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

.env.development

 # 页面标题
-VUE_APP_TITLE = 周期性检测平台
+VUE_APP_TITLE = 安全信息检测平台
 
 # 开发环境配置
 ENV = 'development'
 
+# 中汽研安全检测平台管理系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-# 中汽研安全检测平台管理系统/生产环境
-VUE_APP_BASE_API = '/api'
-
 # 图片服务器地址
-VUE_APP_IMAGE_API = '/vehicle-quality-review-oss'
+VUE_APP_IMAGE_API = http://49.232.167.247:22039
 

.env.staging

 # 页面标题
-VUE_APP_TITLE = 中汽研安全检测平台管理系统
+VUE_APP_TITLE = 安全信息检测平台
 
-NODE_ENV = production
-
-# 测试环境配置
+# 开发环境配置
 ENV = 'staging'
 
-# 中汽研安全检测平台管理系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
-
+# 中汽研安全检测平台管理系统/开发环境
+VUE_APP_BASE_API = 'http://49.232.167.247:22032'
 # 图片服务器地址
-VUE_APP_IMAGE_API = http://49.232.167.247:22037
+VUE_APP_IMAGE_API = http://49.232.167.247:22039
 

package.json

@@ -50,6 +50,7 @@
     "@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",

pnpm-lock.yaml

@@ -100,6 +100,9 @@ devDependencies:
   babel-plugin-dynamic-import-node:
     specifier: 2.3.3
     version: 2.3.3
+  babel-plugin-transform-remove-console:
+    specifier: ^6.9.4
+    version: 6.9.4
   chalk:
     specifier: 4.1.0
     version: 4.1.0
@@ -3798,6 +3801,10 @@ packages:
       - supports-color
     dev: true
 
+  /babel-plugin-transform-remove-console@6.9.4:
+    resolution: {integrity: sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==}
+    dev: true
+
   /babel-polyfill@6.26.0:
     resolution: {integrity: sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==}
     dependencies:

src/main.js

@@ -18,6 +18,7 @@ import './permission' // permission control
 import { getDicts } from '@/api/system/dict/data'
 import { getConfigKey } from '@/api/system/config'
 import {
+  getDictData,
   parseTime,
   resetForm,
   addDateRange,
@@ -73,6 +74,7 @@ import { IconPark } from '@icon-park/vue/es/all';
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime
+Vue.prototype.getDictData = getDictData
 Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel

src/utils/ruoyi.js

@@ -3,6 +3,19 @@
  * Copyright (c) 2019 ruoyi
  */
 
+/**
+   * 获取字典
+   * @param {*} options
+   * @param {*} value
+   */
+export function getDictData(options, value) {
+  const item = options.filter(v => v.value === value)
+  if (item.length > 0) {
+    return item[0].label
+  } else {
+    return null
+  }
+}
 // 日期格式化
 export function parseTime(time, pattern) {
   if (arguments.length === 0 || !time) {

src/views/informationBase/viewStandardTerms/index.vue

@@ -78,8 +78,8 @@
         prop="chapter"
         label="标准章节"
         sortable
-        width="140"
-        align="left"
+        width="110"
+        align="center"
       >
       </el-table-column>
       <el-table-column prop="text" label="标准要求" align="left">
@@ -237,6 +237,7 @@ export default {
     reset() {
       this.queryParams.chapter = ''
       this.queryParams.text = ''
+      this.loadData()
     },
     handleUpdate(row) {
       if (this.queryParams.type === 'test') {

src/views/monitor/job/index.vue

@@ -544,7 +544,9 @@ export default {
     handleStatusChange(row) {
       const text = row.status === '0' ? '启用' : '停用'
       this.$modal
-        .confirm('确认要"' + text + '""' + row.jobName + '"任务吗？')
+        .confirm('确认要"' + text + '""' + row.jobName + '"任务吗？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return changeJobStatus(row.jobId, row.status)
         })
@@ -558,7 +560,9 @@ export default {
     /* 立即执行一次 */
     handleRun(row) {
       this.$modal
-        .confirm('确认要立即执行一次"' + row.jobName + '"任务吗？')
+        .confirm('确认要立即执行一次"' + row.jobName + '"任务吗？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return runJob(row.jobId, row.jobGroup)
         })
@@ -628,7 +632,9 @@ export default {
     handleDelete(row) {
       const jobIds = row.jobId || this.ids
       this.$modal
-        .confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？')
+        .confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delJob(jobIds)
         })

src/views/monitor/job/log.vue

@@ -351,7 +351,9 @@ export default {
     handleDelete(row) {
       const jobLogIds = this.ids
       this.$modal
-        .confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？')
+        .confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delJobLog(jobLogIds)
         })
@@ -364,7 +366,9 @@ export default {
     /** 清空按钮操作 */
     handleClean() {
       this.$modal
-        .confirm('是否确认清空所有调度日志数据项？')
+        .confirm('是否确认清空所有调度日志数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return cleanJobLog()
         })

src/views/monitor/logininfor/index.vue

@@ -284,7 +284,9 @@ export default {
     handleDelete(row) {
       const infoIds = row.infoId || this.ids
       this.$modal
-        .confirm('是否确认删除访问编号为"' + infoIds + '"的数据项？')
+        .confirm('是否确认删除访问编号为"' + infoIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delLogininfor(infoIds)
         })
@@ -297,7 +299,9 @@ export default {
     /** 清空按钮操作 */
     handleClean() {
       this.$modal
-        .confirm('是否确认清空所有登录日志数据项？')
+        .confirm('是否确认清空所有登录日志数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return cleanLogininfor()
         })
@@ -311,7 +315,9 @@ export default {
     handleUnlock() {
       const username = this.selectName
       this.$modal
-        .confirm('是否确认解锁用户"' + username + '"数据项?')
+        .confirm('是否确认解锁用户"' + username + '"数据项?', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return unlockLogininfor(username)
         })

src/views/processing/archivedTask/index.vue

@@ -80,7 +80,7 @@
           :key="index"
           class="task-card-box"
         >
-          <div class="inspection-standard">检验依据：{{ item.name }}</div>
+          <div class="inspection-standard">检验依据：《{{ item.name }}》</div>
           <div class="card-content">
             <div class="card-cell">
               <div class="cell-label">任务编号</div>

src/views/processing/carReview/review-form/index.vue

@@ -24,6 +24,17 @@
             {{ model.carReviewTask.taskInitiatorDept }}
           </span>
         </div>
+        <div class="task-item">
+          <span class="task-label">任务状态:</span>
+          <span class="task-content">
+            {{
+              getDictData(
+                dict.type.test_cartype_type,
+                model.carReviewTask.taskStatus
+              )
+            }}
+          </span>
+        </div>
       </div>
 
       <!--审查问卷概要-->
@@ -147,6 +158,7 @@ export default {
     collapse: collapse,
     'collapse-item': collapseItem
   },
+  dicts: ['test_cartype_type'],
   data() {
     return {
       model: {

src/views/processing/carReview/source-record/index.vue

@@ -25,6 +25,17 @@
               {{ model.carReviewTask.taskInitiatorDept }}
             </span>
           </div>
+          <div class="task-item">
+            <span class="task-label">任务状态:</span>
+            <span class="task-content">
+              {{
+                getDictData(
+                  dict.type.test_cartype_type,
+                  model.carReviewTask.taskStatus
+                )
+              }}
+            </span>
+          </div>
         </div>
         <div class="task-body">
           <!--card统计值-->
@@ -281,6 +292,7 @@ export default {
     collapse: collapse,
     'collapse-item': collapseItem
   },
+  dicts: ['test_cartype_type'],
   data() {
     return {
       isShow: true,

src/views/processing/carReview/vehicle-type/index.vue

@@ -25,6 +25,17 @@
               {{ model.carReviewTask.taskInitiatorDept }}
             </span>
           </div>
+          <div class="task-item">
+            <span class="task-label">任务状态:</span>
+            <span class="task-content">
+              {{
+                getDictData(
+                  dict.type.test_cartype_type,
+                  model.carReviewTask.taskStatus
+                )
+              }}
+            </span>
+          </div>
         </div>
         <div class="task-body">
           <!--card统计值-->
@@ -298,6 +309,7 @@ export default {
     collapse: collapse,
     'collapse-item': collapseItem
   },
+  dicts: ['test_cartype_type'],
   data() {
     return {
       isShow: true,

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

@@ -4,7 +4,7 @@
     <div class="warn-prompt">该文件第一次出现，请维护如下相关信息</div>
 
     <div class="file-box">
-      <div class="file-box-header">企业文件库</div>
+      <div class="file-box-header">企业文件信息</div>
       <el-form
         ref="fileRef"
         :model="model"

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

@@ -34,11 +34,22 @@
                 {{ model.carReviewTask.taskInitiatorDept }}
               </span>
             </div>
+            <div class="task-item">
+              <span class="task-label">任务状态:</span>
+              <span class="task-content">
+                {{
+                  getDictData(
+                    dict.type.test_cartype_type,
+                    model.carReviewTask.taskStatus
+                  )
+                }}
+              </span>
+            </div>
           </div>
           <div class="prompt-message">
             <i class="icon el-icon-info"></i>
             <span
-              >问卷填写情况：共<span class="blue weight">
+              >表单填写情况：共<span class="blue weight">
                 {{ model.detailsList.length }} </span
               >条审查细则，已完成
               <span class="green weight">{{ readNumber }}</span> 条，未完成
@@ -278,6 +289,7 @@ export default {
     'scene-view': sceneView,
     'company-file': companyFile
   },
+  dicts: ['test_cartype_type'],
   data() {
     return {
       sceneManger: {

src/views/processing/fileLibrary/index.vue

@@ -215,19 +215,6 @@ export default {
     this.queryParams.taskId = this.$route.query.id
   },
   methods: {
-    /**
-     * 获取字典
-     * @param {*} options
-     * @param {*} value
-     */
-    getDictData(options, value) {
-      const item = options.filter(v => v.value === value)
-      if (item.length > 0) {
-        return item[0].label
-      } else {
-        return null
-      }
-    },
     handleUpdate(id) {
       this.dialogManger.dialogVisible = true
       this.dialogManger.dialogEditId = id

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

@@ -82,7 +82,7 @@
           :key="index"
           class="task-card-box"
         >
-          <div class="inspection-standard">检验依据：{{ item.name }}</div>
+          <div class="inspection-standard">检验依据：《{{ item.name }}》</div>
           <div class="card-content">
             <div class="card-cell">
               <div class="cell-label">任务编号</div>

src/views/processing/retention-file/index.vue

@@ -9,14 +9,39 @@
       >
         返回
       </header-button>
-      <header-button class="back-btn" icon="to-bottom" type="default">
+      <header-button
+        class="back-btn"
+        icon="to-bottom"
+        type="default"
+        @click="download()"
+      >
         下载文件
       </header-button>
     </div>
+    <div class="task">
+      <div class="task-item">
+        <span class="task-label">任务编号:</span>
+        <span class="task-content">
+          {{ task.taskNo }}
+        </span>
+      </div>
+      <div class="task-item">
+        <span class="task-label">任务名称:</span>
+        <span class="task-content">
+          {{ task.taskName }}
+        </span>
+      </div>
+      <div class="task-item">
+        <span class="task-label">委托单位:</span>
+        <span class="task-content">
+          {{ task.taskInitiatorDept }}
+        </span>
+      </div>
+    </div>
     <!-- table部分 -->
     <div class="pdf-box">
       <iframe
-        :src="'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'"
+        :src="fileUrl"
         frameborder="0"
         style="width: 100%; height: 100%"
       ></iframe>
@@ -25,13 +50,56 @@
 </template>
 
 <script>
+import { getTaskById } from '@/api/task/task'
 export default {
   data() {
-    return {}
+    return {
+      task: {},
+      taskId: 1,
+      fileUrl:
+        'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'
+    }
+  },
+  async mounted() {
+    if (this.$route.query.id) {
+      this.taskId = this.$route.query.id
+      this.getTaskDetail()
+    }
   },
   methods: {
+    async getTaskDetail() {
+      const result = await getTaskById({
+        id: this.taskId
+      })
+      if (result.code === 200) {
+        this.task = result.data
+      }
+    },
     handleBack() {
       this.$router.go(-1)
+    },
+    download() {
+      // 根据pdf文件地址下载
+      // window.location.href = this.fileUrl
+      const xhr = new XMLHttpRequest()
+      xhr.open('GET', this.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()
     }
   }
 }

src/views/processing/systemReview/confirm-result/index.vue

@@ -25,6 +25,17 @@
               {{ model.systemReviewTask.taskInitiatorDept }}
             </span>
           </div>
+          <div class="task-item">
+            <span class="task-label">委托单位:</span>
+            <span class="task-content">
+              {{
+                getDictData(
+                  dict.type.system_review_test,
+                  model.systemReviewTask.taskStatus
+                )
+              }}
+            </span>
+          </div>
         </div>
         <div class="task-body">
           <!--card统计值-->
@@ -269,6 +280,7 @@ export default {
     collapse: collapse,
     'collapse-item': collapseItem
   },
+  dicts: ['system_review_test'],
   data() {
     return {
       isShow: 1,

src/views/processing/systemReview/review-form/index.vue

@@ -24,6 +24,17 @@
             {{ model.systemReviewTask.taskInitiatorDept }}
           </span>
         </div>
+        <div class="task-item">
+          <span class="task-label">委托单位:</span>
+          <span class="task-content">
+            {{
+              getDictData(
+                dict.type.system_review_test,
+                model.systemReviewTask.taskStatus
+              )
+            }}
+          </span>
+        </div>
       </div>
 
       <!--审查问卷概要-->
@@ -146,6 +157,7 @@ export default {
     collapse: collapse,
     'collapse-item': collapseItem
   },
+  dicts: ['system_review_test'],
   data() {
     return {
       isShow: 1,

src/views/processing/systemReview/source-record/index.vue

@@ -25,6 +25,17 @@
               {{ model.systemReviewTask.taskInitiatorDept }}
             </span>
           </div>
+          <div class="task-item">
+            <span class="task-label">委托单位:</span>
+            <span class="task-content">
+              {{
+                getDictData(
+                  dict.type.system_review_test,
+                  model.systemReviewTask.taskStatus
+                )
+              }}
+            </span>
+          </div>
         </div>
         <div class="task-body">
           <!--card统计值-->
@@ -313,6 +324,7 @@ export default {
     collapse: collapse,
     'collapse-item': collapseItem
   },
+  dicts: ['system_review_test'],
   data() {
     return {
       isShow: 1,

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

@@ -4,7 +4,7 @@
     <div class="warn-prompt">该文件第一次出现，请维护如下相关信息</div>
 
     <div class="file-box">
-      <div class="file-box-header">企业文件库</div>
+      <div class="file-box-header">企业文件信息</div>
       <el-form
         ref="fileRef"
         :model="model"

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

@@ -34,11 +34,22 @@
                 {{ model.systemReviewTask.taskInitiatorDept }}
               </span>
             </div>
+            <div class="task-item">
+              <span class="task-label">委托单位:</span>
+              <span class="task-content">
+                {{
+                  getDictData(
+                    dict.type.system_review_test,
+                    model.systemReviewTask.taskStatus
+                  )
+                }}
+              </span>
+            </div>
           </div>
           <div class="prompt-message">
             <i class="icon el-icon-info"></i>
             <span
-              >问卷填写情况：共<span class="blue weight">
+              >表单填写情况：共<span class="blue weight">
                 {{ model.detailsList.length }} </span
               >条审查细则，已完成
               <span class="green weight">{{ readNumber }}</span> 条，未完成
@@ -284,6 +295,7 @@ export default {
     'scene-view': sceneView,
     'company-file': companyFile
   },
+  dicts: ['system_review_test'],
   data() {
     return {
       sceneManger: {

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

@@ -82,7 +82,7 @@
           :key="index"
           class="task-card-box"
         >
-          <div class="inspection-standard">检验依据：{{ item.name }}</div>
+          <div class="inspection-standard">检验依据：《{{ item.name }}》</div>
           <div class="card-content">
             <div class="card-cell">
               <div class="cell-label">任务编号</div>
@@ -341,12 +341,12 @@
                 class="button-item"
                 @click.native="goNext('/task/task-detail?taskId=' + item.id)"
               ></page-button>
-              <page-button
+              <!-- <page-button
                 icon="file-display"
                 title="预览企业留档文件"
                 class="button-item"
                 @click.native="handleRetentionFile(item)"
-              ></page-button>
+              ></page-button> -->
               <page-button
                 icon="folder-close"
                 title="车企文件库"
@@ -430,7 +430,7 @@ export default {
     handleRetentionFile(item) {
       console.log(item)
       this.$router.push({
-        path: '/processing/retention-file'
+        path: '/processing/retention-file?id=' + item.id
       })
     },
     /**
@@ -623,19 +623,6 @@ export default {
           break
       }
     },
-    /**
-     * 获取字典
-     * @param {*} options
-     * @param {*} value
-     */
-    getDictData(options, value) {
-      const item = options.filter(v => v.value === value)
-      if (item.length > 0) {
-        return item[0].label
-      } else {
-        return null
-      }
-    },
     /* 跳转到问卷详情*/
     goNext(url) {
       this.$router.push({ path: url })

src/views/setting/company/index.vue

@@ -10,7 +10,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="车企地址" prop="address">
+        <el-form-item label="企业地址" prop="address">
           <el-input
             v-model="queryParams.address"
             placeholder="请输入"
@@ -18,14 +18,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="车企邮编" prop="postcode">
-          <el-input
-            v-model="queryParams.postcode"
-            placeholder="请输入"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
         <el-form-item label="企业联系人" prop="enterpriseContact">
           <el-input
             v-model="queryParams.enterpriseContact"
@@ -63,7 +55,7 @@
       </el-form-item> -->
     </el-form>
 
-    <!-- <el-row :gutter="10" class="mb10">
+    <el-row v-if="view == 1" :gutter="10" class="mb10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['setting:company:add']"
@@ -75,7 +67,7 @@
           >新建</el-button
         >
       </el-col>
-    </el-row> -->
+    </el-row>
     <el-table
       v-if="refreshTable"
       v-loading="loading"
@@ -101,7 +93,7 @@
       >
       </el-table-column>
       <el-table-column
-        label="企业邮编"
+        label="邮编"
         prop="postcode"
         min-width="200"
         align="left"
@@ -121,6 +113,14 @@
         align="left"
       >
       </el-table-column>
+      <el-table-column
+        label="创建人员"
+        prop="createBy"
+        min-width="200"
+        align="left"
+        sortable
+      >
+      </el-table-column>
       <el-table-column
         label="创建时间"
         prop="createTime"
@@ -214,7 +214,9 @@ export default {
   methods: {
     handleDelete(id) {
       this.$modal
-        .confirm('是否确定删除该条数据？')
+        .confirm('是否确定删除该条数据？', '操作确认', {
+          closeOnClickModal: false
+        })
         .then(() => {
           this.model.uuid = id
           this.model.destroy(() => {

src/views/setting/rules/index.vue

@@ -362,7 +362,9 @@ export default {
     handleDelete(node, data) {
       // console.log(node, data)
       this.$modal
-        .confirm('是否确定删除该条数据？', '操作确认')
+        .confirm('是否确定删除该条数据？', '操作确认', {
+          closeOnClickModal: false
+        })
         .then(() => {
           // return delNotice(noticeIds)
         })

src/views/setting/sample/index.vue

@@ -73,9 +73,7 @@
     <el-table
       v-loading="tableLoding"
       :data="tableData"
-      style="width: 100%"
       border
-      :cell-style="taskNameCellStyle"
       @sort-change="sortClick"
     >
       <el-table-column type="index" width="55" label="序号" align="center">
@@ -83,7 +81,6 @@
       <el-table-column
         v-if="activeName === 'completeSample'"
         prop="identificationCode"
-        align="left"
         label="车辆识别码(VIN)"
         show-overflow-tooltip
         min-width="200"
@@ -91,14 +88,12 @@
       <el-table-column
         prop="sampleNumber"
         label="样品编号"
-        align="left"
         show-overflow-tooltip
         min-width="200"
       />
       <el-table-column
         prop="sampleName"
         label="样品名称"
-        align="left"
         show-overflow-tooltip
         min-width="200"
       >
@@ -115,21 +110,18 @@
       <el-table-column
         prop="sampleSender"
         label="送样者"
-        align="left"
         show-overflow-tooltip
         min-width="200"
       />
       <el-table-column
         prop="numberOfSamples"
         label="样品数量"
-        align="left"
         show-overflow-tooltip
         min-width="100"
       />
       <el-table-column
         prop="deliveryDate"
         label="送样日期"
-        align="left"
         sortable="'custom"
         show-overflow-tooltip
         min-width="150"
@@ -137,18 +129,16 @@
       <el-table-column
         prop="manufactureDate"
         label="生产日期"
-        align="left"
         show-overflow-tooltip
         min-width="150"
       />
       <el-table-column
         prop="manufacturingEnterprise"
         label="生产企业"
-        align="left"
         show-overflow-tooltip
         min-width="200"
       />
-      <el-table-column label="相关任务" align="left">
+      <el-table-column label="相关任务" width="300" :resizable="false">
         <template slot-scope="scope">
           <div v-if="scope.row.taskSampleRelation.length > 0">
             <el-link
@@ -158,7 +148,7 @@
               :underline="false"
               class="custom-link"
               @click="goTaskDetails(item.taskId)"
-              >{{ item.taskName ? item.taskName : '--' }}
+              >{{ item.taskNo ? item.taskNo : '--' }}
               <span v-show="index + 1 != scope.row.taskSampleRelation.length">
                 ,
               </span></el-link
@@ -368,17 +358,17 @@
         <el-form-item label="样品照片:" prop="samplePhotos">
           <div v-if="clickNameForm.samplePhotos">
             <image-preview
-              :src="clickNameForm.samplePhotos"
+              v-for="(item, index) in clickNameForm.samplePhotos"
+              :key="index"
               width="150px"
               height="150px"
+              style="margin-right: 20px"
+              :src="item"
             ></image-preview>
           </div>
           <div v-else>暂无数据</div>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-      </div>
     </el-dialog>
 
     <MaterialLibrary
@@ -399,6 +389,7 @@ import {
 } from '@/api/system/sample'
 import MaterialLibrary from '@/views/setting/materialLibrary/index.vue'
 import materialLibrary from '@/views/setting/materialLibrary/index.vue'
+import { isExternal } from '@/utils/validate'
 
 export default {
   components: { MaterialLibrary },
@@ -495,11 +486,6 @@ export default {
     this.getList()
   },
   methods: {
-    taskNameCellStyle(row, column, rowIndex, columnIndex) {
-      if (row.columnIndex === 9) {
-        return { whiteSpace: 'nowrap' }
-      }
-    },
     closeMaterial(data) {
       this.materialShow = data
     },
@@ -545,7 +531,11 @@ export default {
       })
     },
     clickAddButton() {
-      this.dialogTitle = '新增'
+      if (this.activeName === 'completeSample') {
+        this.dialogTitle = '新增整车样品'
+      } else {
+        this.dialogTitle = '新增零部件样品'
+      }
       this.dialogVisible = true
       this.determineActiveName()
     },
@@ -630,24 +620,35 @@ export default {
     clickSampleName(row) {
       this.dialogFormVisible = true
       this.clickNameForm = row
+      this.clickNameForm.samplePhotos =
+        this.clickNameForm.samplePhotos.split(',')
+      console.log(row)
     },
     closeSamplePhoto() {
       this.clickNameForm = {}
     },
     handleUpdate(id) {
-      this.dialogTitle = '编辑'
+      if (this.activeName === 'completeSample') {
+        this.dialogTitle = '编辑整车样品'
+      } else {
+        this.dialogTitle = '编辑零部件样品'
+      }
       selectSampleInfo({ id: id }).then(res => {
         this.editParamsForm = res.data
         this.dialogVisible = true
       })
     },
     handleDelete(id) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+      this.$confirm('是否确定删除该条数据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         removeSample({ id: id }).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
           this.getList()
         })
       })
@@ -663,7 +664,7 @@ export default {
   }
 }
 </script>
-<style>
+<style lang="scss" scoped>
 .dialog-button {
   display: flex;
   justify-content: flex-end;
@@ -672,4 +673,7 @@ export default {
 .custom-link:hover {
   text-decoration: underline;
 }
+::v-deep .el-textarea__inner {
+  font-family: 微软雅黑;
+}
 </style>

src/views/setting/scene/index.vue

@@ -165,7 +165,9 @@ export default {
     },
     handleDelete(row) {
       this.$modal
-        .confirm('是否确定删除场景？', '操作确认')
+        .confirm('是否确定删除该条数据？', {
+          closeOnClickModal: false
+        })
         .then(() => {
           // return delNotice(noticeIds)
         })

src/views/setting/standard/index.vue

@@ -185,7 +185,9 @@ export default {
     },
     handleDelete(row) {
       this.$modal
-        .confirm('是否确定删除该条数据？', '操作确认')
+        .confirm('是否确定删除该条数据？', '操作确认', {
+          closeOnClickModal: false
+        })
         .then(() => {
           // return delNotice(noticeIds)
         })

src/views/setting/standardTerms/index.vue

@@ -77,8 +77,8 @@
         prop="chapter"
         label="标准章节"
         sortable
-        width="140"
-        align="left"
+        width="110"
+        align="center"
       >
       </el-table-column>
       <el-table-column prop="text" label="标准要求" align="left">
@@ -236,6 +236,7 @@ export default {
     reset() {
       this.queryParams.chapter = ''
       this.queryParams.text = ''
+      this.loadData()
     },
     handleUpdate(row) {
       if (this.queryParams.type === 'test') {

src/views/system/config/index.vue

@@ -400,7 +400,9 @@ export default {
     handleDelete(row) {
       const configIds = row.configId || this.ids
       this.$modal
-        .confirm('是否确认删除参数编号为"' + configIds + '"的数据项？')
+        .confirm('是否确认删除参数编号为"' + configIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delConfig(configIds)
         })

src/views/system/dept/index.vue

@@ -410,7 +410,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal
-        .confirm('是否确认删除名称为"' + row.deptName + '"的数据项？')
+        .confirm('是否确认删除名称为"' + row.deptName + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delDept(row.deptId)
         })

src/views/system/dict/data.vue

@@ -465,7 +465,9 @@ export default {
     handleDelete(row) {
       const dictCodes = row.dictCode || this.ids
       this.$modal
-        .confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？')
+        .confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delData(dictCodes)
         })

src/views/system/dict/index.vue

@@ -395,7 +395,9 @@ export default {
     handleDelete(row) {
       const dictIds = row.dictId || this.ids
       this.$modal
-        .confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？')
+        .confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delType(dictIds)
         })

src/views/system/menu/index.vue

@@ -549,7 +549,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal
-        .confirm('是否确认删除名称为"' + row.menuName + '"的数据项？')
+        .confirm('是否确定删除该条数据？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delMenu(row.menuId)
         })

src/views/system/notice/index.vue

@@ -371,7 +371,9 @@ export default {
     handleDelete(row) {
       const noticeIds = row.noticeId || this.ids
       this.$modal
-        .confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？')
+        .confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(() => {
           return delNotice(noticeIds)
         })

src/views/system/post/index.vue

@@ -352,7 +352,9 @@ export default {
     handleDelete(row) {
       const postIds = row.postId || this.ids
       this.$modal
-        .confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？')
+        .confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delPost(postIds)
         })

src/views/system/role/authUser.vue

@@ -238,7 +238,9 @@ export default {
     cancelAuthUser(row) {
       const roleId = this.queryParams.roleId
       this.$modal
-        .confirm('确认要取消该用户"' + row.userName + '"角色吗？')
+        .confirm('确认要取消该用户"' + row.userName + '"角色吗？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return authUserCancel({ userId: row.userId, roleId: roleId })
         })
@@ -253,7 +255,9 @@ export default {
       const roleId = this.queryParams.roleId
       const userIds = this.userIds.join(',')
       this.$modal
-        .confirm('是否取消选中用户授权数据项？')
+        .confirm('是否取消选中用户授权数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return authUserCancelAll({ roleId: roleId, userIds: userIds })
         })

src/views/system/role/index.vue

@@ -514,7 +514,9 @@ export default {
     handleStatusChange(row) {
       const text = row.status === '0' ? '启用' : '停用'
       this.$modal
-        .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？')
+        .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return changeRoleStatus(row.roleId, row.status)
         })
@@ -709,7 +711,9 @@ export default {
     handleDelete(row) {
       const roleIds = row.roleId || this.ids
       this.$modal
-        .confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？')
+        .confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delRole(roleIds)
         })

src/views/system/user/index.vue

@@ -666,7 +666,9 @@ export default {
     handleStatusChange(row) {
       const text = row.status === '0' ? '启用' : '停用'
       this.$modal
-        .confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
+        .confirm('确认要"' + text + '""' + row.userName + '"用户吗？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return changeUserStatus(row.userId, row.status)
         })
@@ -803,7 +805,9 @@ export default {
     handleDelete(row) {
       const userIds = row.userId || this.ids
       this.$modal
-        .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
+        .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(function () {
           return delUser(userIds)
         })

src/views/task/on/index.vue

@@ -82,7 +82,7 @@
           :key="index"
           class="task-card-box"
         >
-          <div class="inspection-standard">检验依据：{{ item.name }}</div>
+          <div class="inspection-standard">检验依据：《{{ item.name }}》</div>
           <div v-if="item.taskStatus !== 'FINISH'" class="card-content">
             <div class="card-cell">
               <div class="cell-label">任务编号</div>
@@ -563,7 +563,7 @@ export default {
     handleRetentionFile(item) {
       console.log(item)
       this.$router.push({
-        path: '/processing/retention-file'
+        path: '/processing/retention-file?id=' + item.id
       })
     },
     /**
@@ -672,7 +672,9 @@ export default {
     },
     teakDelete(id) {
       this.$modal
-        .confirm('是否确定删除该条数据？')
+        .confirm('是否确定删除该条数据？', '操作确认', {
+          closeOnClickModal: false
+        })
         .then(() => {
           removeTask({
             id
@@ -774,14 +776,6 @@ export default {
           })
           break
       }
-    },
-    getDictData(options, value) {
-      const item = options.filter(v => v.value === value)
-      if (item.length > 0) {
-        return item[0].label
-      } else {
-        return null
-      }
     }
   }
 }

src/views/tool/gen/index.vue

@@ -357,7 +357,9 @@ export default {
     handleSynchDb(row) {
       const tableName = row.tableName
       this.$modal
-        .confirm('确认要强制同步"' + tableName + '"表结构吗？')
+        .confirm('确认要强制同步"' + tableName + '"表结构吗？', {
+          closeOnClickModal: false
+        })
         .then(() => {
           return synchDb(tableName)
         })
@@ -417,7 +419,9 @@ export default {
     handleDelete(row) {
       const tableIds = row.tableId || this.ids
       this.$modal
-        .confirm('是否确认删除表编号为"' + tableIds + '"的数据项？')
+        .confirm('是否确认删除表编号为"' + tableIds + '"的数据项？', {
+          closeOnClickModal: false
+        })
         .then(() => {
           return delTable(tableIds)
         })