更新代码0122
This commit is contained in:
parent
bfe7d0832e
commit
250c5e379d
|
|
@ -1735,7 +1735,7 @@ export default {
|
||||||
iotDBRInfo: {},
|
iotDBRInfo: {},
|
||||||
nowTime: '',
|
nowTime: '',
|
||||||
searchForm: {
|
searchForm: {
|
||||||
area: '2',
|
area: '1',
|
||||||
editable: '2',
|
editable: '2',
|
||||||
},
|
},
|
||||||
treeData: [],
|
treeData: [],
|
||||||
|
|
@ -3037,29 +3037,29 @@ const deviceTypeList = ["11","13","14","19"]
|
||||||
},
|
},
|
||||||
warnPlanClick(row) {
|
warnPlanClick(row) {
|
||||||
var that = this
|
var that = this
|
||||||
if (that.statusTimer) {
|
// if (that.statusTimer) {
|
||||||
clearTimeout(that.statusTimer)
|
// clearTimeout(that.statusTimer)
|
||||||
that.statusTimer = null
|
// that.statusTimer = null
|
||||||
}
|
// }
|
||||||
|
|
||||||
that.dataForm = {}
|
// that.dataForm = {}
|
||||||
that.planLoading = false
|
that.planLoading = false
|
||||||
that.planSuccess = false
|
that.planSuccess = false
|
||||||
that.warnDetailShow = true
|
that.warnDetailShow = true
|
||||||
that.planDetailMap = {
|
// that.planDetailMap = {
|
||||||
11: [],
|
// 11: [],
|
||||||
13: [],
|
// 13: [],
|
||||||
14: [],
|
// 14: [],
|
||||||
// 15: [],
|
// // 15: [],
|
||||||
19: [],
|
// 19: [],
|
||||||
}
|
// }
|
||||||
that.planForm = JSON.parse(JSON.stringify(row))
|
that.planForm = JSON.parse(JSON.stringify(row))
|
||||||
console.log("that.planForm",that.planForm)
|
console.log("that.planForm",that.planForm)
|
||||||
that.deviceIds = []
|
that.deviceIds = []
|
||||||
that.deviceIds15 = []
|
that.deviceIds15 = []
|
||||||
that.templateObj = ''
|
// that.templateObj = ''
|
||||||
that.mediaObj = null
|
// that.mediaObj = null
|
||||||
that.listMedia = []
|
// that.listMedia = []
|
||||||
|
|
||||||
deviceList1(
|
deviceList1(
|
||||||
{ area: that.searchForm.area, editable: '2',}
|
{ area: that.searchForm.area, editable: '2',}
|
||||||
|
|
@ -3068,13 +3068,13 @@ const deviceTypeList = ["11","13","14","19"]
|
||||||
if (res.status == 200) {
|
if (res.status == 200) {
|
||||||
// if (res.data.retCode == 0) {
|
// if (res.data.retCode == 0) {
|
||||||
|
|
||||||
that.planDetailMap = {
|
// that.planDetailMap = {
|
||||||
11: [],
|
// 11: [],
|
||||||
13: [],
|
// 13: [],
|
||||||
14: [],
|
// 14: [],
|
||||||
// 15: [],
|
//
|
||||||
19: [],
|
// 19: [],
|
||||||
}
|
// }
|
||||||
var km1 = that.planForm.PILENUMSHOW.replace('K', '').replace('+', '.')
|
var km1 = that.planForm.PILENUMSHOW.replace('K', '').replace('+', '.')
|
||||||
res.data.data.forEach((item) => {
|
res.data.data.forEach((item) => {
|
||||||
const deviceType = item.deviceType;
|
const deviceType = item.deviceType;
|
||||||
|
|
@ -3125,30 +3125,54 @@ const deviceTypeList = ["11","13","14","19"]
|
||||||
}
|
}
|
||||||
// console.log(" obj", obj)
|
// console.log(" obj", obj)
|
||||||
that.planDetailMap[deviceType].push(obj)
|
that.planDetailMap[deviceType].push(obj)
|
||||||
that.deviceIds.push(item.deviceId)
|
// that.deviceIds.push(item.deviceId)
|
||||||
/*that.planDetailData.push({
|
/*that.planDetailData.push({
|
||||||
type:item.deviceType,
|
type:item.deviceType,
|
||||||
data:p[key]
|
data:p[key]
|
||||||
})*/
|
})*/
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
// console.log(`设备类型 ${deviceType} 不在处理范围内`);
|
// console.log(`设备类型 ${deviceType} 不在处理范围内`);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
// that.loadinfoBoardTemplate(2)
|
// that.loadinfoBoardTemplate(2)
|
||||||
// console.log("that.planDetailMap",that.planDetailMap)
|
// console.log("that.planDetailMap",that.planDetailMap)
|
||||||
setTimeout(() => {
|
that.loadWarnMarker(that.warnMap[that.searchForm.area])
|
||||||
|
if (!that.main2DShow) {
|
||||||
|
that.main2DShow = true
|
||||||
|
that.deviceClose()
|
||||||
|
}
|
||||||
|
var form = that.pileNumMap[that.searchForm.area]
|
||||||
|
var km1 = form.left.replace('K', '').replace('+', '.')
|
||||||
|
var km2 = form.right.replace('K', '').replace('+', '.')
|
||||||
|
console.log('form', form)
|
||||||
|
var num = that.pileNumMap[that.searchForm.area].n
|
||||||
|
var average = (Number(km2) - Number(km1)) / num
|
||||||
|
that.pileNumList = []
|
||||||
|
for (var i = 0; i < num; i++) {
|
||||||
|
let a = (Number(km1) + i * average).toFixed(3)
|
||||||
|
that.pileNumList.push('K' + a.replace('.', '+'))
|
||||||
|
}
|
||||||
|
that.pileNumList.push(form.right)
|
||||||
|
/*var a = (Number(km1) + average).toFixed(3)
|
||||||
|
that.pileNumList = [form.left,'K'+a.replace(".", "+"),form.right]*/
|
||||||
|
console.log('that.pileNumList', that.pileNumList)
|
||||||
|
that.scale = (form.width - 304) / 1000 / (Number(km2) - Number(km1))
|
||||||
|
that.loadTable()
|
||||||
|
} else {
|
||||||
|
that.$message.warning(res.data.message)
|
||||||
|
}
|
||||||
|
// setTimeout(() => {
|
||||||
// if (that.warnList.length > 0) {
|
// if (that.warnList.length > 0) {
|
||||||
// that.warnShow = true
|
// that.warnShow = true
|
||||||
// } else {
|
// } else {
|
||||||
// that.warnShow = false
|
// that.warnShow = false
|
||||||
// }
|
// }
|
||||||
that.tunnelClick(this.searchForm.area)
|
|
||||||
}, 400)
|
// }, 400)
|
||||||
} else {
|
|
||||||
that.$message.warning(res.data.message)
|
|
||||||
}
|
|
||||||
// }
|
// }
|
||||||
})
|
})
|
||||||
|
|
||||||
// 预案处置中广播的下拉列表暂时屏蔽
|
// 预案处置中广播的下拉列表暂时屏蔽
|
||||||
// getMediaList().then((res) => {
|
// getMediaList().then((res) => {
|
||||||
// if (res.status == 200) {
|
// if (res.status == 200) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue