fix: 70905

src/api/task/test.js

@@ -7,3 +7,11 @@ export function testDetail(data) {
         data
     })
 }
+
+export function testConfirm(data) {
+    return request({
+        url: '/car/test/task/confirm',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

src/views/informationBase/viewStandard/index.vue

-<!-- 查看标准库 -->
 <template>
   <page-standard>
     <el-table
       v-loading="loading"
       border
+      :span-method="objectSpanMethod"
       :scroll-x="'1500px'"
-      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      :default-sort="{ prop: 'releaseDate', order: 'descending' }"
       :data="tableData"
+      @sort-change="sort_change"
     >
       <el-table-column type="index" width="55" label="序号" align="center">
         <template slot-scope="scope">
@@ -100,17 +101,35 @@
 </template>
 <script>
 import page from '@/mixins/page'
+import request from '@/utils/request'
+import { geSpanList } from '@/utils/table'
 export default {
   mixins: [page],
   dicts: ['sys_detailed_classification'],
   data() {
     return {
       listUrl: '/standard/findStandardList',
+      showSearch: true,
+      list: [],
       tableData: [],
+      TixiDialogManger: {
+        dialogVisible: false,
+        refreshList: false,
+        dialogEditId: null
+      },
       classFicationList: [],
       standardFicationList: []
     }
   },
+
+  watch: {
+    'TixiDialogManger.refreshList'(val) {
+      if (val) {
+        this.loadData()
+        this.TixiDialogManger.refreshList = false
+      }
+    }
+  },
   mounted() {
     this.getDicts('sys_detailed_classification').then(response => {
       this.classFicationList = response.data
@@ -119,10 +138,65 @@ export default {
       this.standardFicationList = response.data
     })
   },
+  created() {
+    this.queryParams.isAsc = 'desc'
+    this.queryParams.orderByColumn = 'releaseDate'
+  },
   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()
+      }
+    },
     downPdf(row) {
       console.log('row', row)
       window.open(process.env.VUE_APP_IMAGE_API + row.file)
+    },
+    viewTemplate() {
+      // this.$router.push({
+      //   path: '/processing/reviewReport'
+      // })
+      window.open(
+        'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'
+      )
+    },
+    objectSpanMethod() {},
+    handleAdd() {
+      this.TixiDialogManger.dialogVisible = true
+      this.TixiDialogManger.source = {}
+    },
+    handleDelete(row) {
+      this.$modal
+        .confirm('是否确定删除该条数据？', {
+          type: 'warning',
+          title: '删除',
+          closeOnClickModal: false
+        })
+        .then(() => {
+          // return delNotice(noticeIds)
+        })
+        .then(() => {
+          this.loadData()
+          this.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
+    },
+    handleUpdate(row) {
+      console.log('row', row)
+      this.TixiDialogManger.dialogVisible = true
+      this.TixiDialogManger.dialogEditId = row.id
     }
   }
 }

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

@@ -3,55 +3,84 @@
     title="检验内容"
     :visible.sync="dialogManger.dialogVisible"
     direction="rtl"
-    size="40%"
+    size="80%"
     :before-close="handleClose"
   >
     <template slot="title">
       <div class="custom_title">{{ '检验内容' }}</div>
     </template>
-    <el-table
-      v-loading="loading"
-      class="el-table"
-      style="min-height: 88px; margin: 20px"
-      border
-      :scroll-x="'1500px'"
-      :default-sort="{ prop: 'createTime', order: 'descending' }"
-      :data="tableData"
-    >
-      <el-table-column type="index" width="55" label="序号" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="测试场景"
-        align="left"
-        sortable
-        prop="testScenario"
-      >
-      </el-table-column>
-      <el-table-column label="测试方法" align="left" sortable prop="testType">
-      </el-table-column>
-      <el-table-column
-        label="用例编号"
-        align="left"
-        sortable
-        prop="useCaseNumber"
+    <div style="padding: 20px">
+      <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' }"
+        :data="tableData"
       >
-      </el-table-column>
-      <el-table-column
-        label="用例名称"
-        align="left"
-        sortable
-        prop="useCaseName"
+        <el-table-column type="index" width="55" label="序号" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="测试场景"
+          align="left"
+          sortable
+          prop="testScenario"
+        >
+        </el-table-column>
+        <el-table-column label="测试方法" align="left" sortable prop="testType">
+        </el-table-column>
+        <el-table-column
+          label="用例编号"
+          align="left"
+          sortable
+          prop="useCaseNumber"
+        >
+        </el-table-column>
+        <el-table-column
+          label="用例名称"
+          align="left"
+          sortable
+          prop="useCaseName"
+        >
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-dialog
+      title="选择测试用例"
+      :visible.sync="open"
+      append-to-body
+      width="fit-content"
+    >
+      <el-transfer
+        v-model="value"
+        :titles="['待选列表', '已选列表']"
+        filterable
+        :filter-method="filterMethod"
+        filter-placeholder="请输入关键词"
+        :data="data"
       >
-      </el-table-column>
-    </el-table>
+      </el-transfer>
+      <div slot="footer">
+        <el-button @click="cancle">取消</el-button>
+        <el-button type="primary" @click="handleConfirm">确定</el-button>
+      </div>
+    </el-dialog>
   </el-drawer>
 </template>
 
 <script>
-import { listDocumentReview } from '../../../../api/setting/standardTerms'
+import {
+  getStandardUsecase,
+  listDocumentReview,
+  saveStandardUsecase
+} from '../../../../api/setting/standardTerms'
 import { getRows, getRows2 } from '../../../../utils/reviewDetailsTable'
 
 export default {
@@ -70,19 +99,69 @@ export default {
   },
   data() {
     return {
-      loading: true,
+      data: [
+        {
+          label: '北京',
+          key: 1,
+          disabled: false
+        },
+        {
+          label: '天津',
+          key: 2,
+          disabled: false
+        },
+        {
+          label: '河北',
+          key: 3,
+          disabled: false
+        }
+      ],
+      value: [2],
+      filterMethod(query, item) {
+        return item.label.indexOf(query) > -1
+      },
+      open: false,
+      loading: false,
       tableData: []
     }
   },
   methods: {
     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
+        }
+      })
+    },
+    relevancy() {
+      getStandardUsecase({ standardId: this.dialogManger.dialogEditId }).then(
+        res => {
+          if (res.code === 200) {
+            this.open = true
+            this.data = res.data.optionalUseCasesList
+            this.value = res.data.selectedUseCaseList
+          }
+        }
+      )
+    },
     /** 获取文档审查检验内容 */
     init() {
-      this.loading = true
+      // this.loading = true
       listDocumentReview({ id: this.dialogManger.dialogEditId }).then(res => {
         this.tableData = res.data
-        this.loading = false
+        // this.loading = false
       })
     },
     /** 关闭抽屉 */
@@ -94,15 +173,12 @@ export default {
 </script>
 
 <style scoped>
-.el-table {
-  width: auto;
-}
-/deep/ .el-drawer__header {
-  margin-bottom: 0px !important;
-}
 .custom_title {
   color: #303133 !important;
   font-size: 18px;
   font-weight: 400;
 }
+/deep/ .el-drawer__header {
+  margin-bottom: 0px !important;
+}
 </style>

src/views/informationBase/viewStandardTerms/index.vue

@@ -245,6 +245,7 @@ export default {
     reset() {
       this.queryParams.chapter = ''
       this.queryParams.text = ''
+      this.queryParams.testMethod = ''
       this.loadData()
     },
     handleUpdate(row) {

src/views/processing/carTest/execution-test-plan/index.vue

@@ -28,6 +28,7 @@
 <script>
 import SchemeView from './components/SchemeView.vue'
 import routerMixins from '@/mixins/router'
+import { testConfirm } from '@/api/task/test'
 export default {
   name: 'Scheme',
   components: {
@@ -54,6 +55,11 @@ export default {
     this.url = `https://10.12.48.78:8090/car/complianceTestingCenter/projectOverView/${id}`
   },
   methods: {
+    goBack() {
+      testConfirm({ taskId: this.$route.query.taskid }).then(res => {
+        this.$router.back()
+      })
+    },
     handlePreview() {
       this.dialogManger.dialogVisible = true
     }

src/views/setting/standard/index.vue

@@ -7,6 +7,7 @@
       :scroll-x="'1500px'"
       :default-sort="{ prop: 'releaseDate', order: 'descending' }"
       :data="tableData"
+      @sort-change="sort_change"
     >
       <el-table-column type="index" width="55" label="序号" align="center">
         <template slot-scope="scope">

src/views/setting/standardTerms/index.vue

@@ -244,6 +244,7 @@ export default {
     reset() {
       this.queryParams.chapter = ''
       this.queryParams.text = ''
+      this.queryParams.testMethod = ''
       this.loadData()
     },
     handleUpdate(row) {