diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue index f6ebe22e..e11fb4c5 100644 --- a/src/components/PreviewFile/index.vue +++ b/src/components/PreviewFile/index.vue @@ -1,13 +1,11 @@ diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue index 46a451e3..a73bd4c6 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue @@ -68,6 +68,7 @@ const open = (row: any) => { dialogVisible.value = true list.value = JSON.parse(JSON.stringify(row.row)) getFileNameAndFilePath({ filePath: row.row.reportPath }).then(res => { + list.value.keyName = res.data.name list.value.reportPath = res.data.url list.value.reportName = res.data.fileName }) diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue index f9f37671..0afb5ca8 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue @@ -130,6 +130,7 @@ const submit = () => { const open = (row: any) => { dialogVisible.value = true + resetForm() List.value = row.row title.value = row.text diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue index 8c5982aa..c0403041 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue @@ -47,7 +47,7 @@ > --> - + diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue index edd0e874..a3488af3 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue @@ -300,6 +300,7 @@ const tableStore = new TableStore({ list.value.lineType = tableStore.table.params.lineType list.value.alarmThreshold = tableStore.table.params.alarmThreshold flag.value = level.value + console.log('flag',flag.value) flagTime.value = tableStore.table.params.dataType == 0 ? true : false }, loadCallback: () => { diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue index bd62c637..1239b93b 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue @@ -234,7 +234,7 @@ - + @@ -249,7 +249,7 @@ detailData.userType == 5 " > - + @@ -257,7 +257,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -294,14 +294,14 @@ label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1" > - + {{ proviteData?.substationMainWiringDiagram?.name }} - + @@ -310,7 +310,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -329,7 +329,7 @@ label="其他附件" v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url" > - + @@ -339,7 +339,7 @@
- + @@ -349,7 +349,7 @@ - + @@ -367,7 +367,7 @@
- + @@ -377,7 +377,7 @@
- + @@ -387,7 +387,7 @@ - + @@ -396,7 +396,7 @@ - + @@ -404,7 +404,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -429,7 +429,7 @@ - + @@ -437,7 +437,7 @@ - + @@ -462,7 +462,7 @@ import { getByDeptDevLine } from '@/api/supervision-boot/interfere/index' import { addOrUpdateFile, getFileById } from '@/api/supervision-boot/interfere/index' import {download} from '@/utils/fileDownLoad' defineOptions({ name: 'BpmUserReportDetail' }) - +const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei' const { query } = useRoute() // 查询参数 const props = defineProps({ diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue index d522350a..73291214 100644 --- a/src/views/pqs/supervise/technology/components/alarm.vue +++ b/src/views/pqs/supervise/technology/components/alarm.vue @@ -65,6 +65,7 @@ const tableRef = ref() const dialogVisible = ref(false) const detailId = ref('') const TableHeaderRef = ref() +const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei' const tableStore = new TableStore({ url: '/supervision-boot/warningLeaflet/alarmPageData', publicHeight: 65, @@ -232,7 +233,12 @@ const tableStore = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', disabled: row => { - return !(row.problemType == 2 || row.problemType == 4) + if (VITE_FLAG) { + return !(row.problemType == 2 || row.problemType == 4) + } + return true; + + }, click: row => { if (row.problemType == 2) { diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue index c761e7f5..13522703 100644 --- a/src/views/pqs/supervise/technology/components/earlyWarn.vue +++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue @@ -1,5 +1,17 @@