diff --git a/src/router/static.ts b/src/router/static.ts index 12b183c0..53848094 100644 --- a/src/router/static.ts +++ b/src/router/static.ts @@ -119,6 +119,14 @@ export const adminBaseRoute = { title: pageTitle('router.instanceDetail') } }, + { + path: 'programReview', + component: () => import('@/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue'), + name: 'programReview', + meta: { + title: pageTitle('router.programReview') + } + }, // { // path: 'manager/model/edit', // component: () => import('@/views/bpm/model/editor/index.vue'), diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue index 01647c29..a7c00079 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue @@ -29,16 +29,12 @@ import { ref, onMounted, provide, nextTick } from 'vue' import TableStore from '@/utils/tableStore' import Table from '@/components/table/index.vue' import TableHeader from '@/components/table/header/index.vue' -import { ElMessage, ElMessageBox } from 'element-plus' -import { mainHeight } from '@/utils/layout' import { useDictData } from '@/stores/dictData' -import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity' - const dictData = useDictData() -const interferenceType = dictData.getBasicData('Interference_Source') -const istatusList = dictData.getBasicData('On-network_Status') -const TableHeaderRef = ref() const areaOptionList = dictData.getBasicData('jibei_area') + +const { push } = useRouter() +const TableHeaderRef = ref() const tableStore = new TableStore({ url: '/supervision-boot/userReport/getInterferenceUserPage', publicHeight: 65, @@ -86,22 +82,22 @@ const tableStore = new TableStore({ buttons: [ { name: 'productSetting', - title: '电能质量治理工程验收', + title: '方案审查', type: 'primary', icon: 'el-icon-EditPen', render: 'basicButton', click: row => { - + toFangAn(row.id,"3") } }, { name: 'productSetting', - title: '电能质量监测评估', + title: '治理工程', type: 'primary', icon: 'el-icon-EditPen', render: 'basicButton', click: row => { - + toZhiLi(row.id) } } ] @@ -123,6 +119,26 @@ onMounted(() => { tableStore.index() }) +/** 方案审查 */ +const toFangAn = (id: any,activeName:String) => { + push({ + name: 'programReview', + query: { + id: id, + activeName:"3" + } + }) +} + +/** 治理工程 */ +const toZhiLi = (instanceId: any) => { + push({ + name: 'BpmProcessInstanceDetail', + query: { + id: instanceId + } + }) +} /**获取用户性质*/ const getUserTypeName = (userType: any) => { diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue new file mode 100644 index 00000000..80a79fe4 --- /dev/null +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/src/views/pqs/supervise/interfere/index.vue b/src/views/pqs/supervise/interfere/index.vue index 4d7e113d..54e14270 100644 --- a/src/views/pqs/supervise/interfere/index.vue +++ b/src/views/pqs/supervise/interfere/index.vue @@ -18,9 +18,9 @@