Merge branch 'dev' of http://192.168.2.241:3000/wanghai/bimgis_sx into dev

src/config/bigScreenConfig.js

@@ -54,6 +54,10 @@ export const appconfig = {
         "name": "数据服务",
         "type": "data",
         "config": {
+          "sjfw": {
+            "name": "宜昌数据服务",
+            "url": "http://192.168.2.238:8090/iserver/services/data-sxgk_yc/rest/data"
+          },
         }
       },
       "geometry": {
@@ -67,16 +71,7 @@ export const appconfig = {
         "name": "专题地图服务",
         "type": "theme",
         "config": {
-          // "sjtypedt": {
-          //   "isDisplay": "1",
-          //   "name": "岳阳设计管线类型专题图",
-          //   "url": "http://192.168.2.238:8090/iserver/services/map-sxgk/rest/maps/hnyy_type"
-          // },
-          // "pcdtps": {
-          //   "isDisplay": "0",
-          //   "name": "排水存量管线（岳阳）",
-          //   "url": "http://192.168.2.238:8090/iserver/services/map-sxgk/rest/maps/hnyy_pc_ps"
-          // }
+
         }
       }
     }

src/views/groupPage/components/ComMapBox.vue

@@ -0,0 +1,17 @@
+<template>
+  <div class="widget-ComMapBox"></div>
+</template>
+
+<script lang="ts">
+import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
+//属性查看
+@Component({ name: 'ComMapBox' })
+export default class ComMapBox extends Vue {}
+</script>
+
+<style lang='scss'>
+.widget-ComMapBox {
+  width: 810;
+  height: 550;
+}
+</style>

src/views/groupPage/districtPageModules/commonModules/PropertiesView.vue

@@ -7,34 +7,15 @@
   >
     <div class="widget-PropertiesView" ref="widget-PropertiesView">
       <div class="wrap">
-        <div class="icon" title="属性查看" @click="showContent = !showContent">
-          属性查看
-          <div class="iconImg" :class="showContent ? 'upImg' : 'downImg'"></div>
-        </div>
-        <div class="content" v-show="showContent">
-          <div class="statistic">
-            <div class="deviceTypeGroup">
-              <el-tree
-                class="filter-tree"
-                show-checkbox
-                :data="treeData"
-                :props="defaultProps"
-                default-expand-all
-                node-key="id"
-                :default-checked-keys="[0, 1]"
-                :filter-node-method="filterNode"
-                @check="getCheckList()"
-                @node-click="handleTreeNodeClick"
-                ref="tree"
-              >
-                <span slot-scope="{ node }">
-                  {{ node.label }}
-                  <img v-if="setNodeImg(node)" :src="`${setNodeImg(node)}`" style="width: 16px; height: 16px" />
-                </span>
-              </el-tree>
-            </div>
-          </div>
-        </div>
+        <el-cascader
+          v-model="selectValue"
+          :options="options"
+          :props="{ expandTrigger: 'hover' }"
+          clearable
+          size="small"
+          placeholder="属性查看"
+          popper-class="widget-PropertiesView-el-cascader-dropDown"
+        ></el-cascader>
       </div>
     </div>
   </transition>
@@ -45,39 +26,31 @@ import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
 //属性查看
 @Component({ name: 'PropertiesView' })
 export default class PropertiesView extends Vue {
-  @Watch('filterText')
-  onChangeMethod(val) {
-    let target = this.$refs.tree as any
-    target.filter(val)
-  }
-  //参数
-  showContent: boolean = false
-  deviceCheckList = []
-  filterText = ''
-  treeData = []
-  defaultProps = { children: 'children', label: 'name' }
+  options = [
+    {
+      value: 'bjck',
+      label: '部件查看',
+      children: [
+        {
+          value: 'pick',
+          label: '点选'
+        },
+        {
+          value: 'rect',
+          label: '框选'
+        }
+      ]
+    },
+    {
+      value: '工程查看',
+      label: '工程查看'
+    }
+  ]
+  selectValue = null
   mounted() {
     let target = this.$refs['widget-PropertiesView'] as any
     target.style.setProperty('--right', '2.34375rem')
   }
-  //节点过滤
-  filterNode(value, data) {
-    if (!value) return true
-    return data.name.indexOf(value) !== -1
-  }
-  setNodeImg(node) {
-    let iconSrc
-    return iconSrc
-  }
-  handleTreeNodeClick(data) {
-    if (!data.coordiateX || !data.coordiateY) return
-    let position = [data.coordiateX, data.coordiateY]
-    // this.zoomCenter(position)
-  }
-  getCheckList() {
-    // this.resetLayerSource()
-    // this.deviceCheckList = this.$refs.tree.getCheckedNodes().filter((item) => !item.children)
-  }
 }
 </script>
 
@@ -107,134 +80,71 @@ export default class PropertiesView extends Vue {
     display: flex;
     flex-flow: column;
     align-items: flex-end;
-    width: 0;
-    .icon {
-      width: 0.520833rem /* 100/192 */;
-      height: 0.177083rem /* 34/192 */;
-      background: rgba(3, 109, 190, 0.4);
-      border-radius: 2px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      cursor: pointer;
-      font-size: 0.072917rem /* 14/192 */;
-      font-weight: 500;
-      color: #2ba7ff;
-      .iconImg {
-        width: 0.104167rem /* 20/192 */;
-        height: 0.083333rem /* 16/192 */;
-      }
-      .upImg {
-        background: url('~@/views/groupPage/images/三角上.png');
-      }
-      .downImg {
-        background: url('~@/views/groupPage/images/三角下.png');
-      }
-    }
-    .content {
-      margin-top: 0.026042rem /* 5/192 */;
-      // width: 1.979167rem /* 380/192 */;
-      width: 2.1875rem /* 420/192 */;
-      height: 1.979167rem /* 380/192 */;
-      background: linear-gradient(0deg, rgba(2, 20, 37, 0.56) 0%, #072643 100%);
-      .header {
-        height: 0.208333rem /* 40/192 */;
-        margin: 0.052083rem /* 10/192 */ 0.052083rem 0 0.052083rem;
-        padding: 0.026042rem /* 5/192 */;
-        border-bottom: 1px solid rgba(255, 255, 255, 0.1);
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        .title {
-          font-size: 0.083333rem /* 16/192 */;
-          font-weight: 500;
-          color: #2ba7ff;
-          white-space: nowrap;
-        }
-        .close {
-          display: flex;
-          align-items: center;
-          height: 100%;
-          color: rgba(138, 211, 253, 1);
-          font-size: 0.09375rem /* 18/192 */;
-          cursor: pointer;
-        }
-        .el-input {
-          width: 1.041667rem /* 200/192 */;
-        }
-        /deep/ .el-input__inner {
-          background-color: rgb(9, 48, 84);
-          border: none;
-          color: #eee;
-          height: 0.145833rem /* 28/192 */;
-        }
-        /deep/ .el-input-group__append {
-          background-color: rgb(9, 48, 84);
-          border: none;
-        }
-        /deep/ .el-icon-search:before {
-          color: rgba(138, 211, 253, 0.3);
-          font-size: 0.09375rem /* 18/192 */;
-        }
+    width: 0.625rem /* 120/192 */;
+    /deep/ .el-cascader {
+      $background: rgba(7, 48, 80, 0.9);
+      .el-input__inner {
+        color: rgba(43, 167, 255, 1);
+        border: none;
+        background-color: $background;
       }
-      .statistic {
-        display: flex;
-        flex-flow: column;
-        width: 100%;
-        height: calc(100% - 0.208333rem /* 40/192 */);
-        .deviceTypeGroup {
-          width: 100%;
-          height: calc(100% - 0.104167rem /* 20/192 */);
-          overflow: auto;
-          /deep/ .el-tree {
-            background: transparent;
-            color: #8eb2ce;
-            font-size: 0.083333rem /* 16/192 */;
-            .el-tree-node__content {
-              background-color: transparent;
-            }
-            .el-tree-node__content:hover {
-              background-color: rgb(62, 70, 112);
-            }
-            div[role='group'] > .el-tree-node {
-              width: 50%;
-              float: left;
-            }
-            .el-tree-node.is-current > .el-tree-node__content {
-              background: rgba(22, 119, 255, 0.1);
-              border-right: 3px solid #1677ff;
-              color: #4b95fe;
-              /deep/ .el-tree-node__expand-icon {
-                color: rgb(0, 112, 255);
-              }
-              /deep/ .is-leaf {
-                color: rgba(0, 0, 0, 0);
-              }
-            }
-          }
-          .el-checkbox {
-            color: #fff;
-            margin: 0.052083rem /* 10/192 */ 0;
-          }
-          /deep/ .el-checkbox__inner {
-            background: #0a1525;
-            border-color: rgba(3, 109, 190, 1);
-          }
-          /deep/ .el-checkbox__inner::after {
-            border: 2px solid rgba(17, 156, 255, 1);
-            border-left: 0;
-            border-top: 0;
-          }
-          /deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
-            background: #0a1525;
-            border-color: rgba(3, 109, 190, 1);
-          }
-          /deep/ .el-checkbox__input.is-checked + .el-checkbox__label {
-            color: #fff;
-          }
-        }
+      .el-icon-arrow-down:before {
+        content: '';
+        display: block;
+        // 定义元素宽高
+        margin-top: 0.041667rem /* 8/192 */;
+        width: 0.130208rem /* 25/192 */;
+        height: 0.078125rem /* 15/192 */;
+        background: url('~@/views/groupPage/images/三角上.png') no-repeat center center;
+        background-size: 100% 100%;
+        transform: rotate(180deg);
       }
     }
+    // .icon {
+    //   width: 0.520833rem /* 100/192 */;
+    //   height: 0.177083rem /* 34/192 */;
+    //   background: rgba(3, 109, 190, 0.4);
+    //   border-radius: 2px;
+    //   display: flex;
+    //   justify-content: center;
+    //   align-items: center;
+    //   cursor: pointer;
+    //   font-size: 0.072917rem /* 14/192 */;
+    //   font-weight: 500;
+    //   color: #2ba7ff;
+    //   .iconImg {
+    //     width: 0.104167rem /* 20/192 */;
+    //     height: 0.083333rem /* 16/192 */;
+    //   }
+    //   .upImg {
+    //     background: url('~@/views/groupPage/images/三角上.png');
+    //   }
+    //   .downImg {
+    //     background: url('~@/views/groupPage/images/三角下.png');
+    //   }
+    // }
+  }
+}
+</style>
+<style lang="scss">
+.widget-PropertiesView-el-cascader-dropDown {
+  background: rgba(2, 60, 93, 0.64);
+  border-color: #023c5d;
+  .el-cascader-menu {
+    color: #eee;
+    border-right: solid 1px rgba(64, 158, 255, 0.24);
+  }
+  .el-cascader-menu:last-child {
+    border-right: none;
+  }
+  .el-cascader-node:hover {
+    background-color: rgba(43, 167, 255, 0.2);
+  }
+  .popper__arrow {
+    border-bottom-color: rgba(43, 167, 255, 0.2) !important;
+  }
+  .popper__arrow::after {
+    border-bottom-color: rgba(43, 167, 255, 0.2) !important;
   }
 }
 </style>

src/views/groupPage/districtPageModules/commonModules/SearchBox.vue

@@ -100,7 +100,6 @@ export default class SearchBox extends Vue {
     style3D.bottomAltitude = height
     gLayerList.forEach((item) => {
       var layer = this.viewer.scene.layers.find(item)
-      console.log(layer)
       if (layer) {
         layer.style3D = style3D
         layer.refresh()

src/views/groupPage/districtPageModules/customTools/config.json

@@ -0,0 +1,675 @@
+{
+    "themelayer": [
+        {
+            "label": "专题图",
+            "data": [
+                {
+                    "label": "岳阳实施指南总图",
+                    "name": "dsmap3d",
+                    "type": "img",
+                    "add": true
+                },
+                {
+                    "label": "岳阳市污水系统规划图",
+                    "name": "wsmap2d",
+                    "type": "img",
+                    "add": true
+                },
+                {
+                    "label": "设计管线施工动态图",
+                    "name": "sjmvtdt",
+                    "type": "img",
+                    "add": true
+                },
+                {
+                    "label": "设计管线类型专题图",
+                    "name": "sjtypedt",
+                    "type": "img",
+                    "add": true
+                },
+                {
+                    "label": "普查排水管线",
+                    "name": "pcdtps",
+                    "type": "img",
+                    "add": true
+                },
+                {
+                    "label": "普查综合管线",
+                    "name": "pcdt",
+                    "type": "img",
+                    "add": true
+                }
+            ]
+        }
+    ],
+    "sjpipelayer": [
+        {
+            "label": "管线图层",
+            "data": [
+                {
+                    "label": "雨水管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_SJ_PSYS@sxgk#1",
+                            "name_2d": "TF_SJ_PSYS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_SJ_PSYS_Node@sxgk#1",
+                            "name_2d": "TF_SJ_PSYS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_SJ_PSYS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_SJ_PSHS_JG_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_SJ_PSYS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "污水管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_SJ_PSWS@sxgk#1",
+                            "name_2d": "TF_SJ_PSWS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_SJ_PSWS_Node@sxgk#1",
+                            "name_2d": "TF_SJ_PSWS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_SJ_PSWS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_SJ_PSWS_JG_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_SJ_PSWS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "雨污合流管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_SJ_PSHS@sxgk#1",
+                            "name_2d": "TF_SJ_PSHS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_SJ_PSHS_Node@sxgk#1",
+                            "name_2d": "TF_SJ_PSHS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_SJ_PSHS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_SJ_PSHS_JG_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_SJ_PSHS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "ylpipelayer": [],
+    "jgpipelayer": [
+        {
+            "label": "管线图层",
+            "data": [
+                {
+                    "label": "雨水管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_SJ_PSYS@sxgk#1",
+                            "name_2d": "TF_SJ_PSYS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_SJ_PSYS_Node@sxgk#1",
+                            "name_2d": "TF_SJ_PSYS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_SJ_PSYS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_SJ_PSHS_JG_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_SJ_PSYS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "污水管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_SJ_PSWS@sxgk#1",
+                            "name_2d": "TF_SJ_PSWS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_SJ_PSWS_Node@sxgk#1",
+                            "name_2d": "TF_SJ_PSWS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_SJ_PSWS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_SJ_PSWS_JG_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_SJ_PSWS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "雨污合流管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_SJ_PSHS@sxgk#1",
+                            "name_2d": "TF_SJ_PSHS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_SJ_PSHS_Node@sxgk#1",
+                            "name_2d": "TF_SJ_PSHS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_SJ_PSHS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_SJ_PSHS_JG_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_SJ_PSHS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "pcpipelayer": [
+        {
+            "label": "管线图层",
+            "data": [
+                {
+                    "label": "供水-输水管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_JSSS@sxgk#1",
+                            "name_2d": "TF_PC_JSSS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_JSSS_Node@sxgk#1",
+                            "name_2d": "TF_PC_JSSS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_PC_JSSS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_PC_JSSS_NODE_B@sxgk#2"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_PC_JSSS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "燃气-天燃气管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_RQTR@sxgk#1"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_RQTR_Node@sxgk#1"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "调压箱",
+                                    "name": "NETWORK_PC_RQTR_Node@sxgk#2"
+                                },
+                                {
+                                    "label": "井",
+                                    "name": "TF_PC_RQTR_JG_B_3D@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_PC_RQTR_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "电力-供电管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_DLGD@sxgk#1"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_DLGD_Node@sxgk#1"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "变压箱",
+                                    "name": "NETWORK_PC_DLGD_Node@sxgk#2"
+                                },
+                                {
+                                    "label": "检修井",
+                                    "name": "TF_PC_DLGD_JG_B_3D@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井井盖",
+                                    "name": "TF_PC_DLGD_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "电力-路灯管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_DLLD@sxgk#1",
+                            "name_2d": "TF_PC_DLLD_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_DLLD_Node@sxgk#1",
+                            "name_2d": "TF_PC_DLLD_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "控制箱",
+                                    "name": "NETWORK_PC_DLLD_Node@sxgk#2",
+                                    "name_2d": "TF_PC_DLLD_NODE_B@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井",
+                                    "name": "TF_PC_DLLD_JG_B_3D@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井井盖",
+                                    "name": "TF_PC_DLLD_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "排水-雨水管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_PSYS@sxgk#1",
+                            "name_2d": "TF_PC_PSYS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_PSYS_Node@sxgk#1",
+                            "name_2d": "TF_PC_PSYS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "篦子",
+                                    "name": "TF_PC_PSYS_BZ_B_3D@sxgk#1",
+                                    "name_2d": "TF_PC_PSYS_NODE_B@sxgk#2"
+                                },
+                                {
+                                    "label": "篦子井",
+                                    "name": "TF_PC_PSYS_BZ_B_3D@sxgk#2"
+                                },
+                                {
+                                    "label": "井",
+                                    "name": "TF_PC_PSYS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_PC_PSYS_NODE_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_PC_PSYS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "排水-污水管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_PSWS@sxgk#1",
+                            "name_2d": "TF_PC_PSWS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_PSWS_Node@sxgk#1",
+                            "name_2d": "TF_PC_PSWS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_PC_PSWS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_PC_PSWS_NODE_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_PC_PSWS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "排水-雨污合流管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_PSHS@sxgk#1",
+                            "name_2d": "TF_PC_PSHS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_PSHS_Node@sxgk#1",
+                            "name_2d": "TF_PC_PSHS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "井",
+                                    "name": "TF_PC_PSHS_JG_B_3D@sxgk#1",
+                                    "name_2d": "TF_PC_PSHS_NODE_B@sxgk#1"
+                                },
+                                {
+                                    "label": "井盖",
+                                    "name": "TF_PC_PSHS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "通信-电信管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_TXDX@sxgk#1"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_TXDX_Node@sxgk#1"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "接线箱",
+                                    "name": "NETWORK_PC_TXDX_Node@sxgk#2"
+                                },
+                                {
+                                    "label": "检修井",
+                                    "name": "TF_PC_TXDX_JG_B_3D@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井井盖",
+                                    "name": "TF_PC_TXDX_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "通信-电视管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_TXDS@sxgk#1",
+                            "name_2d": "TF_PC_TXDS_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "套管",
+                            "name": "TF_PC_TXDS_PIPE_B_3D@sxgk#1",
+                            "name_2d": "TF_PC_TXDS_PIPE_B_3D@sxgk#1"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_TXDS_Node@sxgk#1",
+                            "name_2d": "TF_PC_TXDS_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "接线箱",
+                                    "name": "NETWORK_PC_TXDS_Node@sxgk#2",
+                                    "name_2d": "TF_PC_TXDS_NODE_B@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井",
+                                    "name": "TF_PC_TXDS_JG_B_3D@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井井盖",
+                                    "name": "TF_PC_TXDS_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "通信-电话管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_TXDH@sxgk#1",
+                            "name_2d": "TF_PC_TXDH_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_TXDH_Node@sxgk#1",
+                            "name_2d": "TF_PC_TXDH_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "接线箱",
+                                    "name": "NETWORK_PC_TXDH_Node@sxgk#2",
+                                    "name_2d": "TF_PC_TXDH_NODE_B@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井",
+                                    "name": "TF_PC_TXDH_JG_B_3D@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井井盖",
+                                    "name": "TF_PC_TXDH_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "通信-监控管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_TXJK@sxgk#1",
+                            "name_2d": "TF_PC_TXJX_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "套管",
+                            "name": "TF_PC_TXJX_PIPE_B_3D@sxgk#1,NETWORK_PC_TXJX@sxgk#2"
+                        },
+                        {
+                            "label": "套管节点",
+                            "name": "NETWORK_PC_TXJX_Node@sxgk#3"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_TXJX_Node@sxgk#1",
+                            "name_2d": "TF_PC_TXJX_NODE_B@sxgk"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "接线箱",
+                                    "name": "NETWORK_PC_TXJX_Node@sxgk#2",
+                                    "name_2d": "TF_PC_TXJX_NODE_B@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井",
+                                    "name": "TF_PC_TXJX_JG_B_3D@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井井盖",
+                                    "name": "TF_PC_TXJX_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "通信-信息管网",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_TXXX@sxgk#1",
+                            "name_2d": "TF_PC_TXXX_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_TXXX_Node@sxgk#1",
+                            "name_2d": "TF_PC_TXXX_NODE_B@sxgk,TF_PC_TXXX_NODE_B@sxgk#1"
+                        },
+                        {
+                            "label": "附属物",
+                            "data": [
+                                {
+                                    "label": "接线箱",
+                                    "name": "NETWORK_PC_TXXX_Node@sxgk#2"
+                                },
+                                {
+                                    "label": "检修井",
+                                    "name": "TF_PC_TXXX_JG_B_3D@sxgk#1"
+                                },
+                                {
+                                    "label": "检修井井盖",
+                                    "name": "TF_PC_TXXX_JG_B_3D@sxgk#2"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "label": "其他-管廊",
+                    "data": [
+                        {
+                            "label": "管线",
+                            "name": "NETWORK_PC_ZH@sxgk#1",
+                            "name_2d": "TF_PC_ZH_PIPE_B@sxgk"
+                        },
+                        {
+                            "label": "其他节点",
+                            "name": "NETWORK_PC_ZH_Node@sxgk#1",
+                            "name_2d": "TF_PC_ZH_NODE_B@sxgk"
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "mapService": [
+        "img"
+    ],
+    "themeMap": "theme",
+    "baselayer": [
+        {
+            "label": "基础图层",
+            "data": [
+                {
+                    "label": "建筑物",
+                    "name": "TF_PAPN_BUILD@sxgk_base"
+                },
+                {
+                    "label": "倾斜摄影",
+                    "name": "Config"
+                },
+                {
+                    "label": "污水处理厂模型",
+                    "name": "TF_PAPN_DFWASTE_B@sywastewater,TF_PAPN_DFWATER1_3D@sywastewater,TF_PAPN_DFWATER2_3D@sywastewater"
+                },
+                {
+                    "label": "岳阳水质监测设备",
+                    "name": "TF_JCSB@sxgk#1"
+                }
+            ]
+        }
+    ]
+}

src/views/groupPage/districtPageModules/customTools/layerControl.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="widget-LayerList">
+  <div class="widget-layerControl">
     <el-tabs v-model="activeName" @tab-click="tabClick">
       <el-tab-pane label="基础图层" name="baselayer">
         <el-tree
@@ -57,8 +57,8 @@
   </div>
 </template>
 <script>
-// import Config from './config.json'
-// import $ from 'jquery'
+import Config from './config.json'
+import $ from 'jquery'
 const LayerType = {
   S3M: 'S3M',
   Imagery: 'Imagery',
@@ -66,7 +66,7 @@ const LayerType = {
   Mvt: 'Mvt'
 }
 export default {
-  name: 'LayerList',
+  name: 'layerControl',
   data() {
     return {
       activeName: 'baselayer',
@@ -106,13 +106,13 @@ export default {
   },
   mounted() {
     this.currentRef = this.$refs.baseTree
-    // if (window.viewer) {
-    //   this.viewer = window.viewer;
-    //   this.initMapConfig();
-    //   this.initLayers();
-    // } else {
-    //   console.error('viewer未初始化');
-    // }
+    if (window.viewer) {
+      this.viewer = window.viewer
+      this.initMapConfig()
+      this.initLayers()
+    } else {
+      console.error('viewer未初始化')
+    }
   },
   methods: {
     tabClick(data) {
@@ -137,15 +137,9 @@ export default {
     initMapConfig() {
       const themeLayer = []
       const baseLayer = []
-      const gisSource = this.AppX.appConfig.gisResource
+      const gisSource = this.AppX.gisResource
       const themeConfig = gisSource[Config.themeMap].config
       const themegroup = this.initThemelayers(themeConfig)
-      // for (let i = 0; i < themeConfig.length; i++) {
-      //     const themeitem = themeConfig[i];
-      //     themeLayer.push({ label: themeitem.name, name: themeitem.key, type: "img", add: true, dic: Config.themeMap, sort: themeitem.sort ? themeitem.sort : 1000 });
-      // }
-      // //排序
-      // themeLayer.sort((a, b) => { return a.sort - b.sort; })
       Config.themelayer[0].data = themegroup
       const mapService = Config.mapService
       for (let j = 0; j < mapService.length; j++) {
@@ -513,7 +507,7 @@ export default {
      */
     imageLayerControl(key, dic, checked) {
       if (checked) {
-        const gisitem = this.AppX.appConfig.gisResource[dic].config[key]
+        const gisitem = this.AppX.gisResource[dic].config[key]
         if (gisitem) {
           const url = gisitem.url
           this.viewer.imageryLayers.addImageryProvider(
@@ -540,7 +534,7 @@ export default {
      */
     mvtLayerControl(key, checked) {
       if (checked) {
-        const url = this.AppX.appConfig.gisResource['img'].config[key].url
+        const url = this.AppX.gisResource['img'].config[key].url
         this.AppX.runtimeConfig.viewer.scene.addVectorTilesMap({
           url: url,
           name: key
@@ -609,7 +603,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.widget-LayerList {
+.widget-layerControl {
   color: white;
   @import './common.scss';
 }

src/views/groupPage/districtPageModules/customTools/pbsTree.vue

@@ -178,32 +178,33 @@ export default {
     handleNodeClick(data) {
       this.tipShow = false
       if (!this.viewer) return
-      if (data !== null && data.layerName) {
-        let lyName = '',
-          code = data.value
-        if (data.layerName.indexOf(',') > -1) {
-          lyName = data.layerName.split(',')[1]
-        } else {
-          lyName = data.layerName
-        }
-        const pipeInfoConstructor = Vue.extend(PipeUnitInfo)
-        // if(!this.pipeInfo){
-        const pipeInfo = new pipeInfoConstructor({
-          data: {
-            pickType: 'point',
-            isInteractive: false,
-            locateUnit: {
-              name: lyName,
-              id: code
-            }
-          },
-          store: this.$store
-        }).$mount()
-        // }else{
-        //   this.pipeInfo.$set(this.pipeInfo.locateUnit,"name",lyName)
-        //   this.pipeInfo.$set(this.pipeInfo.locateUnit,"id",code)
-        // }
-      }
+      console.log(data)
+      // if (data !== null && data.layerName) {
+      //   let lyName = '',
+      //     code = data.value
+      //   if (data.layerName.indexOf(',') > -1) {
+      //     lyName = data.layerName.split(',')[1]
+      //   } else {
+      //     lyName = data.layerName
+      //   }
+      //   const pipeInfoConstructor = Vue.extend(PipeUnitInfo)
+      //   // if(!this.pipeInfo){
+      //   const pipeInfo = new pipeInfoConstructor({
+      //     data: {
+      //       pickType: 'point',
+      //       isInteractive: false,
+      //       locateUnit: {
+      //         name: lyName,
+      //         id: code
+      //       }
+      //     },
+      //     store: this.$store
+      //   }).$mount()
+      //   // }else{
+      //   //   this.pipeInfo.$set(this.pipeInfo.locateUnit,"name",lyName)
+      //   //   this.pipeInfo.$set(this.pipeInfo.locateUnit,"id",code)
+      //   // }
+      // }
     },
     //右键点击显示导出按钮
     exportQRCode(e, data) {