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

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -202,7 +202,6 @@
               show-overflow-tooltip
               prop="standName"
               label="标准名称"
-              width="300"
             >
               <template slot-scope="scope">
                 <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
@@ -4992,7 +4991,6 @@ export default {
   background: url('~@/assets/images/shangqi/img/none-file.png');
   background-size: 100% 100%;
 }
-
 /deep/ .is-show {
   position: relative;
   display: inline-block;
@@ -5001,7 +4999,12 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree.png');
   background-size: 100% 100%;
 }
-
+  #domesticStandardDatabase{
+  height: 100%;
+  .content {
+    height: calc(~'100% - 105px - 56px')
+  }
+}
 /deep/ .tree-line {
   .el-tree-node {
     position: relative;