feat: 对接检验内容车型试验

public/index.html

@@ -8,7 +8,7 @@
     <% } %> -->
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>collapseMenuLogo.png">
     <!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> -->
     <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_86.9b2d26764ccec5f05296d7ffca18aa56.js"></script>
     <title><%= webpackConfig.name %></title>

src/api/setting/useCaseLibrary.js

@@ -12,7 +12,7 @@ export function listTestScenar(data) {
 // 获取场景类型
 export function listTestType(data) {
   return request({
-    url: '/system/type/getList',
+    url: '/system/scenario/getScenarioList',
     method: 'post',
     data: data
   })

src/api/system/home.js

 import request from '@/utils/request'
 
-export function selectQuantityStatistics(data){
+export function selectQuantityStatistics(data) {
   return request({
     url: '/home/statistics/quantityStatistics',
     method: 'post',
@@ -8,31 +8,30 @@ export function selectQuantityStatistics(data){
   })
 }
 
-export function selectStandardCategoryStatistics(){
+export function selectStandardCategoryStatistics() {
   return request({
     url: '/home/statistics/standardCategory',
     method: 'post'
   })
 }
 
-export function selectConfidentialityLevelStatistics(){
+export function selectConfidentialityLevelStatistics() {
   return request({
     url: '/home/statistics/confidentialityLevel',
     method: 'post'
   })
 }
 
-export function selectAverageInspectionRate(){
+export function selectAverageInspectionRate() {
   return request({
     url: '/home/statistics/averageInspectionRate',
     method: 'post'
   })
 }
 
-export function selectTaskParticipationStatistics(){
+export function selectTaskParticipationStatistics() {
   return request({
     url: '/home/statistics/taskParticipation',
     method: 'post'
   })
 }
-

src/api/system/sample.js

@@ -48,28 +48,27 @@ export function selectMaterial(data) {
   })
 }
 
-
 // 查看任务概览任务详情
-export function selectTaskInfo(data){
+export function selectTaskInfo(data) {
   return request({
-    url:'/task/getById',
-    method:'post',
+    url: '/task/getById',
+    method: 'post',
     data: data
   })
 }
 
 // 查看任务概览数据统计
-export function selectDataStatistics(data){
+export function selectDataStatistics(data) {
   return request({
-    url:'/task/dataStatistics',
+    url: '/task/dataStatistics',
     method: 'post',
     data: data
   })
 }
 
-export function componentSelect(data){
+export function componentSelect(data) {
   return request({
-    url:'/system/enterprise/list',
+    url: '/system/enterprise/list',
     method: 'post',
     data: data
   })

src/api/task/task.js

@@ -199,7 +199,7 @@ export function getBySubtaskId(data) {
 }
 /**
  * 下载pdf
-*/
+ */
 export function pdfDownload(data) {
   return request({
     url: '/pdf/download',
@@ -209,7 +209,7 @@ export function pdfDownload(data) {
 }
 /**
  *获取车型实验任务下的测试用例
-*/
+ */
 export function geTaskCase(data) {
   return request({
     url: '/system/testCase/getCaseIdList',
@@ -218,23 +218,21 @@ export function geTaskCase(data) {
   })
 }
 
-
 /**
  *提交确认表单
  */
 export function taskImageSubmit(data) {
-    return request({
-      url: '/car/test/task/submit',
-      method: 'post',
-      data
-    })
+  return request({
+    url: '/car/test/task/submit',
+    method: 'post',
+    data
+  })
 }
 
-
 /**
  * 获取试验场景
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
 export function getScenarioList(data) {
   return request({
@@ -246,8 +244,8 @@ export function getScenarioList(data) {
 
 /**
  * 获取试验场景下的测试用例
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
 export function getCaseByScenario(data) {
   return request({

src/api/task/test.js

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

src/assets/styles/index.scss

@@ -392,6 +392,6 @@ aside {
 .el-input__inner {
   font-family: 微软雅黑;
 }
-.el-tabs__item{
+.el-tabs__item {
   font-size: 16px;
 }

src/assets/styles/process.scss

@@ -80,7 +80,7 @@
   color: #f9a221;
 }
 .taskLeader {
-  width:120px;
+  width: 120px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

src/components/Collapse/collapse-item.vue

@@ -124,7 +124,7 @@ export default {
 .el-collapse-item__header {
   background-color: #f2f2f2 !important;
   height: auto;
-  padding-left:13px;
+  padding-left: 13px;
   display: flex;
   align-items: flex-start;
   padding: 10px;

src/components/ImageUpload/index.vue

@@ -43,7 +43,12 @@
       <template v-if="fileSize"> 且不得超过{{ fileSize }}MB </template>
     </div>
 
-    <el-dialog :visible.sync="dialogVisible" width="800" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      :visible.sync="dialogVisible"
+      width="800"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <img
         :src="dialogImageUrl"
         style="display: block; max-width: 100%; margin: 0 auto"
@@ -146,7 +151,7 @@ export default {
 
             if (file.name.lastIndexOf('.') > -1) {
               fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
-              console.log('21212',fileExtension)
+              console.log('21212', fileExtension)
             }
             isImg = this.fileType.some(type => {
               // if (file.type.indexOf(type) > -1) return true
@@ -160,7 +165,7 @@ export default {
 
           if (!isImg) {
             this.$modal.msgError(
-                `文件格式不正确, 请上传${this.fileType.join('/')}图片格式文件!`
+              `文件格式不正确, 请上传${this.fileType.join('/')}图片格式文件!`
             )
             return false
           }
@@ -185,7 +190,7 @@ export default {
       if (res.code === 200) {
         // const Image = process.env.VUE_APP_IMAGE_API + res.url
         this.uploadList.push({ name: res.originalFilename, url: res.url })
-        console.log(this.uploadList);
+        console.log(this.uploadList)
         this.uploadedSuccessfully()
       } else {
         this.number--

src/components/Page/standardOption.vue

@@ -10,7 +10,12 @@ empty
               placeholder="输入标准关键词"
               @keyup.enter.native="search()"
             >
-              <i class="el-icon-search el-input__icon" @click="search()" slot="suffix"> </i>
+              <i
+                class="el-icon-search el-input__icon"
+                @click="search()"
+                slot="suffix"
+              >
+              </i>
             </el-input>
             <ul class="select-list">
               <template v-for="item in standardList">
@@ -72,7 +77,7 @@ export default {
   methods: {
     search() {
       this.queryParams.pageNum = 1
-      this.$store.dispatch('standard/setStandardList',this.queryParams.name)
+      this.$store.dispatch('standard/setStandardList', this.queryParams.name)
     },
     selectStandard(value) {
       this.$store.dispatch('standard/setStandard', value)

src/layout/components/Navbar.vue

@@ -63,11 +63,10 @@ export default {
     // MessageWaring
   },
   data() {
-    return {
-    }
+    return {}
   },
   computed: {
-    ...mapGetters(['sidebar', 'device', 'name','avatar']),
+    ...mapGetters(['sidebar', 'device', 'name', 'avatar']),
     setting: {
       get() {
         return this.$store.state.settings.showSettings

src/layout/components/Sidebar/index.vue

@@ -9,7 +9,11 @@
     }"
   >
     <logo v-if="showLogo" :collapse="isCollapse" />
-    <el-scrollbar :class="settings.sideTheme" style="padding-bottom: 30px;" wrap-class="scrollbar-wrapper">
+    <el-scrollbar
+      :class="settings.sideTheme"
+      style="padding-bottom: 30px"
+      wrap-class="scrollbar-wrapper"
+    >
       <el-menu
         :default-active="activeMenu"
         :collapse="isCollapse"

src/mixins/router.js

@@ -21,7 +21,7 @@ export default {
       //     path: this.formPath[0]
       //   })
       // } else {
-        this.$router.back()
+      this.$router.back()
       // }
     }
   }

src/store/modules/testScenario.js

-import {getTestScenario} from "@/api/scenario/scenario";
+import { getTestScenario } from '@/api/scenario/scenario'
 
 const testScenario = {
   namespaced: true,
@@ -8,7 +8,7 @@ const testScenario = {
 
   mutations: {
     SET_TEST_SCENARIO_LIST: (state, testScenarioList) => {
-        state.testScenarioList = testScenarioList
+      state.testScenarioList = testScenarioList
     }
   },
 
@@ -16,14 +16,12 @@ const testScenario = {
     setTestScenarioList({ commit }) {
       getTestScenario({}).then(res => {
         if (res.code === 200) {
-          const obj = res.data.map(
-            ({ id, testScenario, ...rest }) => ({
-              label: testScenario,
-              value: parseInt(id),
-              check: false,
-              ...rest
-            })
-          )
+          const obj = res.data.map(({ id, testScenario, ...rest }) => ({
+            label: testScenario,
+            value: parseInt(id),
+            check: false,
+            ...rest
+          }))
           console.log('测试场景', obj)
           commit('SET_TEST_SCENARIO_LIST', obj)
         }

src/utils/el-components.js

 import Vue from 'vue'
-import ElementUI from 'element-ui';
+import ElementUI from 'element-ui'
 
 Vue.component('el-input', {
   extends: ElementUI.Input,
   created() {
-    this.$on('change', (value) => {
-      this.$emit('input', value.replace(/\s+/g,""))
+    this.$on('change', value => {
+      this.$emit('input', value.replace(/\s+/g, ''))
     })
   }
 })

src/utils/reviewDetailsTable.js

@@ -16,11 +16,11 @@ export function getRows(i) {
  * @param {*} i 章节号
  */
 export function getRows3(i) {
-    let n = 0
-    if (i.testCaseList) {
-        n = i.testCaseList.length
-    }
-    return n + 1
+  let n = 0
+  if (i.testCaseList) {
+    n = i.testCaseList.length
+  }
+  return n + 1
 }
 
 /**

src/views/informationBase/viewStandardTerms/index.vue

-<!-- 查看检验内容 -->
 <template>
   <page-standard-option>
     <div slot="tab">
-      <el-tabs v-model="queryParams.type" @tab-click="loadData">
+      <el-tabs v-model="queryParams.type" @tab-click="handleTab">
         <el-tab-pane
           v-for="(dict, key) in reviewTypeList"
           :key="key"
@@ -15,6 +14,72 @@
     <div class="container">
       <div>
         <el-form
+          v-if="queryParams.type == 'test'"
+          v-show="showSearch"
+          ref="queryForm"
+          :model="queryParams"
+          size="small"
+          :inline="true"
+        >
+          <el-form-item prop="status">
+            <el-input
+              v-model="queryParamsTest.searchFields.serialNumber"
+              placeholder="请输入标准章节"
+              clearable
+              @keyup.enter.native="loadTestData"
+            />
+          </el-form-item>
+          <el-form-item prop="status">
+            <el-input
+              v-model="queryParamsTest.searchFields.requirements"
+              placeholder="请输入标准要求"
+              clearable
+              @keyup.enter.native="loadTestData"
+            />
+          </el-form-item>
+          <el-form-item v-if="queryParams.type == 'test'" prop="status">
+            <el-input
+              v-model="queryParamsTest.searchFields.testMethod"
+              placeholder="请输入标准测试方法"
+              clearable
+              @keyup.enter.native="loadTestData"
+            />
+          </el-form-item>
+          <el-form-item v-if="queryParams.type == 'test'">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="loadTestData"
+              >查询</el-button
+            >
+            <el-button
+              type="default"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetTest"
+              >重置</el-button
+            >
+          </el-form-item>
+          <el-form-item v-else>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >查询</el-button
+            >
+            <el-button
+              type="default"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="reset"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+        <el-form
+          v-else
           v-show="showSearch"
           ref="queryForm"
           :model="queryParams"
@@ -45,7 +110,23 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item>
+          <el-form-item v-if="queryParams.type == 'test'">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="loadTestData"
+              >查询</el-button
+            >
+            <el-button
+              type="default"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetTest"
+              >重置</el-button
+            >
+          </el-form-item>
+          <el-form-item v-else>
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -70,62 +151,118 @@
       <!--        ></right-toolbar>-->
       <!--      </div>-->
     </div>
-    <el-table
-      v-loading="loading"
-      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
-        prop="chapter"
-        label="标准章节"
-        sortable
-        width="110"
-        align="center"
+    <template v-if="queryParams.type == 'test'">
+      <el-table
+        v-loading="loading"
+        border
+        :scroll-x="'1500px'"
+        :default-sort="{ prop: 'serialNumber', order: 'descending' }"
+        :data="tableTestData"
+        @sort-change="sort_change"
+      >
+        <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
+          prop="serialNumber"
+          label="标准章节"
+          sortable
+          width="110"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="requirements" label="标准要求" align="left">
+        </el-table-column>
+        <el-table-column prop="testMethod" label="标准测试方法" align="left">
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="240"
+          class-name="fixed-width"
+        >
+          <template slot-scope="scope">
+            <div class="button-bar">
+              <page-button
+                v-hasPermi="['setting:standardTerms:content']"
+                icon="doc-search"
+                title="检验内容"
+                @click.native="handleUpdate(scope.row)"
+              ></page-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="totalTest > 0"
+        :total="totalTest"
+        :background="false"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="queryTestParams"
       >
-      </el-table-column>
-      <el-table-column prop="text" label="标准要求" align="left">
-      </el-table-column>
-      <el-table-column
-        v-if="refreshTable && queryParams.type === 'test'"
-        prop="testMethod"
-        label="标准测试方法"
-        align="left"
+      </pagination>
+    </template>
+    <template v-else>
+      <el-table
+        v-loading="loading"
+        border
+        :scroll-x="'1500px'"
+        :default-sort="{ prop: 'createTime', order: 'descending' }"
+        :data="tableData"
       >
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        width="240"
-        align="center"
-        class-name="fixed-width"
+        <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
+          prop="chapter"
+          label="标准章节"
+          sortable
+          width="110"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="text" label="标准要求" align="left">
+        </el-table-column>
+        <el-table-column
+          v-if="refreshTable && queryParams.type === 'test'"
+          prop="testMethod"
+          label="标准测试方法"
+          align="left"
+        >
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="240"
+          class-name="fixed-width"
+        >
+          <template slot-scope="scope">
+            <div class="button-bar">
+              <page-button
+                v-hasPermi="['setting:standardTerms:content']"
+                icon="doc-search"
+                title="检验内容"
+                @click.native="handleUpdate(scope.row)"
+              ></page-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :background="false"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="loadData"
       >
-        <template slot-scope="scope">
-          <div class="button-bar">
-            <page-button
-              v-hasPermi="['setting:standardTerms:content']"
-              icon="doc-search"
-              title="检验内容"
-              @click.native="handleUpdate(scope.row)"
-            ></page-button>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :background="false"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="loadData"
-    >
-    </pagination>
+      </pagination>
+    </template>
     <vehiclemodel-dialog
       ref="vehicleModelDialog"
       :dialog-manger="vehicleModelDialogManger"
@@ -142,10 +279,9 @@
 </template>
 <script>
 import page from '@/mixins/page'
-import { mapGetters } from 'vuex'
 import vehicleModelDialog from './components/vehicleModelDialog'
 import documentReviewDialog from './components/documentReviewDialog'
-import request from '../../../utils/request'
+import request from '@/utils/request'
 export default {
   components: {
     'vehiclemodel-dialog': vehicleModelDialog,
@@ -156,6 +292,9 @@ export default {
   data() {
     return {
       listUrl: '/review/standard/list',
+      totalTest: 0,
+      queryTestParams: {},
+      tableTestData: [],
       reviewTypeList: [
         {
           label: '体系审查',
@@ -178,6 +317,23 @@ export default {
         standardId: this.$store.getters.standard,
         type: 'system'
       },
+      queryParamsTest: {
+        offset: {
+          offset: 0,
+          limit: 10
+        },
+        pageSize: 10,
+        pageNum: 1,
+        orderBy: {
+          field: 'serialNumber',
+          order: 'DESC'
+        },
+        searchFields: {
+          serialNumber: '',
+          requirements: '',
+          testMethod: ''
+        }
+      },
       vehicleModelDialogManger: {
         dialogVisible: false,
         refreshList: false,
@@ -215,31 +371,12 @@ export default {
     }
   },
   methods: {
-    loadData() {
-      if (this.queryParams.standardId !== '') {
-        this.loading = true
-        request({
-          url: this.listUrl,
-          method: 'post',
-          data: this.queryParams
-        })
-          .then(res => {
-            if (res.code === 200) {
-              console.log(res.rows)
-              // res.rows[0].carReviewStatus = 'FINISH'
-              // res.rows[0].reviewStatus = 'SIGNED'
-              // res.rows[0].carReviewStatus = 'FINISH'
-              this.tableData = res.rows
-              this.total = res.total
-            }
-            this.loading = false
-          })
-          .catch(error => {
-            if (error.msg) {
-              this.$message.error(error.msg)
-            }
-            this.loading = false
-          })
+    handleTab(v) {
+      if (v.index === '2') {
+        console.log(v.index)
+        this.loadTestData()
+      } else {
+        this.loadData()
       }
     },
     reset() {
@@ -259,6 +396,65 @@ export default {
         this.$refs.vehicleModelDialog.init()
       }
       // console.log('dialogEditId', this.vehicleModelDialogManger.dialogEditId)
+    },
+    sort_change(column, prop, order) {
+      this.queryParamsTest.pageNum = 1 // 排序后返回第一页
+      if (column.order) {
+        this.queryParamsTest.orderBy.order =
+          column.order === 'ascending' ? 'ASC' : 'DEAC'
+        this.queryParamsTest.orderBy.field = column.prop
+        this.loadTestData()
+      }
+    },
+    resetTest() {
+      this.queryParamsTest = {
+        offset: {
+          offset: 0,
+          limit: 10
+        },
+        pageSize: 10,
+        pageNum: 1,
+        orderBy: {
+          field: 'serialNumber',
+          order: 'DESC'
+        },
+        searchFields: {
+          serialNumber: '',
+          requirements: '',
+          testMethod: ''
+        }
+      }
+      this.loadTestData()
+    },
+    loadTestData() {
+      this.queryParamsTest.offset.offset =
+        this.queryParamsTest.pageSize * (this.queryParamsTest.pageNum - 1)
+      this.queryParamsTest.offset.limit = this.queryParamsTest.pageSize
+      const params = {
+        offset: this.queryParamsTest.offset,
+        searchFields: this.queryParamsTest.searchFields,
+        orderBy: this.queryParamsTest.orderBy,
+        name: '汽车整车信息安全技术要求'
+      }
+      this.loading = true
+      request({
+        url: '/review/standard/getList',
+        method: 'post',
+        data: params
+      })
+        .then(res => {
+          if (res.code === 200) {
+            this.tableTestData = res.data.inspectionContent
+            this.totalTest = res.data.totalCount
+          }
+          this.loading = false
+        })
+        .catch(error => {
+          if (error.msg) {
+            this.$message.error(error.msg)
+          }
+          this.loading = false
+        })
     }
   }
 }

src/views/informationBase/viewUseCaseLibrary/index.vue

@@ -142,7 +142,7 @@ export default {
   },
   methods: {
     getTestScenar() {
-      listTestScenar({ pageNum: 1, pageSize: 999 }).then(res => {
+      listTestScenar().then(res => {
         this.testScenarList = res.rows
       })
     },

src/views/setting/standardTerms/index.vue

 <template>
   <page-standard-option>
     <div slot="tab">
-      <el-tabs v-model="queryParams.type" @tab-click="loadData">
+      <el-tabs v-model="queryParams.type" @tab-click="handleTab">
         <el-tab-pane
           v-for="(dict, key) in reviewTypeList"
           :key="key"
@@ -14,6 +14,72 @@
     <div class="container">
       <div>
         <el-form
+          v-if="queryParams.type == 'test'"
+          v-show="showSearch"
+          ref="queryForm"
+          :model="queryParams"
+          size="small"
+          :inline="true"
+        >
+          <el-form-item prop="status">
+            <el-input
+              v-model="queryParamsTest.searchFields.serialNumber"
+              placeholder="请输入标准章节"
+              clearable
+              @keyup.enter.native="loadTestData"
+            />
+          </el-form-item>
+          <el-form-item prop="status">
+            <el-input
+              v-model="queryParamsTest.searchFields.requirements"
+              placeholder="请输入标准要求"
+              clearable
+              @keyup.enter.native="loadTestData"
+            />
+          </el-form-item>
+          <el-form-item v-if="queryParams.type == 'test'" prop="status">
+            <el-input
+              v-model="queryParamsTest.searchFields.testMethod"
+              placeholder="请输入标准测试方法"
+              clearable
+              @keyup.enter.native="loadTestData"
+            />
+          </el-form-item>
+          <el-form-item v-if="queryParams.type == 'test'">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="loadTestData"
+              >查询</el-button
+            >
+            <el-button
+              type="default"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetTest"
+              >重置</el-button
+            >
+          </el-form-item>
+          <el-form-item v-else>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >查询</el-button
+            >
+            <el-button
+              type="default"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="reset"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+        <el-form
+          v-else
           v-show="showSearch"
           ref="queryForm"
           :model="queryParams"
@@ -44,7 +110,23 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item>
+          <el-form-item v-if="queryParams.type == 'test'">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="loadTestData"
+              >查询</el-button
+            >
+            <el-button
+              type="default"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetTest"
+              >重置</el-button
+            >
+          </el-form-item>
+          <el-form-item v-else>
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -69,62 +151,118 @@
       <!--        ></right-toolbar>-->
       <!--      </div>-->
     </div>
-    <el-table
-      v-loading="loading"
-      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
-        prop="chapter"
-        label="标准章节"
-        sortable
-        width="110"
-        align="center"
+    <template v-if="queryParams.type == 'test'">
+      <el-table
+        v-loading="loading"
+        border
+        :scroll-x="'1500px'"
+        :default-sort="{ prop: 'serialNumber', order: 'descending' }"
+        :data="tableTestData"
+        @sort-change="sort_change"
+      >
+        <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
+          prop="serialNumber"
+          label="标准章节"
+          sortable
+          width="110"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="requirements" label="标准要求" align="left">
+        </el-table-column>
+        <el-table-column prop="testMethod" label="标准测试方法" align="left">
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="240"
+          class-name="fixed-width"
+        >
+          <template slot-scope="scope">
+            <div class="button-bar">
+              <page-button
+                v-hasPermi="['setting:standardTerms:content']"
+                icon="doc-search"
+                title="检验内容"
+                @click.native="handleUpdate(scope.row)"
+              ></page-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="totalTest > 0"
+        :total="totalTest"
+        :background="false"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="queryTestParams"
       >
-      </el-table-column>
-      <el-table-column prop="text" label="标准要求" align="left">
-      </el-table-column>
-      <el-table-column
-        v-if="refreshTable && queryParams.type === 'test'"
-        prop="testMethod"
-        label="标准测试方法"
-        align="left"
+      </pagination>
+    </template>
+    <template v-else>
+      <el-table
+        v-loading="loading"
+        border
+        :scroll-x="'1500px'"
+        :default-sort="{ prop: 'createTime', order: 'descending' }"
+        :data="tableData"
       >
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        width="240"
-        class-name="fixed-width"
+        <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
+          prop="chapter"
+          label="标准章节"
+          sortable
+          width="110"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="text" label="标准要求" align="left">
+        </el-table-column>
+        <el-table-column
+          v-if="refreshTable && queryParams.type === 'test'"
+          prop="testMethod"
+          label="标准测试方法"
+          align="left"
+        >
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="240"
+          class-name="fixed-width"
+        >
+          <template slot-scope="scope">
+            <div class="button-bar">
+              <page-button
+                v-hasPermi="['setting:standardTerms:content']"
+                icon="doc-search"
+                title="检验内容"
+                @click.native="handleUpdate(scope.row)"
+              ></page-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :background="false"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="loadData"
       >
-        <template slot-scope="scope">
-          <div class="button-bar">
-            <page-button
-              v-hasPermi="['setting:standardTerms:content']"
-              icon="doc-search"
-              title="检验内容"
-              @click.native="handleUpdate(scope.row)"
-            ></page-button>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :background="false"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="loadData"
-    >
-    </pagination>
+      </pagination>
+    </template>
     <vehiclemodel-dialog
       ref="vehicleModelDialog"
       :dialog-manger="vehicleModelDialogManger"
@@ -141,10 +279,9 @@
 </template>
 <script>
 import page from '@/mixins/page'
-import { mapGetters } from 'vuex'
 import vehicleModelDialog from './components/vehicleModelDialog'
 import documentReviewDialog from './components/documentReviewDialog'
-import request from '../../../utils/request'
+import request from '@/utils/request'
 export default {
   components: {
     'vehiclemodel-dialog': vehicleModelDialog,
@@ -155,6 +292,9 @@ export default {
   data() {
     return {
       listUrl: '/review/standard/list',
+      totalTest: 0,
+      queryTestParams: {},
+      tableTestData: [],
       reviewTypeList: [
         {
           label: '体系审查',
@@ -177,6 +317,23 @@ export default {
         standardId: this.$store.getters.standard,
         type: 'system'
       },
+      queryParamsTest: {
+        offset: {
+          offset: 0,
+          limit: 10
+        },
+        pageSize: 10,
+        pageNum: 1,
+        orderBy: {
+          field: 'serialNumber',
+          order: 'DESC'
+        },
+        searchFields: {
+          serialNumber: '',
+          requirements: '',
+          testMethod: ''
+        }
+      },
       vehicleModelDialogManger: {
         dialogVisible: false,
         refreshList: false,
@@ -214,31 +371,12 @@ export default {
     }
   },
   methods: {
-    loadData() {
-      if (this.queryParams.standardId !== '') {
-        this.loading = true
-        request({
-          url: this.listUrl,
-          method: 'post',
-          data: this.queryParams
-        })
-          .then(res => {
-            if (res.code === 200) {
-              console.log(res.rows)
-              // res.rows[0].carReviewStatus = 'FINISH'
-              // res.rows[0].reviewStatus = 'SIGNED'
-              // res.rows[0].carReviewStatus = 'FINISH'
-              this.tableData = res.rows
-              this.total = res.total
-            }
-            this.loading = false
-          })
-          .catch(error => {
-            if (error.msg) {
-              this.$message.error(error.msg)
-            }
-            this.loading = false
-          })
+    handleTab(v) {
+      if (v.index === '2') {
+        console.log(v.index)
+        this.loadTestData()
+      } else {
+        this.loadData()
       }
     },
     reset() {
@@ -258,6 +396,65 @@ export default {
         this.$refs.vehicleModelDialog.init()
       }
       // console.log('dialogEditId', this.vehicleModelDialogManger.dialogEditId)
+    },
+    sort_change(column, prop, order) {
+      this.queryParamsTest.pageNum = 1 // 排序后返回第一页
+      if (column.order) {
+        this.queryParamsTest.orderBy.order =
+          column.order === 'ascending' ? 'ASC' : 'DEAC'
+        this.queryParamsTest.orderBy.field = column.prop
+        this.loadTestData()
+      }
+    },
+    resetTest() {
+      this.queryParamsTest = {
+        offset: {
+          offset: 0,
+          limit: 10
+        },
+        pageSize: 10,
+        pageNum: 1,
+        orderBy: {
+          field: 'serialNumber',
+          order: 'DESC'
+        },
+        searchFields: {
+          serialNumber: '',
+          requirements: '',
+          testMethod: ''
+        }
+      }
+      this.loadTestData()
+    },
+    loadTestData() {
+      this.queryParamsTest.offset.offset =
+        this.queryParamsTest.pageSize * (this.queryParamsTest.pageNum - 1)
+      this.queryParamsTest.offset.limit = this.queryParamsTest.pageSize
+      const params = {
+        offset: this.queryParamsTest.offset,
+        searchFields: this.queryParamsTest.searchFields,
+        orderBy: this.queryParamsTest.orderBy,
+        name: '汽车整车信息安全技术要求'
+      }
+      this.loading = true
+      request({
+        url: '/review/standard/getList',
+        method: 'post',
+        data: params
+      })
+        .then(res => {
+          if (res.code === 200) {
+            this.tableTestData = res.data.inspectionContent
+            this.totalTest = res.data.totalCount
+          }
+          this.loading = false
+        })
+        .catch(error => {
+          if (error.msg) {
+            this.$message.error(error.msg)
+          }
+          this.loading = false
+        })
     }
   }
 }

src/views/system/role/index.vue

@@ -528,7 +528,7 @@ export default {
     handleStatusChange(row) {
       const text = row.status === '0' ? '启用' : '停用'
       this.$modal
-        .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？' ,{
+        .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？', {
           type: 'warning',
           title: text,
           closeOnClickModal: false