Merge remote-tracking branch 'origin/dev' into dev

src/assets/json/waterAccumulationPoint.json

@@ -62,6 +62,30 @@
   ],
 
   "areaDistributionLayer":  [
+    {
+      "labelId": "D999999012024120401",
+      "label": "城市开发边界",
+      "ADDRESS": "https://cimweb.zjw.sh.cegn.cn:2008/MapProxyApi/getSceneServer/gxjh_fwjk/D0103010720241201",
+      "TYPE": "feature",
+      "COORDINATE_SYSTEM": "1",
+      "STATE": "2",
+      "SERVICE_TYPE": "1",
+      "visible": true,
+      "color": "rgba(228,139,139,0.7)",
+      "borderColor": "rgba(0,0,0, 1)"
+    },
+    {
+      "labelId": "D999999012024120402",
+      "label": "建成区范围",
+      "ADDRESS": "https://cimweb.zjw.sh.cegn.cn:2008/MapProxyApi/getSceneServer/gxjh_fwjk/D0103010820241201",
+      "TYPE": "feature",
+      "COORDINATE_SYSTEM": "1",
+      "STATE": "2",
+      "SERVICE_TYPE": "1",
+      "visible": true,
+      "color": "rgba(255,170,0,0.7)",
+      "borderColor": "rgba(255,170,0,1)"
+    },
     {
       "labelId": "D9999990320240701",
       "label": "项目信息",

src/views/system/cityStatistics/regionalAreaDistribution/index.vue

@@ -202,7 +202,9 @@ function showProjectInfo() {
       visible: item.visible,
       url: item.ADDRESS,
       title: item.label,
-      wkid: item.COORDINATE_SYSTEM
+      wkid: item.COORDINATE_SYSTEM,
+      color: item.color,
+      borderColor: item.borderColor
     });
   });
 }

src/views/system/projectDistribution/divisionalStatistics/city/index.vue

@@ -73,6 +73,10 @@
           </div>
         </div>
         <div class="content">
+          <div class="item" v-for="item in serviceList" @click="changeServiceStatus(item)" :key="item.labelId">
+            <div class="single-color" :style="{ backgroundColor: item.color }"></div>
+            <span :class="[item.visible ? 'chosen_title' : 'unchosen_title']">{{ item.label }}</span>
+          </div>
           <div class="item" v-for="item in layerList" @click="changeProjectStatus(item)" :key="item.name">
             <img v-show="item.chosen" class="item_img" :src="item.src">
             <img v-show="!item.chosen" class="item_img" :src="item.unchosensrc">
@@ -120,7 +124,7 @@ import {projectMenuShowInfo, projectSortList} from "@/api/system/cityStatistics/
 import {homePieOption, xmlxOption} from "@/utils/echart/echartOption";
 import {findOrgList} from "@/api/common";
 import {
-  AddSingleLayer_Achieve,
+  AddSingleLayer_Achieve, AddSingleLayer_Common,
   AddSingleLayer_Plan,
   AddSingleLayer_ProjectInfo,
   SetAreaLocation
@@ -193,6 +197,7 @@ const progressList = ref([
   }
 ]);
 const layerList = ref([]);
+const serviceList = ref([]);
 let xgList = ref([]);
 let id = null;  //区县编码
 let projectSort = null;  //新建-规划编码
@@ -218,10 +223,14 @@ function imgPreview(row){
 }
 function showAllType(status){
   allTypeVisible.value = status;
+  serviceList.value.forEach((item) => {
+    item.visible = status;
+  });
   layerList.value.forEach(item=>{
     item.chosen = status
   });
   showProjectInfo();
+  showServiceInfo();
 }
 
 function changeProjectType(item){
@@ -229,6 +238,11 @@ function changeProjectType(item){
   showProjectInfo()
 }
 
+function changeServiceStatus(item) {
+  item.visible = !item.visible;
+  showServiceInfo();
+}
+
 function changeProjectStatus(item){
   item.chosen = !item.chosen;
   showProjectInfo()
@@ -310,10 +324,10 @@ function FindOriginList(id){
         where = "区县名称='"+currentArea.datavalue+"'";
         achieveWhere = "区管委会='"+currentArea.datavalue+"'";
       }
-      AddSingleLayer_Achieve({
-        where:achieveWhere,
-        visible:true
-      });
+      // AddSingleLayer_Achieve({
+      //   where:achieveWhere,
+      //   visible:true
+      // });
       SetAreaLocation({
         type:'区县',
         where
@@ -321,6 +335,22 @@ function FindOriginList(id){
     }
   })
 }
+function showServiceInfo(){
+  serviceList.value.forEach((item) => {
+    AddSingleLayer_Common({
+      type: item.TYPE,
+      id: item.labelId,
+      visible: item.visible,
+      url: item.ADDRESS,
+      title: item.label,
+      wkid: item.COORDINATE_SYSTEM,
+      color: item.color,
+      borderColor: item.borderColor
+    });
+  });
+}
+
+
 function showProjectInfo(){
   findOrgList().then(res =>{
     if(res.code == '200'){
@@ -377,6 +407,32 @@ onMounted(() => {
       unchosensrc:new URL('../../../../../assets/images/system/water_none.png', import.meta.url).href
     }
   ];
+  serviceList.value = [
+    {
+    "labelId": "D999999012024120401",
+    "label": "城市开发边界",
+    "ADDRESS": "https://cimweb.zjw.sh.cegn.cn:2008/MapProxyApi/getSceneServer/gxjh_fwjk/D0103010720241201",
+    "TYPE": "feature",
+    "COORDINATE_SYSTEM": "1",
+    "STATE": "2",
+    "SERVICE_TYPE": "1",
+    "visible": true,
+    "color": "rgba(228,139,139,0.7)",
+    "borderColor": "rgba(0,0,0, 1)"
+  },
+    {
+      "labelId": "D999999012024120402",
+      "label": "建成区范围",
+      "ADDRESS": "https://cimweb.zjw.sh.cegn.cn:2008/MapProxyApi/getSceneServer/gxjh_fwjk/D0103010820241201",
+      "TYPE": "feature",
+      "COORDINATE_SYSTEM": "1",
+      "STATE": "2",
+      "SERVICE_TYPE": "1",
+      "visible": true,
+      "color": "rgba(255,170,0,0.7)",
+      "borderColor": "rgba(255,170,0,1)"
+    }];
+  showAllType(true)
 })
 
 
@@ -660,6 +716,13 @@ onMounted(() => {
           display: flex;
           align-items: center;
           cursor: pointer;
+          .single-color {
+            width: 30px;
+            height: 15px;
+            border-radius: 4px;
+            margin-left: 8px;
+            margin-right: 4px;
+          }
           .item_img{
             border: none;
             width: 30px;