Merge branch 'mengzixuan' of http://gitlab.91isoft.com:90/car-test/web into develop

package.json

-{
-  "name": "jiaxu.yan",
+{
  "name": "jiaxu.yan",
  "version": "0.0.1",
  "description": "中汽研安全检测平台管理系统",
  "author": "中汽研安全检测平台",
  "scripts": {
    "stylelint:fix": "stylelint src/**/*.{html,vue,sass} --fix",
    "lint:fix": "prettier src/**/* --write",
    "lint": "eslint src/**/* --ext .js,.vue",
    "build:prod": "vue-cli-service build",
    "build:stage": "vue-cli-service build --mode staging",
    "dev": "vue-cli-service serve",
    "preview": "node build/index.js --preview",
    "lint:stage": "lint-staged",
    "spellcheck": "cspell lint --dot --gitignore --color --cache --show-suggestions \"src/**/*.@(html|js|cjs|mjs|ts|tsx|css|scss|md|vue)\"",
    "prepare": "husky install",
    "commitlint": "commitlint --edit"
  },
  "dependencies": {
    "@icon-park/vue": "^1.4.2",
    "@riophae/vue-treeselect": "0.4.0",
    "apollo-boost": "^0.4.9",
    "axios": "0.24.0",
    "clipboard": "2.0.8",
    "core-js": "3.25.3",
    "cspell": "^8.1.3",
    "echarts": "5.4.0",
    "element-ui": "2.15.13",
    "file-saver": "2.0.5",
    "fuse.js": "6.4.3",
    "graphql": "^16.8.1",
    "graphql-tag": "^2.12.6",
    "graphql-tools": "^9.0.1",
    "highlight.js": "9.18.5",
    "js-beautify": "1.13.0",
    "js-cookie": "3.0.1",
    "jsencrypt": "3.0.0-rc.1",
    "lodash": "4.17.21",
    "nprogress": "0.2.0",
    "quill": "1.3.7",
    "screenfull": "5.0.2",
    "sortablejs": "1.10.2",
    "svg-sprite-loader": "^6.0.11",
    "vue": "2.6.12",
    "vue-apollo": "^3.1.2",
    "vue-count-to": "1.0.13",
    "vue-cropper": "0.5.5",
    "vue-meta": "2.4.0",
    "vue-router": "3.4.9",
    "vuedraggable": "2.24.3",
    "vuex": "3.6.0"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "5.0.8",
    "@vue/cli-plugin-eslint": "5.0.8",
    "@vue/cli-service": "4.4.6",
    "babel-eslint": "10.1.0",
    "babel-plugin-dynamic-import-node": "2.3.3",
    "babel-plugin-transform-remove-console": "^6.9.4",
    "chalk": "4.1.0",
    "commitizen": "^4.0.3",
    "commitlint": "^8.2.0",
    "compression-webpack-plugin": "5.0.2",
    "connect": "3.6.6",
    "conventional-changelog-cli": "^2.0.28",
    "eslint-config-prettier": "^9.1.0",
    "eslint-plugin-prettier": "^4.2.1",
    "eslint-plugin-vue": "7.2.0",
    "husky": "^8.0.0",
    "lint-staged": "^10.5.3",
    "mockjs": "1.0.1-beta3",
    "postcss": "^8.4.12",
    "postcss-html": "^1.3.0",
    "prettier": "^2.8.8",
    "prettier-eslint-cli": "^8.0.1",
    "runjs": "4.4.2",
    "sass": "1.32.13",
    "sass-loader": "10.1.1",
    "script-ext-html-webpack-plugin": "2.1.5",
    "stylelint": "^14.6.0",
    "stylelint-config-html": "^1.0.0",
    "stylelint-config-prettier": "^9.0.3",
    "stylelint-config-recommended": "^7.0.0",
    "stylelint-config-recommended-scss": "^7.0.0",
    "stylelint-config-recommended-vue": "^1.4.0",
    "stylelint-config-standard": "^25.0.0",
    "stylelint-config-standard-scss": "^4.0.0",
    "stylelint-order": "^5.0.0",
    "vue-cli-plugin-commitlint": "~1.0.12",
    "vue-template-compiler": "2.6.12"
  },
  "browserslist": [
    "> 1%",
    "last 2 versions"
  ],
  "config": {
    "commitizen": {
      "path": "./node_modules/vue-cli-plugin-commitlint/lib/cz"
    }
  },
  "engines": {
    "node": ">=8.9",
    "npm": ">= 3.0.0"
  },
  "keywords": [
    "vue",
    "admin",
    "dashboard",
    "element-ui",
    "boilerplate",
    "admin-template",
    "management-system"
  ],
  "license": "MIT",
  "lint-staged": {
    "src/**/*.{js,vue}": [
      "eslint --fix",
      "git add"
    ]
  },
  "repository": {
    "type": "git",
    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
  }}
\ No newline at end of file
-  "version": "0.0.1",
-  "description": "中汽研安全检测平台管理系统",
-  "author": "中汽研安全检测平台",
-  "scripts": {
-    "stylelint:fix": "stylelint src/**/*.{html,vue,sass} --fix",
-    "lint:fix": "prettier src/**/* --write",
-    "lint": "eslint src/**/* --ext .js,.vue",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "dev": "vue-cli-service serve",
-    "preview": "node build/index.js --preview",
-    "lint:stage": "lint-staged",
-    "spellcheck": "cspell lint --dot --gitignore --color --cache --show-suggestions \"src/**/*.@(html|js|cjs|mjs|ts|tsx|css|scss|md|vue)\"",
-    "prepare": "husky install",
-    "commitlint": "commitlint --edit"
-  },
-  "dependencies": {
-    "@icon-park/vue": "^1.4.2",
-    "@riophae/vue-treeselect": "0.4.0",
-    "apollo-boost": "^0.4.9",
-    "axios": "0.24.0",
-    "clipboard": "2.0.8",
-    "core-js": "3.25.3",
-    "cspell": "^8.1.3",
-    "echarts": "5.4.0",
-    "element-ui": "2.15.13",
-    "file-saver": "2.0.5",
-    "fuse.js": "6.4.3",
-    "graphql": "^16.8.1",
-    "graphql-tag": "^2.12.6",
-    "graphql-tools": "^9.0.1",
-    "highlight.js": "9.18.5",
-    "js-beautify": "1.13.0",
-    "js-cookie": "3.0.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "lodash": "4.17.21",
-    "nprogress": "0.2.0",
-    "quill": "1.3.7",
-    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
-    "vue": "2.6.12",
-    "vue-apollo": "^3.1.2",
-    "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
-    "vue-meta": "2.4.0",
-    "vue-router": "3.4.9",
-    "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "5.0.8",
-    "@vue/cli-plugin-eslint": "5.0.8",
-    "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "chalk": "4.1.0",
-    "commitizen": "^4.0.3",
-    "commitlint": "^8.2.0",
-    "compression-webpack-plugin": "5.0.2",
-    "connect": "3.6.6",
-    "conventional-changelog-cli": "^2.0.28",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "7.2.0",
-    "husky": "^8.0.0",
-    "lint-staged": "^10.5.3",
-    "mockjs": "1.0.1-beta3",
-    "postcss": "^8.4.12",
-    "postcss-html": "^1.3.0",
-    "prettier": "^2.8.8",
-    "prettier-eslint-cli": "^8.0.1",
-    "runjs": "4.4.2",
-    "sass": "1.32.13",
-    "sass-loader": "10.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "stylelint": "^14.6.0",
-    "stylelint-config-html": "^1.0.0",
-    "stylelint-config-prettier": "^9.0.3",
-    "stylelint-config-recommended": "^7.0.0",
-    "stylelint-config-recommended-scss": "^7.0.0",
-    "stylelint-config-recommended-vue": "^1.4.0",
-    "stylelint-config-standard": "^25.0.0",
-    "stylelint-config-standard-scss": "^4.0.0",
-    "stylelint-order": "^5.0.0",
-    "svg-sprite-loader": "5.1.1",
-    "vue-cli-plugin-commitlint": "~1.0.12",
-    "vue-template-compiler": "2.6.12"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ],
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/vue-cli-plugin-commitlint/lib/cz"
-    }
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "keywords": [
-    "vue",
-    "admin",
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "admin-template",
-    "management-system"
-  ],
-  "license": "MIT",
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
-  }
-}

src/api/setting/standardTerms.js

@@ -17,3 +17,21 @@ export function listDocumentReview(data) {
     data: data
   })
 }
+
+// 获取全部测试用例
+export function getStandardUsecase(data) {
+  return request({
+    url: '/review/standard/test/getStandardUsecase',
+    method: 'post',
+    data: data
+  })
+}
+
+// 保存所选测试用例
+export function saveStandardUsecase(data) {
+  return request({
+    url: '/review/standard/test/saveStandardUsecase',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -30,12 +30,12 @@
               {{ task.entrustedUnit }}
             </span>
           </div>
-          <!--          <div class="task-item">-->
-          <!--            <span class="task-label">任务状态:</span>-->
-          <!--            <span class="task-content">-->
-          <!--              {{ getDictData(dict.type.task_test_status, task.taskStatus) }}-->
-          <!--            </span>-->
-          <!--          </div>-->
+          <div class="task-item">
+            <span class="task-label">任务状态:</span>
+            <span class="task-content">
+              {{ getDictData(dict.type.task_test_status, task.taskStatus) }}
+            </span>
+          </div>
         </div>
         <div class="task-body">
           <!--card统计值-->
@@ -116,6 +116,75 @@
 
       <!--测试情况概要-->
       <div>
+        <div class="form-review-questionnaire">
+          <div class="title-display">
+            <span class="title-i"></span>
+            <span class="title-content">审查表单概要</span>
+            <div class="control-btns">
+              <div class="control-btn" @click="openAll()">
+                <icon-park
+                  type="down-c"
+                  theme="outline"
+                  size="16"
+                  style="margin-right: 5px"
+                  fill="#303133"
+                />
+                全部展开
+              </div>
+              <div class="control-btn" @click="closeAll()">
+                <icon-park
+                  type="up-c"
+                  theme="outline"
+                  size="16"
+                  style="margin-right: 5px"
+                  fill="#303133"
+                />
+                全部收起
+              </div>
+            </div>
+          </div>
+          <!--审查表单概要-->
+          <collapse v-model="activeNames" class="mt10">
+            <collapse-item
+              v-for="(item, key) in tableData"
+              :key="key"
+              :name="item.chapter"
+            >
+              <span slot="title" style="width: 100%">
+                <div class="standard-box">
+                  <div class="standard-left">
+                    <div class="standard">标准：</div>
+                    <div class="standard-title">
+                      {{ item.chapter + item.text }}
+                    </div>
+                  </div>
+                  <div class="standard-result">
+                    审查结果：
+                    <span v-if="item.passed == 1" class="green">符合</span>
+                    <span v-else class="orange">不符合</span>
+                  </div>
+                </div>
+              </span>
+              <table class="table">
+                <tr>
+                  <th>审查要点</th>
+                  <th>审查要点</th>
+                </tr>
+                <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
+                  <tr :key="keyPointKey">
+                    <td :rowspan="keyPoint.reviewDetailsList.length + 1">
+                      {{ keyPoint.text }}
+                    </td>
+                    <td :rowspan="keyPoint.reviewDetailsList.length + 1">
+                      {{ keyPoint.text }}
+                    </td>
+                  </tr>
+                </template>
+              </table>
+            </collapse-item>
+          </collapse>
+        </div>
+
         <div class="form-review-questionnaire">
           <div class="title-display">
             <span class="title-i"></span>
@@ -230,16 +299,22 @@
 </template>
 <!--js逻辑-->
 <script>
+import collapse from '@/components/Collapse/collapse'
+import collapseItem from '@/components/Collapse/collapse-item'
 import routerMixins from '@/mixins/router'
 import { getRows3 } from '../../../../utils/reviewDetailsTable'
 import { testDetail } from '../../../../api/task/test'
 import { getBySubtaskId, taskImageSubmit } from '../../../../api/task/task'
 export default {
-  name: 'Index',
+  components: {
+    collapse: collapse,
+    'collapse-item': collapseItem
+  },
   dicts: ['task_test_status'],
   mixins: [routerMixins],
   data() {
     return {
+      activeNames: [],
       tableData: [],
       task: {},
       model: {
@@ -259,6 +334,7 @@ export default {
   mounted() {
     this.getTest()
     this.getTestDetail()
+    this.openAll()
   },
   activated() {
     this.getTest()
@@ -266,6 +342,14 @@ export default {
   },
   methods: {
     getRows3,
+    openAll() {
+      this.activeNames = this.tableData.map(i => {
+        return i.chapter
+      })
+    },
+    closeAll() {
+      this.activeNames = []
+    },
     /* 返回跳转*/
     goToProcessedReview() {
       // this.ruleForm.taskId = '1771093631118106626'
@@ -314,10 +398,4 @@ export default {
 .form-signature-confirmation .img-item .img {
   width: 50% !important;
 }
-.table {
-  margin-top: 20px;
-}
-.table th {
-  background-color: #f2f2f2 !important;
-}
 </style>

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

@@ -9,6 +9,15 @@
     <template slot="title">
       <div class="custom_title">{{ '检验内容' }}</div>
     </template>
+    <div>
+      <el-button
+        style="margin: 20px; margin-bottom: 0px"
+        type="primary"
+        @click="relevancy"
+      >
+        关联测试内容
+      </el-button>
+    </div>
     <el-table
       v-loading="loading"
       class="el-table"
@@ -47,11 +56,35 @@
       >
       </el-table-column>
     </el-table>
+    <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-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 +103,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
       })
     },
     /** 关闭抽屉 */