diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index 64cb50c..7c151ef 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -8,6 +8,13 @@ params: query, }); } +export function specialNavList(query) { + return request({ + url: '/publicService/trainAndPublicize/list', + method: 'get', + params: query, + }); +} // 培训宣传 新增 export function specialNavAdd(data) { return request({ diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index 64cb50c..7c151ef 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -8,6 +8,13 @@ params: query, }); } +export function specialNavList(query) { + return request({ + url: '/publicService/trainAndPublicize/list', + method: 'get', + params: query, + }); +} // 培训宣传 新增 export function specialNavAdd(data) { return request({ diff --git a/src/assets/images/document/thematicMap/tx.png b/src/assets/images/document/thematicMap/tx.png new file mode 100644 index 0000000..6dd8811 --- /dev/null +++ b/src/assets/images/document/thematicMap/tx.png Binary files differ diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index 64cb50c..7c151ef 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -8,6 +8,13 @@ params: query, }); } +export function specialNavList(query) { + return request({ + url: '/publicService/trainAndPublicize/list', + method: 'get', + params: query, + }); +} // 培训宣传 新增 export function specialNavAdd(data) { return request({ diff --git a/src/assets/images/document/thematicMap/tx.png b/src/assets/images/document/thematicMap/tx.png new file mode 100644 index 0000000..6dd8811 --- /dev/null +++ b/src/assets/images/document/thematicMap/tx.png Binary files differ diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index ec67bc8..cc67429 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -67,7 +67,7 @@ 激活 - 查看 + 详情 修改 @@ -235,7 +235,7 @@ caseid: '', caseidone: '', publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')], - form: {}, + form: { a: [] }, formDate: {}, caseFormDate: { id: '' }, queryParams: { @@ -298,9 +298,15 @@ //查看详情操作 function handleDetail(row) { open.value = true; - title.value = '查看巡查计划'; multiple.value = true; + title.value = '查看巡查计划'; form.value = row; + form.value.patrolUserList = row.taskUserList.map(item => { + return item.userName; + }); + form.value.projectList = row.projectList.map(item => { + return item.projectAbbreviation; + }); } // 修改按钮操作 function handleUpdate(row) { @@ -377,4 +383,9 @@ margin-bottom: 10px; border: 1px solid #004565; } +:deep(.el-range-editor.is-disabled input) { + background-color: #004565 !important; + color: var(--el-disabled-text-color); + cursor: not-allowed; +} diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index 64cb50c..7c151ef 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -8,6 +8,13 @@ params: query, }); } +export function specialNavList(query) { + return request({ + url: '/publicService/trainAndPublicize/list', + method: 'get', + params: query, + }); +} // 培训宣传 新增 export function specialNavAdd(data) { return request({ diff --git a/src/assets/images/document/thematicMap/tx.png b/src/assets/images/document/thematicMap/tx.png new file mode 100644 index 0000000..6dd8811 --- /dev/null +++ b/src/assets/images/document/thematicMap/tx.png Binary files differ diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index ec67bc8..cc67429 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -67,7 +67,7 @@ 激活 - 查看 + 详情 修改 @@ -235,7 +235,7 @@ caseid: '', caseidone: '', publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')], - form: {}, + form: { a: [] }, formDate: {}, caseFormDate: { id: '' }, queryParams: { @@ -298,9 +298,15 @@ //查看详情操作 function handleDetail(row) { open.value = true; - title.value = '查看巡查计划'; multiple.value = true; + title.value = '查看巡查计划'; form.value = row; + form.value.patrolUserList = row.taskUserList.map(item => { + return item.userName; + }); + form.value.projectList = row.projectList.map(item => { + return item.projectAbbreviation; + }); } // 修改按钮操作 function handleUpdate(row) { @@ -377,4 +383,9 @@ margin-bottom: 10px; border: 1px solid #004565; } +:deep(.el-range-editor.is-disabled input) { + background-color: #004565 !important; + color: var(--el-disabled-text-color); + cursor: not-allowed; +} diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue index 91fda0e..5ba34bb 100644 --- a/src/views/publicService/publicmind.vue +++ b/src/views/publicService/publicmind.vue @@ -27,7 +27,10 @@ @@ -69,7 +72,7 @@ pageNum: 1, pageSize: 10, opinion: undefined, - publishTime: ref(proxy.moment(new Date()).format('YYYY')), + publishTime: '', }, }); const { queryParams } = toRefs(allData); diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js index 64cb50c..7c151ef 100644 --- a/src/api/publicService/index.js +++ b/src/api/publicService/index.js @@ -8,6 +8,13 @@ params: query, }); } +export function specialNavList(query) { + return request({ + url: '/publicService/trainAndPublicize/list', + method: 'get', + params: query, + }); +} // 培训宣传 新增 export function specialNavAdd(data) { return request({ diff --git a/src/assets/images/document/thematicMap/tx.png b/src/assets/images/document/thematicMap/tx.png new file mode 100644 index 0000000..6dd8811 --- /dev/null +++ b/src/assets/images/document/thematicMap/tx.png Binary files differ diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index ec67bc8..cc67429 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -67,7 +67,7 @@ 激活 - 查看 + 详情 修改 @@ -235,7 +235,7 @@ caseid: '', caseidone: '', publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')], - form: {}, + form: { a: [] }, formDate: {}, caseFormDate: { id: '' }, queryParams: { @@ -298,9 +298,15 @@ //查看详情操作 function handleDetail(row) { open.value = true; - title.value = '查看巡查计划'; multiple.value = true; + title.value = '查看巡查计划'; form.value = row; + form.value.patrolUserList = row.taskUserList.map(item => { + return item.userName; + }); + form.value.projectList = row.projectList.map(item => { + return item.projectAbbreviation; + }); } // 修改按钮操作 function handleUpdate(row) { @@ -377,4 +383,9 @@ margin-bottom: 10px; border: 1px solid #004565; } +:deep(.el-range-editor.is-disabled input) { + background-color: #004565 !important; + color: var(--el-disabled-text-color); + cursor: not-allowed; +} diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue index 91fda0e..5ba34bb 100644 --- a/src/views/publicService/publicmind.vue +++ b/src/views/publicService/publicmind.vue @@ -27,7 +27,10 @@ @@ -69,7 +72,7 @@ pageNum: 1, pageSize: 10, opinion: undefined, - publishTime: ref(proxy.moment(new Date()).format('YYYY')), + publishTime: '', }, }); const { queryParams } = toRefs(allData); diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue index 44b0c54..c013cd9 100644 --- a/src/views/publicService/special.vue +++ b/src/views/publicService/special.vue @@ -34,9 +34,9 @@ - + - +