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

2 years ago · 415972aede
2 changed files with 9 additions and 8 deletions
--- a/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
@ -163,10 +163,10 @@ export default {
          label: "联建单位",
          value: "5",
        },
-        {
+        // {
-          label: "15分钟生活圈商家",
+        //   label: "15分钟生活圈商家",
-          value: "6",
+        //   value: "6",
-        },
+        // },
      ],
    }
  },
--- a/src/views/dataBoard/overview/components/ResourceScheduling.vue
+++ b/src/views/dataBoard/overview/components/ResourceScheduling.vue
@ -146,10 +146,11 @@ export default {
              label: "联建单位",
              value: "5",
            },
-            {
+            // {
-              label: "15分钟生活圈商家",
+            //   label: "15分钟生活圈商家",
-              value: "6",
+            //   value: "6",
-            },]
+            // },
          ]
        }, {
          label: '物资源',
          children: []