文档名称重写，资金投入优化，问题TOPBUG修复，街镇下拉框显示优化。

src/components/common/StepsMyBox.vue

@@ -225,13 +225,13 @@ export default {
         },
         {
           title: "通知",
-          info: { text: "项目审计通知书.pdf", filePath: "./static/word/审计通知书.pdf" },
+          info: { text: "项目审计通知书.pdf", filePath: "./static/word/sjtzs.pdf" },
           status: 200,
           time: "2022-08-30"
         },
         {
           title: "方案",
-          info: { text: "项目实施方案.pdf", filePath: "./static/word/实施方案.pdf" },
+          info: { text: "项目实施方案.pdf", filePath: "./static/word/ssfa.pdf" },
           status: 200,
           time: "2022-09-07"
         },
@@ -257,7 +257,7 @@ export default {
         },
         {
           title: "报告",
-          info: { text: "项目审计意见.docx", filePath: "./static/word/审计意见.pdf" },
+          info: { text: "项目审计意见.docx", filePath: "./static/word/sjyj.pdf" },
           status: 200,
           time: "2022-12-15"
         },

src/components/layout/MenuCard.vue

@@ -629,9 +629,7 @@ export default {
         params.append("page", 0);
         let pramJson = {};
         if (this.menuCardData.paramJson) {
-          if (this.menuCardData.paramJson.sj_select) {
-            pramJson.sj_select = this.menuCardData.paramJson.sj_select;
-          }
+          pramJson = Object.assign({}, this.menuCardData.paramJson);
         }
         if (homeSpecialTown !== "全部") {
           let associatedItems = this.$store.state.selectSelectDataMap.associatedItems;
@@ -1310,6 +1308,10 @@ export default {
   // overflow-y: auto;
   scrollbar-width: none; /* Firefox */
   -ms-overflow-style: none; /* IE 10+ */
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: space-around;
   &::-webkit-scrollbar {
     display: none; /* Chrome Safari */
   }

src/config/common.js

@@ -564,6 +564,7 @@ export const menuOnLine = {
       menuIndex: "1",
       position: "left",
       minDomWidth: 420,
+      // boxHeight: 350,
       intervalTime: 3000,
       gotoPageInfo: {
         index: "2",
@@ -625,6 +626,7 @@ export const menuOnLine = {
       menuIndex: "1",
       position: "left",
       minDomWidth: 420,
+      // boxHeight: 330,
       gotoPageInfo: {
         index: "2",
         subIndex: "2",
@@ -675,6 +677,7 @@ export const menuOnLine = {
       menuIndex: "1",
       position: "left",
       minDomWidth: 420,
+      // boxHeight: 330,
       gotoPageInfo: {
         index: "2",
         subIndex: "3",
@@ -1203,7 +1206,7 @@ export const menuOnLine = {
         getUrl: "/dms/content/selectGroupByCountOrderBy",
         columnId: 1127,
         pageSize: 10,
-        field: "c_wtdx1wt",
+        field: "c_ckwtdxwt",
         bsjzColumnName: true,
         paramJson: {
           c_sjlbwt: "1",
@@ -1256,7 +1259,7 @@ export const menuOnLine = {
         getUrl: "/dms/content/selectGroupByCountOrderBy",
         columnId: 1127,
         pageSize: 10,
-        field: "c_wtdx1wt",
+        field: "c_ckwtdxwt",
         bsjzColumnName: true,
         paramJson: {
           c_sjlbwt: "2",
@@ -1309,7 +1312,7 @@ export const menuOnLine = {
         getUrl: "/dms/content/selectGroupByCountOrderBy",
         columnId: 1127,
         pageSize: 10,
-        field: "c_wtdx1wt",
+        field: "c_ckwtdxwt",
         bsjzColumnName: true,
         paramJson: {
           c_sjlbwt: "3",
@@ -1362,7 +1365,7 @@ export const menuOnLine = {
         getUrl: "/dms/content/selectGroupByCountOrderBy",
         columnId: 1127,
         pageSize: 10,
-        field: "c_wtdx1wt",
+        field: "c_ckwtdxwt",
         bsjzColumnName: true,
         paramJson: {
           c_sjlbwt: "4",
@@ -1422,48 +1425,22 @@ export const menuOnLine = {
       },
       {
         type: "card",
-        title: "资金投入TOP5（亿元）",
-        titleWidth: 100,
+        title: "资金投入TOP10",
+        titleWidth: 80,
         boxWidth: "395",
         menuIndex: "2",
         subMenuIndex: "5",
         position: "right",
         minDomWidth: 1200,
         commonName: "TOP",
-        setBarWidth: 35,
-        // getUrl: "/dms/content/selectGroupByCountOrderBy",
-        // columnId: 1133,
-        // pageSize: 10,
-        // bsjzColumnName: "c_ssjzzjtr",
-        field: "c_kmc",
+        // setBarWidth: 35,
+        getUrl: "/dms/content/selectGroupByCountOrderBy",
+        columnId: 1394,
+        pageSize: 10,
+        bsjzColumnName: "c_ssjz",
+        field: "c_ysxmmc",
         paramJson: {},
-        topData: [
-          {
-            c_kmc: "农业",
-            number: 50.9,
-            info: "8.22",
-          },
-          {
-            c_kmc: "农村综合改革",
-            number: 34,
-            info: "3.44",
-          },
-          {
-            c_kmc: "水利",
-            number: 12.8,
-            info: "2.06",
-          },
-          {
-            c_kmc: "其他农林水支出",
-            number: 5.7,
-            info: "0.92",
-          },
-          {
-            c_kmc: "自然生态保护",
-            number: 4.3,
-            info: "0.70",
-          }
-        ],
+        topData: [],
       },
       {
         type: "card",

src/views/CapitalInput.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="frenquency-container" v-loading="initTableData">
+  <div class="frenquency-container">
     <div class="frenquency-container-inner">
       <div class="header">
         <div class="header-title">资金投入</div>
@@ -12,15 +12,20 @@
         </div>
         <div class="reset-btn" @click="resetEvent">重置</div>
       </div>
-      <div class="center">
+      <div
+        class="center"
+        v-loading="initTableData"
+        element-loading-text="拼命加载中"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
         <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="cYsdwmc" label="预算单位名称" align="center"> </el-table-column>
+          <el-table-column prop="cYsxmmc" label="预算项目名称" align="center"> </el-table-column>
+          <el-table-column prop="cKmc" label="款名称" width="150" 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="cZfrq" label="支付日期" width="120" align="center"> </el-table-column>
+          <el-table-column prop="cZfje" label="支付金额" width="100" align="center"> </el-table-column>
           <el-table-column prop="cSqrmc" label="收款人名称" align="center"> </el-table-column>
         </el-table>
       </div>
@@ -43,10 +48,12 @@ export default {
   components: { NewSelect, Pagination },
   data() {
     return {
-      initTableData: true,
+      initTableData: false,
       // 立项年度搜索框
       whereStr: "",
       allSearchColumn: "",
+      // 全部数据
+      allTableData: [],
       tableData: [],
       // 暂存全部数据
       formData: [],
@@ -65,17 +72,16 @@ export default {
       }
     };
   },
-  computed: {},
-  created() {
-    setTimeout(() => {
-      this.getTableData(1);
-    }, 0);
+  mounted() {
+    this.$nextTick(() => {
+      this.getContentInfoWhere(1);
+    });
   },
   methods: {
     resetEvent() {
       this.allSearchColumn = "";
       setTimeout(() => {
-        this.getTableData(1);
+        this.getContentInfoWhere(1);
       });
     },
     /**
@@ -84,69 +90,85 @@ export default {
      * 查询出结果后自动得到下拉框中的联动
      *  */
     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;
+      if (!this.initTableData) {
+        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
+        };
+        // 开始查询
+        this.$Post(this.urlsCollection.getContentInfoWhere, params).then(res => {
+          if (res.code === 200 && res.content && res.content.length > 0) {
+            // 当前页数
+            if (val) {
+              this.paginationData.currentPage = val;
+            }
+            // 总数
+            this.paginationData.total = res.content.length;
+            this.allTableData = res.content;
+            this.changePaginationData();
+            this.initTableData = false;
+          } else {
+            this.paginationData.total = 0;
+            this.tableData = [];
+            this.initTableData = false;
+          }
+        });
+      } else {
+        this.$message.info("查询中");
+      }
     },
     // 切换页
     getTableData(val) {
-      this.getContentInfoWhere(val);
+      this.paginationData.currentPage = val;
+      this.changePaginationData();
     },
     // 切换条数
     handleSizeChange(val) {
-      this.getTableData(this.paginationData.pageSize);
+      this.paginationData.pageSize = val;
+      this.changePaginationData();
+    },
+    changePaginationData() {
+      if (!this.initTableData) {
+        this.initTableData = true;
+      }
+      // 每页显示数据个数
+      this.formData = this.allTableData.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
+      );
+      console.log("this.formData", this.formData);
+      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;
     }
   },
   watch: {}

src/views/HomeView.vue

@@ -14,7 +14,7 @@
     </div>
 
     <!-- 镇域专题 -->
-    <div id="TownContainer" v-if="$ifMenu('2', '5')">
+    <div id="TownContainer" v-if="$ifMenu('2', '')">
       <Legend
         id="TownContainer_bottomLegend"
         :legendData="{
@@ -26,9 +26,10 @@
           legendTitle: legendTitle
         }"
       />
-      <div class="select-title">所属街道</div>
+      <div class="select-title" :style="{ left: $ifMenu('2', '5') ? '20px' : 'calc(50% - 80px)' }">所属街道</div>
       <NewSelect
         class="select-container"
+        :style="{ left: $ifMenu('2', '5') ? '100px' : '50%' }"
         @selectEvent="specialTownSelect"
         v-model="streetSelectVal"
         :options="streetOptions"