diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index be18943..9be2bbb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -519,3 +519,12 @@ method: 'delete', }); } + +// 分页查询污水处理厂bod浓度填报 +export function sewageBodPage(query) { + return request({ + url: '/business/sewageBod/page', + method: 'get', + params: query, + }); +} diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index be18943..9be2bbb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -519,3 +519,12 @@ method: 'delete', }); } + +// 分页查询污水处理厂bod浓度填报 +export function sewageBodPage(query) { + return request({ + url: '/business/sewageBod/page', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 7215cd0..96ca7f7 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -5,18 +5,18 @@ - - + + - - + + - - + + @@ -47,10 +47,10 @@ - + - {{ scope.row.isRectify == '1' ? '待整改' : scope.row.isRectify == '2' ? '已整改' : '' }} + {{ scope.row.status == '0' ? '待整改' : scope.row.status == '1' ? '已整改' : '' }} @@ -234,11 +234,11 @@ const multipleA = ref(true); const case_level = ref([ { - value: '1', + value: '0', label: '待整改', }, { - value: '2', + value: '1', label: '已整改', }, ]); @@ -259,9 +259,10 @@ queryParams: { pageNum: 1, pageSize: 10, - handleStatus: '', taskName: '', - taskUserIdList: '', + projectNo: '', + status: '', + patroltype: '', }, queryParamstwo: { pageNum: 1, diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index be18943..9be2bbb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -519,3 +519,12 @@ method: 'delete', }); } + +// 分页查询污水处理厂bod浓度填报 +export function sewageBodPage(query) { + return request({ + url: '/business/sewageBod/page', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 7215cd0..96ca7f7 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -5,18 +5,18 @@ - - + + - - + + - - + + @@ -47,10 +47,10 @@ - + - {{ scope.row.isRectify == '1' ? '待整改' : scope.row.isRectify == '2' ? '已整改' : '' }} + {{ scope.row.status == '0' ? '待整改' : scope.row.status == '1' ? '已整改' : '' }} @@ -234,11 +234,11 @@ const multipleA = ref(true); const case_level = ref([ { - value: '1', + value: '0', label: '待整改', }, { - value: '2', + value: '1', label: '已整改', }, ]); @@ -259,9 +259,10 @@ queryParams: { pageNum: 1, pageSize: 10, - handleStatus: '', taskName: '', - taskUserIdList: '', + projectNo: '', + status: '', + patroltype: '', }, queryParamstwo: { pageNum: 1, diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 349548d..d951cba 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -58,7 +58,7 @@ - {{ item.projectAbbreviation }} + {{ item.projectName }} @@ -120,15 +120,7 @@ - + @@ -160,15 +152,7 @@ - + @@ -210,6 +194,7 @@ import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana'; import { listUser } from '@/api/system/user'; import { getProjectInfoList } from '@/api/preassess/targetManage'; +import axios from 'axios'; const { proxy } = getCurrentInstance(); const { patrol_type } = proxy.useDict('patrol_type'); // 巡查类型的字典 console.log(patrol_type); @@ -332,7 +317,7 @@ return item.userName; }); form.value.projectList = row.projectList.map(item => { - return item.projectAbbreviation; + return item.projectName; }); form.value.reportTime1 = [form.value.startDate, form.value.endDate]; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; @@ -343,7 +328,7 @@ title.value = '修改巡查计划'; multiple.value = false; form.value = { ...row }; - console.log(form.value, 'form.value form.value '); + // console.log(form.value, 'form.value form.value '); // 做修改回显判断 form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : []; form.value.patrolUserList.forEach(element => { @@ -355,7 +340,7 @@ } // 激活 function handleActive(row) { - console.log(row.id, '1'); + // console.log(row.id, '1'); activation(row.id).then(res => { if (res.code == 200) { proxy.$modal.msgSuccess('激活成功'); @@ -380,26 +365,25 @@ form.value.startDate = form.value.reportTime1[0]; form.value.endDate = form.value.reportTime1[1]; // 处理项目传参 - form.value.projectList = form.value.projectList.map(obj => { - console.log(projectTList.value, 'projectTList.value'); - let nameXm = ''; - projectTList.value.forEach(item => { - if (item.projectNo == obj) { - nameXm = item.projectName; - // console.log(item.projectName, 'item'); - } - }); - // console.log(obj, 'obj'); - return { projectNo: obj, projectName: nameXm }; - }); + // form.value.projectList = form.value.projectList.map(obj => { + // // console.log(projectTList.value, 'projectTList.value'); + // let nameXm = ''; + // projectTList.value.forEach(item => { + // if (item.projectNo == obj) { + // nameXm = item.projectName; + // // console.log(item.projectName, 'item'); + // } + // }); + // // console.log(obj, 'obj'); + // return { projectNo: obj, projectName: nameXm }; + // }); // 处理人员传参 - form.value.patrolUserList = form.value.patrolUserList.map(item => { - console.log(item, 'item'); - return { userId: item }; - }); + // form.value.patrolUserList = form.value.patrolUserList.map(item => { + // // console.log(item, 'item'); + // return { userId: item }; + // }); form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); - if (title.value == '修改巡查计划') { patrolPlanedit(form.value).then(response => { proxy.$modal.msgSuccess('修改成功'); diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index be18943..9be2bbb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -519,3 +519,12 @@ method: 'delete', }); } + +// 分页查询污水处理厂bod浓度填报 +export function sewageBodPage(query) { + return request({ + url: '/business/sewageBod/page', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 7215cd0..96ca7f7 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -5,18 +5,18 @@ - - + + - - + + - - + + @@ -47,10 +47,10 @@ - + - {{ scope.row.isRectify == '1' ? '待整改' : scope.row.isRectify == '2' ? '已整改' : '' }} + {{ scope.row.status == '0' ? '待整改' : scope.row.status == '1' ? '已整改' : '' }} @@ -234,11 +234,11 @@ const multipleA = ref(true); const case_level = ref([ { - value: '1', + value: '0', label: '待整改', }, { - value: '2', + value: '1', label: '已整改', }, ]); @@ -259,9 +259,10 @@ queryParams: { pageNum: 1, pageSize: 10, - handleStatus: '', taskName: '', - taskUserIdList: '', + projectNo: '', + status: '', + patroltype: '', }, queryParamstwo: { pageNum: 1, diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 349548d..d951cba 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -58,7 +58,7 @@ - {{ item.projectAbbreviation }} + {{ item.projectName }} @@ -120,15 +120,7 @@ - + @@ -160,15 +152,7 @@ - + @@ -210,6 +194,7 @@ import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana'; import { listUser } from '@/api/system/user'; import { getProjectInfoList } from '@/api/preassess/targetManage'; +import axios from 'axios'; const { proxy } = getCurrentInstance(); const { patrol_type } = proxy.useDict('patrol_type'); // 巡查类型的字典 console.log(patrol_type); @@ -332,7 +317,7 @@ return item.userName; }); form.value.projectList = row.projectList.map(item => { - return item.projectAbbreviation; + return item.projectName; }); form.value.reportTime1 = [form.value.startDate, form.value.endDate]; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; @@ -343,7 +328,7 @@ title.value = '修改巡查计划'; multiple.value = false; form.value = { ...row }; - console.log(form.value, 'form.value form.value '); + // console.log(form.value, 'form.value form.value '); // 做修改回显判断 form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : []; form.value.patrolUserList.forEach(element => { @@ -355,7 +340,7 @@ } // 激活 function handleActive(row) { - console.log(row.id, '1'); + // console.log(row.id, '1'); activation(row.id).then(res => { if (res.code == 200) { proxy.$modal.msgSuccess('激活成功'); @@ -380,26 +365,25 @@ form.value.startDate = form.value.reportTime1[0]; form.value.endDate = form.value.reportTime1[1]; // 处理项目传参 - form.value.projectList = form.value.projectList.map(obj => { - console.log(projectTList.value, 'projectTList.value'); - let nameXm = ''; - projectTList.value.forEach(item => { - if (item.projectNo == obj) { - nameXm = item.projectName; - // console.log(item.projectName, 'item'); - } - }); - // console.log(obj, 'obj'); - return { projectNo: obj, projectName: nameXm }; - }); + // form.value.projectList = form.value.projectList.map(obj => { + // // console.log(projectTList.value, 'projectTList.value'); + // let nameXm = ''; + // projectTList.value.forEach(item => { + // if (item.projectNo == obj) { + // nameXm = item.projectName; + // // console.log(item.projectName, 'item'); + // } + // }); + // // console.log(obj, 'obj'); + // return { projectNo: obj, projectName: nameXm }; + // }); // 处理人员传参 - form.value.patrolUserList = form.value.patrolUserList.map(item => { - console.log(item, 'item'); - return { userId: item }; - }); + // form.value.patrolUserList = form.value.patrolUserList.map(item => { + // // console.log(item, 'item'); + // return { userId: item }; + // }); form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); - if (title.value == '修改巡查计划') { patrolPlanedit(form.value).then(response => { proxy.$modal.msgSuccess('修改成功'); diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue index 96ddbd8..a715836 100644 --- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue +++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue @@ -164,16 +164,8 @@ - - + + @@ -181,16 +173,8 @@ - - + + @@ -319,7 +303,10 @@ //查询维修人员列表 function getUserList() { listUser().then(res => { - userList.value = res.data; + userList.value = res.data || []; + userList.value.map(item => { + item.userId = String(item.userId); + }); }); } @@ -410,21 +397,19 @@ function submitForm() { proxy.$refs['roleRef'].validate(valid => { if (valid) { - console.log(form.value, 'form.value'); // 处理时间传参 form.value.planStartDatetime = form.value.publishTime1[0]; form.value.planEndDatetime = form.value.publishTime1[1]; - // 处理项目传参 - form.value.projectCodeList = form.value.projectCodeList.map(obj => { - return { projectNo: obj.projectNo, projectName: obj.projectName }; - }); + // form.value.projectCodeList = form.value.projectCodeList.map(obj => { + // return { projectNo: obj.projectNo, projectName: obj.projectName }; + // }); // 处理人员传参 - form.value.taskUserIdList = form.value.taskUserIdList.map(obj => { - return { userId: String(obj.userId) }; - }); - + // form.value.taskUserIdList = form.value.taskUserIdList.map(obj => { + // return { userId: String(obj.userId) }; + // }); form.value.basicInfoId = '1686274734091489284'; + // console.log(form.value, 'form.value'); patrolTaskadd(form.value).then(response => { proxy.$modal.msgSuccess('新增成功'); open.value = false; diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index be18943..9be2bbb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -519,3 +519,12 @@ method: 'delete', }); } + +// 分页查询污水处理厂bod浓度填报 +export function sewageBodPage(query) { + return request({ + url: '/business/sewageBod/page', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 7215cd0..96ca7f7 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -5,18 +5,18 @@ - - + + - - + + - - + + @@ -47,10 +47,10 @@ - + - {{ scope.row.isRectify == '1' ? '待整改' : scope.row.isRectify == '2' ? '已整改' : '' }} + {{ scope.row.status == '0' ? '待整改' : scope.row.status == '1' ? '已整改' : '' }} @@ -234,11 +234,11 @@ const multipleA = ref(true); const case_level = ref([ { - value: '1', + value: '0', label: '待整改', }, { - value: '2', + value: '1', label: '已整改', }, ]); @@ -259,9 +259,10 @@ queryParams: { pageNum: 1, pageSize: 10, - handleStatus: '', taskName: '', - taskUserIdList: '', + projectNo: '', + status: '', + patroltype: '', }, queryParamstwo: { pageNum: 1, diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 349548d..d951cba 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -58,7 +58,7 @@ - {{ item.projectAbbreviation }} + {{ item.projectName }} @@ -120,15 +120,7 @@ - + @@ -160,15 +152,7 @@ - + @@ -210,6 +194,7 @@ import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana'; import { listUser } from '@/api/system/user'; import { getProjectInfoList } from '@/api/preassess/targetManage'; +import axios from 'axios'; const { proxy } = getCurrentInstance(); const { patrol_type } = proxy.useDict('patrol_type'); // 巡查类型的字典 console.log(patrol_type); @@ -332,7 +317,7 @@ return item.userName; }); form.value.projectList = row.projectList.map(item => { - return item.projectAbbreviation; + return item.projectName; }); form.value.reportTime1 = [form.value.startDate, form.value.endDate]; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; @@ -343,7 +328,7 @@ title.value = '修改巡查计划'; multiple.value = false; form.value = { ...row }; - console.log(form.value, 'form.value form.value '); + // console.log(form.value, 'form.value form.value '); // 做修改回显判断 form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : []; form.value.patrolUserList.forEach(element => { @@ -355,7 +340,7 @@ } // 激活 function handleActive(row) { - console.log(row.id, '1'); + // console.log(row.id, '1'); activation(row.id).then(res => { if (res.code == 200) { proxy.$modal.msgSuccess('激活成功'); @@ -380,26 +365,25 @@ form.value.startDate = form.value.reportTime1[0]; form.value.endDate = form.value.reportTime1[1]; // 处理项目传参 - form.value.projectList = form.value.projectList.map(obj => { - console.log(projectTList.value, 'projectTList.value'); - let nameXm = ''; - projectTList.value.forEach(item => { - if (item.projectNo == obj) { - nameXm = item.projectName; - // console.log(item.projectName, 'item'); - } - }); - // console.log(obj, 'obj'); - return { projectNo: obj, projectName: nameXm }; - }); + // form.value.projectList = form.value.projectList.map(obj => { + // // console.log(projectTList.value, 'projectTList.value'); + // let nameXm = ''; + // projectTList.value.forEach(item => { + // if (item.projectNo == obj) { + // nameXm = item.projectName; + // // console.log(item.projectName, 'item'); + // } + // }); + // // console.log(obj, 'obj'); + // return { projectNo: obj, projectName: nameXm }; + // }); // 处理人员传参 - form.value.patrolUserList = form.value.patrolUserList.map(item => { - console.log(item, 'item'); - return { userId: item }; - }); + // form.value.patrolUserList = form.value.patrolUserList.map(item => { + // // console.log(item, 'item'); + // return { userId: item }; + // }); form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); - if (title.value == '修改巡查计划') { patrolPlanedit(form.value).then(response => { proxy.$modal.msgSuccess('修改成功'); diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue index 96ddbd8..a715836 100644 --- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue +++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue @@ -164,16 +164,8 @@ - - + + @@ -181,16 +173,8 @@ - - + + @@ -319,7 +303,10 @@ //查询维修人员列表 function getUserList() { listUser().then(res => { - userList.value = res.data; + userList.value = res.data || []; + userList.value.map(item => { + item.userId = String(item.userId); + }); }); } @@ -410,21 +397,19 @@ function submitForm() { proxy.$refs['roleRef'].validate(valid => { if (valid) { - console.log(form.value, 'form.value'); // 处理时间传参 form.value.planStartDatetime = form.value.publishTime1[0]; form.value.planEndDatetime = form.value.publishTime1[1]; - // 处理项目传参 - form.value.projectCodeList = form.value.projectCodeList.map(obj => { - return { projectNo: obj.projectNo, projectName: obj.projectName }; - }); + // form.value.projectCodeList = form.value.projectCodeList.map(obj => { + // return { projectNo: obj.projectNo, projectName: obj.projectName }; + // }); // 处理人员传参 - form.value.taskUserIdList = form.value.taskUserIdList.map(obj => { - return { userId: String(obj.userId) }; - }); - + // form.value.taskUserIdList = form.value.taskUserIdList.map(obj => { + // return { userId: String(obj.userId) }; + // }); form.value.basicInfoId = '1686274734091489284'; + // console.log(form.value, 'form.value'); patrolTaskadd(form.value).then(response => { proxy.$modal.msgSuccess('新增成功'); open.value = false; diff --git a/src/views/longoPeration/SewageFactory.vue b/src/views/longoPeration/SewageFactory.vue index 4cda30a..c630217 100644 --- a/src/views/longoPeration/SewageFactory.vue +++ b/src/views/longoPeration/SewageFactory.vue @@ -23,9 +23,9 @@ - - - + + + @@ -48,7 +48,7 @@ diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index be18943..9be2bbb 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -519,3 +519,12 @@ method: 'delete', }); } + +// 分页查询污水处理厂bod浓度填报 +export function sewageBodPage(query) { + return request({ + url: '/business/sewageBod/page', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 7215cd0..96ca7f7 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -5,18 +5,18 @@ - - + + - - + + - - + + @@ -47,10 +47,10 @@ - + - {{ scope.row.isRectify == '1' ? '待整改' : scope.row.isRectify == '2' ? '已整改' : '' }} + {{ scope.row.status == '0' ? '待整改' : scope.row.status == '1' ? '已整改' : '' }} @@ -234,11 +234,11 @@ const multipleA = ref(true); const case_level = ref([ { - value: '1', + value: '0', label: '待整改', }, { - value: '2', + value: '1', label: '已整改', }, ]); @@ -259,9 +259,10 @@ queryParams: { pageNum: 1, pageSize: 10, - handleStatus: '', taskName: '', - taskUserIdList: '', + projectNo: '', + status: '', + patroltype: '', }, queryParamstwo: { pageNum: 1, diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 349548d..d951cba 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -58,7 +58,7 @@ - {{ item.projectAbbreviation }} + {{ item.projectName }} @@ -120,15 +120,7 @@ - + @@ -160,15 +152,7 @@ - + @@ -210,6 +194,7 @@ import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana'; import { listUser } from '@/api/system/user'; import { getProjectInfoList } from '@/api/preassess/targetManage'; +import axios from 'axios'; const { proxy } = getCurrentInstance(); const { patrol_type } = proxy.useDict('patrol_type'); // 巡查类型的字典 console.log(patrol_type); @@ -332,7 +317,7 @@ return item.userName; }); form.value.projectList = row.projectList.map(item => { - return item.projectAbbreviation; + return item.projectName; }); form.value.reportTime1 = [form.value.startDate, form.value.endDate]; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; @@ -343,7 +328,7 @@ title.value = '修改巡查计划'; multiple.value = false; form.value = { ...row }; - console.log(form.value, 'form.value form.value '); + // console.log(form.value, 'form.value form.value '); // 做修改回显判断 form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : []; form.value.patrolUserList.forEach(element => { @@ -355,7 +340,7 @@ } // 激活 function handleActive(row) { - console.log(row.id, '1'); + // console.log(row.id, '1'); activation(row.id).then(res => { if (res.code == 200) { proxy.$modal.msgSuccess('激活成功'); @@ -380,26 +365,25 @@ form.value.startDate = form.value.reportTime1[0]; form.value.endDate = form.value.reportTime1[1]; // 处理项目传参 - form.value.projectList = form.value.projectList.map(obj => { - console.log(projectTList.value, 'projectTList.value'); - let nameXm = ''; - projectTList.value.forEach(item => { - if (item.projectNo == obj) { - nameXm = item.projectName; - // console.log(item.projectName, 'item'); - } - }); - // console.log(obj, 'obj'); - return { projectNo: obj, projectName: nameXm }; - }); + // form.value.projectList = form.value.projectList.map(obj => { + // // console.log(projectTList.value, 'projectTList.value'); + // let nameXm = ''; + // projectTList.value.forEach(item => { + // if (item.projectNo == obj) { + // nameXm = item.projectName; + // // console.log(item.projectName, 'item'); + // } + // }); + // // console.log(obj, 'obj'); + // return { projectNo: obj, projectName: nameXm }; + // }); // 处理人员传参 - form.value.patrolUserList = form.value.patrolUserList.map(item => { - console.log(item, 'item'); - return { userId: item }; - }); + // form.value.patrolUserList = form.value.patrolUserList.map(item => { + // // console.log(item, 'item'); + // return { userId: item }; + // }); form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); - if (title.value == '修改巡查计划') { patrolPlanedit(form.value).then(response => { proxy.$modal.msgSuccess('修改成功'); diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue index 96ddbd8..a715836 100644 --- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue +++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue @@ -164,16 +164,8 @@ - - + + @@ -181,16 +173,8 @@ - - + + @@ -319,7 +303,10 @@ //查询维修人员列表 function getUserList() { listUser().then(res => { - userList.value = res.data; + userList.value = res.data || []; + userList.value.map(item => { + item.userId = String(item.userId); + }); }); } @@ -410,21 +397,19 @@ function submitForm() { proxy.$refs['roleRef'].validate(valid => { if (valid) { - console.log(form.value, 'form.value'); // 处理时间传参 form.value.planStartDatetime = form.value.publishTime1[0]; form.value.planEndDatetime = form.value.publishTime1[1]; - // 处理项目传参 - form.value.projectCodeList = form.value.projectCodeList.map(obj => { - return { projectNo: obj.projectNo, projectName: obj.projectName }; - }); + // form.value.projectCodeList = form.value.projectCodeList.map(obj => { + // return { projectNo: obj.projectNo, projectName: obj.projectName }; + // }); // 处理人员传参 - form.value.taskUserIdList = form.value.taskUserIdList.map(obj => { - return { userId: String(obj.userId) }; - }); - + // form.value.taskUserIdList = form.value.taskUserIdList.map(obj => { + // return { userId: String(obj.userId) }; + // }); form.value.basicInfoId = '1686274734091489284'; + // console.log(form.value, 'form.value'); patrolTaskadd(form.value).then(response => { proxy.$modal.msgSuccess('新增成功'); open.value = false; diff --git a/src/views/longoPeration/SewageFactory.vue b/src/views/longoPeration/SewageFactory.vue index 4cda30a..c630217 100644 --- a/src/views/longoPeration/SewageFactory.vue +++ b/src/views/longoPeration/SewageFactory.vue @@ -23,9 +23,9 @@ - - - + + + @@ -48,7 +48,7 @@ diff --git a/vite.config.js b/vite.config.js index ea36ec6..24dcf41 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,8 +7,8 @@ const Timestamp = new Date().getTime(); //随机时间戳 // const targetUrl = 'http://192.168.16.254:7200'; //孙逢时 -// const targetUrl = 'http://192.168.20.52:7300'; //杨辉 -const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上 +const targetUrl = 'http://192.168.20.52:7300'; //杨辉 +// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上 // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {
{{ item.projectAbbreviation }}
{{ item.projectName }}