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

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

@@ -89,7 +89,7 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率</div>
+                <div class="detail-title">标准条款通过率(%)</div>
                 <div class="detail-num mt10">
                   {{ model.carReviewTask.standardsPass }}%
                 </div>

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

@@ -89,7 +89,7 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率</div>
+                <div class="detail-title">标准条款通过率(%)</div>
                 <div class="detail-num mt10">
                   {{ model.carReviewTask.standardsPass }} %
                 </div>

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

@@ -67,6 +67,7 @@
                 v-model="model.fileName"
                 placeholder="请输入"
                 input="updateFocus"
+                @input="handleUpdateFile"
               ></el-input>
             </el-form-item>
             <el-form-item label="发布日期" prop="publishDate">
@@ -99,6 +100,10 @@ export default {
     enterpriseName: {
       type: String,
       default: ''
+    },
+    fileName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -148,6 +153,9 @@ export default {
     }
   },
   watch: {
+    fileName(newValue) {
+      this.model.fileName = newValue
+    },
     'dialogManger.dialogEditId'(newValue) {
       this.model.fetch(
         newValue,
@@ -164,6 +172,9 @@ export default {
     this.model.taskId = this.$route.query.taskId
   },
   methods: {
+    handleUpdateFile(newValue) {
+      this.$emit('fileNameUpdate', newValue)
+    },
     /**
      * 失去焦点回调
      */

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

@@ -237,6 +237,12 @@
                 v-show="formManger.show"
                 style="margin-left: 125px"
                 :enterprise-name="model.carReviewTask.enterpriseName"
+                :file-name="form.fileName"
+                @fileNameUpdate="
+                  name => {
+                    form.fileName = name
+                  }
+                "
                 @handleUpdate="handleFileUpdate"
                 @handleSave="handleFileSave"
               ></company-file>
@@ -608,11 +614,25 @@ export default {
     handleBack() {
       this.$router.go(-1)
     },
+    // 根据传入的名字去匹配数组内符合的项目并返回该项目
+    getProjectByName(arr, name) {
+      return arr.find(item => item.value === name)
+    },
     // 保存当前条目
     submitQuestionnaire(type) {
       this.$refs.form.validate(valid => {
         if (valid) {
           if (!this.isFileUpdate) {
+            // 根据公司文件和文件名获取特定项目项，并据此更新表单中的审核企业档案ID
+            const files = this.companyFiles // 获取公司文件列表
+            const fileName = this.form.fileName // 获取表单中填写的文件名
+            // 根据文件名在公司文件列表中查找对应项目项
+            const item = this.getProjectByName(files, fileName)
+            if (item) {
+              this.form.reviewEnterpriseArchiveId = item.id // 找到项目项则更新表单的审核企业档案ID
+            } else {
+              this.form.reviewEnterpriseArchiveId = null // 未找到则将审核企业档案ID设为null
+            }
             reviewDetailsSubmit(this.form).then(async res => {
               if (res.code === 200) {
                 await this.getTask()
@@ -641,6 +661,9 @@ export default {
         this.$router.go(-1)
       })
     },
+    /**
+     *确认细则内容变更
+     */
     confirmDetailChange() {
       reviewDetailsConfirm({
         detailsId: this.taskModel.id,

src/views/processing/fileLibrary/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/systemReview/confirm-result/index.vue

@@ -94,7 +94,7 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率</div>
+                <div class="detail-title">标准条款通过率(%)</div>
                 <div class="detail-num mt10">
                   {{ model.systemReviewTask.standardsPass }}%
                 </div>

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

@@ -94,7 +94,7 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率</div>
+                <div class="detail-title">标准条款通过率(%)</div>
                 <div class="detail-num mt10">
                   {{ model.systemReviewTask.standardsPass }} %
                 </div>

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

@@ -67,6 +67,7 @@
                 v-model="model.fileName"
                 placeholder="请输入"
                 input="updateFocus"
+                @input="handleUpdateFile"
               ></el-input>
             </el-form-item>
             <el-form-item label="发布日期" prop="publishDate">
@@ -99,6 +100,10 @@ export default {
     enterpriseName: {
       type: String,
       default: ''
+    },
+    fileName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -148,6 +153,9 @@ export default {
     }
   },
   watch: {
+    fileName(newValue) {
+      this.model.fileName = newValue
+    },
     'dialogManger.dialogEditId'(newValue) {
       this.model.fetch(
         newValue,
@@ -164,6 +172,9 @@ export default {
     this.model.taskId = this.$route.query.taskId
   },
   methods: {
+    handleUpdateFile(newValue) {
+      this.$emit('fileNameUpdate', newValue)
+    },
     /**
      * 失去焦点回调
      */

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

@@ -247,6 +247,12 @@
                 v-show="formManger.show"
                 style="margin-left: 125px"
                 :enterprise-name="model.systemReviewTask.enterpriseName"
+                :file-name="form.fileName"
+                @fileNameUpdate="
+                  name => {
+                    form.fileName = name
+                  }
+                "
                 @handleUpdate="handleFileUpdate"
                 @handleSave="handleFileSave"
               ></company-file>
@@ -623,11 +629,25 @@ export default {
     handleBack() {
       this.$router.go(-1)
     },
+    // 根据传入的名字去匹配数组内符合的项目并返回该项目
+    getProjectByName(arr, name) {
+      return arr.find(item => item.value === name)
+    },
     // 保存当前条目
     submitQuestionnaire(type) {
       this.$refs.form.validate(valid => {
         if (valid) {
           if (!this.isFileUpdate) {
+            // 根据公司文件和文件名获取特定项目项，并据此更新表单中的审核企业档案ID
+            const files = this.companyFiles // 获取公司文件列表
+            const fileName = this.form.fileName // 获取表单中填写的文件名
+            // 根据文件名在公司文件列表中查找对应项目项
+            const item = this.getProjectByName(files, fileName)
+            if (item) {
+              this.form.reviewEnterpriseArchiveId = item.id // 找到项目项则更新表单的审核企业档案ID
+            } else {
+              this.form.reviewEnterpriseArchiveId = null // 未找到则将审核企业档案ID设为null
+            }
             reviewDetailsSubmit(this.form).then(async res => {
               if (res.code === 200) {
                 await this.getTask()

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

@@ -92,16 +92,25 @@
                 <el-row class="prograss-title"> 用例维度 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="4">
+                    <div class="circleBox">
                       <el-progress
                         type="circle"
                         :percentage="
                           percentageChange(dataStatistic.systemDetailsPass)
                         "
                         color="#13BE24"
-                      :width="130"
+                        :width="140"
                         :stroke-width="16"
-                      :format="format"
-                    ></el-progress>
+                      />
+                      <div class="circleCenter">
+                        <span>审查通过率</span>
+                        <div>
+                          {{
+                            percentageChange(dataStatistic.systemDetailsPass)
+                          }}%
+                        </div>
+                      </div>
+                    </div>
                   </el-col>
                   <el-col :span="6">
                     <div class="prograss-laout" style="text-align: end">
@@ -167,16 +176,25 @@
                 <el-row class="prograss-title"> 合规维度 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="4">
+                    <div class="circleBox">
                       <el-progress
                         type="circle"
                         :percentage="
                           percentageChange(dataStatistic.systemStandardsPass)
                         "
                         color="#13BE24"
-                      :width="130"
+                        :width="140"
                         :stroke-width="16"
-                      :format="format"
-                    ></el-progress>
+                      />
+                      <div class="circleCenter">
+                        <span>审查通过率</span>
+                        <div>
+                          {{
+                            percentageChange(dataStatistic.systemStandardsPass)
+                          }}%
+                        </div>
+                      </div>
+                    </div>
                   </el-col>
                   <el-col :span="6">
                     <div class="prograss-laout" style="text-align: end">
@@ -253,16 +271,23 @@
                 <el-row class="prograss-title"> 用例维度 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="4">
+                    <div class="circleBox">
                       <el-progress
                         type="circle"
                         :percentage="
                           percentageChange(dataStatistic.carDetailsPass)
                         "
                         color="#13BE24"
-                      :width="130"
+                        :width="140"
                         :stroke-width="16"
-                      :format="format"
-                    ></el-progress>
+                      />
+                      <div class="circleCenter">
+                        <span>审查通过率</span>
+                        <div>
+                          {{ percentageChange(dataStatistic.carDetailsPass) }}%
+                        </div>
+                      </div>
+                    </div>
                   </el-col>
                   <el-col :span="6">
                     <div class="prograss-laout" style="text-align: end">
@@ -326,16 +351,25 @@
                 <el-row class="prograss-title"> 合规维度 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="4">
+                    <div class="circleBox">
                       <el-progress
                         type="circle"
                         :percentage="
                           percentageChange(dataStatistic.carStandardsPass)
                         "
                         color="#13BE24"
-                      :width="130"
+                        :width="140"
                         :stroke-width="16"
-                      :format="format"
-                    ></el-progress>
+                      />
+                      <div class="circleCenter">
+                        <span>审查通过率</span>
+                        <div>
+                          {{
+                            percentageChange(dataStatistic.carStandardsPass)
+                          }}%
+                        </div>
+                      </div>
+                    </div>
                   </el-col>
                   <el-col :span="6">
                     <div class="prograss-laout" style="text-align: end">
@@ -407,16 +441,23 @@
                 <el-row class="prograss-title"> 用例维度 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="4">
+                    <div class="circleBox">
                       <el-progress
                         type="circle"
                         :percentage="
                           percentageChange(dataStatistic.testDetailsPass)
                         "
                         color="#13BE24"
-                      :width="130"
+                        :width="140"
                         :stroke-width="16"
-                      :format="formatTest"
-                    ></el-progress>
+                      />
+                      <div class="circleCenter">
+                        <span>测试通过率</span>
+                        <div>
+                          {{ percentageChange(dataStatistic.testDetailsPass) }}%
+                        </div>
+                      </div>
+                    </div>
                   </el-col>
                   <el-col :span="6">
                     <div class="prograss-laout" style="text-align: end">
@@ -480,16 +521,25 @@
                 <el-row class="prograss-title"> 合规维度 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="4">
+                    <div class="circleBox">
                       <el-progress
                         type="circle"
                         :percentage="
                           percentageChange(dataStatistic.testStandardsPass)
                         "
                         color="#13BE24"
-                      :width="130"
+                        :width="140"
                         :stroke-width="16"
-                      :format="format"
-                    ></el-progress>
+                      />
+                      <div class="circleCenter">
+                        <span>测试通过率</span>
+                        <div>
+                          {{
+                            percentageChange(dataStatistic.testStandardsPass)
+                          }}%
+                        </div>
+                      </div>
+                    </div>
                   </el-col>
                   <el-col :span="6">
                     <div class="prograss-laout" style="text-align: end">
@@ -822,12 +872,6 @@ export default {
       return data.split(',')
     },
     tabClick() {},
-    formatTest(percentage) {
-      return (percentage = `测试通过率\n\n ${percentage}%`)
-    },
-    format(percentage) {
-      return (percentage = `审查通过率\n\n ${percentage}%`)
-    },
     progressLine(percentage) {
       return (percentage = `${percentage}`)
     },
@@ -842,6 +886,28 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+.circleBox {
+  position: relative;
+  text-align: center;
+  width: 140px;
+  .circleCenter {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    div {
+      margin-top: 10px;
+      font-size: 16px;
+      font-weight: 700;
+      color: #303133;
+    }
+    span {
+      font-size: 14px;
+      font-weight: 400;
+      color: #606266;
+    }
+  }
+}
 .detailsCard {
   background: #ffffff;
   border: 1px solid #ebebeb;
@@ -1011,5 +1077,12 @@ export default {
 }
 ::v-deep .el-progress__text {
   white-space: pre;
+  display: none;
+}
+::v-deep .el-progress-bar__outer {
+  border-radius: 0px !important;
+}
+::v-deep .el-progress-bar__inner {
+  border-radius: 0px !important;
 }
 </style>