Browse Source

修复bug

wangcc 2 năm trước cách đây
mục cha
commit
7829da38ae

+ 1 - 1
src/components/amapTow.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-10-19 09:32:46
  * @LastEditors: wangcc
- * @LastEditTime: 2022-10-19 09:32:47
+ * @LastEditTime: 2022-10-27 17:43:25
  * @FilePath: \castgroup_bigscreen\src\components\amapTow.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 507 - 411
src/components/amapnow.vue


+ 7 - 5
src/components/pickerAddr.vue

@@ -5,7 +5,7 @@
   <div class="pickerAddr u-flex">
     <div class="select-wrap select-province" @click="provinceClick">
       省:
-      <el-select v-model="selectProvince" placeholder="请选择" disabled>
+      <el-select v-model="selectProvince.name" placeholder="请选择" disabled>
         <!-- <el-option
           v-for="item in vuexCityList"
           :key="item.areaCode"
@@ -63,7 +63,11 @@ export default {
   components: {},
   data() {
     return {
-      selectProvince: '贵州省',
+      selectProvince: {
+        parentId: '520000',
+        name: '贵州省',
+        mapLevel: 'province'
+      },
       selectCity: {},
       selectDistrict: {},
       selectStreet: {},
@@ -197,9 +201,7 @@ export default {
     provinceClick() {
       // console.log('provinceClick','provinceClick');
       this.$store.dispatch('searchArea', {
-        parentId: '520000',
-        name: '贵州省',
-        mapLevel: 'province'
+       ...this.selectProvince 
       });
     },
     getSelectModel() {}

+ 7 - 0
src/service/index.js

@@ -130,6 +130,13 @@ callApi({
   prefixUrl: "api2"
 });
 
+// 根据项目ID查询小班
+export const projectSmallClass = data =>
+callApi({
+  url: "course/smallClass",
+  data,
+  prefixUrl: "api2"
+});
 // 事件信息
 export const alarmDataApi = data =>
   callApi({

+ 19 - 15
src/store/addr/index.js

@@ -26,7 +26,8 @@ const addr = {
     // 根据小班号查询搜索小班
     smallClassSearch: [],
     eventData: {},
-    baseDetail: {}
+    baseDetail: {},
+    smallClassMap: []
   },
   mutations: {
     // 更改页面标识
@@ -58,24 +59,24 @@ const addr = {
       state.selectStreet = streetData;
     },
     // 事件详情获取
-    changeEvenData(state,eventData) {
-      state.eventData = eventData
+    changeEvenData(state, eventData) {
+      state.eventData = eventData;
     },
-    // 
+    //
     // 获取基地详情
-    changeBaseDetail(state,baseDetail) {
-      state.baseDetail = baseDetail
+    changeBaseDetail(state, baseDetail) {
+      state.baseDetail = baseDetail;
     },
     changeSelectAddr(state, mapLevel) {
       // console.log("mapLevelmapLevel", mapLevel);
       // console.log('state', state);
       let cityName = null;
-      if (state.selectCity.label == '黔东南苗族侗族自治州') {
-        cityName = '黔东南州'
-      } else if (state.selectCity.label == '黔南布依族苗族自治州') {
-        cityName = '黔南州'
-      } else if (state.selectCity.label == '黔西南布依族苗族自治州') {
-        cityName = '黔西南州'
+      if (state.selectCity.label == "黔东南苗族侗族自治州") {
+        cityName = "黔东南州";
+      } else if (state.selectCity.label == "黔南布依族苗族自治州") {
+        cityName = "黔南州";
+      } else if (state.selectCity.label == "黔西南布依族苗族自治州") {
+        cityName = "黔西南州";
       }
       switch (mapLevel) {
         case "province":
@@ -111,7 +112,11 @@ const addr = {
     // 获取小班边界
     getSmallClassMapArr(state, calssmap) {
       state.smallClassMapArr = calssmap;
-    }
+    },
+    // 根据项目id获取的小班
+    getProjectSmallClassMap(state, projectSmall) {
+      state.smallClassMap = projectSmall;
+    },
   },
   actions: {
     // 获取省市县
@@ -134,7 +139,7 @@ const addr = {
         commit("changeParentId", params);
         commit("changeSelectAddr", params.mapLevel);
       });
-    },
+    }
     // // 获取小班边界
     // getSmallClassMap({ commit }, params = {}) {
     //   smallClassMap(params).then(res => {
@@ -143,5 +148,4 @@ const addr = {
     // }
   }
 };
-
 export default addr;

+ 2 - 1
src/store/getters.js

@@ -14,7 +14,8 @@ const getters = {
     smallClassMapArr: state => state.addr.smallClassMapArr,
     smallClassSearch: state => state.addr.smallClassSearch,
     eventData: state => state.addr.eventData,
-    baseDetail: state => state.addr.baseDetail
+    baseDetail: state => state.addr.baseDetail,
+    smallClassMap: state => state.addr.smallClassMap
 }
 
 export default getters

+ 36 - 22
src/views/index.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-07-06 15:56:45
  * @LastEditors: wangcc
- * @LastEditTime: 2022-10-26 15:26:35
+ * @LastEditTime: 2022-10-28 10:26:47
  * @FilePath: \castgroup_bigscreen\src\views\index.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -241,7 +241,8 @@ import {
   smallInfo,
   eventDetail,
   financeBaseDetail,
-  projectList
+  projectList,
+  projectSmallClass
 } from '../service/index';
 
 import scrollBoardSchema from '../dataSchema/scrollBoardSchema';
@@ -418,7 +419,8 @@ export default {
       'changeBaseDetail',
       'changeSelectCity',
       'changeSelectDistrict',
-      'changeSelectStreet'
+      'changeSelectStreet',
+      'getProjectSmallClassMap'
     ]),
     addrChange(value) {
       console.log('addrChange', value);
@@ -1178,28 +1180,40 @@ export default {
         this.changeSearchSmallClass(res.data);
         console.log(res.data);
         this.alarData = res.data;
-        console.log(this.$store.state.addr.mapLevel);
-        if (this.$store.state.addr.mapLevel == 'city') {
-          this.jumpDistrict();
-        } else {
-          this.vuexCityList.forEach((element) => {
-            if (res.data.cityId === element.areaId) {
-              this.changeSelectCity({
-                value: element.areaCode,
-                label: res.data.cityName,
-                areaId: element.areaId
-              });
-              this.$store.dispatch('searchArea', {
-                parentId: element.areaCode.substring(0, 6),
-                name: res.data.cityName,
-                mapLevel: 'city'
-              });
-            }
-          });
+        // if (this.$store.state.addr.mapLevel == 'city') {
+        //   this.jumpDistrict();
+        // } else {
+        //   this.vuexCityList.forEach((element) => {
+        //     if (res.data.cityId === element.areaId) {
+        //       this.changeSelectCity({
+        //         value: element.areaCode,
+        //         label: res.data.cityName,
+        //         areaId: element.areaId
+        //       });
+        //       this.$store.dispatch('searchArea', {
+        //         parentId: element.areaCode.substring(0, 6),
+        //         name: res.data.cityName,
+        //         mapLevel: 'city'
+        //       });
+        //     }
+        //   });
+        // }
+      });
+    },
+    scrollProjectClick(e) {
+      console.log(e.row[4]);
+      let rowId = e.row[4]
+      let param = {
+        courseId: rowId,
+        pageNum: 1,
+        pageSize: 20
+      };
+      projectSmallClass(param).then((res) => {
+        if (res.code == 200) {
+          this.getProjectSmallClassMap(res.rows)
         }
       });
     },
-    scrollProjectClick() {},
     jumpDistrict() {
       if (this.vuexDistrictList) {
         this.vuexDistrictList.forEach((element) => {

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác