修改自定义模型弹窗无数据; 修改街镇下拉框

src/components/common/BottomForm/CreateTaskForm.vue

@@ -99,6 +99,7 @@
 </template>
 
 <script>
+import { street } from "@/config/common";
 /**
  * 底部菜单（申请任务）组件
  * @author: LiuMengxiang
@@ -116,7 +117,7 @@ export default {
         taskName: "",
         taskType: "",
         associatedItems: "",
-        streetOfOwnership: "",
+        streetOfOwnership: "全部",
         taskDescription: "",
       },
       // 新建任务form表单校验
@@ -218,25 +219,34 @@ export default {
       ],
       // 所属街道Options
       streetOfOwnershipOptions: [
-        {
-          value: "0",
-          label: "全部街道",
-        },
-        {
-          value: "1",
-          label: "花木街道",
-        },
-        {
-          value: "2",
-          label: "陆家嘴街道",
-        },
-        {
-          value: "3",
-          label: "……",
-        },
+        // {
+        //   value: "0",
+        //   label: "全部街道",
+        // },
+        // {
+        //   value: "1",
+        //   label: "花木街道",
+        // },
+        // {
+        //   value: "2",
+        //   label: "陆家嘴街道",
+        // },
+        // {
+        //   value: "3",
+        //   label: "……",
+        // },
       ],
     };
   },
+  created() {
+    // 街道下拉框
+    for (let key in street) {
+      this.streetOfOwnershipOptions.push({
+        value: street[key],
+        label: street[key],
+      });
+    }
+  },
   mounted() {
     // 申请任务事件监听
     this.$bus.$on("sqrw", () => {
@@ -251,9 +261,9 @@ export default {
   methods: {
     // 当用户点击svg底座时，切换底部菜单显示隐藏状态。
     changeShowBottomMenusStatus() {
-        // 打开弹窗
-        this.dialogVisible = true;
-        this.$emit("changeShowBottomMenusStatus", false);
+      // 打开弹窗
+      this.dialogVisible = true;
+      this.$emit("changeShowBottomMenusStatus", false);
     },
     // 弹窗关闭询问
     handleClose() {

src/components/common/BottomForm/CustomModelDialog.vue

@@ -72,15 +72,15 @@ export default {
       inputName: "自定义模型1",
       checkedList: [],
       checkArr: [
-        // "永久基本农田",
-        // "建设用地减量化",
-        // "一般耕地种林",
-        // "一般耕地",
-        // "基本农田被违规占用",
-        // "一般耕地抛荒",
-        // "高标准农田",
-        // "一般耕地被违规占用",
-        // "减量化复垦地块后种林",
+        "永久基本农田",
+        "建设用地减量化",
+        "一般耕地种林",
+        "一般耕地",
+        "基本农田被违规占用",
+        "一般耕地抛荒",
+        "高标准农田",
+        "一般耕地被违规占用",
+        "减量化复垦地块后种林",
       ],
     };
   },

src/config/common.js

@@ -4,7 +4,7 @@ import publicFun from "@/utils/publicFunction.js";
  * 街道
  */
 export const street = {
-  浦东新区:"浦东新区",
+  全部:"全部",
   祝桥镇: "祝桥镇",
   大团镇: "大团镇",
   老港镇: "老港镇",

src/views/FrequencyView.vue

@@ -71,6 +71,7 @@
 <script>
 import NewSelect from "@/components/common/NewSelect.vue";
 import Pagination from "@/components/common/Pagination.vue";
+import { street } from "@/config/common";
 /**
  * 频发问题 dialog -- 智能辅助
  * @author: Gao Lu
@@ -88,12 +89,12 @@ export default {
           label: "土地资源",
         },
       ],
-      streetSelectVal: "全部街道",
+      streetSelectVal: "全部",
       streetOptions: [
-        {
-          value: "全部街道",
-          label: "全部街道",
-        },
+        // {
+        //   value: "全部",
+        //   label: "全部街道",
+        // },
       ],
       timeSelectVal: "2018",
       timeOptions: [
@@ -151,6 +152,16 @@ export default {
       },
     };
   },
+  created() {
+    this.streetOptions = [];
+    // 街道下拉框
+    for (let key in street) {
+      this.streetOptions.push({
+        value: street[key],
+        label: street[key],
+      });
+    }
+  },
   methods: {
     queryEvent() {
       console.log("查询");

src/views/HomeView.vue

@@ -23,7 +23,7 @@
           menuIndex: '2',
           subMenuIndex: '5',
           legendIcon: legendIcon,
-          legendTitle: legendTitle
+          legendTitle: legendTitle,
         }"
       />
       <div class="select-title">所属街道</div>
@@ -41,7 +41,7 @@
               type: 'card',
               title: streetSelectVal + '资源问题',
               titleWidth: 40,
-              boxWidth: '780'
+              boxWidth: '780',
             }"
           >
             <template slot="top">
@@ -57,7 +57,7 @@
               type: 'card',
               title: '资金投入TOP10',
               titleWidth: 85,
-              boxWidth: '400'
+              boxWidth: '400',
             }"
             ><template slot="top"><TopCard :dataSize="10" /></template
           ></MenuCard>
@@ -66,7 +66,7 @@
               type: 'card',
               title: '历年频发问题TOP10',
               titleWidth: 85,
-              boxWidth: '400'
+              boxWidth: '400',
             }"
             ><template slot="top"><TopCard :dataSize="10" /></template
           ></MenuCard>
@@ -75,7 +75,10 @@
     </div>
 
     <!-- 综合分析 -->
-    <ComprehensiveAnalysis id="ComprehensiveContainer" v-if="$ifMenu('3', '')" />
+    <ComprehensiveAnalysis
+      id="ComprehensiveContainer"
+      v-if="$ifMenu('3', '')"
+    />
 
     <!-- 法律法规 -->
     <LawView id="LawContainer" v-if="$ifMenu('5', '1')" />
@@ -90,7 +93,8 @@
     </div>
     <!-- 左侧菜单列(较宽，两列) -- 疑点筛查 -->
     <div id="leftMenusW">
-      <MenuCard v-for="item in menus.leftW" :menuData="item" :key="item.title"> </MenuCard>
+      <MenuCard v-for="item in menus.leftW" :menuData="item" :key="item.title">
+      </MenuCard>
     </div>
     <!-- 中部菜单列 -->
     <div id="mainMenus">
@@ -135,7 +139,7 @@
           boxHeight: '180',
           menuIndex: '1',
           legendIcon: legendIcon,
-          legendTitle: legendTitle
+          legendTitle: legendTitle,
         }"
       />
     </div>
@@ -166,7 +170,13 @@ import Header from "@/components/layout/Header.vue";
 import MenuCard from "@/components/layout/MenuCard";
 import NewSelect from "@/components/common/NewSelect.vue";
 import BarChart from "@/components/chart/BarChart.vue";
-import { street, streetLocation, soilData, waterData, forestryData } from "@/config/common";
+import {
+  street,
+  streetLocation,
+  soilData,
+  waterData,
+  forestryData,
+} from "@/config/common";
 import publicFun from "@/utils/publicFunction.js";
 import TagCard from "@/components/common/TagCard";
 import ChartCard from "@/components/common/ChartCard.vue";
@@ -201,7 +211,7 @@ export default {
     Legend,
     WholeProcessManagement,
     FrequencyView,
-    LawView
+    LawView,
   },
   data() {
     return {
@@ -209,7 +219,7 @@ export default {
         type: "lr",
         title: "林地面积",
         value: 654,
-        unit: "公顷"
+        unit: "公顷",
       },
       testTitle: "土地资源",
       activeIndex: 1,
@@ -230,37 +240,37 @@ export default {
                   title: "基本农田面积",
                   value: 150,
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [100, 120, 150]
+                  valueData: [100, 120, 150],
                 },
                 {
                   title: "储备土地面积",
                   value: 250,
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [2000, 220, 250]
+                  valueData: [2000, 220, 250],
                 },
                 {
                   title: "减量化面积",
                   value: 350,
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [300, 20, 350]
+                  valueData: [300, 20, 350],
                 },
                 {
                   title: "一般耕地面积",
                   value: 450,
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [40, 420, 450]
+                  valueData: [40, 420, 450],
                 },
                 {
                   type: "tb",
                   title: "土地资源面积",
                   value: 172,
-                  unit: "公顷"
-                }
-              ]
+                  unit: "公顷",
+                },
+              ],
             },
             bottomSolt: {
-              commonName: "ChartCard"
-            }
+              commonName: "ChartCard",
+            },
           },
           {
             type: "card",
@@ -278,7 +288,7 @@ export default {
                   value: 654,
                   unit: "条",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [40, 420, 654]
+                  valueData: [40, 420, 654],
                 },
                 {
                   type: "tb",
@@ -286,7 +296,7 @@ export default {
                   value: 654,
                   unit: "条",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [400, 420, 654]
+                  valueData: [400, 420, 654],
                 },
                 {
                   type: "tb",
@@ -294,13 +304,13 @@ export default {
                   value: 654,
                   unit: "条",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [400, 40, 654]
-                }
-              ]
+                  valueData: [400, 40, 654],
+                },
+              ],
             },
             bottomSolt: {
-              commonName: "ChartCard"
-            }
+              commonName: "ChartCard",
+            },
           },
           {
             type: "card",
@@ -318,7 +328,7 @@ export default {
                   value: 654,
                   unit: "公顷",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [40, 420, 654]
+                  valueData: [40, 420, 654],
                 },
                 {
                   type: "lr",
@@ -326,14 +336,14 @@ export default {
                   value: 654,
                   unit: "公顷",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [400, 420, 654]
-                }
-              ]
+                  valueData: [400, 420, 654],
+                },
+              ],
             },
             bottomSolt: {
-              commonName: "ChartCard"
-            }
-          }
+              commonName: "ChartCard",
+            },
+          },
         ],
         leftW: [
           {
@@ -347,7 +357,7 @@ export default {
             subMenuIndex: "1",
             menuName: "土地资源",
             position: "left",
-            gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" }
+            gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
           },
           {
             type: "imageMenu",
@@ -360,7 +370,7 @@ export default {
             subMenuIndex: "1",
             menuName: "土地资源",
             position: "left",
-            gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" }
+            gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
           },
           {
             type: "imageMenu",
@@ -373,7 +383,7 @@ export default {
             subMenuIndex: "1",
             menuName: "土地资源",
             position: "left",
-            gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" }
+            gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
           },
           {
             type: "imageMenu",
@@ -386,8 +396,8 @@ export default {
             subMenuIndex: "1",
             menuName: "土地资源",
             position: "left",
-            gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" }
-          }
+            gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
+          },
         ],
         main: [
           {
@@ -398,8 +408,8 @@ export default {
             boxBackground: "rgba(0,39,77,0.6)",
             menuIndex: "1",
             position: "top",
-            minDomWidth: 1500
-          }
+            minDomWidth: 1500,
+          },
         ],
         right: [
           {
@@ -418,13 +428,13 @@ export default {
                   value: 72,
                   unit: "万元",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [100, 120, 72]
-                }
-              ]
+                  valueData: [100, 120, 72],
+                },
+              ],
             },
             bottomSolt: {
-              commonName: "ChartCard"
-            }
+              commonName: "ChartCard",
+            },
           },
           {
             type: "card",
@@ -442,7 +452,7 @@ export default {
                   value: 172,
                   unit: "个",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [40, 420, 172]
+                  valueData: [40, 420, 172],
                 },
                 {
                   type: "tb",
@@ -450,7 +460,7 @@ export default {
                   value: 156,
                   unit: "个",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [400, 420, 156]
+                  valueData: [400, 420, 156],
                 },
                 {
                   type: "tb",
@@ -458,13 +468,13 @@ export default {
                   value: 188,
                   unit: "个",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [100, 40, 188]
-                }
-              ]
+                  valueData: [100, 40, 188],
+                },
+              ],
             },
             bottomSolt: {
-              commonName: "ChartCard"
-            }
+              commonName: "ChartCard",
+            },
           },
           {
             type: "card",
@@ -473,7 +483,7 @@ export default {
             menuIndex: "1",
             position: "right",
             minDomWidth: 1000,
-            gotoPageInfo: { index: "5", subIndex: "2", name: "频发问题" }
+            gotoPageInfo: { index: "5", subIndex: "2", name: "频发问题" },
           },
           {
             type: "card",
@@ -492,13 +502,13 @@ export default {
                   value: 72,
                   unit: "个",
                   categoryData: ["2019", "2020", "2021"],
-                  valueData: [100, 120, 72]
-                }
-              ]
+                  valueData: [100, 120, 72],
+                },
+              ],
             },
             bottomSolt: {
-              commonName: "ChartCard"
-            }
+              commonName: "ChartCard",
+            },
           },
           {
             type: "card",
@@ -507,73 +517,73 @@ export default {
             menuIndex: "2",
             subMenuIndex: "1",
             position: "right",
-            minDomWidth: 1200
-          }
-        ]
+            minDomWidth: 1200,
+          },
+        ],
       },
       // 首页饼图相关
       buttonData: ["A", "B", "C"],
       legendTitle: [
         {
           name: "A类",
-          info: "耕地林地总和占镇域面积约 45%以上,或超过3000公顷"
+          info: "耕地林地总和占镇域面积约 45%以上,或超过3000公顷",
         },
         {
           name: "B类",
-          info: "有一定的自然资源资产(耕地林地总和 900-3000公项)"
+          info: "有一定的自然资源资产(耕地林地总和 900-3000公项)",
         },
         {
           name: "C类",
-          info: "自然资源资产较少(耕地林地总和低于 900公项)"
-        }
+          info: "自然资源资产较少(耕地林地总和低于 900公项)",
+        },
       ],
       // legendData: ["#E565FF", "#0055FF", "#00FFD5"],
       legendIcon: [
         {
           background: "#E565FF",
-          border: "none"
+          border: "none",
         },
         {
           background: "#0055FF",
-          border: "none"
+          border: "none",
         },
         {
           background: "#00FFD5",
-          border: "none"
-        }
+          border: "none",
+        },
       ],
       btnChecked: "A",
       AData: {
         soil: [],
         water: [],
         forestry: [],
-        categoryData: []
+        categoryData: [],
       },
       BData: {
         soil: [],
         water: [],
         forestry: [],
-        categoryData: []
+        categoryData: [],
       },
       CData: {
         soil: [],
         water: [],
         forestry: [],
-        categoryData: []
+        categoryData: [],
       },
-      streetSelectVal: "浦东新区",
+      streetSelectVal: "全部",
       streetOptions: [],
       // 街镇专题
       townCollection: [
         { name: "土地资源问题", num: 67 },
         { name: "水资源问题", num: 37 },
         { name: "林地资源问题", num: 60 },
-        { name: "生态资源问题", num: 55 }
+        { name: "生态资源问题", num: 55 },
       ],
       // 综合分析
       analysis: {
-        searchInput: ""
-      }
+        searchInput: "",
+      },
     };
   },
   methods: {
@@ -612,7 +622,7 @@ export default {
     // 镇域专题下拉框
     specialTownSelect(val) {
       this.$refs.mapLoaderRef.setView(streetLocationMap.get(val), 11);
-    }
+    },
   },
   created() {
     // 目录
@@ -627,10 +637,19 @@ export default {
     let CDataArr = [];
     // 街道排序
     for (let i in category) {
-      let ADataSum = soilData[category[i]].A + waterData[category[i]].A + forestryData[category[i]].A;
-      let BDataSum = soilData[category[i]].B + waterData[category[i]].B + forestryData[category[i]].B;
+      let ADataSum =
+        soilData[category[i]].A +
+        waterData[category[i]].A +
+        forestryData[category[i]].A;
+      let BDataSum =
+        soilData[category[i]].B +
+        waterData[category[i]].B +
+        forestryData[category[i]].B;
 
-      let CDataSum = soilData[category[i]].C + waterData[category[i]].C + forestryData[category[i]].C;
+      let CDataSum =
+        soilData[category[i]].C +
+        waterData[category[i]].C +
+        forestryData[category[i]].C;
       ADataArr.push({ name: category[i], sum: ADataSum });
       BDataArr.push({ name: category[i], sum: BDataSum });
       CDataArr.push({ name: category[i], sum: CDataSum });
@@ -641,21 +660,21 @@ export default {
     CDataArr.sort(publicFun.compare("sum"));
 
     // 按A,B,C分出各自资源的排序数组
-    ADataArr.forEach(item => {
+    ADataArr.forEach((item) => {
       this.AData.soil.push(soilData[item.name].A);
       this.AData.water.push(waterData[item.name].A);
       this.AData.forestry.push(forestryData[item.name].A);
       this.AData.categoryData.push(item.name);
     });
 
-    BDataArr.forEach(item => {
+    BDataArr.forEach((item) => {
       this.BData.soil.push(soilData[item.name].B);
       this.BData.water.push(waterData[item.name].B);
       this.BData.forestry.push(forestryData[item.name].B);
       this.BData.categoryData.push(item.name);
     });
 
-    CDataArr.forEach(item => {
+    CDataArr.forEach((item) => {
       this.CData.soil.push(soilData[item.name].C);
       this.CData.water.push(waterData[item.name].C);
       this.CData.forestry.push(forestryData[item.name].C);
@@ -671,10 +690,10 @@ export default {
     for (let key in street) {
       this.streetOptions.push({
         value: street[key],
-        label: street[key]
+        label: street[key],
       });
     }
-  }
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -952,14 +971,22 @@ export default {
     transform: translate(-50%, -50%) rotate(45deg);
     width: 110px;
     height: 100px;
-    background: linear-gradient(to left, @commonBorderColor, @commonBorderColor) left top no-repeat,
-      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) left top no-repeat,
-      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right top no-repeat,
-      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) right top no-repeat,
-      linear-gradient(to left, @commonBorderColor, @commonBorderColor) left bottom no-repeat,
-      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) left bottom no-repeat,
-      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right bottom no-repeat,
-      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right bottom no-repeat;
+    background: linear-gradient(to left, @commonBorderColor, @commonBorderColor)
+        left top no-repeat,
+      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) left
+        top no-repeat,
+      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right top
+        no-repeat,
+      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) right
+        top no-repeat,
+      linear-gradient(to left, @commonBorderColor, @commonBorderColor) left
+        bottom no-repeat,
+      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) left
+        bottom no-repeat,
+      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right
+        bottom no-repeat,
+      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right
+        bottom no-repeat;
     background-size: 6px 6px, 6px 6px, 6px 6px, 6px 6px;
   }
 }