微调

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

@@ -328,11 +328,15 @@ const checkStatus: Dict[] = [
 const checkReportStatus: Dict[] = [
   {
     id: "0",
-    label: '已生成',
+    label: '未生成',
   },
   {
     id: "1",
-    label: '未生成',
+    label: '已生成',
+  },
+  {
+    id: "2",
+    label: '未检',
   },
 ]
 //检测结果数组
@@ -379,8 +383,9 @@ const proTable = ref<ProTableInstance>();
 const boundPqDevList=ref<Device.ReqPqDevParams[]>([])//根据检测计划id查询出所有已绑定的设备 
 
 const getTableList = async (params: any) => {
-<<<<<<< HEAD
-  const checkStateList = ref<any>()
+console.log('activeTabs',form.activeTabs)
+  if(props.id){
+    const checkStateList = ref<any>()
   if(form.value.checkStatus != null){
     checkStateList.value = [form.value.checkStatus]
   }else{
@@ -389,17 +394,11 @@ const getTableList = async (params: any) => {
   return  getBoundPqDevList({'planId': props.id, 
                              'checkStateList': checkStateList.value,
                              'checkResult': form.value.checkResult,
-                             'reportState ': form.value.checkReportStatus,
+                             'reportState': form.value.checkReportStatus,
                              'name':form.value.search
                             });
-=======
-  debugger
-  if(props.id) {
-    // const pqDevList_Result2 = await getBoundPqDevList({'planId': props.id,'checkStateList':[0,1,2]});
-    // boundPqDevList.value = pqDevList_Result2.data as Device.ReqPqDevParams[];
-    return  getBoundPqDevList({'planId': props.id,'checkStateList':[0,1,2]});
   }
->>>>>>> 07d02307e2507c32fc2b3c8b745b074d7a9bb74d
+
 };
 
 
@@ -478,10 +477,20 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       minWidth: 100,
       sortable:true,
       render: scope => {
-          return (
-            scope.row.checkState === 0 ? '已生成' : '未生成'
-          )
-      },
+        if (scope.row.reportState === 0) 
+        {
+          return '未生成';
+        } 
+        else if (scope.row.reportState === 1) 
+        {
+            return '已生成';
+        } 
+        else if (scope.row.reportState === 2) 
+        {
+            return '未检';
+        }
+        return '';
+      }
     },
     {
       prop: 'documentState',
@@ -491,7 +500,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       isShow: documentStateShow,
       render: scope => {
           return (
-            scope.row.documentState === 0 ? '未归档' : '归档'
+            scope.row.documentState === 0 ? '未归档' : '已归档'
           )
       },
     },