feat: 更新评审管理

src/api/task/test.js

@@ -50,6 +50,19 @@ export function testType(query) {
       data: query
   })
 }
+
+export function testList(query){
+  return request({
+    url: '/system/testCase/getUseCaseList',
+    method: 'post',
+    headers:{
+        'Content-Type': 'application/json',
+    },
+    data: query
+})
+}
+
+
 // 发起评审页面 用例查标准
 export function testTypeUse(query) {
   return request({

src/router/index.js

@@ -84,13 +84,6 @@ export const constantRoutes = [
       }
     ]
   },
-  //去评审页面跳转 2024-9-5 16:25:29
-  {
-    path: '/review/sceneReview',
-    component: () => import('@/views/review/sceneReview/index'),
-    name: 'GoReview',
-    hidden: true
-  },
 ]
 
 // 动态路由，基于用户权限动态去加载

src/store/modules/standard.js

@@ -67,6 +67,7 @@ const standard = {
         if (res.code === 200) {
           if (res.rows.length) {
             standard.state.standard = res.rows[0].id
+            console.log(res.rows)
           }
           commit(
             'SET_STANDARD_LIST',

src/views/review/already/index.vue

@@ -15,16 +15,17 @@
         >
           <el-form-item prop="type">
             <el-select
-              v-model="queryParams.type"
-              placeholder="检验标准()"
+              placeholder="检验标准"
+              v-model="queryParams.inspectStandardId"
               clearable
+              style="width: 100%"
             >
               <el-option
-                v-for="dict in dict.type.cene_type_wait"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+                v-for="(item, index) in standardList"
+                :key="item.id"
+                :value="item.id"
+                :label="item.standardNo"
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item prop="type">
@@ -34,7 +35,7 @@
               clearable
             >
               <el-option
-                v-for="dict in dict.type.cene_type_wait"
+                v-for="dict in dict.type.sys_scene_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -82,7 +83,6 @@
               >重置
             </el-button>
           </el-form-item>
-      
         </el-form>
         <el-table
           v-loading="loading"
@@ -235,15 +235,14 @@
 import page from '@/mixins/page'
 import dialog from './components/dialog.vue'
 import { getDicts } from '../../../api/system/dict/data'
-import { listReviewerFinish } from '@/views/review/already';
-
-
+import { listReviewerFinish } from '@/views/review/already'
+import { mapGetters } from 'vuex'
 export default {
   components: {
     'yan-dialog': dialog
   },
   mixins: [page],
-  dicts: ['review_type', 'type'],
+  dicts: ['review_type', 'type','sys_scene_type'],
   data() {
     return {
       queryParams: {
@@ -273,10 +272,10 @@ export default {
           }
         }
       },
-      reviewTypeList:[],
-      typeList:[],
-      reviewStatusList:[],
-      buttonDisabled:false
+      reviewTypeList: [],
+      typeList: [],
+      reviewStatusList: [],
+      buttonDisabled: false
     }
   },
   watch: {
@@ -287,18 +286,22 @@ export default {
       }
     }
   },
-  created(){
+  computed: {
+    ...mapGetters(['standardList'])
+  },
+  created() {
+    this.$store.dispatch('standard/setStandardList')
     this.buttonDisabled = true
-      setTimeout(()=>{
+    setTimeout(() => {
       this.buttonDisabled = false
-      },1000)
+    }, 1000)
     this.gainDictDataList()
   },
   methods: {
-    gainDictDataList(){
+    gainDictDataList() {
       const obj = 'scene_type_wait'
-      const obj1= 'review_type'
-      const obj2= 'system_review_test'
+      const obj1 = 'review_type'
+      const obj2 = 'system_review_test'
       // 获取 review_type 字典数据
       getDicts('review_type').then(response => {
         this.reviewTypeList = response.data || []
@@ -313,47 +316,48 @@ export default {
         this.reviewStatusList = response.data || []
       })
     },
-    formatOperationSort(row, column,cellValue) {
+    formatOperationSort(row, column, cellValue) {
       switch (cellValue) {
         case 'ADD_SCENE':
-          return '+新增审查场景';
+          return '+新增审查场景'
         case 'ADD_DETAILS':
-          return '+新增审查细则';
+          return '+新增审查细则'
         case 'ADD_KEYPOINT':
-          return '+新增审查要点';
+          return '+新增审查要点'
         case 'DELETE_SCENE':
-          return '×删除审查场景';
+          return '×删除审查场景'
         case 'DELETE_DETAILS':
-          return '×删除审查细则';
+          return '×删除审查细则'
         case 'DELETE_KEYPOINT':
-          return '×删除审查要点';
+          return '×删除审查要点'
         case 'ADD_USECASE':
-          return '+新增测试用例';
+          return '+新增测试用例'
         case 'DELETE_USECASE':
-          return '×删除测试用例';
+          return '×删除测试用例'
         case 'UPDATE_USECASE':
-          return '修改测试用例';
+          return '修改测试用例'
         default:
           return cellValue
-      
       }
     },
-    formatType(row,column,cellValue){
+    formatType(row, column, cellValue) {
       // const typeList= this.typeList.find(item => item.dictValue === row.type)
       // return typeList ? typeList.dictLabel : ''
-       switch(cellValue){
+      switch (cellValue) {
         case 'system':
-          return '体系审查';
+          return '体系审查'
         case 'car':
-          return '车型审查';
+          return '车型审查'
         case 'test':
-          return '车型检验';
+          return '车型检验'
         default:
           return cellValue
       }
     },
-    formatReviewStatus(row,column){
-      const reviewStatusList= this.reviewStatusList.find(item => item.dictValue === row.decision)
+    formatReviewStatus(row, column) {
+      const reviewStatusList = this.reviewStatusList.find(
+        item => item.dictValue === row.decision
+      )
       return reviewStatusList ? reviewStatusList.dictLabel : ''
     },
     /* 关闭移交弹窗-保存*/
@@ -387,16 +391,16 @@ export default {
     /* 去评审按钮页面跳转*/
     handleReview(row) {
       this.$router.push({
-        path: `/review/sceneReview`,
-        query: { id: row.id },
+        path: '/review/sceneReview',
+        query: { id: row.id }
         // params:{  },
       })
     },
     /*查看按钮页面跳转 */
-    handleDetail (row){
+    handleDetail(row) {
       this.$router.push({
         path: `/review/views`,
-        query: { id: row.id },
+        query: { id: row.id }
         // params:{  },
       })
     },
@@ -407,31 +411,44 @@ export default {
     /* 搜索按钮*/
     handleQuery() {
       this.buttonDisabled = true
-      setTimeout(()=>{
+      setTimeout(() => {
         this.buttonDisabled = false
-      },1000)
+      }, 1000)
       this.queryParams.page = 1
-      this.getList()
+      this.loadData()
     },
-    resetQuery(){
-      this.buttonDisabled = true
-      setTimeout(()=>{
+    resetQuery() {
+      ;(this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        operationSort: '',
+        type: '',
+        keyword: ''
+      }),
+        (this.buttonDisabled = true)
+      setTimeout(() => {
         this.buttonDisabled = false
-      },1000)
-      this.getList()
+      }, 1000)
+      this.loadData()
     },
-    getList(){
+    getList() {
       //打印参数
       // console.log(this.queryParams)
       // console.log(6666)
-      listReviewerFinish(this.queryParams).then(response => {
+      listReviewerFinish(this.queryParams)
+        .then(response => {
           this.tableData = response.rows
-      }).catch(error => {console.error("Error fetching data:", error)})
+        })
+        .catch(error => {
+          console.error('Error fetching data:', error)
+        })
     },
     formatDecision(row, column) {
       if (row.decision === 'PASS') {
-        return '通过'}else if (row.decision === 'REJECT') {
-        return '不通过'}
+        return '通过'
+      } else if (row.decision === 'REJECT') {
+        return '不通过'
+      }
     }
   },
   /* 重置*/
@@ -442,11 +459,9 @@ export default {
     this.queryParams.type = ''
 
     this.handleQuery()
-    },
-    /* 数据字典转换*/
-
   }
-
+  /* 数据字典转换*/
+}
 </script>
 <style lang="scss" scoped>
 /* 标题样式 */

src/views/review/createReview/deleteReviewDetails/index.vue

@@ -594,10 +594,10 @@ export default {
               console.log('testInitatereviewAdd方法出错', error)
             })
         } else {
-          this.$message({
-            message: '提交失败,请填写所有必填项目',
-            type: 'error'
-          })
+          // this.$message({
+          //   message: '提交失败,请填写所有必填项目',
+          //   type: 'error'
+          // })
         }
       })
 

src/views/review/createReview/deleteReviewKeypoints/index.vue

@@ -463,7 +463,6 @@ export default {
           //keypoint => /review/scene/change/task/getKeyPointList
           this.newResDataAdd.keypointId = this.receivedkeypoints.data.keypointId
           this.newResDataAdd.keypoint = this.receivedkeypoints.data.keypoint
-          console.log(this.receivedkeypoints, ' 222')
           this.dialogVisibleKeypoints = true
         })
         .catch(error => {
@@ -510,11 +509,10 @@ export default {
         } else {
           console.log('赋值给 this.newResData.type时出现问题')
         }
-        console.log(this.newResData.type)
+        console.log(this.selectedRequirementSave)
       
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
-      this.newResDataAdd.standard = this.selectedRequirementSave.name
-
+      this.newResDataAdd.standard = this.selectedRequirementSave.text
       this.newResDataAdd.details = this.newReviewDetailText
       
      
@@ -554,10 +552,10 @@ export default {
 
         })
         }else{
-          this.$message({
-            message:'提交失败,请填写所有必填项目',
-            type:'error'
-          })
+          // this.$message({
+          //   message:'提交失败,请填写所有必填项目',
+          //   type:'error'
+          // })
         }
       })
       

src/views/review/createReview/deleteReviewScene/index.vue

@@ -643,7 +643,7 @@ export default {
     handleConfirm() {
       console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
-      this.newResDataAdd.standard = this.selectedRequirementSave.name
+      this.newResDataAdd.standard = this.selectedRequirementSave.text
       if (this.selectedDetailsSave) {
         this.newResDataAdd.details = this.selectedDetailsSave.text
       }
@@ -689,10 +689,10 @@ export default {
               console.log('testInitatereviewAdd方法出错', error)
             })
         } else {
-          this.$message({
-            message: '提交失败,请填写所有必填项目',
-            type: 'error'
-          })
+          // this.$message({
+          //   message: '提交失败,请填写所有必填项目',
+          //   type: 'error'
+          // })
         }
       })
       //newText => 由填写的时候赋值

src/views/review/createReview/deleteUseCase/index.vue

@@ -78,9 +78,9 @@
                         <th>操作</th>
                         <th>用例编号</th>
                         <th>用例描述</th>
-                     
                       </tr>
-                      <tr v-for="(item, key4) in item.useCases">
+                      <tr 
+                      v-for="(item, key4) in item.useCases">
                         <td>
                           <template >
                             <div>
@@ -216,8 +216,12 @@ import {
 } from '@/api/task/test'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
+import { method } from 'lodash';
 import { slice } from 'lodash';
-
+import {
+  testList,
+} from '@/api/task/test'
+import { forEach } from 'lodash';
 export default {
   components: {
     collapse: collapse,
@@ -253,6 +257,7 @@ export default {
 
         testMethod: ''
       },
+      useCaseObj:{},
       newResDataAdd: {
         inspectStandardId: '',
         inspectStandardNo: '',
@@ -440,6 +445,7 @@ export default {
           this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
           this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
           this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
+          this.newResDataAdd.name = this.pageIndexSec.name
           
           this.dialogVisible = true
         })
@@ -518,8 +524,25 @@ export default {
     // 按钮-确认发起
     handleConfirm() {
       console.log('this.value = ', this.formModel)
-      this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
-      this.newResDataAdd.standard = this.selectedRequirementSave.name
+      testList({
+        offset: {
+          offset: 0,
+          limit: 100
+        },
+        name: this.pageIndexSec.name
+      }).then(res=>{
+        let useCase = {}
+        console.log(res.data.useCases)
+        forEach(res.data.useCases, item=>{
+          forEach(item.useCases,cases=>{
+            if(cases.id ==  this.selectedUseCase.id){
+              useCase = item
+              return
+            }
+          })
+        })
+       this.newResDataAdd.chapter = useCase.serialNumber
+        this.newResDataAdd.standard = useCase.requirements
       if(this.selectedDetailsSave){
         this.newResDataAdd.details = this.selectedDetailsSave.text
       }
@@ -534,16 +557,16 @@ export default {
 
       this.newReviewSceneRemark = this.formModel.beizhuxinxi
 
+       this.newResDataAdd.reviewUsecaseId = this.selectedUseCase.id
+      this.newResDataAdd.usecaseId = this.selectedUseCase.customizedID
       this.newResDataAdd.newText = this.selectedUseCase.customizedID
       this.newResDataAdd.remark = this.newReviewSceneRemark
-      this.newResDataAdd.type = 'car'
+      this.newResDataAdd.type = 'test'
       this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
           this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
           this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
-   
-      this.newResDataAdd.usecaseId = ''
       this.newResDataAdd.usecaseDescribe = this.selectedUseCase.description
-      this.newResDataAdd.reviewUsecaseId = ''
+     
 
       console.log(this.newResDataAdd, '提交之前')
       this.$refs.formItemName.validate(valid =>{
@@ -568,10 +591,10 @@ export default {
 
         })
         }else{
-          this.$message({
-            message:'提交失败,请填写所有必填项目',
-            type:'error'
-          })
+          // this.$message({
+          //   message:'提交失败,请填写所有必填项目',
+          //   type:'error'
+          // })
         }
       })
       
@@ -579,6 +602,8 @@ export default {
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText
       // this.newResDataAdd.remark = remark
+      })
+      
     }
   },
   watch: {

src/views/review/createReview/index.vue

 <template>
   <page-standard class="create-review">
-    <div slot="tab">
+    <div slot="tab" style="margin-bottom: 10px;">
       <el-row class="vif0">
         <el-col :span="3"> </el-col>
         <el-col :span="21">
@@ -37,11 +37,10 @@
                   filterable
                   clearable
                   size="medium"
-                  @change="handleSelectStandard(selected)"
                 >
                   <el-option
                     v-for="(item, indexS) in standardList"
-                    :key="indexS"
+                    :key="item.id"
                     :label="item.standardNo"
                     :value="item.id"
                     >{{ item.standardNo }}
@@ -337,6 +336,7 @@ import DeleteUseCase from './deleteUseCase'
 import UpdateUseCase from './updateUseCase'
 import { testInitatereview } from '@/api/task/test'
 
+
 export default {
   name: 'CreateReview',
   dicts: ['create_review_type', 'create_review_subtype'],
@@ -417,7 +417,7 @@ export default {
       testInitatereview(this.standardData)
         .then(response => {
           this.standardList = response.rows
-          this.selected = this.standardList[0].standardNo
+          this.selected = this.standardList[0].id
           this.pageIndexSec.inspectStandardId = this.standardList[0].id
           this.pageIndexSec.standardNo = this.standardList[0].standardNo
       
@@ -449,16 +449,11 @@ export default {
       console.log(selected, "handleSelectStandard selected");
 
       // 查找选中的项
-      const selectedItem = this.standardList.find(
-        item => item.id === selected
-      );
   
       if (selectedItem) {
         // 将选中的项的属性赋值给 pageIndexSec
         this.pageIndexSec.name = selectedItem.name;
         this.pageIndexSec.inspectStandardId = selectedItem.id;
-        this.pageIndexSec.standardNo = selectedItem.standardNo;
-
       } else {
         console.error("赋值给 this.pageIndexSec 时出现问题");
       }
@@ -477,28 +472,27 @@ export default {
     // },
     handleGoBack() {
       this.pageIndex = 0
-      this.pageIndexSec = {
-        reviewSubtype: '0',
-        reviewType: '0',
-        standardNo: '',
-        name: ''
-      }
       this.formModel = {
         reviewType: '0',
         reviewSubtype: '0'
       }
     },
     handleShowNextPage() {
+      const selectedItem = this.standardList.find(
+        item => item.id === this.selected
+      );
       //operationSort => 这个在点击下一步的界面  通过选择新增场景时就已经设置好了 为新增 ADD_SCENE 或删除
       if (
         this.selected &&
         this.formModel.reviewType === '0' &&
         this.formModel.reviewSubtype === '0'
       ) {
+     
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-
-        this.pageIndexSec.id = this.selectedItem.id
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         this.pageIndexSec.operationSort = 'ADD_KEYPOINT'
         // if(this.selectedItem){
         //   this.pageIndexSec.inspectStandardId = this.selectedItem.id
@@ -514,9 +508,10 @@ export default {
       ) {
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-        this.pageIndexSec.standardNo = this.selected
         this.pageIndexSec.operationSort = 'ADD_DETAILS'
-        this.pageIndexSec.id = this.selectedItem.id
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         // this.pageIndexSec.name = this.postData.name
         this.pageIndex = 2
         console.log(this.pageIndexSec)
@@ -527,9 +522,10 @@ export default {
       ) {
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-        this.pageIndexSec.standardNo = this.selected
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         this.pageIndexSec.operationSort = 'ADD_SCENE'
-        this.pageIndexSec.id = this.selectedItem.id
         // this.pageIndexSec.name = this.postData.name
         this.pageIndex = 3
         console.log(this.pageIndexSec)
@@ -540,9 +536,10 @@ export default {
       ) {
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-        this.pageIndexSec.standardNo = this.selected
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         this.pageIndexSec.operationSort = 'ADD_USECASE'
-        this.pageIndexSec.id = this.selectedItem.id
         // this.pageIndexSec.name = this.postData.name
         this.pageIndex = 7
         console.log(this.pageIndexSec)
@@ -554,9 +551,10 @@ export default {
       ) {
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-        this.pageIndexSec.standardNo = this.selected
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         this.pageIndexSec.operationSort = 'DELETE_KEYPOINT'
-        this.pageIndexSec.id = this.selectedItem.id
         // this.pageIndexSec.name = this.postData.name
         this.pageIndex = 4
         console.log(this.pageIndexSec)
@@ -567,9 +565,10 @@ export default {
       ) {
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-        this.pageIndexSec.standardNo = this.selected
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         this.pageIndexSec.operationSort = 'DELETE_DETAILS'
-        this.pageIndexSec.id = this.selectedItem.id
         // this.pageIndexSec.name = this.postData.name
         this.pageIndex = 5
         console.log(this.pageIndexSec)
@@ -580,9 +579,10 @@ export default {
       ) {
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-        this.pageIndexSec.standardNo = this.selected
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         this.pageIndexSec.operationSort = 'DELETE_SCENE'
-        this.pageIndexSec.id = this.selectedItem.id
         // this.pageIndexSec.name = this.postData.name
         this.pageIndex = 6
         console.log(this.pageIndexSec)
@@ -593,9 +593,10 @@ export default {
       ) {
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-        this.pageIndexSec.standardNo = this.selected
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         this.pageIndexSec.operationSort = 'DELETE_USECASE'
-        this.pageIndexSec.id = this.selectedItem.id
         // this.pageIndexSec.name = this.postData.name
         this.pageIndex = 8
         console.log(this.pageIndexSec)
@@ -606,9 +607,10 @@ export default {
       ) {
         this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
         this.pageIndexSec.reviewType = this.formModel.reviewType
-        this.pageIndexSec.standardNo = this.selected
+        this.pageIndexSec.id = selectedItem.id
+        this.pageIndexSec.standardNo =selectedItem.standardNo
+        this.pageIndexSec.name =selectedItem.name
         this.pageIndexSec.operationSort = 'UPDATE_USECASE'
-        this.pageIndexSec.id = this.selectedItem.id
         // this.pageIndexSec.name = this.postData.name
         this.pageIndex = 9
         console.log(this.pageIndexSec)
@@ -650,7 +652,6 @@ export default {
 }
 .create-review-content {
   width: 100%;
-  margin-top: 50px;
   display: flex;
   justify-content: center;
   flex-direction: column;

src/views/review/createReview/newReviewDetails/index.vue

@@ -507,7 +507,7 @@
       handleConfirm() {
         console.log('this.value = ', this.formModel)
         this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
-        this.newResDataAdd.standard = this.selectedRequirementSave.name
+        this.newResDataAdd.standard = this.selectedRequirementSave.text
         if(this.selectedKeyPointsSave){
           this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
         }
@@ -546,10 +546,10 @@
 
         })
         }else{
-          this.$message({
-            message:'提交失败,请填写所有必填项目',
-            type:'error'
-          })
+          // this.$message({
+          //   message:'提交失败,请填写所有必填项目',
+          //   type:'error'
+          // })
         }
       })
       

src/views/review/createReview/newReviewKeypoints/index.vue

@@ -480,7 +480,7 @@ export default {
       this.submitForm()
       console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
-      this.newResDataAdd.standard = this.selectedRequirementSave.name
+      this.newResDataAdd.standard = this.selectedRequirementSave.text
       this.newResDataAdd.details = this.formModel.shenchaxize
 
       this.newResDataAdd.keypoint = this.formModel.shenchayaodian
@@ -515,10 +515,10 @@ export default {
 
         })
         }else{
-          this.$message({
-            message:'提交失败,请填写所有必填项目',
-            type:'error'
-          })
+          // this.$message({
+          //   message:'提交失败,请填写所有必填项目',
+          //   type:'error'
+          // })
         }
       })
       

src/views/review/createReview/newReviewScene/index.vue

@@ -493,20 +493,18 @@ export default {
       // this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
       // this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
       // //这里newResData有type name inspectstandardNo inspectStandardId
-
+      console.log(this.newResData)
       testType(this.newResData)
         .then(response => {
           this.receivedRequirements = response
 
-          this.newResDataAdd.inspectStandardId = this.pageIndexSec.
+          this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
           this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
           this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
 
           this.dialogVisible = true
         })
-        .catch(error => {
-          console.log('testType方法出错', error)
-        })
+        
       //弹窗展示ReceivedRequirements内容 并且可以选择更改为哪一条标准要求
     },
     // 按钮-选择标准要求-选中一条标准要求
@@ -561,7 +559,6 @@ export default {
     },
     // 按钮-确认发起
     handleConfirm() {
-      console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
       this.newResDataAdd.standard = this.selectedRequirementSave.name
       if(this.selectedDetailsSave){
@@ -601,10 +598,10 @@ export default {
 
         })
         }else{
-          this.$message({
-            message:'提交失败,请填写所有必填项目',
-            type:'error'
-          })
+          // this.$message({
+          //   message:'提交失败,请填写所有必填项目',
+          //   type:'error'
+          // })
         }
       })
       //newText => 由填写的时候赋值

src/views/review/createReview/newUseCase/index.vue

@@ -17,14 +17,18 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
+          <el-form-item
+            label="检验类型"
+            prop="jianyanleixing"
+            v-model="formModel.jianyanleixing"
+          >
             <el-select
               form-rules="jianyanleixing"
               v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
               disabled
-              placeholder="车型检验"
+              placeholder="车型实验"
               @change="handleSelectType(formModel.jianyanleixing)"
             >
               <el-option :value="'test'" />
@@ -36,19 +40,23 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
+          <el-form-item
+            label="标准要求"
+            prop="biaozhunyaoqiu"
+            v-model="formModel.biaozhunyaoqiu"
+          >
             <el-button type="primary" plain @click="handleReSelectRequirements"
               >选择标准要求</el-button
             ><span>
-              {{ selectedRequirement.chapter }}
-              {{ selectedRequirement.text }}</span
+              {{ selectedRequirement.serialNumber }}
+              {{ selectedRequirement.requirements }}</span
             >
             <div>
               <!-- 选择标准要求弹窗 -->
               <el-dialog title="" :visible.sync="dialogVisible" width="70%">
                 <!-- 表格 -->
                 <el-table
-                  :data="this.receivedRequirements.rows"
+                  :data="tableData"
                   style="width: 100%"
                 >
                   <el-table-column label="选择" width="50">
@@ -61,10 +69,10 @@
                       </el-radio-group>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="chapter" label="标准章节" width="100">
+                  <el-table-column prop="serialNumber" label="标准章节" width="100">
                   </el-table-column>
 
-                  <el-table-column prop="text" label="标准要求">
+                  <el-table-column prop="requirements" label="标准要求">
                   </el-table-column>
 
                   <!-- <el-table-column prop="testMethod" label="测试方法">
@@ -75,12 +83,13 @@
 
                   <el-table-column prop="standardNo" label="标准号">
                   </el-table-column> -->
-              
                 </el-table>
 
                 <!-- 弹窗底部 -->
                 <div slot="footer" class="dialog-footer">
-                  <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
+                  <el-button type="primary" plain @click="dialogVisible = false"
+                    >确认</el-button
+                  >
                 </div>
               </el-dialog>
             </div>
@@ -92,7 +101,11 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="用例编号" prop="yonglibianhao" v-model="formModel.yonglibianhao">
+          <el-form-item
+            label="用例编号"
+            prop="yonglibianhao"
+            v-model="formModel.yonglibianhao"
+          >
             <el-input
               v-model="formModel.yonglibianhao"
               placeholder="请输入用例编号"
@@ -107,7 +120,11 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="用例描述" prop="yonglimiaoshu" v-model="formModel.yonglimiaoshu">
+          <el-form-item
+            label="用例描述"
+            prop="yonglimiaoshu"
+            v-model="formModel.yonglimiaoshu"
+          >
             <el-input
               v-model="formModel.yonglimiaoshu"
               type="textarea"
@@ -183,6 +200,7 @@
 <script>
 import {
   testType,
+  testList,
   testKeypoint,
   testDetails,
   testInitatereviewAdd,
@@ -207,6 +225,7 @@ export default {
       standardId: '',
       keypointId: '',
       detailsId: '',
+      tableData:[],
       newResDataUse: {
         offset: {
           offset: 0,
@@ -292,10 +311,10 @@ export default {
           {
             validator: (rule, value, callback) => {
               // 检查 selectedRequirement.text 是否有值
-              if (!this.selectedRequirement.text) {
-                callback(new Error('请选择标准要求'));
+              if (!this.selectedRequirement.requirements) {
+                callback(new Error('请选择标准要求'))
               } else {
-                callback();
+                callback()
               }
             },
             trigger: 'change',
@@ -307,9 +326,9 @@ export default {
             validator: (rule, value, callback) => {
               // 检查 selectedRequirement.text 是否有值
               if (!this.selectedKeyPoints.text) {
-                callback(new Error('请选择审查要点'));
+                callback(new Error('请选择审查要点'))
               } else {
-                callback();
+                callback()
               }
             },
             trigger: 'change',
@@ -321,9 +340,9 @@ export default {
             validator: (rule, value, callback) => {
               // 检查 selectedRequirement.text 是否有值
               if (!this.selectedDetails.text) {
-                callback(new Error('请选择审查细则'));
+                callback(new Error('请选择审查细则'))
               } else {
-                callback();
+                callback()
               }
             },
             trigger: 'change',
@@ -333,13 +352,12 @@ export default {
         shenchachangjing: [
           { required: true, message: '请填写审查场景', trigger: 'change' }
         ],
-        yonglibianhao:[
+        yonglibianhao: [
           { required: true, message: '请填写用例编号', trigger: 'change' }
         ],
-        yonglimiaoshu:[
+        yonglimiaoshu: [
           { required: true, message: '请填写用例描述', trigger: 'change' }
         ]
-      
       },
       formItemName: {
         biaozhunyaoqiu: '',
@@ -361,7 +379,7 @@ export default {
       .catch(error => {
         console.log('testReviewer方法出错', error)
       })
-    this.newResData.type = 'car'
+    this.newResData.type = 'test'
     this.newResData.standardNo = this.pageIndexSec.standardNo
     this.newResData.standardId = this.pageIndexSec.id
     this.newResData.name = this.pageIndexSec.name
@@ -419,11 +437,15 @@ export default {
       // this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
       // this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
       // //这里newResData有type name inspectstandardNo inspectStandardId
-
-      testType(this.newResData)
+      testList({
+        offset: {
+          offset: 0,
+          limit: 100
+        },
+        name: this.newResData.name
+      })
         .then(response => {
-          this.receivedRequirements = response
-
+          this.tableData = response.data.useCases
           this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
           this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
           this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
@@ -486,8 +508,6 @@ export default {
     // 按钮-确认发起
     handleConfirm() {
       console.log('this.value = ', this.formModel)
-      this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
-      this.newResDataAdd.standard = this.selectedRequirementSave.name
       // this.newResDataAdd.details = this.selectedDetailsSave.text
       // this.newResDataAdd.detailsId = this.selectedDetailsSave.id
       // this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
@@ -496,15 +516,17 @@ export default {
 
       this.newResDataAdd.newText = this.formModel.yonglibianhao
       this.newResDataAdd.remark = this.newReviewSceneRemark
-
+      this.newResDataAdd.name = this.pageIndexSec.name
       this.newResDataAdd.usecaseId = this.formModel.yonglibianhao
       this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu
+      this.newResDataAdd.standard = this.selectedRequirement.requirements
+      this.newResDataAdd.chapter = this.selectedRequirement.serialNumber
       this.newResDataAdd.reviewUsecaseId = ''
-      this.newResDataAdd.type = 'car'
+      this.newResDataAdd.type = 'test'
 
       console.log(this.newResDataAdd, '提交之前')
-      this.$refs.formItemName.validate(valid =>{
-        if(valid){
+      this.$refs.formItemName.validate(valid => {
+        if (valid) {
           testInitatereviewAdd(this.newResDataAdd)
             .then(response => {
               const aa = response
@@ -522,13 +544,12 @@ export default {
             })
             .catch(error => {
               console.log('testInitatereviewAdd方法出错', error)
-
-        })
-        }else{
-          this.$message({
-            message:'提交失败,请填写所有必填项目',
-            type:'error'
             })
+        } else {
+          // this.$message({
+          //   message:'提交失败,请填写所有必填项目',
+          //   type:'error'
+          // })
         }
       })
       //newText => 由填写的时候赋值
@@ -550,7 +571,7 @@ export default {
         'selectedRequirementSave 的新值:',
         this.selectedRequirementSave
       )
-      this.newResDataAdd.standardId = this.selectedRequirementSave.id
+      //this.newResDataAdd.standardId = this.selectedRequirementSave.id
       console.log(this.newResDataAdd.standardId, '新的standardId')
     },
     //

src/views/review/createReview/updateUseCase/index.vue

@@ -111,6 +111,8 @@
         <el-col :span="18">
           <el-form-item label="标准要求" prop="biaozhunyaoqiu" >
             <el-input
+              type="textarea"
+              resize="none"
               v-model="formModel.biaozhunyaoqiu"
               placeholder="选择测试用例后显示"
               :autosize="{ minRows: 3, maxRows: 6 }"
@@ -222,6 +224,9 @@ import {
 } from '@/api/task/test'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
+import { testList } from '@/api/task/test'
+import { forEach } from 'lodash';
+
 export default {
   components: {
     collapse: collapse,
@@ -259,6 +264,7 @@ export default {
 
         testMethod: ''
       },
+      useCaseObj:{},
       newResDataAdd: {
         inspectStandardId: '',
         inspectStandardNo: '',
@@ -330,6 +336,8 @@ export default {
       newReviewSceneText: '',
       newReviewSceneRemark: '',
 
+     
+
       formRules: {
         // jianyanleixing: [
         //   { required: true, message: '请选择检验类型', trigger: 'change' }
@@ -574,16 +582,35 @@ export default {
     },
     // 按钮-确认选择测试用例
     handleSelectedUseCase() {
+      testList({
+        offset: {
+          offset: 0,
+          limit: 100
+        },
+        name: this.pageIndexSec.name
+      }).then(res=>{
+        let useCase = {}
+        forEach(res.data.useCases, item=>{
+          forEach(item.useCases,cases=>{
+            if(cases.id ==  this.selectedUseCase.id){
+              useCase = item
+              return
+            }
+          })
+        })
         this.dialogVisibleUseCase = false
-      this.formModel.biaozhunyaoqiu = this.pageIndexSec.name
+        this.useCaseObj = useCase
+      this.formModel.biaozhunyaoqiu = useCase.serialNumber + useCase.requirements
       this.formModel.yonglibianhao = this.selectedUseCase.customizedID
       this.formModel.yonglimiaoshu = this.selectedUseCase.description
+      })
+     
     },
     // 按钮-确认发起
     handleConfirm() {
-      console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
       this.newResDataAdd.standard = this.selectedRequirementSave.name
+      this.newResDataAdd.name = this.pageIndexSec.name
       if(this.selectedDetailsSave){
         this.newResDataAdd.details = this.selectedDetailsSave.text
       }
@@ -599,12 +626,17 @@ export default {
           this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
       this.newReviewSceneRemark = this.formModel.beizhuxinxi
 
+      
+      this.newResDataAdd.chapter = this.useCaseObj.serialNumber
+      this.newResDataAdd.standard = this.useCaseObj.requirements
+      this.newResDataAdd.reviewUsecaseId = this.selectedUseCase.id
       this.newResDataAdd.newText = this.formModel.yonglibianhao
       this.newResDataAdd.remark = this.newReviewSceneRemark
-      this.newResDataAdd.type= 'car'
+      this.newResDataAdd.type= 'test'
 
       this.newResDataAdd.usecaseId = this.formModel.yonglibianhao
       this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu
+      
       // this.newResDataAdd.reviewUsecaseId = ''
 
       console.log(this.newResDataAdd, '提交之前')
@@ -630,10 +662,10 @@ export default {
 
         })
         }else{
-          this.$message({
-            message:'提交失败,请填写所有必填项目',
-            type:'error'
-          })
+          // this.$message({
+          //   message:'提交失败,请填写所有必填项目',
+          //   type:'error'
+          // })
         }
       })
       //newText => 由填写的时候赋值

src/views/review/initiatedReview/index.vue

@@ -21,17 +21,16 @@
     <el-form-item >
           <el-select
            placeholder="检验标准"
-            v-model="queryParams.inspectStandardNo"
+            v-model="queryParams.inspectStandardId"
             clearable
             style="width: 100%"
-            @change="loadData"
           >
             <el-option
-              key="1"
-              value="1"
-              label="汽车整车信息安全技术要求"
+              v-for="(item,index) in standardList"
+              :key="item.id"
+              :value="item.id"
+              :label="item.standardNo"
             ></el-option>
-            <el-option key="2" value="2" label="xxxxx软件升级要求"></el-option>
           </el-select>
         </el-form-item>
       <el-form-item prop="type">
@@ -41,7 +40,7 @@
           clearable
         >
           <el-option
-            v-for="dict in dict.type.scene_type"
+            v-for="dict in dict.type.sys_scene_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -239,11 +238,12 @@
 import page from '@/mixins/page'
 import { getDicts } from '@/api/system/dict/data'
 import { listTest } from '@/api/task/test'
-
+import request from '@/utils/request'
+import { mapGetters } from 'vuex'
 export default {
   name: 'Index',
   mixins: [page],
-  dicts: ['review_status', 'review_type',  'scene_type'],
+  dicts: ['review_status', 'review_type',  'sys_scene_type'],
 
   data() {
     return {
@@ -265,17 +265,24 @@ export default {
       tableData: [{}],
       typeList: [],
       reviewTypeList: [],
+      opinionList: [],
       //显示
       typeDisplay: '',
       buttonDisabled:false
     }
   },
   created() {
+    this.$store.dispatch('standard/setStandardList')
     this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
       },1000)
     this.gainDictDataList()
+
+    console.log(this.standardList)
+  },
+  computed: {
+    ...mapGetters(['standardList'])
   },
   mounted() {},
   methods: {
@@ -349,30 +356,24 @@ export default {
           return '进行中';
         case 'FINISH':
           return '已完成';
+          case 'CLOSE':
+          return '已取消'
         default:
           return cellValue
       
         }
     },
     // 列表-查询
-    handleQuery() {
-      this.buttonDisabled = true
-      setTimeout(()=>{
-        this.buttonDisabled = false
-      },1000)
-      this.queryParams.page = 1
-      this.getList()
-    },
+    // handleQuery() {
+    //   this.buttonDisabled = true
+    //   setTimeout(()=>{
+    //     this.buttonDisabled = false
+    //   },1000)
+    //   this.queryParams.page = 1
+    //   this.getList()
+    // },
     // 列表-加载
-    getList() {
-      listTest(this.queryParams)
-        .then(response => {
-          this.tableData = response.rows
-        })
-        .catch(error => {
-          console.error('Error fetching data:', error)
-        })
-    },
+ 
     
     handleQuery(){
       this.buttonDisabled = true
@@ -426,6 +427,13 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        request({
+          url:'/review/scene/change/task/cancel ',
+          method:'post',
+          data:{ id:row.id }
+        }).then(res=>{
+          this.loadData()
+        })
         this.$message.success('操作成功')
       })
     },

src/views/review/wait/index.vue

@@ -13,6 +13,21 @@
           size="small"
           :inline="true"
         >
+        <el-form-item prop="type">
+            <el-select
+              placeholder="检验标准"
+              v-model="queryParams.inspectStandardId"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="(item, index) in standardList"
+                :key="item.id"
+                :value="item.id"
+                :label="item.standardNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item prop="operationSort">
             <el-select
               v-model="queryParams.operationSort"
@@ -34,7 +49,7 @@
               clearable
             >
               <el-option
-                v-for="dict in dict.type.type"
+                v-for="dict in dict.type.sys_scene_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -212,12 +227,13 @@ import page from '@/mixins/page'
 import dialog from './components/dialog.vue'
 import { getDicts } from '@/api/system/dict/data'
 import { listReviewer } from '../../../api/reviewer/reviewer'
+import { mapGetters } from 'vuex'
 export default {
   components: {
     'yan-dialog': dialog
   },
   mixins: [page],
-  dicts: ['review_type', 'type'],
+  dicts: ['review_type', 'type','sys_scene_type'],
   data() {
     return {
       queryParams: {
@@ -262,8 +278,16 @@ export default {
     }
   },
   created() {
+    this.$store.dispatch('standard/setStandardList')
+    this.buttonDisabled = true
+      setTimeout(()=>{
+        this.buttonDisabled = false
+      },1000)
     this.gainDictDataList()
   },
+  computed: {
+    ...mapGetters(['standardList'])
+  },
   methods: {
     //计算任务等待时间
     formatWaitingTime(row) {
@@ -367,7 +391,7 @@ export default {
     /* 去评审按钮页面跳转*/
     handleReview(row) {
       this.$router.push({
-        path: `/review/sceneReview`,
+        path: '/review/sceneReview',
         query: { 
           id: row.id, 
           sort: row.operationSort
@@ -380,10 +404,10 @@ export default {
       this.handOverDialog.visible = true
     },
     /* 搜索按钮*/
-    handleQuery() {
-      this.queryParams.page = 1
-      this.getList()
-    },
+    // handleQuery() {
+    //   this.queryParams.page = 1
+    //   this.getList()
+    // },
     getList() {
       //打印参数
       // console.log(this.queryParams)
@@ -400,7 +424,7 @@ export default {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.loadData()
     },
     /* 重置*/
@@ -408,7 +432,7 @@ export default {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,

src/views/setting/review/index.vue

@@ -29,7 +29,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <div class="subtitle">提醒设置</div>
 
       <el-row :gutter="20">