fix: 70384 70403 70367

.env.staging

@@ -7,5 +7,5 @@ ENV = 'staging'
 # 中汽研安全检测平台管理系统/开发环境
 VUE_APP_BASE_API = 'http://49.232.167.247:22032'
 # 图片服务器地址
-VUE_APP_IMAGE_API = http://49.232.167.247:22039
+VUE_APP_IMAGE_API = http://49.232.167.247:22037
 

src/assets/styles/index.scss

@@ -385,3 +385,10 @@ aside {
   // background-color: #ffffff;
   color: #1a6fd7;
 }
+.el-textarea__inner {
+  font-family: 微软雅黑;
+}
+
+.el-input__inner{
+  font-family: 微软雅黑;
+}

src/utils/request.js

@@ -16,7 +16,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 100000
 })
 
 // request拦截器

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

@@ -193,13 +193,13 @@
                               v-if="reviewDetail.result.passed === 1"
                               size="medium"
                               type="success"
-                              >通过</el-tag
+                              >符合</el-tag
                             >
                             <el-tag
                               v-if="reviewDetail.result.passed === 0"
                               size="medium"
                               type="danger"
-                              >不通过</el-tag
+                              >不符合</el-tag
                             >
                           </div>
                           <div v-else>__</div>

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

@@ -190,13 +190,13 @@
                           v-if="reviewDetail.result.passed === 1"
                           size="medium"
                           type="success"
-                          >通过</el-tag
+                          >符合</el-tag
                         >
                         <el-tag
                           v-if="reviewDetail.result.passed === 0"
                           size="medium"
                           type="danger"
-                          >不通过</el-tag
+                          >不符合</el-tag
                         >
                       </td>
                       <td align="center">

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/components/previewView.vue

@@ -81,13 +81,13 @@
                         v-if="reviewDetail.result.passed === 1"
                         size="medium"
                         type="success"
-                        >通过</el-tag
+                        >符合</el-tag
                       >
                       <el-tag
                         v-if="reviewDetail.result.passed === 0"
                         size="medium"
                         type="danger"
-                        >不通过</el-tag
+                        >不符合</el-tag
                       >
                     </div>
                     <div v-else>__</div>

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

@@ -9,14 +9,14 @@
       >
         返回
       </header-button>
-      <header-button
+      <!-- <header-button
         class="back-btn"
         icon="to-bottom"
         type="default"
         @click="download()"
       >
         下载文件
-      </header-button>
+      </header-button> -->
     </div>
     <div class="task">
       <div class="task-item">

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

@@ -190,13 +190,13 @@
                           v-if="reviewDetail.result.passed === 1"
                           size="medium"
                           type="success"
-                          >通过</el-tag
+                          >符合</el-tag
                         >
                         <el-tag
                           v-if="reviewDetail.result.passed === 0"
                           size="medium"
                           type="danger"
-                          >不通过</el-tag
+                          >不符合</el-tag
                         >
                       </td>
                       <td align="center">

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

@@ -25,7 +25,7 @@
           </span>
         </div>
         <div class="task-item">
-          <span class="task-label">委托单位:</span>
+          <span class="task-label">任务状态:</span>
           <span class="task-content">
             {{
               getDictData(

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

@@ -193,13 +193,13 @@
                               v-if="reviewDetail.result.passed === 1"
                               size="medium"
                               type="success"
-                              >通过</el-tag
+                              >符合</el-tag
                             >
                             <el-tag
                               v-if="reviewDetail.result.passed === 0"
                               size="medium"
                               type="danger"
-                              >不通过</el-tag
+                              >不符合</el-tag
                             >
                           </div>
                           <div v-else>__</div>

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/components/previewView.vue

@@ -81,13 +81,13 @@
                         v-if="reviewDetail.result.passed === 1"
                         size="medium"
                         type="success"
-                        >通过</el-tag
+                        >符合</el-tag
                       >
                       <el-tag
                         v-if="reviewDetail.result.passed === 0"
                         size="medium"
                         type="danger"
-                        >不通过</el-tag
+                        >不符合</el-tag
                       >
                     </div>
                     <div v-else>__</div>

src/views/setting/company/components/dialog.vue

@@ -23,18 +23,18 @@
           placeholder="请输入企业名称"
         />
       </el-form-item>
-      <el-form-item label="车企地址" prop="address">
+      <el-form-item label="企业地址" prop="address">
         <el-input
           v-model="model.address"
           type="textarea"
           :rows="4"
           maxlength="200"
           show-word-limit
-          placeholder="请输入车企地址"
+          placeholder="请输入企业地址"
         />
       </el-form-item>
-      <el-form-item label="车企邮编" prop="postcode">
-        <el-input v-model="model.postcode" placeholder="请输入车企邮编" />
+      <el-form-item label="企业邮编" prop="postcode">
+        <el-input v-model="model.postcode" placeholder="请输入企业邮编" />
       </el-form-item>
       <el-form-item label="企业联系人" prop="enterpriseContact">
         <el-input
@@ -86,10 +86,10 @@ export default {
           { required: true, message: '请输入企业名称', trigger: 'blur' }
         ],
         address: [
-          { required: true, message: '请输入车企地址', trigger: 'blur' }
+          { required: true, message: '请输入企业地址', trigger: 'blur' }
         ],
         postcode: [
-          { required: true, message: '请输入车企邮编', trigger: 'blur' }
+          { required: true, message: '请输入企业邮编', trigger: 'blur' }
         ],
         enterpriseContact: [
           { required: true, message: '请输入企业联系人', trigger: 'blur' }

src/views/setting/company/index.vue

@@ -114,6 +114,7 @@
       >
       </el-table-column>
       <el-table-column
+        v-if="view == 2"
         label="创建人员"
         prop="createBy"
         min-width="200"
@@ -214,9 +215,7 @@ export default {
   methods: {
     handleDelete(id) {
       this.$modal
-        .confirm('是否确定删除该条数据？', '操作确认', {
-          closeOnClickModal: false
-        })
+
         .then(() => {
           this.model.uuid = id
           this.model.destroy(() => {

src/views/setting/rules/index.vue

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

src/views/setting/sample/index.vue

@@ -642,6 +642,7 @@ export default {
       this.$confirm('是否确定删除该条数据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        closeOnClickModal: false,
         type: 'warning'
       }).then(() => {
         removeSample({ id: id }).then(() => {
@@ -673,7 +674,4 @@ export default {
 .custom-link:hover {
   text-decoration: underline;
 }
-::v-deep .el-textarea__inner {
-  font-family: 微软雅黑;
-}
 </style>

src/views/setting/scene/index.vue

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

src/views/setting/standard/index.vue

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

src/views/system/menu/index.vue

@@ -550,6 +550,7 @@ export default {
     handleDelete(row) {
       this.$modal
         .confirm('是否确定删除该条数据？', {
+          title: '操作确认',
           closeOnClickModal: false
         })
         .then(function () {

src/views/task/on/index.vue

@@ -672,7 +672,8 @@ export default {
     },
     teakDelete(id) {
       this.$modal
-        .confirm('是否确定删除该条数据？', '操作确认', {
+        .confirm('是否确定删除该条数据？', {
+          title: '操作确认',
           closeOnClickModal: false
         })
         .then(() => {