From 78954d2e1166ced0f2772674cd11a25bf1f57d25 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Tue, 28 May 2024 14:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92-=E5=AE=9E=E6=96=BD=E9=97=AE=E9=A2=98=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=96=B0=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/static.ts                          | 23 ++++---
 .../plan/components/effectProblem/index.vue   | 64 +++++++++++--------
 src/views/pqs/supervise/plan/index.vue        | 12 +++-
 3 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/src/router/static.ts b/src/router/static.ts
index 63ebd867..3aa8137d 100644
--- a/src/router/static.ts
+++ b/src/router/static.ts
@@ -58,7 +58,6 @@ export const adminBaseRoute = {
                         title: pageTitle('router.eventView')
                     }
                 }
-
             ]
         },
         {
@@ -85,7 +84,7 @@ export const adminBaseRoute = {
                     meta: {
                         title: pageTitle('router.schemeHistory')
                     }
-                },
+                }
             ]
         },
         {
@@ -121,12 +120,21 @@ export const adminBaseRoute = {
                 },
                 {
                     path: 'ProgramReviewInter',
-                    component: () => import('@/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue'),
+                    component: () =>
+                        import('@/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue'),
                     name: 'ProgramReview',
                     meta: {
                         title: pageTitle('router.programReview')
                     }
                 },
+                {
+                    path: 'effectProblem',
+                    component: () => import('@/views/pqs/supervise/plan/components/effectProblem/index.vue'),
+                    name: 'PlanEffectProblem',
+                    meta: {
+                        title: pageTitle('router.effectProblem')
+                    }
+                }
                 // {
                 //     path: 'manager/model/edit',
                 //     component: () => import('@/views/bpm/model/editor/index.vue'),
@@ -151,9 +159,9 @@ export const adminBaseRoute = {
                 //         activeMenu: '/bpm/manager/model'
                 //     }
                 // },
-
             ]
-        },    /*{
+        },
+        /*{
             path: '/bpm',
             name: 'bpm',
             meta: {
@@ -179,7 +187,6 @@ export const adminBaseRoute = {
 
             ]
         },*/
-
     ]
 }
 
@@ -191,7 +198,7 @@ const staticRoutes: Array<RouteRecordRaw> = [
     adminBaseRoute,
     {
         path: '/',
-        redirect: (to) => {
+        redirect: to => {
             return {
                 name: 'adminMainLoading'
             }
@@ -221,7 +228,7 @@ const staticRoutes: Array<RouteRecordRaw> = [
     {
         // 后台找不到页面了-可能是路由未加载上
         path: adminBaseRoutePath + ':path(.*)*',
-        redirect: (to) => {
+        redirect: to => {
             return {
                 name: 'adminMainLoading',
                 params: {
diff --git a/src/views/pqs/supervise/plan/components/effectProblem/index.vue b/src/views/pqs/supervise/plan/components/effectProblem/index.vue
index 324f4810..a7fa4a10 100644
--- a/src/views/pqs/supervise/plan/components/effectProblem/index.vue
+++ b/src/views/pqs/supervise/plan/components/effectProblem/index.vue
@@ -1,5 +1,6 @@
 <template>
-    <el-dialog
+    <div class="default-main">
+        <!-- <el-dialog
         v-model="dialogFormVisible"
         title="技术监督计划实施问题"
         width="90%"
@@ -9,7 +10,7 @@
         draggable
         custom-class="fixed-dialog"
         @closed="close"
-    >
+    > -->
         <TableHeader area datePicker ref="TableHeaderRef">
             <!-- <template #select>
             <el-form-item label="工程名称">
@@ -28,12 +29,15 @@
         </template> -->
             <template #operation>
                 <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
+                <el-button icon="el-icon-Back" @click="go(-1)">返回</el-button>
                 <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
             </template>
         </TableHeader>
         <Table ref="tableRefs" />
-    </el-dialog>
-    <addForm ref="addFormRef" :planId="planId" @onSubmit="effectTableStore.index()"></addForm>
+
+        <!-- </el-dialog> -->
+        <addForm ref="addFormRef" :planId="planId" @onSubmit="effectTableStore.index()"></addForm>
+    </div>
 </template>
 <script lang="ts" setup>
 import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
@@ -48,6 +52,9 @@ import { uploadFile } from '@/api/system-boot/file'
 import { addPlanFormData, getUserByDeptId } from '@/api/supervision-boot/plan/index'
 import { getAreaList } from '@/api/common'
 import Area from '@/components/form/area/index.vue'
+defineOptions({
+    name: 'PlanEffectProblem'
+})
 const emits = defineEmits([''])
 const props = defineProps({
     effectProblemForm: {
@@ -67,7 +74,7 @@ const rectificationStatusList = dictData.getBasicData('rectification_type')
 const problemLevelList = dictData.getBasicData('problem_level_type')
 const effectTableStore = new TableStore({
     url: '/supervision-boot/superProblem/pageProblem',
-    publicHeight: 65,
+    // publicHeight: 65,
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
@@ -95,30 +102,30 @@ const effectTableStore = new TableStore({
                 return row.cellValue ? row.cellValue : '/'
             }
         },
-        { 
-            field: 'problemType', 
+        {
+            field: 'problemType',
             title: '问题类型',
-             minWidth: 170 ,
-             formatter: (row: any) => {
+            minWidth: 170,
+            formatter: (row: any) => {
                 return problemTypeList.filter(item => item.id === row.cellValue)[0]?.name
             }
         },
         { field: 'rectificationMeasure', title: '整改措施', minWidth: 170 },
         { field: 'rectificationProgramme', title: '整改方案', minWidth: 170 },
-        { 
+        {
             field: 'rectificationStatus',
-             title: '整改情况', 
-             minWidth: 170 ,
-             formatter: (row: any) => {
+            title: '整改情况',
+            minWidth: 170,
+            formatter: (row: any) => {
                 return rectificationStatusList.filter(item => item.id === row.cellValue)[0]?.name
             }
         },
         {
-            field: 'rectificationTime', 
-            title: '整改时间', 
-            minWidth: 170 ,
+            field: 'rectificationTime',
+            title: '整改时间',
+            minWidth: 170,
             formatter: (row: any) => {
-                return row.cellValue.replace('T',' ')
+                return row.cellValue.replace('T', ' ')
             }
         },
         { field: 'remark', title: '备注', minWidth: 170 },
@@ -144,7 +151,7 @@ const effectTableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
-                    disabled:row=>{
+                    disabled: row => {
                         return true
                     },
                     click: row => {
@@ -159,12 +166,15 @@ const effectTableStore = new TableStore({
         effectTableStore.table.params.orgNo = effectTableStore.table.params.deptIndex
     }
 })
+const { query } = useRoute() // 查询参数
+const { go } = useRouter() // 路由
+const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
+planId.value = queryId
 watch(
-    () => props.effectProblemForm,
+    () => queryId,
     (val, oldVal) => {
-        if (val.planId != '' && dialogFormVisible.value) {
-            planId.value = val.planId
-            effectTableStore.table.params.planId = planId.value
+        if (val) {
+            effectTableStore.table.params.planId = val
             effectTableStore.index()
         }
     },
@@ -182,13 +192,13 @@ const close = () => {
     // emits('onSubmit')
 }
 //新增
-const addFormRef=ref()
-const addFormModel=()=>{
-    addFormRef.value.open({},'add')
-} 
+const addFormRef = ref()
+const addFormModel = () => {
+    addFormRef.value.open({}, 'add')
+}
 //详情
 const handleDetail = (row: any) => {
-    addFormRef.value.open(row,'detail')
+    addFormRef.value.open(row, 'detail')
 }
 //修改
 const handleEdit = (row: any) => {
diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue
index 936818a5..055d5d15 100644
--- a/src/views/pqs/supervise/plan/index.vue
+++ b/src/views/pqs/supervise/plan/index.vue
@@ -47,7 +47,7 @@ import effectProblem from './components/effectProblem/index.vue'
 import { planDetailsAudit ,sendAlarm} from '@/api/supervision-boot/plan/index'
 import { ElMessage } from 'element-plus'
 defineOptions({
-    name: '/admin/plan'
+    name: 'supervise/plan'
 })
 // const layout = mainHeight(120) as any
 const dictData = useDictData()
@@ -296,8 +296,14 @@ const handleAlarmForm=(row:any)=>{
 const effectProblemList = ref()
 const effectProblemForm: any = ref({})
 const handleEffectProblem = (row: any) => {
-    effectProblemForm.value = row
-    effectProblemList.value.open()
+    // effectProblemForm.value = row
+    // effectProblemList.value.open()
+    push({
+        name: 'PlanEffectProblem',
+        query: {
+            id: row.planId
+        }
+    })
 }
 
 /**获取用户性质*/