Web/admin-sjzx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改海南测试问题

Browse Source
This commit is contained in:
GGJ
2024-12-05 09:04:07 +08:00
parent 6dbc09ef8d
commit 9c627a5f81
21 changed files with 936 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/img/DTJ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 633 B

BIN
src/assets/img/SHBTG.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 611 B

BIN
src/assets/img/SHTG.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 579 B

BIN
src/assets/img/SPZ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 598 B

BIN
src/assets/img/YQX.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 830 B

BIN
src/assets/img/ZS.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 478 B

BIN
src/assets/imgs/t_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 506 B

BIN
src/assets/imgs/t_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 472 B

BIN
src/assets/imgs/t_7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 290 B

2
src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue
View File

@@ -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

6
src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
View File

@@ -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})
}
}
})

1348
src/views/pqs/supervise/home/index.vue
View File

File diff suppressed because it is too large Load Diff

12
src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
View File

@@ -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 {

4
src/views/pqs/supervise/technology/feedbackPopup.vue
View File

@@ -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 })
}
}
})

6
src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
View File

@@ -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('表单验证失败')

8
src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
View File

@@ -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('表单验证失败')

10
src/views/system/bpm/task/done/index.vue
View File

@@ -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)

14
src/views/system/bpm/task/index.vue
View File

@@ -2,13 +2,13 @@
<div class='default-main'>
<el-tabs v-model='activeName' type='border-card'>
<el-tab-pane label='待办任务' name='1'>
<TodoTask v-if="activeName == '1'" />
<TodoTask v-if="activeName == '1'" :height="height"/>
</el-tab-pane>
<el-tab-pane label='已办任务' name='2'>
<DoneTask v-if="activeName == '2'" />
<DoneTask v-if="activeName == '2'" :height="height"/>
</el-tab-pane>
<el-tab-pane label='我发起的' name='3'>
<MyInstance v-if="activeName == '3'" />
<MyInstance v-if="activeName == '3'" :height="height"/>
</el-tab-pane>
<!-- <el-tab-pane label='预告警单任务' name='4'>-->
<!-- <AlarmTask v-if="activeName == '4'" />-->
@@ -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;
}
</style>

21
src/views/system/bpm/task/myInstance/index.vue
View File

@@ -4,7 +4,8 @@
<TableHeader date-picker theCurrentTime>
<template v-slot:select>
<el-form-item label="任务名称">
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" clearable maxlength="32" show-word-limit></el-input>
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" clearable
maxlength="32" show-word-limit></el-input>
</el-form-item>
</template>
</TableHeader>
@@ -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)

34
src/views/system/bpm/task/todo/index.vue
View File

@@ -1,16 +1,17 @@
<!--待办事项列表-->
<template>
<div>
<TableHeader>
<template v-slot:select>
<el-form-item label='任务名称'>
<el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' clearable maxlength="32" show-word-limit></el-input>
</el-form-item>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
</div>
<div>
<TableHeader>
<template v-slot:select>
<el-form-item label='任务名称'>
<el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' clearable
maxlength="32" show-word-limit></el-input>
</el-form-item>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
</div>
</template>
<script setup lang="ts">
@@ -21,6 +22,10 @@ import { onMounted, provide, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import { getById } from '@/api/supervision-boot/leaflet'
import { getRunningDeviceById } from '@/api/supervision-boot/device/quitRunningDev'
const props = defineProps({
height: [String, Number],
})
const router = useRouter() // 路由对象
defineOptions({
@@ -215,6 +220,7 @@ const tableStore = new TableStore({
}
],
beforeSearchFun: () => {
for (let key in tableStore.table.params) {
if (tableStore.table.params[key] === '' && key != 'searchValue') {
delete tableStore.table.params[key]
@@ -222,6 +228,7 @@ const tableStore = new TableStore({
}
},
loadCallback: () => {
if (tableStore.table.params.searchValue) {
const searchProps = ['taskName', 'taskContent', 'startUser', 'taskCreateTime']
const rest = tableStore.table.data.filter(item =>
@@ -245,6 +252,11 @@ provide('tableStore', tableStore)
onMounted(() => {
// 加载数据
tableStore.index()
setTimeout(() => {
if (props.height) {
tableStore.table.height = props.height
}
}, 0)
})
/** 处理审批按钮 */
const handleAudit = (instanceId: string, historyInstanceId: string) => {