fix: 70856 70859 70862 70896 70897 70899 70908 70909 70910 70914

src/views/echartHome/useCaseTest.vue

@@ -19,7 +19,7 @@ export default {
       // 3.配置数据
       const option = {
         title: {
-          text: '用例测试类型概览',
+          text: '用例测试方法概览',
           left: 'left',
           textStyle: {
             color: '#606266',
@@ -52,7 +52,7 @@ export default {
         },
         series: [
           {
-            name: '用例测试类型概览',
+            name: '用例测试方法概览',
             type: 'bar',
             barWidth: '20',
             data: [

src/views/informationBase/viewStandardTerms/components/documentReviewDialog.vue

@@ -30,7 +30,7 @@
         prop="testScenario"
       >
       </el-table-column>
-      <el-table-column label="测试类型" align="left" sortable prop="testType">
+      <el-table-column label="测试方法" align="left" sortable prop="testType">
       </el-table-column>
       <el-table-column
         label="用例编号"

src/views/informationBase/viewStandardTerms/components/vehicleModelDialog.vue

@@ -12,8 +12,8 @@
     <table class="table" style="margin: 20px">
       <thead>
         <tr>
-          <th>标准章节</th>
-          <th>标准要求</th>
+          <th>审查要点</th>
+          <th>审查细则</th>
           <th>关联场景</th>
         </tr>
       </thead>
@@ -32,6 +32,7 @@
                 {{ v.text }}
               </td>
               <td align="center">
+                <template v-if="v.reviewSceneList && v.reviewSceneList.length">
                   <template v-for="(a, reviewSceneIndex) in v.reviewSceneList">
                     <div
                       :key="
@@ -45,6 +46,8 @@
                       <br />
                     </div>
                   </template>
+                </template>
+                <template v-else> -- </template>
               </td>
             </tr>
           </template>

src/views/informationBase/viewStandardTerms/index.vue

@@ -37,6 +37,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item v-if="queryParams.type == 'test'" prop="status">
+            <el-input
+              v-model="queryParams.text"
+              placeholder="请输入标准测试方法"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button
               type="primary"

src/views/informationBase/viewTestMatrix/index.vue

@@ -12,7 +12,7 @@
       @cell-mouse-leave="cellMouseLeave"
     >
       <el-table-column
-        label="测试场景\测试类型"
+        label="测试场景\测试方法"
         align="center"
         width="160px"
         prop="name"
@@ -52,7 +52,7 @@ export default {
       // 表头信息
       echartsTabled: [
         // {
-        //   tableNmae: '测试场景\\测试类型',
+        //   tableNmae: '测试场景\\测试方法',
         //   tableCode: 'test'
         // },
         // {

src/views/informationBase/viewUseCaseLibrary/index.vue

@@ -28,7 +28,7 @@
       <el-form-item prop="status">
         <el-select
           v-model="queryParams.testTypeId"
-          placeholder="请选择测试类型"
+          placeholder="请选择测试方法"
           clearable
         >
           <el-option
@@ -80,11 +80,11 @@
         sortable
         prop="testScenario"
       />
-      <el-table-column label="测试类型" align="left" sortable prop="testType" />
+      <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="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-->

src/views/login.vue

@@ -12,7 +12,7 @@
       <h3 class="title">汽车信息安全周期性检测平台</h3>
       <el-form-item prop="username">
         <el-input
-          v-model="loginForm.username"
+          v-model.trim="loginForm.username"
           type="text"
           auto-complete="off"
           placeholder="账号"
@@ -22,7 +22,7 @@
       </el-form-item>
       <el-form-item prop="password">
         <el-input
-          v-model="loginForm.password"
+          v-model.trim="loginForm.password"
           type="password"
           auto-complete="off"
           placeholder="密码"

src/views/monitor/logininfor/index.vue

@@ -19,7 +19,7 @@
       </el-form-item>
       <el-form-item label="用户名称" prop="userName">
         <el-input
-          v-model="queryParams.userName"
+          v-model.trim="queryParams.userName"
           placeholder="请输入用户名称"
           clearable
           style="width: 240px"

src/views/monitor/online/index.vue

@@ -17,7 +17,7 @@
       </el-form-item>
       <el-form-item label="用户名称" prop="userName">
         <el-input
-          v-model="queryParams.userName"
+          v-model.trim="queryParams.userName"
           placeholder="请输入用户名称"
           clearable
           @keyup.enter.native="handleQuery"

src/views/processing/carReview/write-check-form/index.vue

@@ -10,7 +10,10 @@
           预览表单
         </header-button>
         <header-button
-          v-if="model.carReviewTask.leaderId == userId"
+          v-if="
+            model.carReviewTask.leaderId == userId &&
+            model.detailsList.length == readNumber
+          "
           type="default"
           icon="check"
           @click="submitFrom()"

src/views/processing/carTest/confirmation-test/index.vue

@@ -130,7 +130,7 @@
                 <th>标准技术要求</th>
                 <th>标准测试方法</th>
                 <th>测试场景</th>
-                <th>测试类型</th>
+                <th>测试方法</th>
                 <th>用例编号</th>
                 <th>测试结果</th>
                 <!--                <th>用例名称</th>-->

src/views/processing/carTest/review-form/index.vue

@@ -53,7 +53,7 @@
                 <th>标准技术要求</th>
                 <th>标准测试方法</th>
                 <th>测试场景</th>
-                <th>测试类型</th>
+                <th>测试方法</th>
                 <th>用例编号</th>
                 <th>用例名称</th>
                 <th>工具</th>

src/views/processing/carTest/source-record/index.vue

@@ -130,7 +130,7 @@
                 <th>标准技术要求</th>
                 <th>标准测试方法</th>
                 <th>测试场景</th>
-                <th>测试类型</th>
+                <th>测试方法</th>
                 <th>用例编号</th>
                 <th>测试结果</th>
                 <!--                <th>用例名称</th>-->

src/views/processing/systemReview/write-check-form/index.vue

@@ -10,7 +10,10 @@
           预览表单
         </header-button>
         <header-button
-          v-if="model.systemReviewTask.leaderId == userId"
+          v-if="
+            model.systemReviewTask.leaderId == userId &&
+            model.detailsList.length == readNumber
+          "
           type="default"
           icon="check"
           @click="submitFrom()"

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

@@ -182,7 +182,11 @@
                   </el-link>
                 </div>
                 <div
-                  v-if="item.testStatus && item.testStatus !== 'NONE'"
+                  v-if="
+                    item.testStatus &&
+                    item.testStatus !== 'NONE' &&
+                    item.taskScenario
+                  "
                   class="cell-item"
                 >
                   <el-link

src/views/register.vue

@@ -9,7 +9,7 @@
       <h3 class="title">中汽研安全检测平台</h3>
       <el-form-item prop="username">
         <el-input
-          v-model="registerForm.username"
+          v-model.trim="registerForm.username"
           type="text"
           auto-complete="off"
           placeholder="账号"
@@ -23,7 +23,7 @@
       </el-form-item>
       <el-form-item prop="password">
         <el-input
-          v-model="registerForm.password"
+          v-model.trim="registerForm.password"
           type="password"
           auto-complete="off"
           placeholder="密码"

src/views/setting/scene/index.vue

@@ -64,6 +64,7 @@
       :default-sort="{ prop: 'createTime', order: 'descending' }"
       :scroll-x="'1500px'"
       :data="tableData"
+      @sort-change="sort_change"
     >
       <el-table-column type="index" width="55" label="序号" align="center">
         <template slot-scope="scope">
@@ -103,7 +104,7 @@
         sortable
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.storageTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.storageTime) }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -159,30 +160,28 @@ export default {
       this.classFicationList = response.data
     })
   },
+  created() {
+    this.queryParams.isAsc = 'desc'
+    this.queryParams.orderByColumn = 'createTime'
+  },
   methods: {
-    // handleAdd() {
-    //   this.dialogManger.dialogVisible = true
-    //   this.dialogManger.source = {}
-    // },
-    // handleDelete(row) {
-    //   this.$modal
-    //     .confirm('是否确定删除该条数据？', {
-    //       title: '操作确认',
-    //       closeOnClickModal: false
-    //     })
-    //     .then(() => {
-    //       // return delNotice(noticeIds)
-    //     })
-    //     .then(() => {
-    //       this.loadData()
-    //       this.$modal.msgSuccess('删除成功')
-    //     })
-    //     .catch(() => {})
-    // },
-    // handleUpdate(row) {
-    //   this.dialogManger.dialogVisible = true
-    //   this.dialogManger.source = row
-    // }
+    resetQuery() {
+      this.queryParams = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        isAsc: this.queryParams.isAsc,
+        orderByColumn: this.queryParams.orderByColumn
+      }
+      this.loadData()
+    },
+    sort_change(column, prop, order) {
+      this.queryParams.pageNum = 1 // 排序后返回第一页
+      if (column.order) {
+        this.queryParams.isAsc = column.order === 'ascending' ? 'asc' : 'desc'
+        this.queryParams.orderByColumn = column.prop
+        this.loadData()
+      }
+    }
   }
 }
 </script>

src/views/setting/standard/components/Tixidialog.vue

@@ -111,22 +111,22 @@ export default {
       }),
       rules: {
         standardType: [
-          { required: true, message: '菜单名称不能为空', trigger: 'blur' }
+          { required: true, message: '标准分类不能为空', trigger: 'blur' }
         ],
         standardNo: [
-          { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
+          { required: true, message: '标准号不能为空', trigger: 'blur' }
         ],
         name: [
-          { required: true, message: '路由地址不能为空', trigger: 'blur' }
+          { required: true, message: '标准名称不能为空', trigger: 'blur' }
         ],
         standardStatus: [
-          { required: true, message: '路由地址不能为空', trigger: 'blur' }
+          { required: true, message: '标准状态不能为空', trigger: 'blur' }
         ],
         releaseDate: [
-          { required: true, message: '路由地址不能为空', trigger: 'blur' }
+          { required: true, message: '发布日期不能为空', trigger: 'blur' }
         ],
         implementationDate: [
-          { required: true, message: '路由地址不能为空', trigger: 'blur' }
+          { required: true, message: '实施日期不能为空', trigger: 'blur' }
         ]
       }
     }

src/views/setting/standardTerms/components/documentReviewDialog.vue

@@ -30,7 +30,7 @@
         prop="testScenario"
       >
       </el-table-column>
-      <el-table-column label="测试类型" align="left" sortable prop="testType">
+      <el-table-column label="测试方法" align="left" sortable prop="testType">
       </el-table-column>
       <el-table-column
         label="用例编号"

src/views/setting/standardTerms/components/vehicleModelDialog.vue

@@ -31,6 +31,7 @@
                 {{ v.text }}
               </td>
               <td align="center">
+                <template v-if="v.reviewSceneList && v.reviewSceneList.length">
                   <template v-for="(a, reviewSceneIndex) in v.reviewSceneList">
                     <div
                       :key="
@@ -40,10 +41,12 @@
                         reviewSceneIndex
                       "
                     >
-                    <span>{{ reviewSceneIndex + 1 + '、' + a.text }}</span>
+                      <span>{{ a.text }}</span>
                       <br />
                     </div>
                   </template>
+                </template>
+                <template v-else> -- </template>
               </td>
             </tr>
           </template>

src/views/setting/standardTerms/index.vue

@@ -36,6 +36,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item v-if="queryParams.type == 'test'" prop="status">
+            <el-input
+              v-model="queryParams.text"
+              placeholder="请输入标准测试方法"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button
               type="primary"

src/views/setting/testMatrix/index.vue

@@ -12,7 +12,7 @@
       @cell-mouse-leave="cellMouseLeave"
     >
       <el-table-column
-        label="测试场景\测试类型"
+        label="测试场景\测试方法"
         align="center"
         width="160px"
         prop="name"
@@ -52,7 +52,7 @@ export default {
       // 表头信息
       echartsTabled: [
         // {
-        //   tableNmae: '测试场景\\测试类型',
+        //   tableNmae: '测试场景\\测试方法',
         //   tableCode: 'test'
         // },
         // {

src/views/setting/testType/index.vue

@@ -27,7 +27,7 @@
           <el-form-item prop="status">
             <el-input
               v-model="queryParams.testType"
-              placeholder="测试类型"
+              placeholder="测试方法"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -61,9 +61,10 @@
       v-if="refreshTable"
       v-loading="loading"
       border
-      :default-sort="{ prop: 'createTime', order: 'descending' }"
       :scroll-x="'1500px'"
       :data="tableData"
+      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      @sort-change="sort_change"
     >
       <el-table-column type="index" width="55" label="序号" align="center">
         <template slot-scope="scope">
@@ -89,7 +90,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="测试类型"
+        label="测试方法"
         prop="testType"
         min-width="200"
         align="left"
@@ -104,7 +105,7 @@
         sortable
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.storageTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.storageTime) }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -139,7 +140,29 @@ export default {
       this.classFicationList = response.data
     })
   },
-  methods: {}
+  created() {
+    this.queryParams.isAsc = 'desc'
+    this.queryParams.orderByColumn = 'createTime'
+  },
+  methods: {
+    resetQuery() {
+      this.queryParams = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        isAsc: this.queryParams.isAsc,
+        orderByColumn: this.queryParams.orderByColumn
+      }
+      this.loadData()
+    },
+    sort_change(column, prop, order) {
+      this.queryParams.pageNum = 1 // 排序后返回第一页
+      if (column.order) {
+        this.queryParams.isAsc = column.order === 'ascending' ? 'asc' : 'desc'
+        this.queryParams.orderByColumn = column.prop
+        this.loadData()
+      }
+    }
+  }
 }
 </script>
 <style scoped>

src/views/setting/useCaseLibrary/index.vue

@@ -27,7 +27,7 @@
       <el-form-item prop="status">
         <el-select
           v-model="queryParams.testTypeId"
-          placeholder="请选择测试类型"
+          placeholder="请选择测试方法"
           clearable
         >
           <el-option
@@ -79,11 +79,11 @@
         align="left"
         prop="testScenario"
       />
-      <el-table-column label="测试类型" sortable align="left" prop="testType" />
+      <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" /> -->
       <el-table-column label="用例描述" align="left" prop="description" />
       <!--      <el-table-column label="更新人员" align="left" prop="updateBy" />-->
       <!--      <el-table-column-->

src/views/system/role/authUser.vue

@@ -9,7 +9,7 @@
     >
       <el-form-item label="用户名称" prop="userName">
         <el-input
-          v-model="queryParams.userName"
+          v-model.trim="queryParams.userName"
           placeholder="请输入用户名称"
           clearable
           style="width: 240px"

src/views/system/role/selectUser.vue

@@ -12,7 +12,7 @@
     <el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
       <el-form-item label="用户名称" prop="userName">
         <el-input
-          v-model="queryParams.userName"
+          v-model.trim="queryParams.userName"
           placeholder="请输入用户名称"
           clearable
           @keyup.enter.native="handleQuery"

src/views/system/user/index.vue

@@ -355,7 +355,7 @@
               prop="userName"
             >
               <el-input
-                v-model="form.userName"
+                v-model.trim="form.userName"
                 placeholder="请输入用户名称"
                 maxlength="30"
               />
@@ -368,7 +368,7 @@
               prop="password"
             >
               <el-input
-                v-model="form.password"
+                v-model.trim="form.password"
                 placeholder="请输入用户密码"
                 type="password"
                 maxlength="20"

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

@@ -10,7 +10,7 @@
     </el-form-item>
     <el-form-item label="新密码" prop="newPassword">
       <el-input
-        v-model="user.newPassword"
+        v-model.trim="user.newPassword"
         placeholder="请输入新密码"
         type="password"
         show-password
@@ -18,7 +18,7 @@
     </el-form-item>
     <el-form-item label="确认密码" prop="confirmPassword">
       <el-input
-        v-model="user.confirmPassword"
+        v-model.trim="user.newPassword"
         placeholder="请确认新密码"
         type="password"
         show-password

src/views/task/on/index.vue

@@ -181,7 +181,11 @@
                   </el-link>
                 </div>
                 <div
-                  v-if="item.testStatus && item.testStatus !== 'NONE'"
+                  v-if="
+                    item.testStatus &&
+                    item.testStatus !== 'NONE' &&
+                    item.taskScenario
+                  "
                   class="cell-item"
                 >
                   <el-link