优化

public/static/json/home/layout_project.json

@@ -2,117 +2,117 @@
     "name":"老港镇",
     "data":[{
         "year":2019,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2020,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2021,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2019,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":7
     },{
         "year":2020,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":6
     },{
         "year":2021,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":6
     },{
         "year":2019,
-        "type":"调查项目",
+        "type":"调查",
         "area":2
     },{
         "year":2020,
-        "type":"调查项目",
+        "type":"调查",
         "area":1
     },{
         "year":2021,
-        "type":"调查项目",
+        "type":"调查",
         "area":2
     }]
 },{
     "name":"泥城镇",
     "data":[{
         "year":2019,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2020,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2021,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2019,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":7
     },{
         "year":2020,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":6
     },{
         "year":2021,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":6
     },{
         "year":2019,
-        "type":"调查项目",
+        "type":"调查",
         "area":2
     },{
         "year":2020,
-        "type":"调查项目",
+        "type":"调查",
         "area":1
     },{
         "year":2021,
-        "type":"调查项目",
+        "type":"调查",
         "area":2
     }]
 },{
     "name":"全部",
     "data":[{
         "year":2019,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2020,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2021,
-        "type":"资源环境项目",
+        "type":"专项型",
         "area":3
     },{
         "year":2019,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":7
     },{
         "year":2020,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":6
     },{
         "year":2021,
-        "type":"实现“五个结合”审计项目",
+        "type":"结合型",
         "area":6
     },{
         "year":2019,
-        "type":"调查项目",
+        "type":"调查",
         "area":2
     },{
         "year":2020,
-        "type":"调查项目",
+        "type":"调查",
         "area":1
     },{
         "year":2021,
-        "type":"调查项目",
+        "type":"调查",
         "area":2
     }]
 }]

src/components/common/FilePreView.vue

@@ -3,7 +3,7 @@
           "docx-preview": "^0.1.4",
           "jszip": "^3.10.0",-->
   <div style="width:100%;height:100%;">
-    <div title="文件预览" v-if="showDoc || showPdf || showImg" width="750px" style="background: #FFF !important;width:100%;height:100%;">
+    <div title="文件预览" v-if="showDoc || showPdf || showImg" width="750px" style="background: #FFF !important;width:100%;" :style="{height: boxHeight ? boxHeight : '100%'}">
       <template slot="closeIcon">
         <el-icon icon="close-circle" class="closeIcon" />
       </template>
@@ -46,6 +46,7 @@ window.JSZip = require("jszip");
 export default {
   name: "FilePreView",
   components: { pdfView },
+  props: ["boxHeight"],
   data() {
     return {
       showDoc: false, //判断如果是否为word文件显示

src/components/common/StepsMyBox.vue

@@ -185,8 +185,8 @@ export default {
       countUser: 0,
       dialogData: [
         { title: "问题分类", columnName: "c_wtflwt", info: "--" },
-        { title: "问题定性1", columnName: "c_wtdx1wt", info: "--" },
-        { title: "问题定性2", columnName: "c_wtdx2wt", info: "--" },
+        { title: "问题定性一级", columnName: "c_wtdx1wt", info: "--" },
+        { title: "问题定性二级", columnName: "c_wtdx2wt", info: "--" },
         { title: "问题事项", columnName: "c_wtsxwt", info: "--" },
         { title: "使用法条", columnName: "c_syftwt", info: "--" },
         { title: "边审边改情况", columnName: "c_bsbgqkwt", info: "--" }

src/components/layout/MenuCard.vue

@@ -592,7 +592,7 @@ export default {
     changeHomeSpecialTown() {
       try {
         this.dataInitLoading = true;
-        if (this.resData[this.$store.state.homeSpecialTown] && this.menuData.topSolt.commonData) {
+        if (this.resData[this.$store.state.homeSpecialTown] && this.menuData.topSolt && this.menuData.topSolt.commonData) {
           if (this.resData[this.$store.state.homeSpecialTown].categoryData) {
             this.menuData.topSolt.commonData[0].categoryData = this.resData[this.$store.state.homeSpecialTown].categoryData;
             this.menuData.topSolt.commonData[0].valueData = this.resData[this.$store.state.homeSpecialTown].valueData;

src/components/map/Map.vue

@@ -82,7 +82,7 @@ export default {
         maxZoom: 7,
         attributionControl: false,
         zoomControl: false
-      }).setView(L.latLng(31.14785322514787, 121.50195320451814), 3);
+      }).setView(map2DViewer.map.getCenter(), map2DViewer.map.getZoom());
 
       //添加默认图层
       var layer = L.esri
@@ -94,8 +94,10 @@ export default {
       this.layers = layer;
     },
     setView: function (coord, zoom) {
-      let center = L.latLng(coord[0], coord[1]);
-      this.map.setView(center, zoom);
+      this.$nextTick(() => {
+        let center = L.latLng(coord[0], coord[1]);
+        this.map.setView(center, zoom);
+      });
     },
     // 更改地图渲染个数
     changeMapSize() {
@@ -126,7 +128,6 @@ export default {
     centerZoomInit: {
       handler(newValue, oldValue) {
         if (newValue.lat && newValue.lng && newValue.zoom) {
-          console.log("newValue", newValue);
           let center = L.latLng(newValue.lat, newValue.lng);
           this.map.setView(center, newValue.zoom);
         }

src/components/map/MapHolder.vue

@@ -672,7 +672,7 @@ export default {
         if (this.$store.state.homeSpecialTown === "全部") {
           this.setView(
             townLocationMap.get(this.$store.state.homeSpecialTown),
-            1
+            0
           );
         } else {
           let polygon = townPolygonMap.get(this.$store.state.homeSpecialTown);

src/config/common.js

@@ -1170,6 +1170,10 @@ export const menuOnLine = {
             }
           ]
         },
+        gotoPageInfo: {
+          index: "4",
+          name: "全流程管理"
+        },
         bottomSolt: {
           commonName: "ChartCard"
         }
@@ -1234,9 +1238,9 @@ export const menuOnLine = {
         field: "c_zdsjsx",
         commonName: "SUM",
         categoryData: [
-          "2019",
           "2020",
-          "2021"
+          "2021",
+          "2022"
         ],
         paramJson: {
           sj_select: "1"
@@ -1291,9 +1295,9 @@ export const menuOnLine = {
         field: "c_zdsjsx",
         commonName: "SUM",
         categoryData: [
-          "2019",
           "2020",
-          "2021"
+          "2021",
+          "2022"
         ],
         paramJson: {
           sj_select: "2"
@@ -1348,9 +1352,9 @@ export const menuOnLine = {
         field: "c_zdsjsx",
         commonName: "SUM",
         categoryData: [
-          "2019",
           "2020",
-          "2021"
+          "2021",
+          "2022"
         ],
         paramJson: {
           sj_select: "3"
@@ -1405,9 +1409,9 @@ export const menuOnLine = {
         field: "c_zdsjsx",
         commonName: "SUM",
         categoryData: [
-          "2019",
           "2020",
-          "2021"
+          "2021",
+          "2022"
         ],
         paramJson: {
           sj_select: "4"

src/views/FrequencyView.vue

@@ -187,8 +187,8 @@ export default {
       dialogVisible: false,
       dialogData: [
         { title: "问题分类", columnName: "c_wtflwt", info: "--" },
-        { title: "问题定性1", columnName: "c_wtdx1wt", info: "--" },
-        { title: "问题定性2", columnName: "c_wtdx2wt", info: "--" },
+        { title: "问题定性一级", columnName: "c_wtdx1wt", info: "--" },
+        { title: "问题定性二级", columnName: "c_wtdx2wt", info: "--" },
         { title: "问题事项", columnName: "c_wtsxwt", info: "--" },
         { title: "使用法条", columnName: "c_syftwt", info: "--" },
         { title: "边审边改情况", columnName: "c_bsbgqkwt", info: "--" }

src/views/HomeView.vue

@@ -468,7 +468,7 @@ export default {
   created() {
     this.classDictQuery("0", "浦东新区行政区划", "浦东新区行政区划");
 
-    //   // 街道下拉框
+    // 街道下拉框
     for (let key in street) {
       this.streetOptions.push({
         value: street[key],

src/views/IndexSystem.vue

@@ -1,6 +1,7 @@
 <template>
-  <div style="width: 100%; height: 100%">
-    <FilePreView ref="filePreview" v-show="fileView" />
+  <div style="width: 100%; height: 100%;">
+    <div class="title">镇自然资源资产离任审计分类评价指标体系（试编）</div>
+    <FilePreView ref="filePreview" v-show="fileView" boxHeight="calc(100% - 126px)"/>
   </div>
 </template>
 
@@ -23,10 +24,17 @@ export default {
   mounted() {
     this.$nextTick(() => {
       this.fileView = true;
-      this.$refs.filePreview.showView("./static/word/IndexSystem.docx");
+      this.$refs.filePreview.showView("./static/images/ZNFZ-ZBTX.png");
     });
   }
 };
 </script>
 
-<style></style>
+<style scoped>
+.title{
+  background-color: #00274D;
+  font-size: 24px;
+  color: #FFFFFF;
+  padding: 20px 10px;
+}
+</style>