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

This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-08 20:05:24 +08:00
14 changed files with 223 additions and 22 deletions
@@ -16,7 +16,7 @@
<p class="transition-box-p" v-if="sarAccessEO.sortKey === '1'">
<label class="transition-box-label">国家/地区</label>
<span class="transition-box-span">
{{ sarAccessEO.countryArea }}
{{ sarAccessEO.countryAreaShow }}
</span>
</p>
<p v-else></p>
@@ -23,7 +23,9 @@
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
@mouseleave="mouseleave(data)">
<span
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label }} </span>
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span v-if="node.label.length<15"> {{ node.label}} </span>
<span v-else> {{ node.label.substring(0,15)+'...'}} </span>
<span>
<el-button
type="text"
@@ -21,7 +21,9 @@
default-expand-all
:expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
<span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span v-if="node.label.length<15"> {{ node.label}} </span>
<span v-else> {{ node.label.substring(0,15)+'...'}} </span>
<span>
<el-button
type="text"