From 1487f5ceea18e08e57b6bcbc57ba2a9238b72ef1 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Mon, 24 Jun 2024 16:38:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=20=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=20=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=20=20=E4=BF=AE=E6=94=B9=E4=BA=91=E6=95=88?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panorama/components/mapR.vue | 4 +- .../interferenceUserTable.vue | 37 ++-- .../normalizationManager/programReview.vue | 26 ++- .../components/undocumented/addForm.vue | 22 ++- src/views/pqs/supervise/retire/monitor.vue | 11 +- src/views/pqs/supervise/retire/terminal.vue | 7 + .../components/interferenceUserTable.vue | 4 +- .../components/sensitiveUserPopup.vue | 174 +++++++++++------- .../components/sensitiveUserTable.vue | 2 +- 9 files changed, 187 insertions(+), 100 deletions(-) diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue index 9fedb106..4725ca93 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue @@ -52,7 +52,7 @@ : '' }" > - {{ assessList.score }} + {{ assessList.score == 3.14159 ? '/' : assessList.score }} @@ -81,7 +81,7 @@ : '' }" > - {{ item.score }} + {{ item.score == 3.14159 ? '/' : item.score }} diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue index 34534530..00d9c3c0 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue @@ -47,7 +47,9 @@ import { getUserReportById } from '@/api/supervision-boot/userReport/form' import BpmUserReportDetail from '../../components/undocumented/detail.vue' import { useAdminInfo } from '@/stores/adminInfo' const dictData = useDictData() -const areaOptionList = dictData.getBasicData('jibei_area').filter(item => !(item.name == '超高压' || item.name == '风光储')) +const areaOptionList = dictData + .getBasicData('jibei_area') + .filter(item => !(item.name == '超高压' || item.name == '风光储')) const statusSelect = dictData.statusSelect() //获取登陆用户姓名和部门 const adminInfo = useAdminInfo() @@ -138,12 +140,13 @@ const tableStore = new TableStore({ return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name } }, + // visible:!jb_pl.value && !jb_dky.value?true:false, { title: '操作', minWidth: 180, fixed: 'right', render: 'buttons', - visible:!jb_pl.value && !jb_dky.value?true:false, + buttons: [ { name: 'productSetting', @@ -151,36 +154,36 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-EditPen', render: 'basicButton', - disabled: row => { - return jb_pl.value || jb_dky.value - }, + // disabled: row => { + // return jb_pl.value || jb_dky.value + // }, click: row => { toFangAn(row, 0) } }, { name: 'productSetting', - title: '治理工程申请', + title: '治理工程验收申请', type: 'primary', icon: 'el-icon-EditPen', render: 'basicButton', disabled: row => { - return jb_pl.value || jb_dky.value + return row.needGovernance == 0 }, click: row => { toFangAn(row, 1) } - }, - { - name: 'productSetting', - title: '/', - type: 'primary', - icon: 'el-icon-EditPen', - render: 'basicButton', - disabled: row => { - return !jb_pl.value && !jb_dky.value - } } + // { + // name: 'productSetting', + // title: '/', + // type: 'primary', + // icon: 'el-icon-EditPen', + // render: 'basicButton', + // disabled: row => { + // return !jb_pl.value && !jb_dky.value + // } + // } ] } ], diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue index 4a84e543..37cd3c50 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue @@ -23,8 +23,15 @@ -->
- {{ titleButton }} - + + {{ titleButton }} + + {{ titleButton }} 返回 @@ -65,6 +72,20 @@ const needGovernance = query.needGovernance as unknown as string // 从 URL 传 const dictData = useDictData() const areaOptionList = dictData.getBasicData('jibei_area') const adminInfo = useAdminInfo() +const jb_pl = ref(false) +const jb_dky = ref(false) +jb_pl.value = + adminInfo.$state.roleCode.filter(item => { + return item == 'jb_pl' + }).length != 0 + ? true + : false +jb_dky.value = + adminInfo.$state.roleCode.filter(item => { + return item == 'jb_dky' + }).length != 0 + ? true + : false const tableStore = new TableStore({ url: '/supervision-boot/userReportNormal/userReportGoNetPage', @@ -196,7 +217,6 @@ const tableStore = new TableStore({ click: row => { cancelLeave(row) } - } ] } diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue index 1e959b75..7e1e9c27 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue @@ -80,7 +80,7 @@ v-for="(item, index) in userStateList" :label="item.label" :value="item.value" - :disabled="item.label != '可研'" + :disabled="item.disabled" :key="index" /> @@ -586,25 +586,30 @@ const userTypeList: any = ref([ } ]) //用户状态数组 -const userStateList = reactive([ +const userStateList = ref([ { label: '可研', - value: 0 + value: 0, + disabled: false }, { label: '建设', - value: 1 + value: 1, + disabled: true }, { label: '运行', - value: 2 + value: 2, + disabled: true }, { label: '退运', - value: 3 + value: 3, + disabled: true } ]) const title = ref('') + //获取非线性终端类型树形下拉 const defaultProps = { children: 'children', @@ -623,7 +628,7 @@ const resetForm = () => { userType: 1, //用户性质 1 city: areaOptionList[0].name, //所在地市 1 responsibleDepartment: '', //归口管理部门 1 - userStatus: userStateList[0].value, //用户状态 1 + userStatus: userStateList.value[0].value, //用户状态 1 projectName: '', //用户名称 1 substation: '', //变电站 1 voltageLevel: voltageLevelList[0].id, //电压等级 1 @@ -967,7 +972,7 @@ const fileRaw = (row: any, key: string) => { ] for (let k of list) { if (row[key][k] != null) { - form.value[k] = + form.value[k] = row[key][k].length == 0 ? [] : [ @@ -1351,6 +1356,7 @@ const confirmForm = (flag: boolean) => { // 过滤用户 const filterUsers = (arr: any) => { control.value = false + userStateList.value.map(item => (item.disabled = false)) userTypeList.value = userTypeList.value.filter(item => !arr.includes(item.value)) } defineExpose({ open, filterUsers }) diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue index 87dd1021..0a5b2a6f 100644 --- a/src/views/pqs/supervise/retire/monitor.vue +++ b/src/views/pqs/supervise/retire/monitor.vue @@ -13,6 +13,13 @@ > + + +