Merge branch 'develop' into developer/yanjiaxu

src/views/informationBase/viewStandardTerms/components/documentReviewDialog.vue

@@ -10,10 +10,9 @@
       <div class="custom_title">{{ '检验内容' }}</div>
     </template>
     <div style="padding: 20px">
-      <el-button type="primary" style="margin-bottom: 20px" @click="relevancy">
-        关联测试内容
-      </el-button>
-
+      <!--      <el-button type="primary" style="margin-bottom: 20px" @click="relevancy">-->
+      <!--        关联测试内容-->
+      <!--      </el-button>-->
       <el-table
         v-loading="loading"
         class="el-table"

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

@@ -1004,8 +1004,8 @@ export default {
       return Math.round((b / a) * 100)
     },
     dictValueReturn(item) {
-      if (item === 'sraifv') {
-        return '信息安全管理体系要求'
+      if (item === 'sraif') {
+        return '汽车信息安全管理体系要求'
       } else if (item === 'grfis') {
         return '信息安全一般要求'
       } else {
@@ -1277,6 +1277,7 @@ export default {
 }
 ::v-deep .el-progress-bar__inner {
   border-radius: 0px !important;
+  text-align: center;
 }
 
 .messsage-item {