diff --git a/dist.zip b/dist.zip new file mode 100644 index 00000000..c7ab303e Binary files /dev/null and b/dist.zip differ diff --git a/src/assets/img/DTJ.png b/src/assets/img/DTJ.png new file mode 100644 index 00000000..df5aef23 Binary files /dev/null and b/src/assets/img/DTJ.png differ diff --git a/src/assets/img/SHBTG.png b/src/assets/img/SHBTG.png new file mode 100644 index 00000000..a71bc8af Binary files /dev/null and b/src/assets/img/SHBTG.png differ diff --git a/src/assets/img/SHTG.png b/src/assets/img/SHTG.png new file mode 100644 index 00000000..70d967e0 Binary files /dev/null and b/src/assets/img/SHTG.png differ diff --git a/src/assets/img/SPZ.png b/src/assets/img/SPZ.png new file mode 100644 index 00000000..35d987e3 Binary files /dev/null and b/src/assets/img/SPZ.png differ diff --git a/src/assets/img/YQX.png b/src/assets/img/YQX.png new file mode 100644 index 00000000..22c9408d Binary files /dev/null and b/src/assets/img/YQX.png differ diff --git a/src/assets/img/ZS.png b/src/assets/img/ZS.png new file mode 100644 index 00000000..77b0f1f1 Binary files /dev/null and b/src/assets/img/ZS.png differ diff --git a/src/assets/imgs/t_1.png b/src/assets/imgs/t_1.png new file mode 100644 index 00000000..5991231a Binary files /dev/null and b/src/assets/imgs/t_1.png differ diff --git a/src/assets/imgs/t_3.png b/src/assets/imgs/t_3.png new file mode 100644 index 00000000..036700df Binary files /dev/null and b/src/assets/imgs/t_3.png differ diff --git a/src/assets/imgs/t_7.png b/src/assets/imgs/t_7.png new file mode 100644 index 00000000..118b49d3 Binary files /dev/null and b/src/assets/imgs/t_7.png differ diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue index 1d704ae1..dfb73cae 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue @@ -102,7 +102,7 @@ const rules = { } const formRef = ref() const submit = () => { - console.log('🚀 ~ open ~ form.value:', form.value) + formRef.value.validate(valid => { if (valid) { loading.value = true diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue index ab364627..4a1cc190 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue @@ -246,7 +246,7 @@ const submitFn = async (flag: boolean) => { cancelFn() ElMessage.success('保存成功！') emit('onsubmit') - }) + }).catch(() => { loading.value = false}) } else { formRef.value.validate(async (valid: any) => { if (valid) { @@ -261,13 +261,13 @@ const submitFn = async (flag: boolean) => { cancelFn() ElMessage.success('计划新增成功！') emit('onsubmit') - }) + }).catch(() => { loading.value = false}) } else { await updateSurveyPlan(addForm).then(res => { cancelFn() ElMessage.success('重新发起成功！') emit('onsubmit') - }) + }).catch(() => { loading.value = false}) } } }) diff --git a/src/views/pqs/supervise/home/index.vue b/src/views/pqs/supervise/home/index.vue index 08899711..8773449c 100644 --- a/src/views/pqs/supervise/home/index.vue +++ b/src/views/pqs/supervise/home/index.vue @@ -1,502 +1,876 @@ - + diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue index f6a89512..1c0e296e 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue @@ -1050,7 +1050,7 @@ const confirmForm = async (flag: boolean) => { addUploadRef.value?.submitForm(res.data) resetForm() close() - }) + }).catch(() => { loading.value = false}) } else { await submitFormData(confirmFormData).then(res => { ElMessage({ @@ -1061,7 +1061,7 @@ const confirmForm = async (flag: boolean) => { addUploadRef.value?.submitForm(res.data) resetForm() close() - }) + }).catch(() => { loading.value = false}) } } else { await ruleFormRef.value.validate( async (valid: any) => { @@ -1202,7 +1202,7 @@ const confirmForm = async (flag: boolean) => { addUploadRef.value?.submitForm(res.data) resetForm() close() - }) + }).catch(() => { loading.value = false}) } else { confirmFormData.id = resendId.value if (controFlag.value) confirmFormData.dataType = 1 @@ -1219,7 +1219,7 @@ const confirmForm = async (flag: boolean) => { addUploadRef.value?.submitForm(res.data) resetForm() close() - }) + }).catch(() => { loading.value = false}) } else { await resend(confirmFormData).then(res => { ElMessage({ @@ -1229,7 +1229,7 @@ const confirmForm = async (flag: boolean) => { ruleFormRef.value.resetFields() resetForm() close() - }) + }).catch(() => { loading.value = false}) } } else { await updateFormData(confirmFormData).then(res => { @@ -1241,7 +1241,7 @@ const confirmForm = async (flag: boolean) => { ruleFormRef.value.resetFields() resetForm() close() - }) + }).catch(() => { loading.value = false}) } } } else { diff --git a/src/views/pqs/supervise/technology/feedbackPopup.vue b/src/views/pqs/supervise/technology/feedbackPopup.vue index 4e27281c..6832bb3b 100644 --- a/src/views/pqs/supervise/technology/feedbackPopup.vue +++ b/src/views/pqs/supervise/technology/feedbackPopup.vue @@ -219,7 +219,7 @@ const submit = async (flag: boolean) => { ElMessage.success('重新发起成功') tableStore.index() dialogVisible.value = false - }) + }).catch(() => { loading.value = false }) } else { //此时该告警单处于待反馈状态 await addFeedback(subForm).then(res => { @@ -227,7 +227,7 @@ const submit = async (flag: boolean) => { ElMessage.success('申请成功') tableStore.index() dialogVisible.value = false - }) + }).catch(() => { loading.value = false }) } } }) diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index 6fb4594a..dfd12f16 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -954,7 +954,7 @@ const confirmForm = async (flag: boolean) => { ruleFormRef.value.resetFields() resetForm() close() - }) + }).catch(() => { loading.value = false}) } else { // 先判断提交终端信息与监测点信息 // 提交监测点信息 @@ -994,7 +994,7 @@ const confirmForm = async (flag: boolean) => { ruleFormRef.value.resetFields() resetForm() close() - }) + }).catch(() => { loading.value = false}) } else { confirmFormData.id = resendId.value await updateMointorPointFormData(confirmFormData).then(res => { @@ -1007,7 +1007,7 @@ const confirmForm = async (flag: boolean) => { resetForm() close() } - }) + }).catch(() => { loading.value = false}) } } else { // // console.log('表单验证失败') diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue index 9955d981..09bb2af7 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue @@ -1167,7 +1167,7 @@ const disabledDate = time => { const importType = ref(null) const resendId = ref('') const open = async (row: any) => { - console.log('🚀 ~ open ~ row:', row.row) + let flag = row.row ? true : false importType.value = null if (!flag) await getPowerCompanyList(false) @@ -1273,7 +1273,7 @@ const confirmForm = async (flag: boolean) => { resetForm() close() } - }) + }).catch(() => { loading.value = false}) } else { // 提交终端信息 ruleFormRef.value.validate(async (valid) => { @@ -1311,7 +1311,7 @@ const confirmForm = async (flag: boolean) => { resetForm() close() } - }) + }).catch(() => { loading.value = false}) } else { confirmFormData.reporter = adminInfo.$state.id confirmFormData.orgId = adminInfo.$state.deptId @@ -1328,7 +1328,7 @@ const confirmForm = async (flag: boolean) => { resetForm() close() } - }) + }).catch(() => { loading.value = false}) } } else { console.log('表单验证失败') diff --git a/src/views/system/bpm/task/done/index.vue b/src/views/system/bpm/task/done/index.vue index 15544516..daed09ae 100644 --- a/src/views/system/bpm/task/done/index.vue +++ b/src/views/system/bpm/task/done/index.vue @@ -24,7 +24,10 @@ import { dateFormatter, formatPast2 } from '@/utils/formatTime' defineOptions({ name: 'businessUser' }) - +const props = defineProps({ + height: [String, Number] , + +}) const { push, options, currentRoute } = useRouter() const flag = ref(false) const tableStore = new TableStore({ @@ -106,6 +109,11 @@ const tableStore = new TableStore({ onMounted(() => { // 加载数据 tableStore.index() + setTimeout(() => { + if (props.height) { + tableStore.table.height = props.height + } + },0) }) tableStore.table.params.searchValue = '' provide('tableStore', tableStore) diff --git a/src/views/system/bpm/task/index.vue b/src/views/system/bpm/task/index.vue index 29825594..7d6e9ce8 100644 --- a/src/views/system/bpm/task/index.vue +++ b/src/views/system/bpm/task/index.vue @@ -2,13 +2,13 @@
- + - + - + @@ -24,7 +24,11 @@ import DoneTask from './done/index.vue' import MyInstance from './myInstance/index.vue' import AlarmTask from './alarmTask/index.vue' import { mainHeight } from '@/utils/layout' - +const props = defineProps({ + height: [String, Number] , + +}) +console.log("🚀 ~ height:", props.height) defineOptions({ name: 'bpm/task' }) @@ -40,7 +44,7 @@ const layout = mainHeight(63) as any } :deep(.el-tabs__content) { - height: v-bind('layout.height'); + // height: v-bind('layout.height'); overflow-y: auto; } diff --git a/src/views/system/bpm/task/myInstance/index.vue b/src/views/system/bpm/task/myInstance/index.vue index c1b91a8b..85953154 100644 --- a/src/views/system/bpm/task/myInstance/index.vue +++ b/src/views/system/bpm/task/myInstance/index.vue @@ -4,7 +4,8 @@ @@ -23,7 +24,10 @@ import { useRouter } from 'vue-router' import { useDictData } from '@/stores/dictData' const dictData = useDictData() const categoryOptionList = dictData.getBasicData('flow_category') +const props = defineProps({ + height: [String, Number], +}) defineOptions({ name: 'businessUser' }) @@ -120,17 +124,22 @@ const tableStore = new TableStore({ } ], beforeSearchFun: () => { - for (let key in tableStore.table.params) { - if (tableStore.table.params[key] === '') { - delete tableStore.table.params[key] - } - } + // for (let key in tableStore.table.params) { + // if (tableStore.table.params[key] === '') { + // delete tableStore.table.params[key] + // } + // } } }) onMounted(() => { // 加载数据 tableStore.index() + setTimeout(() => { + if (props.height) { + tableStore.table.height = props.height + } + }, 0) }) tableStore.table.params.searchValue = '' provide('tableStore', tableStore) diff --git a/src/views/system/bpm/task/todo/index.vue b/src/views/system/bpm/task/todo/index.vue index 92122e0c..5c700754 100644 --- a/src/views/system/bpm/task/todo/index.vue +++ b/src/views/system/bpm/task/todo/index.vue @@ -1,16 +1,17 @@