全流程管理中显示字段调整，首页数据调整

public/static/json/home/layout_forest.json

@@ -1,85 +1,154 @@
-[{
-    "name":"北蔡镇",
-    "pid":310115105000,
-    "data":[{
-        "year":2019,
-        "type":"林地面积",
-        "area":150
-    },{
-        "year":2020,
-        "type":"林地面积",
-        "area":160
-    },{
-        "year":2021,
-        "type":"林地面积",
-        "area":170
-    },{
-        "year":2019,
-        "type":"公益林面积",
-        "area":170
-    },{
-        "year":2020,
-        "type":"公益林面积",
-        "area":170
-    },{
-        "year":2021,
-        "type":"公益林面积",
-        "area":170
-    }]
-},{
-    "name":"祝桥镇",
-    "pid":310115105000,
-    "data":[{
-        "year":2019,
-        "type":"林地面积",
-        "area":150
-    },{
-        "year":2020,
-        "type":"林地面积",
-        "area":160
-    },{
-        "year":2021,
-        "type":"林地面积",
-        "area":170
-    },{
-        "year":2019,
-        "type":"公益林面积",
-        "area":170
-    },{
-        "year":2020,
-        "type":"公益林面积",
-        "area":170
-    },{
-        "year":2021,
-        "type":"公益林面积",
-        "area":170
-    }]
-},{
-    "name":"大团镇",
-    "pid":310115105000,
-    "data":[{
-        "year":2019,
-        "type":"林地面积",
-        "area":130
-    },{
-        "year":2020,
-        "type":"林地面积",
-        "area":160
-    },{
-        "year":2021,
-        "type":"林地面积",
-        "area":170
-    },{
-        "year":2019,
-        "type":"公益林面积",
-        "area":170
-    },{
-        "year":2020,
-        "type":"公益林面积",
-        "area":160
-    },{
-        "year":2021,
-        "type":"公益林面积",
-        "area":170
-    }]
-}]
+[
+    {
+        "name": "老港镇",
+        "pid": 310115144000,
+        "data": [
+            {
+                "year": 2018,
+                "type": "林地面积",
+                "area": 14.02
+            },
+            {
+                "year": 2018,
+                "type": "公益林面积",
+                "area": 1.51
+            }
+            ,
+            {
+                "year": 2019,
+                "type": "林地面积",
+                "area": 14.06
+            },
+            {
+                "year": 2019,
+                "type": "公益林面积",
+                "area": 1.52
+            }
+            ,
+            {
+                "year": 2020,
+                "type": "林地面积",
+                "area": 14.04
+            },
+            {
+                "year": 2020,
+                "type": "公益林面积",
+                "area": 1.52
+            }
+        ]
+    },
+    {
+        "name": "泥城镇",
+        "pid": 310115140000,
+        "data": [
+            {
+                "year": 2018,
+                "type": "林地面积",
+                "area": 3.86
+            },
+            {
+                "year": 2018,
+                "type": "公益林面积",
+                "area": 0.00
+            }
+            ,
+            {
+                "year": 2019,
+                "type": "林地面积",
+                "area": 3.84
+            },
+            {
+                "year": 2019,
+                "type": "公益林面积",
+                "area": 0.00
+            }
+            ,
+            {
+                "year": 2020,
+                "type": "林地面积",
+                "area": 3.83
+            },
+            {
+                "year": 2020,
+                "type": "公益林面积",
+                "area": 0.00
+            }
+        ]
+    },
+    {
+        "name": "万祥镇",
+        "pid": 310115143000,
+        "data": [
+            {
+                "year": 2018,
+                "type": "林地面积",
+                "area": 1.44
+            },
+            {
+                "year": 2018,
+                "type": "公益林面积",
+                "area": 0.33
+            }
+            ,
+            {
+                "year": 2019,
+                "type": "林地面积",
+                "area": 1.42
+            },
+            {
+                "year": 2019,
+                "type": "公益林面积",
+                "area": 0.37
+            }
+            ,
+            {
+                "year": 2020,
+                "type": "林地面积",
+                "area": 1.46
+            },
+            {
+                "year": 2020,
+                "type": "公益林面积",
+                "area": 0.38
+            }
+        ]
+    },
+    {
+        "name": "三林镇",
+        "pid": 310115130000,
+        "data": [
+            {
+                "year": 2018,
+                "type": "林地面积",
+                "area": 1.44
+            },
+            {
+                "year": 2018,
+                "type": "公益林面积",
+                "area": 0.33
+            }
+            ,
+            {
+                "year": 2019,
+                "type": "林地面积",
+                "area": 1.42
+            },
+            {
+                "year": 2019,
+                "type": "公益林面积",
+                "area": 0.37
+            }
+            ,
+            {
+                "year": 2020,
+                "type": "林地面积",
+                "area": 1.46
+            },
+            {
+                "year": 2020,
+                "type": "公益林面积",
+                "area": 0.38
+            }
+        ]
+    }
+]

public/static/json/home/layout_land.json

@@ -1,228 +1,71 @@
 [
     {
-        "name": "北蔡镇",
-        "pid": 310115105000,
+        "name": "老港镇",
+        "pid": 310115144000,
         "data": [
             {
-                "year": 2019,
-                "type": "基本农田面积",
-                "area": 150
-            },
-            {
-                "year": 2020,
+                "year": 2018,
                 "type": "基本农田面积",
-                "area": 160
-            },
-            {
-                "year": 2021,
-                "type": "基本农田面积",
-                "area": 170
-            },
-            {
-                "year": 2019,
-                "type": "减量化面积",
-                "area": 170
-            },
-            {
-                "year": 2020,
-                "type": "减量化面积",
-                "area": 170
-            },
-            {
-                "year": 2021,
-                "type": "减量化面积",
-                "area": 170
-            },
-            {
-                "year": 2019,
-                "type": "带征地",
-                "area": 170
-            },
-            {
-                "year": 2020,
-                "type": "带征地",
-                "area": 170
-            },
-            {
-                "year": 2021,
-                "type": "带征地",
-                "area": 170
-            },
-            {
-                "year": 2019,
-                "type": "设施农用地",
-                "area": 170
-            },
-            {
-                "year": 2020,
-                "type": "设施农用地",
-                "area": 170
-            },
-            {
-                "year": 2021,
-                "type": "设施农用地",
-                "area": 170
+                "area": 17.86
             },
-            {
-                "year": 2019,
-                "type": "土地资源面积",
-                "area": 170
-            },
-            {
-                "year": 2020,
-                "type": "土地资源面积",
-                "area": 170
-            },
-            {
-                "year": 2021,
-                "type": "土地资源面积",
-                "area": 170
-            }
-        ]
-    },
-    {
-        "name": "祝桥镇",
-        "pid": 310115105000,
-        "data": [
             {
                 "year": 2019,
                 "type": "基本农田面积",
-                "area": 150
+                "area": 17.89
             },
             {
                 "year": 2020,
                 "type": "基本农田面积",
-                "area": 160
-            },
-            {
-                "year": 2021,
-                "type": "基本农田面积",
-                "area": 170
-            },
-            {
-                "year": 2019,
-                "type": "减量化面积",
-                "area": 170
-            },
-            {
-                "year": 2020,
-                "type": "减量化面积",
-                "area": 170
+                "area": 17.88
             },
             {
-                "year": 2021,
+                "year": 2018,
                 "type": "减量化面积",
-                "area": 170
-            },
-            {
-                "year": 2019,
-                "type": "带征地",
-                "area": 170
-            },
-            {
-                "year": 2020,
-                "type": "带征地",
-                "area": 170
-            },
-            {
-                "year": 2021,
-                "type": "带征地",
-                "area": 170
-            },
-            {
-                "year": 2019,
-                "type": "设施农用地",
-                "area": 170
-            },
-            {
-                "year": 2020,
-                "type": "设施农用地",
-                "area": 170
-            },
-            {
-                "year": 2021,
-                "type": "设施农用地",
-                "area": 170
-            },
-            {
-                "year": 2019,
-                "type": "土地资源面积",
-                "area": 170
-            },
-            {
-                "year": 2020,
-                "type": "土地资源面积",
-                "area": 170
-            },
-            {
-                "year": 2021,
-                "type": "土地资源面积",
-                "area": 170
-            }
-        ]
-    },
-    {
-        "name": "大团镇",
-        "pid": 310115105000,
-        "data": [
-            {
-                "year": 2019,
-                "type": "基本农田面积",
-                "area": 130
-            },
-            {
-                "year": 2020,
-                "type": "基本农田面积",
-                "area": 160
-            },
-            {
-                "year": 2021,
-                "type": "基本农田面积",
-                "area": 170
+                "area": 2.05
             },
             {
                 "year": 2019,
                 "type": "减量化面积",
-                "area": 170
+                "area": 2.06
             },
             {
                 "year": 2020,
                 "type": "减量化面积",
-                "area": 160
+                "area": 2.06
             },
             {
-                "year": 2021,
-                "type": "减量化面积",
-                "area": 170
+                "year": 2018,
+                "type": "带征地",
+                "area": 0.25
             },
             {
                 "year": 2019,
                 "type": "带征地",
-                "area": 170
+                "area": 0.25
             },
             {
                 "year": 2020,
                 "type": "带征地",
-                "area": 170
+                "area": 0.26
             },
             {
-                "year": 2021,
-                "type": "带征地",
-                "area": 170
+                "year": 2018,
+                "type": "设施农用地",
+                "area": 2.48
             },
             {
                 "year": 2019,
                 "type": "设施农用地",
-                "area": 210
+                "area": 2.46
             },
             {
                 "year": 2020,
                 "type": "设施农用地",
-                "area": 170
+                "area": 2.46
             },
             {
-                "year": 2021,
-                "type": "设施农用地",
+                "year": 2018,
+                "type": "土地资源面积",
                 "area": 170
             },
             {
@@ -234,11 +77,6 @@
                 "year": 2020,
                 "type": "土地资源面积",
                 "area": 170
-            },
-            {
-                "year": 2021,
-                "type": "土地资源面积",
-                "area": 170
             }
         ]
     }

src/components/common/WholeProcessManagement.vue

@@ -41,16 +41,16 @@
       :row-class-name="tableRowClassName"
       @row-click="rowClick"
     >
-      <el-table-column type="index" width="50"> </el-table-column>
-      <el-table-column prop="c_project_id" label="项目编号"> </el-table-column>
+      <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_owning_street_town_str" label="所属街镇"> </el-table-column>
-      <el-table-column prop="c_create_date" label="创建时间">
+      <!-- <el-table-column prop="c_create_date" label="创建时间">
         <template slot-scope="scope">
           {{ $dayjs(scope.row.c_create_date).format("YYYY-MM-DD HH:mm:ss") }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="c_year" label="年份"> </el-table-column>
     </el-table>
     <div id="WholeProcessManagement-footer">