diff --git a/src/stores/monitoringPoint.ts b/src/stores/monitoringPoint.ts index 9ef8069d..cd9605bd 100644 --- a/src/stores/monitoringPoint.ts +++ b/src/stores/monitoringPoint.ts @@ -25,14 +25,10 @@ export const useMonitoringPoint = defineStore( val: any ) => { state[key] = val - } const setShowCheckBox = (val: boolean) => { if (val && state.lineIds.length === 0) { state.lineIds = [state.lineId] - // console.log('====================================') - // console.log(state.lineIds) - // console.log('====================================') } state.showCheckBox = val } diff --git a/src/views/pqs/database/algorithm/list.vue b/src/views/pqs/database/algorithm/list.vue index cb55aa4e..8001a067 100644 --- a/src/views/pqs/database/algorithm/list.vue +++ b/src/views/pqs/database/algorithm/list.vue @@ -20,7 +20,7 @@ -
+
新增 修改 删除 diff --git a/src/views/pqs/database/stencil/components/form.vue b/src/views/pqs/database/stencil/components/form.vue index 40a43edf..4d899e0b 100644 --- a/src/views/pqs/database/stencil/components/form.vue +++ b/src/views/pqs/database/stencil/components/form.vue @@ -91,8 +91,10 @@ const submit = () => { formRef.value.validate(async (valid: boolean) => { if (valid) { if (urlList.value.length > 0) { + const promises = urlList.value.map(async (item: any) => { if (urlList.value[0].raw) { + return new Promise((resolve, reject) => { uploadFile(item.raw, '/supervision/') .then((res: any) => { diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/index.vue index 6624b29f..31cda8fa 100644 --- a/src/views/pqs/voltageSags/monitoringPoint/online/index.vue +++ b/src/views/pqs/voltageSags/monitoringPoint/online/index.vue @@ -46,7 +46,7 @@ watch( if (!newLineId) return // 在这里处理 lineId 的变化 - + console.log('newLineId') monitoringPoint.setValue('lineId', router.currentRoute.value.query.lineId) monitoringPoint.setValue('lineName', router.currentRoute.value.query.lineName) setTimeout(() => { diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue b/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue index 68b8c145..83122b23 100644 --- a/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue +++ b/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue @@ -75,6 +75,7 @@ onMounted(() => { }) const handleNodeClick = (data: any, node: any) => { if (data.level === 6) { + monitoringPoint.setValue('lineId', data.id) monitoringPoint.setValue('pid', data.pids) monitoringPoint.setValue('lineName', data.alias) diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue index 144b83ce..f6ec71a3 100644 --- a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue +++ b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue @@ -71,10 +71,8 @@ const handleNodeClick = (data: any, node: any) => { if (window.localStorage.getItem('BMAP_SECKEY') == null) { flag.value = false } - monitoringPoint.setValue('lineId', data.id) monitoringPoint.setValue('lineName', data.alias) - } setTimeout(() => { flag.value = true diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue index a8587fbe..5911fdbb 100644 --- a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue +++ b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue @@ -246,12 +246,14 @@ const handler = async ({ BMap, map }: any) => { () => monitoringPoint.state.lineId, (newLineId, oldLineId) => { let value = areaLineInfo.value.find((item: any) => item.lineId == newLineId) + if (value == undefined) return center.value.lng = value.lng center.value.lat = value.lat + 0.01 infoWindowPoint.value = value infoWindowPoint.value.show = true + monitoringPoint.setValue( 'lineName', value.manufacturer + '>' + value.gdName + '>' + value.subName + '>' + value.lineName