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

This commit is contained in:
zhutianqi
2021-12-30 18:08:24 +08:00
4 changed files with 7 additions and 7 deletions
@@ -90,7 +90,7 @@
</span>
<!-- 多个文件时-->
<span v-else-if="child.value && child.value.length > 0">
<div style="margin-left: 15%;margin-top: -60px;line-height: 90px">
<div style="margin-left: 19%;margin-top: -60px;line-height: 90px">
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -26,7 +26,7 @@
<span
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span style="font-size:12px"> {{ node.label }} </span>
<span>
<!--<span>
<el-button
type="text"
size="mini"
@@ -48,7 +48,7 @@
@click="() => remove(node, data)">
删除
</el-button>
</span>
</span>-->
</span>
</el-tree>
</el-card>
@@ -25,7 +25,7 @@
<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 style="font-size:12px"> {{ node.label }} </span>
<span>
<!-- <span>
<el-button
type="text"
size="mini"
@@ -47,7 +47,7 @@
@click="() => remove(node, data)">
删除
</el-button>
</span>
</span>-->
</span>
</el-tree>
</el-card>
@@ -24,7 +24,7 @@
<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 style="font-size:12px"> {{ node.label }} </span>
<span>
<!-- <span>
<el-button
type="text"
size="mini"
@@ -46,7 +46,7 @@
@click="() => remove(node, data)">
删除
</el-button>
</span>
</span>-->
</span>
</el-tree>
</el-card>