From d7e24c64a3961040fdc7fec835c2efa5d2f106c0 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期日, 26 九月 2021 19:54:54 +0800
Subject: [PATCH] 弹层层级bug修复v2
---
src/pages/vindicate/views/systemClean.vue | 62 ++++++++++--------------------
1 files changed, 21 insertions(+), 41 deletions(-)
diff --git a/src/pages/vindicate/views/systemClean.vue b/src/pages/vindicate/views/systemClean.vue
index 1e79aef..923b54c 100644
--- a/src/pages/vindicate/views/systemClean.vue
+++ b/src/pages/vindicate/views/systemClean.vue
@@ -5,7 +5,8 @@
<el-date-picker
style="width: 100%"
v-model="dataRange"
- type="daterange"
+ value-format="yyyy-MM-dd"
+ type="daterange"
align="right"
size="small"
range-separator="鑷�"
@@ -17,13 +18,12 @@
<div class="desc">
<div class="disk-img">
- <span class="icon iconfont"></span>
+ <span class="icon iconfont">{{"\ue8b1"}}</span>
</div>
<div class="cap">
<div class="cap-text">
- <span>纾佺洏宸茬敤</span>
- <span>鍙敤锛歿{ percent }}%</span>
+ <span>纾佺洏鍙敤: {{ percent }}%</span>
</div>
<div class="cap-bar">
<div class="inner-bar" :style="`width: ${100-percent}%;`"></div>
@@ -33,7 +33,6 @@
<el-button type="primary" @click="deleteData">鏁版嵁娓呯悊</el-button>
<div class="warm">
- <!-- <span class="icon iconfont" style="margin-right:5px"></span> -->
<i class="iconfont icontishi-zhuyi"></i>
<span class="text">璇锋敞鎰忥紝鎸変互涓婃棩鏈熻寖鍥村垹闄ょ殑鏁版嵁涓嶅彲鎭㈠锛岀珛鍗崇敓鏁堬紝璇疯皑鎱庢搷浣�!</span>
</div>
@@ -55,31 +54,23 @@
},
loading: false,
loadingText: '',
- dataRange: [
- this.$moment().format("YYYY-MM-DD HH:mm:ss"),
- this.$moment().format("YYYY-MM-DD HH:mm:ss"),
- ]
+ dataRange: []
};
},
- mounted() {
- },
- props:{
- percent:{
- type:Number,
- default:0
+ props:["free","full"],
+ computed: {
+ percent(){
+ return Math.round(this.free/this.full *100)
}
},
methods: {
deleteData() {
- var timeRange = this.format(this.dataRange);
- var showStartTime = timeRange[0];
- var showEndTime = timeRange[1];
- this.$confirm(
- showStartTime +
- " 鑷� " +
- showEndTime +
- " 浜х敓鐨勫叏閮ㄦ暟鎹皢琚垹闄わ紝姝ゆ搷浣滅珛鍗崇敓鏁堬紝涓嶅彲鎭㈠锛屾槸鍚﹀垹闄わ紵", "鎻愮ず",
- {
+ if (this.dataRange.length==0) {
+ this.$message.warning("璇峰厛閫夋嫨鏃ユ湡")
+ return
+ }
+ const [showStartTime, showEndTime] = this.dataRange
+ this.$confirm(`${showStartTime} 鑷� ${showEndTime} 浜х敓鐨勫叏閮ㄦ暟鎹皢琚垹闄わ紝姝ゆ搷浣滅珛鍗崇敓鏁堬紝涓嶅彲鎭㈠锛屾槸鍚﹀垹闄わ紵`, "鎻愮ず",{
type:"warning",
cancelButtonClass: "comfirm-class-cancle",
confirmButtonClass: "comfirm-class-sure",
@@ -94,28 +85,17 @@
})
.then((resp) => {
if (resp.success) {
- this.$message({
- type: "success",
- message: "鍒犻櫎鏁版嵁鎴愬姛",
- });
this.loading = false
+ this.$message.success(`娓呯悊鎴愬姛锛屽凡娓呯悊 ${resp.data} 鏉℃暟鎹甡);
+ this.$emit("refreshPercent")
}
})
.catch((err) => {
- this.$message({
- type: "error",
- message: "鍒犻櫎鏁版嵁澶辫触锛�",
- });
+ this.$message.error("鍒犻櫎澶辫触锛�"+err.msg);
this.loading = false
});
})
.catch(() => { });
- },
- format(array) {
- return [
- this.$moment(array[0]).format("YYYY-MM-DD"),
- this.$moment(array[1]).format("YYYY-MM-DD"),
- ];
},
},
};
@@ -160,7 +140,7 @@
margin-bottom: 10px;
// background-color: aquamarine;
.iconfont{
- font-size: 90px;
+ font-size: 82px;
color: #3a8120;
}
}
@@ -184,8 +164,8 @@
}
.cap-text {
text-align: right;
- height: 25px; display: flex;
- justify-content: space-between;
+ height: 25px;
+ text-align: right;
line-height: 25px;
font-size: 12px;
}
--
Gitblit v1.8.0