Merge remote-tracking branch 'origin/develop' into develop

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -4157,6 +4157,7 @@ export default {
         .el-card{
           min-width: min-content;
         }
+        height: 95%;
         width: 95%;
         position: absolute;
         left: 0;

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -4747,7 +4747,7 @@ export default {
       .el-card {
         min-width: min-content;
       }
-
+      height: 95%;
       width: calc(~'100% - 15px');
       position: absolute;
       left: 0;

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -163,7 +163,7 @@
         </el-table-column>
         <el-table-column
         prop="actualCloseTime"
-        width="150"
+        width="130"
         align="center"
         sortable
         label="实际关闭时间">

src/pages/regulatoryRepository/standardForComments/index.vue

@@ -74,11 +74,11 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="cname"
+              prop="cid"
               label="标准名称/政策名称"
               align="center">
               <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cname }}</a>
+                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cid }}</a>
               </template>
             </el-table-column>
             <el-table-column

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -10,21 +10,21 @@
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
         <p class="transition-box-p">
-          <label class="transition-box-label">标准号：</label>
+          <label class="transition-box-label">标准名称：</label>
           <span class="transition-box-span table-jump"
                 @click="handlePreview(itemData)"
           >
                       {{ this.$route.query.item.cid }}
                     </span>
         </p>
-        <p class="transition-box-p">
-          <label class="transition-box-label">标准名称：</label>
-          <span class="transition-box-span table-jump"
-                @click="handlePreview(itemData)"
-          >
-                      {{ this.$route.query.item.cname || '-' }}
-                    </span>
-        </p>
+<!--        <p class="transition-box-p">-->
+<!--          <label class="transition-box-label">标准名称：</label>-->
+<!--          <span class="transition-box-span table-jump"-->
+<!--                @click="handlePreview(itemData)"-->
+<!--          >-->
+<!--                      {{ this.$route.query.item.cname || '-' }}-->
+<!--                    </span>-->
+<!--        </p>-->
         <p class="transition-box-p">
           <label class="transition-box-label">附件：</label>
           <span class="file-box" v-if="fileInfoList.length > 0">