优化

public/static/json/home/layout_land.json

@@ -65,17 +65,17 @@
             },
             {
                 "year": 2018,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 66.73
             },
             {
                 "year": 2019,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 66.74
             },
             {
                 "year": 2020,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 66.72
             }
         ]
@@ -146,17 +146,17 @@
             },
             {
                 "year": 2018,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 59.25
             },
             {
                 "year": 2019,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 59.26
             },
             {
                 "year": 2020,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 59.27
             }
         ]
@@ -227,17 +227,17 @@
             },
             {
                 "year": 2018,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 1209
             },
             {
                 "year": 2019,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 1211
             },
             {
                 "year": 2020,
-                "type": "土地资源面积",
+                "type": "土地面积",
                 "area": 1210
             }
         ]

src/components/common/StepsMyBox.vue

@@ -384,7 +384,7 @@ export default {
             ],
             props: { desc: "问题描述", status: "当前状态", endTime: "整改期限", opt: "操作" }
           },
-          status: 200,
+          status: 400,
           time: "进行中"
         }
       ]

src/components/common/TopCard.vue

@@ -6,7 +6,7 @@
         <div class="Top_box_main_title">{{ items[columnName] }}</div>
         <div><el-progress :percentage="items.number >= 100 ? 100 : items.number" :stroke-width="10" :show-text="false"></el-progress></div>
       </div>
-      <div class="Top_box_value">{{ items.number }}</div>
+      <div class="Top_box_value">{{ items.info ? items.info : items.number }}</div>
     </div>
     <el-empty v-show="dataList.length === 0" description="暂无数据"></el-empty>
   </div>

src/components/common/WholeProcessManagement.vue

@@ -2,8 +2,8 @@
   <!-- 全流程管理列表组件 -->
   <div id="WholeProcessManagement">
     <el-form :inline="true" ref="myTaskForm" :model="formInline" style="padding: 10px">
-      <el-form-item label="项目类型">
-        <el-select size="mini" v-model="formInline.c_task_type" placeholder="项目类型" clearable filterable>
+      <!-- <el-form-item label="任务类型">
+        <el-select size="mini" v-model="formInline.c_task_type" placeholder="任务类型" clearable filterable>
           <el-option
             v-for="item in selectSelectDataMap['projectType']"
             :key="item.index"
@@ -11,7 +11,7 @@
             :value="item.index"
           ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="所属街镇">
         <el-select size="mini" v-model="formInline.c_owning_street_town" placeholder="所属街镇" clearable filterable>
           <el-option
@@ -44,7 +44,8 @@
       <el-table-column type="index" width="50" label="序号"> </el-table-column>
       <!-- <el-table-column prop="c_project_id" label="项目编号"> </el-table-column> -->
       <el-table-column prop="c_project_name" label="项目名称"> </el-table-column>
-      <el-table-column prop="c_task_type_str" label="项目类型"> </el-table-column>
+      <!-- <el-table-column prop="c_task_type_str" label="任务类型"> </el-table-column> -->
+      <el-table-column prop="c_project_type_str" label="项目类型"> </el-table-column>
       <el-table-column prop="c_owning_street_town_str" label="所属街镇"> </el-table-column>
       <!-- <el-table-column prop="c_create_date" label="创建时间">
         <template slot-scope="scope">
@@ -112,6 +113,7 @@ export default {
   mounted() {
     // 首先获取数据字典中的下拉框数据
     this.selectSelectData("0", "c_task_type", "projectType");
+    this.selectSelectData("0", "项目类别", "project2Type");
     this.selectSelectData("0", "浦东新区行政区划", "associatedItems");
     this.onSubmit();
   },
@@ -207,6 +209,7 @@ export default {
             if (this.tableData.length > 0) {
               this.tableData.forEach(item => {
                 item.c_task_type_str = this.getSelectByIndex("projectType", item.c_task_type);
+                item.c_project_type_str = this.getSelectByIndex("project2Type", item.c_project_type);
                 item.c_owning_street_town_str = this.getSelectByIndex("associatedItems", item.c_owning_street_town);
               });
             }

src/components/layout/MenuCard.vue

@@ -531,6 +531,8 @@ export default {
             this.dataInitLoading = false;
           }
         );
+      } else {
+        this.dataInitLoading = false;
       }
     },
     allListData(homeSpecialTown) {

src/config/common.js

@@ -1232,11 +1232,11 @@ export const menuOnLine = {
         subMenuIndex: "1",
         position: "right",
         minDomWidth: 1200,
-        getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
+        // getUrl: "/dms/content/selectGroupByCountOrderBy",
+        // columnId: 24,
         pageSize: 5,
         field: "c_zdsjsx",
-        commonName: "SUM",
+        // commonName: "SUM",
         categoryData: [
           "2020",
           "2021",
@@ -1250,7 +1250,7 @@ export const menuOnLine = {
           commonData: [
             {
               type: "lr",
-              title: "土地类疑点",
+              // title: "土地类疑点",
               unit: "个",
               categoryData: [],
               valueData: []
@@ -1289,11 +1289,11 @@ export const menuOnLine = {
         subMenuIndex: "2",
         position: "right",
         minDomWidth: 1200,
-        getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
+        // getUrl: "/dms/content/selectGroupByCountOrderBy",
+        // columnId: 24,
         pageSize: 5,
         field: "c_zdsjsx",
-        commonName: "SUM",
+        // commonName: "SUM",
         categoryData: [
           "2020",
           "2021",
@@ -1307,7 +1307,7 @@ export const menuOnLine = {
           commonData: [
             {
               type: "lr",
-              title: "水资源类疑点",
+              // title: "水资源类疑点",
               unit: "个",
               categoryData: [],
               valueData: []
@@ -1346,11 +1346,11 @@ export const menuOnLine = {
         subMenuIndex: "3",
         position: "right",
         minDomWidth: 1200,
-        getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
+        // getUrl: "/dms/content/selectGroupByCountOrderBy",
+        // columnId: 24,
         pageSize: 5,
         field: "c_zdsjsx",
-        commonName: "SUM",
+        // commonName: "SUM",
         categoryData: [
           "2020",
           "2021",
@@ -1364,7 +1364,7 @@ export const menuOnLine = {
           commonData: [
             {
               type: "lr",
-              title: "林地类疑点",
+              // title: "林地类疑点",
               unit: "个",
               categoryData: [],
               valueData: []
@@ -1403,11 +1403,11 @@ export const menuOnLine = {
         subMenuIndex: "4",
         position: "right",
         minDomWidth: 1200,
-        getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 24,
+        // getUrl: "/dms/content/selectGroupByCountOrderBy",
+        // columnId: 24,
         pageSize: 5,
         field: "c_zdsjsx",
-        commonName: "SUM",
+        // commonName: "SUM",
         categoryData: [
           "2020",
           "2021",
@@ -1421,7 +1421,7 @@ export const menuOnLine = {
           commonData: [
             {
               type: "lr",
-              title: "生态类疑点",
+              // title: "生态类疑点",
               unit: "个",
               categoryData: [],
               valueData: []
@@ -1509,21 +1509,61 @@ export const menuOnLine = {
       },
       {
         type: "card",
-        title: "资金投入TOP10",
-        titleWidth: 81,
+        title: "资金投入TOP10（亿元）",
+        titleWidth: 100,
         boxWidth: "395",
         menuIndex: "2",
         subMenuIndex: "5",
         position: "right",
         minDomWidth: 1200,
         commonName: "TOP",
-        getUrl: "/dms/content/selectGroupByCountOrderBy",
-        columnId: 1133,
-        pageSize: 10,
-        bsjzColumnName: "c_ssjzzjtr",
+        // getUrl: "/dms/content/selectGroupByCountOrderBy",
+        // columnId: 1133,
+        // pageSize: 10,
+        // bsjzColumnName: "c_ssjzzjtr",
         field: "c_kmc",
         paramJson: {},
-        topData: []
+        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"
+        }, {
+          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"
+        }]
       },
       {
         type: "card",