feat: 车辆实验测试用例详情 任务编号改任务号 保密等级相关都去掉 填写表单时 展示已通过多少未通过过多少，仅显示未通过

src/api/setting/standardTerms.js

@@ -17,7 +17,18 @@ export function listDocumentReview(data) {
     data: data
   })
 }
-
+/**
+ * 根据章节号获取测试用例
+ * @param {*} data 
+ * @returns 
+ */
+export function getUseCaseByChapter(data) {
+  return request({
+    url: '/system/testCase/getUseCaseByChapter',
+    method: 'post',
+    data: data
+  })
+}
 // 获取全部测试用例
 export function getStandardUsecase(data) {
   return request({

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

@@ -13,12 +13,13 @@
       <!--      <el-button type="primary" style="margin-bottom: 20px" @click="relevancy">-->
       <!--        关联测试内容-->
       <!--      </el-button>-->
+
       <el-table
         v-loading="loading"
         class="el-table"
         border
         :scroll-x="'1500px'"
-        :default-sort="{ prop: 'createTime', order: 'descending' }"
+        :default-sort="{ prop: 'testScenario', order: 'descending' }"
         :data="tableData"
       >
         <el-table-column type="index" width="55" label="序号" align="center">
@@ -33,21 +34,16 @@
           prop="testScenario"
         >
         </el-table-column>
-        <el-table-column label="测试方法" align="left" sortable prop="testType">
-        </el-table-column>
         <el-table-column
-          label="用例编号"
+          label="测试方法"
           align="left"
           sortable
-          prop="useCaseNumber"
+          prop="testMethod"
         >
         </el-table-column>
-        <el-table-column
-          label="用例名称"
-          align="left"
-          sortable
-          prop="useCaseName"
-        >
+        <el-table-column label="用例编号" align="left" prop="displayID">
+        </el-table-column>
+        <el-table-column label="用例名称" align="left" prop="name">
         </el-table-column>
       </el-table>
     </div>
@@ -78,8 +74,9 @@
 import {
   getStandardUsecase,
   listDocumentReview,
+  getUseCaseByChapter,
   saveStandardUsecase
-} from '../../../../api/setting/standardTerms'
+} from '@/api/setting/standardTerms'
 import { getRows, getRows2 } from '../../../../utils/reviewDetailsTable'
 
 export default {
@@ -125,24 +122,25 @@ export default {
     }
   },
   methods: {
-    getRows,
-    getRows2,
+    // getRows,
+    // getRows2,
     cancle() {
       this.open = false
     },
     handleConfirm() {
-      const data = {
-        standardId: this.dialogManger.dialogEditId,
-        usecaseIdList: this.value
-      }
-      saveStandardUsecase(data).then(res => {
-        if (res.code === 200) {
-          this.value = []
-          console.log('清空value', this.value)
-          this.init()
-          this.open = false
-        }
-      })
+      this.open = false
+      // const data = {
+      //   standardId: this.dialogManger.dialogEditId,
+      //   usecaseIdList: this.value
+      // }
+      // saveStandardUsecase(data).then(res => {
+      //   if (res.code === 200) {
+      //     this.value = []
+      //     console.log('清空value', this.value)
+      //     this.init()
+      //     this.open = false
+      //   }
+      // })
     },
     relevancy() {
       getStandardUsecase({ standardId: this.dialogManger.dialogEditId }).then(
@@ -158,8 +156,10 @@ export default {
     /** 获取文档审查检验内容 */
     init() {
       // this.loading = true
-      listDocumentReview({ id: this.dialogManger.dialogEditId }).then(res => {
-        this.tableData = res.data
+      getUseCaseByChapter({
+        regulationItemID: this.dialogManger.dialogEditId
+      }).then(res => {
+        this.tableData = res.rows
         // this.loading = false
       })
     },

src/views/informationBase/viewStandardTerms/index.vue

@@ -199,9 +199,9 @@
         v-show="totalTest > 0"
         :total="totalTest"
         :background="false"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="queryTestParams"
+        :page.sync="queryParamsTest.pageNum"
+        :limit.sync="queryParamsTest.pageSize"
+        @pagination="loadTestData"
       >
       </pagination>
     </template>
@@ -293,7 +293,6 @@ export default {
     return {
       listUrl: '/review/standard/list',
       totalTest: 0,
-      queryTestParams: {},
       tableTestData: [],
       reviewTypeList: [
         {
@@ -373,9 +372,10 @@ export default {
   methods: {
     handleTab(v) {
       if (v.index === '2') {
-        console.log(v.index)
+        this.queryParamsTest.pageNum = 1
         this.loadTestData()
       } else {
+        this.queryParams.pageNum = 1
         this.loadData()
       }
     },
@@ -401,7 +401,7 @@ export default {
       this.queryParamsTest.pageNum = 1 // 排序后返回第一页
       if (column.order) {
         this.queryParamsTest.orderBy.order =
-          column.order === 'ascending' ? 'ASC' : 'DEAC'
+          column.order === 'ascending' ? 'ASC' : 'DESC'
         this.queryParamsTest.orderBy.field = column.prop
         this.loadTestData()
       }

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

@@ -65,8 +65,9 @@
               <span class="green weight">{{ readNumber }}</span> 条，未完成
               <span class="orange weight">
                 {{ model.detailsList.length - readNumber }} </span
-              >条</span
-            >
+              >条，通过<span class="green weight"> {{ pass }} </span> 条，未通过
+              <span class="orange weight"> {{ noPass }} </span>条
+            </span>
             <!-- <span v-if="taskModel.warnTasks" class="scene-error"
               ><i class="el-icon-warning-outline"></i> 有
               {{ taskModel.warnTasks.length }} 条场景变更待处理</span
@@ -74,6 +75,7 @@
           </div>
           <div class="checked-noUse">
             <el-checkbox v-model="checked">仅显示未完成页面</el-checkbox>
+            <el-checkbox v-model="passed">仅显示未通过页面</el-checkbox>
           </div>
           <div v-if="detailsList.length">
             <div class="btn-tool">
@@ -419,6 +421,7 @@ export default {
       taskModel: {},
       activeModel: 0,
       checked: false,
+      passed: false,
       detailsList: [],
       rules: {},
       changeTask: [],
@@ -446,19 +449,53 @@ export default {
       })
       return num
     },
+    pass() {
+      let num = 0
+      this.model.detailsList.map(i => {
+        if (i.result && i.result.passed === 1) {
+          num++
+        }
+      })
+      return num
+    },
+    noPass() {
+      let num = 0
+      this.model.detailsList.map(i => {
+        if (i.result && i.result.passed === 0) {
+          num++
+        }
+      })
+      return num
+    },
     ...mapGetters(['name', 'companyFiles', 'userId'])
   },
   watch: {
     checked(newV) {
       if (newV) {
-        this.detailsList = this.model.detailsList.filter(item => {
-          return !item.result || item.result.passed === null
+        this.passed = false
+        this.$nextTick(() => {
+          this.detailsList = this.model.detailsList.filter(item => {
+            return !item.result || item.result.passed === null
+          })
         })
         console.log(this.detailsList)
       } else {
         this.detailsList = this.model.detailsList
       }
       this.handleCircle(0)
+    },
+    passed(newV) {
+      if (newV) {
+        this.checked = false
+        this.$nextTick(() => {
+          this.detailsList = this.model.detailsList.filter(item => {
+            return item.result && item.result.passed === 0
+          })
+        })
+      } else {
+        this.detailsList = this.model.detailsList
+      }
+      this.handleCircle(0)
     }
   },
   async mounted() {
@@ -571,6 +608,13 @@ export default {
         } else {
           this.detailsList = this.model.detailsList
         }
+        if (this.passed) {
+          this.detailsList = this.model.detailsList.filter(item => {
+            return item.result && item.result.passed === 0
+          })
+        } else {
+          this.detailsList = this.model.detailsList
+        }
       } else {
         this.$modal.msgError(res.msg)
       }
@@ -740,7 +784,7 @@ export default {
             reviewDetailsSubmit(this.form).then(async res => {
               if (res.code === 200) {
                 await this.getTask()
-                if (this.checked) {
+                if (this.checked || this.passed) {
                   this.handleCircle(0)
                 }
                 this.form.fileList.map(i => {

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

@@ -70,8 +70,9 @@
               <span class="green weight">{{ readNumber }}</span> 条，未完成
               <span class="orange weight">
                 {{ model.detailsList.length - readNumber }} </span
-              >条</span
-            >
+              >条，通过<span class="green weight"> {{ pass }} </span> 条，未通过
+              <span class="orange weight"> {{ noPass }} </span>条
+            </span>
             <!-- <span v-if="taskModel.warnTasks" class="scene-error"
               ><i class="el-icon-warning-outline"></i> 有
               {{ taskModel.warnTasks.length }} 条场景变更待处理</span
@@ -79,6 +80,7 @@
           </div>
           <div class="checked-noUse">
             <el-checkbox v-model="checked">仅显示未完成页面</el-checkbox>
+            <el-checkbox v-model="passed">仅显示未通过页面</el-checkbox>
           </div>
           <div v-if="detailsList.length">
             <div class="btn-tool">
@@ -431,6 +433,7 @@ export default {
       taskModel: {},
       activeModel: 0,
       checked: false,
+      passed: false,
       detailsList: [],
       rules: {},
       // TODO 删除
@@ -466,6 +469,24 @@ export default {
       })
       return num
     },
+    pass() {
+      let num = 0
+      this.model.detailsList.map(i => {
+        if (i.result && i.result.passed === 1) {
+          num++
+        }
+      })
+      return num
+    },
+    noPass() {
+      let num = 0
+      this.model.detailsList.map(i => {
+        if (i.result && i.result.passed === 0) {
+          num++
+        }
+      })
+      return num
+    },
     ...mapGetters(['name', 'companyFiles', 'userId'])
   },
   watch: {
@@ -478,6 +499,19 @@ export default {
         this.detailsList = this.model.detailsList
       }
       this.handleCircle(0)
+    },
+    passed(newV) {
+      if (newV) {
+        this.checked = false
+        this.$nextTick(() => {
+          this.detailsList = this.model.detailsList.filter(item => {
+            return item.result && item.result.passed === 0
+          })
+        })
+      } else {
+        this.detailsList = this.model.detailsList
+      }
+      this.handleCircle(0)
     }
   },
   async mounted() {
@@ -589,6 +623,13 @@ export default {
         } else {
           this.detailsList = this.model.detailsList
         }
+        if (this.passed) {
+          this.detailsList = this.model.detailsList.filter(item => {
+            return item.result && item.result.passed === 0
+          })
+        } else {
+          this.detailsList = this.model.detailsList
+        }
       } else {
         this.$modal.msgError(res.msg)
       }
@@ -769,7 +810,7 @@ export default {
             reviewDetailsSubmit(this.form).then(async res => {
               if (res.code === 200) {
                 await this.getTask()
-                if (this.checked) {
+                if (this.checked || this.passed) {
                   this.handleCircle(0)
                 }
                 this.form.fileList.map(i => {

src/views/setting/sample/taskDetails/index.vue

@@ -38,14 +38,14 @@
               </el-checkbox-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8" class="card-title" style="display: flex">
+          <!-- <el-col :span="8" class="card-title" style="display: flex">
             <el-form-item label="保密等级：">
               <dict-tag
                 :options="dict.type.confidentiality_level"
                 :value="taskForm.confidentialityLevel"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="41">
           <el-col :span="8" class="card-title">

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

@@ -19,7 +19,7 @@
         class="el-table"
         border
         :scroll-x="'1500px'"
-        :default-sort="{ prop: 'createTime', order: 'descending' }"
+        :default-sort="{ prop: 'testScenario', order: 'descending' }"
         :data="tableData"
       >
         <el-table-column type="index" width="55" label="序号" align="center">
@@ -34,21 +34,16 @@
           prop="testScenario"
         >
         </el-table-column>
-        <el-table-column label="测试方法" align="left" sortable prop="testType">
-        </el-table-column>
         <el-table-column
-          label="用例编号"
+          label="测试方法"
           align="left"
           sortable
-          prop="useCaseNumber"
+          prop="testMethod"
         >
         </el-table-column>
-        <el-table-column
-          label="用例名称"
-          align="left"
-          sortable
-          prop="useCaseName"
-        >
+        <el-table-column label="用例编号" align="left" prop="displayID">
+        </el-table-column>
+        <el-table-column label="用例名称" align="left" prop="name">
         </el-table-column>
       </el-table>
     </div>
@@ -79,6 +74,7 @@
 import {
   getStandardUsecase,
   listDocumentReview,
+  getUseCaseByChapter,
   saveStandardUsecase
 } from '../../../../api/setting/standardTerms'
 import { getRows, getRows2 } from '../../../../utils/reviewDetailsTable'
@@ -126,24 +122,25 @@ export default {
     }
   },
   methods: {
-    getRows,
-    getRows2,
+    // getRows,
+    // getRows2,
     cancle() {
       this.open = false
     },
     handleConfirm() {
-      const data = {
-        standardId: this.dialogManger.dialogEditId,
-        usecaseIdList: this.value
-      }
-      saveStandardUsecase(data).then(res => {
-        if (res.code === 200) {
-          this.value = []
-          console.log('清空value', this.value)
-          this.init()
-          this.open = false
-        }
-      })
+      this.open = false
+      // const data = {
+      //   standardId: this.dialogManger.dialogEditId,
+      //   usecaseIdList: this.value
+      // }
+      // saveStandardUsecase(data).then(res => {
+      //   if (res.code === 200) {
+      //     this.value = []
+      //     console.log('清空value', this.value)
+      //     this.init()
+      //     this.open = false
+      //   }
+      // })
     },
     relevancy() {
       getStandardUsecase({ standardId: this.dialogManger.dialogEditId }).then(
@@ -159,8 +156,10 @@ export default {
     /** 获取文档审查检验内容 */
     init() {
       // this.loading = true
-      listDocumentReview({ id: this.dialogManger.dialogEditId }).then(res => {
-        this.tableData = res.data
+      getUseCaseByChapter({
+        regulationItemID: this.dialogManger.dialogEditId
+      }).then(res => {
+        this.tableData = res.rows
         // this.loading = false
       })
     },

src/views/task/edit/index.vue

@@ -82,7 +82,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="任务编号" prop="taskNo">
+            <el-form-item label="任务号" prop="taskNo">
               <el-input v-model="model.taskNo" placeholder="请输入" clearable />
             </el-form-item>
           </el-col>
@@ -95,7 +95,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="保密等级" prop="confidentialityLevel">
               <el-select
                 v-model="model.confidentialityLevel"
@@ -111,7 +111,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="8">
             <el-form-item label="产品名称" prop="productName">
@@ -367,7 +367,7 @@ export default {
         standardId: '', // 检验依据
         taskList: [], // 选择的任务(检查项目)
         testScenarioList: [], // 选择的测试场景
-        taskNo: '', // 任务编号
+        taskNo: '', // 任务号
         taskName: '', // 任务名称测试
         confidentialityLevel: '', // 保密等级
         productName: '', // 产品名称
@@ -428,7 +428,7 @@ export default {
       showTestScenario: false,
       // 新增/保存 - 对象
       model: {
-        taskNo: '', // 任务编号
+        taskNo: '', // 任务号
         taskName: '', // 任务名称
         confidentialityLevel: '', // 保密等级
         productName: '', // 产品名称
@@ -466,7 +466,7 @@ export default {
           { required: true, message: '请选择检验依据', trigger: 'change' }
         ],
         taskNo: [
-          { required: true, message: '任务编号不能为空', trigger: 'blur' }
+          { required: true, message: '任务号不能为空', trigger: 'blur' }
         ],
         taskName: [
           { required: true, message: '任务名称不能为空', trigger: 'blur' }

src/views/task/new/index.vue

@@ -74,7 +74,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="任务编号" prop="taskNo">
+            <el-form-item label="任务号" prop="taskNo">
               <el-input v-model="model.taskNo" placeholder="请输入" clearable />
             </el-form-item>
           </el-col>
@@ -87,7 +87,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="保密等级" prop="confidentialityLevel">
               <el-select
                 v-model="model.confidentialityLevel"
@@ -103,7 +103,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="8">
             <el-form-item label="产品名称" prop="productName">
@@ -367,7 +367,7 @@ export default {
         standardId: '', // 检验依据
         taskList: [], // 选择的任务(检查项目)
         testScenarioList: [], // 选择的测试场景
-        taskNo: '', // 任务编号
+        taskNo: '', // 任务号
         taskName: '', // 任务名称
         confidentialityLevel: '', // 保密等级
         productName: '', // 产品名称
@@ -430,7 +430,7 @@ export default {
       showTestScenario: false,
       // 新增/保存 - 对象
       model: {
-        taskNo: '', // 任务编号
+        taskNo: '', // 任务号
         taskName: '', // 任务名称
         confidentialityLevel: '', // 保密等级
         productName: '', // 产品名称
@@ -477,7 +477,7 @@ export default {
           { required: true, message: '请选择检验依据', trigger: 'change' }
         ],
         taskNo: [
-          { required: true, message: '任务编号不能为空', trigger: 'blur' }
+          { required: true, message: '任务号不能为空', trigger: 'blur' }
         ],
         taskName: [
           { required: true, message: '任务名称不能为空', trigger: 'blur' }

src/views/task/task-detail/index.vue

@@ -110,7 +110,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="保密等级" prop="confidentialityLevel">
               <el-select
                 v-model="model.confidentialityLevel"
@@ -127,7 +127,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="8">
             <el-form-item label="产品名称" prop="productName">