diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue index 369ceec..a74dd8d 100644 --- a/src/views/keyprojects/videomanager/components/video-list.vue +++ b/src/views/keyprojects/videomanager/components/video-list.vue @@ -157,38 +157,38 @@ :title="'绑定列表'" width="80%"> + v-loading="listLoading" + ref="multipleTable" + :data="outsourcedList" + :row-key="getRowKey" + :header-cell-style="{ + 'font-weight': 'bold', + 'color': '#000' + }" + tooltip-effect="dark" + border + fit + highlight-current-row + > - - + + - - - - - - - + + + + + + + @@ -223,9 +223,9 @@ export default { dialogImageUrl: '', dialogVisible: false, dialogSelect: false, - outsourcedListVisible: false,// 重点工程 - controlRowTemp: null,// 正在操作的row,用于删除后刷新 - outsourcedList: [],// 重点工程 + outsourcedListVisible: false, // 重点工程 + controlRowTemp: null, // 正在操作的row,用于删除后刷新 + outsourcedList: [], // 重点工程 add: true, del: true, edit: true, @@ -783,15 +783,15 @@ export default { this.$parent.OUTSOURCED_ID = '' }, // 获取重点工程列表 - async getOutsourced (row){ + async getOutsourced(row) { this.listLoading = true this.outsourcedListVisible = true this.controlRowTemp = row this.outsourcedList = [] requestFN( - `/videoResources/getRelevanceOutsourced?VIDEO_ID=${row.VIDEO_RESOURCES_ID?row.VIDEO_RESOURCES_ID:row.PLATFORMVIDEOMANAGEMENT_ID}`, + `/videoResources/getRelevanceOutsourced?VIDEO_ID=${row.VIDEO_RESOURCES_ID ? row.VIDEO_RESOURCES_ID : row.PLATFORMVIDEOMANAGEMENT_ID}`, { - + } ).then((data) => { this.listLoading = false @@ -799,7 +799,6 @@ export default { }).catch((e) => { this.listLoading = false }) - }, async untie(id) { this.$confirm('确定要删除吗?', { @@ -826,7 +825,7 @@ export default { }) }).catch(() => { }) - }, + } } } diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 73009bd..3948f59 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -2356,7 +2356,7 @@ export default { _this.onePerLocArr[index].x = x _this.onePerLocArr[index].y = y _this.onePerLocArr[index].icon_type = 'img4_0' + pointColor - ry_drag.getPosition(this.onePerLocArr[index]) + ry_drag.getPosition(_this.onePerLocArr[index]) } else { const perLoc = { id: item.id,