Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

frontend/src/views/plan/autoTest/components/table.vue

@@ -157,7 +157,7 @@ tableHeight.value = window.innerHeight - 630;
 //检测状态数据
 const checkStatusList = [
   {
-    label: "未检测",
+    label: "未检",
     value: 0,
   },
   {
@@ -385,7 +385,7 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
   //   width: 120,
   //   render: (scope) => {
   //     return scope.row.checkStatus == 1
-  //       ? "未检测"
+  //       ? "未检"
   //       : scope.row.checkStatus == 2
   //         ? "检测中"
   //         : scope.row.checkStatus == 3

frontend/src/views/plan/singlePlanList/index.vue

@@ -36,7 +36,7 @@
           <el-form-item label="检测状态">
             <el-select v-model="searchForm.checkStatus">
               <el-option :value="0" label="全部"></el-option>
-              <el-option :value="1" label="未检测"></el-option>
+              <el-option :value="1" label="未检"></el-option>
               <el-option :value="2" label="检测中"></el-option>
               <el-option :value="3" label="检测完成"></el-option>
             </el-select>
@@ -342,7 +342,7 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
     width: 120,
     render: (scope) => {
       return scope.row.checkStatus == 1
-        ? "未检测"
+        ? "未检"
         : scope.row.checkStatus == 2
           ? "检测中"
           : scope.row.checkStatus == 3