wuhongbo 1 år sedan
förälder
incheckning
17cc033e06

+ 28 - 0
BJYSYBZ_C/public/config.js

@@ -346,6 +346,34 @@ window.ApplicationConfig = {
                 }
               }
             },
+            {
+              id: "bjq-xzq",
+              name: "滨江区行政区",
+              enabled: true,
+              visible: false,
+              serverType: "dynamic",
+              params: {
+                layers: "show:0",
+                layerDefs: {
+                  0: "xzqdm like '330108%'"
+                }
+              },
+              url: "https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJXZQ/MapServer",
+            },
+            {
+              id: "bjq-gd",
+              name: "滨江区供地地块",
+              enabled: true,
+              visible: false,
+              serverType: "dynamic",
+              params: {
+                layers: "show:0",
+                layerDefs: {
+                  0: "xzqdm like '330108%'"
+                }
+              },
+              url: "https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJQGD/MapServer",
+            },
             {
               id: "bj-wnz",
               name: "滨江未农转用地块",

+ 25 - 9
BJYSYBZ_C/src/components/ol/VLImgLayers/index.vue

@@ -6,9 +6,14 @@
           >查看控规</el-checkbox
         >
       </div>
-      <div class="kgBox">
-        <p>控规</p>
+      <div class=" checkBox checkBox1">
+        <el-checkbox v-model="checked1" @change="checkBoxChange1"
+          >查看供地</el-checkbox
+        >
       </div>
+      <!-- <div class="kgBox">
+        <p>控规</p>
+      </div> -->
     </div>
     <div class="sliderBox">
       <div>
@@ -20,7 +25,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'VlImglayers',
   props: {
@@ -28,6 +32,7 @@ export default {
   },
   data() {
     return {
+      checked1: false,
       checked: false,
       sliderVal: 100,
       moreLayers: ['hzyx-202310'],
@@ -39,8 +44,16 @@ export default {
     checkBoxChange(val) {
       this.$emit('change', val);
     },
-    sliderChangeHandle () {
-      this.$emit('sliderChange', this.sliderVal);
+    checkBoxChange1(val) {
+      this.$emit('change1', val);
+    },
+    sliderChangeHandle() {
+      if (this.checked) {
+        this.$emit('sliderChange', this.sliderVal);
+      }
+      if (this.checked1) {
+        this.$emit('sliderChange1', this.sliderVal);
+      }
     },
   },
 };
@@ -83,6 +96,9 @@ export default {
         color: #fff;
       }
     }
+    .checkBox1 {
+      top: 30px;
+    }
     .kgBox {
       position: absolute;
       right: 0;
@@ -102,11 +118,11 @@ export default {
     align-items: center;
     height: 20px;
     margin-top: 5px;
-    >div {
-        flex: 1;
-        margin-right: 3px;
+    > div {
+      flex: 1;
+      margin-right: 3px;
     }
-    >span {
+    > span {
       display: inline-block;
       padding-left: 5px;
     }

+ 5 - 6
BJYSYBZ_C/src/views/BjWlydManageView/components/YqxqMap.vue

@@ -72,7 +72,7 @@ export default {
       areaType: 'city',
       oldGzData: [],
       mapTitle: '供地总面积',
-      visibleLayerIds: ['bj-dkgl', 'hzyx-202310'],
+      visibleLayerIds: ['bj-dkgl', 'hzyx-202310', 'bjq-xzq'],
       mapImgLayers: ['bj-kgdk'],
       xzqdmArr: [],
       year: 2021,
@@ -81,14 +81,13 @@ export default {
     };
   },
   methods: {
-    async mapClickHandle (payload1, key) {
+    async mapClickHandle(payload1, key) {
       if (key == 'bj-dkgl') {
-        this.$vm.$emit("setGdDetailType", 24);
+        this.$vm.$emit('setGdDetailType', 24);
       } else if (key == 'bj-kgdk') {
-        this.$vm.$emit("setGdDetailType", 101);
+        this.$vm.$emit('setGdDetailType', 101);
       }
-      this.$vm.$emit("getGdDetailData", payload1);
-
+      this.$vm.$emit('getGdDetailData', payload1);
     },
     showLayer(layerId) {
       this.$vm.$emit('setVisibleLayerIdEvent', layerId);

+ 15 - 1
BJYSYBZ_C/src/views/components/BigScreenMap/index.vue

@@ -48,7 +48,7 @@
       :default-expand="defaultExpand"
       v-if="legendShow"
     />
-    <VlImglayers :imgLayers="imgLayers" @change="vlImgLayerChangeHandle" @sliderChange="vlImgLayerSliderChangeHandle"> </VlImglayers>
+    <VlImglayers :imgLayers="imgLayers" @change="vlImgLayerChangeHandle" @change1="vlImgLayerChangeHandle1" @sliderChange="vlImgLayerSliderChangeHandle" @sliderChange1="vlImgLayerSliderChangeHandle1"> </VlImglayers>
     <vl-feature-flicker
       :feature="feature"
       new-layer
@@ -783,11 +783,25 @@ export default {
         this.visibleLayerId = this.visibleLayerIds[0];
       }
     },
+    vlImgLayerChangeHandle1(val) {
+      this.visibleLayerId = 'bjq-gd'
+      const layer = this.$refs.configLayer.getLayerConfigById(this.visibleLayerId);
+      layer.enabled = true;
+      layer.visible = val;
+      if (!val) {
+        this.visibleLayerId = this.visibleLayerIds[0];
+      }
+    },
     vlImgLayerSliderChangeHandle(val) {
       this.visibleLayerId = 'bj-kgdk'
       const layer = this.$refs.configLayer.getLayerConfigById(this.visibleLayerId);
       layer.opacity = val / 100
     },
+    vlImgLayerSliderChangeHandle1(val) {
+      this.visibleLayerId = 'bjq-gd'
+      const layer = this.$refs.configLayer.getLayerConfigById(this.visibleLayerId);
+      layer.opacity = val / 100
+    },
     removeHotLayer() {
       this.map.removeLayer(this.heatMapLayer);
       this.heatMapLayer = null;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


+ 2 - 2
YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -3371,8 +3371,8 @@ function normalizeComponent (
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var config = {
   //发布线上需要吧login里面地址跟这里替换掉
-  // baseUrl: "http://10.10.9.71:7089/ysgzybz/",
-  baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
+  baseUrl: "http://10.10.9.71:7089/ysgzybz/",
+  // baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
 
   bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer' };var _default =
 

+ 2 - 2
YSGZYBZ_WXAPP/utils/config.js

@@ -1,7 +1,7 @@
 const config = {
   //发布线上需要吧login里面地址跟这里替换掉
-  // baseUrl: "http://10.10.9.71:7089/ysgzybz/",
-  baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
+  baseUrl: "http://10.10.9.71:7089/ysgzybz/",
+  // baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
 
   bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer'
 }

Vissa filer visades inte eftersom för många filer har ändrats