频发问题调整，首页数据调整

public/static/json/home/layout_land.json

@@ -160,5 +160,86 @@
                 "area": 59.27
             }
         ]
+    },
+    {
+        "name": "全部",
+        "pid": 310115105000,
+        "data": [
+            {
+                "year": 2018,
+                "type": "基本农田面积",
+                "area": 13.40
+            },
+            {
+                "year": 2019,
+                "type": "基本农田面积",
+                "area": 13.42
+            },
+            {
+                "year": 2020,
+                "type": "基本农田面积",
+                "area": 13.41
+            },
+            {
+                "year": 2018,
+                "type": "减量化面积",
+                "area": 1.97
+            },
+            {
+                "year": 2019,
+                "type": "减量化面积",
+                "area": 1.99
+            },
+            {
+                "year": 2020,
+                "type": "减量化面积",
+                "area": 2.01
+            },
+            {
+                "year": 2018,
+                "type": "带征地",
+                "area": 12
+            },
+            {
+                "year": 2019,
+                "type": "带征地",
+                "area": 13
+            },
+            {
+                "year": 2020,
+                "type": "带征地",
+                "area": 15
+            },
+            {
+                "year": 2018,
+                "type": "设施农用地",
+                "area": 0.04
+            },
+            {
+                "year": 2019,
+                "type": "设施农用地",
+                "area": 0.05
+            },
+            {
+                "year": 2020,
+                "type": "设施农用地",
+                "area": 0.04
+            },
+            {
+                "year": 2018,
+                "type": "土地资源面积",
+                "area": 1209
+            },
+            {
+                "year": 2019,
+                "type": "土地资源面积",
+                "area": 1211
+            },
+            {
+                "year": 2020,
+                "type": "土地资源面积",
+                "area": 1210
+            }
+        ]
     }
 ]

public/static/json/home/layout_money.json

@@ -1,6 +1,6 @@
 [{
-    "name":"北蔡镇",
-    "pid":310115105000,
+    "name":"老港镇",
+    "pid":310115144000,
     "data":[{
         "year":2019,
         "type":"资金",
@@ -14,36 +14,4 @@
         "type":"资金",
         "area":170
     }]
-},{
-    "name":"祝桥镇",
-    "pid":310115105000,
-    "data":[{
-        "year":2019,
-        "type":"资金",
-        "area":150
-    },{
-        "year":2020,
-        "type":"资金",
-        "area":160
-    },{
-        "year":2021,
-        "type":"资金",
-        "area":170
-    }]
-},{
-    "name":"大团镇",
-    "pid":310115105000,
-    "data":[{
-        "year":2019,
-        "type":"资金",
-        "area":130
-    },{
-        "year":2020,
-        "type":"资金",
-        "area":160
-    },{
-        "year":2021,
-        "type":"资金",
-        "area":170
-    }]
 }]

public/static/json/home/layout_project.json

@@ -1,121 +1,118 @@
 [{
-    "name":"北蔡镇",
-    "pid":310115105000,
+    "name":"老港镇",
     "data":[{
         "year":2019,
         "type":"资源环境项目",
-        "area":150
+        "area":3
     },{
         "year":2020,
         "type":"资源环境项目",
-        "area":160
+        "area":3
     },{
         "year":2021,
         "type":"资源环境项目",
-        "area":170
+        "area":3
     },{
         "year":2019,
         "type":"实现“五个结合”审计项目",
-        "area":170
+        "area":7
     },{
         "year":2020,
         "type":"实现“五个结合”审计项目",
-        "area":170
+        "area":6
     },{
         "year":2021,
         "type":"实现“五个结合”审计项目",
-        "area":170
+        "area":6
     },{
         "year":2019,
         "type":"调查项目",
-        "area":170
+        "area":2
     },{
         "year":2020,
         "type":"调查项目",
-        "area":170
+        "area":1
     },{
         "year":2021,
         "type":"调查项目",
-        "area":170
+        "area":2
     }]
 },{
-    "name":"祝桥镇",
-    "pid":310115105000,
+    "name":"泥城镇",
     "data":[{
         "year":2019,
         "type":"资源环境项目",
-        "area":150
+        "area":3
     },{
         "year":2020,
         "type":"资源环境项目",
-        "area":160
+        "area":3
     },{
         "year":2021,
         "type":"资源环境项目",
-        "area":170
+        "area":3
     },{
         "year":2019,
         "type":"实现“五个结合”审计项目",
-        "area":170
+        "area":7
     },{
         "year":2020,
         "type":"实现“五个结合”审计项目",
-        "area":170
+        "area":6
     },{
         "year":2021,
         "type":"实现“五个结合”审计项目",
-        "area":170
+        "area":6
     },{
         "year":2019,
         "type":"调查项目",
-        "area":170
+        "area":2
     },{
         "year":2020,
         "type":"调查项目",
-        "area":170
+        "area":1
     },{
         "year":2021,
         "type":"调查项目",
-        "area":170
+        "area":2
     }]
 },{
-    "name":"大团镇",
-    "pid":310115105000,
+    "name":"全部",
     "data":[{
         "year":2019,
         "type":"资源环境项目",
-        "area":130
+        "area":3
     },{
         "year":2020,
         "type":"资源环境项目",
-        "area":160
+        "area":3
     },{
         "year":2021,
         "type":"资源环境项目",
-        "area":170
+        "area":3
     },{
         "year":2019,
         "type":"实现“五个结合”审计项目",
-        "area":170
+        "area":7
     },{
         "year":2020,
         "type":"实现“五个结合”审计项目",
-        "area":160
+        "area":6
     },{
         "year":2021,
         "type":"实现“五个结合”审计项目",
-        "area":170
+        "area":6
     },{
         "year":2019,
         "type":"调查项目",
-        "area":170
+        "area":2
     },{
         "year":2020,
         "type":"调查项目",
-        "area":170
+        "area":1
     },{
         "year":2021,
         "type":"调查项目",
-        "area":170
+        "area":2
     }]
 }]

public/static/json/home/layout_water.json

@@ -21,32 +21,32 @@
             {
                 "year": 2017,
                 "type": "区管河道数量",
-                "area": 1.74
+                "area": 2
             },
             {
                 "year": 2018,
                 "type": "区管河道数量",
-                "area": 1.74
+                "area": 2
             },
             {
                 "year": 2019,
                 "type": "区管河道数量",
-                "area": 1.74
+                "area": 2
             },
             {
                 "year": 2017,
                 "type": "镇管河道数量",
-                "area": 1.39
+                "area": 23
             },
             {
                 "year": 2018,
                 "type": "镇管河道数量",
-                "area": 1.40
+                "area": 23
             },
             {
                 "year": 2019,
                 "type": "镇管河道数量",
-                "area": 1.40
+                "area": 23
             }
         ]
     },{
@@ -71,32 +71,81 @@
             {
                 "year": 2017,
                 "type": "区管河道数量",
-                "area": 1.00
+                "area": 3
             },
             {
                 "year": 2018,
                 "type": "区管河道数量",
-                "area": 1.00
+                "area": 3
             },
             {
                 "year": 2019,
                 "type": "区管河道数量",
-                "area": 1.02
+                "area": 3
             },
             {
                 "year": 2017,
                 "type": "镇管河道数量",
-                "area": 0.83
+                "area": 23
             },
             {
                 "year": 2018,
                 "type": "镇管河道数量",
-                "area": 0.84
+                "area": 23
             },
             {
                 "year": 2019,
                 "type": "镇管河道数量",
-                "area": 0.87
+                "area": 23
+            }
+        ]
+    },{
+        "name": "全部",
+        "data": [
+            {
+                "year": 2017,
+                "type": "水域面积",
+                "area": 4.34
+            },
+            {
+                "year": 2018,
+                "type": "水域面积",
+                "area": 4.34
+            },
+            {
+                "year": 2019,
+                "type": "水域面积",
+                "area": 4.35
+            },
+            {
+                "year": 2017,
+                "type": "区管河道数量",
+                "area": 72
+            },
+            {
+                "year": 2018,
+                "type": "区管河道数量",
+                "area": 72
+            },
+            {
+                "year": 2019,
+                "type": "区管河道数量",
+                "area": 73
+            },
+            {
+                "year": 2017,
+                "type": "镇管河道数量",
+                "area": 591
+            },
+            {
+                "year": 2018,
+                "type": "镇管河道数量",
+                "area": 591
+            },
+            {
+                "year": 2019,
+                "type": "镇管河道数量",
+                "area": 593
             }
         ]
     }

src/components/layout/MenuCard.vue

@@ -156,201 +156,211 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      if (this.menuData && this.menuData.topSolt && this.menuData.topSolt.commonDataGetUrl) {
-        this.dataInitLoading = true;
-        this.$Get("/static/json/home/" + this.menuData.topSolt.commonDataGetUrl).then(
-          res => {
-            let listMap = {};
-            let tableData = res;
-            tableData.forEach(item => {
-              if (!listMap[item.name]) {
-                // type,data
-                let listMap2 = {};
-                if (item.data) {
-                  item.data.forEach(item2 => {
-                    if (listMap2[item2.type]) {
-                      listMap2[item2.type]["categoryData"].push(item2.year);
-                      listMap2[item2.type]["valueData"].push(item2.area);
-                    } else {
-                      let listMapItem = {};
-                      listMapItem["categoryData"] = [item2.year];
-                      listMapItem["valueData"] = [item2.area];
-                      listMap2[item2.type] = listMapItem;
-                    }
-                  });
-                }
-                listMap[item.name] = listMap2;
-              } else {
-                console.error("json文件内容重复，重复街镇：", item.name);
-              }
-            });
-            if (listMap) {
-              let categoryData = [];
-              for (let listMapKeys in listMap) {
-                // type,data
-                categoryData = listMap[listMapKeys];
-                if (categoryData) {
-                  if (!listMap["全部"]) {
-                    listMap["全部"] = {};
-                  }
-                  for (let categoryDataKeys in categoryData) {
-                    if (categoryData[categoryDataKeys]) {
-                      let categoryDataItemData = categoryData[categoryDataKeys];
-                      if (listMap["全部"][categoryDataKeys]) {
-                        categoryDataItemData.valueData.forEach((valueIndexItem, index) => {
-                          if (listMap["全部"][categoryDataKeys].valueData[index]) {
-                            listMap["全部"][categoryDataKeys].valueData[index] += Math.floor(valueIndexItem);
-                          } else {
-                            listMap["全部"][categoryDataKeys].valueData[index] = Math.floor(valueIndexItem);
-                          }
-                        });
+      try {
+        if (this.menuData && this.menuData.topSolt && this.menuData.topSolt.commonDataGetUrl) {
+          this.dataInitLoading = true;
+          this.$Get("/static/json/home/" + this.menuData.topSolt.commonDataGetUrl).then(
+            res => {
+              let listMap = {};
+              let tableData = res;
+              tableData.forEach(item => {
+                if (!listMap[item.name]) {
+                  // type,data
+                  let listMap2 = {};
+                  if (item.data) {
+                    item.data.forEach(item2 => {
+                      if (listMap2[item2.type]) {
+                        listMap2[item2.type]["categoryData"].push(item2.year);
+                        listMap2[item2.type]["valueData"].push(item2.area);
                       } else {
-                        listMap["全部"][categoryDataKeys] = categoryDataItemData;
+                        let listMapItem = {};
+                        listMapItem["categoryData"] = [item2.year];
+                        listMapItem["valueData"] = [item2.area];
+                        listMap2[item2.type] = listMapItem;
                       }
-                    }
+                    });
                   }
-                }
-              }
-            }
-            this.resData = listMap;
-            if (this.resData["全部"]) {
-              let _index = 0;
-              let sum = 0;
-              for (let keys in this.resData["全部"]) {
-                this.menuData.topSolt.commonData[_index].title = keys;
-                this.menuData.topSolt.commonData[_index].categoryData = this.resData["全部"][keys].categoryData;
-                this.menuData.topSolt.commonData[_index].valueData = this.resData["全部"][keys].valueData;
-                this.menuData.topSolt.commonData[_index].value =
-                  this.resData["全部"][keys].valueData[this.resData["全部"][keys].valueData.length - 1];
-                sum += this.menuData.topSolt.commonData[_index].value;
-                _index++;
-              }
-              // if (this.menuData.topSolt.commonData[4]) {
-              //   this.menuData.topSolt.commonData[4].valueData = [sum];
-              // }
-            }
-            this.dataInitLoading = false;
-          },
-          error => {
-            console.log("error:", error, this.menuData);
-            this.dataInitLoading = false;
-          }
-        );
-      } else if (
-        this.menuData &&
-        this.menuData.columnId &&
-        this.menuData.commonName !== "SUM" &&
-        this.menuData.commonName !== "ALLLIST"
-      ) {
-        this.dataInitLoading = true;
-        let params = new FormData();
-        params.append("columnId", this.menuData.columnId);
-        if (this.menuData.field) {
-          params.append("field", this.menuData.field);
-        }
-        params.append("states", "2,3");
-        params.append("pageSize", this.menuData.pageSize ? this.menuData.pageSize : 999);
-        params.append("page", 0);
-        if (this.menuData.paramJson) {
-          params.append("paramJson", JSON.stringify(this.menuData.paramJson));
-        }
-        if (this.menuData.sortField) {
-          let sortparam = [
-            {
-              field: this.menuData.sortField.field,
-              orderByType: this.menuData.sortField.orderByType
-            }
-          ];
-          params.append("orderBy", JSON.stringify(sortparam));
-        }
-        this.$Post(this.menuData.getUrl ? this.menuData.getUrl : this.urlsCollection.selectContentList, params).then(
-          res => {
-            if (this.menuData.commonName && this.menuData.commonName === "TOP" && res.code === 200 && res.content.length > 0) {
-              res.content.forEach((item, index) => {
-                if (this.menuData.pageSize > index) {
-                  this.resData[index] = item;
-                }
-              });
-              this.changeHomeSpecialTown();
-            } else if (res.code === 200 && res.content.data && res.content.data.length > 0) {
-              let listMap = {};
-              let tableData = res.content.data;
-              tableData.forEach(item => {
-                if (listMap[item.street]) {
-                  listMap[item.street]["categoryData"].push(item.c_years);
-                  listMap[item.street]["valueData"].push((item.c_float_num / 10000).toFixed(2));
+                  listMap[item.name] = listMap2;
                 } else {
-                  let listMapItem = {};
-                  listMapItem["categoryData"] = [item.c_years];
-                  listMapItem["valueData"] = [(item.c_float_num / 10000).toFixed(2)];
-                  listMap[item.street] = listMapItem;
+                  console.error("json文件内容重复，重复街镇：", item.name);
                 }
               });
               if (listMap) {
                 let categoryData = [];
                 for (let listMapKeys in listMap) {
-                  categoryData = listMap[listMapKeys].categoryData;
-                  if (listMap[listMapKeys].valueData) {
+                  categoryData = listMap[listMapKeys];
+                  if (categoryData) {
                     if (!listMap["全部"]) {
-                      listMap["全部"] = { valueData: [], categoryData: [] };
-                    }
-                    listMap[listMapKeys].valueData.forEach((valueIndexItem, index) => {
-                      if (listMap["全部"].valueData[index]) {
-                        listMap["全部"].valueData[index] += Number(valueIndexItem);
-                      } else {
-                        listMap["全部"].valueData[index] = Number(valueIndexItem);
+                      listMap["全部"] = {};
+                      for (let categoryDataKeys in categoryData) {
+                        if (categoryData[categoryDataKeys]) {
+                          let categoryDataItemData = categoryData[categoryDataKeys];
+                          if (listMap["全部"][categoryDataKeys]) {
+                            categoryDataItemData.valueData.forEach((valueIndexItem, index) => {
+                              if (listMap["全部"][categoryDataKeys].valueData[index]) {
+                                listMap["全部"][categoryDataKeys].valueData[index] += Math.floor(valueIndexItem);
+                              } else {
+                                listMap["全部"][categoryDataKeys].valueData[index] = Math.floor(valueIndexItem);
+                              }
+                            });
+                          } else {
+                            listMap["全部"][categoryDataKeys] = categoryDataItemData;
+                          }
+                        }
                       }
-                    });
+                    }
                   }
                 }
-                if (listMap["全部"].categoryData.length == 0 && categoryData.length > 0) {
-                  listMap["全部"].categoryData = categoryData;
+              }
+              this.resData = listMap;
+              if (this.resData["全部"]) {
+                let _index = 0;
+                let sum = 0;
+                for (let keys in this.resData["全部"]) {
+                  this.menuData.topSolt.commonData[_index].title = keys;
+                  this.menuData.topSolt.commonData[_index].categoryData = this.resData["全部"][keys].categoryData;
+                  this.menuData.topSolt.commonData[_index].valueData = this.resData["全部"][keys].valueData;
+                  this.menuData.topSolt.commonData[_index].value =
+                    this.resData["全部"][keys].valueData[this.resData["全部"][keys].valueData.length - 1];
+                  sum += this.menuData.topSolt.commonData[_index].value;
+                  _index++;
                 }
               }
-              if (listMap["全部"] && listMap["全部"].valueData) {
-                listMap["全部"].valueData.forEach((item, index) => {
-                  listMap["全部"].valueData[index] = item.toFixed(2);
+              this.dataInitLoading = false;
+            },
+            error => {
+              console.log("error:", error, this.menuData);
+              this.dataInitLoading = false;
+            }
+          );
+        } else if (
+          this.menuData &&
+          this.menuData.columnId &&
+          this.menuData.commonName !== "SUM" &&
+          this.menuData.commonName !== "ALLLIST"
+        ) {
+          this.dataInitLoading = true;
+          let params = new FormData();
+          params.append("columnId", this.menuData.columnId);
+          if (this.menuData.field) {
+            params.append("field", this.menuData.field);
+          }
+
+          if (this.menuData.states) {
+            params.append("states", this.menuData.states);
+          } else {
+            params.append("states", "1,2,3,4");
+          }
+          params.append("pageSize", this.menuData.pageSize ? this.menuData.pageSize : 999);
+          params.append("page", 0);
+          if (this.menuData.paramJson) {
+            params.append("paramJson", JSON.stringify(this.menuData.paramJson));
+          }
+          if (this.menuData.sortField) {
+            let sortparam = [
+              {
+                field: this.menuData.sortField.field,
+                orderByType: this.menuData.sortField.orderByType
+              }
+            ];
+            params.append("orderBy", JSON.stringify(sortparam));
+          }
+          this.$Post(this.menuData.getUrl ? this.menuData.getUrl : this.urlsCollection.selectContentList, params).then(
+            res => {
+              if (
+                this.menuData.commonName &&
+                this.menuData.commonName === "TOP" &&
+                res.code === 200 &&
+                res.content.length > 0
+              ) {
+                res.content.forEach((item, index) => {
+                  if (this.menuData.pageSize > index) {
+                    this.resData[index] = item;
+                  }
                 });
+                this.changeHomeSpecialTown();
+              } else if (res.code === 200 && res.content.data && res.content.data.length > 0) {
+                let listMap = {};
+                let tableData = res.content.data;
+                tableData.forEach(item => {
+                  if (listMap[item.street]) {
+                    listMap[item.street]["categoryData"].push(item.c_years);
+                    listMap[item.street]["valueData"].push((item.c_float_num / 10000).toFixed(2));
+                  } else {
+                    let listMapItem = {};
+                    listMapItem["categoryData"] = [item.c_years];
+                    listMapItem["valueData"] = [(item.c_float_num / 10000).toFixed(2)];
+                    listMap[item.street] = listMapItem;
+                  }
+                });
+                if (listMap) {
+                  let categoryData = [];
+                  for (let listMapKeys in listMap) {
+                    categoryData = listMap[listMapKeys].categoryData;
+                    if (listMap[listMapKeys].valueData) {
+                      if (!listMap["全部"]) {
+                        listMap["全部"] = { valueData: [], categoryData: [] };
+                      }
+                      listMap[listMapKeys].valueData.forEach((valueIndexItem, index) => {
+                        if (listMap["全部"].valueData[index]) {
+                          listMap["全部"].valueData[index] += Number(valueIndexItem);
+                        } else {
+                          listMap["全部"].valueData[index] = Number(valueIndexItem);
+                        }
+                      });
+                    }
+                  }
+                  if (listMap["全部"].categoryData.length == 0 && categoryData.length > 0) {
+                    listMap["全部"].categoryData = categoryData;
+                  }
+                }
+                if (listMap["全部"] && listMap["全部"].valueData) {
+                  listMap["全部"].valueData.forEach((item, index) => {
+                    listMap["全部"].valueData[index] = item.toFixed(2);
+                  });
+                }
+                this.resData = listMap;
+                this.changeHomeSpecialTown();
+              } else {
+                this.resData = [];
+                this.changeHomeSpecialTown();
               }
-              this.resData = listMap;
-              this.changeHomeSpecialTown();
-            } else {
+              this.dataInitLoading = false;
+            },
+            error => {
               this.resData = [];
               this.changeHomeSpecialTown();
+              console.log("error:", error, this.menuData);
+              this.dataInitLoading = false;
             }
-            this.dataInitLoading = false;
-          },
-          error => {
-            this.resData = [];
-            this.changeHomeSpecialTown();
-            console.log("error:", error, this.menuData);
-            this.dataInitLoading = false;
+          );
+        } else if (this.menuData.commonName && this.menuData.commonName === "TOP") {
+          this.topData(this.$store.state.homeSpecialTown);
+        } else if (this.menuData.commonName && this.menuData.commonName === "ALLLIST") {
+          this.allListData(this.$store.state.homeSpecialTown);
+        } else if (this.menuData.commonName && this.menuData.commonName === "SUM") {
+          this.sumData(this.$store.state.homeSpecialTown);
+        }
+        // 只有第一次创建该页面，或刷新页面时。
+        if (this.menuData.menuIndex) {
+          if (this.$ifMenu(this.menuData.menuIndex, this.menuData.subMenuIndex)) {
+            // 立即修改display为block
+            this.$refs.menuCard.style.display = "block";
+            setTimeout(() => {
+              this.$refs.menuCard.style.transform = "translate(0,0)";
+              this.$refs.menuCard.style.opacity = "0.9";
+            });
+          } else {
+            // 如果不符合，页面创建时就直接隐藏
+            this.$refs.menuCard.style.display = "none";
           }
-        );
-      } else if (this.menuData.commonName && this.menuData.commonName === "TOP") {
-        this.topData(this.$store.state.homeSpecialTown);
-      } else if (this.menuData.commonName && this.menuData.commonName === "ALLLIST") {
-        this.allListData(this.$store.state.homeSpecialTown);
-      } else if (this.menuData.commonName && this.menuData.commonName === "SUM") {
-        this.sumData(this.$store.state.homeSpecialTown);
-      }
-      // 只有第一次创建该页面，或刷新页面时。
-      if (this.menuData.menuIndex) {
-        if (this.$ifMenu(this.menuData.menuIndex, this.menuData.subMenuIndex)) {
-          // 立即修改display为block
-          this.$refs.menuCard.style.display = "block";
-          setTimeout(() => {
-            this.$refs.menuCard.style.transform = "translate(0,0)";
-            this.$refs.menuCard.style.opacity = "0.9";
-          });
-        } else {
-          // 如果不符合，页面创建时就直接隐藏
-          this.$refs.menuCard.style.display = "none";
         }
+        // 当容器创建完成时，监听窗口改变大小时间
+        this.$bus.$off("windowOnresize");
+        this.$bus.$on("windowOnresize", this.windowOnresize);
+      } catch (e) {
+        console.log("MenuCard组件mounted出现异常", e);
       }
-      // 当容器创建完成时，监听窗口改变大小时间
-      this.$bus.$off("windowOnresize");
-      this.$bus.$on("windowOnresize", this.windowOnresize);
     });
   },
   destroy() {
@@ -574,47 +584,49 @@ export default {
     },
     // 切换街镇时
     changeHomeSpecialTown() {
-      if (this.resData[this.$store.state.homeSpecialTown] && this.menuData.topSolt.commonData) {
-        if (this.resData[this.$store.state.homeSpecialTown].categoryData) {
-          this.menuData.topSolt.commonData[0].categoryData = this.resData[this.$store.state.homeSpecialTown].categoryData;
-          this.menuData.topSolt.commonData[0].valueData = this.resData[this.$store.state.homeSpecialTown].valueData;
-        } else {
-          let _index = 0;
-          // let sum = 0;
-          for (let keys in this.resData["全部"]) {
-            this.menuData.topSolt.commonData[_index].title = keys;
-            this.menuData.topSolt.commonData[_index].categoryData =
-              this.resData[this.$store.state.homeSpecialTown][keys].categoryData;
-            this.menuData.topSolt.commonData[_index].valueData =
-              this.resData[this.$store.state.homeSpecialTown][keys].valueData;
-            this.menuData.topSolt.commonData[_index].value =
-              this.resData[this.$store.state.homeSpecialTown][keys].valueData[
-                this.resData[this.$store.state.homeSpecialTown][keys].valueData.length - 1
-              ];
-            // sum += this.menuData.topSolt.commonData[_index].value;
-            _index++;
+      try {
+        this.dataInitLoading = true;
+        if (this.resData[this.$store.state.homeSpecialTown] && this.menuData.topSolt.commonData) {
+          if (this.resData[this.$store.state.homeSpecialTown].categoryData) {
+            this.menuData.topSolt.commonData[0].categoryData = this.resData[this.$store.state.homeSpecialTown].categoryData;
+            this.menuData.topSolt.commonData[0].valueData = this.resData[this.$store.state.homeSpecialTown].valueData;
+          } else {
+            let _index = 0;
+            for (let keys in this.resData["全部"]) {
+              this.menuData.topSolt.commonData[_index].title = keys;
+              this.menuData.topSolt.commonData[_index].categoryData =
+                this.resData[this.$store.state.homeSpecialTown][keys].categoryData;
+              this.menuData.topSolt.commonData[_index].valueData =
+                this.resData[this.$store.state.homeSpecialTown][keys].valueData;
+              this.menuData.topSolt.commonData[_index].value =
+                this.resData[this.$store.state.homeSpecialTown][keys].valueData[
+                  this.resData[this.$store.state.homeSpecialTown][keys].valueData.length - 1
+                ];
+              _index++;
+            }
           }
-          // if (this.menuData.topSolt.commonData[4]) {
-          //   this.menuData.topSolt.commonData[4].valueData = [sum];
-          // }
+        } else if (this.menuData && this.menuData.commonName && this.menuData.commonName === "TOP") {
+          this.topData(this.$store.state.homeSpecialTown);
+        } else if (this.menuData && this.menuData.commonName && this.menuData.commonName === "SUM") {
+          this.sumData(this.$store.state.homeSpecialTown);
+        } else if (this.menuData && this.menuData.commonName && this.menuData.commonName === "ALLLIST") {
+          this.allListData(this.$store.state.homeSpecialTown);
+        } else if (this.menuData && this.menuData.topSolt && this.menuData.topSolt.commonData) {
+          this.menuData.topSolt.commonData.forEach((item, index) => {
+            this.menuData.topSolt.commonData[index].categoryData = [];
+            this.menuData.topSolt.commonData[index].valueData = [];
+            if (this.menuData.topSolt.commonData[index].valueData) {
+              this.menuData.topSolt.commonData[index].valueData = 0;
+            }
+            if (this.menuData.topSolt.commonData[index].value) {
+              this.menuData.topSolt.commonData[index].value = 0;
+            }
+          });
         }
-      } else if (this.menuData && this.menuData.commonName && this.menuData.commonName === "TOP") {
-        this.topData(this.$store.state.homeSpecialTown);
-      } else if (this.menuData && this.menuData.commonName && this.menuData.commonName === "SUM") {
-        this.sumData(this.$store.state.homeSpecialTown);
-      } else if (this.menuData && this.menuData.commonName && this.menuData.commonName === "ALLLIST") {
-        this.allListData(this.$store.state.homeSpecialTown);
-      } else if (this.menuData && this.menuData.topSolt && this.menuData.topSolt.commonData) {
-        this.menuData.topSolt.commonData.forEach((item, index) => {
-          this.menuData.topSolt.commonData[index].categoryData = [];
-          this.menuData.topSolt.commonData[index].valueData = [];
-          if (this.menuData.topSolt.commonData[index].valueData) {
-            this.menuData.topSolt.commonData[index].valueData = 0;
-          }
-          if (this.menuData.topSolt.commonData[index].value) {
-            this.menuData.topSolt.commonData[index].value = 0;
-          }
-        });
+        this.dataInitLoading = false;
+      } catch (e) {
+        console.log("MenuCard组件changeHomeSpecialTown出现异常", e);
+        this.dataInitLoading = false;
       }
     },
     // 当用户使用光标切换交互组件时触发

src/config/common.js

@@ -1109,6 +1109,11 @@ export const menuOnLine = {
         title: "资源环境项目",
         titleWidth: 64,
         menuIndex: "1",
+        // getUrl: "/dms/content/selectGroupByAndOrderByAndTerm",
+        // columnId: 821,
+        // states: "1,2,3,4",
+        // paramJson: [{"key":"c_years","value":"2019","type":"or"},{"key":"c_years","value":"2020","type":"or"},{"key":"c_years","value":"2021","type":"or"}],
+        // feild: "c_select",
         position: "right",
         minDomWidth: 1000,
         topSolt: {
@@ -1118,7 +1123,7 @@ export const menuOnLine = {
             {
               type: "tb",
               title: "资源环境项目",
-              value: 172,
+              value: 3,
               unit: "个",
               categoryData: [
                 "2019",
@@ -1126,15 +1131,15 @@ export const menuOnLine = {
                 "2021"
               ],
               valueData: [
-                40,
-                420,
-                172
+                3,
+                3,
+                3
               ]
             },
             {
               type: "tb",
-              title: "自然资源环境项目",
-              value: 156,
+              title: "实现“五个结合”审计项目",
+              value: 6,
               unit: "个",
               categoryData: [
                 "2019",
@@ -1142,15 +1147,15 @@ export const menuOnLine = {
                 "2021"
               ],
               valueData: [
-                400,
-                420,
-                156
+                7,
+                6,
+                6
               ]
             },
             {
               type: "tb",
               title: "调查项目",
-              value: 188,
+              value: 1,
               unit: "个",
               categoryData: [
                 "2019",
@@ -1158,9 +1163,9 @@ export const menuOnLine = {
                 "2021"
               ],
               valueData: [
-                100,
-                40,
-                188
+                2,
+                1,
+                2
               ]
             }
           ]
@@ -1177,30 +1182,30 @@ export const menuOnLine = {
         position: "right",
         minDomWidth: 1000,
         getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
+        columnId: 1127,
         pageSize: 5,
-        field: "c_wtfl",
+        field: "c_ckwtdxwt",
         paramJson: {},
         topData: [
           {
             number: 0,
-            c_wtfl: "--"
+            c_ckwtdxwt: "--"
           },
           {
             number: 0,
-            c_wtfl: "--"
+            c_ckwtdxwt: "--"
           },
           {
             number: 0,
-            c_wtfl: "--"
+            c_ckwtdxwt: "--"
           },
           {
             number: 0,
-            c_wtfl: "--"
+            c_ckwtdxwt: "--"
           },
           {
             number: 0,
-            c_wtfl: "--"
+            c_ckwtdxwt: "--"
           }
         ],
         commonName: "TOP",
@@ -1505,12 +1510,32 @@ export const menuOnLine = {
         position: "right",
         minDomWidth: 1200,
         commonName: "TOP",
-        getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
-        pageSize: 10,
-        field: "c_zdsjsx",
+        // getUrl: "/dms/content/selectGroupByCountOrderBy",
+        // columnId: 31,
+        // pageSize: 10,
+        // field: "c_zdsjsx",
         paramJson: {},
-        topData: []
+        topData: [
+          {
+            number: 0,
+            c_wtflwt: "--"
+          },
+          {
+            number: 0,
+            c_wtflwt: "--"
+          },
+          {
+            number: 0,
+            c_wtflwt: "--"
+          },
+          {
+            number: 0,
+            c_wtflwt: "--"
+          },
+          {
+            number: 0,
+            c_wtflwt: "--"
+          }]
       },
       {
         type: "card",

src/views/FrequencyView.vue

@@ -1,34 +1,26 @@
 <template>
   <div class="frenquency-container">
-    
     <el-dialog
       custom-class="myMission"
       title="详细信息"
       :append-to-body="true"
       :modal="true"
       :visible.sync="dialogVisible"
-      width="600px"
+      width="70%"
       height="60%"
       :before-close="handleClose"
     >
       <div>
         <div class="dialog_title_info">
-          <div>立项年度：2021</div>
-          <div>被审计镇：周浦</div>
-        </div>
-        <div class="dialog_title_info">问题金额（万元）：/</div>
-        <div class="dialog_title">按指引应纳分类情况</div>
-        <div v-for="(item, index) in dialogData" :key="index" class="dialog_table">
-          <div>{{ item.title }}</div>
-          <div>{{ item.info }}</div>
+          <div>立项年度：{{ formData[activeRowIndex] && formData[activeRowIndex].c_lxndwt ? formData[activeRowIndex].c_lxndwt : '--' }}</div>
+          <div>被审计镇：{{ formData[activeRowIndex] && formData[activeRowIndex].c_bsjzwt && unTownOptions && unTownOptions[formData[activeRowIndex].c_bsjzwt] ? unTownOptions[formData[activeRowIndex].c_bsjzwt] : '--' }}</div>
         </div>
+        <div class="dialog_title_info">问题金额（万元）：{{ formData[activeRowIndex] && formData[activeRowIndex].c_wtjewt ? formData[activeRowIndex].c_wtjewt : '--'}}</div>
         <div class="dialog_title">审计报告中的问题反映情况</div>
-        <div v-for="(item, index) in dialogData2" :key="index" class="dialog_table">
+        <div v-for="(item, index) in dialogData" :key="index" class="dialog_table">
           <div>{{ item.title }}</div>
-          <div>{{ item.info }}</div>
+          <div>{{ formData[activeRowIndex] && formData[activeRowIndex][item.columnName] ? formData[activeRowIndex][item.columnName] : '--'}}</div>
         </div>
-        <div class="dialog_title2">边审边改情况：老港镇对29个案件问题进行了整改</div>
-        <div class="dialog_title2">使用法条：xxxxxx</div>
         <!-- <div class="dialog_title3"><el-button size="mini" type="primary" class="infoBut">查看疑点图斑</el-button></div> -->
       </div>
     </el-dialog>
@@ -74,32 +66,15 @@
         <div class="reset-btn" @click="resetEvent">重置</div>
       </div>
       <div class="center">
-        <el-table :data="tableData" style="width: 100%" max-height="600" 
-      @row-click="rowClick">
-          <el-table-column type="index" width="70" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="createYear"
-            label="立项年度"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="auditTown"
-            label="被审计镇"
-            align="center"
-            width="180"
-          >
-          </el-table-column>
-          <el-table-column prop="type" label="类别" align="center">
-          </el-table-column>
-          <el-table-column prop="keyPoint" label="重点审计事项" align="center">
-          </el-table-column>
-          <el-table-column prop="problemType" label="问题分类" align="center">
-          </el-table-column>
-          <el-table-column prop="problemNature" label="问题定性" align="center">
-          </el-table-column>
+        <el-table :data="tableData" style="width: 100%" max-height="600" @row-click="rowClick">
+          <el-table-column type="index" width="70" align="center"> </el-table-column>
+          <el-table-column prop="createYear" label="立项年度" width="150" align="center"> </el-table-column>
+          <el-table-column prop="auditTown" label="被审计镇" align="center" width="180"> </el-table-column>
+          <el-table-column prop="type" label="类别" align="center"> </el-table-column>
+          <el-table-column prop="keyPoint" label="重点审计事项" align="center"> </el-table-column>
+          <el-table-column prop="problemType" label="参考问题定性" align="center"> </el-table-column>
+          <!-- <el-table-column prop="problemNature" label="问题定性" align="center">
+          </el-table-column> -->
         </el-table>
       </div>
       <div class="footer">
@@ -135,32 +110,35 @@ export default {
       // 整改中的查看详情弹窗状态
       dialogVisible: false,
       dialogData: [
-        { title: "类别", info: "生态环境保护政策执行情况审计" },
-        { title: "重点审计事项", info: "环保督察、执法检查、信访投诉反映问题整治情况" },
-        { title: "参考问题定性", info: "发现问题整改不到位，存在长期……" }
-      ],
-      dialogData2: [
-        { title: "类别", info: "生态环境保护政策执行情况审计" },
-        { title: "重点审计事项", info: "环保督察、执法检查、信访投诉反映问题整治情况" },
-        { title: "参考问题定性", info: "发现问题整改不到位，存在长期……" }
+        { title: "问题分类", columnName: "c_wtflwt", info: "--" },
+        { title: "问题定性1", columnName: "c_wtdx1wt", info: "--" },
+        { title: "问题定性2", columnName: "c_wtdx2wt", info: "--" },
+        { title: "问题事项", columnName: "c_wtsxwt", info: "--" },
+        { title: "使用法条", columnName: "c_syftwt", info: "--" },
+        { title: "边审边改情况", columnName: "c_bsbgqkwt", info: "--" }
       ],
+      // 暂存全部数据
+      formData: [],
+      // 选中的rowinxdex
+      activeRowIndex: 0,
       paginationData: {
         pageSize: 10,
         pagerCount: 5,
         currentPage: 1,
         pageSizes: [5, 10, 20, 30],
         total: 50,
-        currentChange: (val) => {
+        currentChange: val => {
           this.getTableData(val);
         },
-        handleSizeChange: (val) => {
+        handleSizeChange: val => {
           this.handleSizeChange(val);
-        },
-      },
+        }
+      }
     };
   },
   created() {
     this.townOptions = [];
+    this.unTownOptions = {};
     this.timeOptions = [];
     this.typeOptions = [];
 
@@ -168,7 +146,7 @@ export default {
     for (let i = 1980; i <= parseInt(this.$dayjs().format("YYYY")); i++) {
       this.timeOptions.unshift({
         value: i,
-        label: i,
+        label: i
       });
     }
     // 获取数据字典中下拉框数据
@@ -182,13 +160,13 @@ export default {
       let params = new FormData();
       params = {
         type: type,
-        cName: cName,
+        cName: cName
       };
 
-      this.$Post(this.urlsCollection.selectByCNameAType, params).then((res) => {
+      this.$Post(this.urlsCollection.selectByCNameAType, params).then(res => {
         if (res.code === 200 && res.content.length > 0) {
           this.classDictMap[keyName] = new Map();
-          res.content.forEach((v) => {
+          res.content.forEach(v => {
             this.classDictMap[keyName].set(v.index + "", v.name);
           });
 
@@ -196,12 +174,13 @@ export default {
             this.classDictMap[keyName].forEach((v, i) => {
               this.townOptions.push({
                 value: i,
-                label: v,
+                label: v
               });
+              this.unTownOptions[i]=v;
             });
             this.townOptions.unshift({
               value: "全部",
-              label: "全部",
+              label: "全部"
             });
           }
 
@@ -209,7 +188,7 @@ export default {
             this.classDictMap[keyName].forEach((v, i) => {
               this.typeOptions.push({
                 value: i,
-                label: v,
+                label: v
               });
             });
           }
@@ -224,9 +203,9 @@ export default {
       this.$refs.townTypeRef.imgValue = "";
       this.$refs.timeRef.imgValue = "";
       this.getTableData(1);
-      console.log("重置");
     },
-    rowClick(){
+    rowClick(row, column, event) {
+      this.activeRowIndex = row.rowIndex - 1;
       this.dialogVisible = true;
     },
     handleClose() {
@@ -239,63 +218,66 @@ export default {
       // 类别
       if (this.typeSelectVal) {
         let paramType = {
-          field: "sj_select",
+          field: "c_sjlbwt",
           // 等值查询
           searchType: "1",
           content: {
-            value: this.typeSelectVal,
-          },
+            value: this.typeSelectVal
+          }
         };
         searchParam.push(paramType);
       }
       // 被审计街镇
       if (this.townSelectVal && this.townSelectVal !== "全部") {
         let paramTown = {
-          field: "bsjz",
+          field: "c_bsjzwt",
           // 等值查询
           searchType: "1",
           content: {
-            value: this.townSelectVal,
-          },
+            value: this.townSelectVal
+          }
         };
         searchParam.push(paramTown);
       }
       // 立项年度
       if (this.timeSelectVal) {
         let paramTime = {
-          field: "c_new_date",
+          field: "c_lxndwt",
           // 等值查询
           searchType: "1",
           content: {
-            value: this.timeSelectVal,
-          },
+            value: this.timeSelectVal
+          }
         };
         searchParam.push(paramTime);
       }
       let params = new FormData();
       params = {
-        columnId: 24,
+        columnId: 1127,
         states: "0,1,2,3",
         pageSize: this.currentPageSize,
         page: val - 1,
-        search: JSON.stringify(searchParam),
+        search: JSON.stringify(searchParam)
       };
 
-      this.$Post(this.urlsCollection.selectContentList, params).then((res) => {
+      this.$Post(this.urlsCollection.selectContentList, params).then(res => {
         if (res.code === 200 && res.content.data.length > 0) {
           this.paginationData.currentPage = val;
           this.paginationData.total = res.content.count;
-          this.tableData = res.content.data.map((v) => {
+          this.formData = res.content.data;
+          let rowIndex = 0;
+          this.tableData = res.content.data.map(v => {
+            rowIndex ++;            
             return {
+              rowIndex: rowIndex,
               id: v.id || "--",
-              createYear: v.c_new_date || "--",
+              createYear: v.c_lxndwt || "--",
               // createYear: this.$dayjs(v.c_year).format("YYYY")|| "--",
-              auditTown:
-                this.classDictMap["浦东新区行政区划"].get(v.bsjz) || "--",
-              type: this.classDictMap["审计类别"].get(v.sj_select) || "--",
-              keyPoint: v.c_zdsjsx || "--",
-              problemType: v.c_wtfl || "--",
-              problemNature: v.c_wtdx || "--",
+              auditTown: this.classDictMap["浦东新区行政区划"].get(v.c_bsjzwt) || "--",
+              type: this.classDictMap["审计类别"].get(v.c_sjlbwt) || "--",
+              keyPoint: v.c_zdsjsxwt || "--",
+              problemType: v.c_ckwtdxwt || "--",
+              problemNature: v.c_wtdx1wt || "--"
             };
           });
         }
@@ -306,8 +288,8 @@ export default {
       console.log(`每页 ${val} 条`);
       this.currentPageSize = val;
       this.getTableData(this.currentPage);
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -381,11 +363,7 @@ export default {
       }
       .query-btn {
         right: 110px;
-        background-image: linear-gradient(
-          to top,
-          rgba(79, 172, 254, 1),
-          rgba(0, 242, 254, 1)
-        );
+        background-image: linear-gradient(to top, rgba(79, 172, 254, 1), rgba(0, 242, 254, 1));
       }
     }
     .center {
@@ -453,7 +431,7 @@ export default {
     display: flex;
     justify-content: center;
     color: #dcdfe6;
-    border: 1px solid #001d3c00;    
+    border: 1px solid #001d3c00;
   }
 }
 </style>

src/views/HomeView.vue

@@ -290,16 +290,16 @@ export default {
       });
     },
     initMenu(menus) {
-      if (menus) {
-        this.menus = menus;
-        setTimeout(() => {
-          this.getSourcesData();
-        }, 300);
-      }
-      // this.menus = menuOnLine;
-      // setTimeout(() => {
-      //   this.getSourcesData();
-      // }, 300);
+      // if (menus) {
+      //   this.menus = menus;
+      //   setTimeout(() => {
+      //     this.getSourcesData();
+      //   }, 0);
+      // }
+      this.menus = menuOnLine;
+      setTimeout(() => {
+        this.getSourcesData();
+      }, 300);
     },
     navSelect: function (data) {
       this.$store.commit("changeNavSelect", data);