修改代理地址

.env.development

@@ -1,7 +1,7 @@
 NODE_ENV=development
 
-# VUE_APP_API_SERVER =  https://epmet-preview.elinkservice.cn/api
+VUE_APP_API_SERVER =  https://epmet-preview.elinkservice.cn/api
-VUE_APP_API_SERVER =  http://localhost:8080/api
+# VUE_APP_API_SERVER =  http://localhost:8080/api
 # VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api

src/views/dataBoard/cpts/map/index.vue

@@ -1,39 +1,17 @@
 <template>
   <div class="m-map" :class="{ 'z-td': mapType == 'td' }">
     <div id="map" :style="{ transform: `scale(${zoom})` }"></div>
-    <div
+    <div class="btn" v-if="mapStyleType == 'light'" v-show="false" @click="shiftMapStyle('dark')">切换深色模式</div>
-      class="btn"
+    <div class="btn" v-show="false" v-else @click="shiftMapStyle('light')">切换浅色模式</div>
-      v-if="mapStyleType == 'light'"
-      v-show="false"
-      @click="shiftMapStyle('dark')"
-    >
-      切换深色模式
-    </div>
-    <div class="btn" v-show="false" v-else @click="shiftMapStyle('light')">
-      切换浅色模式
-    </div>
     <!-- :style="{ transform: `scale(${zoom})` }" -->
-    <cpt-popup
+    <cpt-popup ref="popup" @clickListItem="handleClickDotListItem" @operate="handleClickDotBtn" />
-      ref="popup"
-      @clickListItem="handleClickDotListItem"
-      @operate="handleClickDotBtn"
-    />
   </div>
 </template>
 
 <script>
 import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
-import {
+import { Scene, PolygonLayer, LineLayer, MarkerLayer, RasterLayer, PointLayer, Marker, Popup } from "@antv/l7";
-  Scene,
-  PolygonLayer,
-  LineLayer,
-  MarkerLayer,
-  RasterLayer,
-  PointLayer,
-  Marker,
-  Popup,
-} from "@antv/l7";
 import { GaodeMap, Map } from "@antv/l7-maps";
 import { spliceIntoChunks } from "@/utils/index";
 import { mapType, searchNearby } from "@/utils/dai-map";
@@ -168,11 +146,7 @@ export default {
   computed: {
     polygonData() {
       const { srcGridData } = this;
-      if (
+      if (!srcGridData || !srcGridData.children || !Array.isArray(srcGridData.children)) {
-        !srcGridData ||
-        !srcGridData.children ||
-        !Array.isArray(srcGridData.children)
-      ) {
         return { type: "FeatureCollection", features: [] };
       }
       const polygon = [
@@ -204,11 +178,7 @@ export default {
 
     polygonDotData() {
       const { srcGridData } = this;
-      if (
+      if (!srcGridData || !srcGridData.children || !Array.isArray(srcGridData.children)) {
-        !srcGridData ||
-        !srcGridData.children ||
-        !Array.isArray(srcGridData.children)
-      ) {
         return { type: "FeatureCollection", features: [] };
       }
       const polygon = [
@@ -229,9 +199,7 @@ export default {
                 item.latitude
                   ? [[item.longitude, item.latitude]]
                   : spliceIntoChunks(
-                      item.coordinates
+                      item.coordinates.split(",").map((item) => parseFloat(item)),
-                        .split(",")
-                        .map((item) => parseFloat(item)),
                       2
                     ).filter((item) => item.length == 2),
               ],
@@ -255,10 +223,7 @@ export default {
               },
               geometry: {
                 type: "Point",
-                coordinates: [
+                coordinates: [parseFloat(item.longitude), parseFloat(item.latitude)],
-                  parseFloat(item.longitude),
-                  parseFloat(item.latitude),
-                ],
               },
             })),
         ],
@@ -279,10 +244,7 @@ export default {
               },
               geometry: {
                 type: "Point",
-                coordinates: [
+                coordinates: [parseFloat(item.longitude), parseFloat(item.latitude)],
-                  parseFloat(item.longitude),
-                  parseFloat(item.latitude),
-                ],
               },
             })),
         ],
@@ -344,14 +306,7 @@ export default {
         styleConfig = lightStyle;
       }
 
-      const iniCenter = [
+      const iniCenter = [srcGridData.longitude || this.$store.state.user.longitude || 116.39743841556731, srcGridData.latitude || this.$store.state.user.latitude || 39.9088810666821];
-        srcGridData.longitude ||
-          this.$store.state.user.longitude ||
-          116.39743841556731,
-        srcGridData.latitude ||
-          this.$store.state.user.latitude ||
-          39.9088810666821,
-      ];
 
       if (mapType != "qq") {
         myMap = new Map({
@@ -403,9 +358,7 @@ export default {
         zIndex: 1,
       });
       baseLayer
-        .source(
+        .source("http://t7.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}", {
-          "http://t7.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
-          {
           parser: {
             type: "rasterTile",
             tileSize: 256,
@@ -413,8 +366,7 @@ export default {
             // maxZoom: 15,
             zoomOffset: 0,
           },
-          }
+        })
-        )
         .style({
           opacity: 0.7,
         });
@@ -424,9 +376,7 @@ export default {
         zIndex: 2,
       });
       annotionLayer
-        .source(
+        .source("http://t7.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}", {
-          "http://t7.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
-          {
           parser: {
             type: "rasterTile",
             tileSize: 256,
@@ -434,8 +384,7 @@ export default {
             // maxZoom: 15,
             zoomOffset: 0,
           },
-          }
+        })
-        )
         .style({
           opacity: 0.5,
         });
@@ -534,14 +483,8 @@ export default {
         });
       // scene.addLayer(circleLayer);
       scene.addImage("pos-red", require("@/assets/img/shuju/grid/pos-red.png"));
-      scene.addImage(
+      scene.addImage("pos-green", require("@/assets/img/shuju/grid/pos-green.png"));
-        "pos-green",
+      scene.addImage("pos-yellow", require("@/assets/img/shuju/grid/pos-yellow.png"));
-        require("@/assets/img/shuju/grid/pos-green.png")
-      );
-      scene.addImage(
-        "pos-yellow",
-        require("@/assets/img/shuju/grid/pos-yellow.png")
-      );
 
       posLayer = new PointLayer({
         zIndex: 4,
@@ -601,11 +544,7 @@ export default {
                       ${e.feature.properties.name}
                   </div>
                    <div class="jw-popup-des">
-                      ${
+                      ${e.feature.properties.description ? e.feature.properties.description : ""}
-                        e.feature.properties.description
-                          ? e.feature.properties.description
-                          : ""
-                      }
                   </div>
                 </div>
           </div>
@@ -784,9 +723,7 @@ export default {
         // lng 经度；lat 纬度；dis 距离（千米）
         let r = 6371; //地球半径千米
         let dis = 0.25; //3千米距离
-        let dlng =
+        let dlng = 2 * Math.asin(Math.sin(dis / (2 * r)) / Math.cos((lat * Math.PI) / 180));
-          2 *
-          Math.asin(Math.sin(dis / (2 * r)) / Math.cos((lat * Math.PI) / 180));
         dlng = (dlng * 180) / Math.PI; // 经度半径
         let dlat = dis / r;
         dlat = (dlat * 180) / Math.PI; // 纬度半径
@@ -861,10 +798,7 @@ export default {
       for (let i in data) {
         // console.log(data[i].longitude * 1, data[i].latitude * 1);
         var el = document.createElement("div");
-        el.className =
+        el.className = peopleType === "building" ? "label-pointLd-class" : "label-point-class";
-          peopleType === "building"
-            ? "label-pointLd-class"
-            : "label-point-class";
         el.classList.add(data[i].type);
         // el.textContent = data[i].peopleType+'：'+data[i].personnelNum;
         const pointMarkerItem = new Marker({
@@ -883,34 +817,14 @@ export default {
                   <div class="jw-popup-title">
                       ${data[i].name}
                   </div>
-                  <div class="jw-popup-type">网格类型：<span class="${
+                  <div class="jw-popup-type">网格类型：<span class="${data[i].type}">${data[i].type === "red" ? "红" : data[i].type === "yellow" ? "黄" : data[i].type === "green" ? "绿色" : ""}</span>
-                    data[i].type
-                  }">${
-            data[i].type === "red"
-              ? "红"
-              : data[i].type === "yellow"
-              ? "黄"
-              : data[i].type === "green"
-              ? "绿色"
-              : ""
-          }</span>
                   </div>
                    <div class="jw-popup-num-list">
-                     <div>户数：<span>${
+                     <div>户数：<span>${data[i].houseNum ? data[i].houseNum : 0}</span></div>
-                       data[i].houseNum ? data[i].houseNum : 0
+                     <div>需求：<span>${data[i].demandNum ? data[i].demandNum : 0}</span></div>
-                     }</span></div>
+                     <div>事件：<span>${data[i].eventNum ? data[i].eventNum : 0}</span></div>
-                     <div>需求：<span>${
+                     <div>重点人群：<span>${data[i].importanceNum ? data[i].importanceNum : 0}</span></div>
-                       data[i].demandNum ? data[i].demandNum : 0
+                     <div>安全隐患：<span>${data[i].safetyNum ? data[i].safetyNum : 0}</span></div>
-                     }</span></div>
-                     <div>事件：<span>${
-                       data[i].eventNum ? data[i].eventNum : 0
-                     }</span></div>
-                     <div>重点人群：<span>${
-                       data[i].importanceNum ? data[i].importanceNum : 0
-                     }</span></div>
-                     <div>安全隐患：<span>${
-                       data[i].safetyNum ? data[i].safetyNum : 0
-                     }</span></div>
                   </div>
                 </div>
           </div>
@@ -921,9 +835,7 @@ export default {
           popup.remove();
         });
         pointMarkerItem.on("click", () => {
-          this.$router.push(
+          this.$router.push(`/homeDetails/index?id=${data[i].id}&typeB=${peopleType}`);
-            `/homeDetails/index?id=${data[i].id}&typeB=${peopleType}`
-          );
         });
 
         pointMarker.addMarker(pointMarkerItem);
@@ -938,6 +850,7 @@ export default {
       numMarker = new MarkerLayer({
         name: "numMarker",
       });
+      console.log("data:", data);
       for (let i in data) {
         var el = document.createElement("label");
         el.className = "label-num-class";
@@ -1013,10 +926,7 @@ export default {
 
     handleClickDotListItem(item) {
       console.log("handleClickDotListItem", item);
-      this.handleClickDot(item, [
+      this.handleClickDot(item, [parseFloat(item.longitude), parseFloat(item.latitude)]);
-        parseFloat(item.longitude),
-        parseFloat(item.latitude),
-      ]);
     },
   },
 };
@@ -1043,12 +953,7 @@ export default {
     right: 0;
     bottom: 0;
     pointer-events: none;
-    background: radial-gradient(
+    background: radial-gradient(rgba(#020c38, 0) 0%, rgba(#020c38, 0) 60%, rgba(#020c38, 1) 85%, rgba(#020c38, 1) 100%);
-      rgba(#020c38, 0) 0%,
-      rgba(#020c38, 0) 60%,
-      rgba(#020c38, 1) 85%,
-      rgba(#020c38, 1) 100%
-    );
   }
 
   &.z-td {
@@ -1056,11 +961,7 @@ export default {
       /deep/ .l7-scene {
         canvas {
           background-color: rgba(43, 51, 73, 0.82);
-          background-image: radial-gradient(
+          background-image: radial-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.3), #000);
-            rgba(0, 0, 0, 0),
-            rgba(0, 0, 0, 0.3),
-            #000
-          );
         }
 
         .gray {

src/views/dataBoard/overview/components/jdwgy.vue

@@ -138,11 +138,15 @@ export default {
           );
         });
       } else {
-        this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId + "&personnelType=" + this.peopleType).then(({ data: { data } }) => {
+        this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId + "&personnelType=" + this.peopleType).then(({ data: { code, msg, data } }) => {
           this.loading = false;
+          if (code === 0) {
             this.list = data.personnelInfoVOList;
             this.unitList = data.departmentInfoVOList ? data.departmentInfoVOList : [];
             this.$emit("setNum", data.orgPersonnelVOList);
+          } else {
+            this.$message.error(msg);
+          }
         });
       }
     },

src/views/dataBoard/overview/index.vue

@@ -8,86 +8,33 @@
     <div class="g-row">
       <div class="g-left">
         <div class="m-box">
-          <title-box
+          <title-box :text="`${currentLevel === 'district' ? '区' : currentLevel === 'street' ? '街道' : currentLevel === 'community' ? '社区' : currentLevel === 'grid' ? '网格' : ''}介绍`" />
-            :text="`${
-              currentLevel === 'district'
-                ? '区'
-                : currentLevel === 'street'
-                ? '街道'
-                : currentLevel === 'community'
-                ? '社区'
-                : currentLevel === 'grid'
-                ? '网格'
-                : ''
-            }介绍`"
-          />
           <jdjs :currentLevelData="currentLevelData" />
         </div>
 
         <div class="m-box">
-          <title-box
+          <title-box :text="`${currentLevel === 'district' ? '区' : currentLevel === 'street' ? '街道' : currentLevel === 'community' ? '社区' : currentLevel === 'grid' ? '网格' : ''}图谱画像`" />
-            :text="`${
-              currentLevel === 'district'
-                ? '区'
-                : currentLevel === 'street'
-                ? '街道'
-                : currentLevel === 'community'
-                ? '社区'
-                : currentLevel === 'grid'
-                ? '网格'
-                : ''
-            }图谱画像`"
-          />
           <jdtphx :currentLevelData="currentLevelData" :id="orgId" />
         </div>
       </div>
       <div class="g-center">
-        <div
+        <div :class="listShow ? 'm-map' : 'g-center-open'" style="overflow: hidden">
-          :class="listShow ? 'm-map' : 'g-center-open'"
+          <map-top :currentLevelData="currentLevelData" @changeType="changeType" :level="currentLevel" />
-          style="overflow: hidden"
-        >
-          <map-top
-            :currentLevelData="currentLevelData"
-            @changeType="changeType"
-            :level="currentLevel"
-          />
           <div v-if="breadList.length > 1" class="go-back" @click="goBackMap">
             <img src="~@/assets/images/shuju/overview/go-back.png" />
           </div>
-          <grid-map
+          <grid-map ref="map" @clickAgency="clickAgencyItem" :srcGridData="orgData" @clickDotBtn="handleClickDotBtn" :level="currentLevel" :peopleType="peopleType" />
-            ref="map"
-            @clickAgency="clickAgencyItem"
-            :srcGridData="orgData"
-            @clickDotBtn="handleClickDotBtn"
-            :level="currentLevel"
-            :peopleType="peopleType"
-          />
         </div>
         <div class="m-box m-rybox">
           <title-box :text="`${customerName}${peopleList[peopleType]}`">
             <div class="up-style" style="width: 51%">
               <div>
-                <img
+                <img v-if="listShow" @click="upDownShow" src="~@/assets/images/overview/down-icon.png" />
-                  v-if="listShow"
+                <img v-else @click="upDownShow" src="~@/assets/images/overview/up-icon.png" />
-                  @click="upDownShow"
-                  src="~@/assets/images/overview/down-icon.png"
-                />
-                <img
-                  v-else
-                  @click="upDownShow"
-                  src="~@/assets/images/overview/up-icon.png"
-                />
               </div>
             </div>
           </title-box>
-          <jdwgy
+          <jdwgy v-show="listShow" :peopleType="peopleType" :currentLevelData="currentLevelData" :level="currentLevel" @setNum="setNum" @setPoint="setPoint" />
-            v-show="listShow"
-            :peopleType="peopleType"
-            :currentLevelData="currentLevelData"
-            :level="currentLevel"
-            @setNum="setNum"
-            @setPoint="setPoint"
-          />
         </div>
       </div>
 
@@ -97,146 +44,57 @@
           <rfsjtj :currentLevelData="currentLevelData" />
         </div>
         <!-- 街道概览 -->
-        <div
+        <div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box">
-          v-if="currentLevel === 'street' || currentLevel === 'district'"
-          class="m-box"
-        >
           <title-box text="各社区人房数据更新排行">
             <span class="date-span">
-              <el-date-picker
+              <el-date-picker popper-class="date-current-weiyi" :append-to-body="false" v-model="rfphDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月"> </el-date-picker>
-                popper-class="date-current-weiyi"
-                :append-to-body="false"
-                v-model="rfphDate"
-                format="yyyy-MM"
-                value-format="yyyy-MM"
-                @change="changeDate"
-                type="month"
-                :clearable="false"
-                placeholder="选择月"
-              >
-              </el-date-picker>
             </span>
           </title-box>
           <sqrfph :currentLevelData="currentLevelData" :date="rfphDate" />
         </div>
-        <div
+        <div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box">
-          v-if="currentLevel === 'street' || currentLevel === 'district'"
-          class="m-box"
-        >
           <title-box text="各社区12345投诉事件统计">
             <span class="date-span">
-              <el-date-picker
+              <el-date-picker popper-class="date-current-weiyi" :append-to-body="false" v-model="sq12345Date" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" placeholder="选择月" />
-                popper-class="date-current-weiyi"
-                :append-to-body="false"
-                v-model="sq12345Date"
-                format="yyyy-MM"
-                value-format="yyyy-MM"
-                type="month"
-                :clearable="false"
-                placeholder="选择月"
-              />
             </span>
           </title-box>
           <sq12345 :currentLevelData="currentLevelData" :date="sq12345Date" />
         </div>
 
         <!-- 社区&网格-->
-        <div
+        <div v-if="currentLevel === 'community' || currentLevel === 'grid'" class="m-box">
-          v-if="currentLevel === 'community' || currentLevel === 'grid'"
-          class="m-box"
-        >
           <title-box text="人房数据动态更新" />
-          <Tabs
+          <Tabs v-model="dynamicType" :list="dynamicTypeList" v-if="currentLevel === 'community'" @changeVal="dynamicTypeChange" />
-            v-model="dynamicType"
+          <DynamicHumanRoomData :currentLevelData="currentLevelData" :currentLevel="currentLevel" v-if="dynamicType === 1" />
-            :list="dynamicTypeList"
+          <GridUpdateRanking :currentLevelData="currentLevelData" :currentLevel="currentLevel" v-if="dynamicType === 2" />
-            v-if="currentLevel === 'community'"
-            @changeVal="dynamicTypeChange"
-          />
-          <DynamicHumanRoomData
-            :currentLevelData="currentLevelData"
-            :currentLevel="currentLevel"
-            v-if="dynamicType === 1"
-          />
-          <GridUpdateRanking
-            :currentLevelData="currentLevelData"
-            :currentLevel="currentLevel"
-            v-if="dynamicType === 2"
-          />
         </div>
         <!-- 社区概览-->
         <div v-if="currentLevel === 'community'" class="m-box">
           <title-box text="社区满意度自查结果">
             <span class="date-span">
-              <el-date-picker
+              <el-date-picker popper-class="date-current-weiyi" :append-to-body="false" v-model="sqzcDate" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" placeholder="选择月" />
-                popper-class="date-current-weiyi"
-                :append-to-body="false"
-                v-model="sqzcDate"
-                format="yyyy-MM"
-                value-format="yyyy-MM"
-                type="month"
-                :clearable="false"
-                placeholder="选择月"
-              />
             </span>
           </title-box>
-          <CommunityResult
+          <CommunityResult :currentLevelData="currentLevelData" :date="sqzcDate" />
-            :currentLevelData="currentLevelData"
-            :date="sqzcDate"
-          />
         </div>
         <div v-if="currentLevel === 'community'" class="m-box">
           <title-box text="事件&回访">
             <span class="date-span">
-              <el-date-picker
+              <el-date-picker popper-class="date-current-weiyi" :append-to-body="false" v-model="sjhfDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月" />
-                popper-class="date-current-weiyi"
-                :append-to-body="false"
-                v-model="sjhfDate"
-                format="yyyy-MM"
-                value-format="yyyy-MM"
-                @change="changeDate"
-                type="month"
-                :clearable="false"
-                placeholder="选择月"
-              />
             </span>
           </title-box>
-          <Tabs
+          <Tabs v-model="eventType" :list="eventTypeList" @changeVal="eventTypeChange" />
-            v-model="eventType"
+          <EventAndFollowUp :currentLevelData="currentLevelData" :date="sjhfDate" v-if="eventType === 1" />
-            :list="eventTypeList"
+          <FollowUp :currentLevelData="currentLevelData" :date="sjhfDate" v-if="eventType === 2" />
-            @changeVal="eventTypeChange"
-          />
-          <EventAndFollowUp
-            :currentLevelData="currentLevelData"
-            :date="sjhfDate"
-            v-if="eventType === 1"
-          />
-          <FollowUp
-            :currentLevelData="currentLevelData"
-            :date="sjhfDate"
-            v-if="eventType === 2"
-          />
         </div>
         <!-- 网格 -->
         <div v-if="currentLevel === 'grid'" class="m-box">
           <title-box text="社区网格数据更新情况排行">
             <span class="date-span">
-              <el-date-picker
+              <el-date-picker popper-class="date-current-weiyi" :append-to-body="false" v-model="sqwggxDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月" />
-                popper-class="date-current-weiyi"
-                :append-to-body="false"
-                v-model="sqwggxDate"
-                format="yyyy-MM"
-                value-format="yyyy-MM"
-                @change="changeDate"
-                type="month"
-                :clearable="false"
-                placeholder="选择月"
-              />
             </span>
           </title-box>
-          <RankingGridData
+          <RankingGridData :currentLevelData="currentLevelData" :date="sqwggxDate" />
-            :currentLevelData="currentLevelData"
-            :date="sqwggxDate"
-          />
         </div>
       </div>
     </div>
@@ -384,8 +242,7 @@ export default {
 
   methods: {
     changeCustomerName() {
-      this.customerName =
+      this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
-        localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
     },
     changeType(e) {
       this.peopleType = e;
@@ -440,8 +297,7 @@ export default {
           orgLevel: item.level,
         };
       } else {
-        this.customerName =
+        this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
-          localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
         this.currentLevelData = {
           ...this.$store.state.chooseArea.chooseName,
           orgLevel: this.$store.state.chooseArea.chooseName.level,
@@ -477,13 +333,11 @@ export default {
       if (!item.longitude) {
         return this.$message.error("请先设置坐标");
       }
-      this.$refs.map.setDotMarker(item, [
+      this.$refs.map.setDotMarker(item, [parseFloat(item.longitude), parseFloat(item.latitude)]);
-        parseFloat(item.longitude),
-        parseFloat(item.latitude),
-      ]);
     },
     setNum(data) {
       // data
+      console.log("hhghjgjhgjhgjh");
       let params = [];
       let org = this.orgData.children;
       org.forEach((item) => {
@@ -499,7 +353,9 @@ export default {
         });
       });
       // if (params.length) {
+      console.log("hhghjgjhgjhgjh111");
       this.$refs.map.setNum(params);
+      console.log("hhghjgjhgjhgjh2222");
       // }
     },
     upDownShow() {
@@ -511,14 +367,9 @@ export default {
       // }
     },
     //获取地图上显示的组织数据
-    async getMapData(
+    async getMapData(orgId = this.$store.state.chooseArea.chooseName.orgId, level = this.$store.state.chooseArea.chooseName.level) {
-      orgId = this.$store.state.chooseArea.chooseName.orgId,
-      level = this.$store.state.chooseArea.chooseName.level
-    ) {
       const url = "org_map";
-      this.$http
+      this.$http.post(`/gov/org/agency/maporg`, { orgId, level }).then(({ data: { data } }) => {
-        .post(`/gov/org/agency/maporg`, { orgId, level })
-        .then(({ data: { data } }) => {
         this.orgData = data;
         this.orgId = this.orgData.id;
         this.orgLevel = this.orgData.level;
@@ -527,8 +378,7 @@ export default {
           orgId: this.orgId,
           orgLevel: this.currentLevel,
         };
-          this.peopleType =
+        this.peopleType = this.currentLevel === "grid" ? "unit" : "staffAgency";
-            this.currentLevel === "grid" ? "unit" : "staffAgency";
       });
     },
 
@@ -623,11 +473,7 @@ export default {
   background: #000;
 }
 </style>
-<style
+<style lang="scss" src="@/assets/scss/dataBoard/overview/index.scss" scoped></style>
-  lang="scss"
-  src="@/assets/scss/dataBoard/overview/index.scss"
-  scoped
-></style>
 
 <style lang="scss" scoped>
 .tabs {

vue.config.js

@@ -36,8 +36,8 @@ module.exports = {
       },
       "/api": {
         // target: "http://219.146.91.110:30801", // 测试地址
-        target: "http://localhost:8080", // 本地地址
+        // target: "http://localhost:8080", // 本地地址
-        // target: "https://epmet-preview.elinkservice.cn", // 演示地址
+        target: "https://epmet-preview.elinkservice.cn", // 演示地址
         changeOrigin: true,
         pathRewrite: {
           "^api": "",