guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

相关方app端编辑信息bug修复

liujun0708-动火作业流程图逻辑修改
liujun 2024-06-06 17:33:05 +08:00
parent 3aac7c988f
commit 7e669c0eab
2 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/views/keyprojects/videomanager/components/video-list.vue
View File

@ -157,38 +157,38 @@
:title="'绑定列表'" :title="'绑定列表'"
width="80%"> width="80%">
<el-table <el-table
v-loading="listLoading" v-loading="listLoading"
ref="multipleTable" ref="multipleTable"
:data="outsourcedList" :data="outsourcedList"
:row-key="getRowKey" :row-key="getRowKey"
:header-cell-style="{ :header-cell-style="{
'font-weight': 'bold', 'font-weight': 'bold',
'color': '#000' 'color': '#000'
}" }"
tooltip-effect="dark" tooltip-effect="dark"
border border
fit fit
highlight-current-row highlight-current-row
> >
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip /> <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip />
<el-table-column prop="STATE" label="状态" width="100" > <el-table-column prop="STATE" label="状态" width="100" >
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.STATE == 0">未开工</span> <span v-if="row.STATE == 0">未开工</span>
<span v-if="row.STATE == 1">进行中</span> <span v-if="row.STATE == 1">进行中</span>
<span v-if="row.STATE == 2">已结束</span> <span v-if="row.STATE == 2">已结束</span>
<span v-if="row.STATE == -1">开工申请中</span> <span v-if="row.STATE == -1">开工申请中</span>
<span v-if="row.STATE == -2">结束申请中</span> <span v-if="row.STATE == -2">结束申请中</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="400"> <el-table-column label="操作" align="center" width="400">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="danger" icon="el-icon-delete" size="mini" @click="untie(row.VIDEOMANAGER_ID)">解绑</el-button> <el-button type="danger" icon="el-icon-delete" size="mini" @click="untie(row.VIDEOMANAGER_ID)">解绑</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="outsourcedListVisible = false">返 回</el-button> <el-button @click="outsourcedListVisible = false">返 回</el-button>
</div> </div>
@ -223,9 +223,9 @@ export default {
dialogImageUrl: '', dialogImageUrl: '',
dialogVisible: false, dialogVisible: false,
dialogSelect: false, dialogSelect: false,
outsourcedListVisible: false,// 重点工程 outsourcedListVisible: false, // 重点工程
controlRowTemp: null,// 正在操作的row，用于删除后刷新 controlRowTemp: null, // 正在操作的row，用于删除后刷新
outsourcedList: [],// 重点工程 outsourcedList: [], // 重点工程
add: true, add: true,
del: true, del: true,
edit: true, edit: true,
@ -783,15 +783,15 @@ export default {
this.$parent.OUTSOURCED_ID = '' this.$parent.OUTSOURCED_ID = ''
}, },
// 获取重点工程列表 // 获取重点工程列表
async getOutsourced (row){ async getOutsourced(row) {
this.listLoading = true this.listLoading = true
this.outsourcedListVisible = true this.outsourcedListVisible = true
this.controlRowTemp = row this.controlRowTemp = row
this.outsourcedList = [] this.outsourcedList = []
requestFN( 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) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -799,7 +799,6 @@ export default {
}).catch((e) => { }).catch((e) => {
this.listLoading = false this.listLoading = false
}) })
}, },
async untie(id) { async untie(id) {
this.$confirm('确定要删除吗?', { this.$confirm('确定要删除吗?', {
@ -826,7 +825,7 @@ export default {
}) })
}).catch(() => { }).catch(() => {
}) })
}, }
} }
} }

2
src/views/map/index.vue
View File

@ -2356,7 +2356,7 @@ export default {
_this.onePerLocArr[index].x = x _this.onePerLocArr[index].x = x
_this.onePerLocArr[index].y = y _this.onePerLocArr[index].y = y
_this.onePerLocArr[index].icon_type = 'img4_0' + pointColor _this.onePerLocArr[index].icon_type = 'img4_0' + pointColor
ry_drag.getPosition(this.onePerLocArr[index]) ry_drag.getPosition(_this.onePerLocArr[index])
} else { } else {
const perLoc = { const perLoc = {
id: item.id, id: item.id,