zzy 管线修改

src/components/mapJK.vue

@@ -4808,8 +4808,8 @@ export default {
         "esri/geometry/Point"]).then(async ([Graphic, geometryEngine, GraphicsLayer,FeatureLayer,Query,query, Point]) => {
         let that = this;
         let status = params.status;
-        let where = "1=1";
-        let layer = this.m_map.layers.find(item => item.id === "pointFeaturelayer");
+        let id = params.id;
+        let layer = this.m_map.layers.find(item => item.id === id);
         if(layer){
           this.m_map.remove(layer);
         }
@@ -4852,7 +4852,7 @@ export default {
 
           //绘制渲染点
           const pointFeaturelayer = new FeatureLayer({
-            id:"pointFeaturelayer",
+            id:id,
             title:params.title,
             source: resultPointGraphics,
             geometryType: "point",
@@ -7748,7 +7748,7 @@ export default {
       ]).then(([Query,query,geometryEngine])=>{
         let typename = params.typename;
         let gid = params.gid;
-        let url = "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu";
+        let url = "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu";
         let arr = [];
         if (typename == "电力") {
           arr.push("/T8101L/MapServer/0");
@@ -8221,7 +8221,6 @@ export default {
         let resultArray = [];
         let res_value;
         let jsonObj = pipedata.PipeServerJson;
-        let type = params.bigType;
         let zitype =  params.middleType;
         let geometry = null;
         if(params.geometry){

src/components/mapTest.vue

@@ -77,8 +77,8 @@ export default {
     //加载地图插件
     this.bridge = new CityGIS.Bridge({
       id:"i_map",
-      //url:'http://localhost:8081/#/jk_map?theme=dark&type=3D',
-      url:'https://cimweb.zjw.sh.cegn.cn:2007/VUE-Map-Tool-Widget/#/jk_map?theme=dark&type=3D',
+      url:'http://localhost:8081/#/jk_map?theme=dark&type=3D',
+      //url:'https://cimweb.zjw.sh.cegn.cn:2007/VUE-Map-Tool-Widget/#/jk_map?theme=dark&type=3D',
       onReady:function (){
         // console.log("地图创建完成");
       }

src/config/config_dojo_jk.json

@@ -1,9 +1,9 @@
 {
-  "css_url": "https://cimweb.zjw.sh.cegn.cn:2007/arcgis-js-api/library/4.24/esri/themes/light/main.css",
-  "jsapi_url": "https://cimweb.zjw.sh.cegn.cn:2007/arcgis-js-api/library/4.24/init.js",
+  "css_url": "http://localhost:8080/arcgis_js_api/library/4.24/esri/themes/light/main.css",
+  "jsapi_url": "http://localhost:8080/arcgis_js_api/library/4.24/init.js",
   "dojoConfig": {
     "async": true,
-    "baseUrl": "https://cimweb.zjw.sh.cegn.cn:2007/arcgis-js-api/library/4.24/dojo"
+    "baseUrl": "http://localhost:8080/arcgis_js_api/library/4.24/dojo"
   },
   "spatialReference": {
     "wkid": 102100

src/config/pipedata.json

@@ -1,14 +1,22 @@
 {
   "PipeServerJson" : [
-    { "GroupName": "电力", "GroupCode": "DL", "TypeName": "供电", "TypeCode": "GD", "serverName": "T81010101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8101L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8101P/MapServer/0" },
-    { "GroupName": "电力", "GroupCode": "DL", "TypeName": "路灯", "TypeCode": "LD", "serverName": "T81010201", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8101L/MapServer/1", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8101P/MapServer/1" },
-    { "GroupName": "电力", "GroupCode": "DL", "TypeName": "交通信号灯", "TypeCode": "XH", "serverName": "T81010401", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8101L/MapServer/2", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8101P/MapServer/2" },
-    { "GroupName": "通信", "GroupCode": "TX", "TypeName": "电信电缆", "TypeCode": "DX", "serverName": "T81020101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8102L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8102P/MapServer/0" },
-    { "GroupName": "通信", "GroupCode": "TX", "TypeName": "信息", "TypeCode": "XX", "serverName": "T81020301", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8102L/MapServer/1", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8102P/MapServer/1" },
-    { "GroupName": "通信", "GroupCode": "TX", "TypeName": "其它", "TypeCode": "QTTX", "serverName": "T81029901", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8102L/MapServer/2", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8102P/MapServer/3" },
-    { "GroupName": "给水", "GroupCode": "JS", "TypeName": "上水", "TypeCode": "SH", "serverName": "T81030101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8103L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8103P/MapServer/0" },
-    { "GroupName": "排水", "GroupCode": "PS", "TypeName": "雨污合流", "TypeCode": "HL", "serverName": "T81040301", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8104L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8104P/MapServer/1" },
-    { "GroupName": "燃气", "GroupCode": "RQ", "TypeName": "煤气", "TypeCode": "MQ", "serverName": "T81050101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8105L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8105P/MapServer/1" },
-    { "GroupName": "燃气", "GroupCode": "RQ", "TypeName": "天然气", "TypeCode": "TR", "serverName": "T81050201", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8105L/MapServer/1", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/longzhu/T8105P/MapServer/0" }
+    { "GroupName": "电力", "GroupCode": "DL", "TypeName": "供电", "TypeCode": "GD", "serverName": "T81010101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101P/MapServer/0" },
+    { "GroupName": "电力", "GroupCode": "DL", "TypeName": "路灯", "TypeCode": "LD", "serverName": "T81010201", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101L/MapServer/1", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101P/MapServer/1" },
+    { "GroupName": "电力", "GroupCode": "DL", "TypeName": "电车", "TypeCode": "DC", "serverName": "T81010301", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101L/MapServer/2", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101P/MapServer/2" },
+    { "GroupName": "电力", "GroupCode": "DL", "TypeName": "交通信号灯", "TypeCode": "XH", "serverName": "T81010401", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101L/MapServer/3", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101P/MapServer/3" },
+    { "GroupName": "电力", "GroupCode": "DL", "TypeName": "电力通讯", "TypeCode": "DT", "serverName": "T81010701", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101L/MapServer/4", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8101P/MapServer/4" },
+    { "GroupName": "通信", "GroupCode": "TX", "TypeName": "电信电缆", "TypeCode": "DX", "serverName": "T81020101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102P/MapServer/0" },
+    { "GroupName": "通信", "GroupCode": "TX", "TypeName": "广播电视", "TypeCode": "DS", "serverName": "T81020201", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102L/MapServer/1", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102P/MapServer/1" },
+    { "GroupName": "通信", "GroupCode": "TX", "TypeName": "信息", "TypeCode": "XX", "serverName": "T81020301", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102L/MapServer/2", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102P/MapServer/2" },
+    { "GroupName": "通信", "GroupCode": "TX", "TypeName": "监控", "TypeCode": "JK", "serverName": "T81020401", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102L/MapServer/3", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102P/MapServer/3" },
+    { "GroupName": "通信", "GroupCode": "TX", "TypeName": "其它", "TypeCode": "QTTX", "serverName": "T81029901", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102L/MapServer/4", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8102P/MapServer/4" },
+    { "GroupName": "给水", "GroupCode": "JS", "TypeName": "上水", "TypeCode": "SH", "serverName": "T81030101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8103L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8103P/MapServer/0" },
+    { "GroupName": "给水", "GroupCode": "JS", "TypeName": "上水", "TypeCode": "SS", "serverName": "T81030101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8103L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8103P/MapServer/0" },
+    { "GroupName": "排水", "GroupCode": "PS", "TypeName": "雨水", "TypeCode": "YS", "serverName": "T81040101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8104L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8104P/MapServer/0" },
+    { "GroupName": "排水", "GroupCode": "PS", "TypeName": "污水", "TypeCode": "WS", "serverName": "T81040201", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8104L/MapServer/1", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8104P/MapServer/1" },
+    { "GroupName": "排水", "GroupCode": "PS", "TypeName": "雨污合流", "TypeCode": "HL", "serverName": "T81040301", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8104L/MapServer/2", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8104P/MapServer/2" },
+    { "GroupName": "排水", "GroupCode": "PS", "TypeName": "其它", "TypeCode": "QTPS", "serverName": "T81049901", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8104L//MapServer/3", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8104P/MapServer/3" },
+    { "GroupName": "燃气", "GroupCode": "RQ", "TypeName": "煤气", "TypeCode": "MQ", "serverName": "T81050101", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8105L/MapServer/0", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8105P/MapServer/1" },
+    { "GroupName": "燃气", "GroupCode": "RQ", "TypeName": "天然气", "TypeCode": "TR", "serverName": "T81050201", "LineNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8105L/MapServer/1", "PointNo": "https://cimweb.zjw.sh.cegn.cn:2008/arcgis/rest/services/cim_huangpu/T8105P/MapServer/0" }
   ]
 }

src/config/typedata.json

@@ -16,7 +16,14 @@
       "s_c": "LD",
       "code": "810102"
     },
-
+    {
+      "id": "3",
+      "b_l": "电力",
+      "b_c": "DL",
+      "s_l": "电车",
+      "s_c": "DC",
+      "code": "810103"
+    },
     {
       "id": "4",
       "b_l": "电力",
@@ -25,7 +32,38 @@
       "s_c": "XH",
       "code": "810104"
     },
-
+    {
+      "id": "5",
+      "b_l": "电力",
+      "b_c": "DL",
+      "s_l": "广告景观灯",
+      "s_c": "DG",
+      "code": "810105"
+    },
+    {
+      "id": "6",
+      "b_l": "电力",
+      "b_c": "DL",
+      "s_l": "直流专用线路",
+      "s_c": "DY",
+      "code": "810106"
+    },
+    {
+      "id": "7",
+      "b_l": "电力",
+      "b_c": "DL",
+      "s_l": "电力通讯",
+      "s_c": "DT",
+      "code": "810107"
+    },
+    {
+      "id": "8",
+      "b_l": "电力",
+      "b_c": "DL",
+      "s_l": "其它",
+      "s_c": "QT",
+      "code": "810199"
+    },
     {
       "id": "9",
       "b_l": "通信",
@@ -34,7 +72,14 @@
       "s_c": "DX",
       "code": "810201"
     },
-
+    {
+      "id": "10",
+      "b_l": "通信",
+      "b_c": "TX",
+      "s_l": "广播电视",
+      "s_c": "DS",
+      "code": "810202"
+    },
     {
       "id": "11",
       "b_l": "通信",
@@ -43,7 +88,22 @@
       "s_c": "XX",
       "code": "810203"
     },
-
+    {
+      "id": "12",
+      "b_l": "通信",
+      "b_c": "TX",
+      "s_l": "监控",
+      "s_c": "JK",
+      "code": "810204"
+    },
+    {
+      "id": "13",
+      "b_l": "通信",
+      "b_c": "TX",
+      "s_l": "专线",
+      "s_c": "ZX",
+      "code": "810205"
+    },
     {
       "id": "14",
       "b_l": "通信",
@@ -57,9 +117,57 @@
       "b_l": "给水",
       "b_c": "JS",
       "s_l": "上水",
+      "s_c": "SS",
+      "code": "810301"
+    },
+    {
+      "id": "151",
+      "b_l": "给水",
+      "b_c": "JS",
+      "s_l": "上水",
       "s_c": "SH",
       "code": "810301"
     },
+    {
+      "id": "16",
+      "b_l": "给水",
+      "b_c": "JS",
+      "s_l": "原水",
+      "s_c": "OS",
+      "code": "810302"
+    },
+    {
+      "id": "17",
+      "b_l": "给水",
+      "b_c": "JS",
+      "s_l": "中水",
+      "s_c": "ZS",
+      "code": "810303"
+    },
+    {
+      "id": "18",
+      "b_l": "给水",
+      "b_c": "JS",
+      "s_l": "消防",
+      "s_c": "XF",
+      "code": "810304"
+    },
+    {
+      "id": "19",
+      "b_l": "给水",
+      "b_c": "JS",
+      "s_l": "绿化",
+      "s_c": "LS",
+      "code": "810305"
+    },
+    {
+      "id": "20",
+      "b_l": "给水",
+      "b_c": "JS",
+      "s_l": "其它",
+      "s_c": "QT",
+      "code": "810399"
+    },
     {
       "id": "21",
       "b_l": "排水",
@@ -68,7 +176,14 @@
       "s_c": "YS",
       "code": "810401"
     },
-
+    {
+      "id": "22",
+      "b_l": "排水",
+      "b_c": "PS",
+      "s_l": "污水",
+      "s_c": "WS",
+      "code": "810402"
+    },
     {
       "id": "23",
       "b_l": "排水",
@@ -77,7 +192,14 @@
       "s_c": "HL",
       "code": "810403"
     },
-
+    {
+      "id": "24",
+      "b_l": "排水",
+      "b_c": "PS",
+      "s_l": "其它",
+      "s_c": "QTPS",
+      "code": "810499"
+    },
     {
       "id": "25",
       "b_l": "热力",
@@ -262,6 +384,22 @@
       "s_c": "TR",
       "code": "810502"
     },
+    {
+      "id": "48",
+      "b_l": "燃气",
+      "b_c": "RQ",
+      "s_l": "液化气",
+      "s_c": "YH",
+      "code": "810503"
+    },
+    {
+      "id": "49",
+      "b_l": "燃气",
+      "b_c": "RQ",
+      "s_l": "其它",
+      "s_c": "QT",
+      "code": "810599"
+    },
     {
       "id": "50",
       "b_l": "长输管线",