字典修改和地图服务功能优化

BJYSYBZ_C/src/utils/dicts.js

@@ -30,9 +30,6 @@ export const ydlxDicts = [{
   }, {
     label: '其它服务设施用地',
     value: 'B9'
-  }, {
-    label: '商业服务业用地(工业用地)',
-    value: 'B5'
   }]
 },
 {
@@ -47,9 +44,12 @@ export const ydlxDicts = [{
   }, {
     label: '三类工业用地',
     value: 'M3'
-    }, {
+  }, {
     label: '工业用地或商业服务业用地',
     value: 'M4'
+  }, {
+    label: '商业服务业用地(工业用地)',
+    value: 'M5'
   }]
 },
 {

WEB-VIEW2/src/components/ol/VlConfigLayers/create-layer/index.js

@@ -16,7 +16,7 @@ export function isLayerGroup(layerOrConfig) {
  * @param cb
  */
 export function layerConfigEach(enabledLayersConfig, cb = (layerConfig, isGroup) => {}) {
-  function fn(tree = []) {
+  function fn (tree = []) {
     tree.forEach(node => {
       try {
         if (isLayerGroup(node)) {

WEB-VIEW2/src/views/components/BigScreenMap/index.vue

@@ -585,14 +585,18 @@ export default {
     },
     switchLayerHandle (idsState) {
       setTimeout(() => {
-        Object.entries(idsState).forEach(([k, v])=> {
-          const layerById = this.$refs.configLayer.getLayerConfigById(k);
-          if (layerById) {
-            layerById.visible = v
-          }
-        }, 500)
-          this.$vm.$emit('switchLayerEvent', idsState)
-      })
+        this.$vm.$emit('switchLayerEvent', idsState)
+        try {
+          Object.entries(idsState).forEach(([k, v])=> {
+            const layerById = this.$refs.configLayer.getLayerConfigById(k);
+            if (layerById) {
+              layerById.visible = v
+            }
+          })
+        } catch (err) {
+          console.error('switchLayerHandle Error'+err)
+        }
+      }, 500)
     },
     showLandDetail(props) {
       this.$vm.$emit('yqModalShow', props);

WEB-VIEW2/src/views/components/SwitchLayer/index.vue

@@ -18,13 +18,13 @@
               <Checkbox label="bj-wlyd">未利用地</Checkbox>
             </DropdownItem>
           </div>
-          <p class="groupTitle" @click="switchDropShow(1)"><Icon :type="currentShow === 0 ? 'md-arrow-dropdown' : 'md-arrow-dropright'" />临时用地</p>
+          <p class="groupTitle" @click="switchDropShow(1)"><Icon :type="currentShow === 1 ? 'md-arrow-dropdown' : 'md-arrow-dropright'" />临时用地</p>
           <div class="groupContent" v-show="currentShow === 1">
             <DropdownItem>
             <Checkbox label="bj-lsyd">临时用地</Checkbox>
           </DropdownItem>
           </div>
-          <p class="groupTitle" @click="switchDropShow(2)"><Icon :type="currentShow === 0 ? 'md-arrow-dropdown' : 'md-arrow-dropright'" />供地</p>
+          <p class="groupTitle" @click="switchDropShow(2)"><Icon :type="currentShow === 2 ? 'md-arrow-dropdown' : 'md-arrow-dropright'" />供地</p>
           <div class="groupContent" v-show="currentShow === 2">
             <DropdownItem>
               <Checkbox label="syyd">商业用地</Checkbox>

WEB-VIEW2/src/webview.vue

@@ -78,6 +78,7 @@ export default {
       detailData: {},
       mapObj: null,
       mapTypeObj: { //默认是临时用地
+        'bj-wlyd': false,
         'bj-lsyd': true,
         'syyd': false,
         'bj-gyyd-new': false,