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

2021-09-26 10:21:03 +08:00
parent c6d4363b7a a688302db7
commit 18b21893c0
19 changed files with 168 additions and 108 deletions
@@ -272,7 +272,7 @@ export default {
        this.countryOptions.forEach(item => {
          map.set(item.value, item.label);
        });
-        arr.forEach(item => {
+        arr.map(item => {
          // 国家地区转换
          if (item.countryArea !== null || item.countryArea !== "") {
            let k = (item.countryArea || "").split(",");
@@ -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;
@@ -306,7 +306,6 @@
            show-overflow-tooltip
            prop="standName"
            label="中文名称"
-            width="300"
          >
            <template slot-scope="scope">
              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -318,7 +317,6 @@
            show-overflow-tooltip
            prop="standEnName"
            label="英文名称"
-            width="300"
          >
            <template slot-scope="scope">
              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -199,7 +199,6 @@
              show-overflow-tooltip
              prop="standName"
              label="标准名称"
-              width="300"
            >
              <template slot-scope="scope">
                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>