feat():优化业务功能 10.7

src/api/fence/group.js

@@ -67,6 +67,17 @@ export function selectAllGroup() {
 }
 
 
+
+//围栏组所有
+export function getGroupListResp(data) {
+  return request({
+    url: '/enterprise/group/getGroupListResp',
+    method: 'post',
+    data
+  })
+}
+
+
 //回显绑定的电子围栏信息
 export function findFenceAndWayById(id) {
   return request({

src/views/enterprise/index.vue

@@ -324,7 +324,6 @@ export default {
               this.open = false;
               this.getList();
             });
-            loading.close();
           }
         }
       });

src/views/system/manage/carInformation/index.vue

@@ -56,8 +56,10 @@
           prop="typeName">
         </el-table-column>
         <el-table-column
-          label="电子围栏外键"
+          label="是否绑定围栏">
-          prop="groupId">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_car_group" :value="scope.row.groupId"/>
+          </template>
         </el-table-column>
         <el-table-column
           label="车辆电机厂商"
@@ -94,7 +96,8 @@
             <el-button type="text"  @click="handleEdit(scope.row)">修改</el-button>
             <el-button type="text"  @click="handleDelete(scope.row)">删除</el-button>
             <el-button type="text" @click="configurationStrategy(scope.row)">配置策略</el-button>
-            <el-button type="text" class="el-icon-connection" @click="boundFenceGroup(scope.row)">绑定围栏组</el-button>
+            <el-button type="primary" class="el-icon-connection" @click="boundFenceGroup(scope.row)" v-show="scope.row.groupId==0">绑定围栏组</el-button>
+            <el-button type="success" class="el-icon-link" @click="lookboundGroup(scope.row)" v-show="scope.row.groupId==1">查看围栏组</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -177,9 +180,10 @@ import {
   updCarStrategyId
 } from '@/api/system/manage/carInformation'
 import { findStrategyListByCarTypeId, updateStrategy } from '@/api/warning/strategy'
-import { boundGroupAndCar, selectAllGroup } from '@/api/fence/group'
+import { boundGroupAndCar, getGroupListResp, selectAllGroup } from '@/api/fence/group'
 
 export default {
+  dicts: ['sys_car_group'],
     //import引入的组件需要注入到对象中才能使用"
     components: {},
     props: {},
@@ -229,6 +233,27 @@ export default {
     //方法集合",
     methods: {
 
+      lookboundGroup(row){
+        selectAllGroup().then(res=>{
+          this.groupList = res.data;
+        })
+        this.drawer=true;
+
+        getGroupListResp(row).then(res=>{
+
+          let rows = res.data;
+          console.log(rows)
+          if (rows!=null&&rows!=undefined&&rows!=''){
+            rows.forEach(row => {
+              console.log(this.groupList[row.id-1]);
+              console.log(row);
+              this.$refs.multipleTable.toggleRowSelection(this.groupList[row.id-1]);
+            });
+          }
+
+
+        })
+      },
       dobound(){
 
         boundGroupAndCar(this.GroupAndCarBound).then(res=>{