1. 同屏对比底图服务按时间排序； 2. 频发问题及资金投入柱状图数据按照百分比加数量显示

public/static/config/config.js

@@ -28,7 +28,7 @@ var systemConfig = {
   // 遥感影像图的相关配置项
   imageryLayer: {
     crs: "",
-    url: "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2022s1/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
+    url: "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2022s2/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
     resolutions: [
       132.2919312505292, 52.91677250021167, 26.458386250105836,
       13.229193125052918, 5.291677250021167, 2.6458386250105836,
@@ -68,7 +68,7 @@ var map2DViewer = {
   myLabels: {},
   overlay: {},
   analysisGroups: {},
-  uploadGroups:{}
+  uploadGroups: {},
 };
 
 // 预设模型图层名称

src/components/common/BottomForm/SameScreenComparison.vue

@@ -46,10 +46,18 @@
           已选择<span class="checkLength">{{ checkedCities.length }}</span
           >个
         </div>
-        <el-checkbox-group id="mapCheckBox" v-model="checkedCities" @change="handleCheckedCitiesChange" :min="2" :max="6">
+        <el-checkbox-group
+          id="mapCheckBox"
+          v-model="checkedCities"
+          @change="handleCheckedCitiesChange"
+          :min="2"
+          :max="6"
+        >
           <el-checkbox
             class="mapCheckBox"
-            :disabled="checkedCities.length >= 6 && checkedCities.indexOf(index) == -1"
+            :disabled="
+              checkedCities.length >= 6 && checkedCities.indexOf(index) == -1
+            "
             v-for="(city, index) in mapList"
             :checked="city.active"
             :label="index"
@@ -63,12 +71,26 @@
     <div id="textareaBox">
       <div class="doPrintInfo">时间：{{ newTime }}</div>
       <div class="textareaTitle">描述记录:</div>
-      <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 4 }" placeholder="请输入内容" v-model="textarea1"> </el-input>
+      <el-input
+        type="textarea"
+        :autosize="{ minRows: 3, maxRows: 4 }"
+        placeholder="请输入内容"
+        v-model="textarea1"
+      >
+      </el-input>
     </div>
     <!-- 打印区域 -->
     <div id="imgBox">
       <span>基本农田被侵占</span>
-      <img src="" id="imgOut" style="width: 1240px; background-repeat: no-repeat; background-size: 100% 100%" />
+      <img
+        src=""
+        id="imgOut"
+        style="
+          width: 1240px;
+          background-repeat: no-repeat;
+          background-size: 100% 100%;
+        "
+      />
       <div class="doPrintInfo2">时间：{{ newTime }}</div>
       <span><div>描述记录:</div></span>
       <div>{{ textarea1 }}</div>
@@ -115,7 +137,7 @@ export default {
       // 底部文本域
       textarea1: "",
       // 地图底图列表
-      mapList: []
+      mapList: [],
     };
   },
   created() {
@@ -150,18 +172,22 @@ export default {
       let params = new FormData();
       params = {
         columnId: 35,
-        states: 3,
-        pageSize: 20,
-        page: 0
+        states: "3",
+        pageSize: 30,
+        page: 0,
       };
-      this.$Post(this.urlsCollection.selectContentList, params).then(res => {
+      let sortparam = [{ field: "c_year", orderByType: 1 }];
+      params.orderBy = JSON.stringify(sortparam);
+      this.$Post(this.urlsCollection.selectContentList, params).then((res) => {
         if (res.code === 200 && res.content.data.length > 0) {
           let data = res.content.data;
-          data.forEach(v => {
+          data.forEach((v) => {
             this.mapList.unshift({
               mapName: v.title,
-              mapUrl: v.c_url + "?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
-              active: v.c_defined_show ? v.c_defined_show : false
+              mapUrl:
+                v.c_url +
+                "?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
+              active: v.c_defined_show ? v.c_defined_show : false,
             });
           });
         }
@@ -180,7 +206,7 @@ export default {
         this.centerZoomInit = {
           lat: mapCenter.lat,
           lng: mapCenter.lng,
-          zoom: mapZoom
+          zoom: mapZoom,
         };
       }
       this.handleCheckedCitiesChange();
@@ -219,7 +245,7 @@ export default {
           _width,
           _height,
           useCORS: true,
-          allowTaint: true
+          allowTaint: true,
         };
         let that = this;
         let parentNodeList = [];
@@ -257,31 +283,45 @@ export default {
         });
         // html2canvas插件实现dom转imageBase64
         html2canvas(this.$refs.doPrint, ops).then(
-          canvas => {
-            document.getElementById("imgOut").setAttribute("src", canvas.toDataURL("image/png"));
+          (canvas) => {
+            document
+              .getElementById("imgOut")
+              .setAttribute("src", canvas.toDataURL("image/png"));
             setTimeout(() => {
               if (that.doPrintLoading) {
                 that.doPrint(parentNodeList, svgElemNodeList, canvasList);
               }
             }, 1000);
           },
-          error => {
+          (error) => {
             that.$message.error(error);
-            this.showMapSvgAndRemoveMapCanvas(parentNodeList, svgElemNodeList, canvasList);
+            this.showMapSvgAndRemoveMapCanvas(
+              parentNodeList,
+              svgElemNodeList,
+              canvasList
+            );
             this.doPrintLoading = false;
           }
         );
         setTimeout(() => {
           if (this.doPrintLoading) {
             this.$message.error("打印超时请稍后重试！");
-            this.showMapSvgAndRemoveMapCanvas(parentNodeList, svgElemNodeList, canvasList);
+            this.showMapSvgAndRemoveMapCanvas(
+              parentNodeList,
+              svgElemNodeList,
+              canvasList
+            );
             this.doPrintLoading = false;
           }
         }, 10000);
       } catch (e) {
         if (this.doPrintLoading) {
           this.$message.error("打印异常，异常信息：" + e);
-          this.showMapSvgAndRemoveMapCanvas(parentNodeList, svgElemNodeList, canvasList);
+          this.showMapSvgAndRemoveMapCanvas(
+            parentNodeList,
+            svgElemNodeList,
+            canvasList
+          );
           this.doPrintLoading = false;
         }
       }
@@ -308,7 +348,11 @@ export default {
       var obj = document.getElementById("imgBox");
       doc.write(obj.innerHTML);
       doc.close();
-      this.showMapSvgAndRemoveMapCanvas(parentNodeList, svgElemNodeList, canvasList);
+      this.showMapSvgAndRemoveMapCanvas(
+        parentNodeList,
+        svgElemNodeList,
+        canvasList
+      );
       this.doPrintLoading = false;
       new_iframe.contentWindow.focus();
       new_iframe.contentWindow.print();
@@ -352,9 +396,9 @@ export default {
       if (!this.MouseDownStatus) {
         this.mouseIndex = mouseIndex;
       }
-    }
+    },
   },
-  watch: {}
+  watch: {},
 };
 </script>
 <style lang="less" scoped>

src/components/common/BottomForm/UploadingData.vue

@@ -1,6 +1,11 @@
 <template>
   <!-- 上传数据弹窗 -->
-  <el-dialog title="上传数据" :visible.sync="dialogVisible" :before-close="handleClose" width="400px">
+  <el-dialog
+    title="上传数据"
+    :visible.sync="dialogVisible"
+    :before-close="handleClose"
+    width="400px"
+  >
     <template slot="title">
       <div class="dialogTitle">
         <div class="dialogTitleIcon"></div>
@@ -23,7 +28,9 @@
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip" slot="tip">*仅支持Geojson格式文件，且不超过5MB</div>
+        <div class="el-upload__tip" slot="tip">
+          *仅支持Geojson格式文件，且不超过5MB
+        </div>
       </el-upload>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -51,7 +58,7 @@ export default {
       // 暂存上传文件数据
       fileDataList: {},
       // 上传数据弹窗显示状态
-      dialogVisible: false
+      dialogVisible: false,
     };
   },
   mounted() {
@@ -77,10 +84,10 @@ export default {
     handleClose() {
       if (this.dialogVisible && this.fileList.length > 0) {
         this.$confirm("确认关闭？")
-          .then(_ => {
+          .then((_) => {
             this.clearDialogVisible();
           })
-          .catch(_ => {});
+          .catch((_) => {});
       } else {
         this.clearDialogVisible();
       }
@@ -104,11 +111,13 @@ export default {
       setTimeout(() => {
         if (map2DViewer.analysisGroups[`upload_layer_unique`]) {
           this.$message.success("数据上传成功!");
-          map2DViewer.map.fitBounds(map2DViewer.analysisGroups[`upload_layer_unique`].getBounds());
+          map2DViewer.map.fitBounds(
+            map2DViewer.analysisGroups[`upload_layer_unique`].getBounds()
+          );
         }
         let options = {
           id: "upload_layer_unique",
-          label: "我的图层1"
+          label: "我的图层1",
         };
         this.$bus.$emit("addUploadLayerEvent", options);
       }, 1000);
@@ -121,8 +130,7 @@ export default {
       delete this.fileDataList[file.uid];
     },
     // 点击文件列表中已上传的文件时
-    handlePreview(file) {
-    },
+    handlePreview(file) {},
     // 文件超出个数限制时
     handleExceed(files, fileList) {
       // this.$message.warning(
@@ -143,6 +151,8 @@ export default {
     // 根据上传的文件渲染到地图中
     uploadRENDER(geoJson) {
       // 呈现数据已经成功
+      let firstPolygon = JSON.parse(JSON.stringify(geoJson));
+      // let uniqueId = firstPolygon.name;
       let uniqueId = `upload_layer_unique`;
       if (!map2DViewer.analysisGroups[uniqueId]) {
         map2DViewer.analysisGroups[uniqueId] = L.featureGroup();
@@ -150,13 +160,21 @@ export default {
         if (!this.$store.state.selectSelectDataMap["singlePolygon"]) {
           this.$store.state.selectSelectDataMap["singlePolygon"] = [];
         }
-        let firstPolygon = JSON.parse(JSON.stringify(geoJson));
+
+        console.log("上传文件读取到的数据", firstPolygon);
         firstPolygon.features.forEach((ele, index) => {
           let cid = `myLayer_${index}`;
           let geometry = JSON.stringify(ele);
           this.$store.state.mapMethodsCollection
             .get("RENDER")
-            .addSinglePolygon(geometry, cid, "rgb(0,255,255)", uniqueId, "我的图层", "土地资源");
+            .addSinglePolygon(
+              geometry,
+              cid,
+              "rgb(0,255,255)",
+              uniqueId,
+              "我的图层",
+              "土地资源"
+            );
         });
       }
     },
@@ -181,9 +199,9 @@ export default {
         this.$message.error("上传文件大小不能超过 5MB!");
       }
       return isJPG && isLt5M;
-    }
+    },
   },
-  watch: {}
+  watch: {},
 };
 </script>
 <style lang="less" scoped>

src/components/common/TagCard.vue

@@ -65,7 +65,7 @@ export default {
     data: {
       handler(val) {
         this.$nextTick(() => {
-          console.log('TagCard data',val.value);
+          // console.log('TagCard data',val.value);
           // this.showChange();
         });
       },

src/components/common/TopCard.vue

@@ -17,8 +17,9 @@
           <div>
             <el-progress
               :percentage="items.number >= 100 ? 100 : items.number"
-              :stroke-width="10"
-              :show-text="false"
+              :stroke-width="15"
+              :text-inside="true"
+              :show-text="true"
             ></el-progress>
           </div>
         </div>
@@ -27,6 +28,38 @@
         </div>
       </div>
     </vue-seamless-scroll>
+    <div
+      style="height: 100%; width: 100%"
+      v-else-if="cardtTitle === '资金投入TOP5（亿元）'"
+    >
+      <div
+        style="padding-bottom: 50px"
+        v-for="(items, index) in dataList"
+        :key="index"
+        class="Top_box"
+        v-show="dataList.length > 0"
+      >
+        <div class="Top_box_name" style="font-size: 16px">
+          {{ "TOP" + (index + 1) }}
+        </div>
+        <div class="Top_box_main">
+          <div class="Top_box_main_title" style="font-size: 20px">
+            {{ items[columnName] }}
+          </div>
+          <div>
+            <el-progress
+              :percentage="items.number >= 100 ? 100 : items.number"
+              :stroke-width="barWidth"
+              :text-inside="true"
+              :show-text="true"
+            ></el-progress>
+          </div>
+        </div>
+        <div class="Top_box_value">
+          {{ items.info ? items.info : items.number }}
+        </div>
+      </div>
+    </div>
     <div style="height: 100%; width: 100%" v-else>
       <div
         v-for="(items, index) in dataList"
@@ -40,8 +73,9 @@
           <div>
             <el-progress
               :percentage="items.number >= 100 ? 100 : items.number"
-              :stroke-width="10"
-              :show-text="false"
+              :stroke-width="barWidth"
+              :text-inside="true"
+              :show-text="true"
             ></el-progress>
           </div>
         </div>
@@ -50,7 +84,6 @@
         </div>
       </div>
     </div>
-
     <el-empty v-show="dataList.length === 0" description="暂无数据"></el-empty>
   </div>
 </template>
@@ -69,7 +102,7 @@ export default {
   /**
    * data:top data
    */
-  props: ["dataList", "columnName", "isScroll"],
+  props: ["dataList", "columnName", "isScroll", "barWidth", "cardtTitle"],
   methods: {},
   data() {
     return {
@@ -166,6 +199,9 @@ export default {
           #007dff 0%,
           #00ffff 100%
         ) !important;
+        .el-progress-bar__innerText {
+          margin: 0 -40px 0 0;
+        }
       }
     }
     .Top_box_value {

src/components/layout/MenuCard.vue

@@ -117,6 +117,8 @@
           :dataList="menuData.topData"
           :columnName="menuData.field"
           :isScroll="menuData.isScroll ? true : false"
+          :barWidth="menuData.setBarWidth ? menuData.setBarWidth : 20"
+          :cardtTitle="menuData.title"
         />
       </div>
       <div class="menuMainBox_main_top" v-if="menuData.topSolt">

src/components/map/BasemapChange.vue

@@ -50,12 +50,12 @@ export default {
             active: "DXA",
             defalut: "DX",
           },
-          {
-            src: require("@/assets/map/darkmap.png"),
-            type: 1,
-            active: "SEA",
-            defalut: "SE",
-          },
+          // {
+          //   src: require("@/assets/map/darkmap.png"),
+          //   type: 1,
+          //   active: "SEA",
+          //   defalut: "SE",
+          // },
 
           {
             src: require("@/assets/map/sat2019.png"),
@@ -128,17 +128,17 @@ export default {
             map2DViewer.map.addLayer(map2DViewer.layers["imagery"]);
           }
           break;
-        case 1:
-          // console.log("蓝黑图");
-          // 测绘院蓝黑图
-          if (!map2DViewer.map.hasLayer(map2DViewer.layers["darkmap"])) {
-            map2DViewer.map.hasLayer(map2DViewer.layers["imagery"]) &&
-              map2DViewer.map.removeLayer(map2DViewer.layers["imagery"]);
-            map2DViewer.map.hasLayer(map2DViewer.layers["imagery2"]) &&
-              map2DViewer.map.removeLayer(map2DViewer.layers["imagery2"]);
-            map2DViewer.map.addLayer(map2DViewer.layers["darkmap"]);
-          }
-          break;
+        // case 1:
+        //   // console.log("蓝黑图");
+        //   // 测绘院蓝黑图
+        //   if (!map2DViewer.map.hasLayer(map2DViewer.layers["darkmap"])) {
+        //     map2DViewer.map.hasLayer(map2DViewer.layers["imagery"]) &&
+        //       map2DViewer.map.removeLayer(map2DViewer.layers["imagery"]);
+        //     map2DViewer.map.hasLayer(map2DViewer.layers["imagery2"]) &&
+        //       map2DViewer.map.removeLayer(map2DViewer.layers["imagery2"]);
+        //     map2DViewer.map.addLayer(map2DViewer.layers["darkmap"]);
+        //   }
+        //   break;
         case 2:
           // 遥感影像图sat2018
           if (!map2DViewer.map.hasLayer(map2DViewer.layers["imagery2"])) {

src/config/common.js

@@ -567,7 +567,7 @@ export const menuOnLine = {
       gotoPageInfo: {
         index: "2",
         subIndex: "1",
-        name: "土地资源"
+        name: "土地资源",
       },
       topSolt: {
         commonName: "TagTableCard",
@@ -577,74 +577,42 @@ export const menuOnLine = {
             title: "基本农田面积",
             value: 150,
             unit: "km²",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              100,
-              120,
-              150
-            ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [100, 120, 150],
           },
           {
             title: "带征地",
             value: 250,
             unit: "km²",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              2000,
-              220,
-              250
-            ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [2000, 220, 250],
           },
           {
             title: "减量化面积",
             value: 350,
             unit: "km²",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              300,
-              20,
-              350
-            ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [300, 20, 350],
           },
           {
             title: "设施农用地",
             value: 450,
             unit: "km²",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              40,
-              420,
-              450
-            ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [40, 420, 450],
           },
           {
             type: "tb",
             title: "土地资源面积",
             valueData: [],
             categoryData: [],
-            unit: "km²"
-          }
-        ]
+            unit: "km²",
+          },
+        ],
       },
       bottomSolt: {
-        commonName: "ChartCard"
-      }
+        commonName: "ChartCard",
+      },
     },
     {
       type: "card",
@@ -655,7 +623,7 @@ export const menuOnLine = {
       gotoPageInfo: {
         index: "2",
         subIndex: "2",
-        name: "水资源"
+        name: "水资源",
       },
       topSolt: {
         commonName: "TagCard",
@@ -665,52 +633,28 @@ export const menuOnLine = {
             type: "tb",
             title: "水域面积",
             unit: "km²",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              40,
-              420,
-              654
-            ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [40, 420, 654],
           },
           {
             type: "tb",
             title: "区管河道数量",
             unit: "条",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              400,
-              420,
-              654
-            ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [400, 420, 654],
           },
           {
             type: "tb",
             title: "镇管河道数量",
             unit: "条",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              400,
-              40,
-              654
-            ]
-          }
-        ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [400, 40, 654],
+          },
+        ],
       },
       bottomSolt: {
-        commonName: "ChartCard"
-      }
+        commonName: "ChartCard",
+      },
     },
     {
       type: "card",
@@ -721,7 +665,7 @@ export const menuOnLine = {
       gotoPageInfo: {
         index: "2",
         subIndex: "3",
-        name: "林地资源"
+        name: "林地资源",
       },
       topSolt: {
         commonName: "TagCard",
@@ -731,38 +675,22 @@ export const menuOnLine = {
             type: "lr",
             title: "林地面积",
             unit: "km²",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              40,
-              420,
-              654
-            ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [40, 420, 654],
           },
           {
             type: "lr",
             title: "公益林面积",
             unit: "km²",
-            categoryData: [
-              "2019",
-              "2020",
-              "2021"
-            ],
-            valueData: [
-              400,
-              420,
-              654
-            ]
-          }
-        ]
+            categoryData: ["2019", "2020", "2021"],
+            valueData: [400, 420, 654],
+          },
+        ],
       },
       bottomSolt: {
-        commonName: "ChartCard"
-      }
-    }
+        commonName: "ChartCard",
+      },
+    },
   ],
   leftW: [
     [
@@ -780,8 +708,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -797,8 +725,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -814,8 +742,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -831,8 +759,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -848,8 +776,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -865,8 +793,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -882,8 +810,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -899,9 +827,9 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
-      }
+          name: "综合分析",
+        },
+      },
     ],
     [
       {
@@ -918,8 +846,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -935,8 +863,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -952,8 +880,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -969,8 +897,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -986,8 +914,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -1003,8 +931,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -1020,9 +948,9 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
-      }
+          name: "综合分析",
+        },
+      },
     ],
     [
       {
@@ -1039,8 +967,8 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
+          name: "综合分析",
+        },
       },
       {
         type: "imageMenu",
@@ -1056,10 +984,10 @@ export const menuOnLine = {
         gotoPageInfo: {
           index: "3",
           subIndex: "",
-          name: "综合分析"
-        }
-      }
-    ]
+          name: "综合分析",
+        },
+      },
+    ],
   ],
   main: [
     {
@@ -1070,8 +998,8 @@ export const menuOnLine = {
       boxBackground: "rgba(0,39,77,0.6)",
       menuIndex: "1",
       position: "top",
-      minDomWidth: 1500
-    }
+      minDomWidth: 1500,
+    },
   ],
   right: [
     [
@@ -1085,7 +1013,7 @@ export const menuOnLine = {
         columnId: 31,
         sortField: {
           field: "c_years",
-          orderByType: 1
+          orderByType: 1,
         },
         topSolt: {
           commonName: "TagCard",
@@ -1095,13 +1023,13 @@ export const menuOnLine = {
               title: "资金投入",
               unit: "万元",
               categoryData: [],
-              valueData: []
-            }
-          ]
+              valueData: [],
+            },
+          ],
         },
         bottomSolt: {
-          commonName: "ChartCard"
-        }
+          commonName: "ChartCard",
+        },
       },
       {
         type: "card",
@@ -1124,58 +1052,34 @@ export const menuOnLine = {
               title: "资源环境项目",
               value: 3,
               unit: "个",
-              categoryData: [
-                "2019",
-                "2020",
-                "2021"
-              ],
-              valueData: [
-                3,
-                3,
-                3
-              ]
+              categoryData: ["2019", "2020", "2021"],
+              valueData: [3, 3, 3],
             },
             {
               type: "tb",
               title: "实现“五个结合”审计项目",
               value: 6,
               unit: "个",
-              categoryData: [
-                "2019",
-                "2020",
-                "2021"
-              ],
-              valueData: [
-                7,
-                6,
-                6
-              ]
+              categoryData: ["2019", "2020", "2021"],
+              valueData: [7, 6, 6],
             },
             {
               type: "tb",
               title: "调查项目",
               value: 1,
               unit: "个",
-              categoryData: [
-                "2019",
-                "2020",
-                "2021"
-              ],
-              valueData: [
-                2,
-                1,
-                2
-              ]
-            }
-          ]
+              categoryData: ["2019", "2020", "2021"],
+              valueData: [2, 1, 2],
+            },
+          ],
         },
         gotoPageInfo: {
           index: "4",
-          name: "全流程管理"
+          name: "全流程管理",
         },
         bottomSolt: {
-          commonName: "ChartCard"
-        }
+          commonName: "ChartCard",
+        },
       },
       {
         type: "card",
@@ -1189,40 +1093,40 @@ export const menuOnLine = {
         columnId: 1127,
         pageSize: 10,
         field: "c_ckwtdxwt",
-        isScroll:true,
+        isScroll: true,
         pramJson: {
-          c_bsjzwt: ""
+          c_bsjzwt: "",
         },
         bsjzColumnName: "c_bsjzwt",
         topData: [
           {
             number: 0,
-            c_ckwtdxwt: "--"
+            c_ckwtdxwt: "--",
           },
           {
             number: 0,
-            c_ckwtdxwt: "--"
+            c_ckwtdxwt: "--",
           },
           {
             number: 0,
-            c_ckwtdxwt: "--"
+            c_ckwtdxwt: "--",
           },
           {
             number: 0,
-            c_ckwtdxwt: "--"
+            c_ckwtdxwt: "--",
           },
           {
             number: 0,
-            c_ckwtdxwt: "--"
-          }
+            c_ckwtdxwt: "--",
+          },
         ],
         commonName: "TOP",
         gotoPageInfo: {
           index: "5",
           subIndex: "2",
-          name: "历史问题"
-        }
-      }
+          name: "历史问题",
+        },
+      },
     ],
     [
       {
@@ -1238,13 +1142,9 @@ export const menuOnLine = {
         pageSize: 5,
         field: "c_zdsjsx",
         // commonName: "SUM",
-        categoryData: [
-          "2020",
-          "2021",
-          "2022"
-        ],
+        categoryData: ["2020", "2021", "2022"],
         paramJson: {
-          sj_select: "1"
+          sj_select: "1",
         },
         topSolt: {
           commonName: "TagCard",
@@ -1254,13 +1154,13 @@ export const menuOnLine = {
               // title: "土地类疑点",
               unit: "个",
               categoryData: [],
-              valueData: []
-            }
-          ]
+              valueData: [],
+            },
+          ],
         },
         bottomSolt: {
-          commonName: "ChartCard"
-        }
+          commonName: "ChartCard",
+        },
       },
       {
         type: "card",
@@ -1276,10 +1176,10 @@ export const menuOnLine = {
         pageSize: 5,
         field: "c_zdsjsx",
         paramJson: {
-          sj_select: "1"
+          sj_select: "1",
         },
-        topData: []
-      }
+        topData: [],
+      },
     ],
     [
       {
@@ -1295,13 +1195,9 @@ export const menuOnLine = {
         pageSize: 5,
         field: "c_zdsjsx",
         // commonName: "SUM",
-        categoryData: [
-          "2020",
-          "2021",
-          "2022"
-        ],
+        categoryData: ["2020", "2021", "2022"],
         paramJson: {
-          sj_select: "2"
+          sj_select: "2",
         },
         topSolt: {
           commonName: "TagCard",
@@ -1311,13 +1207,13 @@ export const menuOnLine = {
               // title: "水资源类疑点",
               unit: "个",
               categoryData: [],
-              valueData: []
-            }
-          ]
+              valueData: [],
+            },
+          ],
         },
         bottomSolt: {
-          commonName: "ChartCard"
-        }
+          commonName: "ChartCard",
+        },
       },
       {
         type: "card",
@@ -1333,10 +1229,10 @@ export const menuOnLine = {
         pageSize: 5,
         field: "c_zdsjsx",
         paramJson: {
-          sj_select: "2"
+          sj_select: "2",
         },
-        topData: []
-      }
+        topData: [],
+      },
     ],
     [
       {
@@ -1352,13 +1248,9 @@ export const menuOnLine = {
         pageSize: 5,
         field: "c_zdsjsx",
         // commonName: "SUM",
-        categoryData: [
-          "2020",
-          "2021",
-          "2022"
-        ],
+        categoryData: ["2020", "2021", "2022"],
         paramJson: {
-          sj_select: "3"
+          sj_select: "3",
         },
         topSolt: {
           commonName: "TagCard",
@@ -1368,13 +1260,13 @@ export const menuOnLine = {
               // title: "林地类疑点",
               unit: "个",
               categoryData: [],
-              valueData: []
-            }
-          ]
+              valueData: [],
+            },
+          ],
         },
         bottomSolt: {
-          commonName: "ChartCard"
-        }
+          commonName: "ChartCard",
+        },
       },
       {
         type: "card",
@@ -1390,10 +1282,10 @@ export const menuOnLine = {
         pageSize: 5,
         field: "c_zdsjsx",
         paramJson: {
-          sj_select: "3"
+          sj_select: "3",
         },
-        topData: []
-      }
+        topData: [],
+      },
     ],
     [
       {
@@ -1409,13 +1301,9 @@ export const menuOnLine = {
         pageSize: 5,
         field: "c_zdsjsx",
         // commonName: "SUM",
-        categoryData: [
-          "2020",
-          "2021",
-          "2022"
-        ],
+        categoryData: ["2020", "2021", "2022"],
         paramJson: {
-          sj_select: "4"
+          sj_select: "4",
         },
         topSolt: {
           commonName: "TagCard",
@@ -1425,13 +1313,13 @@ export const menuOnLine = {
               // title: "生态类疑点",
               unit: "个",
               categoryData: [],
-              valueData: []
-            }
-          ]
+              valueData: [],
+            },
+          ],
         },
         bottomSolt: {
-          commonName: "ChartCard"
-        }
+          commonName: "ChartCard",
+        },
       },
       {
         type: "card",
@@ -1447,11 +1335,11 @@ export const menuOnLine = {
         pageSize: 5,
         field: "c_zdsjsx",
         paramJson: {
-          sj_select: "4"
+          sj_select: "4",
         },
-        topData: []
-      }
-    ]
+        topData: [],
+      },
+    ],
   ],
   rightW: [
     [
@@ -1471,12 +1359,7 @@ export const menuOnLine = {
         field: "c_zdsjsx",
         commonName: "ALLLIST",
         paramJson: {
-          sj_select: [
-            "1",
-            "2",
-            "3",
-            "4"
-          ]
+          sj_select: ["1", "2", "3", "4"],
         },
         topSolt: {
           commonName: "TagCard",
@@ -1485,32 +1368,32 @@ export const menuOnLine = {
               type: "lr",
               title: "土地资源问题",
               value: 0,
-              unit: "个"
+              unit: "个",
             },
             {
               type: "lr",
               title: "水资源问题",
               value: 0,
-              unit: "个"
+              unit: "个",
             },
             {
               type: "lr",
               title: "林地资源问题",
               value: 0,
-              unit: "个"
+              unit: "个",
             },
             {
               type: "lr",
               title: "生态资源问题",
               value: 0,
-              unit: "个"
-            }
-          ]
-        }
+              unit: "个",
+            },
+          ],
+        },
       },
       {
         type: "card",
-        title: "资金投入TOP10（亿元）",
+        title: "资金投入TOP5（亿元）",
         titleWidth: 100,
         boxWidth: "395",
         menuIndex: "2",
@@ -1518,53 +1401,61 @@ export const menuOnLine = {
         position: "right",
         minDomWidth: 1200,
         commonName: "TOP",
+        setBarWidth:35,
         // getUrl: "/dms/content/selectGroupByCountOrderBy",
         // columnId: 1133,
         // pageSize: 10,
         // bsjzColumnName: "c_ssjzzjtr",
         field: "c_kmc",
         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"
-        }, {
-          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"
-        }]
+        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",
@@ -1581,11 +1472,11 @@ export const menuOnLine = {
         pageSize: 10,
         field: "c_ckwtdxwt",
         pramJson: {
-          c_bsjzwt: ""
+          c_bsjzwt: "",
         },
         bsjzColumnName: "c_bsjzwt",
-        topData: []
-      }
-    ]
-  ]
+        topData: [],
+      },
+    ],
+  ],
 };

src/utils/watermark.js

@@ -12,12 +12,12 @@ let setWatermark = (str1, str2) => {
   }
   let can = document.createElement("canvas");
   // 设置canvas画布大小
-  can.width = 500;
-  can.height = 330;
+  can.width = 390;
+  can.height = 180;
   let cans = can.getContext("2d");
   //   水印旋转角度
-  cans.rotate((-45 * Math.PI) / 180);
-  cans.font = "16px Vedana";
+  cans.rotate((-20 * Math.PI) / 180);
+  cans.font = "20px Vedana";
   // cans.fillStyle = "#666666";
   cans.fillStyle = "#F0FFFF";
   cans.textAlign = "center";
@@ -30,7 +30,7 @@ let setWatermark = (str1, str2) => {
   div.style.pointerEvents = "none";
   div.style.top = "60px";
   div.style.left = "0px";
-  div.style.opacity = "0.15";
+  div.style.opacity = "0.35";
   div.style.position = "fixed";
   div.style.zIndex = "100000";
   div.style.width = document.documentElement.clientWidth + "px";

src/views/ComprehensiveAnalysis.vue

@@ -216,9 +216,20 @@
               <el-collapse-item
                 v-for="key in Object.keys(originalData)"
                 :key="key"
-                :title="key"
                 :name="key"
               >
+                <template slot="title">
+                  <div class="status-select">
+                    <div class="title">{{ key }}</div>
+                    <NewSelect
+                      style="width: 100px"
+                      :placeholder="'请选择排序方式'"
+                      v-model="statusSelectVal"
+                      :options="statusOptions"
+                      :value="statusSelectVal"
+                    />
+                  </div>
+                </template>
                 <div
                   class="panel-list-item"
                   v-for="(v, i) in originalData[key]"
@@ -351,6 +362,21 @@ export default {
       labelAllVisibleChecked: true,
       townSelectVal: "老港镇",
       townOptions: [],
+      statusSelectVal: "未标记",
+      statusOptions: [
+        {
+          value: "未标记",
+          label: "未标记",
+        },
+        {
+          value: "疑点",
+          label: "疑点",
+        },
+        {
+          value: "非疑点",
+          label: "非疑点",
+        },
+      ],
       enteredPanelId: "",
       enteredColumnId: "",
       enteredMainType: "",
@@ -2373,6 +2399,25 @@ export default {
         width: 90%;
         height: 98%;
         .el-collapse-item__header {
+          .status-select {
+            width: 300px;
+            height: 30px;
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            font-size: 15px;
+            .title {
+              width: 200px;
+              height: 30px;
+              line-height: 30px;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+            }
+            /deep/.el-input__suffix {
+              right: -15px;
+            }
+          }
           .all-icon {
             position: relative;
             left: 10px;