归档页调整

frontend/src/api/device/device/deviceData.ts

@@ -94,7 +94,7 @@ const data = [
         name: '240005', //设备名称
         dev_Type: 'PQS-882A',//设备类型
         dev_Chns: 1,  //设备通道数
-        check_Result: '不合格', //检测结果
+        check_Result: '不符合', //检测结果
         report_State: '未生成', //报告状态
         document_State: '未归档', //归档状态
         check_State:'检测完成',//检测状态
@@ -105,7 +105,7 @@ const data = [
         name: '240006', //设备名称
         dev_Type: 'PQS-882B4',//设备类型
         dev_Chns: 4,  //设备通道数
-        check_Result: '不合格', //检测结果
+        check_Result: '不符合', //检测结果
         report_State: '未生成', //报告状态
         document_State: '未归档', //归档状态
         check_State:'检测完成',//检测状态
@@ -116,7 +116,7 @@ const data = [
         name: '240007', //设备名称
         dev_Type: 'PQS-882A',//设备类型
         dev_Chns: 1,  //设备通道数
-        check_Result: '合格', //检测结果
+        check_Result: '符合', //检测结果
         report_State: '未生成', //报告状态
         document_State: '未归档', //归档状态
         check_State:'检测完成',//检测状态
@@ -127,7 +127,7 @@ const data = [
         name: '240008', //设备名称
         dev_Type: 'PQS-882B4',//设备类型
         dev_Chns: 4,  //设备通道数
-        check_Result: '合格', //检测结果
+        check_Result: '符合', //检测结果
         report_State: '未生成', //报告状态
         document_State: '未归档', //归档状态
         check_State:'检测完成',//检测状态
@@ -138,7 +138,7 @@ const data = [
         name: '240009', //设备名称
         dev_Type: 'PQS-882B4',//设备类型
         dev_Chns: 4,  //设备通道数
-        check_Result: '不合格', //检测结果
+        check_Result: '不符合', //检测结果
         report_State: '已生成', //报告状态
         document_State: '未归档', //归档状态
         check_State:'检测完成',//检测状态
@@ -149,7 +149,7 @@ const data = [
         name: '240010', //设备名称
         dev_Type: 'PQS-882A',//设备类型
         dev_Chns: 1,  //设备通道数
-        check_Result: '合格', //检测结果
+        check_Result: '符合', //检测结果
         report_State: '已生成', //报告状态
         document_State: '未归档', //归档状态
         check_State:'检测完成',//检测状态
@@ -160,7 +160,7 @@ const data = [
         name: '240011', //设备名称
         dev_Type: 'PQS-882A',//设备类型
         dev_Chns: 1,  //设备通道数
-        check_Result: '合格', //检测结果
+        check_Result: '符合', //检测结果
         report_State: '已生成', //报告状态
         document_State: '已归档', //归档状态
         check_State:'检测完成',//检测状态
@@ -171,7 +171,7 @@ const data = [
         name: '240012', //设备名称
         dev_Type: 'PQS-882B4',//设备类型
         dev_Chns: 4,  //设备通道数
-        check_Result: '合格', //检测结果
+        check_Result: '符合', //检测结果
         report_State: '已生成', //报告状态
         document_State: '已归档', //归档状态
         check_State:'检测完成',//检测状态

frontend/src/views/home/components/table.vue

@@ -21,7 +21,7 @@
           <el-form-item label="关键字">
             <el-input v-model="form.search" placeholder="请输入设备名称、类型"></el-input>
           </el-form-item>
-          <el-form-item label="检测状态" v-if="form.activeTabs != 3 && form.activeTabs != 5">
+          <el-form-item label="检测状态" v-if="form.activeTabs != 3 && form.activeTabs != 4 && form.activeTabs != 5">
             <el-select v-model="form.checkStatus" clearable>
               <el-option
                 v-for="(item, index) in checkStatusList"
@@ -45,7 +45,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="报告状态" v-if="form.activeTabs != 0 && form.activeTabs != 4">
+          <el-form-item label="报告状态" v-if="form.activeTabs != 0">
             <el-select v-model="form.checkReportStatus" clearable>
               <el-option
                 v-for="(item, index) in checkReportStatusList"
@@ -110,12 +110,10 @@
             >
 
             <!-- :disabled="!scope.isSelected || scope.selectedList.filter((item) => item.check_State === '检测完成').length === 0" -->
-            <el-button type="primary" :icon="Notebook"  @click="handleTest('批量归档')" v-if="form.activeTabs === 0"
+            <el-button type="primary" :icon="Notebook"  @click="handleTest('批量归档')" v-if="form.activeTabs === 4"
-              >归档</el-button
+              >归档</el-button>
-            >
             <el-button type="primary" :icon="CirclePlus" @click="addDevice('设备新增')" v-if="form.activeTabs === 0"
-              >设备新增</el-button
+              >设备新增</el-button>
-            >
             
           </el-form-item>
         </el-form>
@@ -166,7 +164,7 @@
           link
           :icon="Notebook"
           @click="openDrawer('归档', scope.row)"
-          v-if="form.activeTabs === 0"
+          v-if="form.activeTabs === 4"
           :disabled = "scope.row.check_State != '检测完成'"
           >归档</el-button
         >
@@ -332,12 +330,12 @@ let checkResultList = reactive([
     disabled: false,
   },
   {
-    label: "不合格",
+    label: "不符合",
     value: 1,
     disabled: false,
   },
   {
-    label: "合格",
+    label: "符合",
     value: 2,
     disabled: false,
   },
@@ -434,7 +432,7 @@ const columns = reactive([
       minWidth: 100,
       sortable:true,
       render: (scope) => {
-    if(scope.row.check_Result === '不合格')
+    if(scope.row.check_Result === '不符合')
     {
       return (
       <el-tag type='danger'>{ scope.row.check_Result }</el-tag>
@@ -636,7 +634,7 @@ const handleSelectionChange = (selection: any[]) => {
   }
 
   devTestedNum = selection.filter((item) => item.check_State === '检测完成').length;
-  const result = selection.filter((item) => item.check_Result != "不合格")
+  const result = selection.filter((item) => item.check_Result != "不符合")
   if(result.length > 0)
   {
     testType= "test";    
@@ -650,10 +648,14 @@ const handleSelectionChange = (selection: any[]) => {
 //查询
 const handleSearch = () => {
 
-  if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档
+  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 === "检测完成");
@@ -668,11 +670,14 @@ const handleRefresh = () => {
   form.value.checkResult = null;
   form.value.checkReportStatus = null;
   
-  
+  if(form.value.activeTabs === 0)//设备检测、设备归档
-  if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档
   {
     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 === "检测完成");
@@ -691,42 +696,7 @@ const sortTable = ({
   ElMessage.success("修改列表排序成功");
 };
 
-// 删除用户信息
-const deleteAccount = async (params: User.ResUserList) => {
-  await useHandleData(
-    deleteUser,
-    { id: [params.id] },
-    `删除【${params.username}】`
-  );
-  proTable.value?.getTableList();
-};
 
-// 批量删除用户信息
-const batchDelete = async (id: string[]) => {
-  await useHandleData(deleteUser, { id }, "删除所选用户信息");
-  proTable.value?.clearSelection();
-  proTable.value?.getTableList();
-};
-
-// 重置用户密码
-const resetPass = async (params: User.ResUserList) => {
-  await useHandleData(
-    resetUserPassWord,
-    { id: params.id },
-    `重置【${params.username}】用户密码`
-  );
-  proTable.value?.getTableList();
-};
-
-// 切换用户状态
-const changeStatus = async (row: User.ResUserList) => {
-  await useHandleData(
-    changeUserStatus,
-    { id: row.id, status: row.status == 1 ? 0 : 1 },
-    `切换【${row.username}】用户状态`
-  );
-  proTable.value?.getTableList();
-};
 //顶部功能切换时修改activeTabs
 const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => {
   form.value.activeTabs = val;
@@ -745,9 +715,9 @@ function tableHeaderInit(val: number) {
       //disableCheckStatus("检测中")
       disableCheckStatus("归档")
       // operationShow.value = false;
-      columns[columns.length - 1].minWidth = 100;
+      // columns[columns.length - 1].minWidth = 100;
       tableKey.value ++;
-      operationShow.value = true;
+      operationShow.value = false;
       documentStateShow.value = false;
       checkStateShow.value = true;
       selectionShow.value = true;
@@ -785,12 +755,12 @@ function tableHeaderInit(val: number) {
       // disableCheckStatus("未检")
       // disableCheckStatus("检测中")
       // disableCheckStatus("归档")
-      disableCheckReportStatus("未生成报告")
+      disablecheckResultList("未检")
-      disablecheckResultList("未出结果")
+      disableCheckReportStatus("未检")
       columns[columns.length - 1].minWidth = 100;
-      tableKey.value ++;
+      tableKey.value += 1;
       operationShow.value = true;
-      documentStateShow.value = true;
+      documentStateShow.value = false;
       checkStateShow.value = false;
       selectionShow.value = true;
     break;

frontend/src/views/home/components/test.vue

@@ -8,10 +8,11 @@
             :color="customColors"
           />
 
+          <!-- v-if="!isPause && activeIndex < activeTotalNum" -->
             <el-button
               type="primary"
-              v-if="!isPause && activeIndex < activeTotalNum"
+              
-              :disabled="activeIndex===0"
+              :disabled="activeIndex===0 && activeIndex >= activeTotalNum"
               :icon="VideoPause"
               @click="handlePauseTest"
               >暂停检测</el-button
@@ -24,13 +25,13 @@
               >继续检测</el-button
             >
 
-            <el-button
+            <!-- <el-button
               type="warning"
               v-if="activeIndex >= activeTotalNum"
               :icon="Refresh"
               @click="handleReCheck"
               >重新检测</el-button
-            >
+            > -->
             <!-- <el-button type="danger" :icon="Close" @click="handleFinishTest"
               >停止检测</el-button
             > -->
@@ -228,7 +229,7 @@
     </div>
     <div style="height: 98px;">
         <el-collapse model-value="1" accordion>
-            <el-collapse-item title="检测日志：" name="1">
+            <el-collapse-item title="检测项进度" name="1">
                 <div ref="scrollContainer"  class="dialog-log"> 
                   <p v-for="(item, index) in testLogList" :key="index" :style="{color:item.type==='error'?'#F56C6C':'var(--el-text-color-regular)'}">
                     {{ item.log }} <br />

frontend/src/views/home/tabs/dashboard.vue

@@ -183,17 +183,17 @@ const tabsList = ref([
     checked: false,
   },
   {
-    label: "数据查询",
+    label: "设备归档",
+    value: 4,
+    img: "/src/assets/images/plan/static/4.svg",
+    checked: false,
+  },
+  {
+    label: "数据操作",
     value: 5,
     img: "/src/assets/images/plan/static/5.svg",
     checked: false,
   },
-  // {
-  //   label: "设备归档",
-  //   value: 4,
-  //   img: "/src/assets/images/plan/static/4.svg",
-  //   checked: false,
-  // },
 ]);
 
 form.value.activeTabs = tabsList.value[0].value;
@@ -208,11 +208,16 @@ watch(
 
       console.log(form.value.activeTabs,111);
       
-    if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档
+    if(form.value.activeTabs === 0 )//设备检测
     {
       const tabledata = deviceData.filter((item) => item.document_State === "未归档")
       tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs,form.value.activeChildTabs,tabledata);
     }
+    else if(form.value.activeTabs === 4)//设备归档
+    {
+      const tabledata = deviceData.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档")
+      tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs,form.value.activeChildTabs,tabledata);
+    }
     else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
     {
       const tabledata = deviceData.filter((item) => item.check_State === "检测完成");
@@ -258,8 +263,8 @@ const getPieData = () => {
   ];
   chartsData2.value = [
     { value: 12, name: "未检" , itemStyle: { color: '#fac858' } },
-    { value: 3, name: "不合格" , itemStyle: { color: '#ee6666' } },
+    { value: 3, name: "不符合" , itemStyle: { color: '#ee6666' } },
-    { value: 5, name: "合格", itemStyle: { color: '#91cc75' }  },
+    { value: 5, name: "符合", itemStyle: { color: '#91cc75' }  },
     //     { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项" , itemStyle: { color: '#ee6666' } },
     // { value: Math.floor(Math.random() * 100) + 1, name: "全部合格", itemStyle: { color: '#91cc75' }  },
   ];