小生接口联调

src/utils/operation.js

@@ -255,13 +255,21 @@ export function getEcologyList() {
   }]
   return dataList;
 }
-export function getEcologySelect () {
-  let data = [{
-    label: '上海小生态',
-    value: '1',
-  },{
-    label: '北京小生态',
-    value: '2',
-  }];
-  return data;
+export function getEcologySelect (data) {
+  // let ecologyist = [{
+  //   label: '上海小生态',
+  //   value: '1',
+  // },{
+  //   label: '北京小生态',
+  //   value: '2',
+  // }];
+  let ecologyist = [];
+  for(let i=0;i<data.length;i++) {
+    let obj = {
+      label: data[i].name,
+      value: data[i].id,
+    }
+    ecologyist.push(obj);
+  }
+  return ecologyist;
 }
\ No newline at end of file

src/views/education/add-manager.vue

@@ -460,7 +460,7 @@
               <el-form-item label>
                 <el-select
                   size="small"
-                  v-model="formEcology.id"
+                  v-model="formEcology.ecology"
                   placeholder="选择小生态"
                   v-if="idType != 2"
                   @change="selectChangeEcology"
@@ -473,18 +473,18 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <span class="span_ecology">范围</span>
+              <span class="span_ecology">{{ checkedEcology }}</span>
               <el-form-item style="float:right;">
                 <el-button-group>
                   <el-button
                     size="small"
                     type="default"
-                    @click="checkAll(true,'multipleEcology')"
+                    @click="checkAllEcology(true)"
                   >选择全部</el-button>
                   <el-button
                     size="small"
                     type="default"
-                    @click="checkAll(false,'multipleEcology')"
+                    @click="checkAllEcology(false)"
                   >全部不选</el-button>
                 </el-button-group>
               </el-form-item>
@@ -772,14 +772,16 @@ export default {
       searchOrganizationType: '',
       searchPeopleType: '',
       //小生态
+      checkedEcology: '',
       ecologySelect: [],
       formEcology: {
-        id: '',
+        ecology: '',
         pageNum: 1,
         pageSize: 10,
       },
       totalEcology: 0,
       tableEcology: [],
+      checkTableEcology: '',
       getRowKeysEcology(row) {
         return row.id;
       },
@@ -1959,8 +1961,13 @@ export default {
         this.changedEcology2
       );
     },
-    selectChangeEcology() {
-
+    selectChangeEcology(value) {
+      // console.log('select',value);
+      for(let i=0;i<this.ecologySelect.length;i++) {
+        if(this.ecologySelect[i].value == value) {
+          this.checkedEcology = this.ecologySelect[i].label;
+        }
+      }
     },
     //设定机构table全选
     checkAll(flag, name) {
@@ -2028,6 +2035,36 @@ export default {
         }
       }
     },
+    checkAllEcology(flag) {
+      if (flag === true) {
+        let idList = operationData.getIdList(this.tableEcology);
+        //console.log('idList',idList,'changedPerson',this.changedPerson);
+        let difference = operationData.getDifference(
+          idList,
+          this.changedEcology
+        );
+        //console.log('difference',difference);
+        if (difference.length > 0) {
+          this.$refs.multipleEcology.toggleAllSelection();
+        }
+        this.checkTableEcology = true;
+
+        this.changedEcology2 = [];
+        this.changedEcology = operationData.getDifference(
+          this.lookedEcology,
+          this.changedEcology
+        );
+      } else {
+        this.$refs.multipleEcology.clearSelection();
+        this.checkTableEcology = false;
+
+        this.changedEcology = [];
+        this.changedEcology2 = operationData.getDifference(
+          this.lookedEcology,
+          this.changedEcology
+        );
+      }
+    },
     //获取用户类型
     getKind(type) {
       let kind = 3;
@@ -2629,10 +2666,23 @@ export default {
       return list;
     },
     getEcologySelect() {
-      this.ecologySelect = operationData.getEcologySelect();
+      let req = {};
+      vm.GET("portal/scope/v1/"+this.projectId+"/ecology", req).then(
+        res => {
+          console.log('查询小生态列表',res);
+          this.ecologySelect = operationData.getEcologySelect(res.data.list);
+        }
+      );
     },
     //获取小生态数据
     getEcology() {
+      let req = {};
+      req = this.formEcology;
+      vm.GET("portal/scope/v1/"+this.projectId+"/organization", req).then(
+        res => {
+          console.log('根基小生态查询机构列表信息',res);
+        }
+      );
       this.tableEcology = operationData.getEcologyList();
     },
     //