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

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

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' }],

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

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: '用户性质',