From 0de895453b479ce5e7e681e69a93c35c3ffe7f26 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 00:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/yunpan/zhishou.vue | 19 +++++++++++++++++--
src/views/yunpan/uploadfj.vue | 6 ++++++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/views/yunpan/uploadfj.vue b/src/views/yunpan/uploadfj.vue
index ce505bf..2c16bdb 100644
--- a/src/views/yunpan/uploadfj.vue
+++ b/src/views/yunpan/uploadfj.vue
@@ -727,6 +727,11 @@
width: 100px;
height: 100px;
}
+
+.el-image .el-image-viewer__mask {
+ background-color: #fff !important;
+ opacity: 1;
+}
</style>
<style lang="scss" scoped>
.el-main {
@@ -755,4 +760,5 @@
background-color: rgb(64, 158, 255);
border-color: rgb(64, 158, 255);
}
+
</style>
diff --git a/src/views/yunpan/zhishou.vue b/src/views/yunpan/zhishou.vue
index 99a4c37..7399e15 100644
--- a/src/views/yunpan/zhishou.vue
+++ b/src/views/yunpan/zhishou.vue
@@ -295,7 +295,8 @@
checkAll: false,
activities: [],
filesUploadData: [],
- updateNum: 0
+ updateNum: 0,
+ folderid: ''
}
},
mounted() {
@@ -317,6 +318,7 @@
this.folderform.folderid = data.id
// eslint-disable-next-line no-unused-vars
var params = {}
+ this.folderid = data.id
params = {
folderid: data.id,
filesname: this.fileName
@@ -510,7 +512,7 @@
},
delFolder() {
// 生成查询文件的条件
- var params = { folderid: this.activities[this.beforeIndex].id }
+ var params = { folderid: this.folderid }
this.$delete('hr/folder', { ...params }).then(() => {
this.dialogFormVisible = false
this.$message({
@@ -877,6 +879,19 @@
width: 100px;
height: 100px;
}
+
+.zs-main {
+ .el-tree .el-tree-node__content{
+ font-size:16px;
+ color: #333;
+ height: 35px;
+ line-height: 35px;
+ }
+ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+ background-color: #e8f2fd;
+ border-radius: 4px;
+ }
+}
</style>
<style lang="scss" scoped>
.el-main {
--
Gitblit v1.8.0