首页数据修改为真实数据，添加页面资金投入。

src/components/chart/LineChart.vue

@@ -113,9 +113,19 @@ export default {
           }
         },
         yAxis: {
-          min: dataMax === dataMin ? dataMax : parseFloat(dataMin - (dataMax - dataMin) / 2).toFixed(2),
+          min:
+            dataMax === dataMin
+              ? dataMax
+              : parseFloat(dataMin - (dataMax - dataMin) / 2).toFixed(2) < 0
+              ? 0
+              : parseFloat(dataMin - (dataMax - dataMin) / 2).toFixed(2),
           max: parseFloat(dataMax).toFixed(2),
-          interval: dataMax === dataMin ? dataMax : parseFloat(dataMax - dataMin).toFixed(2),
+          interval:
+            dataMax === dataMin
+              ? dataMax
+              : parseFloat(dataMax - dataMin).toFixed(2) < 0
+              ? 0
+              : parseFloat(dataMax - dataMin).toFixed(2),
           type: "value",
           scale: true,
           splitLine: {

src/components/common/TagCard.vue

@@ -5,7 +5,13 @@
       <!-- 上下布局 -->
       <div v-if="data.type !== 'lr'" class="tbFlx">
         <div class="tagValue">
-          <span>{{ data.value  ? data.value : "--" }}</span
+          <span>{{
+            data.value && data.value !== "--"
+              ? (data.value + "").indexOf(".") >= 0
+                ? parseFloat(data.value).toFixed(2)
+                : data.value
+              : "--"
+          }}</span
           ><span>{{ data.unit ? data.unit : "--" }}</span>
         </div>
         <div class="tagImg">
@@ -20,7 +26,13 @@
         </div>
         <div>
           <div class="tagValue">
-            <span>{{ data.value ? data.value : "--"}}</span
+            <span>{{
+              data.value && data.value !== "--"
+                ? (data.value + "").indexOf(".") >= 0
+                  ? parseFloat(data.value).toFixed(2)
+                  : data.value
+                : "--"
+            }}</span
             ><span>{{ data.unit ? data.unit : "--" }}</span>
           </div>
           <div class="tagTitle">{{ data.title ? data.title : "--" }}</div>
@@ -61,17 +73,7 @@ export default {
       console.log("预留事件，主要是阻止click冒泡！");
     }
   },
-  watch: {
-    data: {
-      handler(val) {
-        this.$nextTick(() => {
-          // console.log('TagCard data',val.value);
-          // this.showChange();
-        });
-      },
-      deep: true
-    }
-  }
+  watch: {}
 };
 </script>
 

src/components/common/TagTableCard.vue

@@ -27,6 +27,7 @@
     </div>
     <div>
       <TagCard
+        v-if="echartData[4]"
         :data="echartData[4]"
         :index="4"
         :chartCardDataIndex="mousemoveIndex"

src/components/common/WholeProcessManagement.vue

@@ -1,10 +1,13 @@
 <template>
   <!-- 全流程管理列表组件 -->
   <div id="WholeProcessManagement">
+    <div class="header-title">全流程管理</div>
     <div class="header-search">
-      <el-input style="width: 300px" v-model="allSearchColumn" clearable>
-        <i class="el-icon-search" style="cursor: pointer" @click="onSubmit()" slot="append"></i
-      ></el-input>
+      <div>
+        <el-input style="width: 300px" v-model="allSearchColumn" clearable placeholder="请输入关键词">
+          <i class="el-icon-search" style="cursor: pointer" @click="onSubmit()" slot="append"></i
+        ></el-input>
+      </div>
       <el-button @click="resetForm()">重置</el-button>
     </div>
     <el-table
@@ -546,4 +549,20 @@ export default {
     flex-wrap: nowrap;
   }
 }
+
+.header {
+  height: 13%;
+  width: 100%;
+  position: relative;
+  &-title {
+    font-size: 20px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #4dc3ff;
+    line-height: 30px;
+    position: relative;
+    top: 1px;
+    left: 10px;
+  }
+}
 </style>

src/components/layout/Header.vue

@@ -1,30 +1,14 @@
 <template>
   <div id="layoutHeader">
     <el-row>
-      <el-col
-        :span="8"
-        v-if="$store.state.windowsSize.width >= 1300"
-        class="logoBox"
-      >
+      <el-col :span="8" v-if="$store.state.windowsSize.width >= 1300" class="logoBox">
         <div class="logo"></div>
         <div class="title">
-          {{
-            systemInfo.system_name
-              ? systemInfo.system_name
-              : "浦东新区资源环境智慧审计平台"
-          }}
-          <span class="title_version"
-            >Version:{{
-              systemInfo.version ? systemInfo.version : "版本信息获取失败！"
-            }}</span
-          >
+          {{ systemInfo.system_name ? systemInfo.system_name : "浦东新区资源环境智慧审计平台" }}
+          <span class="title_version">Version:{{ systemInfo.version ? systemInfo.version : "版本信息获取失败！" }}</span>
         </div>
       </el-col>
-      <el-col
-        :span="2"
-        v-if="$store.state.windowsSize.width < 1300"
-        class="logoBox"
-      >
+      <el-col :span="2" v-if="$store.state.windowsSize.width < 1300" class="logoBox">
         <div class="logo"></div>
       </el-col>
       <el-col :span="$store.state.windowsSize.width < 1300 ? 18 : 13">
@@ -37,23 +21,13 @@
           @select="select"
         >
           <el-menu-item index="1"
-            ><i
-              class="el-icon-s-home"
-              v-show="$store.state.windowsSize.width <= 1700"
-            ></i
-            ><span v-show="$store.state.windowsSize.width > 1700"
-              >首页</span
-            ></el-menu-item
+            ><i class="el-icon-s-home" v-show="$store.state.windowsSize.width <= 1700"></i
+            ><span v-show="$store.state.windowsSize.width > 1700">首页</span></el-menu-item
           >
           <el-submenu index="2">
-            <template slot="title" class="submenu"
-              ><i
-                class="el-icon-s-order"
-                v-show="$store.state.windowsSize.width <= 1700"
-              ></i
-              ><span v-show="$store.state.windowsSize.width > 1700"
-                >疑点筛查</span
-              ></template
+            <template slot="title"
+              ><i class="el-icon-s-order" v-show="$store.state.windowsSize.width <= 1700"></i
+              ><span v-show="$store.state.windowsSize.width > 1700">疑点筛查</span></template
             >
             <el-menu-item index="2-1">土地资源</el-menu-item>
             <el-menu-item index="2-2">水资源</el-menu-item>
@@ -62,36 +36,22 @@
             <el-menu-item index="2-5">镇域专题</el-menu-item>
           </el-submenu>
           <el-menu-item index="3"
-            ><i
-              class="el-icon-s-order"
-              v-show="$store.state.windowsSize.width <= 1700"
-            ></i
-            ><span v-show="$store.state.windowsSize.width > 1700"
-              >综合分析</span
-            ></el-menu-item
+            ><i class="el-icon-s-order" v-show="$store.state.windowsSize.width <= 1700"></i
+            ><span v-show="$store.state.windowsSize.width > 1700">综合分析</span></el-menu-item
           >
           <el-menu-item index="4"
-            ><i
-              class="el-icon-s-management"
-              v-show="$store.state.windowsSize.width <= 1700"
-            ></i
-            ><span v-show="$store.state.windowsSize.width > 1700"
-              >全流程管理</span
-            ></el-menu-item
+            ><i class="el-icon-s-management" v-show="$store.state.windowsSize.width <= 1700"></i
+            ><span v-show="$store.state.windowsSize.width > 1700">全流程管理</span></el-menu-item
           >
           <el-submenu index="5">
             <template slot="title"
-              ><i
-                class="el-icon-s-finance"
-                v-show="$store.state.windowsSize.width <= 1700"
-              ></i
-              ><span v-show="$store.state.windowsSize.width > 1700"
-                >智能辅助</span
-              ></template
+              ><i class="el-icon-s-finance" v-show="$store.state.windowsSize.width <= 1700"></i
+              ><span v-show="$store.state.windowsSize.width > 1700">智能辅助</span></template
             >
             <el-menu-item index="5-1">法律法规</el-menu-item>
             <el-menu-item index="5-2">历史问题</el-menu-item>
             <el-menu-item index="5-3">指标体系</el-menu-item>
+            <el-menu-item index="5-4">资金投入</el-menu-item>
           </el-submenu>
         </el-menu>
       </el-col>
@@ -115,11 +75,7 @@
                 ></el-avatar>
                 <!-- <div class="inner-user-icon"></div> -->
                 <div class="inner-user-text">
-                  {{
-                    $store.state.userInfo && $store.state.userInfo.username
-                      ? $store.state.userInfo.username
-                      : userName
-                  }}
+                  {{ $store.state.userInfo && $store.state.userInfo.username ? $store.state.userInfo.username : userName }}
                 </div>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -138,9 +94,7 @@ export default {
   data() {
     return {
       systemInfo: {},
-      userName: localStorage.getItem("USER_NAME")
-        ? localStorage.getItem("USER_NAME")
-        : "未登录",
+      userName: localStorage.getItem("USER_NAME") ? localStorage.getItem("USER_NAME") : "未登录",
       ActiveIndex: "0",
       navData: {
         1: "首页",
@@ -155,7 +109,8 @@ export default {
         "5-1": "法律法规",
         "5-2": "历史问题",
         "5-3": "指标体系",
-      },
+        "5-4": "资金投入"
+      }
     };
   },
   mounted() {
@@ -174,7 +129,7 @@ export default {
       let sortparam = [{ field: "c_publish_time", orderByType: 2 }];
       params.append("orderBy", JSON.stringify(sortparam));
       this.$Post(this.urlsCollection.selectContentList, params).then(
-        (res) => {
+        res => {
           if (res.code === 200 && res.content.data.length > 0) {
             let tableData = res.content.data;
             if (tableData.length > 0) {
@@ -188,10 +143,7 @@ export default {
               if (systemVersion) {
                 if (systemVersion != this.systemInfo.version) {
                   this.$message.success("新版本已发布！自动更新中！");
-                  localStorage.setItem(
-                    "SYSTEM_VERSION",
-                    this.systemInfo.version
-                  );
+                  localStorage.setItem("SYSTEM_VERSION", this.systemInfo.version);
                   window.location.reload();
                 }
               } else {
@@ -203,7 +155,7 @@ export default {
             this.$message.error(res.message);
           }
         },
-        (error) => {
+        error => {
           this.systemInfo = {};
           this.$message.error(error);
         }
@@ -214,10 +166,7 @@ export default {
       let _ActiveIndex = "";
       if (this.$store.state.navSelect) {
         if (this.$store.state.navSelect.subIndex) {
-          _ActiveIndex =
-            this.$store.state.navSelect.index +
-            "-" +
-            this.$store.state.navSelect.subIndex;
+          _ActiveIndex = this.$store.state.navSelect.index + "-" + this.$store.state.navSelect.subIndex;
         } else {
           _ActiveIndex = this.$store.state.navSelect.index;
         }
@@ -247,7 +196,7 @@ export default {
       that.$emit("navSelect", {
         index: index[0],
         subIndex: index[1],
-        name: name,
+        name: name
       });
       // let notFound = ["2-2", "2-3", "2-4", "5-3"];
       // let notFoundState = true;
@@ -290,7 +239,7 @@ export default {
         // 我的标记
         myLabels: {},
         overlay: {},
-        analysisGroups: {},
+        analysisGroups: {}
       };
       localStorage.removeItem("TOKEN");
       localStorage.removeItem("USER_ID");
@@ -299,18 +248,18 @@ export default {
       const h = this.$createElement;
       this.$notify({
         title: "登出成功",
-        message: h("i", { style: "color: teal" }, "用户退出！感谢使用！"),
+        message: h("i", { style: "color: teal" }, "用户退出！感谢使用！")
       });
-    },
+    }
   },
   watch: {
     "$store.state.navSelect": {
       handler() {
         this.getActiveIndex(false);
       },
-      deep: true,
-    },
-  },
+      deep: true
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -412,11 +361,7 @@ export default {
   color: #ffffff !important;
   font-size: 24px !important;
 }
-#layoutHeader
-  /deep/
-  .el-menu--horizontal
-  > .el-submenu
-  .el-submenu__title:hover {
+#layoutHeader /deep/ .el-menu--horizontal > .el-submenu .el-submenu__title:hover {
   background: none;
 }
 #layoutHeader /deep/ .el-submenu__title i {

src/components/layout/MenuCard.vue

@@ -176,6 +176,7 @@ export default {
           this.menuCardData.topSolt &&
           this.menuCardData.topSolt.commonData
         ) {
+          // 多数据轮播配置并判断
           this.setInterval = setInterval(() => {
             if (this.chartCardDataIndex < this.menuCardData.topSolt.commonData.length - 1) {
               this.chartCardDataIndex++;
@@ -263,6 +264,9 @@ export default {
               this.dataInitLoading = false;
             }
           );
+        } else if (this.menuCardData.commonName && this.menuCardData.commonName === "HOME_CARD") {
+          // 首页左侧列表数据获取
+          this.HomeCardData(this.$store.state.homeSpecialTown);
         } else if (this.menuCardData.commonName && this.menuCardData.commonName === "TOP") {
           // top列表
           this.topData(this.$store.state.homeSpecialTown);
@@ -284,7 +288,7 @@ export default {
           if (this.menuCardData.states) {
             params.append("states", this.menuCardData.states);
           } else {
-            params.append("states", "1,2,3,4");
+            params.append("states", "0,1,2,3,4");
           }
           params.append("pageSize", this.menuCardData.pageSize ? this.menuCardData.pageSize : 999);
           params.append("page", 0);
@@ -437,69 +441,179 @@ export default {
    */
   props: ["menuData"],
   methods: {
+    HomeCardData(homeSpecialTown) {
+      this.dataInitLoading = true;
+      // 类型对照，直接写死，累了
+      let c_ejfl_MAP = {
+        1: "带征地",
+        2: "减量化",
+        3: "森林",
+        4: "设施农用地",
+        5: "项目化造林",
+        6: "永久基本农田",
+        7: "水域面积",
+        8: "区管河道",
+        9: "镇管河道",
+        10: "土地资源面积"
+      };
+
+      // 原数据清空
+      this.menuData.topSolt.commonData.forEach(item => {
+        item.categoryData = [];
+        item.value = 0;
+        item.valueData = [];
+      });
+      let params = new FormData();
+      let searchParam = [];
+      params.append("states", "0,1,2,3,4");
+      params.append("pageSize", this.menuCardData.pageSize ? this.menuCardData.pageSize : 999);
+      params.append("page", 0);
+      params.append("columnId", this.menuCardData.columnId);
+      let paramJson = {};
+      let paramType = {
+        field: "c_yjfl",
+        // 等值查询
+        searchType: "1",
+        content: {
+          value: this.menuCardData.paramJson.c_yjfl
+        }
+      };
+      searchParam.push(paramType);
+      if (homeSpecialTown !== "全部") {
+        let associatedItems = this.$store.state.selectSelectDataMap.associatedItems;
+        if (associatedItems.length > 0) {
+          associatedItems.forEach(item => {
+            if (item.name == homeSpecialTown) {
+              let c_ssjz = {
+                field: "c_ssjz",
+                // 等值查询
+                searchType: "1",
+                content: {
+                  value: item.index + ""
+                }
+              };
+              searchParam.push(c_ssjz);
+            }
+          });
+        }
+      } else {
+        let c_ssjz = {
+          field: "c_ssjz",
+          // 等值查询
+          searchType: "1",
+          content: {
+            value: "5000000"
+          }
+        };
+        searchParam.push(c_ssjz);
+      }
+      params.append("search", JSON.stringify(searchParam));
+      params.append("paramJson", JSON.stringify(paramJson));
+      let sortparam = [{ field: "c_years", orderByType: 1 }];
+      params.append("orderBy", JSON.stringify(sortparam));
+      let resData = [];
+      this.$Post(this.menuCardData.getUrl, params).then(
+        res => {
+          if (res.code === 200 && res.content !== "数据为空" && res.content.data.length > 0) {
+            // 接收到所有数据并整合为正常数据
+            res.content.data.forEach(resItem => {
+              let hasIf = false;
+              if (resData.length > 0) {
+                resData.forEach(item => {
+                  if (item.title === c_ejfl_MAP[resItem.c_ejfl]) {
+                    hasIf = true;
+                    item.value = resItem.c_zrsj;
+                    item.categoryData.push(resItem.c_years);
+                    item.valueData.push(resItem.c_zrsj.toFixed(2));
+                  }
+                });
+              }
+              if (!hasIf) {
+                let itemData = {
+                  title: c_ejfl_MAP[resItem.c_ejfl],
+                  value: resItem.c_zrsj,
+                  unit: resItem.c_unit == 1 ? "km²" : "条",
+                  categoryData: [resItem.c_years],
+                  valueData: [resItem.c_zrsj.toFixed(2)]
+                };
+                if (this.menuCardData.paramJson.c_yjfl == 3) {
+                  itemData.type = "lr";
+                }
+                resData.push(itemData);
+              }
+            });
+            console.log(resData);
+            this.menuData.topSolt.commonData = resData;
+          }
+          this.dataInitLoading = false;
+        },
+        error => {
+          this.dataInitLoading = false;
+          console.log("error:", error, this.menuCardData);
+        }
+      );
+    },
     sumData(homeSpecialTown) {
       if (this.menuCardData.paramJson && this.menuCardData.categoryData) {
         this.dataInitLoading = true;
-        this.menuCardData.topSolt.commonData[0].categoryData = [];
-        this.menuCardData.topSolt.commonData[0].valueData = [];
+        this.menuCardData.topSolt.commonData[0] = Object.assign(this.menuCardData.topSolt.commonData[0], {
+          categoryData: [],
+          valueData: [],
+          value: 0
+        });
         let _categoryData = this.menuCardData.categoryData;
         let _valueData = [];
         this.menuCardData.categoryData.forEach(item => {
           _valueData.push(0);
         });
-
-        this.menuCardData.categoryData.forEach((item, _index) => {
-          let params = new FormData();
-          params.append("columnId", this.menuCardData.columnId);
-          if (this.menuCardData.field) {
-            params.append("field", this.menuCardData.field);
-          }
-          params.append("states", "2,3");
-          params.append("pageSize", this.menuCardData.pageSize ? this.menuCardData.pageSize : 999);
-          params.append("page", 0);
-          let pramJson = {};
-          pramJson.c_new_date = item;
-          pramJson.sj_select = this.menuCardData.paramJson.sj_select;
-          if (homeSpecialTown !== "全部") {
-            let associatedItems = this.$store.state.selectSelectDataMap.associatedItems;
-            if (associatedItems.length > 0) {
-              associatedItems.forEach(item => {
-                if (item.name === homeSpecialTown) {
-                  pramJson.bsjz = item.index + "";
-                }
-              });
-            }
-          }
-          params.append("paramJson", JSON.stringify(pramJson));
-          if (this.menuCardData.sortField) {
-            let sortparam = [
-              {
-                field: this.menuCardData.sortField.field,
-                orderByType: this.menuCardData.sortField.orderByType
+        let params = new FormData();
+        params.append("columnId", this.menuCardData.columnId);
+        if (this.menuCardData.field) {
+          params.append("field", this.menuCardData.field);
+        }
+        let paramJson = Object.assign({}, this.menuCardData.paramJson);
+        this.menuCardData.categoryData.forEach((item, _index) => {});
+        if (homeSpecialTown !== "全部") {
+          let associatedItems = this.$store.state.selectSelectDataMap.associatedItems;
+          if (associatedItems.length > 0) {
+            associatedItems.forEach(item => {
+              if (item.name == homeSpecialTown) {
+                paramJson.c_bsjzwt = item.index + "";
               }
-            ];
-            params.append("orderBy", JSON.stringify(sortparam));
+            });
           }
-          this.$Post(this.menuCardData.getUrl ? this.menuCardData.getUrl : this.urlsCollection.selectContentList, params).then(
-            res => {
-              let sumField = 0;
-              if (res.code === 200 && res.content !== "数据为空" && res.content.length > 0) {
-                res.content.forEach(contentItem => {
-                  sumField += Number(contentItem.number);
+        }
+        params.append("paramJson", JSON.stringify(paramJson));
+        if (this.menuCardData.sortField) {
+          let sortparam = [
+            {
+              field: this.menuCardData.sortField.field,
+              orderByType: this.menuCardData.sortField.orderByType
+            }
+          ];
+          params.append("orderBy", JSON.stringify(sortparam));
+        }
+        this.$Post(this.menuCardData.getUrl ? this.menuCardData.getUrl : this.urlsCollection.selectContentList, params).then(
+          res => {
+            if (res.code === 200 && res.content !== "数据为空" && res.content.length > 0) {
+              res.content.forEach(contentItem => {
+                this.menuCardData.categoryData.forEach((item, _index) => {
+                  if (contentItem.c_lxndwt == item) {
+                    let sumField = Number(contentItem.number);
+                    _valueData[Number(_index)] = sumField;
+                  }
                 });
-              }
-              _valueData[Number(_index)] = sumField;
-
+              });
               this.menuCardData.topSolt.commonData[0].categoryData = _categoryData;
               this.menuCardData.topSolt.commonData[0].valueData = _valueData;
               this.menuCardData.topSolt.commonData[0].value = _valueData[_valueData.length - 1];
-              this.dataInitLoading = false;
-            },
-            error => {
-              console.log("error:", error, this.menuCardData);
             }
-          );
-        });
+            this.dataInitLoading = false;
+          },
+          error => {
+            console.log("error:", error, this.menuCardData);
+          }
+        );
       }
     },
     topData(homeSpecialTown) {
@@ -574,60 +688,62 @@ export default {
       this.dataInitLoading = true;
       if (this.menuCardData.paramJson) {
         this.menuCardData.paramJson.sj_select.forEach((paramSjItem, paramSjIndex) => {
-          let params = new FormData();
-          params.append("columnId", this.menuCardData.columnId);
-          if (this.menuCardData.field) {
-            params.append("field", this.menuCardData.field);
-          }
-          params.append("states", "0,1,2,3,4");
-          params.append("pageSize", this.menuCardData.pageSize ? this.menuCardData.pageSize : 999);
-          params.append("page", 0);
-          let pramJson = {};
-          pramJson.sj_select = paramSjItem;
-          if (homeSpecialTown !== "全部") {
-            let associatedItems = this.$store.state.selectSelectDataMap.associatedItems;
-            if (associatedItems.length > 0) {
-              associatedItems.forEach(item => {
-                if (item.name === homeSpecialTown) {
-                  pramJson.bsjz = item.index + "";
-                }
-              });
-            }
-          }
-          params.append("paramJson", JSON.stringify(pramJson));
-          if (this.menuCardData.sortField) {
-            let sortparam = [
-              {
-                field: this.menuCardData.sortField.field,
-                orderByType: this.menuCardData.sortField.orderByType
+          this.menuCardData.topSolt.commonData[paramSjIndex].value = 0;
+        });
+        let params = new FormData();
+        params.append("columnId", this.menuCardData.columnId);
+        if (this.menuCardData.field) {
+          params.append("field", this.menuCardData.field);
+        }
+        let paramJson = {};
+        if (homeSpecialTown !== "全部") {
+          let associatedItems = this.$store.state.selectSelectDataMap.associatedItems;
+          if (associatedItems.length > 0) {
+            associatedItems.forEach(item => {
+              if (item.name === homeSpecialTown) {
+                paramJson.c_bsjzwt = item.index + "";
               }
-            ];
-            params.append("orderBy", JSON.stringify(sortparam));
+            });
           }
-          this.$Post(this.menuCardData.getUrl ? this.menuCardData.getUrl : this.urlsCollection.selectContentList, params).then(
-            res => {
-              let allSum = 0;
-              if (res.code === 200 && res.content.length > 0) {
+        }
+        params.append("paramJson", JSON.stringify(paramJson));
+        if (this.menuCardData.sortField) {
+          let sortparam = [
+            {
+              field: this.menuCardData.sortField.field,
+              orderByType: this.menuCardData.sortField.orderByType
+            }
+          ];
+          params.append("orderBy", JSON.stringify(sortparam));
+        }
+        this.$Post(this.menuCardData.getUrl ? this.menuCardData.getUrl : this.urlsCollection.selectContentList, params).then(
+          res => {
+            if (res.code === 200 && res.content.length > 0) {
+              this.menuCardData.paramJson.sj_select.forEach((paramSjItem, paramSjIndex) => {
                 res.content.forEach(item => {
-                  allSum += item.number;
+                  if (item.c_sjlbwt === paramSjItem) {
+                    this.menuCardData.topSolt.commonData[paramSjIndex].value = item.number;
+                  }
                 });
-              }
-              this.menuCardData.topSolt.commonData[paramSjIndex].value = allSum;
-              this.dataInitLoading = false;
-            },
-            error => {
-              this.menuCardData.topSolt.commonData[paramSjIndex].value = "--";
-              console.log("error:", error, this.menuCardData);
-              this.dataInitLoading = false;
+              });
             }
-          );
-        });
+            this.dataInitLoading = false;
+          },
+          error => {
+            console.log("error:", error, this.menuCardData);
+            this.dataInitLoading = false;
+          }
+        );
       }
     },
     // 切换街镇时
     changeHomeSpecialTown() {
       try {
-        if (this.menuData.ifChange === undefined || this.menuData.ifChange !== false || this.$store.state.homeSpecialTown === "全部") {
+        if (
+          this.menuData.ifChange === undefined ||
+          this.menuData.ifChange !== false ||
+          this.$store.state.homeSpecialTown === "全部"
+        ) {
           this.dataInitLoading = true;
           // 如果静态文件中的数据存在，直接返回
           if (
@@ -669,6 +785,8 @@ export default {
                 console.log("切换街道:end", this.menuCardData.topSolt.commonData);
               }
             }
+          } else if (this.menuCardData && this.menuCardData.commonName && this.menuCardData.commonName === "HOME_CARD") {
+            this.HomeCardData(this.$store.state.homeSpecialTown);
           } else if (this.menuCardData && this.menuCardData.commonName && this.menuCardData.commonName === "TOP") {
             this.topData(this.$store.state.homeSpecialTown);
           } else if (this.menuCardData && this.menuCardData.commonName && this.menuCardData.commonName === "SUM") {

src/config/common.js

@@ -570,44 +570,48 @@ export const menuOnLine = {
         subIndex: "1",
         name: "土地资源",
       },
+      getUrl: "/dms/content/selectContentList",
+      columnId: 1376,
+      field: "c_ejfl",
+      commonName: "HOME_CARD",
+      categoryData: ["2020", "2021", "2022"],
+      paramJson: {
+        c_yjfl: "1",
+      },
       topSolt: {
         commonName: "TagTableCard",
-        commonDataGetUrl: "layout_land.json",
+        // commonDataGetUrl: "layout_land.json",
         commonData: [
           {
             title: "基本农田面积",
-            value: 150,
             unit: "km²",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [100, 120, 150],
+            categoryData: [],
+            valueData: [],
           },
           {
             title: "带征地",
-            value: 250,
             unit: "km²",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [2000, 220, 250],
+            categoryData: [],
+            valueData: [],
           },
           {
             title: "减量化面积",
-            value: 350,
             unit: "km²",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [300, 20, 350],
+            categoryData: [],
+            valueData: [],
           },
           {
             title: "设施农用地",
-            value: 450,
             unit: "km²",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [40, 420, 450],
+            categoryData: [],
+            valueData: [],
           },
           {
             type: "tb",
             title: "土地资源面积",
+            unit: "km²",
             valueData: [],
             categoryData: [],
-            unit: "km²",
           },
         ],
       },
@@ -626,30 +630,38 @@ export const menuOnLine = {
         subIndex: "2",
         name: "水资源",
       },
+      getUrl: "/dms/content/selectContentList",
+      columnId: 1376,
+      field: "c_ejfl",
+      commonName: "HOME_CARD",
+      categoryData: ["2020", "2021", "2022"],
+      paramJson: {
+        c_yjfl: "2",
+      },
       topSolt: {
         commonName: "TagCard",
-        commonDataGetUrl: "layout_water.json",
+        // commonDataGetUrl: "layout_water.json",
         commonData: [
           {
             type: "tb",
             title: "水域面积",
             unit: "km²",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [40, 420, 654],
+            categoryData: [],
+            valueData: [],
           },
           {
             type: "tb",
             title: "区管河道数量",
             unit: "条",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [400, 420, 654],
+            categoryData: [],
+            valueData: [],
           },
           {
             type: "tb",
             title: "镇管河道数量",
             unit: "条",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [400, 40, 654],
+            categoryData: [],
+            valueData: [],
           },
         ],
       },
@@ -668,23 +680,31 @@ export const menuOnLine = {
         subIndex: "3",
         name: "林地资源",
       },
+      getUrl: "/dms/content/selectContentList",
+      columnId: 1376,
+      field: "c_ejfl",
+      commonName: "HOME_CARD",
+      categoryData: ["2020", "2021", "2022"],
+      paramJson: {
+        c_yjfl: "3",
+      },
       topSolt: {
         commonName: "TagCard",
-        commonDataGetUrl: "layout_forest.json",
+        // commonDataGetUrl: "layout_forest.json",
         commonData: [
           {
             type: "lr",
             title: "林地面积",
             unit: "km²",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [40, 420, 654],
+            categoryData: [],
+            valueData: [],
           },
           {
             type: "lr",
             title: "公益林面积",
             unit: "km²",
-            categoryData: ["2019", "2020", "2021"],
-            valueData: [400, 420, 654],
+            categoryData: [],
+            valueData: [],
           },
         ],
       },
@@ -1009,6 +1029,11 @@ export const menuOnLine = {
         ifChange: false,
         type: "card",
         title: "资金投入情况",
+        gotoPageInfo: {
+          index: "5",
+          subIndex: "4",
+          name: "资金投入",
+        },
         titleWidth: 64,
         menuIndex: "1",
         position: "right",
@@ -1142,21 +1167,20 @@ export const menuOnLine = {
         subMenuIndex: "1",
         position: "right",
         minDomWidth: 1200,
-        // getUrl: "/dms/content/selectGroupByCountOrderBy",
-        // columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
-        // commonName: "SUM",
+        getUrl: "/dms/content/selectGroupByCountOrderBy",
+        columnId: 1127,
+        field: "c_lxndwt",
+        commonName: "SUM",
         categoryData: ["2020", "2021", "2022"],
         paramJson: {
-          sj_select: "1",
+          c_sjlbwt: "1",
         },
         topSolt: {
           commonName: "TagCard",
           commonData: [
             {
               type: "lr",
-              // title: "土地类疑点",
+              title: "土地类疑点",
               unit: "个",
               categoryData: [],
               valueData: [],
@@ -1169,7 +1193,7 @@ export const menuOnLine = {
       },
       {
         type: "card",
-        title: "土地类问题TOP5",
+        title: "土地类问题TOP10",
         titleWidth: 81,
         menuIndex: "2",
         subMenuIndex: "1",
@@ -1177,11 +1201,12 @@ export const menuOnLine = {
         minDomWidth: 1200,
         commonName: "TOP",
         getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
+        columnId: 1127,
+        pageSize: 10,
+        field: "c_wtdx1wt",
+        bsjzColumnName: true,
         paramJson: {
-          sj_select: "1",
+          c_sjlbwt: "1",
         },
         topData: [],
       },
@@ -1195,21 +1220,20 @@ export const menuOnLine = {
         subMenuIndex: "2",
         position: "right",
         minDomWidth: 1200,
-        // getUrl: "/dms/content/selectGroupByCountOrderBy",
-        // columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
-        // commonName: "SUM",
+        getUrl: "/dms/content/selectGroupByCountOrderBy",
+        columnId: 1127,
+        field: "c_lxndwt",
+        commonName: "SUM",
         categoryData: ["2020", "2021", "2022"],
         paramJson: {
-          sj_select: "2",
+          c_sjlbwt: "2",
         },
         topSolt: {
           commonName: "TagCard",
           commonData: [
             {
               type: "lr",
-              // title: "水资源类疑点",
+              title: "水资源类疑点",
               unit: "个",
               categoryData: [],
               valueData: [],
@@ -1222,7 +1246,7 @@ export const menuOnLine = {
       },
       {
         type: "card",
-        title: "水资源类问题TOP5",
+        title: "水资源类问题TOP10",
         titleWidth: 81,
         menuIndex: "2",
         subMenuIndex: "2",
@@ -1230,11 +1254,12 @@ export const menuOnLine = {
         minDomWidth: 1200,
         commonName: "TOP",
         getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
+        columnId: 1127,
+        pageSize: 10,
+        field: "c_wtdx1wt",
+        bsjzColumnName: true,
         paramJson: {
-          sj_select: "2",
+          c_sjlbwt: "2",
         },
         topData: [],
       },
@@ -1248,21 +1273,20 @@ export const menuOnLine = {
         subMenuIndex: "3",
         position: "right",
         minDomWidth: 1200,
-        // getUrl: "/dms/content/selectGroupByCountOrderBy",
-        // columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
-        // commonName: "SUM",
+        getUrl: "/dms/content/selectGroupByCountOrderBy",
+        columnId: 1127,
+        field: "c_lxndwt",
+        commonName: "SUM",
         categoryData: ["2020", "2021", "2022"],
         paramJson: {
-          sj_select: "3",
+          c_sjlbwt: "3",
         },
         topSolt: {
           commonName: "TagCard",
           commonData: [
             {
               type: "lr",
-              // title: "林地类疑点",
+              title: "林地类疑点",
               unit: "个",
               categoryData: [],
               valueData: [],
@@ -1275,7 +1299,7 @@ export const menuOnLine = {
       },
       {
         type: "card",
-        title: "林类问题TOP5",
+        title: "林类问题TOP10",
         titleWidth: 81,
         menuIndex: "2",
         subMenuIndex: "3",
@@ -1283,11 +1307,12 @@ export const menuOnLine = {
         minDomWidth: 1200,
         commonName: "TOP",
         getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
+        columnId: 1127,
+        pageSize: 10,
+        field: "c_wtdx1wt",
+        bsjzColumnName: true,
         paramJson: {
-          sj_select: "3",
+          c_sjlbwt: "3",
         },
         topData: [],
       },
@@ -1301,21 +1326,20 @@ export const menuOnLine = {
         subMenuIndex: "4",
         position: "right",
         minDomWidth: 1200,
-        // getUrl: "/dms/content/selectGroupByCountOrderBy",
-        // columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
-        // commonName: "SUM",
+        getUrl: "/dms/content/selectGroupByCountOrderBy",
+        columnId: 1127,
+        field: "c_lxndwt",
+        commonName: "SUM",
         categoryData: ["2020", "2021", "2022"],
         paramJson: {
-          sj_select: "4",
+          c_sjlbwt: "4",
         },
         topSolt: {
           commonName: "TagCard",
           commonData: [
             {
               type: "lr",
-              // title: "生态类疑点",
+              title: "生态类疑点",
               unit: "个",
               categoryData: [],
               valueData: [],
@@ -1328,7 +1352,7 @@ export const menuOnLine = {
       },
       {
         type: "card",
-        title: "生态问题TOP5",
+        title: "生态问题TOP10",
         titleWidth: 81,
         menuIndex: "2",
         subMenuIndex: "4",
@@ -1336,11 +1360,12 @@ export const menuOnLine = {
         minDomWidth: 1200,
         commonName: "TOP",
         getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
+        columnId: 1127,
+        pageSize: 10,
+        field: "c_wtdx1wt",
+        bsjzColumnName: true,
         paramJson: {
-          sj_select: "4",
+          c_sjlbwt: "4",
         },
         topData: [],
       },
@@ -1359,9 +1384,8 @@ export const menuOnLine = {
         position: "right",
         minDomWidth: 1200,
         getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
-        pageSize: 5,
-        field: "c_zdsjsx",
+        columnId: 1127,
+        field: "c_sjlbwt",
         commonName: "ALLLIST",
         paramJson: {
           sj_select: ["1", "2", "3", "4"],
@@ -1438,28 +1462,7 @@ export const menuOnLine = {
             c_kmc: "自然生态保护",
             number: 4.3,
             info: "0.70",
-          },
-          // {
-          //   c_kmc: "林业和草原",
-          //   number: 2.0,
-          //   info: "0.32"
-          // }, {
-          //   c_kmc: "环境保护管理事务",
-          //   number: 1.0,
-          //   info: "0.17"
-          // }, {
-          //   c_kmc: "农业农村",
-          //   number: 0.9,
-          //   info: "0.15"
-          // }, {
-          //   c_kmc: "扶贫",
-          //   number: 0.7,
-          //   info: "0.12"
-          // }, {
-          //   c_kmc: "其他节能环保支出",
-          //   number: 0.2,
-          //   info: "0.02"
-          // }
+          }
         ],
       },
       {

src/views/CapitalInput.vue

@@ -0,0 +1,297 @@
+<template>
+  <div class="frenquency-container" v-loading="initTableData">
+    <div class="frenquency-container-inner">
+      <div class="header">
+        <div class="header-title">资金投入</div>
+        <div class="header-select">
+          <div>
+            <el-input class="search-input" v-model="allSearchColumn" clearable placeholder="请输入关键词">
+              <i class="el-icon-search" style="cursor: pointer" @click="getContentInfoWhere(1)" slot="append"></i>
+            </el-input>
+          </div>
+        </div>
+        <div class="reset-btn" @click="resetEvent">重置</div>
+      </div>
+      <div class="center">
+        <el-table :data="tableData" style="width: 100%" max-height="600">
+          <el-table-column type="index" width="70" align="center" label="序号"> </el-table-column>
+          <el-table-column prop="cYsdwmc" label="预算单位名称" width="150" align="center"> </el-table-column>
+          <el-table-column prop="cYsxmmc" label="预算项目名称" align="center" width="180"> </el-table-column>
+          <el-table-column prop="cKmc" label="款名称" align="center"> </el-table-column>
+          <el-table-column prop="cZy" label="摘要" align="center"> </el-table-column>
+          <el-table-column prop="cZfrq" label="支付日期" align="center"> </el-table-column>
+          <el-table-column prop="cZfje" label="支付金额" align="center"> </el-table-column>
+          <el-table-column prop="cSqrmc" label="收款人名称" align="center"> </el-table-column>
+        </el-table>
+      </div>
+      <div class="footer">
+        <Pagination class="pagination-style" :paginationData="paginationData" />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import NewSelect from "@/components/common/NewSelect.vue";
+import Pagination from "@/components/common/Pagination.vue";
+/**
+ * 资金投入 -- 智能辅助
+ * @author: 刘梦祥
+ * @Date: 2023.02.23
+ */
+export default {
+  name: "CapitalInput",
+  components: { NewSelect, Pagination },
+  data() {
+    return {
+      initTableData: true,
+      // 立项年度搜索框
+      whereStr: "",
+      allSearchColumn: "",
+      tableData: [],
+      // 暂存全部数据
+      formData: [],
+      paginationData: {
+        pageSize: 10,
+        pagerCount: 5,
+        currentPage: 1,
+        pageSizes: [5, 10, 20, 30],
+        total: 50,
+        currentChange: val => {
+          this.getTableData(val);
+        },
+        handleSizeChange: val => {
+          this.handleSizeChange(val);
+        }
+      }
+    };
+  },
+  computed: {},
+  created() {
+    setTimeout(() => {
+      this.getTableData(1);
+    }, 0);
+  },
+  methods: {
+    resetEvent() {
+      this.allSearchColumn = "";
+      setTimeout(() => {
+        this.getTableData(1);
+      });
+    },
+    /**
+     * 全字段模糊查询
+     * 通过全表查询模拟分页
+     * 查询出结果后自动得到下拉框中的联动
+     *  */
+    getContentInfoWhere(val) {
+      this.initTableData = true;
+      // 创建搜索条件对象
+      this.whereStr = "";
+      // 不存在明确条件，只存在模糊条件时
+      if (this.allSearchColumn) {
+        this.whereStr += `where c_ysdwmc like '%${this.allSearchColumn}%' `;
+        this.whereStr += `or c_ysxmmc like '%${this.allSearchColumn}%' `;
+        this.whereStr += `or c_kmc like '%${this.allSearchColumn}%' `;
+        this.whereStr += `or c_zy like '%${this.allSearchColumn}%' `;
+        // this.whereStr += `or c_zfje like '%${this.allSearchColumn}%' `;
+        this.whereStr += `or c_sqrmc like '%${this.allSearchColumn}%' `;
+      }
+
+      // 创建FormData对象
+      let params = new FormData();
+      params = {
+        columnId: 1394,
+        whereStr: this.whereStr
+      };
+      let _this = this;
+      // 开始查询
+      this.$Post(this.urlsCollection.getContentInfoWhere, params).then(res => {
+        if (res.code === 200 && res.content && res.content.length > 0) {
+          // 当前页数
+          this.paginationData.currentPage = val;
+          // 总数
+          this.paginationData.total = res.content.length;
+          // 每页显示数据个数
+          this.formData = res.content.slice(
+            (this.paginationData.currentPage - 1) * this.paginationData.pageSize,
+            this.paginationData.currentPage * this.paginationData.pageSize > this.paginationData.total
+              ? this.paginationData.total
+              : this.paginationData.currentPage * this.paginationData.pageSize
+          );
+          let rowIndex = 0;
+          this.tableData = this.formData.map(v => {
+            rowIndex++;
+            return {
+              rowIndex: rowIndex,
+              cYsdwmc: v.c_ysdwmc,
+              cYsxmmc: v.c_ysxmmc,
+              cKmc: v.c_kmc,
+              cZy: v.c_zy,
+              cZfrq: _this.$dayjs(v.c_zfrq).format("YYYY-MM-DD"),
+              cZfje: v.c_zfje,
+              cSqrmc: v.c_sqrmc
+            };
+          });
+          this.initTableData = false;
+        } else {
+          this.paginationData.total = 0;
+          this.tableData = [];
+          this.initTableData = false;
+        }
+      });
+    },
+    // 切换页
+    getTableData(val) {
+      this.getContentInfoWhere(val);
+    },
+    // 切换条数
+    handleSizeChange(val) {
+      this.getTableData(this.paginationData.pageSize);
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.frenquency-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  &-inner {
+    width: 98%;
+    height: 97%;
+    background: rgba(0, 39, 77, 0.5);
+    .header {
+      height: 13%;
+      width: 100%;
+      position: relative;
+      &-title {
+        width: 84px;
+        height: 20px;
+        font-size: 20px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #4dc3ff;
+        line-height: 30px;
+        position: absolute;
+        top: 1px;
+        left: 10px;
+      }
+      &-select {
+        position: absolute;
+        left: 10px;
+        bottom: 5px;
+        width: 900px;
+        height: 40px;
+        color: #e6e6e6;
+        display: flex;
+        justify-content: space-between;
+        & > div {
+          // position: absolute;
+          display: flex;
+          justify-content: space-around;
+          width: 320px;
+          .text {
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            width: 100px;
+            height: 28px;
+          }
+          .select-input {
+            width: 170px;
+          }
+        }
+      }
+      .reset-btn,
+      .query-btn {
+        width: 60px;
+        height: 30px;
+        border-radius: 3px;
+        border: none;
+        color: #fff;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: absolute;
+        top: 15px;
+      }
+      .reset-btn {
+        right: 30px;
+        background: rgba(129, 140, 164, 1);
+      }
+      .query-btn {
+        right: 110px;
+        background-image: linear-gradient(to top, rgba(79, 172, 254, 1), rgba(0, 242, 254, 1));
+      }
+    }
+    .center {
+      height: 77%;
+      width: 100%;
+      overflow: auto;
+      /deep/.el-table {
+        background: rgba(0, 39, 77, 0.6);
+        // font-size: 0.95rem;
+        font-family: PingFang SC;
+        font-weight: 500;
+        thead {
+          color: #4dc3ff;
+          font-size: 15px;
+        }
+      }
+    }
+    .footer {
+      height: 10%;
+      width: 100%;
+      position: absolute;
+      .pagination-style {
+        position: absolute;
+        right: 50px;
+      }
+    }
+  }
+}
+
+.dialog_title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #fff;
+  padding-bottom: 1.5rem;
+  &2 {
+    font-weight: 100;
+    font-size: 18px;
+    color: #fff;
+    padding-top: 1.5rem;
+  }
+  &3 {
+    display: flex;
+    justify-content: center;
+    padding-top: 1.5rem;
+  }
+  &_info {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+    font-weight: 400px;
+    color: #dcdfe6;
+    padding: 1rem 0;
+  }
+}
+.dialog_table {
+  display: flex;
+  justify-content: space-between;
+  div {
+    width: 50%;
+    text-align: center;
+    background-color: #00000064 !important;
+    margin: 1px;
+    padding: 5px 10px;
+    display: flex;
+    justify-content: center;
+    color: #dcdfe6;
+    border: 1px solid #001d3c00;
+  }
+}
+</style>

src/views/FrequencyView.vue

@@ -51,7 +51,7 @@
         <div class="header-title">历史问题</div>
         <div class="header-select">
           <div>
-            <el-input class="search-input" v-model="allSearchColumn" clearable>
+            <el-input class="search-input" v-model="allSearchColumn" clearable placeholder="请输入关键词">
               <i class="el-icon-search" style="cursor: pointer" @click="getContentInfoWhere(1)" slot="append"></i>
             </el-input>
           </div>
@@ -185,7 +185,7 @@ export default {
     };
   },
   computed: {
-    filteredValues(){
+    filteredValues() {
       return this.timeSelectVal[0] + this.townSelectVal[0] + this.typeSelectVal[0] + this.keyPoint[0] + this.problemType[0];
     }
   },
@@ -486,7 +486,7 @@ export default {
               problemNature: v.c_wtdx1wt || "--"
             };
           });
-        }else{
+        } else {
           this.paginationData.total = 0;
           this.tableData = [];
         }
@@ -504,7 +504,7 @@ export default {
     }
   },
   watch: {
-    filteredValues(){
+    filteredValues() {
       this.getTableData(this.currentPage);
     }
   }

src/views/HomeView.vue

@@ -23,7 +23,7 @@
           menuIndex: '2',
           subMenuIndex: '5',
           legendIcon: legendIcon,
-          legendTitle: legendTitle,
+          legendTitle: legendTitle
         }"
       />
       <div class="select-title">所属街道</div>
@@ -37,10 +37,7 @@
     </div>
 
     <!-- 综合分析 -->
-    <ComprehensiveAnalysis
-      id="ComprehensiveContainer"
-      v-show="$ifMenu('3', '')"
-    />
+    <ComprehensiveAnalysis id="ComprehensiveContainer" v-show="$ifMenu('3', '')" />
 
     <!-- 法律法规 -->
     <LawView id="LawContainer" v-if="$ifMenu('5', '1')" />
@@ -51,6 +48,9 @@
     <!-- 指标体系 -->
     <IndexSystem id="IndexSystemContainer" v-if="$ifMenu('5', '3')" />
 
+    <!-- 资金投入 -->
+    <CapitalInput id="CapitalInputContainer" v-if="$ifMenu('5', '4')" />
+
     <!-- Home页面（因为客户要求需要动画，所以不能用v-if控制首页元素的显示与隐藏，而是改为组件内部动态v-show控制元素的样式） -->
     <!-- 左侧菜单列 -- 首页 -->
     <div id="leftMenus">
@@ -58,8 +58,7 @@
     </div>
     <!-- 左侧菜单列(较宽，两列) -- 疑点筛查 -->
     <div id="leftMenusW" v-for="(item, index) in menus.leftW" :key="index">
-      <MenuCard :menuData="item2" v-for="item2 in item" :key="item2.title">
-      </MenuCard>
+      <MenuCard :menuData="item2" v-for="item2 in item" :key="item2.title"> </MenuCard>
     </div>
     <!-- 中部菜单列 -->
     <div id="mainMenus">
@@ -105,35 +104,17 @@
           boxHeight: '180',
           menuIndex: '1',
           legendIcon: legendIcon,
-          legendTitle: legendTitle,
+          legendTitle: legendTitle
         }"
       />
     </div>
     <!-- 首页右侧菜单列 -->
-    <div
-      class="rightMenus"
-      v-for="(item, index) in menus.right"
-      :key="'rightBox' + index"
-    >
-      <MenuCard
-        :menuData="item2"
-        v-for="(item2, index2) in item"
-        :key="'right' + index2"
-      >
-      </MenuCard>
+    <div class="rightMenus" v-for="(item, index) in menus.right" :key="'rightBox' + index">
+      <MenuCard :menuData="item2" v-for="(item2, index2) in item" :key="'right' + index2"> </MenuCard>
     </div>
     <!-- 首页右侧菜单列 -->
-    <div
-      class="rightMenusW"
-      v-for="(item, index) in menus.rightW"
-      :key="'rightBoxW' + index"
-    >
-      <MenuCard
-        :menuData="item2"
-        v-for="(item2, index2) in item"
-        :key="'rightW' + index2"
-      >
-      </MenuCard>
+    <div class="rightMenusW" v-for="(item, index) in menus.rightW" :key="'rightBoxW' + index">
+      <MenuCard :menuData="item2" v-for="(item2, index2) in item" :key="'rightW' + index2"> </MenuCard>
     </div>
   </div>
 </template>
@@ -159,6 +140,7 @@ import WholeProcessManagement from "@/components/common/WholeProcessManagement.v
 // 智能辅助 -- 历史问题
 import FrequencyView from "@/views/FrequencyView.vue";
 import IndexSystem from "@/views/IndexSystem.vue";
+import CapitalInput from "@/views/CapitalInput.vue";
 // 智能辅助 -- 法律法规
 import LawView from "@/views/LawView.vue";
 import { removeWatermark, setWaterMark } from "@/utils/watermark";
@@ -181,6 +163,7 @@ export default {
     FrequencyView,
     LawView,
     IndexSystem,
+    CapitalInput
   },
   data() {
     return {
@@ -189,7 +172,7 @@ export default {
         type: "lr",
         title: "林地面积",
         value: 654,
-        unit: "公顷",
+        unit: "公顷"
       },
       testTitle: "土地资源",
       activeIndex: 1,
@@ -198,38 +181,38 @@ export default {
         left: [],
         leftW: [],
         main: [],
-        right: [],
+        right: []
       },
       // 首页饼图相关
       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",
       soil: [],
@@ -240,19 +223,19 @@ export default {
         soil: [],
         other: [],
         forestry: [],
-        categoryData: [],
+        categoryData: []
       },
       BData: {
         soil: [],
         other: [],
         forestry: [],
-        categoryData: [],
+        categoryData: []
       },
       CData: {
         soil: [],
         other: [],
         forestry: [],
-        categoryData: [],
+        categoryData: []
       },
       streetSelectVal: "全部",
       streetOptions: [],
@@ -261,12 +244,12 @@ export default {
         { name: "土地资源问题", num: 67 },
         { name: "水资源问题", num: 37 },
         { name: "林地资源问题", num: 60 },
-        { name: "生态资源问题", num: 55 },
+        { name: "生态资源问题", num: 55 }
       ],
       // 综合分析
       analysis: {
-        searchInput: "",
-      },
+        searchInput: ""
+      }
     };
   },
   mounted() {
@@ -287,12 +270,12 @@ 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.classTextToIndex[keyName] = new Map();
-          res.content.forEach((v) => {
+          res.content.forEach(v => {
             this.classTextToIndex[keyName].set(v.index + "", v.name);
           });
         }
@@ -338,12 +321,12 @@ export default {
       params.append("type", type);
       params.append("cName", cName);
       this.$Post(this.urlsCollection.selectByCNameAType, params).then(
-        (res) => {
+        res => {
           if (res.code === 200 && res.content.length > 0) {
             this.$store.state.selectSelectDataMap[keyName] = res.content;
           }
         },
-        (error) => {
+        error => {
           this.$message.error(error);
           console.log(error);
         }
@@ -377,10 +360,10 @@ export default {
         columnId: 30,
         states: "0,1,2,3",
         pageSize: 30,
-        page: 0,
+        page: 0
       };
       this.$Post(this.urlsCollection.selectContentList, params)
-        .then((res) => {
+        .then(res => {
           if (res.code === 200 && res.content.data.length > 0) {
             // console.log(res.content.data, "getSourcesData接口获取成功");
             this.soil = [];
@@ -390,38 +373,32 @@ export default {
             let ADataArr = [];
             let BDataArr = [];
             let CDataArr = [];
-            data.map((v) => {
+            data.map(v => {
               if (v.zy_type === "0") {
                 ADataArr.push({
-                  name: this.classTextToIndex["浦东新区行政区划"].get(
-                    v.zy_town
-                  ),
+                  name: this.classTextToIndex["浦东新区行政区划"].get(v.zy_town),
                   soil: v.c_land_area,
                   other: v.other_area,
                   forest: v.c_forest_area,
-                  sum: v.c_land_area + v.other_area + v.c_forest_area,
+                  sum: v.c_land_area + v.other_area + v.c_forest_area
                 });
               }
               if (v.zy_type === "1") {
                 BDataArr.push({
-                  name: this.classTextToIndex["浦东新区行政区划"].get(
-                    v.zy_town
-                  ),
+                  name: this.classTextToIndex["浦东新区行政区划"].get(v.zy_town),
                   soil: v.c_land_area,
                   other: v.other_area,
                   forest: v.c_forest_area,
-                  sum: v.c_land_area + v.other_area + v.c_forest_area,
+                  sum: v.c_land_area + v.other_area + v.c_forest_area
                 });
               }
               if (v.zy_type === "2") {
                 CDataArr.push({
-                  name: this.classTextToIndex["浦东新区行政区划"].get(
-                    v.zy_town
-                  ),
+                  name: this.classTextToIndex["浦东新区行政区划"].get(v.zy_town),
                   soil: v.c_land_area,
                   other: v.other_area,
                   forest: v.c_forest_area,
-                  sum: v.c_land_area + v.other_area + v.c_forest_area,
+                  sum: v.c_land_area + v.other_area + v.c_forest_area
                 });
               }
             });
@@ -431,20 +408,20 @@ export default {
             CDataArr.sort(publicFun.compare("sum"));
 
             // 按A,B,C分出各自资源的排序数组
-            ADataArr.forEach((item) => {
+            ADataArr.forEach(item => {
               this.AData.soil.push(item.soil);
               this.AData.other.push(item.other);
               this.AData.forestry.push(item.forest);
               this.AData.categoryData.push(item.name);
             });
-            BDataArr.forEach((item) => {
+            BDataArr.forEach(item => {
               this.BData.soil.push(item.soil);
               this.BData.other.push(item.other);
               this.BData.forestry.push(item.forest);
               this.BData.categoryData.push(item.name);
             });
 
-            CDataArr.forEach((item) => {
+            CDataArr.forEach(item => {
               this.CData.soil.push(item.soil);
               this.CData.other.push(item.other);
               this.CData.forestry.push(item.forest);
@@ -463,10 +440,10 @@ export default {
             });
           }
         })
-        .catch((error) => {
+        .catch(error => {
           console.log(error, "getSourcesData");
         });
-    },
+    }
   },
   created() {
     this.classDictQuery("0", "浦东新区行政区划", "浦东新区行政区划");
@@ -475,10 +452,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>
@@ -599,7 +576,8 @@ export default {
 
 /* 历史问题 */
 #FrequencyContainer,
-#IndexSystemContainer {
+#IndexSystemContainer,
+#CapitalInputContainer {
   position: relative;
   height: calc(100% - 60px);
   width: 100%;
@@ -781,22 +759,14 @@ 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;
   }
 }