master
关凯 2023-02-01 16:13:21 +08:00
parent c929f715e6
commit 799b64615c
14 changed files with 61 additions and 79 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -23683,71 +23683,6 @@ wonderland = "wonderland"
*/ */
class EchartTheme extends InvisibleBase { class EchartTheme extends InvisibleBase {
}
/**
*高德地图组件
*/
class GaodeMap extends PopInputBase {
/**
* 得到弹出的编辑器
* @returns 弹出的编辑器实例
*/
getPopEdior(): IPopInputBaseEditor
/**
* 注册点击并选中任意日期时触发
* @param val 地址json
*/
onRenderDisplayValue(val: AddressValueJson): void
}
/**
*分析组件
*/
class GaodeMapDistribution extends FieldDbComponentBase {
cityInfo: any
currMarker: any[]
districtInfo: any
districtSearch: any
geocoder: any
getMapAddressInfo: any[]
infoWindow: any
map: any
mapId: string
mapInputId: string
marker: any
markers: any[]
markersFour: any[]
markersThree: any[]
markersTwo: any[]
provinceInfo: any
/**
* 获取组件经纬度的值
子类重载这个方法实现自定义取值赋值过程
* @returns 经纬度的值
*/
getLngLat(): any
/**
* 加载数据
* @param paramObj 参数对象
* @param isNew 可选参数 默认值:false 重新一次查询清掉所有的以前查的参数
*/
loadData(paramObj: any,isNew: boolean): void
/**
* 加载数据
* @param ret 返回的结果集 参数对象* @returns
*/
packageData(ret: IRetVo): void
} }
/** /**
*设置组件的大小 *设置组件的大小

View File

@ -51,6 +51,7 @@ html {
cursor: pointer; cursor: pointer;
} }
/* 重置布局结构 */ /* 重置布局结构 */
.layui-layout-admin .layui-header { .layui-layout-admin .layui-header {
height: 50px; height: 50px;
@ -397,9 +398,9 @@ html {
/* 侧边菜单 */ /* 侧边菜单 */
.navbar-side-search { .navbar-side-search {
position: fixed; /* position: fixed;
top: 50px; top: 50px;
width: 220px; width: 220px;*/
height: 40px; height: 40px;
z-index: 1002; z-index: 1002;
background-color: #20222A; background-color: #20222A;
@ -424,7 +425,7 @@ html {
.navbar-side-search i#navbarSearchIcon { .navbar-side-search i#navbarSearchIcon {
position: absolute; position: absolute;
top: 12px; top: 8px;
right: 15px; right: 15px;
cursor: pointer; cursor: pointer;
color: #fff; color: #fff;
@ -1592,9 +1593,9 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
} }
.kdayun-app-layout-left .layui-logo { .kdayun-app-layout-left .layui-logo {
position: fixed; /* position: fixed;
left: 0; left: 0;
top: 0; top: 0; */
z-index: 1002; z-index: 1002;
width: 220px; width: 220px;
height: 49px; height: 49px;
@ -1671,11 +1672,12 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
/* 侧边菜单 */ /* 侧边菜单 */
.kdayun-app-layout-left .navbar-side-search { .kdayun-app-layout-left .navbar-side-search {
position: fixed; /* position: fixed;
top: 49px; top: 49px;
width: 220px; width: 220px;
height: 40px; height: 40px; */
z-index: 1002; z-index: 1002;
position: relative;
background-color: #20222A; background-color: #20222A;
} }
@ -1698,8 +1700,6 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
.kdayun-app-layout-left .navbar-side-search i#navbarSearchIcon { .kdayun-app-layout-left .navbar-side-search i#navbarSearchIcon {
position: absolute; position: absolute;
top: 12px;
right: 15px;
cursor: pointer; cursor: pointer;
color: #fff; color: #fff;
} }
@ -2380,13 +2380,14 @@ CORE STYLES BELOW - NO TOUCHY
.kdayun-app-layout-left .kdayun-menu-container { .kdayun-app-layout-left .kdayun-menu-container {
width: 100%; width: 100%;
position: relative; position: relative;
height: 100%; height: calc(100% - 94px);
overflow-x: hidden; overflow-x: hidden;
scrollbar-width: none;
} }
.kdayun-app-layout-left .kdayun-menu-ul { .kdayun-app-layout-left .kdayun-menu-ul {
border-top: none; border-top: none;
margin-top: 90px; /* margin-top: 90px; */
background: none; background: none;
padding: 0; padding: 0;
position: relative; position: relative;

View File

@ -23,7 +23,7 @@
<!-- jdk版本 --> <!-- jdk版本 -->
<jdk.version>1.8</jdk.version> <jdk.version>1.8</jdk.version>
<!-- 平台版本 --> <!-- 平台版本 -->
<base.version>5.0.220</base.version> <base.version>5.0.221</base.version>
<!-- Spring 版本号 --> <!-- Spring 版本号 -->
<spring.version>5.1.2.RELEASE</spring.version> <spring.version>5.1.2.RELEASE</spring.version>