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

src/views/processing/archivedTask/index.vue

@@ -185,7 +185,7 @@
                 type="primary"
                 plain
                 size="mini"
-                @click="goNext(item.id)"
+                @click="downloadPdf(item.id)"
                 >检查报告</el-button
               >
               <el-button
@@ -249,6 +249,7 @@
 </template>
 <script>
 import page from '@/mixins/page'
+import { pdfDownload } from '@/api/task/task'
 import { mapGetters } from 'vuex'
 export default {
   dicts: ['sys_scene_type', 'task_type', 'inspection_item'],
@@ -270,6 +271,47 @@ export default {
     this.$store.dispatch('standard/setStandardList')
   },
   methods: {
+    /**
+     * 检验报告
+     */
+    downloadPdf(id) {
+      pdfDownload({
+        taskId: id,
+        type: 0
+      }).then(res => {
+        const fileUrl =
+          process.env.VUE_APP_IMAGE_API +
+          '/vehicle-quality-review-oss/' +
+          res.data
+        this.download(fileUrl)
+      })
+    },
+    /**
+     * 下载pdf
+     */
+    download(fileUrl) {
+      // 根据pdf文件地址下载
+      // window.location.href = this.fileUrl
+      const xhr = new XMLHttpRequest()
+      xhr.open('GET', fileUrl, true)
+      xhr.responseType = 'blob'
+
+      xhr.onload = () => {
+        if (xhr.status === 200) {
+          const blob = new Blob([xhr.response], { type: 'application/pdf' })
+          const url = URL.createObjectURL(blob)
+
+          const link = document.createElement('a')
+          link.href = url
+          link.download = '检查报告.pdf'
+          link.click()
+
+          URL.revokeObjectURL(url)
+        }
+      }
+
+      xhr.send()
+    },
     /* 跳转到问卷详情*/
     goNext(url) {
       this.$router.push({ path: url })

src/views/processing/carReview/write-check-form/components/companyFile.vue

@@ -156,6 +156,7 @@ export default {
     fileName(newValue) {
       this.model.fileName = newValue
       this.model.enterpriseName = this.enterpriseName
+      this.model.taskId = this.$route.query.taskId
     },
     'dialogManger.dialogEditId'(newValue) {
       this.model.fetch(
@@ -166,9 +167,6 @@ export default {
       )
     }
   },
-  created() {
-    this.model.taskId = this.$route.query.taskId
-  },
   methods: {
     handleUpdateFile(newValue) {
       this.$emit('fileNameUpdate', newValue)

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

@@ -354,7 +354,11 @@ export default {
           { required: true, message: '请选择审查结果', trigger: 'blur' }
         ],
         fileName: [
-          { required: true, message: '请输入文件名称', trigger: 'blur' }
+          {
+            required: true,
+            message: '请输入文件名称',
+            trigger: ['change']
+          }
         ],
         catalogue: [
           {

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

+<!-- 测试用例详情 -->
+<template>
+  <page-standard>
+    <div class="web-page">
+      <iframe
+        :src="url"
+        frameborder="0"
+        style="width: 100%; height: 100%"
+      ></iframe>
+    </div>
+  </page-standard>
+</template>
+
+<script>
+import { NewFileTestProject } from '@/api/graphql/client.graphql'
+export default {
+  name: 'Index',
+  data() {
+    return {
+      id: this.$route.query,
+      url: ''
+    }
+  },
+  mounted() {
+    const id = this.$route.query.id
+    this.url = `http://10.12.48.78:8090/car/complianceTestingCenter/projectOverView/project_items;${id}`
+  },
+  methods: {}
+}
+</script>
+
+<style scoped>
+.web-page {
+  height: 90vh;
+}
+</style>

src/views/processing/checkFileLibrary/index.vue

@@ -138,12 +138,12 @@
         align="left"
       >
         <template slot-scope="scope">
-          <img
+          <el-image
+            style="width: 36px; height: 36px"
             :src="baseUrl + scope.row.photo"
-            alt="文件照片"
-            width="36"
-            height="36"
-          />
+            :preview-src-list="[baseUrl + scope.row.photo]"
+          >
+          </el-image>
         </template>
       </el-table-column>
       <el-table-column

src/views/processing/processed-review/index.vue

@@ -183,7 +183,7 @@
                 type="primary"
                 plain
                 size="mini"
-                @click="goNext(item.id)"
+                @click="downloadPdf(item.id)"
                 >检查报告</el-button
               >
               <el-button
@@ -220,6 +220,7 @@
 <script>
 import page from '@/mixins/page'
 import { mapGetters } from 'vuex'
+import { pdfDownload } from '@/api/task/task'
 export default {
   mixins: [page],
   dicts: ['inspection_item'],
@@ -237,6 +238,47 @@ export default {
     this.$store.dispatch('standard/setStandardList')
   },
   methods: {
+    /**
+     * 检验报告
+     */
+    downloadPdf(id) {
+      pdfDownload({
+        taskId: id,
+        type: 0
+      }).then(res => {
+        const fileUrl =
+          process.env.VUE_APP_IMAGE_API +
+          '/vehicle-quality-review-oss/' +
+          res.data
+        this.download(fileUrl)
+      })
+    },
+    /**
+     * 下载pdf
+     */
+    download(fileUrl) {
+      // 根据pdf文件地址下载
+      // window.location.href = this.fileUrl
+      const xhr = new XMLHttpRequest()
+      xhr.open('GET', fileUrl, true)
+      xhr.responseType = 'blob'
+
+      xhr.onload = () => {
+        if (xhr.status === 200) {
+          const blob = new Blob([xhr.response], { type: 'application/pdf' })
+          const url = URL.createObjectURL(blob)
+
+          const link = document.createElement('a')
+          link.href = url
+          link.download = '检查报告.pdf'
+          link.click()
+
+          URL.revokeObjectURL(url)
+        }
+      }
+
+      xhr.send()
+    },
     /* 跳转到问卷详情*/
     goNext(url) {
       this.$router.push({ path: url })

src/views/processing/systemReview/write-check-form/components/companyFile.vue

@@ -156,6 +156,7 @@ export default {
     fileName(newValue) {
       this.model.fileName = newValue
       this.model.enterpriseName = this.enterpriseName
+      this.model.taskId = this.$route.query.taskId
     },
     'dialogManger.dialogEditId'(newValue) {
       this.model.fetch(
@@ -166,9 +167,6 @@ export default {
       )
     }
   },
-  created() {
-    this.model.taskId = this.$route.query.taskId
-  },
   methods: {
     handleUpdateFile(newValue) {
       this.$emit('fileNameUpdate', newValue)

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

@@ -364,7 +364,11 @@ export default {
           { required: true, message: '请选择审查结果', trigger: 'blur' }
         ],
         fileName: [
-          { required: true, message: '请输入文件名称', trigger: 'blur' }
+          {
+            required: true,
+            message: '请输入文件名称',
+            trigger: ['change']
+          }
         ],
         catalogue: [
           {

src/views/processing/unprocessed-review/index.vue

@@ -189,7 +189,11 @@
                     type="primary"
                     :underline="false"
                     @click="
-                      handleCarTypeTestTaskContent(item.carTestStatus, item.id)
+                      handleCarTypeTestTaskContent(
+                        item.carTestStatus,
+                        item.carTestTaskId,
+                        item.id
+                      )
                     "
                   >
                     {{
@@ -534,26 +538,30 @@ export default {
       }
     },
     // 车型测试
-    handleCarTypeTestTaskContent(status, id) {
+    handleCarTypeTestTaskContent(status, id, taskId) {
       switch (status) {
         // 查看试验方案
         case 'NEW':
           this.$router.push({
-            path: '/processing/review-form?type=3&id=' + id
+            path: `/processing/carTest/review-form?id=${id}`
           })
           break
         // 执行试验方案
         case 'PENDING':
           this.$router.push({
-            path: '/processing/vehicle-type'
+            path: `/processing/carTest/execution-test-plan?id=${id}&taskId=${taskId}`
           })
           break
         // 确认测试结果
         case 'SIGNED':
           this.$router.push({
-            path: '/processing/vehicle-type'
+            ath: `/processing/carTest/confirmation-test??id=${id}`
           })
           break
+        case 'FINISH':
+          this.$router.push({
+            path: '/processing/carTest/source-record?id=' + id
+          })
       }
     },
     /* 跳转到问卷详情*/

src/views/setting/sample/index.vue

@@ -133,11 +133,15 @@
         min-width="150"
       />
       <el-table-column
-        prop="manufacturingEnterprise"
+        prop="enterpriseName"
         label="生产企业"
         show-overflow-tooltip
         min-width="200"
-      />
+      >
+        <template slot-scope="scope">
+          {{ scope.row.enterpriseName ? scope.row.enterpriseName : '--' }}
+        </template>
+      </el-table-column>
       <el-table-column label="相关任务" width="300" :resizable="false">
         <template slot-scope="scope">
           <div v-if="scope.row.taskSampleRelation.length > 0">
@@ -279,6 +283,7 @@
             v-model="editParamsForm.manufacturingEnterpriseId"
             placeholder="请选择"
             style="width: 90%"
+            @change="selectComponent"
           >
             <el-option
               v-for="item in componentSelect"
@@ -495,6 +500,11 @@ export default {
     this.getComponentSelect()
   },
   methods: {
+    selectComponent(val) {
+      const obj = this.componentSelect.find(item => item.id === val)
+      this.editParamsForm.manufacturingEnterprise = obj.enterpriseName
+      console.log(obj)
+    },
     getComponentSelect() {
       componentSelect({
         pageNum: 1,
@@ -655,8 +665,18 @@ export default {
       }
       selectSampleInfo({ id: id }).then(res => {
         this.editParamsForm = res.data
+        const foundObject = this.componentSelect.find(
+          item => item.id === this.editParamsForm.manufacturingEnterpriseId
+        )
+        if (foundObject) {
+          this.editParamsForm.manufacturingEnterpriseId =
+            res.data.manufacturingEnterpriseId
+        } else {
+          this.editParamsForm.manufacturingEnterpriseId = ''
+        }
         this.dialogVisible = true
       })
+      this.$refs.editForm.resetFields()
     },
     handleDelete(id) {
       this.$confirm('是否确定删除该条数据?', '提示', {

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

@@ -22,7 +22,7 @@
           <el-col :span="8">
             <el-form-item label="检验依据：">
               <sapn class="card-contnet">{{
-                taskForm.standardNo + '-' + taskForm.name
+                taskForm.standardNo + '  ' + taskForm.name
               }}</sapn>
             </el-form-item>
           </el-col>

src/views/setting/testMatrix/index.vue

@@ -183,7 +183,8 @@ export default {
     },
     /** 点击跳转详情 */
     viewDetail(row) {
-      this.$message(row)
+      console.log(row)
+      // this.$message(row)
       this.$router.push({
         path: '/setting/useCaseDetails',
         query: { id: row }

src/views/setting/testMatrix/useCaseDetails/index.vue

@@ -6,8 +6,7 @@
         :src="url"
         frameborder="0"
         style="width: 100%; height: 100%"
-      ></iframe
-      >Ï
+      ></iframe>
       <el-button @click="newFileTest">新建任务</el-button>
     </div>
   </page-standard>
@@ -20,12 +19,13 @@ export default {
   data() {
     return {
       id: this.$route.query,
-      url: 'http://10.12.48.78:8090/car/caseManage/case/casePublishDetail/case_items;375'
+      url: ''
       // http://10.12.48.80:1234/car/caseManage/case/casePublishDetail/case_items;375
     }
   },
   mounted() {
-    this.getSuiteList()
+    const id = this.$route.query.id
+    this.url = `http://10.12.48.78:8090/car/caseManage/case/casePublishDetail/case_items;${id}`
   },
   methods: {
     newFileTest() {

src/views/task/on/index.vue

@@ -448,7 +448,7 @@
                 type="primary"
                 plain
                 size="mini"
-                @click="goNext(item.id)"
+                @click="downloadPdf(item.id)"
                 >检查报告</el-button
               >
               <el-button
@@ -486,11 +486,7 @@
 import page from '@/mixins/page'
 import { getHourDiff } from '@/utils/diff'
 import { mapGetters } from 'vuex'
-import {
-  reviewTaskStart,
-  reviewCarTaskStart,
-  removeTask
-} from '@/api/task/task'
+import { reviewTaskStart, pdfDownload, removeTask } from '@/api/task/task'
 import request from '@/utils/request'
 export default {
   dicts: [
@@ -545,6 +541,47 @@ export default {
     this.$store.dispatch('standard/setStandardList')
   },
   methods: {
+    /**
+     * 检验报告
+     */
+    downloadPdf(id) {
+      pdfDownload({
+        taskId: id,
+        type: 0
+      }).then(res => {
+        const fileUrl =
+          process.env.VUE_APP_IMAGE_API +
+          '/vehicle-quality-review-oss/' +
+          res.data
+        this.download(fileUrl)
+      })
+    },
+    /**
+     * 下载pdf
+     */
+    download(fileUrl) {
+      // 根据pdf文件地址下载
+      // window.location.href = this.fileUrl
+      const xhr = new XMLHttpRequest()
+      xhr.open('GET', fileUrl, true)
+      xhr.responseType = 'blob'
+
+      xhr.onload = () => {
+        if (xhr.status === 200) {
+          const blob = new Blob([xhr.response], { type: 'application/pdf' })
+          const url = URL.createObjectURL(blob)
+
+          const link = document.createElement('a')
+          link.href = url
+          link.download = '检查报告.pdf'
+          link.click()
+
+          URL.revokeObjectURL(url)
+        }
+      }
+
+      xhr.send()
+    },
     loadData() {
       this.loading = true
       if (this.active === '0') {