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

“工程名称”修改为“用户名称”&删除console打印

Browse Source
This commit is contained in:
zhujiyan
2024-06-03 11:28:44 +08:00
parent 9b77cf0262
commit 00b0e02093
23 changed files with 40 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/device-boot/Business.ts
View File

@@ -38,7 +38,7 @@ export function getTerminalTree() {
/**
* 总计出3层，提供给表单选择具体的终端、母线、监测点
* 终端台账树
* 等级：0-项目名称；1- 工程名称；2-单位；3-部门；4-终端；5-母线；6-监测点
* 等级：0-项目名称；1- 用户名称；2-单位；3-部门；4-终端；5-母线；6-监测点
*/
export function getTerminalSelectTree(level: number) {
return createAxios({

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

@@ -232,7 +232,6 @@ const audit = (filePath: any) => {
addSurveyPlan(addForm).then(res => {
cancelFn()
emit('onsubmit')
console.log(res, '新增普测计划')
})
return
if (title.value == '普测计划新增') {

6
src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
View File

@@ -46,11 +46,11 @@
:disabled="openType == 'detail'"
/>
</el-form-item>
<el-form-item label="工程名称：" prop="projectName">
<el-form-item label="用户名称：" prop="projectName">
<el-input
v-model="form.projectName"
autocomplete="off"
placeholder="请输入工程名称"
placeholder="请输入用户名称"
:disabled="openType == 'detail'"
/>
</el-form-item>
@@ -272,7 +272,7 @@ const resetForm = () => {
userType: 0, //用户性质
city: areaOptionList[0].name, //所属地市
responsibleDepartment: '', //归口管理部门
projectName: '', //工程名称
projectName: '', //用户名称
userStatus: userStateList[0].value, //用户状态
substation: '', //变电站
backgroundTestPerformed: 0, //是否开展背景测试

4
src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
View File

@@ -2,7 +2,7 @@
<div>
<TableHeader ref="TableHeaderRef">
<template #select>
<el-form-item label="工程名称">
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.projectName" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">
@@ -57,7 +57,7 @@ const tableStore = new TableStore({
column: [
{ title: '序号', type: 'seq', width: 80 },
{ field: 'city', title: '所属地市', minWidth: 80 },
{ field: 'projectName', title: '工程名称', minWidth: 170 },
{ field: 'projectName', title: '用户名称', minWidth: 170 },
{
field: 'userType',
title: '用户性质',

4
src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue
View File

@@ -2,7 +2,7 @@
<div class="default-main">
<!-- <TableHeader ref='TableHeaderRef'>
<template #select>
<el-form-item label='工程名称'>
<el-form-item label='用户名称'>
<el-input v-model='tableStore.table.params.projectName' clearable></el-input>
</el-form-item>
<el-form-item label='所属地市'>
@@ -66,7 +66,7 @@ const tableStore = new TableStore({
method: 'POST',
column: [
{ title: '序号', type: 'seq', width: 80 },
{ field: 'projectName', title: '工程名称', minWidth: 170 },
{ field: 'projectName', title: '用户名称', minWidth: 170 },
{
field: 'userType',
title: '用户性质',

22
src/views/pqs/supervise/interfere/components/terminalNetworkDetection/addForm.vue
View File

@@ -10,7 +10,7 @@
draggable
>
<!--终端信息录入 基础信息+终端信息+附件材料 -->
<!--监测点信息录入 基础信息+监测点信息 监测点信息要有工程名称、用户状态 -->
<!--监测点信息录入 基础信息+监测点信息 监测点信息要有用户名称、用户状态 -->
<el-tabs class="demo-tabs" v-model="selectFormType" @tab-click="handleClick">
<el-tab-pane label="终端信息" name="0"></el-tab-pane>
<el-tab-pane label="监测点信息" name="1"></el-tab-pane>
@@ -111,12 +111,12 @@
</el-row>
<!-- <el-row>
<el-col :span="12">
<el-form-item label="工程名称：" prop="userName">
<el-form-item label="用户名称：" prop="userName">
<el-select
v-model="form.userName"
clearable
style="width: 100%"
placeholder="请选择工程名称"
placeholder="请选择用户名称"
>
<el-option
v-for="item in areaOptionList"
@@ -723,12 +723,12 @@
</el-row>
<el-row v-if="selectFormType == '1'">
<el-col :span="12">
<el-form-item label="工程名称：" prop="userName">
<el-form-item label="用户名称：" prop="userName">
<el-select
v-model="form.userName"
clearable
style="width: 100%"
placeholder="请选择工程名称"
placeholder="请选择用户名称"
>
<el-option
v-for="item in areaOptionList"
@@ -1362,7 +1362,7 @@ const resetForm = () => {
expectedProductionDate: '', //工程投产日期
city: areaOptionList[0].name, //所属地市
userStatus: userStateList[1].id, //用户状态
userName: '', //工程名称
userName: '', //用户名称
userId: '',
acceptanceInspectionReport: [], //验收检验报告
@@ -1451,7 +1451,7 @@ const devReportForm = ref({
expectedProductionDate: '', //工程投产日期
city: areaOptionList[0].name, //所属地市
userStatus: userStateList[1].id, //用户状态
userName: '', //工程名称
userName: '', //用户名称
userId: '',
acceptanceInspectionReport: [], //验收检验报告
@@ -1509,7 +1509,7 @@ const monitorPointForm = ref({
expectedProductionDate: '', //工程投产日期
city: areaOptionList[0].name, //所属地市
userStatus: userStateList[1].id, //用户状态
userName: '', //工程名称
userName: '', //用户名称
userId: '',
acceptanceInspectionReport: [], //验收检验报告
@@ -1632,7 +1632,7 @@ const rules = ref({
userName: [
{
required: true,
message: '请选择工程名称',
message: '请选择用户名称',
trigger: 'change'
}
],
@@ -2027,7 +2027,6 @@ watch(
}
//处理填报日期时间格式
devReportForm.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd');
// console.log('处理好的表单++++++++++>',devReportForm.value)
}
//监测点信息
else {
@@ -2144,7 +2143,6 @@ const disabledDate = time => {
const activeName = ref('0')
//提交
const confirmForm = () => {
console.log(form.value, '打印form对象')
// 先判断提交终端信息与监测点信息
// 提交终端信息
@@ -2221,9 +2219,7 @@ const confirmForm = () => {
typeExperimentReport: typeExperimentReport.value, //型式实验报告
otherAttachments: otherAttachments?.value, //其他附件
}
console.log(confirmFormData,"打印提交表单111111111111")
addTerminalFormData(confirmFormData).then(res => {
console.log(res,"打印提交结果222222222222+++++++++")
ruleFormRef.value.resetFields()
resetForm()
close()

4
src/views/pqs/supervise/interfere/components/terminalNetworkDetection/detail.vue
View File

@@ -194,7 +194,6 @@ const getProviteData = async () => {
proviteData.value = detailData.value.userReportProjectPO
//查询非线性设备类型
await getDictTreeById(proviteData.value.nonlinearDeviceType).then(res => {
console.log(res, '==========')
proviteData.value.nonlinearDeviceType = res.data?.name
})
} else if (
@@ -206,13 +205,11 @@ const getProviteData = async () => {
proviteData.value = detailData.value.userReportSubstationPO
//查询非线性负荷类型
await getDictTreeById(proviteData.value.nonlinearLoadType).then(res => {
console.log(res, '==========')
proviteData.value.nonlinearLoadType = res.data?.name
})
} else {
proviteData.value = detailData.value.userReportSensitivePO
}
console.log(proviteData.value, '++++++++++++proviteData.evaluationType')
//可研报告
if (proviteData.value.feasibilityReport) {
await getFileNamePath(proviteData.value.feasibilityReport, 'feasibilityReport')
@@ -261,7 +258,6 @@ const getProviteData = async () => {
//根据文件名请求
const getFileNamePath = async (val: any, pathName: any) => {
await getFileNameAndFilePath({ filePath: val }).then(res => {
console.log(111111111)
if (res.data && res.data.name && res.data.url) {
//可研报告
if (pathName == 'feasibilityReport' && proviteData.value.feasibilityReport) {

3
src/views/pqs/supervise/interfere/components/terminalNetworkDetection/index.vue
View File

@@ -2,7 +2,7 @@
<template>
<TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select>
<el-form-item label="工程名称">
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">
@@ -137,7 +137,6 @@ const tableStore = new TableStore({
// tableStore.table.params.loadType = ''
// tableStore.table.params.userName = ''
// tableStore.table.params.fileUploadflag = ''
console.log(tableStore.table.params,"=========查询列表");
provide('tableStore', tableStore)

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

@@ -67,8 +67,8 @@
<el-form-item for="-" label="归口管理部门：" prop="responsibleDepartment">
<el-input v-model="form.responsibleDepartment" autocomplete="off" placeholder="请输入归口管理部门" />
</el-form-item>
<el-form-item for="-" label="工程名称：" prop="projectName">
<el-input v-model="form.projectName" autocomplete="off" placeholder="请输入工程名称" />
<el-form-item for="-" label="用户名称：" prop="projectName">
<el-input v-model="form.projectName" autocomplete="off" placeholder="请输入用户名称" />
</el-form-item>
<el-form-item for="-" label="用户状态：" prop="userStatus">
<el-select v-model="form.userStatus" placeholder="请选择用户状态">
@@ -604,7 +604,7 @@ const resetForm = () => {
city: areaOptionList[0].name, //所属地市 1
responsibleDepartment: '', //归口管理部门 1
userStatus: userStateList[0].value, //用户状态 1
projectName: '', //工程名称 1
projectName: '', //用户名称 1
substation: '', //变电站 1
voltageLevel: voltageLevelList[0].id, //电压等级 1
evaluationDept: evaluationDeptList[0].name, //预测评估单位 1
@@ -764,7 +764,7 @@ const rules = ref({
city: [{ required: true, message: '请选择所属地市', trigger: 'change' }],
responsibleDepartment: [{ required: true, message: '请输入归口管理部门', trigger: 'blur' }],
userStatus: [{ required: true, message: '请选择用户状态', trigger: 'change' }],
projectName: [{ required: true, message: '请输入工程名称', trigger: 'blur' }],
projectName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
substation: [{ required: true, message: '请输入变电站', trigger: 'blur' }],
voltageLevel: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
evaluationDept: [{ required: true, message: '请选择预测评估单位', trigger: 'change' }],

4
src/views/pqs/supervise/interfere/components/undocumented/detail.vue
View File

@@ -357,7 +357,6 @@ const evaluationTypeList = dictData.getBasicData('Evaluation_Type')
const evaluationDeptList = dictData.getBasicData('evaluation_dept')
/** 获得数据 */
const getInfo = async () => {
console.log(666666666, '加载了')
detailLoading.value = true
try {
await getUserReportById(props.id || queryId).then(res => {
@@ -375,7 +374,6 @@ const getProviteData = async () => {
proviteData.value = detailData.value.userReportProjectPO
//查询非线性设备类型
await getDictTreeById(proviteData.value.nonlinearDeviceType).then(res => {
console.log(res, '==========')
proviteData.value.nonlinearDeviceType = res.data?.name
})
} else if (
@@ -387,13 +385,11 @@ const getProviteData = async () => {
proviteData.value = detailData.value.userReportSubstationPO
//查询非线性负荷类型
await getDictTreeById(proviteData.value.nonlinearLoadType).then(res => {
console.log(res, '==========')
proviteData.value.nonlinearLoadType = res.data?.name
})
} else {
proviteData.value = detailData.value.userReportSensitivePO
}
console.log(proviteData.value, '++++++++++++proviteData.evaluationType')
//可研报告
if (proviteData.value.feasibilityReport) {
await getFileNamePath(proviteData.value.feasibilityReport, 'feasibilityReport')

4
src/views/pqs/supervise/interfere/components/undocumented/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<TableHeader ref="TableHeaderRef">
<template #select>
<el-form-item label="工程名称">
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.projectName" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">
@@ -60,7 +60,7 @@ const tableStore = new TableStore({
// { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
{ field: 'city', title: '所属地市', minWidth: 80 },
{ field: 'substation', title: '变电站', minWidth: 100 },
{ field: 'projectName', title: '工程名称', minWidth: 170 },
{ field: 'projectName', title: '用户名称', minWidth: 170 },
{
field: 'userType',
title: '用户性质',

2
src/views/pqs/supervise/plan/components/detail.vue
View File

@@ -201,7 +201,6 @@ const getInfo = async () => {
try {
await getPlanDetailsById({ id: props.id || queryId }).then(res => {
detailData.value = res.data
console.log(detailData.value, '+++++++++')
getFileName()
})
} finally {
@@ -237,7 +236,6 @@ const getFileName = async () => {
//根据文件名请求
const getFileNamePath = async (val: any, pathName: any) => {
await getFileNameAndFilePath({ filePath: val }).then(res => {
console.log(111111111)
if (res.data) {
//可研报告
if (pathName == 'acceptanceInspectionReport' && detailData.value.acceptanceInspectionReport) {

2
src/views/pqs/supervise/plan/components/effectProblem/index.vue
View File

@@ -13,7 +13,7 @@
> -->
<TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select>
<el-form-item label="工程名称">
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">

2
src/views/pqs/supervise/plan/index.vue
View File

@@ -3,7 +3,7 @@
<div class="default-main">
<TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select>
<el-form-item label="工程名称">
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">

4
src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
View File

@@ -2,7 +2,7 @@
<div>
<TableHeader ref="TableHeaderRef">
<template #select>
<el-form-item label="工程名称">
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.projectName" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">
@@ -47,7 +47,7 @@ const tableStore = new TableStore({
method: 'POST',
column: [
{ title: '序号', type: 'seq', width: 80 },
{ field: 'projectName', title: '工程名称', minWidth: 170 },
{ field: 'projectName', title: '用户名称', minWidth: 170 },
{
field: 'userType',
title: '用户性质',

2
src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
View File

@@ -9,7 +9,7 @@
:lazy="true"
draggable
>
<!--监测点信息录入 基础信息+监测点信息 监测点信息要有工程名称、用户状态 -->
<!--监测点信息录入 基础信息+监测点信息 监测点信息要有用户名称、用户状态 -->
<el-form
:model="form"
:validate-on-rule-change="false"

2
src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
View File

@@ -2,7 +2,7 @@
<template>
<TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select>
<el-form-item label="工程名称">
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">

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

@@ -9,7 +9,7 @@
:lazy="true"
draggable
>
<!--监测点信息录入 基础信息+监测点信息 监测点信息要有工程名称、用户状态 -->
<!--监测点信息录入 基础信息+监测点信息 监测点信息要有用户名称、用户状态 -->
<el-form
:model="form"
:validate-on-rule-change="false"
@@ -522,7 +522,7 @@ const resetForm = () => {
userStatus: userStateList[1].id, //用户状态
monitoringTerminalCode: monitoringTerminalList.value[0]?.id, //关联设备
monitoringTerminalName: monitoringTerminalList.value[0]?.monitoringTerminalName,
userName: projectList.value[0]?.id, //工程名称
userName: projectList.value[0]?.id, //用户名称
userId: '', //工程id
//监测点信息实体
businessType: '', // 干扰源类别
@@ -700,7 +700,7 @@ const rules = ref({
userName: [
{
required: true,
message: '请选择工程名称',
message: '请选择用户名称',
trigger: 'change'
}
],

2
src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
View File

@@ -2,7 +2,7 @@
<template>
<TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select>
<el-form-item label="工程名称">
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">

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

@@ -81,12 +81,12 @@
</el-form-item>
-->
<!--
<el-form-item for="-" label="工程名称：" prop="userName">
<el-form-item for="-" label="用户名称：" prop="userName">
<el-select
v-model="form.userName"
clearable
style="width: 100%"
placeholder="请选择工程名称"
placeholder="请选择用户名称"
>
<el-option
v-for="item in areaOptionList"
@@ -788,7 +788,7 @@ const resetForm: any = async () => {
expectedProductionDate: '', //工程投产日期
city: areaOptionList[0].id, //所属地市
userStatus: userStateList[1].id, //用户状态
userName: '', //工程名称
userName: '', //用户名称
userId: '',
customSubstaionFlag: '0', //电站类型
acceptanceInspectionReport: [], //验收检验报告
@@ -847,7 +847,7 @@ const devReportForm: any = ref({
expectedProductionDate: '', //工程投产日期
city: areaOptionList[0].name, //所属地市
userStatus: userStateList[1].id, //用户状态
userName: '', //工程名称
userName: '', //用户名称
userId: '',
acceptanceInspectionReport: [], //验收检验报告
acceptanceInspectionReportSingle: [], //验收检验报告单
@@ -944,7 +944,7 @@ const rules = ref({
userName: [
{
required: true,
message: '请选择工程名称',
message: '请选择用户名称',
trigger: 'change'
}
],

1
src/views/system/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue
View File

@@ -34,7 +34,6 @@ const bpmnControlForm = ref({
})
const activityList = ref([]) // 任务列表
const getMapList = () => {
console.log('执行力');
if (props.id) {
nextTick(()=>{
getTaskListByReturn(props.id).then(res => {

1
src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
View File

@@ -128,7 +128,6 @@ watch(
return sortYMDHMS(a.createTime) - sortYMDHMS(b.createTime)
}
}).reverse()
console.log(JSON.parse(JSON.stringify( val)),tasksList.value, '传递过来的task任务数据')
}
},
{

35
src/views/system/bpm/processInstance/detail/index.vue
View File

@@ -340,13 +340,9 @@ const getTaskList = async () => {
try {
// 获得未取消的任务
tasksLoad.value = true
//根据历史实例id查询历史任务日志数据
// 把最新的id加进去
//根据历史实例id查询历史任务日志数据把最新的id加进去
historyInstanceIdList.value.push(id)
// if (historyInstanceIdList.value && historyInstanceIdList.value.length != 0) {
//轮询
console.log(historyInstanceIdList.value.length,"77778899999");
await historyInstanceIdList.value?.map((item: any, index: any) => {
getTaskListByProcessInstanceId(item).then(res => {
res.data.map(vv => {
@@ -355,35 +351,6 @@ const getTaskList = async () => {
})
tasks.value=[]
})
// }
// await getTaskListByProcessInstanceId(id).then(res => {
// data = res.data
// })
//历史数据添加进tasks数据中
// 1.1 移除已取消的审批
// data.map(task => {
// if (task.status !== 4) {
// tasks.value.push(task)
// }
// })
// // 1.2 排序，将未完成的排在前面，已完成的排在后面；
// let list = Array.from(tasks.value)?.sort((a, b) => {
// // 有已完成的情况，按照完成时间倒序
// if (a.endTime && b.endTime) {
// return sortYMDHMS(b.createTime) - sortYMDHMS(a.createTime)
// } else if (a.endTime) {
// return 1
// } else if (b.endTime) {
// return -1
// // 都是未完成，按照创建时间倒序
// } else {
// return sortYMDHMS(b.createTime) - sortYMDHMS(a.createTime)
// }
// })
// console.log(list, '打印处理好的数据', list.length)
// // 获得需要自己审批的任务
// await loadRunningTask(list)
} finally {
tasksLoad.value = false
}