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

谐波普测-普测计划新增&终端退运-历史记录

Browse Source
This commit is contained in:
zhujiyan
2024-06-03 09:17:00 +08:00
parent c7025c615f
commit d9f02ef5ff
15 changed files with 1009 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,47 +1,62 @@
<template>
<el-dialog draggable :title="title" v-model="planAddition" width="65%" :before-close="cancelFn">
<el-form
:model="formdata"
ref="formRef"
:rules="rules"
label-width="auto"
class="form-two"
>
<el-form-item for="-" label="普测负责单位:">
<Area v-model="formdata.orgNo" />
<el-dialog draggable :title="title" v-model="planAddition" width="500px" :before-close="cancelFn">
<el-form :model="form" ref="formRef" :rules="rules" label-width="auto" scroll-to-error :validate-on-rule-change="false" class="form-one">
<el-form-item for="-" label="普测负责单位:">
<Area v-model="form.deptId" />
</el-form-item>
<el-form-item for="-" label="计划名称:" prop="planName">
<el-input v-model="formdata.planName" placeholder="请输入计划名称"></el-input>
<el-form-item for="-" label="计划名称:" prop="planName">
<el-input v-model="form.planName" placeholder="请输入计划名称"></el-input>
</el-form-item>
<el-form-item for="-" label="计划开始时间:" prop="planStartTime">
<el-form-item for="-" label="计划开始时间:" prop="planStartTime">
<el-date-picker
v-model="formdata.planStartTime"
v-model="form.planStartTime"
type="date"
placeholder="选择计划开始时间"
value-format="YYYY-MM-DD"
></el-date-picker>
</el-form-item>
<el-form-item for="-" label="计划结束时间:" prop="planEndTime">
<el-form-item for="-" label="计划结束时间:" prop="planEndTime">
<el-date-picker
v-model="formdata.planEndTime"
v-model="form.planEndTime"
type="date"
placeholder="选择计划结束时间"
value-format="YYYY-MM-DD"
></el-date-picker>
</el-form-item>
<el-form-item for="-" label="实际完成时间:" prop="planComplateTime">
<!-- <el-form-item for="-" label="实际完成时间:" prop="planComplateTime">
<el-date-picker
v-model="formdata.planComplateTime"
v-model="form.planComplateTime"
type="date"
placeholder="选择实际完成时间"
value-format="YYYY-MM-DD"
></el-date-picker>
</el-form-item> -->
<!-- <el-form-item for="-" label="测试负责人:" prop="leader">
<el-input v-model="form.leader" placeholder="请输入测试负责人"></el-input>
</el-form-item> -->
<el-form-item for="-" label="系统电站：" prop="customSubstationFlag">
<!-- 默认值 开启 -->
<el-radio-group v-model="form.customSubstationFlag" @change="changeSubstationFlag">
<el-radio value="0">是</el-radio>
<el-radio value="1">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item for="-" label="测试负责人:" prop="leader">
<el-input v-model="formdata.leader" placeholder="请输入测试负责人"></el-input>
</el-form-item>
<el-form-item for="-" label="关联电站:" prop="subIds" style="display: flex;align-items: center;">
<el-cascader v-model="formdata.subIds" :options="treeList" :props="defaultProps" clearable filterable />
<el-form-item
for="-"
label="关联电站:"
v-if="form.customSubstationFlag == '0'"
prop="substation"
style="display: flex; align-items: center"
>
<el-cascader
v-model="form.substation"
:options="treeList"
:props="defaultProps"
clearable
filterable
collapse-tags
placeholder="请选择关联电站"
/>
<!-- <el-tree-select
accordion
ref="treeRef"
@@ -52,15 +67,18 @@
readonly
node-key="id"
:props="defaultProps"
v-model="formdata.subIds"
v-model="form.substation"
:data="treeList"
:render-after-expand="false"
/> -->
</el-form-item>
<!-- <el-form :model="formdata" label-width="auto"> -->
<el-form-item for="-" class="uploadFile" label="普测报告:" prop="fileList">
<el-form-item for="-" label="关联电站:" v-if="form.customSubstationFlag == '1'" prop="substation">
<el-input v-model="form.substation" placeholder="请输入关联电站"></el-input>
</el-form-item>
<!-- <el-form :model="form" label-width="auto"> -->
<!-- <el-form-item for="-" class="uploadFile" label="普测报告:" prop="fileList">
<el-upload
v-model:file-list="formdata.fileList"
v-model:file-list="form.fileList"
ref="upload"
action=""
:limit="5"
@@ -72,7 +90,7 @@
<el-button type="primary">上传文件</el-button>
</template>
</el-upload>
</el-form-item>
</el-form-item> -->
<!-- </el-form> -->
</el-form>
<!-- <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">添加电站</el-divider> -->
@@ -80,7 +98,7 @@
<!-- <div
v-if="
(title == '查看计划' || title == '计划审核') &&
(title == '计划审核' || formdata.status == 1 || formdata.status == 3 || formdata.status == 4)
(title == '计划审核' || form.status == 1 || form.status == 3 || form.status == 4)
"
>
<el-divider content-position="left" style="font-size: 18px; font-weight: bolder">审核意见</el-divider>
@@ -88,7 +106,7 @@
:disabled="title != '计划审核'"
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
v-model="formdata.checkComment"
v-model="form.checkComment"
></el-input>
</div> -->
<template #footer v-if="title != '查看计划'">
@@ -102,7 +120,7 @@
<script setup lang="ts">
import generalTestTree from '@/components/tree/pqs/generalTestTree.vue'
import { ref, reactive, nextTick } from 'vue'
import { addSurvey, auditSurvey } from '@/api/process-boot/generalTest'
import { addSurvey, auditSurvey, addSurveyPlan } from '@/api/process-boot/generalTest'
import Area from '@/components/form/area/index.vue'
import { ElMessage, UploadProps } from 'element-plus'
import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file'
@@ -118,34 +136,52 @@ const defaultProps = ref({
checkStrictly: true,
emitPath: false,
expandTrigger: 'hover' as const,
multiple: true
})
const formdata: any = ref({
orgName: '',
orgNo: dictData.state.area[0].id,
const obj = {
customSubstationFlag: '0',
deptId: '0d52f9f6e43ec0ee83013cd32da93f66',
planEndTime: '2024-05-31',
planName: '5.31计划',
planStartTime: '2024-05-01',
substation: '3c175083dbc1e870365dd12d79c837ec,5487bd33c24007aad7af4882b455203b'
}
const form: any = ref({
// orgName: '',
deptId: dictData.state.area[0].id,
planStartTime: '',
planEndTime: '',
planName: '',
rgeneralSurveyPlanDetailAddParm: [],
subCount: '',
busCount: '',
subIds: '',
fileList: [],
checkComment: '',
filePath: ''
// fileList: [],
// checkComment: '',
// filePath: '',
substation: '', //关联电站
customSubstationFlag: '0' //电站类型
})
const props = {
expandTrigger: 'hover' as const
}
const formRef = ref()
const treeRef = ref()
const rules = {
const rules = ref({
planStartTime: [{ required: true, message: '选择计划开始时间', trigger: 'change' }],
planEndTime: [{ required: true, message: '选择计划结束时间', trigger: 'change' }],
planComplateTime: [{ required: true, message: '选择实际完成时间 ', trigger: 'change' }],
planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
leader: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
subIds: [{ required: true, message: '请选择关联电站', trigger: 'change' }],
fileList: [{ required: true, message: '请上传文件', trigger: 'change' }]
substation: [{ required: true, message: '请选择关联电站', trigger: 'change' }]
// fileList: [{ required: true, message: '请上传文件', trigger: 'change' }],
})
const changeSubstationFlag = () => {
console.log(form.value.customSubstationFlag)
//处理所属变电站手都输入1/下拉数据0
if (form.value.customSubstationFlag == '0') {
rules.value.substation[0].message = '请选择关联电站'
form.value.substation = ''
} else {
rules.value.substation[0].message = '请输入关联电站'
form.value.substation = []
}
}
const cancelFn = () => {
formRef.value.resetFields()
@@ -159,42 +195,54 @@ const loadData = () => {
console.log(treeList.value)
})
}
loadData()
// 提交
const submitFn = () => {
formRef.value.validate(async (valid: any) => {
if (valid) {
let filePath = ''
// formdata.value.subIds = treeRef.value.treeRef.getCheckedKeys(false)
formdata.value.subIds= typeof(formdata.value.subIds)=='string'?[formdata.value.subIds]:formdata.value.subIds
if (formdata.value.fileList.length == 0) {
audit(filePath)
} else {
for (let i = 0; i < formdata.value.fileList.length; i++) {
if (formdata.value.fileList[i].raw) {
await uploadFile(formdata.value.fileList[i].raw, 'supervision/').then(res => {
filePath = filePath + res.data.name + ','
})
} else {
filePath = filePath + formdata.value.fileList[i].supervision + ','
}
if (i == formdata.value.fileList.length - 1) {
audit(filePath)
}
}
}
audit(filePath)
// form.value.substation = treeRef.value.treeRef.getCheckedKeys(false)
// form.value.substation = typeof form.value.substation == 'string' ? [form.value.substation] : form.value.substation
// if (form.value.fileList.length == 0) {
// audit(filePath)
// } else {
// for (let i = 0; i < form.value.fileList.length; i++) {
// if (form.value.fileList[i].raw) {
// await uploadFile(form.value.fileList[i].raw, 'supervision/').then(res => {
// filePath = filePath + res.data.name + ','
// })
// } else {
// filePath = filePath + form.value.fileList[i].supervision + ','
// }
// if (i == form.value.fileList.length - 1) {
// audit(filePath)
// }
// }
// }
}
})
}
const audit = (filePath: any) => {
//选择系统变电站
const addForm = JSON.parse(JSON.stringify(form.value))
if (form.value.customSubstationFlag == '0') {
addForm.substation = addForm.substation.join(',')
}
console.log(addForm, '提交')
addSurveyPlan(addForm).then(res => {
cancelFn()
emit('onsubmit')
console.log(res, '新增普测计划')
})
return
if (title.value == '普测计划新增') {
addSurvey({ ...formdata.value, filePath: filePath }).then((res: any) => {
addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
ElMessage.success('新增成功!')
cancelFn()
emit('onsubmit')
})
} else if (title.value == '重新发起计划') {
auditSurvey({ ...formdata.value, filePath: filePath }).then((res: any) => {
auditSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
ElMessage.success('重新发起计划成功!')
cancelFn()
emit('onsubmit')
@@ -207,37 +255,36 @@ const handleExceed: UploadProps['onExceed'] = (): void => {
ElMessage.error(`上传文件数量不能超过5个!`)
}
//移除文件上传
const removeFile = (file: any,uploadFiles:any) => {
const removeFile = (file: any, uploadFiles: any) => {
console.log(file, uploadFiles)
}
const open = (text: string, row?: any) => {
formdata.value = Object.assign({
orgName: '',
orgNo: dictData.state.area[0].id,
loadData()
form.value = Object.assign({
// orgName: '',
deptId: dictData.state.area[0].id,
planStartTime: '',
planEndTime: '',
planName: '',
rgeneralSurveyPlanDetailAddParm: [],
subCount: '',
busCount: '',
subIds: [],
checkComment: '',
fileList: [],
filePath: []
substation: '', //关联电站
// fileList: [],
// checkComment: '',
// filePath: '',
customSubstationFlag: '0' //电站类型
})
title.value = text
planAddition.value = true
formRef.value?.resetFields()
// if (row) {
// formdata.value = JSON.parse(JSON.stringify(row))
// form.value = JSON.parse(JSON.stringify(row))
// nextTick(() => {
// formdata.value.fileList = []
// form.value.fileList = []
// treeRef.value.loadData()
// treeRef.value.setKey(row.subIds || [], text)
// treeRef.value.setKey(row.substation || [], text)
// let arr = row.filePath.split(',')
// arr.slice(0, -1).forEach((item: any) => {
// getFileNameAndFilePath({ filePath: item }).then((res: any) => {
// formdata.value.fileList.push({
// form.value.fileList.push({
// name: res.data.fileName,
// supervision: res.data.name,
// url: res.data.url

1
src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue
View File

@@ -4,7 +4,6 @@
<TableHeader area datePicker ref="TableHeaderRef" />
<Table ref="tableRef" />
<!-- 审核 -->
<planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
</div>
</div>

28
src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
View File

@@ -1,6 +1,5 @@
<template>
<TableHeader area datePicker ref="TableHeaderRef">
<template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
<!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
@@ -9,9 +8,6 @@
<Table ref="tableRef" />
<!-- 新增 -->
<planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
</template>
<script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue'
@@ -22,19 +18,15 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { cancel } from '@/api/process-boot/generalTest'
import planAdd from './planAdd.vue'
import { useRouter } from 'vue-router'
import { queryPlan,removeSurvey } from '@/api/process-boot/generalTest'
import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
import { getUserByRoleType } from '@/api/user-boot/user'
const { push } = useRouter()
const dialogVisible=ref(false)
const dialogVisible = ref(false)
const tableRef = ref()
const planAddRef = ref()
const TableHeaderRef = ref()
const auditList:any = ref([])
const auditList: any = ref([])
const auditUser = ref('')
const tableStore = new TableStore({
url: '/supervision-boot/surveyPlan/surveyPlanPage',
publicHeight: 65,
@@ -47,12 +39,21 @@ const tableStore = new TableStore({
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
}
},
{ field: 'deptName', title: '普测负责单位' },
{
field: 'deptName',
title: '普测负责单位'
},
{
field: 'substation',
title: '变电站',
formatter: (row: any) => {
return row.cellValue
}
},
{
field: 'planName',
title: '普测计划名称'
},
{ field: 'substation', title: '变电站' },
{ field: 'planStartTime', title: '计划开始时间' },
{ field: 'planEndTime', title: '计划结束时间' },
{
@@ -125,7 +126,6 @@ const tableStore = new TableStore({
})
tableStore.table.params.status = ''
provide('tableStore', tableStore)
// 新增计划
const add = () => {

102
src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
View File

@@ -1,48 +1,48 @@
<template>
<el-dialog draggable :title="title" v-model="planAddition" width="65%" :before-close="cancelFn">
<el-dialog draggable :title="title" v-model="planAddition" width="500px" :before-close="cancelFn">
<el-form
:model="formdata"
:model="form"
:disabled="title == '查看计划' || title == '计划审核'"
ref="formRef"
:rules="rules"
label-width="auto"
class="form-two"
class="form-one"
>
<el-form-item for="-" label="普测负责单位:">
<Area v-model="formdata.orgNo" disabled />
<el-form-item for="-" label="普测负责单位:">
<Area v-model="form.orgNo" disabled />
</el-form-item>
<el-form-item for="-" label="计划名称:" prop="planName">
<el-input v-model="formdata.planName" placeholder="请输入计划名称"></el-input>
<el-form-item for="-" label="计划名称:" prop="planName">
<el-input v-model="form.planName" placeholder="请输入计划名称"></el-input>
</el-form-item>
<el-form-item for="-" label="计划开始时间:" prop="planStartTime">
<el-form-item for="-" label="计划开始时间:" prop="planStartTime">
<el-date-picker
v-model="formdata.planStartTime"
v-model="form.planStartTime"
type="date"
placeholder="选择计划开始时间"
value-format="YYYY-MM-DD"
></el-date-picker>
</el-form-item>
<el-form-item for="-" label="计划结束时间:" prop="planEndTime">
<el-form-item for="-" label="计划结束时间:" prop="planEndTime">
<el-date-picker
v-model="formdata.planEndTime"
v-model="form.planEndTime"
type="date"
placeholder="选择计划结束时间"
value-format="YYYY-MM-DD"
></el-date-picker>
</el-form-item>
<el-form-item for="-" label="实际完成时间:" prop="planComplateTime">
<el-form-item for="-" label="实际完成时间:" prop="planComplateTime">
<el-date-picker
v-model="formdata.planComplateTime"
v-model="form.planComplateTime"
type="date"
placeholder="选择实际完成时间"
value-format="YYYY-MM-DD"
></el-date-picker>
</el-form-item>
<el-form-item for="-" label="测试负责人:" prop="leader">
<el-input v-model="formdata.leader" placeholder="请输入测试负责人"></el-input>
<el-form-item for="-" label="测试负责人:" prop="leader">
<el-input v-model="form.leader" placeholder="请输入测试负责人"></el-input>
</el-form-item>
<el-form-item for="-" label="关联电站:" prop="subIds" style="display: flex;align-items: center;">
<el-cascader v-model="formdata.subIds" :options="treeList" :props="defaultProps" clearable filterable />
<el-form-item for="-" label="关联电站:" prop="subIds" style="display: flex; align-items: center">
<el-cascader v-model="form.subIds" :options="treeList" :props="defaultProps" clearable filterable />
<!-- <el-tree-select
accordion
ref="treeRef"
@@ -53,15 +53,25 @@
readonly
node-key="id"
:props="defaultProps"
v-model="formdata.subIds"
v-model="form.subIds"
:data="treeList"
:render-after-expand="false"
/> -->
</el-form-item>
<!-- <el-form :model="formdata" label-width="auto"> -->
<el-form-item for="-" class="uploadFile" label="普测报告:" prop="fileList">
<el-form-item for="-" label="测试是否有问题：" prop="isQuesition">
<!-- 默认值 否 -->
<el-radio-group v-model="form.isQuesition">
<el-radio value="0">否</el-radio>
<el-radio value="1">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item style="width: 100%" for="-" label="问题描述:" prop="resion" v-if="form.isQuesition == '1'">
<el-input type="textarea" v-model="form.resion" placeholder="请输入问题描述"></el-input>
</el-form-item>
<!-- <el-form :model="form" label-width="auto"> -->
<el-form-item for="-" class="uploadFile" label="普测报告:" prop="fileList">
<el-upload
v-model:file-list="formdata.fileList"
v-model:file-list="form.fileList"
ref="upload"
action=""
:limit="5"
@@ -80,7 +90,7 @@
<!-- <div
v-if="
(title == '查看计划' || title == '计划审核') &&
(title == '计划审核' || formdata.status == 1 || formdata.status == 3 || formdata.status == 4)
(title == '计划审核' || form.status == 1 || form.status == 3 || form.status == 4)
"
>
<el-divider content-position="left" style="font-size: 18px; font-weight: bolder">审核意见</el-divider>
@@ -88,7 +98,7 @@
:disabled="title != '计划审核'"
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
v-model="formdata.checkComment"
v-model="form.checkComment"
></el-input>
</div> -->
<template #footer v-if="title != '查看计划'">
@@ -117,9 +127,9 @@ const defaultProps = ref({
value: 'id',
checkStrictly: true,
emitPath: false,
expandTrigger: 'hover' as const,
expandTrigger: 'hover' as const
})
const formdata: any = ref({
const form: any = ref({
orgName: '',
orgNo: dictData.state.area[0].id,
planStartTime: '',
@@ -133,7 +143,9 @@ const formdata: any = ref({
subIds: '',
fileList: [],
checkComment: '',
filePath: ''
filePath: '',
resion: '', //测试问题
isQuesition: '0' //是否有问题
})
const props = {
expandTrigger: 'hover' as const
@@ -146,8 +158,10 @@ const rules = {
planComplateTime: [{ required: true, message: '选择实际完成时间 ', trigger: 'change' }],
planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
leader: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
subIds: [{ required: true, message: '请选择关联电站', trigger: 'change' }],
fileList: [{ required: true, message: '请上传文件', trigger: 'change' }]
subIds: [{ required: true, message: '请选择关联电站', trigger: 'change' }],
fileList: [{ required: true, message: '请上传文件', trigger: 'change' }],
isQuesition: [{ required: true, message: '请选择测试是否有问题', trigger: 'change' }],
resion: [{ required: true, message: '请输入测试问题', trigger: 'blur' }],
}
const cancelFn = () => {
formRef.value.resetFields()
@@ -167,20 +181,20 @@ const submitFn = () => {
formRef.value.validate(async (valid: any) => {
if (valid) {
let filePath = ''
// formdata.value.subIds = treeRef.value.treeRef.getCheckedKeys(false)
formdata.value.subIds= typeof(formdata.value.subIds)=='string'?[formdata.value.subIds]:formdata.value.subIds
if (formdata.value.fileList.length == 0) {
// form.value.subIds = treeRef.value.treeRef.getCheckedKeys(false)
form.value.subIds = typeof form.value.subIds == 'string' ? [form.value.subIds] : form.value.subIds
if (form.value.fileList.length == 0) {
audit(filePath)
} else {
for (let i = 0; i < formdata.value.fileList.length; i++) {
if (formdata.value.fileList[i].raw) {
await uploadFile(formdata.value.fileList[i].raw, 'supervision/').then(res => {
for (let i = 0; i < form.value.fileList.length; i++) {
if (form.value.fileList[i].raw) {
await uploadFile(form.value.fileList[i].raw, 'supervision/').then(res => {
filePath = filePath + res.data.name + ','
})
} else {
filePath = filePath + formdata.value.fileList[i].supervision + ','
filePath = filePath + form.value.fileList[i].supervision + ','
}
if (i == formdata.value.fileList.length - 1) {
if (i == form.value.fileList.length - 1) {
audit(filePath)
}
}
@@ -190,13 +204,13 @@ const submitFn = () => {
}
const audit = (filePath: any) => {
if (title.value == '普测计划新增') {
addSurvey({ ...formdata.value, filePath: filePath }).then((res: any) => {
addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
ElMessage.success('新增成功!')
cancelFn()
emit('onsubmit')
})
} else if (title.value == '重新发起计划') {
auditSurvey({ ...formdata.value, filePath: filePath }).then((res: any) => {
auditSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
ElMessage.success('重新发起计划成功!')
cancelFn()
emit('onsubmit')
@@ -209,7 +223,7 @@ const handleExceed: UploadProps['onExceed'] = (): void => {
ElMessage.error(`上传文件数量不能超过5个!`)
}
const open = (text: string, row?: any) => {
formdata.value = Object.assign({
form.value = Object.assign({
orgName: '',
orgNo: dictData.state.area[0].id,
planStartTime: '',
@@ -223,21 +237,23 @@ const open = (text: string, row?: any) => {
subIds: [],
checkComment: '',
fileList: [],
filePath: []
filePath: [],
resion: '', //测试问题
isQuesition: '0' //是否有问题
})
title.value = text
planAddition.value = true
formRef.value?.resetFields()
// if (row) {
// formdata.value = JSON.parse(JSON.stringify(row))
// form.value = JSON.parse(JSON.stringify(row))
// nextTick(() => {
// formdata.value.fileList = []
// form.value.fileList = []
// treeRef.value.loadData()
// treeRef.value.setKey(row.subIds || [], text)
// let arr = row.filePath.split(',')
// arr.slice(0, -1).forEach((item: any) => {
// getFileNameAndFilePath({ filePath: item }).then((res: any) => {
// formdata.value.fileList.push({
// form.value.fileList.push({
// name: res.data.fileName,
// supervision: res.data.name,
// url: res.data.url

15
src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
View File

@@ -1,6 +1,5 @@
<template>
<TableHeader area datePicker ref="TableHeaderRef">
<template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
<!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
@@ -8,7 +7,7 @@
</TableHeader ref="tableRef">
<Table ref="tableRef" />
<!-- 新增 -->
<planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
<planTest ref="planTestRef" @onsubmit="tableStore.index()" />
<!-- 选择审核人 -->
<el-dialog draggable v-model="dialogVisible" title="审核" width="300" :before-close="handleClose">
@@ -34,7 +33,7 @@ import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { submitAuditUser,cancel } from '@/api/process-boot/generalTest'
import planAdd from './planAdd.vue'
import planTest from './planTest.vue'
import { useRouter } from 'vue-router'
import { useDictData } from '@/stores/dictData'
@@ -46,7 +45,7 @@ const dialogVisible=ref(false)
const tableRef = ref()
const planAddRef = ref()
const planTestRef = ref()
const TableHeaderRef = ref()
const auditList:any = ref([])
const auditUser = ref('')
@@ -98,7 +97,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
// planAddRef.value.open('查看计划', row)
// planTestRef.value.open('查看计划', row)
handleAudit(row.processInstanceId)
}
},
@@ -113,7 +112,7 @@ const tableStore = new TableStore({
},
click: row => {
// deviceQuitPopup.value.open('重新发起退运', row)
planAddRef.value.open('重新发起计划', row)
planTestRef.value.open('重新发起计划', row)
}
},
{
@@ -139,7 +138,7 @@ const tableStore = new TableStore({
// icon: 'el-icon-Plus',
// render: 'basicButton',
// click: async row => {
// planAddRef.value.open('编辑计划', row)
// planTestRef.value.open('编辑计划', row)
// }
// },
// {
@@ -179,7 +178,7 @@ provide('tableStore', tableStore)
// 新增计划
const add = () => {
// title.value = '普测计划新增'
planAddRef.value.open('普测计划新增')
planTestRef.value.open('普测计划新增')
}
// 提交审核

1
src/views/pqs/supervise/harmonicSurvey/index.vue
View File

@@ -16,7 +16,6 @@ import { onMounted, reactive, ref, provide } from 'vue'
import planManage from './components/planManage.vue'
import testManage from './components/testManage.vue'
import { mainHeight } from '@/utils/layout'
defineOptions({
name: 'supervision/harmonicmanagement'
})

45
src/views/pqs/supervise/retire/deviceQuitPopup.vue
View File

@@ -4,21 +4,21 @@
class="cn-operate-dialog"
v-model="dialogVisible"
:title="title"
style="max-width: 450px; "
style="max-width: 450px"
top="30vh"
>
<el-scrollbar>
<el-form :inline="false" :model="formData" label-width="120px" :rules="rules" ref="formRef">
<el-form-item label="设备类型" prop="deviceType">
<el-radio-group v-model="formData.deviceType" @change="changeType">
<el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
<!-- <el-form-item label="设备类型" prop="deviceType">
<el-radio-group v-model="form.deviceType" :disabled="title == '监测点退运'" @change="changeType">
<el-radio border label="1">监测装置</el-radio>
<el-radio border label="2">监测点</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item> -->
<el-form-item label="设备" prop="deviceId">
<el-tree-select
v-model="formData.deviceId"
v-model="form.deviceId"
:data="data"
filterable
:default-expand-all="true"
@@ -28,7 +28,7 @@
<el-form-item label="退役原因" prop="propertyNo">
<!-- <el-input
v-model='formData.propertyNo'
v-model='form.propertyNo'
clearable
placeholder='请输入退役原因'
/> -->
@@ -37,7 +37,7 @@
clearable
:autosize="{ minRows: 2, maxRows: 4 }"
placeholder="请输入退役原因"
v-model="formData.propertyNo"
v-model="form.propertyNo"
></el-input>
</el-form-item>
</el-form>
@@ -69,10 +69,10 @@ const formRef = ref()
const dialogVisible = ref(false)
// 注意不要和表单ref的命名冲突
const formData = reactive({
const form = ref({
id: '',
deviceId: '',
deviceType: '',
deviceType: '1',
propertyNo: ''
})
@@ -90,7 +90,6 @@ const resetForm = () => {
const open = async (text: string, tempData?: any) => {
title.value = text
if (tempData) {
if (tempData.deviceType == 1) {
//先加载装置数据并赋值
@@ -118,28 +117,30 @@ const open = async (text: string, tempData?: any) => {
data.value = lineList.value
}
// 表单赋值
for (let key in formData) {
formData[key] = tempData[key]
for (let key in form.value) {
form.value[key] = tempData[key]
}
formData.deviceType = formData.deviceType + ''
form.value.deviceType = form.value.deviceType + ''
} else {
//终端
await getTerminalSelectTree(4).then(res => {
deviceList.value = res.data
})
//监测点
getTerminalSelectTree(6).then(res => {
await getTerminalSelectTree(6).then(res => {
lineList.value = res.data
})
sourceData.value = deviceList.value
data.value = deviceList.value
resetForm()
// 在此处恢复默认表单
for (let key in formData) {
formData[key] = ''
for (let key in form.value) {
form.value[key] = ''
}
formData.deviceType = '1'
form.value.deviceType = '1'
}
form.value.deviceType = text == '监测点退运' ? '2' : '1'
changeType(form.value.deviceType)
dialogVisible.value = true
}
@@ -149,13 +150,13 @@ const open = async (text: string, tempData?: any) => {
const submit = () => {
formRef.value.validate(async (valid: any) => {
if (valid) {
if (formData.id) {
await quitRunningDeviceUpdate(formData)
if (form.value.id) {
await quitRunningDeviceUpdate(form.value)
ElMessage.success('重新发起成功')
tableStore.index()
dialogVisible.value = false
} else {
await addRunningDevice(formData)
await addRunningDevice(form.value)
//查询进线数据，避免一直处于loading状态
ElMessage.success('申请成功')
tableStore.index()
@@ -175,7 +176,7 @@ const changeType = (event: any) => {
} else {
sourceData.value = lineList.value
}
formData.deviceId = ''
form.value.deviceId = ''
data.value = sourceData.value
}

217
src/views/pqs/supervise/retire/index.vue
View File

@@ -1,201 +1,38 @@
<!--待办事项列表-->
<template>
<div class='default-main'>
<TableHeader date-picker>
<template v-slot:select>
<!-- <el-form-item label='任务名称'>-->
<!-- <el-input-->
<!-- v-model='tableStore.table.params.searchValue'-->
<!-- clearable-->
<!-- placeholder='请输入任务名称'-->
<!-- />-->
<!-- </el-form-item>-->
</template>
<template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
<!--弹框-->
<device-quit-popup ref='deviceQuitPopup' />
<div class="default-main">
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="终端状态管理" name="0">
<terminal v-if="activeName == '0'" />
</el-tab-pane>
<el-tab-pane label="监测点退运" name="1">
<monitor v-if="activeName == '1'" />
</el-tab-pane>
</el-tabs>
</div>
</template>
<script setup lang='ts'>
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { useRouter } from 'vue-router'
import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
import { ElMessage } from 'element-plus'
import { ElMessageBox } from 'element-plus/es'
import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
<script setup lang="ts">
import { onMounted, reactive, ref, provide } from 'vue'
import { mainHeight } from '@/utils/layout'
import terminal from './terminal.vue'
import monitor from './monitor.vue'
defineOptions({
name: 'supervision/retire'
})
const { push } = useRouter()
const deviceQuitPopup = ref()
const tableStore = new TableStore({
url: '/supervision-boot/quitRunningDevice/list',
method: 'POST',
column: [
{ title: '序号', type: 'seq', width: 80 },
{
title: '设备类型', field: 'deviceType', minWidth: 130,
render: 'tag',
custom: {
1: 'primary',
2: 'primary'
},
replaceValue: {
1: '装置',
2: '监测点'
}
},
{ title: '供电公司', field: 'gdName', minWidth: 130 },
{ title: '变电站', field: 'subName', minWidth: 130 },
{ title: '设备名称', field: 'deviceName', minWidth: 130 },
{ title: '退役原因', field: 'propertyNo', minWidth: 130 },
{
title: '设备状态', field: 'deviceStatus', minWidth: 130,
render: 'tag',
custom: {
0: 'success',
1: 'warning',
2: 'danger',
3: 'warning',
4: 'info'
},
replaceValue: {
0: '运行',
1: '检修',
2: '停运',
3: '调试',
4: '退运'
}
},
{
field: 'status', title: '审核状态', minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
2: 'success',
3: 'danger',
4: 'warning'
},
replaceValue: {
1: '审批中',
2: '审批通过',
3: '审批不通过',
4: '已取消'
}
},
{ field: 'createTime', title: '开始时间', minWidth: 170 },
{
title: '操作',
align: 'center',
minWidth: '150',
fixed: 'right',
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId,row.historyInstanceId)
}
},
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status !== 3
},
click: row => {
deviceQuitPopup.value.open('重新发起退运', row)
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 3 || row.status == 2 || row.status == 4
},
click: row => {
cancelLeave(row)
}
}
]
}
],
beforeSearchFun: () => {
for (let key in tableStore.table.params) {
if (tableStore.table.params[key] === '') {
delete tableStore.table.params[key]
}
}
}
})
onMounted(() => {
// 加载数据
tableStore.index()
})
tableStore.table.params.searchValue = ''
provide('tableStore', tableStore)
//新增退运设备信息
const add = () => {
deviceQuitPopup.value.open('新增退运')
}
/** 流程实例详情 */
const handleAudit = (instanceId: string,historyIds:string) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
id: instanceId,
historyIds:historyIds
}
})
}
/**取消流程操作*/
const cancelLeave = async (row: any) => {
// 二次确认
const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
inputErrorMessage: '取消原因不能为空'
})
// 发起取消
let data = {
id: row.id,
processInstanceId: row.processInstanceId,
reason: value
}
await cancelQuitRunningDevice(data)
ElMessage.success('取消成功')
// 加载数据
tableStore.index()
}
const activeName = ref('1')
const layout = mainHeight(63) as any
</script>
<style lang="scss" scoped>
.bars_w {
width: 100%;
height: 500px;
}
:deep(.el-tabs__content) {
height: v-bind('layout.height');
overflow-y: auto;
}
</style>

201
src/views/pqs/supervise/retire/monitor.vue Normal file
View File

@@ -0,0 +1,201 @@
<!--待办事项列表-->
<template>
<div class='default-main'>
<TableHeader date-picker>
<template v-slot:select>
<!-- <el-form-item label='任务名称'>-->
<!-- <el-input-->
<!-- v-model='tableStore.table.params.searchValue'-->
<!-- clearable-->
<!-- placeholder='请输入任务名称'-->
<!-- />-->
<!-- </el-form-item>-->
</template>
<template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
<!--弹框-->
<device-quit-popup ref='deviceQuitPopup' />
</div>
</template>
<script setup lang='ts'>
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { useRouter } from 'vue-router'
import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
import { ElMessage } from 'element-plus'
import { ElMessageBox } from 'element-plus/es'
import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
defineOptions({
name: 'supervision/retire'
})
const { push } = useRouter()
const deviceQuitPopup = ref()
const tableStore = new TableStore({
url: '/supervision-boot/quitRunningDevice/list',
method: 'POST',
column: [
{ title: '序号', type: 'seq', width: 80 },
{
title: '设备类型', field: 'deviceType', minWidth: 130,
render: 'tag',
custom: {
1: 'primary',
2: 'primary'
},
replaceValue: {
1: '装置',
2: '监测点'
}
},
{ title: '供电公司', field: 'gdName', minWidth: 130 },
{ title: '变电站', field: 'subName', minWidth: 130 },
{ title: '设备名称', field: 'deviceName', minWidth: 130 },
{ title: '退役原因', field: 'propertyNo', minWidth: 130 },
{
title: '设备状态', field: 'deviceStatus', minWidth: 130,
render: 'tag',
custom: {
0: 'success',
1: 'warning',
2: 'danger',
3: 'warning',
4: 'info'
},
replaceValue: {
0: '运行',
1: '检修',
2: '停运',
3: '调试',
4: '退运'
}
},
{
field: 'status', title: '审核状态', minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
2: 'success',
3: 'danger',
4: 'warning'
},
replaceValue: {
1: '审批中',
2: '审批通过',
3: '审批不通过',
4: '已取消'
}
},
{ field: 'createTime', title: '开始时间', minWidth: 170 },
{
title: '操作',
align: 'center',
minWidth: '150',
fixed: 'right',
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId,row.historyInstanceId)
}
},
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status !== 3
},
click: row => {
deviceQuitPopup.value.open('重新发起退运', row)
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 3 || row.status == 2 || row.status == 4
},
click: row => {
cancelLeave(row)
}
}
]
}
],
beforeSearchFun: () => {
for (let key in tableStore.table.params) {
if (tableStore.table.params[key] === '') {
delete tableStore.table.params[key]
}
}
}
})
onMounted(() => {
// 加载数据
tableStore.index()
})
tableStore.table.params.searchValue = ''
provide('tableStore', tableStore)
//新增退运设备信息
const add = () => {
deviceQuitPopup.value.open('监测点退运')
}
/** 流程实例详情 */
const handleAudit = (instanceId: string,historyInstanceId:string) => {
push({
name: 'BpmProcessInstanceDetail',
state: {
id: instanceId,
historyInstanceId
}
})
}
/**取消流程操作*/
const cancelLeave = async (row: any) => {
// 二次确认
const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
inputErrorMessage: '取消原因不能为空'
})
// 发起取消
let data = {
id: row.id,
processInstanceId: row.processInstanceId,
reason: value
}
await cancelQuitRunningDevice(data)
ElMessage.success('取消成功')
// 加载数据
tableStore.index()
}
</script>

201
src/views/pqs/supervise/retire/terminal.vue Normal file
View File

@@ -0,0 +1,201 @@
<!--待办事项列表-->
<template>
<div class='default-main'>
<TableHeader date-picker>
<template v-slot:select>
<!-- <el-form-item label='任务名称'>-->
<!-- <el-input-->
<!-- v-model='tableStore.table.params.searchValue'-->
<!-- clearable-->
<!-- placeholder='请输入任务名称'-->
<!-- />-->
<!-- </el-form-item>-->
</template>
<template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
<!--弹框-->
<device-quit-popup ref='deviceQuitPopup' />
</div>
</template>
<script setup lang='ts'>
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { useRouter } from 'vue-router'
import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
import { ElMessage } from 'element-plus'
import { ElMessageBox } from 'element-plus/es'
import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
defineOptions({
name: 'supervision/retire'
})
const { push } = useRouter()
const deviceQuitPopup = ref()
const tableStore = new TableStore({
url: '/supervision-boot/quitRunningDevice/list',
method: 'POST',
column: [
{ title: '序号', type: 'seq', width: 80 },
{
title: '设备类型', field: 'deviceType', minWidth: 130,
render: 'tag',
custom: {
1: 'primary',
2: 'primary'
},
replaceValue: {
1: '装置',
2: '监测点'
}
},
{ title: '供电公司', field: 'gdName', minWidth: 130 },
{ title: '变电站', field: 'subName', minWidth: 130 },
{ title: '设备名称', field: 'deviceName', minWidth: 130 },
{ title: '退役原因', field: 'propertyNo', minWidth: 130 },
{
title: '设备状态', field: 'deviceStatus', minWidth: 130,
render: 'tag',
custom: {
0: 'success',
1: 'warning',
2: 'danger',
3: 'warning',
4: 'info'
},
replaceValue: {
0: '运行',
1: '检修',
2: '停运',
3: '调试',
4: '退运'
}
},
{
field: 'status', title: '审核状态', minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
2: 'success',
3: 'danger',
4: 'warning'
},
replaceValue: {
1: '审批中',
2: '审批通过',
3: '审批不通过',
4: '已取消'
}
},
{ field: 'createTime', title: '开始时间', minWidth: 170 },
{
title: '操作',
align: 'center',
minWidth: '150',
fixed: 'right',
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId,row.historyInstanceId)
}
},
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status !== 3
},
click: row => {
deviceQuitPopup.value.open('重新发起退运', row)
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 3 || row.status == 2 || row.status == 4
},
click: row => {
cancelLeave(row)
}
}
]
}
],
beforeSearchFun: () => {
for (let key in tableStore.table.params) {
if (tableStore.table.params[key] === '') {
delete tableStore.table.params[key]
}
}
}
})
onMounted(() => {
// 加载数据
tableStore.index()
})
tableStore.table.params.searchValue = ''
provide('tableStore', tableStore)
//新增退运设备信息
const add = () => {
deviceQuitPopup.value.open('新增退运')
}
/** 流程实例详情 */
const handleAudit = (instanceId: string,historyInstanceId:string) => {
push({
name: 'BpmProcessInstanceDetail',
state: {
id: instanceId,
historyInstanceId
}
})
}
/**取消流程操作*/
const cancelLeave = async (row: any) => {
// 二次确认
const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
inputErrorMessage: '取消原因不能为空'
})
// 发起取消
let data = {
id: row.id,
processInstanceId: row.processInstanceId,
reason: value
}
await cancelQuitRunningDevice(data)
ElMessage.success('取消成功')
// 加载数据
tableStore.index()
}
</script>