fix: 70914 70895

src/views/informationBase/viewUseCaseLibrary/index.vue

@@ -83,20 +83,17 @@
       <el-table-column label="测试方法" align="left" sortable prop="testType" />
       <el-table-column label="用例编号" align="left" prop="usecaseNo" />
       <el-table-column label="用例名称" align="left" prop="name" />
-      <!-- <el-table-column label="工具" align="left" prop="tools" />
-      <el-table-column label="对应输入" align="left" prop="input" /> -->
-      <el-table-column label="用例描述" align="left" prop="description" />
-      <!--      <el-table-column label="更新人员" align="left" prop="updateBy" />-->
-      <!--      <el-table-column-->
-      <!--        label="更新时间"-->
-      <!--        align="center"-->
-      <!--        prop="updateTime"-->
-      <!--        width="180"-->
-      <!--      >-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
+      <el-table-column label="工具" align="left" prop="tools" />
+      <el-table-column label="对应输入" align="left" prop="input">
+        <template slot-scope="scope">
+          <span>{{ scope.row.input || '--' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="用例描述" align="left" prop="description">
+        <template slot-scope="scope">
+          <span>{{ scope.row.description || '--' }}</span>
+        </template>
+      </el-table-column>
     </el-table>
     <pagination
       v-show="total > 0"

src/views/login.vue

@@ -105,9 +105,9 @@ export default {
           { required: true, trigger: 'blur', message: '请输入您的密码' },
           {
             validator: (rule, value, callback) => {
-              const pattern = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z]).{8,}$/
+              const pattern = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z]).{6,20}$/
               if (!pattern.test(value)) {
-                callback(new Error('字段必须包含数字、字母和英文字符'))
+                callback(new Error('必须包含数字、字母和英文字符,长度6~20位'))
               } else {
                 callback()
               }

src/views/processing/carReview/vehicle-type/index.vue

@@ -445,6 +445,13 @@ export default {
         taskId: this.taskId
       }
       formData.testScenarioList = this.selectedScenario
+      if (
+        this.model.testScenarioList &&
+        this.model.testScenarioList.length > 0 &&
+        this.selectedScenario.length === 0
+      ) {
+        this.$message.error('请至少选择一个场景!')
+      }
       carTaskSubmit(formData).then(res => {
         if (res.code === 200) {
           this.$modal.msgSuccess('确认提交成功')

src/views/processing/unprocessed-review/index.vue

@@ -182,16 +182,13 @@
                   </el-link>
                 </div>
                 <div
-                  v-if="
-                    item.testStatus &&
-                    item.testStatus !== 'NONE' &&
-                    item.taskScenario
-                  "
+                  v-if="item.testStatus && item.testStatus !== 'NONE'"
                   class="cell-item"
                 >
                   <el-link
                     type="primary"
                     :underline="false"
+                    :disabled="!item.taskScenario"
                     @click="
                       handleCarTypeTestTaskContent(
                         item.testStatus,

src/views/setting/scene/index.vue

@@ -61,7 +61,7 @@
       v-if="refreshTable"
       v-loading="loading"
       border
-      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      :default-sort="{ prop: 'storageTime', order: 'descending' }"
       :scroll-x="'1500px'"
       :data="tableData"
       @sort-change="sort_change"
@@ -162,7 +162,7 @@ export default {
   },
   created() {
     this.queryParams.isAsc = 'desc'
-    this.queryParams.orderByColumn = 'createTime'
+    this.queryParams.orderByColumn = 'storageTime'
   },
   methods: {
     resetQuery() {

src/views/setting/testType/index.vue

@@ -63,7 +63,7 @@
       border
       :scroll-x="'1500px'"
       :data="tableData"
-      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      :default-sort="{ prop: 'storageTime', order: 'descending' }"
       @sort-change="sort_change"
     >
       <el-table-column type="index" width="55" label="序号" align="center">
@@ -142,7 +142,7 @@ export default {
   },
   created() {
     this.queryParams.isAsc = 'desc'
-    this.queryParams.orderByColumn = 'createTime'
+    this.queryParams.orderByColumn = 'storageTime'
   },
   methods: {
     resetQuery() {

src/views/setting/useCaseLibrary/index.vue

@@ -82,8 +82,12 @@
       <el-table-column label="测试方法" sortable align="left" prop="testType" />
       <el-table-column label="用例编号" align="left" prop="usecaseNo" />
       <el-table-column label="用例名称" align="left" prop="name" />
-      <!-- <el-table-column label="工具" align="left" prop="tools" />
-      <el-table-column label="对应输入" align="left" prop="input" /> -->
+      <!-- <el-table-column label="工具" align="left" prop="tools" /> -->
+      <el-table-column label="对应输入" align="left" prop="input">
+        <template slot-scope="scope">
+          <span>{{ scope.row.input || '--' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="用例描述" align="left" prop="description" />
       <!--      <el-table-column label="更新人员" align="left" prop="updateBy" />-->
       <!--      <el-table-column-->

src/views/system/user/profile/resetPwd.vue

@@ -64,9 +64,9 @@ export default {
           },
           {
             validator: (rule, value, callback) => {
-              const pattern = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z]).{8,}$/
+              const pattern = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z]).{6,20}$/
               if (!pattern.test(value)) {
-                callback(new Error('字段必须包含数字、字母和英文字符'))
+                callback(new Error('必须包含数字、字母和英文字符,长度6~20位'))
               } else {
                 callback()
               }

src/views/task/on/index.vue

@@ -181,16 +181,13 @@
                   </el-link>
                 </div>
                 <div
-                  v-if="
-                    item.testStatus &&
-                    item.testStatus !== 'NONE' &&
-                    item.taskScenario
-                  "
+                  v-if="item.testStatus && item.testStatus !== 'NONE'"
                   class="cell-item"
                 >
                   <el-link
                     type="primary"
                     :underline="false"
+                    :disabled="!item.taskScenario"
                     @click="
                       handleCarTypeTestTaskContent(
                         'NEW',