From 6e6cfa5be0ec38e4a637737568169b2cb7091f85 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Mon, 17 Feb 2025 16:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/routers/modules/staticRouter.ts  | 116 +++++++++---------
 .../testScript/components/testScriptPopup.vue |   1 -
 .../src/views/machine/testScript/index.vue    |   1 +
 .../plan/planList/components/devTransfer.vue  |  12 +-
 .../plan/planList/components/planPopup.vue    |   6 +-
 frontend/src/views/plan/planList/index.vue    |   5 +
 6 files changed, 76 insertions(+), 65 deletions(-)

diff --git a/frontend/src/routers/modules/staticRouter.ts b/frontend/src/routers/modules/staticRouter.ts
index eb0a877..0062fc8 100644
--- a/frontend/src/routers/modules/staticRouter.ts
+++ b/frontend/src/routers/modules/staticRouter.ts
@@ -27,64 +27,64 @@ export const staticRouter: RouteRecordRaw[] = [
         name: "plan",
         redirect: "/plan/planList",
         children: [
-          {
-            path: "/plan/planList",
-            name: "planList",
-            component: () => import("@/views/plan/planList/index.vue"),
-            meta: {
-              title: "检测计划列表",
-              icon: "List",
-              isLink: "",
-              isHide: false,
-              isFull: false,
-              isAffix: false,
-              isKeepAlive: true,//缓存改成true
-            },
-          },
-          {
-            path: "/plan/singlePlanList",
-            name: "singlePlanList",
-            component: () => import("@/views/plan/singlePlanList/index.vue"),
-            meta: {
-              title: "单个计划列表",
-              icon: "List",
-              isLink: "",
-              isHide: false,
-              isFull: false,
-              isAffix: false,
-              isKeepAlive: true,
-            },
-          },
-          {
-            path: "/plan/preTest",
-            name: "preTest",
-            component: () => import("@/views/plan/preTest/index.vue"),
-            meta: {
-              title: "预检测",
-              icon: "List",
-              isLink: "",
-              isHide: false,
-              isFull: false,
-              isAffix: false,
-              isKeepAlive: false,
-            },
-          },
-          {
-            path: "/plan/autoTest",
-            name: "autoTest",
-            component: () => import("@/views/plan/autoTest/index.vue"),
-            meta: {
-              title: "自动检测",
-              icon: "List",
-              isLink: "",
-              hideTab:true,
-              parentPath:'/system/proTable',
-              isHide: false,
-              isFull: false,
-              isAffix: false,
-              isKeepAlive: true,
-            },
-          },
+          // {
+          //   path: "/plan/planList",
+          //   name: "planList",
+          //   component: () => import("@/views/plan/planList/index.vue"),
+          //   meta: {
+          //     title: "检测计划列表",
+          //     icon: "List",
+          //     isLink: "",
+          //     isHide: false,
+          //     isFull: false,
+          //     isAffix: false,
+          //     isKeepAlive: true,//缓存改成true
+          //   },
+          // },
+          // {
+          //   path: "/plan/singlePlanList",
+          //   name: "singlePlanList",
+          //   component: () => import("@/views/plan/singlePlanList/index.vue"),
+          //   meta: {
+          //     title: "单个计划列表",
+          //     icon: "List",
+          //     isLink: "",
+          //     isHide: false,
+          //     isFull: false,
+          //     isAffix: false,
+          //     isKeepAlive: true,
+          //   },
+          // },
+          // {
+          //   path: "/plan/preTest",
+          //   name: "preTest",
+          //   component: () => import("@/views/plan/preTest/index.vue"),
+          //   meta: {
+          //     title: "预检测",
+          //     icon: "List",
+          //     isLink: "",
+          //     isHide: false,
+          //     isFull: false,
+          //     isAffix: false,
+          //     isKeepAlive: false,
+          //   },
+          // },
+          // {
+          //   path: "/plan/autoTest",
+          //   name: "autoTest",
+          //   component: () => import("@/views/plan/autoTest/index.vue"),
+          //   meta: {
+          //     title: "自动检测",
+          //     icon: "List",
+          //     isLink: "",
+          //     hideTab:true,
+          //     parentPath:'/system/proTable',
+          //     isHide: false,
+          //     isFull: false,
+          //     isAffix: false,
+          //     isKeepAlive: true,
+          //   },
+          // },
           {
             path: "/machine/testScriptAdd",
             name: "testScriptAdd",
diff --git a/frontend/src/views/machine/testScript/components/testScriptPopup.vue b/frontend/src/views/machine/testScript/components/testScriptPopup.vue
index 808a5c9..c1bb050 100644
--- a/frontend/src/views/machine/testScript/components/testScriptPopup.vue
+++ b/frontend/src/views/machine/testScript/components/testScriptPopup.vue
@@ -97,7 +97,6 @@ const save = () => {}
 
 // 打开弹窗，可能是新增，也可能是编辑
 const open = async (sign: string, row: any, currentMode: string, id: string) => {
- 
     const result = await getDictTreeByCode({ code: 'Script_Indicator_Items' })
 
     const allOptions = convertToOptions(result.data as Dict.ResDictTree[])
diff --git a/frontend/src/views/machine/testScript/index.vue b/frontend/src/views/machine/testScript/index.vue
index ac6e05f..e509b95 100644
--- a/frontend/src/views/machine/testScript/index.vue
+++ b/frontend/src/views/machine/testScript/index.vue
@@ -152,6 +152,7 @@ const openDialog = (titleType: string, row: Partial<TestScript.ResTestScript> =
                 state: { title: '新增检测脚本', row: row, mode: modeStore.currentMode }
             })
         } else {
+            
             testScriptPopup.value?.open(titleType, row, modeStore.currentMode, '')
         }
     }
diff --git a/frontend/src/views/plan/planList/components/devTransfer.vue b/frontend/src/views/plan/planList/components/devTransfer.vue
index 7770a8f..5722731 100644
--- a/frontend/src/views/plan/planList/components/devTransfer.vue
+++ b/frontend/src/views/plan/planList/components/devTransfer.vue
@@ -4,10 +4,10 @@
     <div>
         <el-transfer v-model="value" 
         filterable
-      :filter-method="filterMethod"
-      filter-placeholder="请输入内容搜索"
-      :data="allData" 
-      :titles="['未绑定设备', '已绑定设备']">
+        :filter-method="filterMethod"
+        filter-placeholder="请输入内容搜索"
+        :data="allData" 
+        :titles="['未绑定设备', '已绑定设备']">
       <template #default="{ option }">
         <el-tooltip :content="option.tips" placement="top" :show-after=1000>
           <span>{{ option.label }}</span>
@@ -69,6 +69,8 @@ const filterMethod = (query: string, item: { label?: string }) => {
   dialogVisible.value = true
   planData.value = data
 
+  console.log('123')
+
   const pqDevList_Result1 = await getUnboundPqDevList(data);
   unboundPqDevList.value = pqDevList_Result1.data as Device.ReqPqDevParams[];
 
@@ -76,9 +78,11 @@ const filterMethod = (query: string, item: { label?: string }) => {
   boundPqDevList.value = pqDevList_Result2.data as Device.ReqPqDevParams[];
 
   value.value = boundPqDevList.value.map((i: { id: { toString: () => any } }) => i.id.toString());
+  console.log('123',value.value)
 }
   const close = () => {
     dialogVisible.value = false
+   
   }
 
   const save = async () => {
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index 14c02ef..2762897 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/frontend/src/views/plan/planList/components/planPopup.vue
@@ -214,12 +214,13 @@ const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
 
   // 关闭弹窗
   const close = () => {
+    value.value = []
     dialogVisible.value = false
     // 清空dialogForm中的值
     resetFormContent()
     // 重置表单
     dialogFormRef.value?.resetFields()
-    
+   
   }
 
 
@@ -278,7 +279,8 @@ const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
 const open = async (sign: string, 
               data: Plan.ReqPlan,
               currentMode: string,) => {
-
+    
+    value.value = []
      //处理异步调用
      const patternId   = dictStore.getDictData('Pattern').find(item=>item.name=== currentMode)?.id ?? ''
      data.pattern = patternId
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index bdda78f..c77c760 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -16,6 +16,7 @@
         <el-button type='danger' v-auth.plan="'delete'" :icon='Delete' plain :disabled='!scope.isSelected'  @click='batchDelete(scope.selectedListIds)'>
           删除
         </el-button>
+        <el-button type='primary' v-auth.plan="'analysis'" link :icon='List' @click='statisticalAnalysisMore(scope.selectedListIds)'>统计分析</el-button>
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
@@ -394,6 +395,10 @@ const showDeviceOpen = (row: Partial<Plan.ReqPlan> = {}) => {
 
 const myDict = new Map<string, any[]>();
 
+const statisticalAnalysisMore = async (id: string[]) =>{
+
+}
+
 const statisticalAnalysis = async (row: Partial<Plan.ReqPlan> = {}) => {
   useDownload(staticsAnalyse,row.name+'分析结果', {planId:row.id}, false,'.xlsx')