Преглед на файлове

事件信息点击跳转

wangcc преди 2 години
родител
ревизия
4cf8984356
променени са 4 файла, в които са добавени 43 реда и са изтрити 29 реда
  1. 35 25
      src/components/alarm.vue
  2. 6 3
      src/components/amap.vue
  3. 1 0
      src/components/pickerAddr.vue
  4. 1 1
      src/store/addr/index.js

+ 35 - 25
src/components/alarm.vue

@@ -1,5 +1,5 @@
 <!--
- * @LastEditors: gcz
+ * @LastEditors: wangcc
 -->
 <template>
   <div class="alarm-wrap">
@@ -8,9 +8,11 @@
         <img src="../assets/img/gaojing.png" alt />
         <div class="g-container">
           <ul class="new-list" :class="{anim:animate}" @mouseenter="Stop()" @mouseleave="Up()">
-            <li v-for="(item,index) in data" :key="index" @click="jumpMap(item)">
-            {{item.countyName}}{{item.townName}}{{item.villageName}}{{item.createTime.slice(11)}}发现[{{item.eventType|filterEventType}}],请尽快处理!
-            </li>
+            <li
+              v-for="(item,index) in data"
+              :key="index"
+              @click="jumpMap(item)"
+            >{{item.countyName}}{{item.townName}}{{item.villageName}}{{item.createTime.slice(11)}}发现[{{item.eventType|filterEventType}}],请尽快处理!</li>
           </ul>
         </div>
       </div>
@@ -47,9 +49,15 @@ export default {
   watch: {
     '$store.state.addr.mapLevel': {
       handler(val) {
+        console.log(val);
         if (val === 'city') {
           // console.log('aowfk');
-          this.jumpDistrict()
+          let _this = this;
+          this.jumpDistrict();
+          // setTimeout(() => {
+          //   console.log('321');
+          //   _this.jumpDistrict();
+          // }, 800);
         }
       }
     }
@@ -62,21 +70,23 @@ export default {
     ]),
     jumpMap(item) {
       this.alarData = item;
-      console.log(item);
-        this.vuexCityList.forEach((element) => {
-          if (item.cityId === element.areaId) {
-            this.changeSelectCity({
-              value: element.areaCode,
-              label: item.cityName,
-              areaId: element.areaId
-            });
-            this.$store.dispatch('searchArea', {
-              parentId: element.areaCode.substring(0, 6),
-              name: item.cityName,
-              mapLevel: this.$store.state.addr.mapLevel
-            });
-          }
-        });
+     
+      this.vuexCityList.forEach((element) => {
+        if (item.cityId === element.areaId) {
+          this.changeSelectCity({
+            value: element.areaCode,
+            label: item.cityName,
+            areaId: element.areaId
+          });
+          console.log(element.areaCode.substring(0, 6));
+          console.log(item.cityName);
+          this.$store.dispatch('searchArea', {
+            parentId: element.areaCode.substring(0, 6),
+            name: item.cityName,
+            mapLevel: 'city'
+          });
+        }
+      });
     },
     jumpDistrict() {
       if (this.vuexDistrictList) {
@@ -90,7 +100,7 @@ export default {
             this.$store.dispatch('searchArea', {
               parentId: element.areaCode.substring(0, 6),
               name: element.areaName,
-              mapLevel: this.$store.state.addr.mapLevel
+              mapLevel: 'district'
             });
           }
         });
@@ -292,11 +302,11 @@ ul li {
 //     transform: translate(0, calc(var(--h) * -1px));
 //   }
 // }
-@media only screen and (max-width : 1200px) {
-  .alarm{
+@media only screen and (max-width: 1200px) {
+  .alarm {
     width: 35vw;
-    ul{
-      li{
+    ul {
+      li {
         font-size: 14px;
       }
     }

+ 6 - 3
src/components/amap.vue

@@ -123,7 +123,6 @@ export default {
       deep: true,
       immediate: true,
       handler(val) {
-        console.log(val);
         this.smallClassMapArr = val.rows;
         if (this.smallClassMapArr) {
           if (this.$store.state.addr.mapLevel === 'district') {
@@ -150,7 +149,8 @@ export default {
     ...mapMutations([
       'changeSelectCity',
       'changeSelectDistrict',
-      'changeSelectStreet'
+      'changeSelectStreet',
+      'changeSelectAddr'
     ]),
     initAMap() {
       let _this = this;
@@ -506,6 +506,8 @@ export default {
       if (smallClassMapArr) {
         smallClassMapArr.forEach((item) => {
           let polyData = JSON.parse(item.mapInfo);
+          console.log(item);
+          console.log(polyData);
           that.smallClassPolygon = new AMap.Polygon({
             map: this.map,
             path: polyData.features[0].geometry.coordinates,
@@ -514,7 +516,7 @@ export default {
             strokeColor: 'red',
             strokeWeight: 2,
             zIndex: 999,
-            cursor: 'pointer'
+            cursor: 'pointer',
           });
           var lanLatArr = [];
           that.smallClassPolygon.on('click', (e) => {
@@ -1083,6 +1085,7 @@ export default {
             label: label,
             areaId: areaId
           });
+          this.changeSelectAddr('street')
           console.log(this.streetData);
           var outer = [
             new AMap.LngLat(-360, 90, true),

+ 1 - 0
src/components/pickerAddr.vue

@@ -75,6 +75,7 @@ export default {
   },
   watch: {
     '$store.state.addr.selectCity'(val) {
+      console.log(val);
       this.selectCity = val;
     },
     '$store.state.addr.selectDistrict'(val) {

+ 1 - 1
src/store/addr/index.js

@@ -69,7 +69,7 @@ const addr = {
           state.selectAddr = `贵州省 · ${state.selectCity.label} · ${state.selectDistrict.label}`;
           break;
 
-        case "treet":
+        case "street":
           state.selectAddr = `贵州省 · ${state.selectCity.label} · ${state.selectDistrict.label} · ${state.selectStreet.label}`;
           break;