From b9f68eadd170e469314430d7bbdb4246f65451cd Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 17 Jun 2021 11:31:31 +0800
Subject: [PATCH] 目录树调整添加图层管理等

---
 widgets/LeftNavigationBar/Widget.js   |    3 
 /dev/null                             |  131 --------
 widgets/Layermanagement/Widget.html   |   44 +-
 widgets/Layermanagement/Widget.js     |  477 -----------------------------
 widgets/Layermanagement/css/style.css |  139 ++------
 widgets/ShowPosition/Widget.html      |    2 
 widgets/ShowPosition/Widget.js        |  141 ++++---
 widgets/ShowPosition/css/style.css    |    2 
 8 files changed, 138 insertions(+), 801 deletions(-)

diff --git a/widgets/Layermanagement/Widget.html b/widgets/Layermanagement/Widget.html
index 77f3cfd..a5add6c 100644
--- a/widgets/Layermanagement/Widget.html
+++ b/widgets/Layermanagement/Widget.html
@@ -1,26 +1,24 @@
 <div>
-	<div class="layer-management">
-		<div class="bar-item menu-switch" id="menu_switch" data-type="7">
-			<i></i>
-			<span>图层</span>
-		</div>
-		<div class="ztree-demo-background" id="ztree_container">
-			<div class="layer-tag-bar">
-				<img src="./images/menu.png" alt=""> <span>图层</span> <i id="close_tag_bar">×</i>
-			</div>
-			<ul id="treeDemo" class="ztree"></ul>
-		</div>
+	<div class="layer-tab">
+		<button>
+			<img src="./images/layer-control.png" alt="">
+		</button>
 	</div>
-</div>
 
-
-<!-- {config.json--widgetOnScreen--widgets
-	"uri": "widgets/Layermanagement/Widget",
-	"position": {
-	  "right": 82,
-	  "top": 20,
-	  "height": "32px",
-	  "width": "72px",
-	  "relativeTo": "map"
-	}
-  }, -->
\ No newline at end of file
+	<div class="layer-list">
+		<ul>
+			<li>
+				<div>
+					名称
+					<button>
+						透明度设置
+					</button>
+					<button type="button" class="layui-btn layui-btn-normal layui-btn-sm"><i
+							class="layui-icon">&#xe619;</i></button>
+					<button type="button" class="layui-btn layui-btn-normal layui-btn-sm"><i
+							class="layui-icon">&#xe61a;</i></button>
+				</div>
+			</li>
+		</ul>
+	</div>
+</div>
\ No newline at end of file
diff --git a/widgets/Layermanagement/Widget.js b/widgets/Layermanagement/Widget.js
index bcea65b..ea685a3 100644
--- a/widgets/Layermanagement/Widget.js
+++ b/widgets/Layermanagement/Widget.js
@@ -28,30 +28,11 @@
         return declare([BaseWidget], {
             baseClass: 'jimu-widget-Layermanagement',
             name: 'Layermanagement',
-            layers: {},
-            LayerzNodes: [],
-            entitys: {},
-            // 存放id的数组
-            layermanagementId: [],
             startup: function () {
                 var that = this;
                 // 暴露在外的接口
                 topic.subscribe("closeZtree", lang.hitch(this, this.closeZtreeBox));
-                this.inherited(arguments);
-
-                $('#menu_switch span').click(function () {
-                    if ($('#ztree_container').is(":hidden")) {
-                        $('#ztree_container').stop().show();
-                    } else {
-                        $('#ztree_container').stop().hide();
-                    }
-                    topic.publish('closeMap', this.name);
-                    topic.publish('closeTool', this.name);
-                });
-
-                $('#close_tag_bar').click(function () {
-                    $('#ztree_container').stop().hide();
-                });
+               
             },
 
             closeZtreeBox: function (item) {
@@ -61,131 +42,7 @@
             },
 
             onOpen: function () {
-                var self = this;
-                this.map.scene.globe.depthTestAgainstTerrain = false;
-                $.ajax({
-                    url: 'widgets/Layermanagement/datas.json',
-                    dataType: 'json',
-                    type: 'post',
-                    success: function (data) {
-                        setTimeout(function () {
-                            var parentOpen = null;
-                            var parentCheck = null;
-                            for (var i = 0; i < data.data.length; i++) {
-                                data.data[i].isOpen == 1 ? parentOpen = false : parentOpen = true;
-                                data.data[i].isCheck == 1 ? parentCheck = false : parentCheck = true;
-                                self.LayerzNodes.push({
-                                    id: data.data[i].id,
-                                    pId: data.data[i].parentId,
-                                    name: data.data[i].name,
-                                    url: data.data[i].url,
-                                    open: parentOpen,
-                                    nocheck: parentCheck,
-                                });
-                                // 存储数据得
-                                var result = null;
-                                // 存储url最后面数字的
-                                var layersNumber = null;
-                                // 存储 true, false
-                                var layerShow = null;
-                                // 存储除数字外的URL
-                                var layersUrl = null;
-                                for (var j = 0; j < data.data[i].children.length; j++) {
-                                    result = data.data[i].children[j];
-                                    result.isCheck == 1 ? layerShow = false : layerShow = true;
-                                    self.LayerzNodes.push({
-                                        id: result.id,
-                                        pId: result.parentId,
-                                        name: result.name,
-                                        checked: layerShow,
-                                        type: result.type,
-                                        icon: result.icon,
-                                        rendering: result.rendering,
-                                        url: result.url,
-                                        showheight: result.showheight
-                                    });
-
-
-                                    // 从服务上 并且是服务端渲染的 的 就去添加图层
-                                    if (result.type == 1 && result.rendering == 1) {
-                                        layersNumber = result.url.substring(result.url.length - 1);
-                                        layersUrl = result.url.substring(0, result.url.length - 2);
-                                        var layersObject = {
-                                            icon: result.icon,
-                                            label: result.name,
-                                            show: layerShow,
-                                            type: result.type,
-                                            url: result.url,
-                                            layerID:result.layerID,
-                                            showheight: result.showheight
-                                        };
-                                        if (!isNaN(layersNumber)) {
-                                            layersObject.layers = layersNumber;
-                                            layersObject.url = layersUrl;
-                                        }
-                                        self.createLayers(layersObject);
-                                    } else if (result.type == 0 && result.rendering == 0) {  // 从 接口上读取的数据 并且是 本地渲染,就去添加entity实体
-                                        layerShow && self.createEntity({
-                                            url: result.url,
-                                            entityName: result.name,
-                                            img: result.icon,
-                                            delete: !layerShow,
-                                            showheight: result.showheight
-                                        });
-                                    } else if (result.type == 1 && result.rendering == 0) {
-                                        layerShow && self.serviceEntity({
-                                            url: result.url,
-                                            oname: result.name,
-                                            img: result.icon,
-                                            delete: !layerShow,
-                                            showheight: result.showheight
-                                        });
-                                    }
-                                }
-                            }
-
-                            // 获取现有图层
-                            var imageryLayers = self.map.scene.globe.imageryLayers;
-
-                            for (var i = 0; i < imageryLayers.length; i++) {
-                                var layer = imageryLayers.get(i);
-                                self.layers[layer.label] = layer;
-                                // self.layers[layer.label].show = true;
-                            }
-
-                            var setting = {
-                                view: {
-                                    selectedMulti: false
-                                },
-                                check: {
-                                    enable: true
-                                },
-                                data: {
-                                    simpleData: {
-                                        enable: true
-                                    }
-                                },
-                                callback: {
-                                    onCheck: onCheck,
-                                }
-                            };
-                            $.fn.zTree.init($("#treeDemo"), setting, self.LayerzNodes);
-                            $("#treeDemo li ").on('click', 'a', function () {
-                                return false;
-                            });
-
-                            function onCheck(e, treeId, treeNode) {
-                                if (treeNode.isParent) {
-                                    treeNode.children.forEach(function (item, index) {
-                                        self.selectiveLoading(item);
-                                    });
-                                    return;
-                                }
-                                self.selectiveLoading(treeNode);
-                            }
-                        }, 2000);
-                    }
-                });
+                
             },
 
             onClose: function () {
@@ -209,336 +66,6 @@
                 //todo
                 //do something before this func
                 this.inherited(arguments);
-            },
-
-            // 选中与否,判断后进行添加或者删除实体
-            selectiveLoading: function (treeNodeItem) {
-
-                var self = this;
-                if (treeNodeItem.type == 1 && treeNodeItem.rendering == 1) {
-                    self.layers[treeNodeItem.name].show = treeNodeItem.checked;
-                } else if (treeNodeItem.type == 0 && treeNodeItem.rendering == 0) {
-                    self.createEntity({
-                        url: treeNodeItem.url,
-                        entityName: treeNodeItem.name,
-                        img: treeNodeItem.icon,
-                        delete: !treeNodeItem.checked,
-                        showheight: treeNodeItem.showheight
-                    });
-                } else if (treeNodeItem.type == 1 && treeNodeItem.rendering == 0) {
-                    self.serviceEntity({
-                        url: treeNodeItem.url,
-                        oname: treeNodeItem.name,
-                        img: treeNodeItem.icon,
-                        delete: !treeNodeItem.checked,
-                        showheight: treeNodeItem.showheight
-                    });
-                }
-            },
-
-            // 读取服务,并且服务端加载,添加图层
-            createLayers: function (layerConfig) {
-                var layMap = {
-                    '1': 'ArcGisMapServerImageryProvider'
-                };
-                var layers;
-                if (false) {
-
-                } else {
-
-                    /*var layers = new Cesium[layMap[layerConfig.type]](layerConfig);
-                    var imageryLayers = this.map.imageryLayers;
-                    var olayer = imageryLayers.addImageryProvider(layers);*/
-
-                    //创建provider。
-                    var provider = new Cesium.SuperMapImageryProvider({
-                        url: layerConfig.url,
-                        layersID: layerConfig.layerID
-                    });
-
-                    //创建影像图层。
-                    var olayer = this.map.imageryLayers.addImageryProvider(provider);
-
-                    olayer.show = layerConfig.show;
-                    olayer.label = layerConfig.label;
-                }
-            },
-
-            // 创建entity实体
-            createEntity: function (entityConfig) {
-                var self = this;
-                $.ajax({
-                    url: entityConfig.url,
-                    type: 'GET',
-                    dataType: 'JSON',
-                    success: function (data) {
-                        /*if (data.data.length < 100) {
-                            labelHeight = 260000;
-                        } else if (data.data.length >= 100 && data.data.length < 250) {
-                            labelHeight = 220000;
-                        } else if (data.data.length >= 250 && data.data.length < 500) {
-                            labelHeight = 180000;
-                        } else if (data.data.length >= 500) {
-                            labelHeight = 140000;
-                        }*/
-                        var site = "siteCode";
-                        if (entityConfig.entityName == "山洪隐患点") {
-                            var site = "siteId";
-                        }
-                        data.data.forEach(function (item, index) {
-                            var id = item[site] + entityConfig.entityName + item['lgtd'];
-                            var angle = "";
-                            if (typeof (item.angle) != "undefined") {
-                                angle = item.angle;
-                            }
-                            // 移除entity实体
-                            if (entityConfig.delete == true) {
-                                self.map.entities.removeById(id);
-                                if (self.layermanagementId.indexOf(id) != -1) {
-                                    self.layermanagementId.splice(id, 1);
-                                }
-                                return;
-                            }
-                            self.layermanagementId.push(id);
-                            // 添加entity实体
-                            self.map.entities.add({
-                                id: id, // 实体ID
-                                name: item.siteName, // 实体名称
-                                position: Cesium.Cartesian3.fromDegrees(Number(item.lgtd), Number(item.lttd)), // x,y 实体经纬度
-                                label: {
-                                    show: true,
-                                    text: item.siteName, // text 与实体相关的文字
-                                    font: "700 14px '黑体'",
-                                    fillColor: Cesium.Color.DEEPSKYBLUE,
-                                    // backgroundColor: Cesium.Color.DEEPSKYBLUE,
-                                    style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-                                    outlineWidth: 2,
-                                    outlineColor: Cesium.Color.fromBytes(255, 255, 255), // 文字轮廓的颜色
-                                    verticalOrigin: Cesium.VerticalOrigin.CENTER,//垂直位置
-                                    horizontalOrigin: Cesium.HorizontalOrigin.LEFT,//水平位置
-                                    pixelOffset: new Cesium.Cartesian2(10, -10), // 文字位置
-                                    heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-                                    distanceDisplayCondition: new Cesium.DistanceDisplayCondition(1, entityConfig.showheight),
-                                    disableDepthTestDistance: Number.POSITIVE_INFINITY
-                                },
-                                billboard: {
-                                    show: true,
-                                    image: entityConfig.img,
-                                    // image: entityConfig.img,
-                                    width: 20,
-                                    height: 20,
-                                    clampToGround: true,
-                                    heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-                                    disableDepthTestDistance: Number.POSITIVE_INFINITY,
-                                    rotation: Cesium.Math.toRadians(angle),
-                                }
-                            });
-                            /*self.map.entities.add({
-                                id: item[site] + entityConfig.entityName, // 实体ID
-                                name: item.siteName, // 实体名称
-                                position: Cesium.Cartesian3.fromDegrees(item.lgtd, item.lttd), // x,y 实体经纬度
-                                label: {
-                                    show: true,
-                                    text: item.siteName, // text 与实体相关的文字
-                                    font: "700 16px '黑体'",
-                                    fillColor: Cesium.Color.DEEPSKYBLUE,
-                                    // backgroundColor: Cesium.Color.DEEPSKYBLUE,
-                                    style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-                                    outlineWidth: 3,
-                                    outlineColor: Cesium.Color.fromBytes(255, 255, 255), // 文字轮廓的颜色
-                                    verticalOrigin: Cesium.VerticalOrigin.CENTER,//垂直位置
-                                    horizontalOrigin: Cesium.HorizontalOrigin.LEFT,//水平位置
-                                    pixelOffset: new Cesium.Cartesian2(10, -10), // 文字位置
-                                    heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-                                    distanceDisplayCondition: new Cesium.DistanceDisplayCondition(1, entityConfig.showheight),
-                                    disableDepthTestDistance: Number.POSITIVE_INFINITY
-                                },
-                                ellipse: {
-                                    show: true,
-                                    semiMajorAxis: 200,
-                                    semiMinorAxis: 200,
-                                    heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-
-                                    rotation: Cesium.Math.toRadians(angle),
-                                    material: new Cesium.ImageMaterialProperty({
-                                        image: entityConfig.img
-                                    }),
-                                }
-                            })*/
-                        });
-                    }
-                });
-            },
-
-            // 读取服务,并本地加载
-            serviceEntity: function (entityConfig) {
-                var self = this;
-                $.ajax({
-                    url: entityConfig.url + "/query",
-                    type: 'get',
-                    data: {
-                        where: '1=1',
-                        returnGeometry: true,
-                        outFields: "*",
-                        f: "pjson"
-                    },
-                    dataType: 'JSON',
-                    success: function (data) {
-                        if (data.geometryType == "esriGeometryPoint") {
-                            self.geometryPoints({
-                                data: data,
-                                img: entityConfig.img,
-                                delete: entityConfig.delete,
-                                showheight: entityConfig.showheight
-                            });
-                        } else if (data.geometryType == 'esriGeometryPolyline') {
-                            self.geometryPolylines({
-                                data: data,
-                                img: entityConfig.img,
-                                delete: entityConfig.delete,
-                                showheight: entityConfig.showheight
-                            });
-                        } else if (data.geometryType == 'esriGeometryPolygon') {
-                            self.geometryPolygon({
-                                data: data,
-                                img: entityConfig.img,
-                                delete: entityConfig.delete,
-                                showheight: entityConfig.showheight
-                            });
-                        }
-                    }
-                });
-            },
-
-            // 读取服务,并且在本地渲染的,加载实体点方法
-            geometryPoints: function (entityConfig) {
-                var self = this;
-                var labelHeight = null;
-                if (entityConfig.data.features.length < 100) {
-                    labelHeight = 260000;
-                } else if (entityConfig.data.features.length >= 100 && entityConfig.data.features.length < 250) {
-                    labelHeight = 220000;
-                } else if (entityConfig.data.features.length >= 250 && entityConfig.data.features.length < 500) {
-                    labelHeight = 180000;
-                } else if (entityConfig.data.features.length >= 500) {
-                    labelHeight = 140000;
-                }
-                for (var o = 0; o < entityConfig.data.features.length; o++) {
-                    if (entityConfig.delete == true) {
-                        self.map.entities.removeById(JSON.stringify(entityConfig.data.features[o].attributes));
-                        if (self.layermanagementId.indexOf(JSON.stringify(entityConfig.data.features[o].attributes)) != -1) {
-                            self.layermanagementId.splice(self.layermanagementId.indexOf(JSON.stringify(entityConfig.data.features[o].attributes)), 1);
-                        }
-                        continue;
-                    }
-
-                    self.layermanagementId.push(JSON.stringify(entityConfig.data.features[o].attributes));
-
-                    self.map.entities.add({
-                        id: JSON.stringify(entityConfig.data.features[o].attributes), // 实体ID
-                        name: entityConfig.data.features[o].attributes[entityConfig.data.displayFieldName], // 实体名称
-                        position: Cesium.Cartesian3.fromDegrees(entityConfig.data.features[o].geometry.x, entityConfig.data.features[o].geometry.y), // x,y 实体经纬度
-                        show: true,
-                        //字体标签样式
-                        label: {
-                            show: true,
-                            text: entityConfig.data.features[o].attributes[entityConfig.data.displayFieldName], // text 与实体相关的文字
-                            font: "700 14px '黑体'",
-                            fillColor: Cesium.Color.DEEPSKYBLUE,
-                            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-                            outlineWidth: 2,
-                            outlineColor: Cesium.Color.fromBytes(255, 255, 255), // 文字轮廓的颜色
-                            verticalOrigin: Cesium.VerticalOrigin.CENTER,//垂直位置
-                            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,//水平位置
-                            pixelOffset: new Cesium.Cartesian2(14, -10), // 文字位置
-                            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-                            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(1, entityConfig.showheight),
-                            disableDepthTestDistance: Number.POSITIVE_INFINITY
-                        },
-                        billboard: {
-                            show: true,
-                            image: entityConfig.img,
-                            width: 20,
-                            height: 20,
-                            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-                            disableDepthTestDistance: Number.POSITIVE_INFINITY
-                        }
-                    });
-                }
-            },
-
-            // 读取服务,并且在本地渲染的,加载实体线段方法
-            geometryPolylines: function (entityConfig) {
-                var self = this;
-                var position = [];
-                for (var o = 0; o < entityConfig.data.features.length; o++) {
-                    for (var i = 0; i < entityConfig.data.features[o].geometry.paths[0].length; i++) {
-                        position.push(entityConfig.data.features[o].geometry.paths[0][i][0], entityConfig.data.features[o].geometry.paths[0][i][1]);
-                    }
-                    if (entityConfig.delete == true) {
-                        self.map.entities.removeById(JSON.stringify(entityConfig.data.features[o].attributes));
-                        if (self.layermanagementId.indexOf(JSON.stringify(entityConfig.data.features[o].attributes)) != -1) {
-                            self.layermanagementId.splice(self.layermanagementId.indexOf(JSON.stringify(entityConfig.data.features[o].attributes)), 1);
-                        }
-                        continue;
-                    }
-                    self.layermanagementId.push(JSON.stringify(entityConfig.data.features[o].attributes));
-                    // 绘制线段的
-                    self.map.entities.add({
-                        id: JSON.stringify(entityConfig.data.features[o].attributes),
-                        show: true,
-                        polyline: {
-                            positions: Cesium.Cartesian3.fromDegreesArray(position),
-                            width: 20,
-                            material: new Cesium.ImageMaterialProperty({
-
-                                // 明天需要修改,备注。。!!!!
-                                image: entityConfig.img,
-                                // image: 'images/1111.png',
-                                repeat: new Cesium.Cartesian2(position.length / 8, 1),
-                                // transparent: true,
-                            }),
-                            // granularity: Cesium.Math.RADIANS_PER_DEGREE,
-                            // arcType: Cesium.ArcType.RHUMB,
-                            // classificationType: Cesium.ClassificationType.TERRAIN,
-                            clampToGround: true,
-                        },
-                    });
-                    position = [];
-                }
-
-            },
-
-            // 读取服务,并且在本地渲染的,加载实体多边形方法
-            geometryPolygon: function (entityConfig) {
-                var self = this;
-                var position = [];
-                for (var o = 0; o < entityConfig.data.features.length; o++) {
-                    for (var i = 0; i < entityConfig.data.features[o].geometry.rings[0].length; i++) {
-                        position.push(entityConfig.data.features[o].geometry.rings[0][i][0], entityConfig.data.features[o].geometry.rings[0][i][1]);
-                    }
-                    if (entityConfig.delete == true) {
-                        self.map.entities.removeById(JSON.stringify(entityConfig.data.features[o].attributes));
-                        if (self.layermanagementId.indexOf(JSON.stringify(entityConfig.data.features[o].attributes)) != -1) {
-                            self.layermanagementId.splice(self.layermanagementId.indexOf(JSON.stringify(entityConfig.data.features[o].attributes)), 1);
-                        }
-                        continue;
-                    }
-                    self.layermanagementId.push(JSON.stringify(entityConfig.data.features[o].attributes));
-                    // 绘制多边形的
-                    self.map.entities.add({
-                        id: JSON.stringify(entityConfig.data.features[o].attributes),
-                        show: true,
-                        polygon: {
-                            hierarchy: {positions: Cesium.Cartesian3.fromDegreesArray(position)},
-                            material: new Cesium.ImageMaterialProperty({
-                                image: entityConfig.img
-                            }),
-                            clampToGround: true,
-                        },
-                    });
-                    position = [];
-                }
             }
         });
     });
\ No newline at end of file
diff --git a/widgets/Layermanagement/css/style.css b/widgets/Layermanagement/css/style.css
index c53755e..ff596e2 100644
--- a/widgets/Layermanagement/css/style.css
+++ b/widgets/Layermanagement/css/style.css
@@ -1,121 +1,46 @@
 .jimu-widget-Layermanagement {
-    position: relative;
-    font-size: 14px;
-    height: 32px;
-    line-height: 32px;
-    width: 100%; /* 240px */
-    background: rgba(44, 46, 46, 0.7);
-    color: #fff;
-    border-right: 1px solid #000;
-    text-align: center;
-    cursor: pointer;
-    z-index: 10 !important;
+    
 }
 
-.layer-management {
-    width: 100%;
-}
-
-.layer-management .menu-switch {
-    width: 72px;
-    height: 32px;
-    line-height: 32px;
-}
-
-.layer-management .menu-switch i {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background: url(../../../images/menu.png) no-repeat;
-    background-size: 16px;
-    vertical-align: middle;
-}
-
-.layer-management .menu-switch span:hover {
-    text-decoration: underline;
-}
-
-.layer-management .ztree-demo-background {
-    display: none;
+.jimu-widget-Layermanagement .layer-tab {
     position: fixed;
-    top: 98px;
+    top: 100px;
     right: 10px;
-    /* bottom: 25px; */
-    height: 64%;
-    width: 240px;
-    background: rgba(31, 39, 48, .7);
-    border: 1px solid rgb(69, 154, 251);
-    border-radius: 4px;
-    color: #fff;
 }
 
-.layer-management .ztree-demo-background .ztree {
-    position: absolute;
-    top: 47px;
-    bottom: 10px;
-    overflow: auto;
-    width: 100%;
-    height: auto;
-}
-
-.layer-management .ztree-demo-background .layer-tag-bar {
-    width: 100%;
-    height: 46px;
-    line-height: 46px;
-    border-bottom: 1px solid rgb(69, 154, 251);
-}
-
-.layer-management .ztree-demo-background .layer-tag-bar img {
-    float: left;
-    margin-top: 8px;
-    margin-left: 8px;
-    vertical-align: middle;
-    height: 32px;
+.jimu-widget-Layermanagement .layer-tab button {
+    background: #fff;
+    box-shadow: 0 0 8px #fff;
     width: 32px;
-}
-
-.layer-management .ztree-demo-background .layer-tag-bar span {
-    float: left;
-    font-size: 18px;
-    margin-left: 6px;
-
-}
-
-.layer-management .ztree-demo-background .layer-tag-bar i {
-    float: right;
-    height: 100%;
-    width: 46px;
-    font-size: 46px;
-    font-weight: 400;
-    font-style: normal;
-    text-align: center;
+    height: 32px;
+    border-radius: 14%;
+    padding: 0;
+    vertical-align: middle;
+    z-index: 0;
+    box-sizing: border-box;
+    display: inline-block;
+    position: relative;
+    border: 1px solid #444;
+    border-color: #fff;
+    color: #edffff;
+    fill: #edffff;
+    margin: 1px 2px;
     cursor: pointer;
-}
-
-.layer-management a {
-    color: #fff !important;
-}
-
-.layer-management .ztree li span {
-    color: rgb(228, 228, 228);
-}
-
-#treeDemo a.curSelectedNode {
-    background-color: transparent !important;
-    border: none;
-}
-
-#treeDemo li ul li a span.button.ico_docu {
-    background-size: 16px !important;
-    display: none;
-}
-
-#layermanagement {
-    height: 100%;
     overflow: hidden;
+    user-select: none;
 }
 
+.jimu-widget-Layermanagement .layer-tab button:focus {
 
-#layermanagement iframe {
-    height: 95% !important;
+    outline: none !important;
+
+}
+
+.jimu-widget-Layermanagement .layer-list {
+    position: fixed;
+    top: 100px;
+    right: 60px;
+    width: 320px;
+    height: 420px;
+    background: #fff;
 }
\ No newline at end of file
diff --git a/widgets/Layermanagement/datas.json b/widgets/Layermanagement/datas.json
deleted file mode 100644
index da5843b..0000000
--- a/widgets/Layermanagement/datas.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "data": [
-    {
-      "date": "2020-09-12 08:53:28",
-      "hasChildren": true,
-      "icon": "http://www.sw797.com:10011/gzsw3D/v2/images/icon/mrtc.png",
-      "id": "1",
-      "isCheck": "1",
-      "isDisable": "1",
-      "isOpen": "0",
-      "name": "基础图层",
-      "parentId": "0",
-      "rendering": "2",
-      "showheight": "25000",
-      "children": [
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "2",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "行政区",
-          "parentId": "1",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLXZQ/rest/maps/WLXZQ"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "3",
-          "isCheck": "0",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "乡镇行政区",
-          "parentId": "1",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:0]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLXZQ/rest/maps/WLXZQ"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "4",
-          "isCheck": "0",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "区行政区",
-          "parentId": "1",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:1]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLXZQ/rest/maps/WLXZQ"
-        }
-      ]
-    },
-    {
-      "date": "2020-09-12 08:53:28",
-      "hasChildren": true,
-      "icon": "http://www.sw797.com:10011/gzsw3D/v2/images/icon/mrtc.png",
-      "id": "5",
-      "isCheck": "1",
-      "isDisable": "1",
-      "isOpen": "1",
-      "name": "专题",
-      "parentId": "0",
-      "rendering": "2",
-      "showheight": "25000",
-      "children": [
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "6",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "交通专题",
-          "parentId": "5",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:0]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-ZTSJ/rest/maps/WLZTSJ"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "7",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "湾里区消防大队位置",
-          "parentId": "5",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:1]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-ZTSJ/rest/maps/WLZTSJ"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "8",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "防火林带专题",
-          "parentId": "5",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:2]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-ZTSJ/rest/maps/WLZTSJ"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "8",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "林地小斑",
-          "parentId": "5",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:3]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-ZTSJ/rest/maps/WLZTSJ"
-        }
-      ]
-    },{
-      "date": "2020-09-12 08:53:28",
-      "hasChildren": true,
-      "icon": "http://www.sw797.com:10011/gzsw3D/v2/images/icon/mrtc.png",
-      "id": "9",
-      "isCheck": "1",
-      "isDisable": "1",
-      "isOpen": "1",
-      "name": "POI点",
-      "parentId": "0",
-      "rendering": "2",
-      "showheight": "25000",
-      "children": [
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "10",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "医院",
-          "parentId": "9",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:0]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLPOI/rest/maps/WLPOI"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "11",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "景点",
-          "parentId": "9",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:1]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLPOI/rest/maps/WLPOI"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "12",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "行政区",
-          "parentId": "9",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:2]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLPOI/rest/maps/WLPOI"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "13",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "收费站",
-          "parentId": "9",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:3]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLPOI/rest/maps/WLPOI"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "14",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "山名",
-          "parentId": "9",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:4]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLPOI/rest/maps/WLPOI"
-        },
-        {
-          "date": "2020-05-21 10:18:56",
-          "hasChildren": false,
-          "icon": "",
-          "id": "15",
-          "isCheck": "1",
-          "isDisable": "1",
-          "isOpen": "1",
-          "name": "学校",
-          "parentId": "9",
-          "rendering": "1",
-          "showheight": "260000",
-          "type": "1",
-          "layerID": "[0:5]",
-          "url": "http://61.131.223.3:8090/iserver/services/map-WLPOI/rest/maps/WLPOI"
-        }
-      ]
-    }
-  ],
-  "success": true
-}
\ No newline at end of file
diff --git a/widgets/Layermanagement/popup/css/style.css b/widgets/Layermanagement/popup/css/style.css
deleted file mode 100644
index c826d7d..0000000
--- a/widgets/Layermanagement/popup/css/style.css
+++ /dev/null
@@ -1,782 +0,0 @@
-* {
-    padding: 0;
-    margin: 0
-}
-
-html,
-body {
-    height: auto;
-    width: 100%;
-    overflow: hidden;
-}
-
-body {
-    font-family: "Microsoft YaHei";
-    font-size: 12px;
-}
-
-ul,
-ol,
-li,
-dl,
-dd,
-dt {
-    list-style-type: none;
-}
-
-select,
-input,
-img,
-select,
-button {
-    vertical-align: middle;
-    font-size: 12px;
-}
-
-a {
-    text-decoration: none;
-    color: #323232
-}
-
-a:hover {
-    color: #0262AB;
-}
-
-a:hover,
-a:link {
-    text-decoration: none;
-}
-
-input {
-    outline: none
-}
-
-input[type=button] {
-    cursor: pointer;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-    font-size: 100%;
-    font-weight: normal;
-}
-
-.river-course {
-    width: 100%;
-    height: 100%;
-}
-
-.river-top {
-    width: 100%;
-    height: 50px;
-    background: rgb(187, 195, 200);
-}
-
-.river-menu,
-.rain-menu,
-.reser-menu {
-    width: 100%;
-    height: 35px;
-}
-
-.river-menu ul li,
-.rain-menu ul li,
-.reser-menu ul li {
-    min-width: 50px;
-    padding: 0 15px;
-    height: 35px;
-    float: left;
-    margin-top: 15px;
-    line-height: 35px;
-    color: #fff;
-    cursor: pointer;
-    margin-left: 5px;
-    font-size: 14px;
-}
-
-.river-menu ul li:hover,
-.rain-menu ul li:hover,
-.reser-menu ul li:hover {
-    background: #539af6;
-}
-
-.river-menu ul li.on,
-.rain-menu ul li.on,
-.reser-menu ul li.on {
-    background: #fff;
-    color: rgb(187, 195, 200);
-}
-
-.river-box {
-    width: 100%;
-    height: 420px;
-}
-
-.rain-box{
-    width: 100%;
-    height: 420px;
-}
-
-.reser-box{
-    width: 100%;
-    height: 420px;
-}
-
-.river-course .river-box .river-fou {
-    position: relative;
-    width: 100%;
-    height: 100%;
-
-}
-
-.river-course .river-box .river-fou .river-fou-box {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    width: 700px;
-    height: 380px;
-}
-
-.river-course .river-box .river-fou .river-fou-box ul {
-    position: absolute;
-    top: 40px;
-    left: 44px;
-    width: 666px;
-    height: 220px;
-}
-.river-course .reser-box .river-fou .river-fou-box {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    width: 700px;
-    height: 380px;
-}
-
-.river-course .reser-box .river-fou .river-fou-box ul {
-    position: absolute;
-    top: 40px;
-    left: 44px;
-    width: 666px;
-    height: 220px;
-}
-.river-course .rain-box .river-fou .river-fou-box {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    width: 700px;
-    height: 380px;
-}
-
-.river-course .rain-box .river-fou .river-fou-box ul {
-    position: absolute;
-    top: 40px;
-    left: 44px;
-    width: 666px;
-    height: 220px;
-}
-
-
-
-.river-one,
-.river-two,
-.river-thr,
-.river-fou {
-    width: 100%;
-    height: 100%;
-}
-
-.river-box-top {
-    height: 45px;
-    width: 100%;
-}
-
-.river-pei {
-    width: 53%;
-    height: 87%;
-    float: left;
-}
-
-.river-tab {
-    width: 46%;
-    height: 360px;
-    float: left;
-}
-
-.river-fou-box {
-    width: 100%;
-}
-
-.river-fou-box ul li {
-    width: 48%;
-    float: left;
-    margin-left: 1%;
-    height: 30px;
-    line-height: 30px;
-    margin-top: 14px;
-}
-
-.river-fou-box ul li span {
-    width: 80px;
-    height: 30px;
-    text-align: right;
-    display: inline-block;
-    float: left;
-}
-
-.river-fou-box ul li div {
-    width: 150px;
-    height: 30px;
-    border: 1px solid #d0d0d0;
-    float: left;
-    padding-left: 10px;
-}
-
-.river-fou-box ul li div.on {
-    border: 1px solid #3892d4;
-}
-
-.table-thead {
-    width: 100%;
-    font-size: 12px;
-    background-color: #f0eded;
-    border: 1px solid #CFCFCF;
-    border-collapse: collapse;
-    border-spacing: 0px;
-}
-
-.table-thead tr th {
-    text-align: left;
-    border-right: 1px solid #CFCFCF;
-    color: #404040;
-}
-
-.table-thead tr th:last-child,
-.table-thead tr th:nth-last-child(2) {
-    border-right: 0;
-}
-
-.table-thead tr th div {
-    padding-left: 3px;
-}
-
-.table-thead tr,
-.table-tbody tr {
-    height: 35px;
-}
-
-.table-tbody {
-    width: 100%;
-    font-size: 12px;
-    background-color: #FFF;
-    border-left: 1px solid #CFCFCF;
-    border-collapse: collapse;
-    border-spacing: 0px;
-}
-
-.table-tbody tr {
-    border-bottom: 1px solid #CFCFCF;
-}
-
-.table-tbody tr:last-child {
-    border-bottom: 0;
-}
-
-.table-tbody tr td {
-    border-right: 1px solid #CFCFCF;
-}
-
-.table-tbody tr td:first-child {
-    text-align: center;
-}
-
-.table-tbody tr td div {
-    text-align: center;
-    padding-left: 3px;
-}
-
-.river-thead tr th{
-    text-align: center;
-}
-
-.river-thead tr th:nth-child(1) div {
-    width: 28px;
-}
-
-.river-thead tr th:nth-child(2) div {
-    width: 108px;
-}
-
-.river-thead tr th:nth-child(3) div {
-    width: 80px;
-}
-
-.river-thead tr th:nth-child(4) div {
-    width: 41px;
-}
-
-.river-thead tr th:nth-child(5) div {
-    width: 68px;
-}
-
-.river-thead tr th:nth-child(6) {
-    width: 14px;
-}
-
-.river-thead tr th:nth-child(6) div {
-    width: 14px;
-}
-
-.river-tbody tr td:nth-child(1) div {
-    width: 28px;
-}
-
-.river-tbody tr td:nth-child(2) div {
-    width: 108px;
-}
-
-.river-tbody tr td:nth-child(3) div {
-    width: 80px;
-}
-
-.river-tbody tr td:nth-child(4) div {
-    width: 41px;
-}
-
-.river-tbody tr td:nth-child(5) div {
-    width: 68px;
-}
-
-.comTbody {
-    width: 100%;
-    display: inline-block;
-    max-height: 90%;
-    overflow-y: scroll;
-    border-bottom: 1px solid #CFCFCF;
-}
-
-
-
-
-
-/*降雨*/
-.rain-pei {
-    width: 53%;
-    height: 87%;
-    float: left;
-}
-
-.rain-tab {
-    width: 46%;
-    height: 360px;
-    float: left;
-}
-
-.rain-thead tr th{
-    text-align: center;
-}
-
-.rain-thead tr th:nth-child(1) div {
-    width: 34px;
-}
-
-.rain-thead tr th:nth-child(2) div {
-    width: 110px;
-}
-
-.rain-thead tr th:nth-child(3) div {
-    width: 80px;
-}
-
-.rain-thead tr th:nth-child(4) div {
-    width: 14px;
-}
-.rain-thead tr th:nth-child(4){
-    width: 17px;
-}
-
-.rain-tbody tr td:nth-child(1) div {
-    width: 34px;
-}
-
-.rain-tbody tr td:nth-child(2) div {
-    width: 110px;
-}
-
-.rain-tbody tr td:nth-child(3) div {
-    width: 82px;
-}
-
-
-.rain-thead-box tr th {
-    text-align: center;
-}
-
-.rain-thead-box tr th:nth-child(1) div {
-    width: 45px;
-}
-
-.rain-thead-box tr th:nth-child(2) div {
-    width: 150px;
-}
-
-.rain-thead-box tr th:nth-child(3) div {
-    width: 68px;
-}
-
-.rain-thead-box tr th:nth-child(4) div {
-    width: 68px;
-}
-
-.rain-thead-box tr th:nth-child(5) div {
-    width: 68px;
-}
-
-.rain-thead-box tr th:nth-child(6) div {
-    width: 68px;
-}
-
-.rain-thead-box tr th:nth-child(7) div {
-    width: 68px;
-}
-
-.rain-thead-box tr th:nth-child(8) div {
-    width: 68px;
-}
-
-.rain-thead-box tr th:nth-child(9) div {
-    width: 68px;
-}
-
-.rain-thead-box tr th:nth-child(10) div {
-    width: 67px;
-}
-
-.rain-thead-box tr th:nth-child(11) div {
-    width: 17px;
-}
-
-.rain-thead-box tr th:nth-child(11) {
-    width: 17px;
-}
-
-.rain-tbody-box tr td:nth-child(1) div {
-    width: 45px;
-}
-
-.rain-tbody-box tr td:nth-child(2) div {
-    width: 150px;
-}
-
-.rain-tbody-box tr td:nth-child(3) div {
-    width: 68px;
-}
-
-.rain-tbody-box tr td:nth-child(4) div {
-    width: 68px;
-}
-
-.rain-tbody-box tr td:nth-child(5) div {
-    width: 68px;
-}
-
-.rain-tbody-box tr td:nth-child(6) div {
-    width: 68px;
-}
-
-.rain-tbody-box tr td:nth-child(7) div {
-    width: 68px;
-}
-
-.rain-tbody-box tr td:nth-child(8) div {
-    width: 68px;
-}
-
-.rain-tbody-box tr td:nth-child(9) div {
-    width: 68px;
-}
-
-.rain-tbody-box tr td:nth-child(10) div {
-    width: 67px;
-}
-
-.rser-thead tr th {
-    text-align: center;
-}
-
-.rser-thead tr th:nth-child(1) div {
-    width: 35px;
-}
-
-.rser-thead tr th:nth-child(2) div {
-    width: 90px;
-}
-
-.rser-thead tr th:nth-child(3) div {
-    width: 51px;
-}
-
-.rser-thead tr th:nth-child(4) div {
-    width: 14px;
-}
-
-.rser-thead tr th:nth-child(4){
-    width: 17px;
-}
-
-.rser-tbody tr td:nth-child(1) div {
-    width: 35px;
-}
-
-.rser-tbody tr td:nth-child(2) div {
-    width: 90px;
-}
-
-.rser-tbody tr td:nth-child(3) div {
-    width: 51px;
-}
-
-.rese-pei {
-    width: 585px;
-    height: 360px;
-    float: left;
-}
-
-.rese-tab {
-    width: 200px;
-    height: 360px;
-    float: left;
-}
-
-/* 模拟下拉框 */
-.hide {
-    display: none;
-}
-
-.select {
-    width: 200px;
-    position: relative;
-    margin: 10px 0 0 10px;
-    float: left;
-}
-
-.selectsd {
-    position: relative;
-    margin: 10px 10px 0 0px;
-    float: left;
-}
-
-.select .input_in input {
-    width: 188px;
-    height: 28px;
-    line-height: 28px;
-    border: 1px solid #d0d0d0;
-    cursor: pointer;
-    padding-left: 10px;
-    color: #6d6d6d;
-    background: url("../img/sel.png")
-        no-repeat 175px;
-}
-
-.selectsd .input_insd input {
-    width: 50px;
-    height: 28px;
-    line-height: 28px;
-    border: 1px solid #d0d0d0;
-    cursor: pointer;
-    padding-left: 10px;
-    color: #6d6d6d;
-    background: url("../img/sel.png")
-    no-repeat 40px;
-}
-
-.select .city {
-    position: absolute;
-    top: 30px;
-    left: 0;
-    z-index: 10;
-}
-
-.select .city ul {
-    width: 198px;
-    border: 1px solid #d6d6d6;
-    border-top: none;
-}
-
-.select .city ul li {
-    padding-left: 10px;
-    width: 188px;
-    height: 28px;
-    line-height: 28px;
-    cursor: pointer;
-    background: #fff;
-    color: #404040;
-}
-
-.select .city ul li:hover {
-    background: #539af6;
-    color: #fff;
-}
-
-.selectsd .city {
-    position: absolute;
-    top: 30px;
-    left: 0;
-    z-index: 10;
-}
-
-.selectsd .city ul {
-    width: 60px;
-    border: 1px solid #d6d6d6;
-    border-top: none;
-}
-
-.selectsd .city ul li {
-    padding-left: 10px;
-    width: 50px;
-    height: 28px;
-    line-height: 28px;
-    cursor: pointer;
-    background: #fff;
-    color: #404040;
-}
-
-.selectsd .city ul li:hover {
-    background: #539af6;
-    color: #fff;
-}
-
-
-/** 日历代码   **/
-.river-data {
-    float: left;
-    margin-top: 10px;
-}
-
-.datainp {
-    width: 145px;
-    height: 30px;
-    border: 1px solid #d0d0d0;
-    padding-left: 5px;
-    margin-left: 10px;
-    margin-right: 10px;
-    color: #6d6d6d;
-}
-
-.wicon {
-    background: url("../img/data.png")
-        no-repeat 120px;
-}
-
-.time-icon {
-    background: url("../img/sel.png")
-        no-repeat 128px;
-}
-
-.river-btn {
-    width: 50px;
-    height: 30px;
-    border: 1px solid #d0d0d0;
-    background: #f6f6f6;
-    margin-top: 10px;
-    color: #6d6d6d;
-    float: left;
-}
-.loc-btn {
-    width: 80px;
-    height: 30px;
-    border: 1px solid #d0d0d0;
-    background: #f6f6f6;
-    margin-top: 10px;
-    margin-left: 10px;
-    color: #6d6d6d;
-    float: left;
-}
-
-.none {
-    display: none;
-}
-
-.load-box-list {
-    display: block;
-    overflow-y: auto;
-    width: 100%;
-    background-color: #fff;
-    position: absolute;
-    top: 0;
-}
-
-.load-box-list .rote-load {
-    position: absolute;
-    top: 36%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: 60px;
-    height: 80px;
-}
-
-.load-box-list .rote-load img {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 60px;
-    animation: rote 3s linear infinite;
-}
-
-
-@keyframes rote {
-    0% {
-        transform: rotate(0deg);
-    }
-
-    25% {
-        transform: rotate(90deg);
-    }
-
-    50% {
-        transform: rotate(180deg);
-    }
-
-    75% {
-        transform: rotate(270deg);
-    }
-
-    100% {
-        transform: rotate(360deg);
-    }
-}
-
-.load-box-list .rote-load span {
-    margin: 0 !important;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 20px;
-    line-height: 20px !important;
-    text-align: center;
-}
-
-.load-box-list {
-    /*margin-left: 1%;*/
-    height: auto;
-    max-height: 91.5%;
-    overflow-y: auto;
-    background-color: #fff;
-    position: absolute;
-    bottom: 0px;
-    top: 95px;
-}
\ No newline at end of file
diff --git a/widgets/Layermanagement/popup/img/close.png b/widgets/Layermanagement/popup/img/close.png
deleted file mode 100644
index cbd501a..0000000
--- a/widgets/Layermanagement/popup/img/close.png
+++ /dev/null
Binary files differ
diff --git a/widgets/Layermanagement/popup/img/data.png b/widgets/Layermanagement/popup/img/data.png
deleted file mode 100644
index bb2d9df..0000000
--- a/widgets/Layermanagement/popup/img/data.png
+++ /dev/null
Binary files differ
diff --git a/widgets/Layermanagement/popup/img/rote.jpg b/widgets/Layermanagement/popup/img/rote.jpg
deleted file mode 100644
index 0a997b9..0000000
--- a/widgets/Layermanagement/popup/img/rote.jpg
+++ /dev/null
Binary files differ
diff --git a/widgets/Layermanagement/popup/img/sel.png b/widgets/Layermanagement/popup/img/sel.png
deleted file mode 100644
index 1406837..0000000
--- a/widgets/Layermanagement/popup/img/sel.png
+++ /dev/null
Binary files differ
diff --git a/widgets/Layermanagement/popup/js/end.js b/widgets/Layermanagement/popup/js/end.js
deleted file mode 100644
index 369697f..0000000
--- a/widgets/Layermanagement/popup/js/end.js
+++ /dev/null
@@ -1,13 +0,0 @@
-$(function () {
-    laydate.render({
-        elem: '#timeend' //指定元素
-        ,type: 'datetime'
-    });
-    laydate.render({
-        elem: '#inpend' //指定元素
-        ,type: 'datetime'
-    });
-    laydate.render({
-        elem: '#inpend_zr' //指定元素
-    });
-})
\ No newline at end of file
diff --git a/widgets/Layermanagement/popup/js/rain.js b/widgets/Layermanagement/popup/js/rain.js
deleted file mode 100644
index 7789cc0..0000000
--- a/widgets/Layermanagement/popup/js/rain.js
+++ /dev/null
@@ -1,586 +0,0 @@
-$(function () {
-
-	$('.close').click(function () {
-		window.parent.$('#infoWindow_pup').hide();
-		window.parent.$('#infoWindow_pup').attr('src', '');
-	});
-	$('.input_in input').val('快速查询');
-
-	var d = new Date();
-	var str = d.getFullYear()+"-"+(d.getMonth()+1 < 10 ? '0'+(d.getMonth()+1) : d.getMonth()+1)+"-"+(d.getDate() < 10 ? '0'+d.getDate() : d.getDate())+" "
-			+(d.getHours()+1 <10 ? '0'+(d.getHours()+1):(d.getHours()+1))+":00:00";
-	var str_zr = d.getFullYear()+"-"+(d.getMonth()+1 < 10 ? '0'+(d.getMonth()+1) : d.getMonth()+1)+"-"+d.getDate();
-	var qz =new Date(getDate(Date.parse(new Date()) - 86400000 *2));
-	var qzstr = qz.getFullYear()+"-"+(qz.getMonth()+1 < 10 ? '0'+(qz.getMonth()+1) : qz.getMonth()+1)+"-"+(qz.getDate() < 10 ? '0'+qz.getDate() : qz.getDate())+" 00:00:00";
-	var qzstr_zr = qz.getFullYear()+"-"+(qz.getMonth()+1 < 10 ? '0'+(qz.getMonth()+1) : qz.getMonth()+1)+"-"+qz.getDate();
-
-	var startTime = qzstr;
-	var endTime = str;
-	var rainstartTime = qzstr_zr;
-	var rainendTime = str_zr;
-	var code = GetQueryString("id");
-
-	var sdData = "1";
-
-	$('#inpstart_zr').val(qzstr_zr);
-	$('#inpend_zr').val(str_zr);
-	$('#timestart').val(qzstr);
-	$('#timeend').val(str);
-
-
-	$('.input_in input').click(function () {
-		// $('#riverSel').show();
-		$('#RainSel').toggle();
-		$('#dailyRiverSel').toggle();
-	})
-
-	$('.input_insd input').click(function () {
-		$('#RainSd').toggle();
-	})
-
-	function GetQueryString(name) {
-		var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-		var r = window.location.search.substr(1).match(reg);
-		if (r != null) return unescape(r[2]);
-		return null;
-	}
-	setTimeout(function () {
-		$('.load-box-list').show();
-		rainShowPie(startTime, endTime,sdData);
-	}, 200);
-	//时段雨量
-	$('#rainBtnOne').click(function () {
-		recharts();
-		$('.load-box-list').show();
-		$('.input_in input').val('快速查询');
-		rainShowPie(startTime, endTime,sdData);
-		$('#RainSel').hide();
-		$('#dailyRiverSel').hide();
-	});
-	//逐日雨量
-	$('#rainBtnTwo').click(function () {
-		recharts_z();
-		$('.load-box-list').show();
-		$('.input_in input').val('快速查询');
-		dailyRainShowPie(rainstartTime, rainendTime);
-		$('#RainSel').hide();
-		$('#dailyRiverSel').hide();
-	});
-
-	//特征雨量
-	$('#rainBtnThr').click(function () {
-		$('.input_in input').val('快速查询');
-		featuresShowInfo();
-		$('#RainSel').hide();
-		$('#dailyRiverSel').hide();
-
-
-
-	});
-
-	//基础信息
-	$('#rainBtnFou').click(function () {
-		$('.input_in input').val('快速查询');
-		rainBasicShowInfo();
-		$('#RainSel').hide();
-		$('#dailyRiverSel').hide();
-	});
-
-	function recharts_z(){
-		var width = $(window).width()*0.53;
-		var height =($(window).height()-50)-80;
-
-		var chartPie = document.getElementById('dailyPei');
-		var myChartPie = echarts.init(chartPie);
-		var resize = {
-			width:width,
-			height:height
-		}
-		myChartPie.resize(resize);
-	}
-
-	function recharts(){
-		var width = $(window).width()*0.53;
-		var height =($(window).height()-50)-80;
-
-		// 获取ID
-		var chartPie = document.getElementById('rainPei');
-		var myChartPie = echarts.init(chartPie);
-		var resize = {
-			width:width,
-			height:height
-		}
-		myChartPie.resize(resize);
-	}
-
-	window.onresize = function () {
-
-		var width = $(window).width()*0.53;
-		var height =($(window).height()-50)-80;
-
-		$(".rain-tab").height(height);
-		// 获取ID
-		var chartPie_1 = document.getElementById('rainPei');
-		var chartPie_2 = document.getElementById('dailyPei');
-		// echarts初始化
-		var myChartPie_1 = echarts.init(chartPie_1);
-		var myChartPie_2 = echarts.init(chartPie_2);
-		var resize = {
-			width:width,
-			height:height
-		}
-		myChartPie_1.resize(resize);
-		myChartPie_2.resize(resize);
-	};
-
-	//时段选择
-	$('#RainSd ul li').click(function () {
-		$('#RainSd').hide();
-		var checkTime = $(this).attr('data');
-
-		if (checkTime == '1') {
-			sdData = "1";
-			$('.input_insd input').val('1');
-		} else if (checkTime == '2') {
-			sdData = "2";
-			$('.input_insd input').val('2');
-		} else if (checkTime == '3') {
-			sdData = "3";
-			$('.input_insd input').val('3');
-		} else if (checkTime == '6') {
-			sdData = "6";
-			$('.input_insd input').val('6');
-		}
-
-	});
-
-	//时段雨量------时间查询
-	$('#riverBtn').click(function () {
-		$('.load-box-list').show();
-		$('.input_in input').val('快速查询');
-		startTime = $("#timestart").val();
-		endTime = $("#timeend").val();
-		rainShowPie(startTime, endTime,sdData);
-	});
-	//时段雨量-----快速查询
-	$('#RainSel ul li').click(function () {
-		$('.load-box-list').show();
-		$('#RainSel').hide();
-		var checkTime = $(this).attr('data');
-		var curr = new Date();
-		var currDataD = curr.getFullYear();
-		var currDataM = curr.getMonth() + 1;
-		var currDataR = curr.getDate();
-		var currDataH = curr.getHours();
-		// 结束时间
-		var currAllTime = currDataD + '-' + currDataM + '-' + currDataR + ' ' +  (currDataH+1) + ':00:00';
-		var data = '';
-		var dataD = '';
-		var dataM = '';
-		var dataR = '';
-		var dataH = '';
-		var dataDd = '';
-		var allDataTime = '';
-		if (checkTime == '2') {
-			data = new Date(new Date() - 2 * 60 * 60 * 1000);
-			$('.input_in input').val('最近2小时');
-		} else if (checkTime == '12') {
-			data = new Date(new Date() - 12 * 60 * 60 * 1000);
-			$('.input_in input').val('最近12小时');
-		} else if (checkTime == '24') {
-			data = new Date(new Date() - 24 * 60 * 60 * 1000);
-			$('.input_in input').val('最近24小时');
-		} else if (checkTime == '36') {
-			data = new Date(new Date() - 36 * 60 * 60 * 1000);
-			$('.input_in input').val('最近36小时');
-		} else if (checkTime == '72') {
-			data = new Date(new Date() - 72 * 60 * 60 * 1000);
-			$('.input_in input').val('最近72小时');
-		}
-		dataD = data.getFullYear();
-		dataM = data.getMonth() + 1;
-		dataR = data.getDate();
-		dataH = data.getHours();
-		dataDd = data.getMinutes();
-		// 开始时间
-		allDataTime = dataD + '-' + dataM + '-' + dataR + ' ' + (dataH+1) + ':00:00';
-
-		$('#timestart').val(allDataTime);
-		$('#timeend').val(currAllTime);
-		rainShowPie(allDataTime, currAllTime,sdData);
-	});
-
-	function getDate(timestamp) {
-		let d = new Date(timestamp);// 时间戳为10位需*1000,时间戳为13位的话不需乘1000
-		let yyyy = d.getFullYear() + '-';
-		let MM = (d.getMonth()+1 < 10 ? '0'+(d.getMonth()+1) : d.getMonth()+1) + '-';
-		let dd = d.getDate() + ' ';
-		let HH = d.getHours() + ':';
-		let mm = d.getMinutes() + ':';
-		let ss = d.getSeconds();
-		return yyyy + MM + dd + HH + mm + ss;
-	}
-
-	function rainShowPie(startTime, endTime,sd) {
-
-		$.ajax({
-			url: "http://www.sw797.com:82/blade-ycreal/pptnr/selectDayStation",
-			type: 'post',
-			dataType: 'json',
-			jsonp: 'callback',
-			jsonpCallback: 'data',
-			data: {
-				'code': code,
-				'dateBegin': startTime,
-				'dateEnd': endTime,
-				'sd':sd,
-			},
-			success: function (result) {
-				var q = '';
-				var w = '';
-				var dataName = [];
-				var dataZ = [];
-				var contant = '';
-				for (var i = 0; i < result.data.length; i++) {
-					var time = result.data[i].tm;
-					var timesub = time.substr(5, 11);
-					dataName.push(timesub);
-					dataZ.push(result.data[i].DRP);
-
-					if (result.data[i].DRP == null) {
-						q = '';
-					} else {
-						q = result.data[i].DRP;
-					}
-					contant += '<tr>' +
-						'<td><div>' + (i + 1) + '</div></td>' +
-						'<td><div>' + timesub + '</div></td>' +
-						'<td><div>' + q + '</div></td>' +
-						'</tr>';
-				}
-				$('#rainTable').html(contant);
-
-				var option = {
-					title: {
-						text: '时段降雨过程',
-						left: 'center'
-					},
-					tooltip: {
-						trigger: 'axis'
-					},
-					legend: {
-						bottom: '0px',
-						left: 'center',
-						data: ['雨量']
-					},
-					xAxis: [{
-						type: 'category',
-						splitLine: {
-							show: false
-						},
-						data: dataName,
-						inverse:true,
-						boundaryGap: false,
-						axisLine: {
-							onZero: false,
-							lineStyle: {
-								color: "#000"
-							}
-						},
-					}],
-					grid: {
-						left: '8%',
-						right: '4%',
-						bottom: '8%',
-						containLabel: true
-					},
-					yAxis: [{
-						type: 'value',
-						name: '降雨量(mm)',
-						axisLine: {
-							lineStyle: {
-								color: '#000',
-							}
-						},
-						splitLine: {
-							show: true
-						},
-					}],
-					series: [{
-						name: '雨量',
-						type: 'bar',
-						data: dataZ
-					}]
-				};
-				var chartPie = document.getElementById('rainPei');
-				var myChartPie = echarts.init(chartPie);
-				myChartPie.setOption(option, true);
-				$('.load-box-list').hide();
-			}
-		});
-	}
-
-	//逐日雨量------时间查询
-	$('#dailyRainBtn').click(function () {
-		$('.load-box-list').show();
-		$('.input_in input').val('快速查询');
-		rainstartTime = $("#inpstart_zr").val();
-		rainendTime = $("#inpend_zr").val();
-		dailyRainShowPie(rainstartTime, rainendTime);
-	});
-
-	$('#dailyRiverSel ul li').click(function () {
-		$('.load-box-list').show();
-		$('#dailyRiverSel').hide();
-		var checkTime = $(this).attr('data');
-		var curr = new Date();
-		var currDataD = curr.getFullYear(); // 获取完整的年份 4位数
-		var currDataM = curr.getMonth() + 1; // 获取当前月份,0是1月,所以+1
-		var currDataR = curr.getDate(); // 获取当前日,1-31日
-		var currDataH = curr.getHours(); // 获取当前小时数0-23
-		// 结束时间
-		var currAllTime = currDataD + '-' + currDataM + '-' + currDataR;
-		var data = '';
-		var dataD = '';
-		var dataM = '';
-		var dataR = '';
-		var dataH = '';
-		var allDataTime = '';
-		if (checkTime == '3') {
-			data = new Date(new Date() - 24 * 60 * 60 * 1000 * 3);
-			$('.input_in input').val('近3天');
-		} else if (checkTime == '7') {
-			data = new Date(new Date() - 24 * 60 * 60 * 1000 * 7);
-			$('.input_in input').val('近7天');
-		}else if (checkTime == '15') {
-			data = new Date(new Date() - 24 * 60 * 60 * 1000 * 15);
-			$('.input_in input').val('近15天');
-		}
-		dataD = data.getFullYear();
-		dataM = data.getMonth() + 1;
-		dataR = data.getDate();
-		dataH = data.getHours();
-		// 开始时间
-		allDataTime = dataD + '-' + dataM + '-' + dataR;
-
-		$('#inpstart_zr').val(allDataTime);
-		$('#inpend_zr').val(currAllTime);
-
-		dailyRainShowPie(allDataTime, currAllTime);
-	});
-
-	function dailyRainShowPie(rainstartTime, rainendTime) {
-		if (rainstartTime == '' && rainendTime == '') {
-			var Nowdate = new Date();
-			var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
-			M = Number(MonthFirstDay.getMonth()) + 1
-			rainstartTime = MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
-			var MonthNextFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth() + 1, 1);
-			var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
-			M = Number(MonthLastDay.getMonth()) + 1
-			rainendTime = MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
-		}
-
-		$.ajax({
-			url: "http://www.sw797.com:82/blade-ycreal/pptnr/selectStation",
-			type: 'post',
-			dataType: 'json',
-			jsonp: 'callback',
-			jsonpCallback: 'data',
-			data: {
-				'code': code,
-				'dateBegin': rainstartTime,
-				'dateEnd': rainendTime
-			},
-			success: function (result) {
-				var q = '';
-				var w = '';
-				var dataName = [];
-				var dataZ = [];
-				var contant = '';
-				for (var i = 0; i < result.data.length; i++) {
-					var time = result.data[i].tm;
-					var timesub = time.substr(5, 11);
-					dataName.push(timesub);
-
-					if (result.data[i].DRP == -1) {
-						q = 0;
-					} else {
-						q = result.data[i].DRP;
-					}
-					dataZ.push(q);
-					contant += '<tr>' +
-						'<td><div>' + (i + 1) + '</div></td>' +
-						'<td><div>' + timesub + '</div></td>' +
-						'<td><div>' + q + '</div></td>' +
-						'</tr>';
-				}
-				$('#dailyRainTable').html(contant);
-
-				var option = {
-					title: {
-						text: '逐日雨量',
-						left: 'center'
-					},
-					tooltip: {
-						trigger: 'axis'
-					},
-					legend: {
-						bottom: '0px',
-						left: 'center',
-						data: ['雨量']
-					},
-					xAxis: [{
-						type: 'category',
-						splitLine: {
-							show: false
-						},
-						data: dataName,
-						inverse:true,
-						boundaryGap: true,
-						axisLine: {
-							onZero: false,
-							lineStyle: {
-								color: "#000"
-							}
-						},
-					}],
-					grid: {
-						left: '8%',
-						right: '4%',
-						bottom: '8%',
-						containLabel: true
-					},
-					yAxis: [{
-						type: 'value',
-						name: '降雨量(mm)',
-						axisLine: {
-							lineStyle: {
-								color: '#000',
-							}
-						},
-						splitLine: {
-							show: true
-						},
-					}],
-					series: [{
-						name: '雨量',
-						type: 'bar',
-						barWidth: 30, // 柱图宽度
-						barMaxWidth: 30, // 最大宽度
-						data: dataZ
-					}]
-				};
-
-				var chartPie = document.getElementById('dailyPei');
-				var myChartPie = echarts.init(chartPie);
-				myChartPie.setOption(option, true);
-				$('.load-box-list').hide();
-			}
-		});
-	}
-
-
-	//特征雨量---查询
-	function featuresShowInfo() {
-		$.ajax({
-			url: "http://www.sw797.com:82/blade-ycreal/pptnr/selectPptnTz",
-			type: 'post',
-			async: false,
-			dataType: 'json',
-			jsonp: 'callback',
-			jsonpCallback: 'data',
-			data: {
-				'code': code
-			},
-			success: function (result) {
-				var contant = '';
-
-				var time = result.data[0].time;
-				var timesub = time.substr(5, 11);
-				contant = '<tr>' +
-					'<td><div>1</div></td>' +
-					'<td><div>' + timesub + '</div></td>' +
-					'<td><div>' + result.data[0].drp1 + '</div></td>' +
-					'<td><div>' + result.data[0].drp2 + '</div></td>' +
-					'<td><div>' + result.data[0].drp3 + '</div></td>' +
-					'<td><div>' + result.data[0].drp6 + '</div></td>' +
-					'<td><div>' + result.data[0].drp12 + '</div></td>' +
-					'<td><div>' + result.data[0].drp24 + '</div></td>' +
-					'<td><div>' + result.data[0].drp48 + '</div></td>' +
-					'<td><div>' + result.data[0].drp72 + '</div></td>' +
-					'</tr>';
-
-				$('#rainTbodyBox').html(contant);
-			}
-		});
-	}
-
-
-	//基础信息---查询
-	function rainBasicShowInfo() {
-		$.ajax({
-			url: "http://www.sw797.com:82/blade-ycreal/stbprpb/selectInfo",
-			type: 'post',
-			async: false,
-			dataType: 'json',
-			jsonp: 'callback',
-			jsonpCallback: 'data',
-			data: {
-				'code': code
-			},
-			success: function (result) {
-				var html = '<li>' +
-					'<span>测站编码:</span>' +
-					'<div>' + code + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>测站名称:</span>' +
-					'<div>' + result.data[0].stnm + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>测站类别:</span>' +
-					'<div>' + result.data[0].sttp + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>报讯等级:</span>' +
-					'<div>' + result.data[0].frgrd + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>基面名称:</span>' +
-					'<div>' + result.data[0].atcunit + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>管理单位:</span>' +
-					'<div>' + result.data[0].locality + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>所在县:</span>' +
-					'<div>' + result.data[0].addvcd5 + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>流域名称:</span>' +
-					'<div>' + result.data[0].bsnm + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>水系:</span>' +
-					'<div>' + result.data[0].hnnm + '</div>' +
-					'</li>' +
-					'<li>' +
-					'<span>河名:</span>' +
-					'<div>' + result.data[0].rvnm + '</div>' +
-					'</li>';
-
-				$('#rainInfo').html(html);
-			}
-		});
-	}
-
-
-
-	$('.rain-menu ul li').click(function () {
-		$(this).addClass('on').siblings().removeClass('on');
-		$('.rain-box .river-con').eq($(this).index()).show().siblings().hide();
-	});
-
-});
\ No newline at end of file
diff --git a/widgets/Layermanagement/popup/js/river.js b/widgets/Layermanagement/popup/js/river.js
deleted file mode 100644
index 97d2fda..0000000
--- a/widgets/Layermanagement/popup/js/river.js
+++ /dev/null
@@ -1,756 +0,0 @@
-$(function () {
-    // div 下面的快速查询
-    $('.input_in input').val('快速查询');
-
-    //	var code = '62304700';
-
-
-    // 截取 url 地址参数code的值
-    var code = GetQueryString("id");
-
-    var d = new Date();
-    var str = d.getFullYear() + "-" + (d.getMonth() + 1 < 10 ? '0' + (d.getMonth() + 1) : d.getMonth() + 1) + "-" + (d.getDate() < 10 ? '0' + d.getDate() : d.getDate()) + " "
-        + (d.getHours() + 1 < 10 ? '0' + (d.getHours() + 1) : (d.getHours() + 1)) + ":00:00";
-    var str_zr = d.getFullYear() + "-" + (d.getMonth() + 1 < 10 ? '0' + (d.getMonth() + 1) : d.getMonth() + 1) + "-" + d.getDate();
-    var qz = new Date(getDate(Date.parse(new Date()) - 86400000 * 5));
-    var qzstr = qz.getFullYear() + "-" + (qz.getMonth() + 1 < 10 ? '0' + (qz.getMonth() + 1) : qz.getMonth() + 1) + "-" + (qz.getDate() < 10 ? '0' + qz.getDate() : qz.getDate()) + " 00:00:00";
-    var qzstr_zr = qz.getFullYear() + "-" + (qz.getMonth() + 1 < 10 ? '0' + (qz.getMonth() + 1) : qz.getMonth() + 1) + "-" + qz.getDate();
-
-    // 4个控制时间
-    $('#inpstart_zr').val(qzstr_zr);
-    $('#inpend_zr').val(str_zr);
-    $('#timestart').val(qzstr);
-    $('#timeend').val(str);
-
-    //  开始时间
-    var startTime = qzstr;
-    // 结束时间
-    var endTime = str;
-
-    // 八时开始
-    var eightstartTime = qzstr_zr;
-    var eightendTime = str_zr;
-
-    var option_sw = {};
-    var option_bs = {};
-
-    //水位过程
-    $('#riverBtnOne').click(function () {
-        recharts();
-        $('.load-box-list').show();
-        $('.input_in input').val('快速查询');
-        showPie(startTime, endTime);
-        $('#riverSel').hide();
-        $('#eightRiverSel').hide();
-
-    });
-
-    function recharts() {
-        var width = $(window).width() * 0.53;
-        var height = ($(window).height() - 50) - 80;
-
-        // 获取ID
-        var chartPie = document.getElementById('riverPei');
-        var myChartPie = echarts.init(chartPie);
-        var resize = {
-            width: width,
-            height: height
-        }
-        myChartPie.resize(resize);
-    }
-
-    //八时水位
-    $('#riverBtnTwo').click(function () {
-        recharts_z();
-        $('.load-box-list').show();
-        $('.input_in input').val('快速查询');
-        eightShowPie(eightstartTime, eightendTime);
-        $('#riverSel').hide();
-        $('#eightRiverSel').hide();
-
-
-    });
-
-    function recharts_z() {
-        var width = $(window).width() * 0.53;
-        var height = ($(window).height() - 50) - 80;
-
-        $("#eigthRiverWeater").empty();
-        $("#eigthRiverWeater").removeAttr("_echarts_instance_").empty();
-        var chartPie = document.getElementById('eigthRiverWeater');
-        var myChartPie = echarts.init(chartPie);
-        var resize = {
-            width: width,
-            height: height
-        }
-        myChartPie.resize(resize);
-    }
-
-    window.onresize = function () {
-
-        var width = $(window).width() * 0.53;
-        var height = ($(window).height() - 50) - 80;
-
-        $(".river-tab").height(height);
-        // 获取ID
-        var chartPie_1 = document.getElementById('riverPei');
-        var chartPie_2 = document.getElementById('eigthRiverWeater');
-        // echarts初始化
-        var myChartPie_1 = echarts.init(chartPie_1);
-        var myChartPie_2 = echarts.init(chartPie_2);
-        var resize = {
-            width: width,
-            height: height
-        }
-        myChartPie_1.resize(resize);
-        myChartPie_2.resize(resize);
-    };
-    //预报水情信息
-    $('#riverBtnOne').click(function () {
-        $('.input_in input').val('快速查询');
-    });
-    //基础信息
-    $('#riverBtnFou').click(function () {
-        $('.input_in input').val('快速查询');
-        $('#riverSel').hide();
-        $('#eightRiverSel').hide();
-        basicShowInfo();
-    });
-
-    function getDate(timestamp) {
-        let d = new Date(timestamp);// 时间戳为10位需*1000,时间戳为13位的话不需乘1000
-        let yyyy = d.getFullYear() + '-';
-        let MM = (d.getMonth() + 1 < 10 ? '0' + (d.getMonth() + 1) : d.getMonth() + 1) + '-';
-        let dd = (d.getDate() < 10 ? '0' + d.getDate() : d.getDate()) + ' ';
-        let HH = d.getHours() + ':';
-        let mm = d.getMinutes() + ':';
-        let ss = d.getSeconds();
-        return yyyy + MM + dd + HH + mm + ss;
-    }
-
-    function GetQueryString(name) {
-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-        var r = window.location.search.substr(1).match(reg);
-        if (r != null) return unescape(r[2]);
-        return null;
-    }
-
-    setTimeout(function () {
-        $('.load-box-list').show();
-        showPie(startTime, endTime);
-    }, 200);
-
-    $('.input_in input').click(function () {
-        $('#riverSel').toggle();
-        $('#eightRiverSel').toggle();
-    })
-
-    //水位过程-----快速查询
-    $('#riverSel ul li').click(function () {
-        $('.load-box-list').show();
-        $('#riverSel').hide();
-        var checkTime = $(this).attr('data');
-        var curr = new Date();
-        var currDataD = curr.getFullYear(); // 获取完整的年份 4位数
-        var currDataM = curr.getMonth() + 1; // 获取当前月份,0是1月,所以+1
-        var currDataR = curr.getDate(); // 获取当前日,1-31日
-        var currDataH = curr.getHours(); // 获取当前小时数0-23
-        // 结束时间
-        var currAllTime = currDataD + '-' + currDataM + '-' + currDataR + ' ' + (currDataH + 1) + ':00:00';
-        var data = '';
-        var dataD = '';
-        var dataM = '';
-        var dataR = '';
-        var dataH = '';
-        var allDataTime = '';
-        if (checkTime == '12') {
-            data = new Date(new Date() - 12 * 60 * 60 * 1000);
-            $('.input_in input').val('最近12小时');
-        } else if (checkTime == '24') {
-            data = new Date(new Date() - 24 * 60 * 60 * 1000);
-            $('.input_in input').val('最近24小时');
-        } else if (checkTime == '36') {
-            data = new Date(new Date() - 36 * 60 * 60 * 1000);
-            $('.input_in input').val('最近36小时');
-        } else if (checkTime == '72') {
-            data = new Date(new Date() - 72 * 60 * 60 * 1000);
-            $('.input_in input').val('最近72小时');
-        }
-        dataD = data.getFullYear();
-        dataM = data.getMonth() + 1;
-        dataR = data.getDate();
-        dataH = data.getHours();
-        // 开始时间
-        allDataTime = dataD + '-' + dataM + '-' + dataR + ' ' + (dataH + 1) + ':00:00';
-        $('#timestart').val(allDataTime);
-        $('#timeend').val(currAllTime);
-        showPie(allDataTime, currAllTime);
-    });
-
-
-    //水位过程------时间查询
-    $('#riverBtn').click(function () {
-
-        $('.load-box-list').show();
-        $('.input_in input').val('快速查询');
-        // 开始时间获取
-        startTime = $("#timestart").val();
-        // 结束时间获取
-        endTime = $("#timeend").val();
-        // 调用方法,传参数, 开始 于 结束
-        showPie(startTime, endTime);
-    });
-
-    // 时间查询方法
-    function showPie(startTime, endTime) {
-        // 接受参数,发送ajax请求
-        $.ajax({
-            url: "http://www.sw797.com:82/blade-ycreal/riverr/selectStation",
-            type: 'post',
-            dataType: 'json',
-            jsonp: 'callback',
-            jsonpCallback: 'data',
-            data: {
-                'code': code,
-                'dateBegin': startTime,
-                'dateEnd': endTime
-            },
-            success: function (result) {
-                debugger
-                var result = result.data;
-
-                var maxY = Number(result.maxWater);
-                var yadd = 0;
-                yadd = Math.ceil(parseFloat(result.wrz).toFixed(2) - maxY);
-                if (isNaN(yadd)) {
-                    yadd = 0;
-                }
-                var minY = result.minWater;
-                var intervalY;
-                var difference = (maxY + yadd) - minY;
-
-                if (difference / 15 < 0.1) {
-                    intervalY = 0.1;
-                } else if (difference / 15 < 0.2) {
-                    intervalY = 0.2;
-                } else if (difference / 15 < 0.4) {
-                    intervalY = 0.4;
-                } else if (difference) {
-                    intervalY = 0.5;
-                }
-
-                var maxQY = result.maxQ;
-                var minQY = result.minQ;
-
-
-                // 回调函数,接受数据
-                var q = '';
-                var dataName = [];
-                var dataL = [];
-                var dataZ = [];
-                var contant = '';
-                for (var i = 0; i < result.data.length; i++) {
-                    var time = result.data[i].tm;
-                    var timesub = time.substr(5, 11);
-                    var timetab = time.substr(5, 11);
-                    var wptn_val = result.data[i].wptn;
-
-                    if (wptn_val == '4') {
-                        var wptn = '↓';
-                        var color1 = 0;
-                        var color2 = 128;
-                        var color3 = 0;
-                    } else if (wptn_val == '5') {
-                        var wptn = '↑';
-                        var color1 = 255;
-                        var color2 = 0;
-                        var color3 = 0;
-                    } else if (wptn_val == '6') {
-                        var wptn = '-';
-                        var color1 = 0;
-                        var color2 = 0;
-                        var color3 = 255;
-                    }
-
-                    dataName.push(timesub);
-
-                    dataZ.push(result.data[i].z);
-                    if (result.data[i].q == null || result.data[i].q == -1) {
-                        q = '/';
-                    } else {
-                        q = result.data[i].q;
-                    }
-
-                    dataL.push(q);
-                    contant += '<tr>' +
-                        '<td><div>' + (i + 1) + '</div></td>' +
-                        '<td><div>' + timetab + '</div></td>' +
-                        '<td><div>' + result.data[i].z + '</div></td>' +
-                        "<td><div style='text-align:center'><span style='color: rgb(" + color1 + ", " + color2 + ", " + color3 + ")'>" + wptn + "</span></div></td>" +
-                        '<td><div>' + q + '</div></td>' +
-                        '</tr>';
-                }
-                $('#riverTable').html(contant);
-
-
-                // echarts 需要
-                option_sw = {
-                    title: {
-                        text: '实时水情',
-                        left: 'center',
-                        top: '15px'
-                    },
-                    tooltip: {
-                        trigger: 'axis'
-                    },
-                    legend: {
-                        bottom: '0px',
-                        left: 'center',
-                        data: ['水位', '流量']
-                    },
-                    xAxis: [{
-                        type: 'category',
-                        splitLine: {
-                            show: false
-                        },
-                        data: dataName,
-                        inverse: true,
-                        boundaryGap: false,
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                color: "#000"
-                            }
-                        },
-                    }],
-                    grid: {
-                        left: '3%',
-                        right: '4%',
-                        bottom: '8%',
-                        containLabel: true
-                    },
-                };
-                if (dataL[0] != "/") {
-                    option_sw.series = [{
-                        name: '水位',
-                        type: 'line',
-                        data: dataZ,
-                        markLine : {   //添加警戒线
-                            symbol:"none",               //去掉警戒线最后面的箭头
-                            name:"警戒线",
-                            silent:true,
-                            label:{
-                                position:"middle",         //将警示值放在哪个位置,三个值“start”,"middle","end"  开始  中点 结束
-                                color:"red",
-                                fontSize:14
-                            },
-                            data : [{
-                                silent:true,             //鼠标悬停事件  true没有,false有
-                                lineStyle:{               //警戒线的样式  ,虚实  颜色
-                                    type:"solid",
-                                    color:"red"
-                                },
-                                name: '警戒线',
-                                yAxis: result.wrz
-                            }]
-                        }
-                    },
-                        {
-                            name: '流量',
-                            type: 'line',
-                            data: dataL,
-                            yAxisIndex: 1,
-                        }
-                    ];
-                    option_sw.yAxis = [{
-                        type: 'value',
-                        name: '水位(m)',
-                        min: minY,
-                        max: maxY + yadd,
-                        tickInterval: intervalY, // 固定间隔
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                        axisLabel: {
-                            formatter: function (value) {
-                                return value.toFixed(2);
-                            }
-                        },
-                    }, {
-                        type: 'value',
-                        name: '流量(m³/s)',
-                        min: minQY,
-                        max: maxQY,
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        }
-                    }
-                    ];
-                } else {
-                    option_sw.series = [{
-                        name: '水位',
-                        type: 'line',
-                        data: dataZ,
-                        markLine : {   //添加警戒线
-                            symbol:"none",               //去掉警戒线最后面的箭头
-                            name:"警戒线",
-                            silent:true,
-                            label:{
-                                position:"middle",         //将警示值放在哪个位置,三个值“start”,"middle","end"  开始  中点 结束
-                                color:"red",
-                                fontSize:14
-                            },
-                            data : [{
-                                silent:true,             //鼠标悬停事件  true没有,false有
-                                lineStyle:{               //警戒线的样式  ,虚实  颜色
-                                    type:"solid",
-                                    color:"red"
-                                },
-                                name: '警戒线',
-                                yAxis: result.wrz
-                            }]
-                        }
-                    }
-                    ];
-                    option_sw.yAxis = [{
-                        type: 'value',
-                        name: '水位(m)',
-                        min: minY,
-                        max: maxY + yadd,
-                        tickInterval: intervalY, // 固定间隔
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                        axisLabel: {
-                            formatter: function (value) {
-                                return value.toFixed(2);
-                            }
-                        },
-                    }
-                    ];
-                }
-
-                // 获取ID
-                var chartPie = document.getElementById('riverPei');
-                // echarts初始化
-                var myChartPie = echarts.init(chartPie);
-                myChartPie.setOption(option_sw, true);
-                $('.load-box-list').hide();
-            }
-        });
-    }
-
-    //八时水位------时间查询
-    $('#eigthRiverBtn').click(function () {
-        $('.load-box-list').show();
-        $('.input_in input').val('快速查询');
-        eightstartTime = $("#inpstart_zr").val();
-        eightendTime = $("#inpend_zr").val();
-        eightShowPie(eightstartTime, eightendTime);
-    });
-
-    //八时水位------快速查询
-    $('#eightRiverSel ul li').click(function () {
-        $('.load-box-list').show();
-        $('#eightRiverSel').hide();
-        var checkTime = $(this).attr('data');
-        var eightstartTime = '';
-        var eightendTime = '';
-        var Nowdate = new Date();
-        var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
-        if (checkTime == '本月') {
-            $('.input_in input').val('本月');
-            M = Number(MonthFirstDay.getMonth()) + 1
-            eightstartTime = MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
-            var MonthNextFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth() + 1, 1);
-            var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
-            M = Number(MonthLastDay.getMonth()) + 1
-            eightendTime = MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
-        } else if (checkTime == '上月') {
-            $('.input_in input').val('上月');
-            M = Number(MonthFirstDay.getMonth())
-            eightstartTime = MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
-            var MonthNextFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
-            var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
-            M = Number(MonthLastDay.getMonth() + 1)
-            eightendTime = MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
-        }
-
-        // 时间回填
-        $('#inpstart_zr').val(eightstartTime);
-        $('#inpend_zr').val(eightendTime);
-
-
-        eightShowPie(eightstartTime, eightendTime);
-    });
-
-    function eightShowPie(eightstartTime, eightendTime) {
-        if (eightstartTime == '' && eightendTime == '') {
-            var Nowdate = new Date();
-            var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
-            M = Number(MonthFirstDay.getMonth()) + 1
-            eightstartTime = MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
-            var MonthNextFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth() + 1, 1);
-            var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
-            M = Number(MonthLastDay.getMonth()) + 1
-            eightendTime = MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
-        }
-        $.ajax({
-            url: "http://www.sw797.com:82/blade-ycreal/riverr/selectDayList",
-            type: 'post',
-            dataType: 'json',
-            jsonp: 'callback',
-            jsonpCallback: 'data',
-            data: {
-                'code': code,
-                'dateBegin': eightstartTime + " 00:00:00",
-                'dateEnd': eightendTime + " 23:59:59"
-            },
-            success: function (result) {
-                var q = '';
-                var dataName = [];
-                var dataZ = [];
-                var dataL = [];
-                var contant = '';
-                for (var i = 0; i < result.data.length; i++) {
-                    var time = result.data[i].tm;
-                    var timesub = time.substr(5, 11);
-                    var timetab = time.substr(5, 11);
-                    dataName.push(timesub);
-
-                    var wptn_val = result.data[i].wptn;
-
-                    if (wptn_val == '4') {
-                        var wptn = '↓';
-                        var color1 = 0;
-                        var color2 = 128;
-                        var color3 = 0;
-                    } else if (wptn_val == '5') {
-                        var wptn = '↑';
-                        var color1 = 255;
-                        var color2 = 0;
-                        var color3 = 0;
-                    } else if (wptn_val == '6') {
-                        var wptn = '-';
-                        var color1 = 0;
-                        var color2 = 0;
-                        var color3 = 255;
-                    }
-
-                    dataZ.push(result.data[i].z);
-
-                    if (result.data[i].q == null || result.data[i].q == -1) {
-                        q = '/';
-                    } else {
-                        q = result.data[i].q;
-                    }
-                    dataL.push(q);
-
-                    contant += '<tr>' +
-                        '<td><div>' + (i + 1) + '</div></td>' +
-                        '<td><div>' + timetab + '</div></td>' +
-                        '<td><div>' + result.data[i].z + '</div></td>' +
-                        "<td><div style='text-align:center'><span style='color: rgb(" + color1 + ", " + color2 + ", " + color3 + ")'>" + wptn + "</span></div></td>" +
-                        '<td><div>' + q + '</div></td>' +
-                        '</tr>';
-                }
-
-                $('#eigthRiverTable').html(contant);
-
-
-                // echarts 数据需要
-                option_bs = {
-                    title: {
-                        text: '逐日八时',
-                        left: 'center',
-                        top: '15px'
-                    },
-                    tooltip: {
-                        trigger: 'axis'
-                    },
-                    legend: {
-                        bottom: '0px',
-                        left: 'center',
-                        data: ['水位', '流量']
-                    },
-                    xAxis: [{
-                        type: 'category',
-                        splitLine: {
-                            show: false
-                        },
-                        data: dataName,
-                        boundaryGap: false,
-                        inverse: true,
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                color: "#000"
-                            }
-                        },
-                    }],
-                    grid: {
-                        left: '3%',
-                        right: '4%',
-                        bottom: '8%',
-                        containLabel: true
-                    }
-                };
-
-                if (dataL[0] != "/") {
-                    option_bs.series = [{
-                        name: '水位',
-                        type: 'line',
-                        data: dataZ,
-                    },
-                        {
-                            name: '流量',
-                            type: 'line',
-                            data: dataL,
-                            yAxisIndex: 1,
-                        }
-                    ];
-                    option_bs.yAxis = [{
-                        type: 'value',
-                        name: '水位(m)',
-                        scale: true,
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                    }, {
-                        type: 'value',
-                        name: '流量(m³/s)',
-                        scale: true,
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                    }
-                    ];
-                } else {
-                    option_bs.series = [{
-                        name: '水位',
-                        type: 'line',
-                        data: dataZ
-                    }
-                    ];
-                    option_bs.yAxis = [{
-                        type: 'value',
-                        name: '水位(m)',
-                        scale: true,
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                    }
-                    ];
-                }
-
-
-                var chartPie = document.getElementById('eigthRiverWeater');
-                var myChartPie = echarts.init(chartPie);
-                myChartPie.setOption(option_bs, true);
-                $('.load-box-list').hide();
-            }
-        });
-    }
-
-    //基础信息---查询
-    function basicShowInfo() {
-        $.ajax({
-            url: "http://www.sw797.com:82/blade-ycreal/stbprpb/selectInfo",
-            type: 'post',
-            async: false,
-            dataType: 'json',
-            jsonp: 'callback',
-            jsonpCallback: 'data',
-            data: {
-                'code': code
-            },
-            success: function (result) {
-                var html = '<li>' +
-                    '<span>测站编码:</span>' +
-                    '<div>' + code + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>测站名称:</span>' +
-                    '<div>' + result.data[0].stnm + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>测站类别:</span>' +
-                    '<div>' + result.data[0].sttp + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>报讯等级:</span>' +
-                    '<div>' + result.data[0].frgrd + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>基面名称:</span>' +
-                    '<div>' + result.data[0].atcunit + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>管理单位:</span>' +
-                    '<div>' + result.data[0].locality + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>所在县:</span>' +
-                    '<div>' + result.data[0].addvcd5 + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>流域名称:</span>' +
-                    '<div>' + result.data[0].bsnm + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>水系:</span>' +
-                    '<div>' + result.data[0].hnnm + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>河名:</span>' +
-                    '<div>' + result.data[0].rvnm + '</div>' +
-                    '</li>';
-
-                $('#riverInfo').html(html);
-            }
-        });
-    }
-
-    $('.river-menu ul li').click(function () {
-        $(this).addClass('on').siblings().removeClass('on');
-        $('.river-box .river-con').eq($(this).index()).show().siblings().hide();
-    });
-
-    $("#loc_smx").click(function () {
-        //注意:parent 是 JS 自带的全局对象,可用于操作父页面
-        var index = parent.layer.getFrameIndex("Location"); //获取窗口索引
-        window.parent.$('#loc_openWin').click();
-        parent.layer.close(index);
-    });
-
-});
diff --git a/widgets/Layermanagement/popup/js/start.js b/widgets/Layermanagement/popup/js/start.js
deleted file mode 100644
index 40820e7..0000000
--- a/widgets/Layermanagement/popup/js/start.js
+++ /dev/null
@@ -1,13 +0,0 @@
-$(function () {
-    laydate.render({
-        elem: '#timestart', //指定元素
-        type: 'datetime'
-    });
-    laydate.render({
-        elem: '#inpstart' //指定元素
-        ,type: 'datetime'
-    });
-    laydate.render({
-        elem: '#inpstart_zr' //指定元素
-    });
-})
\ No newline at end of file
diff --git a/widgets/Layermanagement/popup/js/weather.js b/widgets/Layermanagement/popup/js/weather.js
deleted file mode 100644
index 7e5d189..0000000
--- a/widgets/Layermanagement/popup/js/weather.js
+++ /dev/null
@@ -1,610 +0,0 @@
-$(function () {
-
-    $('.close').click(function () {
-        window.parent.$('#infoWindow_pup').hide();
-        window.parent.$('#infoWindow_pup').attr('src', '');
-    });
-    $('.input_in input').val('快速查询');
-
-    var code = GetQueryString("id");
-
-    var d = new Date();
-    var str = d.getFullYear() + "-" + (d.getMonth() + 1 < 10 ? '0' + (d.getMonth() + 1) : d.getMonth() + 1) + "-" + (d.getDate() < 10 ? '0' + d.getDate() : d.getDate()) + " "
-        + (d.getHours() + 1 < 10 ? '0' + (d.getHours() + 1) : (d.getHours() + 1)) + ":00:00";
-    var str_zr = d.getFullYear() + "-" + (d.getMonth() + 1 < 10 ? '0' + (d.getMonth() + 1) : d.getMonth() + 1) + "-" + d.getDate();
-    var qz = new Date(getDate(Date.parse(new Date()) - 86400000 * 5));
-    var qzstr = qz.getFullYear() + "-" + (qz.getMonth() + 1 < 10 ? '0' + (qz.getMonth() + 1) : qz.getMonth() + 1) + "-" + (qz.getDate() < 10 ? '0' + qz.getDate() : qz.getDate()) + " 00:00:00";
-    var qzstr_zr = qz.getFullYear() + "-" + (qz.getMonth() + 1 < 10 ? '0' + (qz.getMonth() + 1) : qz.getMonth() + 1) + "-" + qz.getDate();
-
-    // 4个控制时间
-    $('#inpstart_zr').val(qzstr_zr);
-    $('#inpend_zr').val(str_zr);
-    $('#timestart').val(qzstr);
-    $('#timeend').val(str);
-
-    var startTime = qzstr;
-    var endTime = str;
-    var rainstartTime = qzstr_zr;
-    var rainendTime = str_zr;
-
-    function GetQueryString(name) {
-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-        var r = window.location.search.substr(1).match(reg);
-        if (r != null) return unescape(r[2]);
-        return null;
-    }
-
-    function getDate(timestamp) {
-        let d = new Date(timestamp);// 时间戳为10位需*1000,时间戳为13位的话不需乘1000
-        let yyyy = d.getFullYear() + '-';
-        let MM = (d.getMonth() + 1 < 10 ? '0' + (d.getMonth() + 1) : d.getMonth() + 1) + '-';
-        let dd = d.getDate() + ' ';
-        let HH = d.getHours() + ':';
-        let mm = d.getMinutes() + ':';
-        let ss = d.getSeconds();
-        return yyyy + MM + dd + HH + mm + ss;
-    }
-
-    setTimeout(function () {
-        $('.load-box-list').show();
-        reseShowPie(startTime, endTime);
-    }, 200);
-
-    $('.input_in input').click(function () {
-        // $('#riverSel').show();
-        $('#restSel').toggle();
-        $('#restRiverSelBox').toggle();
-    })
-
-    //水位过程
-    $('#reseBtnOne').click(function () {
-        $('.load-box-list').show();
-        $('#restSel').hide();
-        $('#restRiverSelBox').hide();
-        $('.input_in input').val('快速查询');
-        reseShowPie(startTime, endTime);
-        $('#restSel').hide();
-        $('#restRiverSelBox').hide();
-    });
-    //八时水位
-    $('#reseBtnTwo').click(function () {
-        $('.load-box-list').show();
-        $('.input_in input').val('快速查询');
-        dailyReseShowPie(rainstartTime, rainendTime);
-        $('#restSel').hide();
-        $('#restRiverSelBox').hide();
-    });
-
-    function recharts_z() {
-        var width = $(window).width() * 0.53;
-        var height = ($(window).height() - 50) - 80;
-
-        var chartPie = document.getElementById('rserWeaterPie');
-        var myChartPie = echarts.init(chartPie);
-        var resize = {
-            width: width,
-            height: height
-        }
-        myChartPie.resize(resize);
-    }
-
-    function recharts() {
-        var width = $(window).width() * 0.53;
-        var height = ($(window).height() - 50) - 80;
-
-        // 获取ID
-        var chartPie = document.getElementById('resePei');
-        var myChartPie = echarts.init(chartPie);
-        var resize = {
-            width: width,
-            height: height
-        }
-        myChartPie.resize(resize);
-    }
-
-    window.onresize = function () {
-
-        var width = $(window).width() * 0.53;
-        var height = ($(window).height() - 50) - 80;
-
-        $(".river-tab").height(height);
-        // 获取ID
-        var chartPie_1 = document.getElementById('resePei');
-        var chartPie_2 = document.getElementById('rserWeaterPie');
-        // echarts初始化
-        var myChartPie_1 = echarts.init(chartPie_1);
-        var myChartPie_2 = echarts.init(chartPie_2);
-        var resize = {
-            width: width,
-            height: height
-        }
-        myChartPie_1.resize(resize);
-        myChartPie_2.resize(resize);
-    };
-
-
-    //基础信息
-    $('#reseBtnThr').click(function () {
-        $('.input_in input').val('快速查询');
-        reseBasicShowInfo();
-        $('#restSel').hide();
-        $('#restRiverSelBox').hide();
-    });
-
-    $('#restSel ul li').click(function () {
-        $('.load-box-list').show();
-        $('#restSel').hide();
-        var checkTime = $(this).attr('data');
-        var curr = new Date();
-        var currDataD = curr.getFullYear();
-        var currDataM = curr.getMonth() + 1;
-        var currDataR = curr.getDate();
-        var currDataH = curr.getHours();
-        var currDataDd = curr.getMinutes(); // 获取分钟数
-        var currAllTime = currDataD + '-' + currDataM + '-' + currDataR + ' ' + (currDataH + 1) + ':00:00';
-        var data = '';
-        var dataD = '';
-        var dataM = '';
-        var dataR = '';
-        var dataH = '';
-        var dataDd = '';
-        var allDataTime = '';
-        if (checkTime == '12') {
-            data = new Date(new Date() - 12 * 60 * 60 * 1000);
-            $('.input_in input').val('最近12小时');
-        } else if (checkTime == '24') {
-            data = new Date(new Date() - 24 * 60 * 60 * 1000);
-            $('.input_in input').val('最近24小时');
-        } else if (checkTime == '36') {
-            data = new Date(new Date() - 36 * 60 * 60 * 1000);
-            $('.input_in input').val('最近36小时');
-        } else if (checkTime == '72') {
-            data = new Date(new Date() - 72 * 60 * 60 * 1000);
-            $('.input_in input').val('最近72小时');
-        }
-        dataD = data.getFullYear();
-        dataM = data.getMonth() + 1;
-        dataR = data.getDate();
-        dataH = data.getHours();
-        dataDd = data.getMinutes();
-        allDataTime = dataD + '-' + dataM + '-' + dataR + ' ' + (dataH + 1) + ':00:00';
-        $('#timestart').val(allDataTime);
-        $('#timeend').val(currAllTime);
-        reseShowPie(allDataTime, currAllTime);
-    });
-
-    //水位过程------时间查询
-    $('#restRiverBtn').click(function () {
-        $('.load-box-list').show();
-        $('.input_in input').val('快速查询');
-        startTime = $("#timestart").val();
-        endTime = $("#timeend").val();
-        reseShowPie(startTime, endTime);
-    });
-
-    function reseShowPie(startTime, endTime) {
-        $.ajax({
-            url: "http://www.sw797.com:82/blade-ycreal/rsvrr/selectRsvrList",
-            type: 'post',
-            dataType: 'json',
-            jsonp: 'callback',
-            jsonpCallback: 'data',
-            data: {
-                'code': code,
-                'dateBegin': startTime,
-                'dateEnd': endTime
-            },
-            success: function (result) {
-                var result = result.data;
-
-                var maxY = Number(result.maxWater);
-                var yadd = 0;
-                yadd = Math.ceil(parseFloat(result.wrz).toFixed(2) - maxY);
-                if (isNaN(yadd)) {
-                    yadd = 0;
-                }
-                var minY = result.minWater;
-                var intervalY;
-                var difference = (maxY + yadd) - minY;
-                if (difference / 15 < 0.1) {
-                    intervalY = 0.1;
-                } else if (difference / 15 < 0.2) {
-                    intervalY = 0.2;
-                } else if (difference / 15 < 0.4) {
-                    intervalY = 0.4;
-                } else if (difference) {
-                    intervalY = 0.5;
-                }
-
-                var maxQY = result.maxQ;
-                var minQY = result.minQ;
-
-
-                var q = '';
-                var dataName = [];
-                var dataZ = [];
-                var dataL = [];
-                var dataX = [];
-                var contant = '';
-                for (var i = 0; i < result.data.length; i++) {
-                    var time = result.data[i].tm;
-                    var timesub = time.substr(5, 11);
-
-                    var wptn_val = result.data[i].rwptn;
-                    if (wptn_val == '4') {
-                        var wptn = '↓';
-                        var color1 = 0;
-                        var color2 = 128;
-                        var color3 = 0;
-                    } else if (wptn_val == '5') {
-                        var wptn = '↑';
-                        var color1 = 255;
-                        var color2 = 0;
-                        var color3 = 0;
-                    } else if (wptn_val == '6' || !wptn_val) {
-                        var wptn = '-';
-                        var color1 = 0;
-                        var color2 = 0;
-                        var color3 = 255;
-                    }
-                    if (result.data[i].w == -1) {
-                        result.data[i].w = 0;
-                    }
-                    dataName.push(timesub);
-                    dataZ.push(result.data[i].rz);
-                    dataL.push(result.data[i].w);
-                    dataX.push(result.data[i].fsltdz);
-                    contant += '<tr>' +
-                        '<td><div>' + (i + 1) + '</div></td>' +
-                        '<td><div>' + timesub + '</div></td>' +
-                        '<td><div>' + result.data[i].rz + '</div></td>' +
-                        "<td><div style='text-align:center'><span style='color: rgb(" + color1 + ", " + color2 + ", " + color3 + ")'>" + wptn + "</span></div></td>" +
-                        '<td><div>' + result.data[i].w + '</div></td>' +
-                        '</tr>';
-                }
-                $('#reseTable').html(contant);
-
-                var option = {
-                    title: {
-                        text: '实时水情',
-                        left: 'center',
-                        top: '15px'
-                    },
-                    tooltip: {
-                        trigger: 'axis'
-                    },
-                    legend: {
-                        bottom: '0px',
-                        left: 'center',
-                        data: ['水位', '蓄水量']
-                    },
-                    xAxis: [{
-                        type: 'category',
-                        splitLine: {
-                            show: false
-                        },
-                        data: dataName,
-                        inverse: true,
-                        boundaryGap: false,
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                color: "#000"
-                            }
-                        },
-                    }],
-                    grid: {
-                        left: '3%',
-                        right: '4%',
-                        bottom: '8%',
-                        containLabel: true
-                    },
-                    yAxis: [{
-                        type: 'value',
-                        scale: true,
-                        name: '水位(m)',
-                        min: minY,
-                        max: maxY + yadd,
-                        tickInterval: intervalY, // 固定间隔
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                        axisLabel: {
-                            formatter: function (value) {
-                                return value.toFixed(2);
-                            }
-                        },
-                    }, {
-                        type: 'value',
-                        scale: true,
-                        name: '蓄水量(m³)',
-                        min: minQY,
-                        max: maxQY,
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                    }
-
-                    ],
-                    series: [{
-                        name: '水位',
-                        type: 'line',
-                        data: dataZ,
-                        markLine: {   //添加警戒线
-                            symbol: "none",               //去掉警戒线最后面的箭头
-                            name: "警戒线",
-                            silent: true,
-                            label: {
-                                position: "middle",         //将警示值放在哪个位置,三个值“start”,"middle","end"  开始  中点 结束
-                                color: "red",
-                                fontSize: 14
-                            },
-                            data: [{
-                                silent: true,             //鼠标悬停事件  true没有,false有
-                                lineStyle: {               //警戒线的样式  ,虚实  颜色
-                                    type: "solid",
-                                    color: "red"
-                                },
-                                name: '警戒线',
-                                yAxis: result.wrz
-                            }]
-                        }
-                    },
-                        {
-                            name: '蓄水量',
-                            type: 'line',
-                            data: dataL,
-                            yAxisIndex: 1,
-                        }
-                    ]
-                };
-                var chartPie = document.getElementById('resePei');
-                var myChartPie = echarts.init(chartPie);
-                myChartPie.setOption(option, true);
-                $('.load-box-list').hide();
-            }
-        });
-    }
-
-    //八时水位------时间查询
-    $('#restriverBtn_bs').click(function () {
-        $('.load-box-list').show();
-        $('.input_in input').val('快速查询');
-        eightstartTime = $("#inpstart_zr").val();
-        eightendTime = $("#inpend_zr").val();
-        dailyReseShowPie(eightstartTime, eightendTime);
-    });
-
-    //八时水位------快速查询
-    $('#restRiverSelBox ul li').click(function () {
-        $('.load-box-list').show();
-        $('#restRiverSelBox').hide();
-        var checkTime = $(this).attr('data');
-        var eightstartTime = '';
-        var eightendTime = '';
-        var Nowdate = new Date();
-        var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
-        if (checkTime == '本月') {
-            $('.input_in input').val('本月');
-            M = Number(MonthFirstDay.getMonth()) + 1
-            eightstartTime = MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
-            var MonthNextFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth() + 1, 1);
-            var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
-            M = Number(MonthLastDay.getMonth()) + 1
-            eightendTime = MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
-        } else if (checkTime == '上月') {
-            $('.input_in input').val('上月');
-            M = Number(MonthFirstDay.getMonth())
-            eightstartTime = MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
-            var MonthNextFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
-            var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
-            M = Number(MonthLastDay.getMonth() + 1)
-            eightendTime = MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
-        }
-
-        // 时间回填
-        $('#inpstart_zr').val(eightstartTime);
-        $('#inpend_zr').val(eightendTime);
-        dailyReseShowPie(eightstartTime, eightendTime);
-    });
-
-    function dailyReseShowPie(reseStartTime, reseEndTime) {
-        if (reseStartTime == '' && reseStartTime == '') {
-            var Nowdate = new Date();
-            var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
-            M = Number(MonthFirstDay.getMonth()) + 1
-            reseStartTime = MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
-            var MonthNextFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth() + 1, 1);
-            var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
-            M = Number(MonthLastDay.getMonth()) + 1
-            reseEndTime = MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
-        }
-        $.ajax({
-            url: "http://www.sw797.com:82/blade-ycreal/rsvrr/selectRsvrDayList",
-            type: 'post',
-            dataType: 'json',
-            jsonp: 'callback',
-            jsonpCallback: 'data',
-            data: {
-                'code': code,
-                'dateBegin': reseStartTime + " 00:00:00",
-                'dateEnd': reseEndTime + " 23:59:59"
-            },
-            success: function (result) {
-                var q = '';
-                var dataName = [];
-                var dataZ = [];
-                var dataL = [];
-                var dataX = [];
-                var contant = '';
-                for (var i = 0; i < result.data.length; i++) {
-                    var time = result.data[i].tm;
-                    var timesub = time.substr(5, 11);
-                    dataName.push(timesub);
-                    dataZ.push(result.data[i].rz);
-                    dataL.push(result.data[i].w);
-                    dataX.push(result.data[i].fsltdz);
-                    contant += '<tr>' +
-                        '<td><div>' + (i + 1) + '</div></td>' +
-                        '<td><div>' + timesub + '</div></td>' +
-                        '<td><div>' + result.data[i].rz + '</div></td>' +
-                        '</tr>';
-                }
-                $('#reseTableBox').html(contant);
-                var option = {
-                    title: {
-                        text: '逐日八时',
-                        left: 'center',
-                        top: '15px'
-                    },
-                    tooltip: {
-                        trigger: 'axis'
-                    },
-                    legend: {
-                        bottom: '0px',
-                        left: 'center',
-                        data: ['水位', '蓄水量']
-                    },
-                    xAxis: [{
-                        type: 'category',
-                        splitLine: {
-                            show: false
-                        },
-                        data: dataName,
-                        inverse: true,
-                        boundaryGap: false,
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                color: "#000"
-                            }
-                        },
-                    }],
-                    grid: {
-                        left: '3%',
-                        right: '4%',
-                        bottom: '8%',
-                        containLabel: true
-                    },
-                    yAxis: [{
-                        type: 'value',
-                        scale: true,
-                        name: '水位(m)',
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                    }, {
-                        type: 'value',
-                        scale: true,
-                        name: '水位(m)',
-                        axisLine: {
-                            lineStyle: {
-                                color: '#000',
-                            }
-                        },
-                        splitLine: {
-                            show: true
-                        },
-                    }
-                    ],
-                    series: [{
-                        name: '水位',
-                        type: 'line',
-                        data: dataZ
-                    },
-                        {
-                            name: '蓄水量',
-                            type: 'line',
-                            data: dataL,
-                            yAxisIndex: 1,
-                        }
-                    ]
-                };
-                var chartPie = document.getElementById('rserWeaterPie');
-                var myChartPie = echarts.init(chartPie);
-                myChartPie.setOption(option, true);
-                $('.load-box-list').hide();
-            }
-        });
-    }
-
-    //基础信息---查询
-    function reseBasicShowInfo() {
-        $.ajax({
-            url: "http://www.sw797.com:82/blade-ycreal/stbprpb/selectInfo",
-            type: 'post',
-            async: false,
-            dataType: 'json',
-            jsonp: 'callback',
-            jsonpCallback: 'data',
-            data: {
-                'code': code
-            },
-            success: function (result) {
-
-                var html = '<li>' +
-                    '<span>测站编码:</span>' +
-                    '<div>' + code + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>测站名称:</span>' +
-                    '<div>' + result.data[0].stnm + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>测站类别:</span>' +
-                    '<div>' + result.data[0].sttp + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>报讯等级:</span>' +
-                    '<div>' + result.data[0].frgrd + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>基面名称:</span>' +
-                    '<div>' + result.data[0].atcunit + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>管理单位:</span>' +
-                    '<div>' + result.data[0].locality + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>所在县:</span>' +
-                    '<div>' + result.data[0].addvcd5 + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>流域名称:</span>' +
-                    '<div>' + result.data[0].bsnm + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>水系:</span>' +
-                    '<div>' + result.data[0].hnnm + '</div>' +
-                    '</li>' +
-                    '<li>' +
-                    '<span>河名:</span>' +
-                    '<div>' + result.data[0].rvnm + '</div>' +
-                    '</li>';
-
-                $('#reseInfo').html(html);
-            }
-        });
-    }
-
-    $('.reser-menu ul li').click(function () {
-        $(this).addClass('on').siblings().removeClass('on');
-        $('.reser-box .river-con').eq($(this).index()).show().siblings().hide();
-    });
-});
diff --git a/widgets/Layermanagement/popup/rain.html b/widgets/Layermanagement/popup/rain.html
deleted file mode 100644
index 3bb7272..0000000
--- a/widgets/Layermanagement/popup/rain.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8" />
-	<title>降雨</title>
-	<link rel="stylesheet" href="./css/style.css">
-</head>
-<body>
-	<div class="river-course">
-		<div class="river-top">
-			<div class="rain-menu">
-				<ul>
-					<li class="on" id="rainBtnOne">时段雨量</li>
-					<li id="rainBtnTwo">逐日雨量</li>
-					<li id="rainBtnThr">特征雨量</li>
-					<li id="rainBtnFou">基础信息</li>
-				</ul>
-			</div>
-		</div>
-		<div class="rain-box">
-			<!-- 时段雨量  -->
-			<div class="river-one river-con">
-				<div class="river-box-top">
-					<div class="river-data">
-						<input type="text" class="datainp time-icon" id="timestart" placeholder="开始日期"><span>至</span>
-					 <input type="text" class="datainp time-icon" id="timeend" placeholder="结束日期">
-					</div>
-
-					<div class="selectsd">
-						<div class="input_insd">
-							<input type="text" value="时段" readonly="readonly"/>
-						</div>
-						<div class="city hide" id="RainSd">
-							<ul>
-								<li data="1">1</li>
-								<li data="2">2</li>
-								<li data="3">3</li>
-								<li data="6">6</li>
-							</ul>
-						</div>
-					</div>
-
-					<input type="button" value="查询" class="river-btn" id="riverBtn"/>
-					<div class="select">
-					     <div class="input_in">
-					         <input type="text" value="快速查询" readonly="readonly"/>
-					     </div>
-					     <div class="city hide" id="RainSel">
-					         <ul>
-					             <li data="2">最近2小时</li>
-					             <li data="12">最近12小时</li>
-					             <li data="24">最近24小时</li>
-					             <li data="36">最近36小时</li>
-					             <li data="72">最近72小时</li>
-					         </ul>
-					     </div>
-					 </div>
-				</div>
-				<div class="rain-pei" id="rainPei"></div>
-				<div class="rain-tab">
-					<table class="table-thead rain-thead">
-				        <thead>
-					        <tr>
-					            <th><div>序号</div></th>
-					            <th><div>时间</div></th>
-					            <th><div>雨量(mm)</div></th>
-					            <th><div></div></th>
-					        </tr>
-				        </thead>
-				    </table>
-				    <div class="comTbody">
-				        <table class="table-tbody rain-tbody" style="border-top: 0;">
-				            <tbody id="rainTable">
-				            </tbody>
-				        </table>
-				    </div>
-				</div>
-			</div>
-			<!-- 逐日雨量  -->
-			<div class="river-two none river-con">
-				<div class="river-box-top">
-					<div class="river-data">
-					<input class="datainp time-icon" id="inpstart_zr" type="text" placeholder="开始日期" value="" readonly ><span>至</span><input class="datainp time-icon" id="inpend_zr" type="text" placeholder="结束日期" readonly>
-					</div>
-					<input type="button" value="查询" class="river-btn" id="dailyRainBtn"/>
-					<div class="select">
-					     <div class="input_in">
-					         <input type="text" value="快速查询" readonly="readonly"/>
-					     </div>
-					     <div class="city hide" id="dailyRiverSel">
-					         <ul>
-					             <li data="3">近3天</li>
-					             <li data="7">近7天</li>
-					             <li data="15">近15天</li>
-					         </ul>
-					     </div>
-					 </div>
-				</div>		 
-				<div class="rain-pei" id="dailyPei"></div>
-				<div class="rain-tab">
-					<table class="table-thead rain-thead">
-				        <thead>
-					        <tr>
-					            <th><div>序号</div></th>
-					            <th><div>时间</div></th>
-					            <th><div>雨量(mm)</div></th>
-					            <th><div></div></th>
-					        </tr>
-				        </thead>
-				    </table>
-				    <div class="comTbody">
-				        <table class="table-tbody rain-tbody" style="border-top: 0;">
-				            <tbody id="dailyRainTable">
-				            </tbody>
-				        </table>
-				    </div>
-				</div>	 
-			</div>
-			<!-- 特征雨量  -->
-			<div class="river-thr none river-con">
-				<table class="table-thead rain-thead-box">
-				        <thead>
-					        <tr>
-					            <th><div>序号</div></th>
-					            <th><div>年份/时间</div></th>
-					            <th><div>1小时</div></th>
-					            <th><div>2小时</div></th>
-					            <th><div>3小时</div></th>
-					            <th><div>6小时</div></th>
-					            <th><div>12小时</div></th>
-					            <th><div>24小时</div></th>
-					            <th><div>48小时</div></th>
-					            <th><div>72小时</div></th>
-					            <th><div></div></th>
-					        </tr>
-				        </thead>
-				    </table>
-				    <div class="comTbody">
-				        <table class="table-tbody rain-tbody-box" style="border-top: 0;">
-				            <tbody id="rainTbodyBox">
-				            	
-				            </tbody>
-				        </table>
-				    </div>
-			</div>
-			<!-- 基础信息  -->
-			<div class="river-fou river-con none">
-				<div class="river-fou-box">
-					<ul id="rainInfo">
-					</ul>
-					
-				</div>
-			</div>
-			<div class="load-box-list">
-				<div class="rote-load">
-					<img src="./img/rote.jpg" alt="">
-					<span>正在加载</span>
-				</div>
-			</div>
-		</div>
-	</div>
-    <script src="../../../libs/jquery/jquery-3.3.1.min.js"></script>
-    <script src="../../../libs/echarts/v4/echarts.min.js"></script>
-    <script src="../../../libs/laydate/laydate.js"></script>
-    <script src="./js/rain.js"></script>
-    <script src="./js/start.js"></script>
-    <script src="./js/end.js"></script>
-</body>	
-</html>
diff --git a/widgets/Layermanagement/popup/river.html b/widgets/Layermanagement/popup/river.html
deleted file mode 100644
index e02c7c7..0000000
--- a/widgets/Layermanagement/popup/river.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>河道站</title>
-    <link rel="stylesheet" href="./css/style.css">
-    <link rel="stylesheet" href="">
-</head>
-<body>
-
-    <div class="river-course">
-		<div class="river-top">
-			<div class="river-menu">
-				<ul>
-					<li class="on" id="riverBtnOne">水位过程</li>
-					<li id="riverBtnTwo">八时水位</li>
-					<li id="riverBtnFou">基础信息</li>
-				</ul>
-			</div>
-		</div>
-		<div class="river-box">
-			<!-- 水位过程  -->
-			<div class="river-one river-con">
-				<div class="river-box-top">
-					<div class="river-data">
-						<input type="text" class="datainp time-icon" id="timestart" placeholder="开始日期">
-						<span>至</span>
-					 	<input type="text" class="datainp time-icon" id="timeend" placeholder="结束日期">
-					</div>
-					<input type="button" value="查询" class="river-btn" id="riverBtn"/>
-					<input type="button" value="1" style="display: none" class="river-btn" id="REecharts"/>
-					 <div class="select">
-					     <div class="input_in">
-					         <input type="text" value="快速查询" readonly="readonly"/>
-					     </div>
-					     <div class="city hide" id="riverSel">
-					         <ul>
-					             <li data="12">最近12小时</li>
-					             <li data="24">最近24小时</li>
-					             <li data="36">最近36小时</li>
-					             <li data="72">最近72小时</li>
-					         </ul>
-					     </div>
-					 </div>
-					<input type="button" value="水面线查询" style="display: none" class="loc-btn" id="loc_smx"/>
-				</div>
-				<div class="river-pei" id="riverPei"></div>
-				<div class="river-tab">
-					<table class="table-thead river-thead">
-				        <thead>
-				        <tr>
-				            <th><div>序号</div></th>
-				            <th><div>时间</div></th>
-				            <th><div>水位(m)</div></th>
-				            <th><div>水势</div></th>
-				            <th><div>流量(m³/s)</div></th>
-				            <th><div></div></th>
-				        </tr>
-				        </thead>
-				    </table>
-				    <div class="comTbody">
-				        <table class="table-tbody river-tbody" style="border-top: 0;">
-				            <tbody id="riverTable">
-				            </tbody>
-				        </table>
-				    </div>
-				</div>
-			</div>
-			<!-- 八时水位  -->
-			<div class="river-two river-con none">
-				<div class="river-box-top">
-					<div class="river-data">
-						<input class="datainp time-icon" id="inpstart_zr" type="text" placeholder="开始日期" readonly ><span>至</span><input class="datainp time-icon" id="inpend_zr" type="text" placeholder="结束日期" readonly>
-					</div>
-					<input type="button" value="查询" class="river-btn" id="eigthRiverBtn"/>
-					<div class="select">
-					     <div class="input_in">
-					         <input type="text" value="快速查询" readonly="readonly"/>
-					     </div>
-					     <div class="city hide" id="eightRiverSel">
-					         <ul>
-					             <li data="本月">本月</li>
-					             <li data="上月">上月</li>
-					         </ul>
-					     </div>
-					 </div>
-				</div>		 
-				<div class="river-pei" id="eigthRiverWeater"></div>
-				<div class="river-tab">
-					<table class="table-thead river-thead">
-				        <thead>
-				        <tr>
-				            <th><div>序号</div></th>
-				            <th><div>时间</div></th>
-				            <th><div>水位(m)</div></th>
-				            <th><div>水势</div></th>
-				            <th><div>流量(m³/s)</div></th>
-							<th><div></div></th>
-				        </tr>
-				        </thead>
-				    </table>
-				    <div class="comTbody">
-				        <table class="table-tbody river-tbody" style="border-top: 0;">
-				            <tbody id="eigthRiverTable">
-				            </tbody>
-				        </table>
-				    </div>
-				</div>	 
-			</div>
-			<!--&lt;!&ndash; 预报水情信息  &ndash;&gt;
-			<div class="river-thr river-con none"></div>-->
-			<!-- 基础信息  -->
-			<div class="river-fou river-con none">
-				<div class="river-fou-box">
-					<ul id="riverInfo">
-						
-					</ul>
-					
-				</div>
-			</div>
-
-			<div class="load-box-list">
-				<div class="rote-load">
-					<img src="./img/rote.jpg" alt="">
-					<span>正在加载</span>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-    <script src="../../../libs/jquery/jquery-3.3.1.min.js"></script>
-    <script src="../../../libs/echarts/v4/echarts.min.js"></script>
-    <script src="../../../libs/laydate/laydate.js"></script>
-    <script src="./js/river.js"></script>
-    <script src="./js/start.js"></script>
-    <script src="./js/end.js"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/widgets/Layermanagement/popup/weather.html b/widgets/Layermanagement/popup/weather.html
deleted file mode 100644
index 5bb902f..0000000
--- a/widgets/Layermanagement/popup/weather.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8" />
-	<title>水库</title>
-	<link rel="stylesheet" href="./css/style.css">
-</head>
-<body>
-	<div class="river-course">
-		<div class="river-top">
-			<div class="reser-menu">
-				<ul>
-					<li class="on" id="reseBtnOne">水位过程</li>
-					<li id="reseBtnTwo">八时水位</li>
-					<li id="reseBtnThr">基础信息</li>
-				</ul>
-			</div>
-		</div>
-		<div class="reser-box">
-			<!-- 水位过程  -->
-			<div class="river-one river-con">
-				<div class="river-box-top">
-					<div class="river-data">
-						<input type="text" class="datainp time-icon" id="timestart" placeholder="开始日期"><span>至</span>
-					 <input type="text" class="datainp time-icon" id="timeend" placeholder="结束日期">
-					</div>
-					<input type="button" value="查询" class="river-btn" id="restRiverBtn"/>
-					<div class="select">
-					     <div class="input_in">
-					         <input type="text" value="快速查询" readonly="readonly"/>
-					     </div>
-					     <div class="city hide" id="restSel">
-					         <ul>
-					             <li data="12">最近12小时</li>
-					             <li data="24">最近24小时</li>
-					             <li data="36">最近36小时</li>
-					             <li data="72">最近72小时</li>
-					         </ul>
-					     </div>
-					 </div>
-				</div>
-				<div class="river-pei" id="resePei"></div>
-				<div class="river-tab">
-					<table class="table-thead river-thead">
-				        <thead>
-				        <tr>
-				            <th><div>序号</div></th>
-				            <th><div>时间</div></th>
-				            <th><div>水位(m)</div></th>
-				            <th><div>水势</div></th>
-				            <th><div>蓄水量(m³)</div></th>
-				            <th><div></div></th>
-				        </tr>
-				        </thead>
-				    </table>
-				    <div class="comTbody">
-				        <table class="table-tbody river-tbody" style="border-top: 0;">
-				            <tbody id="reseTable">
-				            
-				            </tbody>
-				        </table>
-				    </div>
-				</div>
-			</div>
-			<!-- 八时水位  -->
-			<div class="river-two river-con none">
-				<div class="river-box-top">
-					<div class="river-data">
-					<input class="datainp time-icon" id="inpstart_zr" type="text" placeholder="开始日期" value="" readonly ><span>至</span><input class="datainp time-icon" id="inpend_zr" type="text" placeholder="结束日期" readonly>
-					</div>
-					<input type="button" value="查询" class="river-btn" id="restriverBtn_bs"/>
-					<div class="select">
-					     <div class="input_in">
-					         <input type="text" value="快速查询" readonly="readonly"/>
-					     </div>
-					     <div class="city hide" id="restRiverSelBox">
-					         <ul>
-					             <li data="本月">本月</li>
-					             <li data="上月">上月</li>
-					         </ul>
-					     </div>
-					 </div>
-				</div>		 
-				<div class="river-pei" id="rserWeaterPie"></div>
-				<div class="river-tab">
-					<table class="table-thead rser-thead">
-				        <thead>
-				        <tr>
-				            <th><div>序号</div></th>
-				            <th><div>时间</div></th>
-				            <th><div>水位(m³)</div></th>
-				            <th><div></div></th>
-				        </tr>
-				        </thead>
-				    </table>
-				    <div class="comTbody">
-				        <table class="table-tbody rser-tbody" style="border-top: 0;">
-				            <tbody id="reseTableBox">
-				            
-				            </tbody>
-				        </table>
-				    </div>
-				</div>	 
-			</div>
-			<!-- 基础信息  -->
-			<div class="river-fou river-con none">
-				<div class="river-fou-box">
-					<ul id="reseInfo">
-						
-					</ul>
-				</div>
-			</div>
-
-			<div class="load-box-list">
-				<div class="rote-load">
-					<img src="./img/rote.jpg" alt="">
-					<span>正在加载</span>
-				</div>
-			</div>
-		</div>
-	</div>
-	
-    <script src="../../../libs/jquery/jquery-3.3.1.min.js"></script>
-    <script src="../../../libs/echarts/v4/echarts.min.js"></script>
-    <script src="../../../libs/laydate/laydate.js"></script>
-    <script src="./js/weather.js"></script>
-    <script src="./js/start.js"></script>
-    <script src="./js/end.js"></script>
-</body>
-
-</html>
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index c0b0c31..f820ae3 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -577,10 +577,13 @@
 															});
 														});
 													}
+													console.log(that[obj.data.id])
 												}
 											})
 										}
 
+								
+
 									}
 
 								} else {
diff --git a/widgets/ShowPosition/Widget.html b/widgets/ShowPosition/Widget.html
index f7814ee..69ae39b 100644
--- a/widgets/ShowPosition/Widget.html
+++ b/widgets/ShowPosition/Widget.html
@@ -3,7 +3,7 @@
 		<!--<p>@ &nbsp;2018-2020 &nbsp; &nbsp; 技术支持: &nbsp;江西汇图科技有限公司 &nbsp;</p>-->
 
 	</div>
-	 <div style="display: none;">
+	 <div>
 		当前视角(
 		经度:<span id="jd"></span>°&nbsp;&nbsp;
 		纬度:<span id="wd"></span>°&nbsp;&nbsp;
diff --git a/widgets/ShowPosition/Widget.js b/widgets/ShowPosition/Widget.js
index f7740b5..460e997 100644
--- a/widgets/ShowPosition/Widget.js
+++ b/widgets/ShowPosition/Widget.js
@@ -10,7 +10,7 @@
 		'dojo/topic',
 		'jimu/BaseWidget'
 	],
-	function(declare,
+	function (declare,
 		lang,
 		array,
 		html,
@@ -20,53 +20,56 @@
 		return declare([BaseWidget], {
 			baseClass: 'jimu-widget-ShowPosition',
 			name: 'ShowPosition',
-			startup: function() {
+			startup: function () {
 				this.inherited(arguments);
 				//显示帧速(FPS)
 				//this.map.scene.debugShowFramesPerSecond = true;
-				
+
 				// Mouse over the globe to see the cartographic position
-				var handler = new Cesium.ScreenSpaceEventHandler(this.map.scene.canvas);
-				handler.setInputAction(lang.hitch(this, function(movement) {
-					/*if(this.map.scene.globe.depthTestAgainstTerrain==false){
-						var ray=this.map.camera.getPickRay(movement.endPosition);  
-						var cartesian=this.map.scene.globe.pick(ray,this.map.scene);  
-						var cartographic=Cesium.Cartographic.fromCartesian(cartesian);  
-						var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值  
-						var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值  //height结果与cartographic.height相差无几,注意:cartographic.height可以为0,也就是说,可以根据经纬度计算出高程。  
-						var height=this.map.scene.globe.getHeight(cartographic);  //height的值为地形高度。  
-						//鼠标位置经纬度
-						$("#positionSpan").html("鼠标(经度:"+lng.toFixed(6)+"°&nbsp;&nbsp;纬度:"+lat.toFixed(6)+"°&nbsp;&nbsp;高度:"+height.toFixed(2)+"m);&nbsp;&nbsp;&nbsp;&nbsp;");
-					}
-					else{
-						var cartesian = this.map.camera.pickEllipsoid(movement.position, this.map.scene.globe.ellipsoid);
-						var posit = this.map.scene.pickPosition(movement.position);
-						var cartographic = Cesium.Cartographic.fromCartesian(posit);
-						var currentClickLon = Cesium.Math.toDegrees(cartographic.longitude);
-						var currentClickLat = Cesium.Math.toDegrees(cartographic.latitude);
-						var currentClickHei = cartographic.height;
-						//鼠标位置经纬度
-						$("#positionSpan").html("鼠标(经度:"+lng.toFixed(6)+"°&nbsp;&nbsp;纬度:"+lat.toFixed(6)+"°&nbsp;&nbsp;高度:"+height.toFixed(2)+"m);&nbsp;&nbsp;&nbsp;&nbsp;");
-					}*/
-					
-					var ray=this.map.camera.getPickRay(movement.endPosition);  
-					var cartesian=this.map.scene.globe.pick(ray,this.map.scene);  
-					var cartographic=Cesium.Cartographic.fromCartesian(cartesian);  
-					var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值  
-					var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值  //height结果与cartographic.height相差无几,注意:cartographic.height可以为0,也就是说,可以根据经纬度计算出高程。  
-					var height=this.map.scene.globe.getHeight(cartographic);  //height的值为地形高度。  
-					//鼠标位置经纬度
-					$("#positionSpan").html("经度:"+lng.toFixed(6)+"&nbsp;&nbsp;纬度:"+lat.toFixed(6)+"&nbsp;&nbsp;高程:"+height.toFixed(2)+"m&nbsp;&nbsp;&nbsp;&nbsp;");
-					
-				}), Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-				
-				
-				 //相机改变事件 
-			    this.map.camera.changed.addEventListener(lang.hitch(this, function() {
-					var cartographic=Cesium.Cartographic.fromCartesian(this.map.camera._positionWC);//使用this.map.camera.position获取相机坐标,在飞行时候会导致实时显示坐标不对
-					var lat=Cesium.Math.toDegrees(cartographic.latitude);
-					var lng=Cesium.Math.toDegrees(cartographic.longitude);
-					var height=cartographic.height;
+				// var handler = new Cesium.ScreenSpaceEventHandler(this.map.scene.canvas);
+				// handler.setInputAction(lang.hitch(this, function(movement) {
+				// 	// if(this.map.scene.globe.depthTestAgainstTerrain==false){
+				// 	// 	var ray=this.map.camera.getPickRay(movement.endPosition);  
+				// 	// 	var cartesian=this.map.scene.globe.pick(ray,this.map.scene);  
+				// 	// 	var cartographic=Cesium.Cartographic.fromCartesian(cartesian);  
+				// 	// 	var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值  
+				// 	// 	var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值  //height结果与cartographic.height相差无几,注意:cartographic.height可以为0,也就是说,可以根据经纬度计算出高程。  
+				// 	// 	var height=this.map.scene.globe.getHeight(cartographic);  //height的值为地形高度。  
+				// 	// 	//鼠标位置经纬度
+				// 	// 	$("#positionSpan").html("鼠标(经度:"+lng.toFixed(6)+"°&nbsp;&nbsp;纬度:"+lat.toFixed(6)+"°&nbsp;&nbsp;高度:"+height.toFixed(2)+"m);&nbsp;&nbsp;&nbsp;&nbsp;");
+				// 	// }
+				// 	// else{
+				// 	// 	var cartesian = this.map.camera.pickEllipsoid(movement.position, this.map.scene.globe.ellipsoid);
+				// 	// 	var posit = this.map.scene.pickPosition(movement.position);
+				// 	// 	var cartographic = Cesium.Cartographic.fromCartesian(posit);
+				// 	// 	var currentClickLon = Cesium.Math.toDegrees(cartographic.longitude);
+				// 	// 	var currentClickLat = Cesium.Math.toDegrees(cartographic.latitude);
+				// 	// 	var currentClickHei = cartographic.height;
+				// 	// 	//鼠标位置经纬度
+				// 	// 	$("#positionSpan").html("鼠标(经度:"+lng.toFixed(6)+"°&nbsp;&nbsp;纬度:"+lat.toFixed(6)+"°&nbsp;&nbsp;高度:"+height.toFixed(2)+"m);&nbsp;&nbsp;&nbsp;&nbsp;");
+				// 	// }
+
+				// 	var ray=this.map.camera.getPickRay(movement.endPosition);  
+				// 	var cartesian=this.map.scene.globe.pick(ray,this.map.scene);  
+				// 	var cartographic=Cesium.Cartographic.fromCartesian(cartesian);  
+				// 	var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值  
+				// 	var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值  //height结果与cartographic.height相差无几,注意:cartographic.height可以为0,也就是说,可以根据经纬度计算出高程。  
+				// 	var height=this.map.scene.globe.getHeight(cartographic);  //height的值为地形高度。  
+
+
+
+				// 	//鼠标位置经纬度
+				// 	// $("#positionSpan").html("经度:"+lng.toFixed(6)+"&nbsp;&nbsp;纬度:"+lat.toFixed(6)+"&nbsp;&nbsp;高程:"+height.toFixed(2)+"m&nbsp;&nbsp;&nbsp;&nbsp;");
+
+				// }), Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
+
+				//相机改变事件 
+				this.map.camera.changed.addEventListener(lang.hitch(this, function () {
+					var cartographic = Cesium.Cartographic.fromCartesian(this.map.camera._positionWC); //使用this.map.camera.position获取相机坐标,在飞行时候会导致实时显示坐标不对
+					var lat = Cesium.Math.toDegrees(cartographic.latitude);
+					var lng = Cesium.Math.toDegrees(cartographic.longitude);
+					var height = cartographic.height;
 					//var cartographic=Cesium.Cartographic.fromCartesian(this.map.camera.position);
 					//相机位置经纬度
 					$("#jd").html(lng.toFixed(6));
@@ -75,42 +78,54 @@
 					$("#phj").html(Cesium.Math.toDegrees(this.map.camera.heading).toFixed(2));
 					$("#fyj").html(Cesium.Math.toDegrees(this.map.camera.pitch).toFixed(2));
 					$("#fgj").html(Cesium.Math.toDegrees(this.map.camera.roll).toFixed(2));
-				}));				
-				
-//				handler.setInputAction(lang.hitch(this, function(movement) {
-//					
-//					var ray=this.map.camera.getPickRay(movement.position);  
-//					var cartesian=this.map.scene.globe.pick(ray,this.map.scene);  
-//					var cartographic=Cesium.Cartographic.fromCartesian(cartesian);  
-//					var lng=Cesium.Math.toDegrees(cartographic.longitude).toFixed(6);;//经度值  
-//					var lat=Cesium.Math.toDegrees(cartographic.latitude).toFixed(6);;//纬度值  //height结果与cartographic.height相差无几,注意:cartographic.height可以为0,也就是说,可以根据经纬度计算出高程。  
-//					
-//					$("#positionDiv").append("["+lng+","+lat+"],");
-//				}), Cesium.ScreenSpaceEventType.LEFT_CLICK);
-				
+				}));
+
+				//				handler.setInputAction(lang.hitch(this, function(movement) {
+				//					
+				//					var ray=this.map.camera.getPickRay(movement.position);  
+				//					var cartesian=this.map.scene.globe.pick(ray,this.map.scene);  
+				//					var cartographic=Cesium.Cartographic.fromCartesian(cartesian);  
+				//					var lng=Cesium.Math.toDegrees(cartographic.longitude).toFixed(6);;//经度值  
+				//					var lat=Cesium.Math.toDegrees(cartographic.latitude).toFixed(6);;//纬度值  //height结果与cartographic.height相差无几,注意:cartographic.height可以为0,也就是说,可以根据经纬度计算出高程。  
+				//					
+				//					$("#positionDiv").append("["+lng+","+lat+"],");
+				//				}), Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
 			},
 
-			onOpen: function() {
+			onOpen: function () {
 				//面板打开的时候触发 (when open this panel trigger)
+				var cartographic = Cesium.Cartographic.fromCartesian(this.map.camera._positionWC); //使用this.map.camera.position获取相机坐标,在飞行时候会导致实时显示坐标不对
+				var lat = Cesium.Math.toDegrees(cartographic.latitude);
+				var lng = Cesium.Math.toDegrees(cartographic.longitude);
+				var height = cartographic.height;
+				//var cartographic=Cesium.Cartographic.fromCartesian(this.map.camera.position);
+				//相机位置经纬度
+				$("#jd").html(lng.toFixed(6));
+				$("#wd").html(lat.toFixed(6));
+				$("#gd").html(height.toFixed(2));
+				$("#phj").html(Cesium.Math.toDegrees(this.map.camera.heading).toFixed(2));
+				$("#fyj").html(Cesium.Math.toDegrees(this.map.camera.pitch).toFixed(2));
+				$("#fgj").html(Cesium.Math.toDegrees(this.map.camera.roll).toFixed(2));
 			},
 
-			onClose: function() {
+			onClose: function () {
 				//面板关闭的时候触发 (when this panel is closed trigger)
 			},
 
-			onMinimize: function() {
+			onMinimize: function () {
 				this.resize();
 			},
 
-			onMaximize: function() {
+			onMaximize: function () {
 				this.resize();
 			},
 
-			resize: function() {
+			resize: function () {
 
 			},
 
-			destroy: function() {
+			destroy: function () {
 				//销毁的时候触发
 				//todo
 				//do something before this func
diff --git a/widgets/ShowPosition/css/style.css b/widgets/ShowPosition/css/style.css
index 10fbf9e..119eb9b 100644
--- a/widgets/ShowPosition/css/style.css
+++ b/widgets/ShowPosition/css/style.css
@@ -2,7 +2,7 @@
   position: relative;
   font-size: 12px;
   line-height: 25px;
-  width: 320px !important;
+  width: 840px !important;
   background: rgba(38, 38, 38, 0.75);
   color: #fff;
   z-index: 3 !important;

--
Gitblit v1.9.3