diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js index 40140a2..13d02f3 100644 --- a/src/api/longoPeration/inspectiontasks.js +++ b/src/api/longoPeration/inspectiontasks.js @@ -38,3 +38,11 @@ params: query, }); } + +export function patrolProblemlist(query) { + return request({ + url: '/business/patrolProblem/list', + method: 'get', + params: query, + }); +} diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js index 40140a2..13d02f3 100644 --- a/src/api/longoPeration/inspectiontasks.js +++ b/src/api/longoPeration/inspectiontasks.js @@ -38,3 +38,11 @@ params: query, }); } + +export function patrolProblemlist(query) { + return request({ + url: '/business/patrolProblem/list', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 0cb7544..60b7c66 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -34,7 +34,7 @@ - + @@ -63,10 +63,10 @@ 查看 - 发布整改通知 - 提交整改回复单 @@ -231,6 +231,7 @@ const openOne = ref(false); const opendetails = ref(false); const showSearch = ref(true); +const multipleA = ref(true); const case_level = ref([ { value: '1', @@ -344,6 +345,9 @@ // function handleUpdate(Val) { openOne.value = true; + console.log(Val, 'Val'); + // console.log('multipleA.value', multipleA.value); + proxy.resetForm('roleRefOne'); AllData.NumIdOne = Val.id; } @@ -353,6 +357,13 @@ loading.value = true; let res = await rectifypage(queryParams.value); dataList.value = res.data; + res.data.forEach(item => { + if (item.fileListToNotice.length != 0) { + multipleA.value = false; + console.log(multipleA.value, 'multipleA.value'); + } + }); + total.value = res.total; loading.value = false; }; diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js index 40140a2..13d02f3 100644 --- a/src/api/longoPeration/inspectiontasks.js +++ b/src/api/longoPeration/inspectiontasks.js @@ -38,3 +38,11 @@ params: query, }); } + +export function patrolProblemlist(query) { + return request({ + url: '/business/patrolProblem/list', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 0cb7544..60b7c66 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -34,7 +34,7 @@ - + @@ -63,10 +63,10 @@ 查看 - 发布整改通知 - 提交整改回复单 @@ -231,6 +231,7 @@ const openOne = ref(false); const opendetails = ref(false); const showSearch = ref(true); +const multipleA = ref(true); const case_level = ref([ { value: '1', @@ -344,6 +345,9 @@ // function handleUpdate(Val) { openOne.value = true; + console.log(Val, 'Val'); + // console.log('multipleA.value', multipleA.value); + proxy.resetForm('roleRefOne'); AllData.NumIdOne = Val.id; } @@ -353,6 +357,13 @@ loading.value = true; let res = await rectifypage(queryParams.value); dataList.value = res.data; + res.data.forEach(item => { + if (item.fileListToNotice.length != 0) { + multipleA.value = false; + console.log(multipleA.value, 'multipleA.value'); + } + }); + total.value = res.total; loading.value = false; }; diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 41b65ac..b39b4b4 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -46,7 +46,7 @@ - + @@ -72,8 +72,8 @@ - - + + - - + + 激活 @@ -253,7 +253,7 @@ planName: '', status: '', startTime: '', - endDate: '', + endTime: '', }, rules: { planName: [{ required: true, message: '请输入巡查计划名称', trigger: 'blur' }], @@ -272,10 +272,10 @@ // console.log('123', AllData.publishTime); if (AllData.publishTime) { queryParams.value.startTime = AllData.publishTime[0]; - queryParams.value.endDate = AllData.publishTime[1]; + queryParams.value.endTime = AllData.publishTime[1]; } else { queryParams.value.startTime = ''; - queryParams.value.endDate = ''; + queryParams.value.endTime = ''; } getList(); } @@ -312,7 +312,7 @@ loading.value = true; if (AllData.publishTime) { queryParams.value.startTime = AllData.publishTime[0]; - queryParams.value.endDate = AllData.publishTime[1]; + queryParams.value.endTime = AllData.publishTime[1]; } let res = await patrolPlanpage(queryParams.value); dataList.value = res.data; @@ -334,7 +334,7 @@ form.value.projectList = row.projectList.map(item => { return item.projectAbbreviation; }); - form.value.reportTime1 = [form.value.startDate, form.value.endDate]; + form.value.reportTime1 = [form.value.startDate, form.value.endTime]; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; } // 修改按钮操作 @@ -351,7 +351,7 @@ }); form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : []; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; - form.value.reportTime1 = [form.value.startDate, form.value.endDate]; + form.value.reportTime1 = [form.value.startDate, form.value.endTime]; } // 激活 function handleActive(row) { @@ -378,7 +378,7 @@ if (valid) { // 处理时间传参 form.value.startDate = form.value.reportTime1[0]; - form.value.endDate = form.value.reportTime1[1]; + form.value.endTime = form.value.reportTime1[1]; // 处理项目传参 form.value.projectList = form.value.projectList.map(obj => { console.log(projectTList.value, 'projectTList.value'); @@ -451,4 +451,7 @@ color: var(--el-disabled-text-color); cursor: not-allowed; } +:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) { + background-color: #004565 !important; +} diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js index 40140a2..13d02f3 100644 --- a/src/api/longoPeration/inspectiontasks.js +++ b/src/api/longoPeration/inspectiontasks.js @@ -38,3 +38,11 @@ params: query, }); } + +export function patrolProblemlist(query) { + return request({ + url: '/business/patrolProblem/list', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 0cb7544..60b7c66 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -34,7 +34,7 @@ - + @@ -63,10 +63,10 @@ 查看 - 发布整改通知 - 提交整改回复单 @@ -231,6 +231,7 @@ const openOne = ref(false); const opendetails = ref(false); const showSearch = ref(true); +const multipleA = ref(true); const case_level = ref([ { value: '1', @@ -344,6 +345,9 @@ // function handleUpdate(Val) { openOne.value = true; + console.log(Val, 'Val'); + // console.log('multipleA.value', multipleA.value); + proxy.resetForm('roleRefOne'); AllData.NumIdOne = Val.id; } @@ -353,6 +357,13 @@ loading.value = true; let res = await rectifypage(queryParams.value); dataList.value = res.data; + res.data.forEach(item => { + if (item.fileListToNotice.length != 0) { + multipleA.value = false; + console.log(multipleA.value, 'multipleA.value'); + } + }); + total.value = res.total; loading.value = false; }; diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 41b65ac..b39b4b4 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -46,7 +46,7 @@ - + @@ -72,8 +72,8 @@ - - + + - - + + 激活 @@ -253,7 +253,7 @@ planName: '', status: '', startTime: '', - endDate: '', + endTime: '', }, rules: { planName: [{ required: true, message: '请输入巡查计划名称', trigger: 'blur' }], @@ -272,10 +272,10 @@ // console.log('123', AllData.publishTime); if (AllData.publishTime) { queryParams.value.startTime = AllData.publishTime[0]; - queryParams.value.endDate = AllData.publishTime[1]; + queryParams.value.endTime = AllData.publishTime[1]; } else { queryParams.value.startTime = ''; - queryParams.value.endDate = ''; + queryParams.value.endTime = ''; } getList(); } @@ -312,7 +312,7 @@ loading.value = true; if (AllData.publishTime) { queryParams.value.startTime = AllData.publishTime[0]; - queryParams.value.endDate = AllData.publishTime[1]; + queryParams.value.endTime = AllData.publishTime[1]; } let res = await patrolPlanpage(queryParams.value); dataList.value = res.data; @@ -334,7 +334,7 @@ form.value.projectList = row.projectList.map(item => { return item.projectAbbreviation; }); - form.value.reportTime1 = [form.value.startDate, form.value.endDate]; + form.value.reportTime1 = [form.value.startDate, form.value.endTime]; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; } // 修改按钮操作 @@ -351,7 +351,7 @@ }); form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : []; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; - form.value.reportTime1 = [form.value.startDate, form.value.endDate]; + form.value.reportTime1 = [form.value.startDate, form.value.endTime]; } // 激活 function handleActive(row) { @@ -378,7 +378,7 @@ if (valid) { // 处理时间传参 form.value.startDate = form.value.reportTime1[0]; - form.value.endDate = form.value.reportTime1[1]; + form.value.endTime = form.value.reportTime1[1]; // 处理项目传参 form.value.projectList = form.value.projectList.map(obj => { console.log(projectTList.value, 'projectTList.value'); @@ -451,4 +451,7 @@ color: var(--el-disabled-text-color); cursor: not-allowed; } +:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) { + background-color: #004565 !important; +} diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue index dd7e526..e7dac3a 100644 --- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue +++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue @@ -66,9 +66,9 @@ - + - + diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js index 40140a2..13d02f3 100644 --- a/src/api/longoPeration/inspectiontasks.js +++ b/src/api/longoPeration/inspectiontasks.js @@ -38,3 +38,11 @@ params: query, }); } + +export function patrolProblemlist(query) { + return request({ + url: '/business/patrolProblem/list', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 0cb7544..60b7c66 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -34,7 +34,7 @@ - + @@ -63,10 +63,10 @@ 查看 - 发布整改通知 - 提交整改回复单 @@ -231,6 +231,7 @@ const openOne = ref(false); const opendetails = ref(false); const showSearch = ref(true); +const multipleA = ref(true); const case_level = ref([ { value: '1', @@ -344,6 +345,9 @@ // function handleUpdate(Val) { openOne.value = true; + console.log(Val, 'Val'); + // console.log('multipleA.value', multipleA.value); + proxy.resetForm('roleRefOne'); AllData.NumIdOne = Val.id; } @@ -353,6 +357,13 @@ loading.value = true; let res = await rectifypage(queryParams.value); dataList.value = res.data; + res.data.forEach(item => { + if (item.fileListToNotice.length != 0) { + multipleA.value = false; + console.log(multipleA.value, 'multipleA.value'); + } + }); + total.value = res.total; loading.value = false; }; diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 41b65ac..b39b4b4 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -46,7 +46,7 @@ - + @@ -72,8 +72,8 @@ - - + + - - + + 激活 @@ -253,7 +253,7 @@ planName: '', status: '', startTime: '', - endDate: '', + endTime: '', }, rules: { planName: [{ required: true, message: '请输入巡查计划名称', trigger: 'blur' }], @@ -272,10 +272,10 @@ // console.log('123', AllData.publishTime); if (AllData.publishTime) { queryParams.value.startTime = AllData.publishTime[0]; - queryParams.value.endDate = AllData.publishTime[1]; + queryParams.value.endTime = AllData.publishTime[1]; } else { queryParams.value.startTime = ''; - queryParams.value.endDate = ''; + queryParams.value.endTime = ''; } getList(); } @@ -312,7 +312,7 @@ loading.value = true; if (AllData.publishTime) { queryParams.value.startTime = AllData.publishTime[0]; - queryParams.value.endDate = AllData.publishTime[1]; + queryParams.value.endTime = AllData.publishTime[1]; } let res = await patrolPlanpage(queryParams.value); dataList.value = res.data; @@ -334,7 +334,7 @@ form.value.projectList = row.projectList.map(item => { return item.projectAbbreviation; }); - form.value.reportTime1 = [form.value.startDate, form.value.endDate]; + form.value.reportTime1 = [form.value.startDate, form.value.endTime]; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; } // 修改按钮操作 @@ -351,7 +351,7 @@ }); form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : []; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; - form.value.reportTime1 = [form.value.startDate, form.value.endDate]; + form.value.reportTime1 = [form.value.startDate, form.value.endTime]; } // 激活 function handleActive(row) { @@ -378,7 +378,7 @@ if (valid) { // 处理时间传参 form.value.startDate = form.value.reportTime1[0]; - form.value.endDate = form.value.reportTime1[1]; + form.value.endTime = form.value.reportTime1[1]; // 处理项目传参 form.value.projectList = form.value.projectList.map(obj => { console.log(projectTList.value, 'projectTList.value'); @@ -451,4 +451,7 @@ color: var(--el-disabled-text-color); cursor: not-allowed; } +:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) { + background-color: #004565 !important; +} diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue index dd7e526..e7dac3a 100644 --- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue +++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue @@ -66,9 +66,9 @@ - + - + diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue index c1e596c..e44eae9 100644 --- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue +++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue @@ -309,6 +309,7 @@ //搜索 function handleQuery() { getList(); + getList1(); } //重置 function resetQuery() { diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js index 40140a2..13d02f3 100644 --- a/src/api/longoPeration/inspectiontasks.js +++ b/src/api/longoPeration/inspectiontasks.js @@ -38,3 +38,11 @@ params: query, }); } + +export function patrolProblemlist(query) { + return request({ + url: '/business/patrolProblem/list', + method: 'get', + params: query, + }); +} diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 0cb7544..60b7c66 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -34,7 +34,7 @@ - + @@ -63,10 +63,10 @@ 查看 - 发布整改通知 - 提交整改回复单 @@ -231,6 +231,7 @@ const openOne = ref(false); const opendetails = ref(false); const showSearch = ref(true); +const multipleA = ref(true); const case_level = ref([ { value: '1', @@ -344,6 +345,9 @@ // function handleUpdate(Val) { openOne.value = true; + console.log(Val, 'Val'); + // console.log('multipleA.value', multipleA.value); + proxy.resetForm('roleRefOne'); AllData.NumIdOne = Val.id; } @@ -353,6 +357,13 @@ loading.value = true; let res = await rectifypage(queryParams.value); dataList.value = res.data; + res.data.forEach(item => { + if (item.fileListToNotice.length != 0) { + multipleA.value = false; + console.log(multipleA.value, 'multipleA.value'); + } + }); + total.value = res.total; loading.value = false; }; diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 41b65ac..b39b4b4 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -46,7 +46,7 @@ - + @@ -72,8 +72,8 @@ - - + + - - + + 激活 @@ -253,7 +253,7 @@ planName: '', status: '', startTime: '', - endDate: '', + endTime: '', }, rules: { planName: [{ required: true, message: '请输入巡查计划名称', trigger: 'blur' }], @@ -272,10 +272,10 @@ // console.log('123', AllData.publishTime); if (AllData.publishTime) { queryParams.value.startTime = AllData.publishTime[0]; - queryParams.value.endDate = AllData.publishTime[1]; + queryParams.value.endTime = AllData.publishTime[1]; } else { queryParams.value.startTime = ''; - queryParams.value.endDate = ''; + queryParams.value.endTime = ''; } getList(); } @@ -312,7 +312,7 @@ loading.value = true; if (AllData.publishTime) { queryParams.value.startTime = AllData.publishTime[0]; - queryParams.value.endDate = AllData.publishTime[1]; + queryParams.value.endTime = AllData.publishTime[1]; } let res = await patrolPlanpage(queryParams.value); dataList.value = res.data; @@ -334,7 +334,7 @@ form.value.projectList = row.projectList.map(item => { return item.projectAbbreviation; }); - form.value.reportTime1 = [form.value.startDate, form.value.endDate]; + form.value.reportTime1 = [form.value.startDate, form.value.endTime]; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; } // 修改按钮操作 @@ -351,7 +351,7 @@ }); form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : []; form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : []; - form.value.reportTime1 = [form.value.startDate, form.value.endDate]; + form.value.reportTime1 = [form.value.startDate, form.value.endTime]; } // 激活 function handleActive(row) { @@ -378,7 +378,7 @@ if (valid) { // 处理时间传参 form.value.startDate = form.value.reportTime1[0]; - form.value.endDate = form.value.reportTime1[1]; + form.value.endTime = form.value.reportTime1[1]; // 处理项目传参 form.value.projectList = form.value.projectList.map(obj => { console.log(projectTList.value, 'projectTList.value'); @@ -451,4 +451,7 @@ color: var(--el-disabled-text-color); cursor: not-allowed; } +:deep(.el-table .el-table__body-wrapper td.el-table-fixed-column--right) { + background-color: #004565 !important; +} diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue index dd7e526..e7dac3a 100644 --- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue +++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue @@ -66,9 +66,9 @@ - + - + diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue index c1e596c..e44eae9 100644 --- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue +++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue @@ -309,6 +309,7 @@ //搜索 function handleQuery() { getList(); + getList1(); } //重置 function resetQuery() { diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue index daa5bb5..be14038 100644 --- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue +++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue @@ -6,7 +6,7 @@ - 巡查任务名称 + 巡查任务名称11 {{ props.DataList.taskName }} @@ -108,7 +108,7 @@