diff --git a/src/api/fence/group.js b/src/api/fence/group.js index 5930065..c27a48c 100644 --- a/src/api/fence/group.js +++ b/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({ diff --git a/src/views/enterprise/index.vue b/src/views/enterprise/index.vue index d974b83..eef7893 100644 --- a/src/views/enterprise/index.vue +++ b/src/views/enterprise/index.vue @@ -324,7 +324,6 @@ export default { this.open = false; this.getList(); }); - loading.close(); } } }); diff --git a/src/views/system/manage/carInformation/index.vue b/src/views/system/manage/carInformation/index.vue index a312803..63332a4 100644 --- a/src/views/system/manage/carInformation/index.vue +++ b/src/views/system/manage/carInformation/index.vue @@ -56,8 +56,10 @@ prop="typeName"> + label="是否绑定围栏"> + 修改 删除 配置策略 - 绑定围栏组 + 绑定围栏组 + 查看围栏组 @@ -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=>{