Explorar o código

1、综合分析-标记疑点-距离计算BUG修复。
2、折线图刷新或切换页面显示异常BUG修复。
3、发到手机放开所有疑点列表。
4、核查结果任务tabUI优化。
5、首页街镇添加遗漏街镇:航头镇。
6、综合分析-右侧所有图层疑点点击定位到当前位置并高亮提示。
7、首页部分元素渲染优化,合理使用v-if。

DESKTOP-6LTVLN7\Liumouren %!s(int64=2) %!d(string=hai) anos
pai
achega
bca9156ddc

+ 5 - 5
public/static/plugins/draw-plugin/leaflet.draw.js

@@ -185,7 +185,7 @@ L.Control.Draw = L.Control.extend({
     for (var i = 1; i < data.length; i++) {
       var curcoor = data[i];
       var prePoint = data[i - 1];
-      lineDistance = L.latLng(curcoor).distanceTo(prePoint);
+      lineDistance += L.latLng(curcoor).distanceTo(prePoint);
       var lineDistanceStr =
         lineDistance > 1000
           ? (lineDistance / 1000).toFixed(2) + "公里"
@@ -395,7 +395,7 @@ L.Control.Draw = L.Control.extend({
 
         if (i > 0) {
           var prePoint = _this._measureObjs[_this._lC].measurePoints[i - 1];
-          lineDistance = L.latLng(curcoor).distanceTo(prePoint);
+          lineDistance += L.latLng(curcoor).distanceTo(prePoint);
           var lineDistanceStr =
             lineDistance > 1000
               ? (lineDistance / 1000).toFixed(2) + "公里"
@@ -545,7 +545,7 @@ L.Control.Draw = L.Control.extend({
     for (var i = 1; i < coorslength; i++) {
       var curcoor = _this._measureObjs[data.LC].measurePoints[i];
       var prePoint = _this._measureObjs[data.LC].measurePoints[i - 1];
-      lineDistance = L.latLng(curcoor).distanceTo(prePoint);
+      lineDistance += L.latLng(curcoor).distanceTo(prePoint);
       var lineDistanceStr =
         lineDistance > 1000
           ? (lineDistance / 1000).toFixed(2) + "公里"
@@ -612,8 +612,8 @@ L.Control.Draw = L.Control.extend({
 /**
  * 测量工具
  */
-// map2DViewer.drawToolFire = function (data) {
-// };
+map2DViewer.drawToolFire = function (data) {
+};
 map2DViewer.setDrawTool = function (options) {
   mousemoveStatus = true;
   var defaultData = {

+ 31 - 41
src/components/chart/BarChart.vue

@@ -7,7 +7,7 @@ export default {
   name: "barChart",
   data() {
     return {
-      barChart: null,
+      barChart: null
     };
   },
   props: {
@@ -15,53 +15,43 @@ export default {
       type: Array,
       default() {
         return [];
-      },
+      }
     },
     soilValueData: {
       type: Array,
       default() {
         return [];
-      },
+      }
     },
     otherValueData: {
       type: Array,
       default() {
         return [];
-      },
+      }
     },
     forestryValueData: {
       type: Array,
       default() {
         return [];
-      },
+      }
     },
     sourceType: {
       type: String,
-      default: "A",
+      default: "A"
     },
     unit: {
       type: String,
-      default: "公顷",
-    },
+      default: "公顷"
+    }
   },
   mounted() {
-    this.initEchart(
-      this.categoryData,
-      this.soilValueData,
-      this.forestryValueData,
-      this.otherValueData
-    );
+    this.initEchart(this.categoryData, this.soilValueData, this.forestryValueData, this.otherValueData);
   },
   watch: {
     sourceType(val) {
-      // console.log(val, "sourceType");
-      this.initEchart(
-        this.categoryData,
-        this.soilValueData,
-        this.forestryValueData,
-        this.otherValueData
-      );
-    },
+      this.barChart.resize();
+      this.initEchart(this.categoryData, this.soilValueData, this.forestryValueData, this.otherValueData);
+    }
   },
   methods: {
     initEchart(categoryData, soil, forestry, other) {
@@ -73,7 +63,7 @@ export default {
           trigger: "axis",
           axisPointer: {
             // Use axis to trigger tooltip
-            type: "shadow", // 'shadow' as default; can also be 'line' or 'shadow'
+            type: "shadow" // 'shadow' as default; can also be 'line' or 'shadow'
           },
           formatter: function (params) {
             let relVal = params[0].name;
@@ -85,7 +75,7 @@ export default {
               }
             }
             return relVal;
-          },
+          }
         },
         legend: {
           bottom: "0%",
@@ -94,25 +84,25 @@ export default {
           textStyle: {
             color: "#FFF",
             fontSize: "14",
-            fontFamily: "PingFang SC",
-          },
+            fontFamily: "PingFang SC"
+          }
         },
         grid: {
           top: "5%",
           left: "0",
           right: "19%",
           bottom: "-5%",
-          containLabel: true,
+          containLabel: true
         },
         xAxis: {
           type: "value",
-          show: false,
+          show: false
         },
         yAxis: {
           axisLine: {
             lineStyle: {
-              color: "#FFF",
-            },
+              color: "#FFF"
+            }
           },
           // axisLine: "none",
           axisTick: "none",
@@ -120,7 +110,7 @@ export default {
             //  inside:true,
           },
           type: "category",
-          data: categoryData,
+          data: categoryData
           // data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
         },
         series: [
@@ -132,9 +122,9 @@ export default {
             //   show: true
             // },
             emphasis: {
-              focus: "series",
+              focus: "series"
             },
-            data: soil,
+            data: soil
             // itemStyle:{
             //   color:"#f00"
             // }
@@ -149,9 +139,9 @@ export default {
             //   show: true
             // },
             emphasis: {
-              focus: "series",
+              focus: "series"
             },
-            data: forestry,
+            data: forestry
             // itemStyle:{
             //   color:"#f00"
             // }
@@ -165,18 +155,18 @@ export default {
             //   show: true
             // },
             emphasis: {
-              focus: "series",
+              focus: "series"
             },
-            data: other,
+            data: other
             // itemStyle:{
             //   color:"#f00"
             // }
             // data: [120, 132, 101, 134, 90, 230, 210],
-          },
-        ],
+          }
+        ]
       };
       this.barChart.setOption(option);
-    },
-  },
+    }
+  }
 };
 </script>

+ 28 - 3
src/components/chart/LineChart.vue

@@ -6,7 +6,8 @@ export default {
   name: "LineChart",
   data() {
     return {
-      lineChart: null
+      lineChart: null,
+      chartReSizeState: false
     };
   },
   props: {
@@ -48,14 +49,38 @@ export default {
       immediate: true
     }
   },
+  destroy() {
+    // 当容器销毁时,需要停止监听该事件
+    // this.$bus.$off("chartReSize");
+  },
   mounted() {
     this.$nextTick(() => {
       if (this.valueData) {
         this.initEchart(this.categoryData, this.valueData);
       }
     });
+    // this.$bus.$off("chartReSize");
+    // this.$bus.$on("chartReSize", () => {
+    //   this.lineChart.resize();
+    //   this.chartReSize();
+    //   this.lineChart.resize();
+    // });
+    // window.addEventListener("resize", () => {
+    //   this.chartReSize();
+    // });
   },
   methods: {
+    // chartReSize() {
+    //   this.lineChart.resize();
+    //   if (this.lineChart && !this.chartReSizeState) {
+    //     this.chartReSizeState = true;
+    //     setTimeout(() => {
+    //       console.log("chartReSize 方法 》 1000 sleep");
+    //       this.chartReSizeState = false;
+    //       this.lineChart.resize();
+    //     }, 1000);
+    //   }
+    // },
     initEchart(xData, seriesData) {
       if (!this.lineChart) {
         this.lineChart = this.$Echarts.init(this.$refs.line);
@@ -174,7 +199,7 @@ export default {
 </script>
 <style>
 #lineChart {
-  width: 100%;
-  height: 100%;
+  width: 390px;
+  height: 75px;
 }
 </style>

+ 17 - 1
src/components/common/BottomForm/PutPhone.vue

@@ -35,6 +35,14 @@
           >
           </el-option>
         </el-select>
+        <el-tooltip
+          class="item"
+          effect="dark"
+          content="当发到手机的任务存在该关联任务时,会直接将新选中的疑点直接添加到已存在的任务中,并覆盖任务描述和更新时间。"
+          placement="right-start"
+        >
+          <i class="el-icon-warning-outline putPhoneI"></i>
+        </el-tooltip>
       </el-form-item>
       <!-- <el-form-item label="所属街道" prop="c_area_code">
         <el-input v-model="c_area_code_str" disabled placeholder="请选择关联任务,自动填入"></el-input>
@@ -336,6 +344,7 @@ export default {
             content_["c_app_state"] = 0;
             content_["c_app_title"] = this.createTaskForm.c_task_name;
             content_["c_app_content"] = this.createTaskForm.content;
+            content_["c_create_time"] = parseInt(new Date().getTime() / 1000) * 1000;
             // 修改当前模型图层数据,并重新进行叠置
             let modifyParams = new FormData();
             modifyParams = {
@@ -402,7 +411,7 @@ export default {
       layerParams = {
         columnId: columnId,
         states: "0,1,2,3",
-        pageSize: 10,
+        pageSize: 9999,
         page: 0
       };
       this.$Post(this.urlsCollection.selectContentList, layerParams).then(
@@ -451,3 +460,10 @@ export default {
   }
 };
 </script>
+<style>
+.putPhoneI {
+  margin-left: 10px;
+  font-size: 20px;
+  color: #909399;
+}
+</style>

+ 16 - 10
src/components/common/BottomForm/VerificationResult.vue

@@ -1,13 +1,6 @@
 <template>
   <!-- 核查结果弹窗 fullscreen -->
-  <el-dialog
-    custom-class="myMission"
-    title="核查结果"
-    :visible.sync="dialogVisible"
-    width="70%"
-    height="60%"
-    :before-close="handleClose"
-  >
+  <el-dialog custom-class="myMission" title="核查结果" :visible.sync="dialogVisible" width="70%" :before-close="handleClose">
     <template slot="title">
       <div class="dialogTitle">
         <div class="dialogTitleIcon"></div>
@@ -46,7 +39,7 @@
       </el-form-item>
     </el-form>
     <!-- tabsBOX -->
-    <el-tabs tab-position="top" height="calc(60vh)" v-if="tableData" :value="tabsValue">
+    <el-tabs tab-position="top" type="card" height="calc(60vh)" v-if="tableData" :value="tabsValue">
       <!-- item-tab -->
       <el-tab-pane
         v-for="item in tableData"
@@ -102,9 +95,10 @@
         <el-table
           v-if="testVIfState"
           :data="tableDataList[item.id]"
-          style="width: 100%"
+          height="30vh"
           stripe
           v-loading="tableInitInfoLoading"
+          @row-click="ToView"
         >
           <el-table-column type="index" width="50" label="序号"> </el-table-column>
           <el-table-column label="疑点标题">
@@ -246,6 +240,14 @@ export default {
   },
   props: [],
   methods: {
+    ToView(val) {
+      if (val.state == 1) {
+        // 已核查
+      } else {
+        // 未核查
+      }
+      console.log("ToView", val);
+    },
     srcList(fileList) {
       let fileSrcList = [];
       for (let fileName in fileList) {
@@ -557,4 +559,8 @@ export default {
 .el-tabs__item {
   color: #ccc;
 }
+.el-tabs .is-active {
+  background-color: #00000064 !important;
+  border-bottom: 2px solid #2196f3 !important;
+}
 </style>

+ 1 - 1
src/components/layout/MenuCard.vue

@@ -123,7 +123,7 @@
       </div>
       <div class="menuMainBox_main_bottom" v-if="menuCardData.bottomSolt">
         <ChartCard
-          v-if="
+          v-show="
             menuCardData.bottomSolt.commonName == 'ChartCard' &&
             menuCardData.topSolt.commonData[chartCardDataIndex].categoryData.length > 1
           "

+ 1 - 1
src/components/map/Map.vue

@@ -151,7 +151,7 @@ export default {
                 index++;
                 let cid = v.cid + "_tpdb_" + index;
                 let geometry = v.geometry;
-                let coord = JSON.parse(geometry).geometry.coordinates[0];
+                let coord = JSON.parse(geometry).geometry.coordinates;
                 // 经纬度顺序转换
                 let coordinates = publicFun.latLngsToReverse(coord);
                 let polygon = L.polygon(coordinates, {

+ 7 - 14
src/components/popup/LabelCasePopup.vue

@@ -23,15 +23,12 @@
       <div class="distance">
         距离:&nbsp;&nbsp;
         <span v-if="targetDistance === 0 || !targetDistance">0</span>
-        <span v-else>{{ parseFloat(targetDistance).toFixed(2) }}&nbsp;公里</span>
+        <span v-else>{{ parseFloat(targetDistance).toFixed(2) }}&nbsp;</span>
       </div>
       <div class="center">
         <div class="center-title">描述 :</div>
         <div class="center-text">
-          <textarea
-            placeholder="请输入详细信息"
-            v-model="textContent"
-          ></textarea>
+          <textarea placeholder="请输入详细信息" v-model="textContent"></textarea>
         </div>
       </div>
       <div class="footer">
@@ -59,12 +56,12 @@ export default {
         type: "chart",
         title: "添加标记",
         boxWidth: "380",
-        boxHeight: "300",
+        boxHeight: "300"
       },
       selectVal: "土地资源",
       textContent: "",
       id: null,
-      geojson: "",
+      geojson: ""
     };
   },
   methods: {
@@ -73,8 +70,8 @@ export default {
     },
     saveEvent() {
       this.$emit("save");
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -193,11 +190,7 @@ export default {
         background: rgba(129, 140, 164, 1);
       }
       input:nth-child(2) {
-        background-image: linear-gradient(
-          to top,
-          rgba(79, 172, 254, 1),
-          rgba(0, 242, 254, 1)
-        );
+        background-image: linear-gradient(to top, rgba(79, 172, 254, 1), rgba(0, 242, 254, 1));
       }
     }
   }

+ 1 - 0
src/config/common.js

@@ -28,6 +28,7 @@ export const street = {
   北蔡镇: "北蔡镇",
   金桥镇: "金桥镇",
   高行镇: "高行镇",
+  航头镇: "航头镇",
 };
 
 /**

+ 10 - 2
src/views/ComprehensiveAnalysis.vue

@@ -1138,9 +1138,14 @@ export default {
     },
     // 右侧分页栏图斑定位
     locateCase(data) {
-      console.log(data, "locateCase");
+      // console.log(data, "右侧分页栏图斑定位locateCase");
       // 将当前点定位到中心位置
       if (map2DViewer.polygons[data.id]) {
+        map2DViewer.polygons[data.id].setStyle({
+          color: "red",
+          fillColor: "red",
+          fillOpacity: 0
+        });
         map2DViewer.map.fitBounds(map2DViewer.polygons[data.id].getBounds());
       }
     },
@@ -2254,7 +2259,10 @@ export default {
         let geojsonData = JSON.parse(data.geojson);
         let geoType = geojsonData.properties.featureType;
         let area = geojsonData.properties.area;
-        let distance = parseFloat(geojsonData.properties.distance).toFixed(2) + " 公里";
+        let distance =
+          geojsonData.properties.distance > 1000
+            ? parseFloat(geojsonData.properties.distance / 1000).toFixed(2) + " 公里"
+            : parseFloat(geojsonData.properties.distance).toFixed(2) + " 米";
         this.$store.state.mapMethodsCollection.get("RENDER").drawGeometry(geoType, data);
 
         this.tableType = "personal";

+ 56 - 101
src/views/HomeView.vue

@@ -23,15 +23,10 @@
           menuIndex: '2',
           subMenuIndex: '5',
           legendIcon: legendIcon,
-          legendTitle: legendTitle,
+          legendTitle: legendTitle
         }"
       />
-      <div
-        class="select-title"
-        :style="{ left: $ifMenu('2', '5') ? '20px' : 'calc(50% - 80px)' }"
-      >
-        所属街道
-      </div>
+      <div class="select-title" :style="{ left: $ifMenu('2', '5') ? '20px' : 'calc(50% - 80px)' }">所属街道</div>
       <NewSelect
         class="select-container"
         :style="{ left: $ifMenu('2', '5') ? '100px' : '50%' }"
@@ -43,10 +38,7 @@
     </div>
 
     <!-- 综合分析 -->
-    <ComprehensiveAnalysis
-      id="ComprehensiveContainer"
-      v-show="$ifMenu('3', '')"
-    />
+    <ComprehensiveAnalysis id="ComprehensiveContainer" v-show="$ifMenu('3', '')" />
 
     <!-- 消息提醒 -->
     <MessageList id="MessageListContainer" v-if="$ifMenu('6', '')" />
@@ -70,8 +62,7 @@
     </div>
     <!-- 左侧菜单列(较宽,两列) -- 疑点筛查 -->
     <div id="leftMenusW" v-for="(item, index) in menus.leftW" :key="index">
-      <MenuCard :menuData="item2" v-for="item2 in item" :key="item2.title">
-      </MenuCard>
+      <MenuCard :menuData="item2" v-for="item2 in item" :key="item2.title"> </MenuCard>
     </div>
     <!-- 中部菜单列 -->
     <div id="mainMenus">
@@ -84,11 +75,7 @@
         @selectEvent="homeSelect"
         v-if="$ifMenu('1', '')"
       />
-      <div
-        id="mainMenus_topRight"
-        v-if="menus.main[0]"
-        v-show="$ifMenu('1', '')"
-      >
+      <div id="mainMenus_topRight" v-if="menus.main[0]" v-show="$ifMenu('1', '')">
         <MenuCard :menuData="menus.main[0]">
           <div class="bar-btn">
             <div
@@ -121,35 +108,17 @@
           boxHeight: '180',
           menuIndex: '1',
           legendIcon: legendIcon,
-          legendTitle: legendTitle,
+          legendTitle: legendTitle
         }"
       />
     </div>
     <!-- 首页右侧菜单列 -->
-    <div
-      class="rightMenus"
-      v-for="(item, index) in menus.right"
-      :key="'rightBox' + index"
-    >
-      <MenuCard
-        :menuData="item2"
-        v-for="(item2, index2) in item"
-        :key="'right' + index2"
-      >
-      </MenuCard>
+    <div class="rightMenus" v-for="(item, index) in menus.right" :key="'rightBox' + index">
+      <MenuCard :menuData="item2" v-for="(item2, index2) in item" :key="'right' + index2"> </MenuCard>
     </div>
     <!-- 首页右侧菜单列 -->
-    <div
-      class="rightMenusW"
-      v-for="(item, index) in menus.rightW"
-      :key="'rightBoxW' + index"
-    >
-      <MenuCard
-        :menuData="item2"
-        v-for="(item2, index2) in item"
-        :key="'rightW' + index2"
-      >
-      </MenuCard>
+    <div class="rightMenusW" v-for="(item, index) in menus.rightW" :key="'rightBoxW' + index">
+      <MenuCard :menuData="item2" v-for="(item2, index2) in item" :key="'rightW' + index2"> </MenuCard>
     </div>
   </div>
 </template>
@@ -201,7 +170,7 @@ export default {
     LawView,
     IndexSystem,
     CapitalInput,
-    MessageList,
+    MessageList
   },
   data() {
     return {
@@ -210,7 +179,7 @@ export default {
         type: "lr",
         title: "林地面积",
         value: 654,
-        unit: "公顷",
+        unit: "公顷"
       },
       testTitle: "土地资源",
       activeIndex: 1,
@@ -219,38 +188,38 @@ export default {
         left: [],
         leftW: [],
         main: [],
-        right: [],
+        right: []
       },
       // 首页饼图相关
       buttonData: ["A", "B", "C"],
       legendTitle: [
         {
           name: "A类",
-          info: "耕地林地总和占镇域面积约 45%以上,或超过3000公顷",
+          info: "耕地林地总和占镇域面积约 45%以上,或超过3000公顷"
         },
         {
           name: "B类",
-          info: "有一定的自然资源资产(耕地林地总和 900-3000公项)",
+          info: "有一定的自然资源资产(耕地林地总和 900-3000公项)"
         },
         {
           name: "C类",
-          info: "自然资源资产较少(耕地林地总和低于 900公项)",
-        },
+          info: "自然资源资产较少(耕地林地总和低于 900公项)"
+        }
       ],
       // legendData: ["#E565FF", "#0055FF", "#00FFD5"],
       legendIcon: [
         {
           background: "#E565FF",
-          border: "none",
+          border: "none"
         },
         {
           background: "#0055FF",
-          border: "none",
+          border: "none"
         },
         {
           background: "#00FFD5",
-          border: "none",
-        },
+          border: "none"
+        }
       ],
       btnChecked: "A",
       soil: [],
@@ -261,19 +230,19 @@ export default {
         soil: [],
         other: [],
         forestry: [],
-        categoryData: [],
+        categoryData: []
       },
       BData: {
         soil: [],
         other: [],
         forestry: [],
-        categoryData: [],
+        categoryData: []
       },
       CData: {
         soil: [],
         other: [],
         forestry: [],
-        categoryData: [],
+        categoryData: []
       },
       streetSelectVal: "全部",
       streetOptions: [],
@@ -282,12 +251,12 @@ export default {
         { name: "土地资源问题", num: 67 },
         { name: "水资源问题", num: 37 },
         { name: "林地资源问题", num: 60 },
-        { name: "生态资源问题", num: 55 },
+        { name: "生态资源问题", num: 55 }
       ],
       // 综合分析
       analysis: {
-        searchInput: "",
-      },
+        searchInput: ""
+      }
     };
   },
   mounted() {
@@ -308,12 +277,12 @@ export default {
       let params = new FormData();
       params = {
         type: type,
-        cName: cName,
+        cName: cName
       };
-      this.$Post(this.urlsCollection.selectByCNameAType, params).then((res) => {
+      this.$Post(this.urlsCollection.selectByCNameAType, params).then(res => {
         if (res.code === 200 && res.content.length > 0) {
           this.classTextToIndex[keyName] = new Map();
-          res.content.forEach((v) => {
+          res.content.forEach(v => {
             this.classTextToIndex[keyName].set(v.index + "", v.name);
           });
         }
@@ -359,12 +328,12 @@ export default {
       params.append("type", type);
       params.append("cName", cName);
       this.$Post(this.urlsCollection.selectByCNameAType, params).then(
-        (res) => {
+        res => {
           if (res.code === 200 && res.content.length > 0) {
             this.$store.state.selectSelectDataMap[keyName] = res.content;
           }
         },
-        (error) => {
+        error => {
           this.$message.error(error);
           console.log(error);
         }
@@ -398,10 +367,10 @@ export default {
         columnId: 30,
         states: "0,1,2,3",
         pageSize: 30,
-        page: 0,
+        page: 0
       };
       this.$Post(this.urlsCollection.selectContentList, params)
-        .then((res) => {
+        .then(res => {
           if (res.code === 200 && res.content.data.length > 0) {
             // console.log(res.content.data, "getSourcesData接口获取成功");
             this.soil = [];
@@ -411,38 +380,32 @@ export default {
             let ADataArr = [];
             let BDataArr = [];
             let CDataArr = [];
-            data.map((v) => {
+            data.map(v => {
               if (v.zy_type === "0") {
                 ADataArr.push({
-                  name: this.classTextToIndex["浦东新区行政区划"].get(
-                    v.zy_town
-                  ),
+                  name: this.classTextToIndex["浦东新区行政区划"].get(v.zy_town),
                   soil: v.c_land_area,
                   other: v.other_area,
                   forest: v.c_forest_area,
-                  sum: v.c_land_area + v.other_area + v.c_forest_area,
+                  sum: v.c_land_area + v.other_area + v.c_forest_area
                 });
               }
               if (v.zy_type === "1") {
                 BDataArr.push({
-                  name: this.classTextToIndex["浦东新区行政区划"].get(
-                    v.zy_town
-                  ),
+                  name: this.classTextToIndex["浦东新区行政区划"].get(v.zy_town),
                   soil: v.c_land_area,
                   other: v.other_area,
                   forest: v.c_forest_area,
-                  sum: v.c_land_area + v.other_area + v.c_forest_area,
+                  sum: v.c_land_area + v.other_area + v.c_forest_area
                 });
               }
               if (v.zy_type === "2") {
                 CDataArr.push({
-                  name: this.classTextToIndex["浦东新区行政区划"].get(
-                    v.zy_town
-                  ),
+                  name: this.classTextToIndex["浦东新区行政区划"].get(v.zy_town),
                   soil: v.c_land_area,
                   other: v.other_area,
                   forest: v.c_forest_area,
-                  sum: v.c_land_area + v.other_area + v.c_forest_area,
+                  sum: v.c_land_area + v.other_area + v.c_forest_area
                 });
               }
             });
@@ -452,20 +415,20 @@ export default {
             CDataArr.sort(publicFun.compare("sum"));
 
             // 按A,B,C分出各自资源的排序数组
-            ADataArr.forEach((item) => {
+            ADataArr.forEach(item => {
               this.AData.soil.push(item.soil);
               this.AData.other.push(item.other);
               this.AData.forestry.push(item.forest);
               this.AData.categoryData.push(item.name);
             });
-            BDataArr.forEach((item) => {
+            BDataArr.forEach(item => {
               this.BData.soil.push(item.soil);
               this.BData.other.push(item.other);
               this.BData.forestry.push(item.forest);
               this.BData.categoryData.push(item.name);
             });
 
-            CDataArr.forEach((item) => {
+            CDataArr.forEach(item => {
               this.CData.soil.push(item.soil);
               this.CData.other.push(item.other);
               this.CData.forestry.push(item.forest);
@@ -484,10 +447,10 @@ export default {
             });
           }
         })
-        .catch((error) => {
+        .catch(error => {
           console.log(error, "getSourcesData");
         });
-    },
+    }
   },
   created() {
     this.classDictQuery("0", "浦东新区行政区划", "浦东新区行政区划");
@@ -496,10 +459,10 @@ export default {
     for (let key in street) {
       this.streetOptions.push({
         value: street[key],
-        label: street[key],
+        label: street[key]
       });
     }
-  },
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -812,22 +775,14 @@ export default {
     transform: translate(-50%, -50%) rotate(45deg);
     width: 110px;
     height: 100px;
-    background: linear-gradient(to left, @commonBorderColor, @commonBorderColor)
-        left top no-repeat,
-      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) left
-        top no-repeat,
-      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right top
-        no-repeat,
-      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) right
-        top no-repeat,
-      linear-gradient(to left, @commonBorderColor, @commonBorderColor) left
-        bottom no-repeat,
-      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) left
-        bottom no-repeat,
-      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right
-        bottom no-repeat,
-      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right
-        bottom no-repeat;
+    background: linear-gradient(to left, @commonBorderColor, @commonBorderColor) left top no-repeat,
+      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) left top no-repeat,
+      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right top no-repeat,
+      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) right top no-repeat,
+      linear-gradient(to left, @commonBorderColor, @commonBorderColor) left bottom no-repeat,
+      linear-gradient(to bottom, @commonBorderColor, @commonBorderColor) left bottom no-repeat,
+      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right bottom no-repeat,
+      linear-gradient(to left, @commonBorderColor, @commonBorderColor) right bottom no-repeat;
     background-size: 6px 6px, 6px 6px, 6px 6px, 6px 6px;
   }
 }

+ 20 - 0
vue.config.js

@@ -66,6 +66,26 @@ module.exports = {
       //   target: "http://121.43.55.7:10013",
       //   changeOrigin: true, // 允许跨域
       // },
+      // "/oauth": {
+      //   target: "http://117.131.26.69:10081",
+      //   changeOrigin: true, // 允许跨域
+      //   pathRewrite: {
+      //     "^/oauth" : "/proxy_oauth"
+      //   }
+      // },
+      // "/dms": {
+      //   target: "http://117.131.26.69:10081",
+      //   changeOrigin: true, // 允许跨域
+      // },
+      // "/conllection": {
+      //   target: "http://117.131.26.69:10081",
+      //   changeOrigin: true, // 允许跨域
+      // },
+      // "/audit": {
+      //   target: "http://117.131.26.69:10081",
+      //   changeOrigin: true, // 允许跨域
+      // },
+
       "/oauth": {
         target: "http://10.220.106.75:10011",
         changeOrigin: true, // 允许跨域