From a027dc75c3c966473e481bba6dd1143ba836bf68 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Mon, 16 Dec 2024 16:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A5=BC=E5=9B=BE=E5=92=8C=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/config/config.default.js            |   8 +-
 frontend/src/views/home/components/table.vue | 130 +++++++------------
 frontend/src/views/home/tabs/dashboard.vue   |   8 +-
 3 files changed, 49 insertions(+), 97 deletions(-)

diff --git a/electron/config/config.default.js b/electron/config/config.default.js
index aed196f..c42a1ab 100644
--- a/electron/config/config.default.js
+++ b/electron/config/config.default.js
@@ -25,10 +25,10 @@ module.exports = (appInfo) => {
    */
   config.windowsOption = {
     title: '自动检测平台',
-    width: 1280,
-    height: 850,
-    minWidth: 1280,
-    minHeight: 850,
+    width: 1600,
+    height: 950,
+    minWidth: 1600,
+    minHeight: 950,
     webPreferences: {
       //webSecurity: false,
       contextIsolation: false, // false -> 可在渲染进程中使用electron的api，true->需要bridge.js(contextBridge)
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 4ac6878..08e5d0b 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -14,7 +14,7 @@
     >
     <!-- :height="tableHeight" -->
       <!-- 表格 header 按钮 -->
-      <template #tableHeader="scope">
+      <template #tableHeader="">
         <el-form :model="form" :inline="true">
           <el-form-item label="关键字">
             <el-input v-model="form.search" placeholder="请输入设备名称、类型"></el-input>
@@ -239,7 +239,7 @@
 import { useRouter } from "vue-router";
 import type { Device } from '@/api/device/interface/device'
 import { useHandleData } from "@/hooks/useHandleData";
-import { ElMessage, ElMessageBox, ElLoading} from "element-plus";
+import { ElMessage, ElMessageBox, ElLoading, Action} from "element-plus";
 import ProTable from "@/components/ProTable/index.vue";
 import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
 import {
@@ -300,60 +300,56 @@ id: {
 })
 
 //下拉框数据
+interface Dict {
+  id: string;
+  label: string;
+}
 //检测状态数据
-let checkStatusList = reactive([
+const checkStatus: Dict[] = [
   {
-    label: "未检",
-    value: 0,
-    disabled: false,
+    id: "0",
+    label: '未检',
   },
   {
-    label: "检测中",
-    value: 1,
-    disabled: false,
+    id: "1",
+    label: '检测中',
   },
   {
-    label: "检测完成",
-    value: 2,
-    disabled: false,
+    id: "2",
+    label: '检测完成',
   },
   {
-    label: "归档",
-    value: 3,
-    disabled: false,
+    id: "3",
+    label: '归档',
   },
-]);
+]
 //检测报告状态数据
-let checkReportStatusList = reactive([
+const checkReportStatus: Dict[] = [
   {
-    label: "已生成",
-    value: 0,
-    disabled: false,
+    id: "0",
+    label: '已生成',
   },
   {
-    label: "未生成",
-    value: 1,
-    disabled: false,
+    id: "1",
+    label: '未生成',
   },
-]);
+]
 //检测结果数组
-let checkResultList = reactive([
+const checkResult: Dict[] = [
   {
-    label: "不符合",
-    value: 0,
-    disabled: false,
+    id: "0",
+    label: '不符合',
   },
   {
-    label: "符合",
-    value: 1,
-    disabled: false,
+    id: "1",
+    label: '符合',
   },
   {
-    label: "未检",
-    value: 2,
-    disabled: false,
+    id: "2",
+    label: '未检',
   },
-]);
+]
+
 
 //查询条件
 const form: any = ref({
@@ -385,21 +381,12 @@ const initParam = reactive({ type: 1, pageNum: 1, pageSize: 10 });
 // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
 // 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
 const tableList = ref([]);
-const dataCallback = (data: any) => {
-  return {
-    list: data || data.data || data.list,
-    total: data.length || data.total, //total
-  };
-};
-
 
 const boundPqDevList=ref<Device.ReqPqDevParams[]>([])//根据检测计划id查询出所有已绑定的设备 
 
 const getTableList = async (params: any) => {
   const pqDevList_Result2 = await getBoundPqDevList({'planId': props.id, 'checkStateList':[0,1,2]});
   boundPqDevList.value = pqDevList_Result2.data as Device.ReqPqDevParams[];
-  console.log('qwe',boundPqDevList.value)
-  console.log('qwe123',props.id)
   return  getBoundPqDevList({'planId': props.id, 'checkStateList':[0,1,2]});
 };
 
@@ -413,6 +400,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       prop: 'name',
       label: '设备名称',
       minWidth: 220,
+      //search: { el: 'input' },
     },
     {
       prop: 'devType',
@@ -444,6 +432,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       label: '检测状态',
       minWidth: 100,
       sortable:true,
+      //enum:checkStatus,
       isShow:checkStateShow,
       render: scope => {
           return (
@@ -455,6 +444,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       prop: 'checkResult',
       label: '检测结果',
       minWidth: 100,
+      //enum:checkResult,
       sortable:true,
       render: (scope) => {
         if (scope.row.checkResult === 0) 
@@ -469,6 +459,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       prop: 'reportState',
       label: '报告状态',
       minWidth: 100,
+      enum:checkReportStatus,
       sortable:true,
       render: scope => {
           return (
@@ -604,21 +595,7 @@ const handleSelectionChange = (selection: any[]) => {
 
 //查询
 const handleSearch = () => {
-
-  if(form.value.activeTabs === 0)//设备检测、设备归档
-  {
-    deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.document_State === "未归档")
-  }
-  else if(form.value.activeTabs === 4)
-  {
-    deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档");
-  }
-  else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
-  {
-    deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成");
-  }
-  //matchDialogVisible.value = true;
-  //proTable.value?.getTableList();
+  proTable.value?.getTableList();
 };
 //重置
 const handleRefresh = () => {
@@ -627,18 +604,6 @@ const handleRefresh = () => {
   form.value.checkResult = null;
   form.value.checkReportStatus = null;
   
-  if(form.value.activeTabs === 0)//设备检测、设备归档
-  {
-    deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.document_State === "未归档")
-  }
-  else if(form.value.activeTabs === 4)
-  {
-    deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档");
-  }
-  else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
-  {
-    deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成");
-  }
 };
 // 表格拖拽排序
 const sortTable = ({
@@ -664,8 +629,8 @@ const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => {
 
 //根据当前功能，初始化表头下拉框中的默认值和禁用值
 function tableHeaderInit(val: number) {
+  console.log("tableHeader",val)
   refreshStatusList()
-
   switch (val) {
     case 0://设备检测
     case 1://手动检测
@@ -734,10 +699,8 @@ function tableHeaderInit(val: number) {
     break;
   }
 //console.log("test",columns);
-
 }
 
-tableHeaderInit(0)
 function refreshStatusList(){
   // devNum = 0;
   // devChannelsNum = 0;
@@ -745,17 +708,17 @@ function refreshStatusList(){
   devNum = 0;
   devChannelsNum = 0;
   devTestedNum = 0;
-  checkStatusList.map((item: any, index: any) => {
+  checkStatus.map((item: any, index: any) => {
     if (item.disabled) {
       item.disabled = false;
     }
   });
-  checkReportStatusList.map((item: any, index: any) => {
+  checkReportStatus.map((item: any, index: any) => {
     if (item.disabled) {
       item.disabled = false;
     }
   });
-  checkResultList.map((item: any, index: any) => {
+  checkResult.map((item: any, index: any) => {
     if (item.disabled) {
       item.disabled = false;
     }
@@ -767,21 +730,21 @@ function refreshStatusList(){
 }
 
 function disableCheckStatus(val: string){
-  checkStatusList.map((item: any, index: any) => {
+  checkStatus.map((item: any, index: any) => {
     if (val == item.label) {
       item.disabled = true;
     }
   });
 }
 function disableCheckReportStatus(val: string){
-  checkReportStatusList.map((item: any, index: any) => {
+  checkReportStatus.map((item: any, index: any) => {
     if (val == item.label) {
       item.disabled = true;
     }
   });
 }
 function disablecheckResultList(val: string){
-  checkResultList.map((item: any, index: any) => {
+  checkResult.map((item: any, index: any) => {
     if (val == item.label) {
       item.disabled = true;
     }
@@ -945,17 +908,12 @@ const openDrawer = (title: string, row: any) => {
     }
 }
 
-onMounted(() => {
-  //console.log(proTable.value?.tableData);
-});
-
 // 监听 props.id 的变化
 watch(
   () => props.id,
   (newId) => {
-    console.log(`props.id changed to ${newId}`);
     // 调用获取数据的方法
-    getTableList({ type: 1, pageNum: 1, pageSize: 10 });
+    handleSearch();
   },
   { immediate: true } // 立即执行一次
 );
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index e0df5ac..dc4674f 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -175,7 +175,6 @@ const handleTabsChange = (val: any) => {
   form.value.activeTabs = 0;
   form.value.activeTabs = 3;
   form.value.activeChildTabs = Number(val);
-  console.log(val)
 
 }
 localStorage.setItem("color", "red");
@@ -222,8 +221,6 @@ watch(
   () => form.value,
   (val, oldVal) => {
     if (val) {
-
-      console.log(form.value.activeTabs,111);
       
     if(form.value.activeTabs === 0 )//设备检测
     {
@@ -252,7 +249,6 @@ watch(
   (val, oldVal) => {
     if (val) {
       tableRef2.value && tableRef2.value.changeActiveTabs(form.value.activeTabs,form.value.activeChildTabs);
-      console.log(form.value.activeTabs,form.value.activeChildTabs);
     }
   },
   {
@@ -271,8 +267,8 @@ const chartsData1: any = ref([]),
   chartsData2: any = ref([]),
   chartsData3: any = ref([]);
 const getPieData = async (id: string) => {
-  console.log('1qaz')
   currentId.value = id; // 设置当前ID
+  handleCheckFunction(0)//切换左侧树，默认css功能是设备检测
 
   const boundPqDevList=ref<Device.ResPqDev[]>([])//根据检测计划id查询出所有已绑定的设备 
   const pqDevList_Result2 = await getBoundPqDevList({'planId': id, 'checkStateList':[0,1,2]});
@@ -346,7 +342,6 @@ const planDetail = () => {
 };
 //功能选择css切换
 const handleCheckFunction = (val: any) => {
-console.log('点击了css切换');
   editableTabsValue.value = '0';
   form.value.activeChildTabs = 0;
   tabsList.value.map((item: any, index: any) => {
@@ -361,7 +356,6 @@ console.log('点击了css切换');
 
   switch (val) {
     case 0://自动检测
-    getPieData(currentId.value);
     tabLabel1.value = "设备检测";
     break;
     case 1://手动检测