疑点审计弹窗修改

src/components/layout/MenuCard.vue

@@ -5,36 +5,68 @@
     v-loading="dataInitLoading"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
-    :class="$ifLeftMenu(menuData.title != undefined ? menuData.title : '') ? 'menuMainBoxA' : 'menuMainBox'"
+    :class="
+      $ifLeftMenu(menuData.title != undefined ? menuData.title : '')
+        ? 'menuMainBoxA'
+        : 'menuMainBox'
+    "
     :style="{
       width: menuData.boxWidth ? menuData.boxWidth + 'px' : '410px',
       height: menuData.boxHeight ? menuData.boxHeight + 'px' : 'auto',
-      border: menuData.type !== 'chart' && menuData.type !== 'legend' ? '' : '1px solid #2FB8FF',
-      background: menuData.boxBackground ? menuData.boxBackground : ''
+      border:
+        menuData.type !== 'chart' && menuData.type !== 'legend'
+          ? ''
+          : '1px solid #2FB8FF',
+      background: menuData.boxBackground ? menuData.boxBackground : '',
     }"
     @click="changeMenu()"
   >
     <!-- 头部 -->
-    <div class="menuMainBox_top" v-if="menuData.type !== 'chart' && menuData.type !== 'legend'">
+    <div
+      class="menuMainBox_top"
+      v-if="menuData.type !== 'chart' && menuData.type !== 'legend'"
+    >
       <!-- 头部左侧 -->
-      <div class="menuMainBox_top_left" :style="{ width: menuData.titleWidth ? menuData.titleWidth + '%' : '50%' }">
+      <div
+        class="menuMainBox_top_left"
+        :style="{
+          width: menuData.titleWidth ? menuData.titleWidth + '%' : '50%',
+        }"
+      >
         <!-- 左侧箭头图标 -->
-        <div class="menuMainBox_top_left_iconS" v-if="menuData.type !== 'imageMenu'"></div>
-        <div class="menuMainBox_top_left_iconR" v-if="menuData.type === 'imageMenu'">
+        <div
+          class="menuMainBox_top_left_iconS"
+          v-if="menuData.type !== 'imageMenu'"
+        ></div>
+        <div
+          class="menuMainBox_top_left_iconR"
+          v-if="menuData.type === 'imageMenu'"
+        >
           <div
             class="menuMainBox_top_left_iconR_active"
-            v-if="$ifLeftMenu(menuData.index != undefined ? menuData.title : '')"
+            v-if="
+              $ifLeftMenu(menuData.index != undefined ? menuData.title : '')
+            "
           ></div>
         </div>
         <!-- 标题 -->
         <div class="menuMainBox_top_left_title">{{ menuData.title }}</div>
         <!-- 右侧倾斜图标1 -->
-        <div class="menuMainBox_top_left_iconE menuMainBox_top_left_iconE1"></div>
+        <div
+          class="menuMainBox_top_left_iconE menuMainBox_top_left_iconE1"
+        ></div>
         <!-- 右侧倾斜图标2 -->
-        <div class="menuMainBox_top_left_iconE menuMainBox_top_left_iconE2"></div>
+        <div
+          class="menuMainBox_top_left_iconE menuMainBox_top_left_iconE2"
+        ></div>
       </div>
       <!-- 右侧两个倾斜方框 -->
-      <div class="menuMainBox_top_right" :style="{ width: menuData.titleWidth ? 110 - menuData.titleWidth + '%' : '60%' }">
+      <div
+        class="menuMainBox_top_right"
+        :style="{
+          width: menuData.titleWidth ? 110 - menuData.titleWidth + '%' : '60%',
+        }"
+      >
         <!-- 方块1 -->
         <div class="menuMainBox_top_right_d1"></div>
         <!-- 方块2 -->
@@ -53,14 +85,19 @@
       v-if="menuData.type !== 'chart' && menuData.type !== 'legend'"
       :style="{
         left: menuData.titleWidth
-          ? (menuData.titleWidth <= 40 ? menuData.titleWidth - 39 : menuData.titleWidth - 40) + '%'
-          : '10%'
+          ? (menuData.titleWidth <= 40
+              ? menuData.titleWidth - 39
+              : menuData.titleWidth - 40) + '%'
+          : '10%',
       }"
     >
       <!-- 折线右上角圆球 -->
       <div></div>
     </div>
-    <div class="menuMainBox_topChart" v-if="menuData.type === 'chart' || menuData.type === 'legend'">
+    <div
+      class="menuMainBox_topChart"
+      v-if="menuData.type === 'chart' || menuData.type === 'legend'"
+    >
       <div class="menuMainBox_topChart_title">
         {{ menuData.title }}
       </div>
@@ -80,7 +117,12 @@
         <div
           class="menuCardFlex"
           v-if="menuData.topSolt.commonName == 'TagCard'"
-          :style="{ justifyContent: menuData.topSolt.commonData.length > 1 ? 'space-between' : 'center' }"
+          :style="{
+            justifyContent:
+              menuData.topSolt.commonData.length > 1
+                ? 'space-between'
+                : 'center',
+          }"
         >
           <TagCard
             v-for="(item, index) in menuData.topSolt.commonData"
@@ -100,19 +142,30 @@
         <ChartCard
           v-if="menuData.bottomSolt.commonName == 'ChartCard'"
           :title="menuData.topSolt.commonData[chartCardDataIndex].title"
-          :categoryData="menuData.topSolt.commonData[chartCardDataIndex].categoryData"
+          :categoryData="
+            menuData.topSolt.commonData[chartCardDataIndex].categoryData
+          "
           :valueData="menuData.topSolt.commonData[chartCardDataIndex].valueData"
           :unit="menuData.topSolt.commonData[chartCardDataIndex].unit"
         />
       </div>
     </div>
-    <div class="menuMainBox_main" v-if="menuData.type === 'chart' || menuData.type === 'legend'">
-      <div class="menuMainBox_main_all" v-if="!menuData.topSolt && !menuData.bottomSolt">
+    <div
+      class="menuMainBox_main"
+      v-if="menuData.type === 'chart' || menuData.type === 'legend'"
+    >
+      <div
+        class="menuMainBox_main_all"
+        v-if="!menuData.topSolt && !menuData.bottomSolt"
+      >
         <slot></slot>
       </div>
     </div>
     <div class="menuMainBox_main_image" v-if="menuData.type === 'imageMenu'">
-      <div class="menuMainBox_main_image_box" :style="returnImageUrl(menuData.imageUrl, menuData.boxHeight)"></div>
+      <div
+        class="menuMainBox_main_image_box"
+        :style="returnImageUrl(menuData.imageUrl, menuData.boxHeight)"
+      ></div>
     </div>
     <!-- 图例属性显示区域 -->
     <div v-if="menuData.type === 'legend'" class="legend"></div>
@@ -135,23 +188,29 @@ export default {
     return {
       dataInitLoading: false,
       resData: [],
-      chartCardDataIndex: 0
+      chartCardDataIndex: 0,
     };
   },
   mounted() {
     this.$nextTick(() => {
-      if (this.menuData && this.menuData.topSolt && this.menuData.topSolt.commonDataGetUrl) {
+      if (
+        this.menuData &&
+        this.menuData.topSolt &&
+        this.menuData.topSolt.commonDataGetUrl
+      ) {
         this.dataInitLoading = true;
-        this.$Get("/static/json/home/" + this.menuData.topSolt.commonDataGetUrl).then(
-          res => {
+        this.$Get(
+          "/static/json/home/" + this.menuData.topSolt.commonDataGetUrl
+        ).then(
+          (res) => {
             let listMap = {};
             let tableData = res;
-            tableData.forEach(item => {
+            tableData.forEach((item) => {
               if (!listMap[item.name]) {
                 // type,data
                 let listMap2 = {};
                 if (item.data) {
-                  item.data.forEach(item2 => {
+                  item.data.forEach((item2) => {
                     if (listMap2[item2.type]) {
                       listMap2[item2.type]["categoryData"].push(item2.year);
                       listMap2[item2.type]["valueData"].push(item2.area);
@@ -181,15 +240,24 @@ export default {
                     if (categoryData[categoryDataKeys]) {
                       let categoryDataItemData = categoryData[categoryDataKeys];
                       if (listMap["全部"][categoryDataKeys]) {
-                        categoryDataItemData.valueData.forEach((valueIndexItem, index) => {
-                          if (listMap["全部"][categoryDataKeys].valueData[index]) {
-                            listMap["全部"][categoryDataKeys].valueData[index] += Number(valueIndexItem);
-                          } else {
-                            listMap["全部"][categoryDataKeys].valueData[index] = Number(valueIndexItem);
+                        categoryDataItemData.valueData.forEach(
+                          (valueIndexItem, index) => {
+                            if (
+                              listMap["全部"][categoryDataKeys].valueData[index]
+                            ) {
+                              listMap["全部"][categoryDataKeys].valueData[
+                                index
+                              ] += Number(valueIndexItem);
+                            } else {
+                              listMap["全部"][categoryDataKeys].valueData[
+                                index
+                              ] = Number(valueIndexItem);
+                            }
                           }
-                        });
+                        );
                       } else {
-                        listMap["全部"][categoryDataKeys] = categoryDataItemData;
+                        listMap["全部"][categoryDataKeys] =
+                          categoryDataItemData;
                       }
                     }
                   }
@@ -202,10 +270,14 @@ export default {
               let sum = 0;
               for (let keys in this.resData["全部"]) {
                 this.menuData.topSolt.commonData[_index].title = keys;
-                this.menuData.topSolt.commonData[_index].categoryData = this.resData["全部"][keys].categoryData;
-                this.menuData.topSolt.commonData[_index].valueData = this.resData["全部"][keys].valueData;
+                this.menuData.topSolt.commonData[_index].categoryData =
+                  this.resData["全部"][keys].categoryData;
+                this.menuData.topSolt.commonData[_index].valueData =
+                  this.resData["全部"][keys].valueData;
                 this.menuData.topSolt.commonData[_index].value =
-                  this.resData["全部"][keys].valueData[this.resData["全部"][keys].valueData.length - 1];
+                  this.resData["全部"][keys].valueData[
+                    this.resData["全部"][keys].valueData.length - 1
+                  ];
                 sum += this.menuData.topSolt.commonData[_index].value;
                 _index++;
               }
@@ -215,33 +287,47 @@ export default {
             }
             this.dataInitLoading = false;
           },
-          error => {
+          (error) => {
             console.log("error:", error, this.menuData);
             this.dataInitLoading = false;
           }
         );
-      } else if (this.menuData && this.menuData.topSolt && this.menuData.topSolt.columnId) {
+      } else if (this.menuData && this.menuData.columnId) {
         let params = new FormData();
         this.countUser = 0;
-        params.append("columnId", this.menuData.topSolt.columnId);
+        params.append("columnId", this.menuData.columnId);
+        if (this.menuData.field) {
+          params.append("field", this.menuData.field);
+        }
         params.append("states", "2,3");
         params.append("pageSize", 999);
         params.append("page", 0);
-        let sortparam = [{ field: "c_years", orderByType: 1 }];
-        params.append("orderBy", JSON.stringify(sortparam));
+        if (this.menuData.sortField) {
+          let sortparam = [
+            {
+              field: this.menuData.sortField.field,
+              orderByType: this.menuData.sortField.orderByType,
+            },
+          ];
+          params.append("orderBy", JSON.stringify(sortparam));
+        }
         this.$Post(this.urlsCollection.selectContentList, params).then(
-          res => {
+          (res) => {
             if (res.code === 200 && res.content.data.length > 0) {
               let listMap = {};
               let tableData = res.content.data;
-              tableData.forEach(item => {
+              tableData.forEach((item) => {
                 if (listMap[item.street]) {
                   listMap[item.street]["categoryData"].push(item.c_years);
-                  listMap[item.street]["valueData"].push((item.c_float_num / 10000).toFixed(2));
+                  listMap[item.street]["valueData"].push(
+                    (item.c_float_num / 10000).toFixed(2)
+                  );
                 } else {
                   let listMapItem = {};
                   listMapItem["categoryData"] = [item.c_years];
-                  listMapItem["valueData"] = [(item.c_float_num / 10000).toFixed(2)];
+                  listMapItem["valueData"] = [
+                    (item.c_float_num / 10000).toFixed(2),
+                  ];
                   listMap[item.street] = listMapItem;
                 }
               });
@@ -253,16 +339,23 @@ export default {
                     if (!listMap["全部"]) {
                       listMap["全部"] = { valueData: [], categoryData: [] };
                     }
-                    listMap[listMapKeys].valueData.forEach((valueIndexItem, index) => {
-                      if (listMap["全部"].valueData[index]) {
-                        listMap["全部"].valueData[index] += Number(valueIndexItem);
-                      } else {
-                        listMap["全部"].valueData[index] = Number(valueIndexItem);
+                    listMap[listMapKeys].valueData.forEach(
+                      (valueIndexItem, index) => {
+                        if (listMap["全部"].valueData[index]) {
+                          listMap["全部"].valueData[index] +=
+                            Number(valueIndexItem);
+                        } else {
+                          listMap["全部"].valueData[index] =
+                            Number(valueIndexItem);
+                        }
                       }
-                    });
+                    );
                   }
                 }
-                if (listMap["全部"].categoryData.length == 0 && categoryData.length > 0) {
+                if (
+                  listMap["全部"].categoryData.length == 0 &&
+                  categoryData.length > 0
+                ) {
                   listMap["全部"].categoryData = categoryData;
                 }
               }
@@ -279,7 +372,7 @@ export default {
             }
             this.dataInitLoading = false;
           },
-          error => {
+          (error) => {
             this.resData = [];
             this.changeHomeSpecialTown();
             console.log("error:", error, this.menuData);
@@ -338,22 +431,30 @@ export default {
   methods: {
     // 切换街镇时
     changeHomeSpecialTown() {
-      if (this.resData[this.$store.state.homeSpecialTown] && this.menuData.topSolt.commonData) {
+      if (
+        this.resData[this.$store.state.homeSpecialTown] &&
+        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;
+          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;
         } else {
           let _index = 0;
           let sum = 0;
           for (let keys in this.resData["全部"]) {
             this.menuData.topSolt.commonData[_index].title = keys;
             this.menuData.topSolt.commonData[_index].categoryData =
-              this.resData[this.$store.state.homeSpecialTown][keys].categoryData;
+              this.resData[this.$store.state.homeSpecialTown][
+                keys
+              ].categoryData;
             this.menuData.topSolt.commonData[_index].valueData =
               this.resData[this.$store.state.homeSpecialTown][keys].valueData;
             this.menuData.topSolt.commonData[_index].value =
               this.resData[this.$store.state.homeSpecialTown][keys].valueData[
-                this.resData[this.$store.state.homeSpecialTown][keys].valueData.length - 1
+                this.resData[this.$store.state.homeSpecialTown][keys].valueData
+                  .length - 1
               ];
             sum += this.menuData.topSolt.commonData[_index].value;
             _index++;
@@ -362,7 +463,11 @@ export default {
             this.menuData.topSolt.commonData[4].valueData = [sum];
           }
         }
-      } else if (this.menuData && this.menuData.topSolt && this.menuData.topSolt.commonData) {
+      } else if (
+        this.menuData &&
+        this.menuData.topSolt &&
+        this.menuData.topSolt.commonData
+      ) {
         this.menuData.topSolt.commonData.forEach((item, index) => {
           this.menuData.topSolt.commonData[index].categoryData = [];
           this.menuData.topSolt.commonData[index].valueData = [];
@@ -383,17 +488,27 @@ export default {
     },
     // 用户点击菜单标题时，调用全局函数，根据全局暂存对象
     changeMenu() {
-      if (this.menuData != undefined && this.menuData.index != undefined && this.menuData.title != undefined) {
+      if (
+        this.menuData != undefined &&
+        this.menuData.index != undefined &&
+        this.menuData.title != undefined
+      ) {
         this.$store.commit("changeLeftMenuTitle", this.menuData.title);
-        if (this.menuData.menuIndex != undefined && this.menuData.subMenuIndex != undefined) {
+        if (
+          this.menuData.menuIndex != undefined &&
+          this.menuData.subMenuIndex != undefined
+        ) {
           this.$store.commit("changeBackMenu", {
             index: this.menuData.menuIndex,
             subIndex: this.menuData.subMenuIndex,
-            name: this.menuData.menuName ? this.menuData.menuName : ""
+            name: this.menuData.menuName ? this.menuData.menuName : "",
           });
         }
       }
-      if (this.menuData != undefined && this.menuData.gotoPageInfo != undefined) {
+      if (
+        this.menuData != undefined &&
+        this.menuData.gotoPageInfo != undefined
+      ) {
         this.$store.commit("changeNavSelect", this.menuData.gotoPageInfo);
         // // 暂未开发页面集合
         // let notFound = [
@@ -495,7 +610,7 @@ export default {
       } catch (error) {
         console.error("MenuCard组件出现异常：", error);
       }
-    }
+    },
   },
   watch: {
     "$store.state.navSelect": {
@@ -504,7 +619,7 @@ export default {
           this.showChange();
         });
       },
-      deep: true
+      deep: true,
     },
     "$store.state.homeSpecialTown": {
       handler() {
@@ -512,9 +627,9 @@ export default {
           this.changeHomeSpecialTown();
         });
       },
-      deep: true
-    }
-  }
+      deep: true,
+    },
+  },
 };
 </script>
 
@@ -545,7 +660,11 @@ export default {
     .menuMainBox_top {
       background-color: @lightColor;
       &_left {
-        background-image: --webkit-linear-gradient(to left, @lightColor, #007dff);
+        background-image: --webkit-linear-gradient(
+          to left,
+          @lightColor,
+          #007dff
+        );
         background-image: --moz-linear-gradient(to left, @lightColor, #007dff);
         background-image: linear-gradient(to left, @lightColor, #007dff);
       }
@@ -575,9 +694,24 @@ export default {
       flex-wrap: nowrap;
       align-content: center;
       height: 100%;
-      background-image: --webkit-linear-gradient(to left, @topTitleMinLeft, @borderColor, @topTitleMinLeft);
-      background-image: --moz-linear-gradient(to left, @topTitleMinLeft, @borderColor, @topTitleMinLeft);
-      background-image: linear-gradient(to left, @topTitleMinLeft, @borderColor, @topTitleMinLeft);
+      background-image: --webkit-linear-gradient(
+        to left,
+        @topTitleMinLeft,
+        @borderColor,
+        @topTitleMinLeft
+      );
+      background-image: --moz-linear-gradient(
+        to left,
+        @topTitleMinLeft,
+        @borderColor,
+        @topTitleMinLeft
+      );
+      background-image: linear-gradient(
+        to left,
+        @topTitleMinLeft,
+        @borderColor,
+        @topTitleMinLeft
+      );
       border-bottom: 2px solid @borderColor;
       &_iconS {
         margin: 10px;
@@ -616,7 +750,12 @@ export default {
         margin-left: 10px;
         width: 15px;
         height: 30px;
-        background-image: linear-gradient(to bottom, transparent, transparent, #00a6c0);
+        background-image: linear-gradient(
+          to bottom,
+          transparent,
+          transparent,
+          #00a6c0
+        );
         transform: skew(-45deg);
       }
       &_iconE1 {
@@ -634,8 +773,18 @@ export default {
       border-left: 2px solid @borderColor;
       transform: skew(-45deg);
       background-color: @topTitleBgLeft;
-      border-image: --webkit-linear-gradient(to right, @borderColor, @topTitleBgLeft) 1;
-      border-image: --moz-linear-gradient(to right, @borderColor, @topTitleBgLeft) 1;
+      border-image: --webkit-linear-gradient(
+          to right,
+          @borderColor,
+          @topTitleBgLeft
+        )
+        1;
+      border-image: --moz-linear-gradient(
+          to right,
+          @borderColor,
+          @topTitleBgLeft
+        )
+        1;
       border-image: linear-gradient(to right, @borderColor, @topTitleBgLeft) 1;
       &_d1 {
         position: absolute;
@@ -756,7 +905,12 @@ export default {
         margin-left: 10px;
         width: 15px;
         height: 30px;
-        background-image: linear-gradient(to bottom, transparent, transparent, #00a6c0);
+        background-image: linear-gradient(
+          to bottom,
+          transparent,
+          transparent,
+          #00a6c0
+        );
         transform: skew(-45deg);
       }
       &_iconE1 {
@@ -774,8 +928,18 @@ export default {
       border-left: 2px solid @borderColor;
       transform: skew(-45deg);
       background-color: @topTitleBgLeft;
-      border-image: --webkit-linear-gradient(to right, @borderColor, @topTitleBgLeft) 1;
-      border-image: --moz-linear-gradient(to right, @borderColor, @topTitleBgLeft) 1;
+      border-image: --webkit-linear-gradient(
+          to right,
+          @borderColor,
+          @topTitleBgLeft
+        )
+        1;
+      border-image: --moz-linear-gradient(
+          to right,
+          @borderColor,
+          @topTitleBgLeft
+        )
+        1;
       border-image: linear-gradient(to right, @borderColor, @topTitleBgLeft) 1;
       &_d1 {
         position: absolute;
@@ -855,9 +1019,24 @@ export default {
   flex-wrap: nowrap;
   justify-content: center;
   align-content: center;
-  background-image: --webkit-linear-gradient(to left, @topTitleMinLeft, @borderColor, @topTitleMinLeft);
-  background-image: --moz-linear-gradient(to left, @topTitleMinLeft, @borderColor, @topTitleMinLeft);
-  background-image: linear-gradient(to left, @topTitleMinLeft, @borderColor, @topTitleMinLeft);
+  background-image: --webkit-linear-gradient(
+    to left,
+    @topTitleMinLeft,
+    @borderColor,
+    @topTitleMinLeft
+  );
+  background-image: --moz-linear-gradient(
+    to left,
+    @topTitleMinLeft,
+    @borderColor,
+    @topTitleMinLeft
+  );
+  background-image: linear-gradient(
+    to left,
+    @topTitleMinLeft,
+    @borderColor,
+    @topTitleMinLeft
+  );
   &_title {
     font-size: 18px;
     font-family: PingFang SC;
@@ -872,8 +1051,16 @@ export default {
   padding-top: 10px;
   width: 100%;
   height: calc(100% - 30px);
-  background-image: --webkit-linear-gradient(to top, @topTitleMinLeft, @topTitleBgLeft);
-  background-image: --moz-linear-gradient(to top, @topTitleMinLeft, @topTitleBgLeft);
+  background-image: --webkit-linear-gradient(
+    to top,
+    @topTitleMinLeft,
+    @topTitleBgLeft
+  );
+  background-image: --moz-linear-gradient(
+    to top,
+    @topTitleMinLeft,
+    @topTitleBgLeft
+  );
   background-image: linear-gradient(to top, @topTitleMinLeft, @topTitleBgLeft);
   box-sizing: border-box;
   overflow-x: hidden;
@@ -944,14 +1131,18 @@ export default {
     transform: translate(-50%, -50%) rotate(45deg);
     width: 110px;
     height: 100px;
-    background: linear-gradient(to left, @borderColor, @borderColor) left top no-repeat,
+    background: linear-gradient(to left, @borderColor, @borderColor) left top
+        no-repeat,
       linear-gradient(to bottom, @borderColor, @borderColor) left top no-repeat,
       linear-gradient(to left, @borderColor, @borderColor) right top no-repeat,
       linear-gradient(to bottom, @borderColor, @borderColor) right top no-repeat,
       linear-gradient(to left, @borderColor, @borderColor) left bottom no-repeat,
-      linear-gradient(to bottom, @borderColor, @borderColor) left bottom no-repeat,
-      linear-gradient(to left, @borderColor, @borderColor) right bottom no-repeat,
-      linear-gradient(to left, @borderColor, @borderColor) right bottom no-repeat;
+      linear-gradient(to bottom, @borderColor, @borderColor) left bottom
+        no-repeat,
+      linear-gradient(to left, @borderColor, @borderColor) right bottom
+        no-repeat,
+      linear-gradient(to left, @borderColor, @borderColor) right bottom
+        no-repeat;
     background-size: 6px 6px, 6px 6px, 6px 6px, 6px 6px;
   }
 }

src/components/map/MapHolder.vue

@@ -27,6 +27,7 @@ export default {
       // 疑点审计
       currentCid: null,
       currentHtml: null,
+      currentProperties: null,
       // 标记疑点
       currentLabelCid: null,
       currentLabelHtml: null,
@@ -69,6 +70,7 @@ export default {
     this.$bus.$off("JLControl");
     // 疑点审计
     this.$bus.$off("caseAuditEvent");
+    map2DViewer.map.closePopup()
   },
   computed: {
     // 监听底部菜单栏的状态
@@ -145,9 +147,9 @@ export default {
     },
     // 常规图层弹窗
     createAuditDiv(str, properties) {
-      debugger;
       // 根据ref获取组件的dom元素
       this.currentHtml = this.$refs.auditRef.$el.innerHTML;
+      this.$refs.auditRef.tableObj = properties
       if (this.currentHtml) {
         let div = document.createElement("div");
         div.id = str + "_id";
@@ -155,8 +157,23 @@ export default {
         // 动态创建div后赋值模板样式
         div.innerHTML = this.currentHtml;
         $(() => {
-          // console.log($(`#${str}_id .center-table-item-normal`).find(".leftcell"), "first");
-          // console.log($(`#${str}_id .center-table-item-normal`).lastChild(), "last");
+          if (properties) {
+            $(`#${str}_id .center-table-item-normal .leftcell`).each(
+              (index, domEle) => {
+                $(`#${str}_id .center-table-item-normal .leftcell`)
+                  .eq(index)
+                  .text(Object.keys(properties)[index]);
+              }
+            );
+            $(`#${str}_id .center-table-item-normal .rightcell`).each(
+              (index, domEle) => {
+                $(`#${str}_id .center-table-item-normal .rightcell`)
+                  .eq(index)
+                  .text(Object.values(properties)[index]);
+              }
+            );
+          }
+
           // 法律法规点击事件
           if ($(`#${str}_id a`)) {
             $(`#${str}_id a`).click((e) => {
@@ -329,7 +346,9 @@ export default {
       if (this.currentHtml && this.currentCid) {
         setTimeout(() => {
           this.popup
-            .setContent(this.createAuditDiv(this.currentCid))
+            .setContent(
+              this.createAuditDiv(this.currentCid, this.currentProperties)
+            )
             .openOn(map2DViewer.map);
         }, 300);
       }
@@ -575,6 +594,7 @@ export default {
         this.auditPopupShow = false;
         this.popup.openOn(map2DViewer.map);
         this.currentCid = cid;
+        this.currentProperties = properties;
       });
     },
     // 综合分析 - 图层绘制面

src/components/popup/CaseAuditPopup.vue

@@ -32,12 +32,6 @@
               <option value="isTrue">疑点</option>
               <option value="isFalse">非疑点</option>
             </select>
-            <!-- <NewSelect
-              style="width: 120px; height: 30px"
-              v-model="selectVal"
-              :options="selectOptions"
-              :value="selectVal"
-            /> -->
           </div>
         </div>
       </div>

src/config/common.js

@@ -733,72 +733,77 @@ export const menusMap = {
         menuName: "土地资源",
         position: "left",
         gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
-      }],
-    [{
-      type: "imageMenu",
-      index: 0,
-      title: "水域面积",
-      titleWidth: 81,
-      boxHeight: 236,
-      imageUrl: "/static/images/2.png",
-      menuIndex: "2",
-      subMenuIndex: "2",
-      menuName: "水资源",
-      position: "left",
-      gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
-    },
-    {
-      type: "imageMenu",
-      index: 1,
-      title: "区管河道数量",
-      titleWidth: 81,
-      boxHeight: 236,
-      imageUrl: "/static/images/3.png",
-      menuIndex: "2",
-      subMenuIndex: "2",
-      menuName: "水资源",
-      position: "left",
-      gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
-    },
-    {
-      type: "imageMenu",
-      index: 2,
-      title: "镇管河道数量",
-      titleWidth: 81,
-      boxHeight: 236,
-      imageUrl: "/static/images/1.png",
-      menuIndex: "2",
-      subMenuIndex: "2",
-      menuName: "水资源",
-      position: "left",
-      gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
-    }],
-    [{
-      type: "imageMenu",
-      index: 0,
-      title: "林地面积",
-      titleWidth: 81,
-      boxHeight: 236,
-      imageUrl: "/static/images/1.png",
-      menuIndex: "2",
-      subMenuIndex: "3",
-      menuName: "林地资源",
-      position: "left",
-      gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
-    },
-    {
-      type: "imageMenu",
-      index: 1,
-      title: "公益林面积",
-      titleWidth: 81,
-      boxHeight: 236,
-      imageUrl: "/static/images/4.png",
-      menuIndex: "2",
-      subMenuIndex: "3",
-      menuName: "林地资源",
-      position: "left",
-      gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
-    }]
+      },
+    ],
+    [
+      {
+        type: "imageMenu",
+        index: 0,
+        title: "水域面积",
+        titleWidth: 81,
+        boxHeight: 236,
+        imageUrl: "/static/images/2.png",
+        menuIndex: "2",
+        subMenuIndex: "2",
+        menuName: "水资源",
+        position: "left",
+        gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
+      },
+      {
+        type: "imageMenu",
+        index: 1,
+        title: "区管河道数量",
+        titleWidth: 81,
+        boxHeight: 236,
+        imageUrl: "/static/images/3.png",
+        menuIndex: "2",
+        subMenuIndex: "2",
+        menuName: "水资源",
+        position: "left",
+        gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
+      },
+      {
+        type: "imageMenu",
+        index: 2,
+        title: "镇管河道数量",
+        titleWidth: 81,
+        boxHeight: 236,
+        imageUrl: "/static/images/1.png",
+        menuIndex: "2",
+        subMenuIndex: "2",
+        menuName: "水资源",
+        position: "left",
+        gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
+      },
+    ],
+    [
+      {
+        type: "imageMenu",
+        index: 0,
+        title: "林地面积",
+        titleWidth: 81,
+        boxHeight: 236,
+        imageUrl: "/static/images/1.png",
+        menuIndex: "2",
+        subMenuIndex: "3",
+        menuName: "林地资源",
+        position: "left",
+        gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
+      },
+      {
+        type: "imageMenu",
+        index: 1,
+        title: "公益林面积",
+        titleWidth: 81,
+        boxHeight: 236,
+        imageUrl: "/static/images/4.png",
+        menuIndex: "2",
+        subMenuIndex: "3",
+        menuName: "林地资源",
+        position: "left",
+        gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" },
+      },
+    ],
   ],
   main: [
     {
@@ -887,7 +892,17 @@ export const menusMap = {
       menuIndex: "1",
       position: "right",
       minDomWidth: 1000,
-      gotoPageInfo: { index: "5", subIndex: "2", name: "频发问题" },
+      columnId: 24,
+      field: "c_wtfl",
+      // sortField: {
+      //   field: "c_year",
+      //   orderByType: 1
+      // },
+      gotoPageInfo: {
+        index: "5",
+        subIndex: "2",
+        name: "频发问题"
+      },
     },
     {
       type: "card",

src/views/ComprehensiveAnalysis.vue

@@ -1034,10 +1034,16 @@ export default {
           if (data.mainType === "预设模型") {
             layerAuthorityMap.set(data.id, "有权限");
             this.rightPanelTitle = data.id;
+            this.$store.state.treeDataCollection.set(data.id, {
+              mainType: data.mainType,
+              // town: data.town,
+              // type: data.type,
+            });
             this.displaySingleLayer(data.columnId, data.id);
           }
         } else {
           delete this.originalData[data.id];
+          map2DViewer.map.closePopup();
 
           // 移除图例
           if (this.legendTitle.length > 0) {

src/views/FrequencyView.vue

@@ -226,7 +226,7 @@ export default {
       let params = new FormData();
       params = {
         columnId: 24,
-        states: 3,
+        states: "0,1,2,3",
         pageSize: this.currentPageSize,
         page: val - 1,
         search: JSON.stringify(searchParam),

vue.config.js

@@ -45,7 +45,7 @@ module.exports = {
         changeOrigin: true, // 允许跨域
       },
       "/audit": {
-        target: "http://121.43.55.7:10011",
+        target: "http://121.43.55.7:10013",
         changeOrigin: true, // 允许跨域
       },
     },