Explorar el Código

资环审计更新

wdq hace 2 semanas
padre
commit
d02fbc33f0

+ 12 - 8
config/config.js

@@ -23,7 +23,7 @@ var map23DConfig = {
         [-90, 180]
     ], //左上角  右下角,
     //23D资源文件
-    map23DAssetsUrl: 'http://10.235.245.174:2024', //+ 文件名
+    map23DAssetsUrl: 'http://10.235.245.174:2025', //+ 文件名
     //图层最大数量限制
     layerMaxLength: 10,
     //网络类型1:离线,2:在线
@@ -40,7 +40,7 @@ var map23DConfig = {
  */
 var onemapUrlConfig = {
     //域名
-    siteUrl: 'http://10.235.245.174:2024',
+    siteUrl: 'http://10.235.245.174:2025',
     //DMS
     DMS_URL: "/proxy_dms",
     OAUTH_URL: "/proxy_auth",
@@ -49,9 +49,13 @@ var onemapUrlConfig = {
         // { columnId: 1410, type: 0, label: "矢量数据", layerType: "vector" },
         // { columnId: 1417, type: 1, label: "二维地图服务", layerType: "raster" },
         // { columnId: 1416, type: 1, label: "三维地图服务", layerType: "model" }
-        { columnId: 1157, type: 0, label: "矢量数据", layerType: "vector" },
-        { columnId: 1226, type: 1, label: "二维地图服务", layerType: "raster" },
-        { columnId: 1499, type: 1, label: "三维地图服务", layerType: "model" }
+        { columnId: 1679, type: 1, label: "遥感影像", layerType: "raster" },
+        { columnId: 1680, type: 0, label: "金泽镇行政区划", layerType: "vector" },
+        { columnId: 1681, type: 1, label: "金泽镇资环疑点", layerType: "vector" },
+        { columnId: 2373, type: 1, label: "朱家角镇资环疑点", layerType: "vector" },
+        { columnId: 2120, type: 0, label: "青浦区审计土地专题", layerType: "vector" },
+        { columnId: 2290, type: 1, label: "土地矢量数据", layerType: "raster" },
+        // { columnId: 2021, type: 1, label: "青浦规资地图服务", layerType: "raster" }
     ],
     // {
     //     vector: {
@@ -78,9 +82,9 @@ var onemapUrlConfig = {
     //系统名称
     // systemName: '全息地理信息系统',
     // systemName: '大数据可视化平台',
-    systemName: '地图数据可视化系统',
+    systemName: '青浦资环审计系统',//'青浦一张图-金泽资环审计',
     //系统logo
-    systemLogoUrl: 'http://10.235.245.174:2024/images/layout/logo-offline.png',
+    systemLogoUrl: 'http://10.235.245.174:2025/images/layout/logo-offline.png',
     //版权
     systemCopy: '-',
 
@@ -149,6 +153,6 @@ var onemapUrlConfig = {
 };
 
 // if (1) {
-//     let t = JSON.stringify(onemapUrlConfig).replace("10.235.245.174:2024", "localhost:10154")
+//     let t = JSON.stringify(onemapUrlConfig).replace("10.235.245.174:2025", "localhost:10154")
 //     onemapUrlConfig = JSON.parse(t)
 // }

BIN
images/layout/loading-text--.png


BIN
images/layout/loading-text.png


+ 0 - 154
scripts/config.js

@@ -1,154 +0,0 @@
-/**
- * @fileoverview 应用配置文件
- * @version 1.0.8
- */
-
-/**
- * 版本号
- */
-var onemapVersion = '1.2.2'; //+'-'+(new Date()).getTime();
-/**
- * map引擎配置
- */
-var map23DConfig = {
-    //2D地图最小缩放等级
-    map2DMinZoom: 2,
-    //2D地图最大缩放等级
-    map2DMaxZoom: 19,
-    //3D瓦片图片类型
-    imageType: 'png',
-    //3D瓦片范围
-    layerBounds: [
-        [90, -180],
-        [-90, 180]
-    ], //左上角  右下角,
-    //23D资源文件
-    map23DAssetsUrl: 'http://10.235.245.174:2024', //+ 文件名
-    //图层最大数量限制
-    layerMaxLength: 10,
-    //网络类型1:离线,2:在线
-    netType: 2,
-    atlas: true, //海量地图库
-    sanweiMenu: true, //三维场景
-    clockLocal: true, //是否用本地时间
-};
-
-
-/**
- * 应用Url配置
- * @type {Object}
- */
-var onemapUrlConfig = {
-    //域名
-    siteUrl: 'http://10.235.245.174:2024',
-    //DMS
-    DMS_URL: "/proxy_dms",
-    OAUTH_URL: "/proxy_auth",
-    PROXY_URL: "/proxy_proxy",
-    columnConfig: [
-        // { columnId: 1410, type: 0, label: "矢量数据", layerType: "vector" },
-        // { columnId: 1417, type: 1, label: "二维地图服务", layerType: "raster" },
-        // { columnId: 1416, type: 1, label: "三维地图服务", layerType: "model" }
-        { columnId: 1157, type: 0, label: "矢量数据", layerType: "vector" },
-        { columnId: 1226, type: 1, label: "二维地图服务", layerType: "raster" },
-        { columnId: 1499, type: 1, label: "三维地图服务", layerType: "model" }
-    ],
-    // {
-    //     vector: {
-    //         id: 1157,
-    //     },
-    //     // 栅格数据
-    //     raster: {
-    //         id: 1226
-    //     },
-    //     // 3dt
-    //     model: {
-    //         id: 1499,
-    //     },
-    // },
-    //图层配置
-    customizeLayer: {
-        // gr: "http://121.43.55.7:10011/proxy?servertype=World_Imagery&token=622067E9-93E5-D8EC-E677-85B58A63C0C7", // 2000
-        gr: "http://10.235.245.174:10011/proxy?servertype=y01_air_newest&token=622067E9-93E5-D8EC-E677-85B58A63C0C7", // 2000
-        gt: "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer",
-        gm: "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer"
-    },
-
-
-    //系统名称
-    //systemName: '全息地理信息系统',
-    // systemName: '大数据可视化平台',
-    systemName: '地图数据可视化系统',
-    //系统logo
-    systemLogoUrl: 'http://10.235.245.174:2024/images/layout/logo-offline.png',
-    //版权
-    systemCopy: '-',
-
-    //默认全局设置
-    defaultGlobalSettingData: {
-        "baseMap2D": {
-            "center": {
-                "lat": 31.141618,
-                "lng": 121.126049
-            },
-            "type": 2,
-            "zoom": 12
-        },
-        "map2DThematicSetting": [],
-        "map2DThematicCategory": [],
-        "baseMap3D": {
-            "map3DDEM": "http://mt.mapplus.cn/v1.0/dem?z=%d&x=%d&y=%d",
-            "map3DName": "http://119.3.233.75:5050/v1.0/name?x={x}&y={y}&z={z}"
-        },
-        "map3DModelSettingCategory": [],
-        "map3DModelSetting": [
-            {
-                "category": "倾斜摄影",
-                "info": "",
-                "type": "qxData",
-                "name": "蟠龙天地建筑",
-                "url": "http://10.235.245.174:10011/proxy/tileset.json?servertype=ppl_jz&token=622067E9-93E5-D8EC-E677-85B58A63C0C7"
-            }, {
-                "category": "倾斜摄影",
-                "info": "",
-                "type": "qxData",
-                "name": "蟠龙天地水系",
-                "url": "http://10.235.245.174:10011/proxy/tileset.json?servertype=ppl_sx&token=622067E9-93E5-D8EC-E677-85B58A63C0C7"
-            }, {
-                "category": "倾斜摄影",
-                "info": "",
-                "type": "qxData",
-                "name": "蟠龙天地地面",
-                "url": "http://10.235.245.174:10011/proxy/tileset.json?servertype=ppl_dm&token=622067E9-93E5-D8EC-E677-85B58A63C0C7"
-            }, {
-                "category": "倾斜摄影",
-                "info": "",
-                "type": "qxData",
-                "name": "蟠龙天地小品",
-                "url": "http://10.235.245.174:10011/proxy/tileset.json?servertype=ppl_xp&token=622067E9-93E5-D8EC-E677-85B58A63C0C7"
-            }
-        ],
-        "importantGoalsCategory": [],
-        "importantGoalsSetting": [],
-    },
-
-    //底图类型设置
-    defaultTypes: [{
-        "name": "影像图",
-        "id": "gr",
-        "imgurl": "../images/layout/yingxiang.png"
-    }, {
-        "name": "地势图",
-        "id": "gt",
-        "imgurl": "../images/layout/dishi.png"
-    }, {
-        "name": "线划图",
-        "id": "gm",
-        "imgurl": "../images/layout/jiaot.png"
-    }],
-};
-
-// if (1) {
-//     let t = JSON.stringify(onemapUrlConfig).replace("10.235.245.174:2024", "localhost:10154")
-//     onemapUrlConfig = JSON.parse(t)
-// }

+ 2 - 1
scripts/layout/toolsBar.js

@@ -446,9 +446,10 @@ define([
         $(".tools-painting").unbind('click');
     }
     return ONEMAP.M.toolsBar = {
+        status: status,
         init: init,
         bindEvents: bindEvents,
         unbindEvents: unbindEvents,
         layoutResize: layoutResize,
     };
-})
+})

+ 5 - 5
scripts/mod/layerVue/model.js

@@ -85,11 +85,11 @@ define(function () {
 
     function add(item, cancelSelected) {
         modValue.cancelSelected = cancelSelected
-        if (ONEMAP.M.myLayers.checkLength() >= map23DConfig.layerMaxLength) {
-            ONEMAP.C.publisher.publish({ type: 'warning', message: '图层数量已达上限' }, 'noteBar::add');
-            modValue.cancelSelected(item.id)
-            return;
-        }
+        // if (ONEMAP.M.myLayers.checkLength() >= map23DConfig.layerMaxLength) {
+        //     ONEMAP.C.publisher.publish({ type: 'warning', message: '图层数量已达上限' }, 'noteBar::add');
+        //     modValue.cancelSelected(item.id)
+        //     return;
+        // }
         var modelData = {
             "category": "倾斜摄影",
             "info": "",

+ 30 - 14
scripts/mod/layerVue/raster.js

@@ -89,11 +89,11 @@ define([
 
     async function add(item, cancelSelected) {
         modValue.cancelSelected = cancelSelected
-        if(ONEMAP.M.myLayers.checkLength() >= map23DConfig.layerMaxLength) {
-            ONEMAP.C.publisher.publish({ type: 'warning', message: '图层数量已达上限' }, 'noteBar::add');
-            modValue.cancelSelected(item.id)
-            return;
-        }
+        // if (ONEMAP.M.myLayers.checkLength() >= map23DConfig.layerMaxLength) {
+        //     ONEMAP.C.publisher.publish({ type: 'warning', message: '图层数量已达上限' }, 'noteBar::add');
+        //     modValue.cancelSelected(item.id)
+        //     return;
+        // }
         var modelData = {
             "category": "倾斜摄影",
             "info": "",
@@ -261,15 +261,29 @@ define([
             } else if (items.c_tile_server_type == "9") {
                 // wms 
                 let note = JSON.parse(items.c_note);
-                layerObj = new Cesium.WebMapServiceImageryProvider({
-                    url: items.c_url,
-                    layers: note.layers,
-                    parameters: {
-                        TRANSPARENT: true,
-                        format: note.format,
-                    },
-                    tilingScheme: new Cesium.SHmapMercatorTilingScheme()
-                });
+                if (items.c_epsg == "EPSG:sh2000"){
+                    layerObj = new Cesium.WebMapServiceImageryProvider({
+                        url: items.c_url,
+                        layers: note.layers,
+                        parameters: {
+                            TRANSPARENT: true,
+                            format: note.format,
+                        },
+                        tilingScheme:new Cesium.SHmapMercatorTilingScheme()
+                    });
+                }else{
+                    layerObj = new Cesium.WebMapServiceImageryProvider({
+                        url: items.c_url,
+                        layers: note.layers,
+                        parameters: {
+                            TRANSPARENT: true,
+                            format: note.format,
+                        },
+                    });
+                }
+               
+                // if (items.c_epsg == "EPSG:sh2000")
+                //     layerObj.
                 var layer = map3DViewer.map.imageryLayers.addImageryProvider(layerObj);
                 // var bbox = JSON.parse(items.c_bbox)
                 // var extentR = turf.bbox(bbox);
@@ -301,6 +315,7 @@ define([
         modValue.handler = new Cesium.ScreenSpaceEventHandler(map3DViewer.map.canvas);
         // 监听鼠标点击事件
         modValue.handler.setInputAction(function (click) {
+            if (ONEMAP.M.toolsBar.status.toolsShow) return;
             let cartesian = map3DViewer.map.scene.globe.pick(map3DViewer.map.camera.getPickRay(click.position), map3DViewer.map.scene);
             if (Cesium.defined(cartesian)) {
                 // 将笛卡尔坐标转换为经纬度坐标
@@ -373,6 +388,7 @@ define([
     function createCartodb(layerArr, lon, lat, callback) {
         tt(layerArr, lon, lat, 0, [])
         function tt(layerArr, lon, lat, index, info) {
+            if (layerArr.length <= 0) return;
             let layer = JSON.parse(layerArr[index].layerData.c_note);
             tableSearch(layer, layer.tables, lon, lat, 0, [], function (result) {
                 info.push(result);

+ 6 - 5
scripts/mod/layerVue/vector.js

@@ -25,11 +25,11 @@ define([
 
     function add(item, cancelSelected) {
         modValue.cancelSelected = cancelSelected
-        if(ONEMAP.M.myLayers.checkLength() >= map23DConfig.layerMaxLength) {
-            ONEMAP.C.publisher.publish({ type: 'warning', message: '图层数量已达上限' }, 'noteBar::add');
-            modValue.cancelSelected(item.id)
-            return;
-        }
+        // if (ONEMAP.M.myLayers.checkLength() >= map23DConfig.layerMaxLength) {
+        //     ONEMAP.C.publisher.publish({ type: 'warning', message: '图层数量已达上限' }, 'noteBar::add');
+        //     modValue.cancelSelected(item.id)
+        //     return;
+        // }
         var modelData = {
             "category": "倾斜摄影",
             "info": "",
@@ -388,6 +388,7 @@ define([
         // 绑定点击事件 
         modValue.handler = new Cesium.ScreenSpaceEventHandler(map3DViewer.map.canvas);
         modValue.handler.setInputAction(function (movement) {
+            if (ONEMAP.M.toolsBar.status.toolsShow) return;
             var pick = map3DViewer.map.scene.pick(movement.position); // 拾取鼠标所在的entity
             if (Cesium.defined(pick)) {
                 let entity = pick.id;

+ 331 - 25
scripts/mod/menu/menuVue.js

@@ -55,11 +55,283 @@ define(function () {
                         return true
                     }
                 }
-            }
+            },
+            // leafArr: [
+            //     {
+            //         "id": 2296,
+            //         "title": "流转看管地块提取_polyline"
+            //     },
+            //     {
+            //         "id": 2295,
+            //         "title": "流转看管地块提取_polygon"
+            //     },
+            //     {
+            //         "id": 2294,
+            //         "title": "流转看管地块提取_multipatch"
+            //     },
+            //     {
+            //         "id": 2293,
+            //         "title": "流转看管地块提取_annotation"
+            //     },
+            //     {
+            //         "id": 2255,
+            //         "title": "X核减量化地块_第三批"
+            //     },
+            //     {
+            //         "id": 2254,
+            //         "title": "评估地块层_第三批"
+            //     },
+            //     {
+            //         "id": 2252,
+            //         "title": "建设用地疑似林地_朱家角镇_Polyline"
+            //     },
+            //     {
+            //         "id": 2251,
+            //         "title": "建设用地疑似林地_朱家角镇_Polygon"
+            //     },
+            //     {
+            //         "id": 2250,
+            //         "title": "建设用地疑似林地_朱家角镇_Annotation"
+            //     },
+            //     {
+            //         "id": 2249,
+            //         "title": "建设用地疑似林地_重固镇_Polyline"
+            //     },
+            //     {
+            //         "id": 2248,
+            //         "title": "建设用地疑似林地_重固镇_Polygon"
+            //     },
+            //     {
+            //         "id": 2247,
+            //         "title": "建设用地疑似林地_重固镇_Annotation"
+            //     },
+            //     {
+            //         "id": 2246,
+            //         "title": "建设用地疑似林地_赵巷镇_Polyline"
+            //     },
+            //     {
+            //         "id": 2245,
+            //         "title": "建设用地疑似林地_赵巷镇_Polygon"
+            //     },
+            //     {
+            //         "id": 2244,
+            //         "title": "建设用地疑似林地_赵巷镇_Annotation"
+            //     },
+            //     {
+            //         "id": 2243,
+            //         "title": "建设用地疑似林地_徐泾镇_Polyline"
+            //     },
+            //     {
+            //         "id": 2242,
+            //         "title": "建设用地疑似林地_徐泾镇_Polygon"
+            //     },
+            //     {
+            //         "id": 2241,
+            //         "title": "建设用地疑似林地_徐泾镇_Annotation"
+            //     },
+            //     {
+            //         "id": 2240,
+            //         "title": "建设用地疑似林地_香花桥街道_Polyline"
+            //     },
+            //     {
+            //         "id": 2239,
+            //         "title": "建设用地疑似林地_香花桥街道_Polygon"
+            //     },
+            //     {
+            //         "id": 2238,
+            //         "title": "建设用地疑似林地_香花桥街道_Annotation"
+            //     },
+            //     {
+            //         "id": 2237,
+            //         "title": "建设用地疑似林地_夏阳街道_Polyline"
+            //     },
+            //     {
+            //         "id": 2236,
+            //         "title": "建设用地疑似林地_夏阳街道_Polygon"
+            //     },
+            //     {
+            //         "id": 2235,
+            //         "title": "建设用地疑似林地_夏阳街道_Annotation"
+            //     },
+            //     {
+            //         "id": 2234,
+            //         "title": "建设用地疑似林地_练塘镇_Polyline"
+            //     },
+            //     {
+            //         "id": 2233,
+            //         "title": "建设用地疑似林地_练塘镇_Polygon"
+            //     },
+            //     {
+            //         "id": 2232,
+            //         "title": "建设用地疑似林地_练塘镇_Annotation"
+            //     },
+            //     {
+            //         "id": 2231,
+            //         "title": "建设用地疑似林地_金泽镇_Polyline"
+            //     },
+            //     {
+            //         "id": 2230,
+            //         "title": "建设用地疑似林地_金泽镇_Polygon"
+            //     },
+            //     {
+            //         "id": 2229,
+            //         "title": "建设用地疑似林地_金泽镇_Annotation"
+            //     },
+            //     {
+            //         "id": 2228,
+            //         "title": "建设用地疑似林地_华新镇_Polyline"
+            //     },
+            //     {
+            //         "id": 2227,
+            //         "title": "建设用地疑似林地_华新镇_Polygon"
+            //     },
+            //     {
+            //         "id": 2226,
+            //         "title": "建设用地疑似林地_华新镇_Annotation"
+            //     },
+            //     {
+            //         "id": 2225,
+            //         "title": "建设用地疑似林地_白鹤镇_Polyline"
+            //     },
+            //     {
+            //         "id": 2224,
+            //         "title": "建设用地疑似林地_白鹤镇_Polygon"
+            //     },
+            //     {
+            //         "id": 2223,
+            //         "title": "建设用地疑似林地_白鹤镇_Annotation"
+            //     },
+            //     {
+            //         "id": 2288,
+            //         "title": "违法用地综合整治21-23-polyline-裁切"
+            //     },
+            //     {
+            //         "id": 2287,
+            //         "title": "违法用地综合整治21-23-polygon-裁剪"
+            //     },
+            //     {
+            //         "id": 2258,
+            //         "title": "违法用地综合整治21-23-annotation-裁剪"
+            //     },
+            //     {
+            //         "id": 2197,
+            //         "title": "违法用地综合整治21-23-polyline"
+            //     },
+            //     {
+            //         "id": 2196,
+            //         "title": "违法用地综合整治21-23-annotation"
+            //     },
+            //     {
+            //         "id": 2195,
+            //         "title": "违法用地综合整治-21-23-polygon"
+            //     },
+            //     {
+            //         "id": 2187,
+            //         "title": "青浦区2024减量化地块"
+            //     },
+            //     {
+            //         "id": 2186,
+            //         "title": "青浦区2023减量化地块"
+            //     },
+            //     {
+            //         "id": 2185,
+            //         "title": "青浦区2022减量化地块"
+            //     },
+            //     {
+            //         "id": 2184,
+            //         "title": "青浦区2021减量化地块"
+            //     },
+            //     {
+            //         "id": 2183,
+            //         "title": "青浦区2020年减量化地块"
+            //     },
+            //     {
+            //         "id": 2135,
+            //         "title": "2024减量化潜力空间"
+            //     },
+            //     {
+            //         "id": 2136,
+            //         "title": "2023减量化潜力空间"
+            //     },
+            //     {
+            //         "id": 2181,
+            //         "title": "23年部卫片矢量"
+            //     },
+            //     {
+            //         "id": 2179,
+            //         "title": "2024年卫片执法图斑矢量-polyline"
+            //     },
+            //     {
+            //         "id": 2178,
+            //         "title": "2024年卫片执法图斑矢量-plygon"
+            //     },
+            //     {
+            //         "id": 2177,
+            //         "title": "2024年卫片执法图斑矢量-annotation"
+            //     },
+            //     {
+            //         "id": 2176,
+            //         "title": "青浦2023督察-polyline"
+            //     },
+            //     {
+            //         "id": 2175,
+            //         "title": "青浦2023督察-polygon"
+            //     },
+            //     {
+            //         "id": 2174,
+            //         "title": "青浦2023督察-annotation"
+            //     },
+            //     {
+            //         "id": 2173,
+            //         "title": "青浦2024督察-polyline"
+            //     },
+            //     {
+            //         "id": 2172,
+            //         "title": "青浦2024督察-polygon"
+            //     },
+            //     {
+            //         "id": 2171,
+            //         "title": "青浦2024督察-annotation"
+            //     },
+            //     {
+            //         "id": 2154,
+            //         "title": "annotation"
+            //     },
+            //     {
+            //         "id": 2153,
+            //         "title": "polyline"
+            //     },
+            //     {
+            //         "id": 2151,
+            //         "title": "polygon"
+            //     },
+            //     {
+            //         "id": 2150,
+            //         "title": "point"
+            //     },
+            //     {
+            //         "id": 2149,
+            //         "title": "multipatch"
+            //     },
+            //     {
+            //         "id": 2134,
+            //         "title": "24年报部项目"
+            //     },
+            //     {
+            //         "id": 2133,
+            //         "title": "23年报部项目"
+            //     },
+            //     {
+            //         "id": 2132,
+            //         "title": "T2024减量化0210"
+            //     }
+            // ],
+            // leafInfo: []
         },
         mounted() {
             let that = this;
             let layerArr = onemapUrlConfig.columnConfig;
+            // this.getInfo(0)
             // 获取树状结构
             $.ajax({
                 type: "POST",
@@ -80,53 +352,54 @@ define(function () {
                             let newlayer = {
                                 id: item.id,
                                 label: layer.label,
-                                layerType: layer.layerType,
-                                children: []
+                                layerType: layer.layerType
+                            }
+                            if (item.dataList.length > 0) {
+                                newlayer.children = handleData(item.dataList, layer.layerType)
+                            } else {
+                                newlayer.children = [{ label: '暂无数据', leaf: true }]
                             }
-                            newlayer.children = handleData(item.dataList, layer.layerType)
                             that.treeData.push(newlayer)
                         }
                         let baseCalcConfig = {
                             label: '基础时空专题服务', layerType: "service", id: "4f", children: [
-                                {
-                                    label: '坐标转换', layerType: "coordinate", id: "4f-1", children: [
-                                        { label: 'WGS84 转 火星坐标', layerType: "coordinate", coorKey: "wgs84ToGcj02", id: "4f-1-1", leaf: true, },
-                                        { label: '火星坐标 转 WGS84', layerType: "coordinate", coorKey: "gcj02ToWgs84", id: "4f-1-2", leaf: true, },
-                                        { label: 'WGS84 转 百度坐标', layerType: "coordinate", coorKey: "wgs84ToBD09", id: "4f-1-3", leaf: true, },
-                                        { label: '百度坐标 转 WGS84', layerType: "coordinate", coorKey: "bd09ToWgs84", id: "4f-1-4", leaf: true, },
-                                        { label: 'WGS84 转 上海2000', layerType: "coordinate", coorKey: "wgs84ToSh2000", id: "4f-1-5", leaf: true, },
-                                        { label: '上海2000 转 WGS84', layerType: "coordinate", coorKey: "sh2000ToWgs84", id: "4f-1-6", leaf: true, },
-                                        { label: 'WGS84 转 上海2000投影', layerType: "coordinate", coorKey: "wgs84ToSh2000xy", id: "4f-1-7", leaf: true, },
-                                        { label: '上海2000投影 转 WGS84', layerType: "coordinate", coorKey: "sh2000xyToWgs84", id: "4f-1-8", leaf: true, },
-                                    ]
-                                },
+                                // {
+                                //     label: '坐标转换', layerType: "coordinate", id: "4f-1", children: [
+                                //         { label: 'WGS84 转 火星坐标', layerType: "coordinate", coorKey: "wgs84ToGcj02", id: "4f-1-1", leaf: true, },
+                                //         { label: '火星坐标 转 WGS84', layerType: "coordinate", coorKey: "gcj02ToWgs84", id: "4f-1-2", leaf: true, },
+                                //         { label: 'WGS84 转 百度坐标', layerType: "coordinate", coorKey: "wgs84ToBD09", id: "4f-1-3", leaf: true, },
+                                //         { label: '百度坐标 转 WGS84', layerType: "coordinate", coorKey: "bd09ToWgs84", id: "4f-1-4", leaf: true, },
+                                //         { label: 'WGS84 转 上海2000', layerType: "coordinate", coorKey: "wgs84ToSh2000", id: "4f-1-5", leaf: true, },
+                                //         { label: '上海2000 转 WGS84', layerType: "coordinate", coorKey: "sh2000ToWgs84", id: "4f-1-6", leaf: true, },
+                                //         { label: 'WGS84 转 上海2000投影', layerType: "coordinate", coorKey: "wgs84ToSh2000xy", id: "4f-1-7", leaf: true, },
+                                //         { label: '上海2000投影 转 WGS84', layerType: "coordinate", coorKey: "sh2000xyToWgs84", id: "4f-1-8", leaf: true, },
+                                //     ]
+                                // },
                                 { label: '路径规划', layerType: "route", id: "4f-2", leaf: true },
-                                { label: '距离计算', layerType: "distance", id: "4f-3", leaf: true },
-                                { label: '目标点计算', layerType: "targetPoint", id: "4f-4", leaf: true },
+                                // { label: '距离计算', layerType: "distance", id: "4f-3", leaf: true },
+                                // { label: '目标点计算', layerType: "targetPoint", id: "4f-4", leaf: true },
                                 { label: '地名搜索', layerType: "addressSearch", id: "4f-5", leaf: true },
-                                { label: '高级地名搜索', layerType: "advancedAddressSearch", id: "4f-6", leaf: true },
-                                { label: '经纬度获取村居/网格/微格网信息', layerType: "gridInfoByLonlat", id: "4f-7", leaf: true },
-                                { label: 'shape与geojson转换', layerType: "shpAGeojsonMutualism", id: "4f-8", leaf: true },
+                                // { label: '高级地名搜索', layerType: "advancedAddressSearch", id: "4f-6", leaf: true },
+                                // { label: '经纬度获取村居/网格/微格网信息', layerType: "gridInfoByLonlat", id: "4f-7", leaf: true },
+                                // { label: 'shape与geojson转换', layerType: "shpAGeojsonMutualism", id: "4f-8", leaf: true },
                             ]
                         }
                         that.treeData.push(baseCalcConfig)
-
                     }
-
                     // columnList 分级栏目 
                     function handleData(arr, layerType) {
                         return arr.map(function (item) {
                             item.label = item.title || item.c_name;
                             item.layerType = layerType
 
-                            if (item.dataList!=undefined&& item.dataList.length != 0) {
+                            if (item.dataList != undefined && item.dataList.length != 0) {
                                 item.children = handleData(item.dataList, layerType);
                             } else {
                                 // 0 分级栏目 1 内容栏目 -1内容
                                 if (item.type == 0) {
                                     item.children = [{ label: '暂无数据', leaf: true }]
                                 } else {
-                                    item.leaf = true
+                                    item.leaf = true;
                                 }
                             }
                             return item
@@ -136,6 +409,39 @@ define(function () {
             })
         },
         methods: {
+            getInfo(index) {
+                let that = this
+                fetch(onemapUrlConfig.DMS_URL + '/dms/content/getVectorData', {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/x-www-form-urlencoded",
+                        "token": localStorage.getItem("systemToken"),
+                    },
+                    mode: "cors",
+                    body: "columnId=" + this.leafArr[index].id + "&token=" + localStorage.getItem("systemToken")
+                    // body: "columnId=" + modelData.layerInfo.id
+                }).then(resp => resp.json()).then(function (result) {
+                    let total = 0
+                    result.features.map(function (feature) {
+                        total = total + feature.geometry.coordinates.join(",").split(",").length / 2
+                    })
+                    that.leafInfo.push({
+                        id: that.leafArr[index].id,
+                        title: that.leafArr[index].title,
+                        pointNum: total
+                    })
+                    if (index == that.leafArr.length - 1) {
+                        console.log(JSON.stringify(that.leafInfo))
+                        let TT = 0
+                        that.leafInfo.map(function (item) {
+                            TT += item.pointNum
+                        })
+                        console.log("总数:", TT)
+                    } else {
+                        that.getInfo(index + 1)
+                    }
+                })
+            },
             handleOpen() { console.log('handleOpen') },
             handleClose() { console.log('handleClose') },
             // handleNodeClick(data, node, self) {

+ 154 - 154
scripts/mod/menu/myLayer.js

@@ -72,164 +72,164 @@ define(['modDir/menu/myLayerActions'],
         function addToMyLayer(options) { // guid type(图层或图层组) name mod(是否无透明度)
             // console.log(options.layerData);
             // console.log("add");
-            var layerLength = $("#layerControlMenu .myLayers li").length;
-            if (layerLength < map23DConfig.layerMaxLength) {
-                // console.log(layerLength);
-                var DOMid = options.DOM.guid;
-                var mnAct = '<div class="mn-act no" setOp="no">';
-                if (options.DOM.type == "layer" || options.DOM.type == "otherOrigin" || options.DOM.type == "thematicOrigin" || options.DOM.type == "sxlayer" || options.DOM.type == "QXSY" || options.DOM.type == "RASTER" || options.DOM.type == "VECTOR") {
-                    mnAct = '<div class="mn-act yes" setOp="yes">';
-                } else if (options.mod == "taiShi") {
-                    mnAct = '<div class="mn-act no taiShiTool" setOp="no">';
-                } else if (options.mod == "wxjd") {
-                    mnAct = '<div class="mn-act no" style="margin-left: 0px;" setOp="no">';
-                }
-                if (options.mod == "test") {
-                    mnAct = '<div class="mn-act yes DS" setOp="yes">';
-                }
-                var data;
-                var layerFloor = "zid" + DOMid;
-                if (options.mod == "test") {
-                    data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true" class="' + DOMid + '">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
-                        '<span class="data-save" guid="' + DOMid + '">' + JSON.stringify(options.layerData) + '</span>' +
-                        '<span class="fr gear"></span></div>' + mnAct +
-                        '<span>透明度:</span><span class="op"><span class="chang"></span>' +
-                        '<span class="yuan" layer="' + DOMid + '"></span></span>' +
-                        '<span class="layer-detail"></span><span class="layer-cale"></span>' +
-                        '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
-                    // 设置层级
-                    setFloor(layerFloor, options.DOM.name);
-                } else if (options.mod == "otherOrigin" || options.mod == "thematicOrigin" || options.mod == "qixiang" || options.mod == "vectorOrigin") {
-                    data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true" class="' + DOMid + '">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
-                        '</span><span class="fr legend" title="图例" curl="' + options.DOM.legend + '"></span><span class="fr gear"></span></div>' + mnAct +
-                        '<span>透明度:</span><span class="op"><span class="chang"></span>' +
-                        '<span class="yuan" layer="' + DOMid + '"></span></span>' +
-                        '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
-                    // 设置层级
-                    setFloor(layerFloor, options.DOM.name);
-                } else if (options.mod == "taiShi") {
-                    data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
-                        '</span><span class="data-save"></span><span class="fr gear"></span></div>' + mnAct
-                        // +'<span style="line-height:25px; ">用户ID:<input type="text"  id="video-query-ids"  style="width:114px;height: 25px;line-height: 20px;border: #7F9BB3 1px solid;margin-left: 5px;"  /></span>'
-                        +
-                        '<span style="line-height:25px; "><input type="text"  id="video-query-startDate"  class="Wdate" onfocus="WdatePicker({dateFmt:\'yyyy-MM-dd HH:mm:ss\',maxDate:\'#F{$dp.$D(\\\'video-query-endDate\\\')}\',readOnly:true});" />至</span>' +
-                        '<span style="line-height:25px; "><input type="text"  id="video-query-endDate"  class="Wdate" onfocus="WdatePicker({dateFmt:\'yyyy-MM-dd HH:mm:ss\',minDate:\'#F{$dp.$D(\\\'video-query-startDate\\\')}\',readOnly:true});" /></span>' +
-                        '<span style="line-height:25px; ">时间间隔:<input type="number"  value="1" style="width: 40px;height: 25px;line-height: 20px;font-size: 12px;border: #7F9BB3 1px solid;padding-left: 5px;margin-left: 5px;" id="video-timeSpace"  />小时<input type="button" id="taishi_setBtn" style="position:absolute;left:145px;height: 25px;line-height: 20px;text-align: center;vertical-align: middle;border: 0px !important; background: #104792;color: #fff;padding: 0px 5px 0px 5px;cursor: pointer;border-radius: 2px;" value="查询" /></span>' +
-                        '</div><span class="eye">显示开关</span></li>';
-                } else if (options.mod == "zhihuiji") {
-                    data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
-                        '</span><span class="data-save"></span><span class="fr gear"></span></div>' + mnAct +
-                        '<p class="getHistoryZHJ" onclick="ONEMAP.M.projectController.openHistroyPosition()">历史轨迹查询</p></div><span class="eye">显示开关</span></li>';
-                } else if (options.mod == "wxjd") {
-                    data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
-                        '</span><span class="data-save"></span><span class="fr gear"></span></div>' + mnAct
-                        // +'<span style="line-height:30px; "><input type="radio" name="jd" id="wxjd-rdss"checked/>RDSS<input type="radio" id="wxjd-rnss" name="jd"/>RNSS<input type="radio" id="wxjd-gps" name="jd"/>GPS</span>'
-                        +
-                        '<span style="line-height:30px; "><input type="radio" id="wxjd-rnss" name="jd"/>RNSS<input type="radio" id="wxjd-gps" name="jd"/>GPS</span>' +
-                        '</div><span class="eye">显示开关</span></li>';
-                } else if (options.mod == "sxlayer") {
-                    data = '<li layer="' + DOMid + '" class="' + DOMid + ' sxlayer" cg="true"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true" class="' + DOMid + '">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
-                        '</span><span class="fr gear"></span></div>' + mnAct +
-                        '<span>透明度:</span><span class="op"><span class="chang"></span>' +
-                        '<span class="yuan" layer="' + DOMid + '"></span></span>' +
-                        '</div><span class="eye">显示开关</span></li>';
-                } else if (options.mod == "QXSY") {
-                    // data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
-                    //     '<input type="checkbox" checked="true" class="' + DOMid + '">' +
-                    //     '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
-                    //     '</span><span class="data-save"></span></div><span class="eye">显示开关</span></li>';
-
-                    data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true" class="' + DOMid + '">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
-                        '<span class="data-save" guid="' + DOMid + '">' + JSON.stringify(options.layerData) + '</span>' +
-                        '<span class="fr gear"></span><span class="fr location"></span></div>' + mnAct +
-                        '<span>透明度:</span><span class="op"><span class="chang"></span>' +
-                        '<span class="yuan" layer="' + DOMid + '"></span></span>' +
-                        // '<span class="layer-detail"></span><span class="layer-cale"></span>' +
-                        '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
-                    // 设置层级
-                    setFloor(layerFloor, options.DOM.name);
-                } else if (options.mod == "RASTER") {
-                    data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true" class="' + DOMid + '">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
-                        '<span class="data-save" guid="' + DOMid + '">' + JSON.stringify(options.layerData) + '</span>' +
-                        '<span class="fr gear"></span><span class="fr location"></span></div>' + mnAct +
-                        '<span>透明度:</span><span class="op"><span class="chang"></span>' +
-                        '<span class="yuan" layer="' + DOMid + '"></span></span>' +
-                        // '<span class="layer-detail"></span><span class="layer-cale"></span>' +
-                        '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
-                    // 设置层级
-                    setFloor(layerFloor, options.DOM.name);
-                } else if (options.mod == "VECTOR") {
-                    data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true" class="' + DOMid + '">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
-                        '<span class="data-save" guid="' + DOMid + '">' + JSON.stringify(options.layerData) + '</span>' +
-                        '<span class="fr gear"></span><span class="fr location"></span></div>' + mnAct +
-                        '<span>透明度:</span><span class="op"><span class="chang"></span>' +
-                        '<span class="yuan" layer="' + DOMid + '"></span></span>' +
-                        // '<span class="layer-detail"></span><span class="layer-cale"></span>' +
-                        '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
-                    // 设置层级
-                    setFloor(layerFloor, options.DOM.name);
-                }
-                else if (options.mod == "MOXING") {
-                    data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true" class="' + DOMid + '">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
-                        '<span class="data-save"></span>' +
-                        '<span class="fr stereoscopic_set"></span>' +
-                        '</div><span class="eye">显示开关</span></li>';
-                } else {
-                    data = '<li layer="' + DOMid + '" class="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
-                        '<input type="checkbox" checked="true">' +
-                        '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
-                        '</span><span class="data-save"></span></div><span class="eye">显示开关</span></li>';
-                }
-                $("#layerControlMenu .myLayers .mn-content").prepend(data);
-                $("#layerControlMenu .myLayers .mn-content").children(":first").find("input").next().html(options.DOM.name);
-                $("#layerControlMenu .myLayers").addClass('active');
-                $("#layerControlMenu .mn-content .mn-act").removeClass('active');
-                $("#layerControlMenu .myLayers .mn-content").children(":first").find("input:checkbox").attr("checked", true);
-                $("#layerControlMenu .myLayers .mn-content").children(":first").find(".eye").addClass("checkTrue");
-
-                $("#layerControlMenu .myLayers .scroll-bar").mCustomScrollbar('update');
+            // var layerLength = $("#layerControlMenu .myLayers li").length;
+            // if (layerLength < map23DConfig.layerMaxLength) {
+            // console.log(layerLength);
+            var DOMid = options.DOM.guid;
+            var mnAct = '<div class="mn-act no" setOp="no">';
+            if (options.DOM.type == "layer" || options.DOM.type == "otherOrigin" || options.DOM.type == "thematicOrigin" || options.DOM.type == "sxlayer" || options.DOM.type == "QXSY" || options.DOM.type == "RASTER" || options.DOM.type == "VECTOR") {
+                mnAct = '<div class="mn-act yes" setOp="yes">';
+            } else if (options.mod == "taiShi") {
+                mnAct = '<div class="mn-act no taiShiTool" setOp="no">';
+            } else if (options.mod == "wxjd") {
+                mnAct = '<div class="mn-act no" style="margin-left: 0px;" setOp="no">';
+            }
+            if (options.mod == "test") {
+                mnAct = '<div class="mn-act yes DS" setOp="yes">';
+            }
+            var data;
+            var layerFloor = "zid" + DOMid;
+            if (options.mod == "test") {
+                data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true" class="' + DOMid + '">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
+                    '<span class="data-save" guid="' + DOMid + '">' + JSON.stringify(options.layerData) + '</span>' +
+                    '<span class="fr gear"></span></div>' + mnAct +
+                    '<span>透明度:</span><span class="op"><span class="chang"></span>' +
+                    '<span class="yuan" layer="' + DOMid + '"></span></span>' +
+                    '<span class="layer-detail"></span><span class="layer-cale"></span>' +
+                    '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
+                // 设置层级
+                setFloor(layerFloor, options.DOM.name);
+            } else if (options.mod == "otherOrigin" || options.mod == "thematicOrigin" || options.mod == "qixiang" || options.mod == "vectorOrigin") {
+                data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true" class="' + DOMid + '">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
+                    '</span><span class="fr legend" title="图例" curl="' + options.DOM.legend + '"></span><span class="fr gear"></span></div>' + mnAct +
+                    '<span>透明度:</span><span class="op"><span class="chang"></span>' +
+                    '<span class="yuan" layer="' + DOMid + '"></span></span>' +
+                    '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
+                // 设置层级
+                setFloor(layerFloor, options.DOM.name);
+            } else if (options.mod == "taiShi") {
+                data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
+                    '</span><span class="data-save"></span><span class="fr gear"></span></div>' + mnAct
+                    // +'<span style="line-height:25px; ">用户ID:<input type="text"  id="video-query-ids"  style="width:114px;height: 25px;line-height: 20px;border: #7F9BB3 1px solid;margin-left: 5px;"  /></span>'
+                    +
+                    '<span style="line-height:25px; "><input type="text"  id="video-query-startDate"  class="Wdate" onfocus="WdatePicker({dateFmt:\'yyyy-MM-dd HH:mm:ss\',maxDate:\'#F{$dp.$D(\\\'video-query-endDate\\\')}\',readOnly:true});" />至</span>' +
+                    '<span style="line-height:25px; "><input type="text"  id="video-query-endDate"  class="Wdate" onfocus="WdatePicker({dateFmt:\'yyyy-MM-dd HH:mm:ss\',minDate:\'#F{$dp.$D(\\\'video-query-startDate\\\')}\',readOnly:true});" /></span>' +
+                    '<span style="line-height:25px; ">时间间隔:<input type="number"  value="1" style="width: 40px;height: 25px;line-height: 20px;font-size: 12px;border: #7F9BB3 1px solid;padding-left: 5px;margin-left: 5px;" id="video-timeSpace"  />小时<input type="button" id="taishi_setBtn" style="position:absolute;left:145px;height: 25px;line-height: 20px;text-align: center;vertical-align: middle;border: 0px !important; background: #104792;color: #fff;padding: 0px 5px 0px 5px;cursor: pointer;border-radius: 2px;" value="查询" /></span>' +
+                    '</div><span class="eye">显示开关</span></li>';
+            } else if (options.mod == "zhihuiji") {
+                data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
+                    '</span><span class="data-save"></span><span class="fr gear"></span></div>' + mnAct +
+                    '<p class="getHistoryZHJ" onclick="ONEMAP.M.projectController.openHistroyPosition()">历史轨迹查询</p></div><span class="eye">显示开关</span></li>';
+            } else if (options.mod == "wxjd") {
+                data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
+                    '</span><span class="data-save"></span><span class="fr gear"></span></div>' + mnAct
+                    // +'<span style="line-height:30px; "><input type="radio" name="jd" id="wxjd-rdss"checked/>RDSS<input type="radio" id="wxjd-rnss" name="jd"/>RNSS<input type="radio" id="wxjd-gps" name="jd"/>GPS</span>'
+                    +
+                    '<span style="line-height:30px; "><input type="radio" id="wxjd-rnss" name="jd"/>RNSS<input type="radio" id="wxjd-gps" name="jd"/>GPS</span>' +
+                    '</div><span class="eye">显示开关</span></li>';
+            } else if (options.mod == "sxlayer") {
+                data = '<li layer="' + DOMid + '" class="' + DOMid + ' sxlayer" cg="true"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true" class="' + DOMid + '">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
+                    '</span><span class="fr gear"></span></div>' + mnAct +
+                    '<span>透明度:</span><span class="op"><span class="chang"></span>' +
+                    '<span class="yuan" layer="' + DOMid + '"></span></span>' +
+                    '</div><span class="eye">显示开关</span></li>';
+            } else if (options.mod == "QXSY") {
+                // data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
+                //     '<input type="checkbox" checked="true" class="' + DOMid + '">' +
+                //     '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
+                //     '</span><span class="data-save"></span></div><span class="eye">显示开关</span></li>';
+
+                data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true" class="' + DOMid + '">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
+                    '<span class="data-save" guid="' + DOMid + '">' + JSON.stringify(options.layerData) + '</span>' +
+                    '<span class="fr gear"></span><span class="fr location"></span></div>' + mnAct +
+                    '<span>透明度:</span><span class="op"><span class="chang"></span>' +
+                    '<span class="yuan" layer="' + DOMid + '"></span></span>' +
+                    // '<span class="layer-detail"></span><span class="layer-cale"></span>' +
+                    '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
+                // 设置层级
+                setFloor(layerFloor, options.DOM.name);
+            } else if (options.mod == "RASTER") {
+                data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true" class="' + DOMid + '">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
+                    '<span class="data-save" guid="' + DOMid + '">' + JSON.stringify(options.layerData) + '</span>' +
+                    '<span class="fr gear"></span><span class="fr location"></span></div>' + mnAct +
+                    '<span>透明度:</span><span class="op"><span class="chang"></span>' +
+                    '<span class="yuan" layer="' + DOMid + '"></span></span>' +
+                    // '<span class="layer-detail"></span><span class="layer-cale"></span>' +
+                    '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
+                // 设置层级
+                setFloor(layerFloor, options.DOM.name);
+            } else if (options.mod == "VECTOR") {
+                data = '<li layer="' + DOMid + '" class="' + layerFloor + '" cg="true"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true" class="' + DOMid + '">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
+                    '<span class="data-save" guid="' + DOMid + '">' + JSON.stringify(options.layerData) + '</span>' +
+                    '<span class="fr gear"></span><span class="fr location"></span></div>' + mnAct +
+                    '<span>透明度:</span><span class="op"><span class="chang"></span>' +
+                    '<span class="yuan" layer="' + DOMid + '"></span></span>' +
+                    // '<span class="layer-detail"></span><span class="layer-cale"></span>' +
+                    '<span class="move"><span class="down"></span><span class="up"></span></span></div><span class="eye">显示开关</span></li>';
+                // 设置层级
+                setFloor(layerFloor, options.DOM.name);
+            }
+            else if (options.mod == "MOXING") {
+                data = '<li layer="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true" class="' + DOMid + '">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name + '</span>' +
+                    '<span class="data-save"></span>' +
+                    '<span class="fr stereoscopic_set"></span>' +
+                    '</div><span class="eye">显示开关</span></li>';
+            } else {
+                data = '<li layer="' + DOMid + '" class="' + DOMid + '"><div class="clearfix"><span class="close">×</span>' +
+                    '<input type="checkbox" checked="true">' +
+                    '<span class="data-name" title="' + options.DOM.name + '">' + options.DOM.name +
+                    '</span><span class="data-save"></span></div><span class="eye">显示开关</span></li>';
+            }
+            $("#layerControlMenu .myLayers .mn-content").prepend(data);
+            $("#layerControlMenu .myLayers .mn-content").children(":first").find("input").next().html(options.DOM.name);
+            $("#layerControlMenu .myLayers").addClass('active');
+            $("#layerControlMenu .mn-content .mn-act").removeClass('active');
+            $("#layerControlMenu .myLayers .mn-content").children(":first").find("input:checkbox").attr("checked", true);
+            $("#layerControlMenu .myLayers .mn-content").children(":first").find(".eye").addClass("checkTrue");
 
-                _myLayerActions.init();
+            $("#layerControlMenu .myLayers .scroll-bar").mCustomScrollbar('update');
 
-                // 判断图层控制是否显示
-                if (!$("#layerControlMenu").hasClass("bl")) {
-                    $("#layerControlMenu").addClass("bl");
-                    $("#layerControlMenu .myLayers").addClass("active");
-                }
-                // 添加时窗口位置如未显示则重置
-                if (parseInt($("#layerControlMenu").css("left")) < -100) {
-                    $("#layerControlMenu").css("left", "0");
-                }
-                // 检查图层控制是否为空
-                ONEMAP.M.layerControlMenu.checkLayerNull();
+            _myLayerActions.init();
 
-                return DOMid;
-            } else {
-                ONEMAP.C.publisher.publish({
-                    type: 'warning',
-                    message: '图层数量已达上限'
-                }, 'noteBar::add');
+            // 判断图层控制是否显示
+            if (!$("#layerControlMenu").hasClass("bl")) {
+                $("#layerControlMenu").addClass("bl");
+                $("#layerControlMenu .myLayers").addClass("active");
+            }
+            // 添加时窗口位置如未显示则重置
+            if (parseInt($("#layerControlMenu").css("left")) < -100) {
+                $("#layerControlMenu").css("left", "0");
             }
+            // 检查图层控制是否为空
+            ONEMAP.M.layerControlMenu.checkLayerNull();
+
+            return DOMid;
+            // } else {
+            //     ONEMAP.C.publisher.publish({
+            //         type: 'warning',
+            //         message: '图层数量已达上限'
+            //     }, 'noteBar::add');
+            // }
         }
 
         // 从我的图层中删除

+ 2 - 2
scripts/vendor/userLogin/userLogin.js

@@ -530,8 +530,8 @@
         function userLogin() {
             // var userEmail = $("#userLogin .login .user").val();
             // var psd = $("#userLogin .login .lock").val();
-            var userEmail = "user001";
-            var psd = "1234567890";
+            var userEmail = "user_2025";
+            var psd = "User@2025";
             $.ajax({
                 url: param.userServer + '/oauth/user/login',
                 method: 'POST',

+ 2 - 2
styles/menu.css

@@ -1405,9 +1405,9 @@
   display: none !important;
 }
 
-#vuemenu .el-tree>.el-tree-node:nth-child(4) .el-checkbox__inner {
+/* #vuemenu .el-tree>.el-tree-node:nth-child(4) .el-checkbox__inner {
   display: none !important;
-}
+} */
 
 .el-tree-node__content:hover {
   background-color: transparent;

+ 2 - 0
styles/menu/vectorInfo.css

@@ -25,6 +25,8 @@
 
 #vectorInfoModal .daili {
     padding: 20px 20px 20px 20px;
+    max-height:600px;
+    overflow: auto;
 }
 
 #vectorInfoModal .popup-ct .close {

+ 4 - 14
templates/menu/baseCalc/addressSearch.html

@@ -14,7 +14,7 @@
                 <div id="addressSearchForm">
                     <table>
                         <tr>
-                            <td>查询地址:</td>
+                            <td>查询地址</td>
                             <td>
                                 <input class="input address" />
                             </td>
@@ -25,22 +25,12 @@
                     </table>
                     <table>
                         <tr>
-                            <td>查询结果:</td>
+                            <td>查询结果</td>
                         </tr>
-                        <tr class="outputResult">
-                            <!-- <td>
-                                <span></span>
-                            </td>
-                            <td>
-                                <span></span>
-                            </td> -->
+                        <tr class="outputResult"> 
                         </tr>
                     </table>
-                </div>
-                <!-- <div class="loc">
-                    <button class="btn-default sure">确定</button>
-                    <button class="btn-default close">取消</button>
-                </div> -->
+                </div> 
             </div>
         </div>
     </div>

+ 2 - 2
templates/menu/baseCalc/gridInfoByLonlat.html

@@ -14,8 +14,8 @@
                 <div id="gridInfoByLonlatForm">
                     <!-- 开启/关闭 -->
                     <div class="control">
-                        <button class="openFunc" type="button">开启</button>
-                        <button class="closeFunc" type="button">关闭</button>
+                        <button class="openFunc" type="button">开启选点</button>
+                        <button class="closeFunc" type="button">关闭选点</button>
                     </div>
                     <div class="detailTitle">点击查看详细信息:</div>
                     <div class="outputResult">

+ 1 - 1
templates/user.html

@@ -1,6 +1,6 @@
 <div id="userContent">
   <!-- 地名地址原网页跳转 -->
-  <div class="UserAHref">
+  <div class="UserAHref" style="display: none;">
     <div class="UserAHref_logo"></div>
     <div class="UserAHref_title">青浦区统一地址管理平台</div>
   </div>