|
|
@@ -52,7 +52,7 @@
|
|
|
<button
|
|
|
type="button"
|
|
|
class="v-btn v-btn-grey"
|
|
|
- @click.stop="reload"
|
|
|
+ @click.capture="reload"
|
|
|
>
|
|
|
<span> 刷新 </span>
|
|
|
</button>
|
|
|
@@ -309,7 +309,7 @@
|
|
|
</div>
|
|
|
<div
|
|
|
class="v-pagination-refresh"
|
|
|
- @click.stop="reload"
|
|
|
+ @click.capture="reload"
|
|
|
></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -339,7 +339,7 @@
|
|
|
<button
|
|
|
type="button"
|
|
|
class="v-btn v-btn-footbar v-btn-grey"
|
|
|
- @click.stop="closeNotifyShowall"
|
|
|
+ @click.capture="closeNotifyShowall"
|
|
|
>
|
|
|
<span> 关闭 </span>
|
|
|
</button>
|
|
|
@@ -361,87 +361,101 @@
|
|
|
<div class="handler v-window-resizable-e"></div>
|
|
|
</div>
|
|
|
<div
|
|
|
- class="v-window-mask"
|
|
|
- :style="{ display: clearAllNotifyMessage.clearAllNotifyMessageDisplay}"
|
|
|
- @click.stop="WindowClick()"
|
|
|
- ></div>
|
|
|
- </div>
|
|
|
-
|
|
|
- <div
|
|
|
- class="v-window v-message-box-window auto-height"
|
|
|
- syno-id="SYNO.SDS.DSMNotify.ShowAll.Window-msgbox"
|
|
|
- style="
|
|
|
- position: absolute;
|
|
|
- width: 480px;
|
|
|
- height: auto;
|
|
|
- top: 180px;
|
|
|
- left: 190px;
|
|
|
- "
|
|
|
- :style="{
|
|
|
- display: clearAllNotifyMessage.clearAllNotifyMessageDisplay,
|
|
|
- zIndex: clearAllNotifyMessage.clearAllNotifyMessageZIndex,
|
|
|
- }"
|
|
|
- :class="clearAllNotifyMessage.clearAllNotifyMessageCls"
|
|
|
- @click.stop="clickClearAllNotifyMessage"
|
|
|
- >
|
|
|
- <div>
|
|
|
- <div class="v-trap-focus-indicator"></div>
|
|
|
- <div class="v-trap-focus-body">
|
|
|
- <div class="v-trap-focus-indicator"></div>
|
|
|
- <div class="v-layout layout-panel-content v-panel message-box">
|
|
|
- <div class="v-spin-wrapper circle v-panel-wrapper">
|
|
|
- <div class="v-spin-wrapper-masking" style="display: none"></div>
|
|
|
- <div
|
|
|
- class="v-layout layout-body-wrapper layout-panel-body"
|
|
|
- style="--panel-in-tabs-padding-top: 0"
|
|
|
- >
|
|
|
- <div class="body-wrapper">
|
|
|
- <div class="message-box-body has-icon">
|
|
|
- <div class="dialog-icon-wrapper alarm">
|
|
|
- <div class="dialog-icon alarm"></div>
|
|
|
- </div>
|
|
|
- <div class="dialog-content">
|
|
|
- 所有桌面通知都会被清除。是否确定要继续？
|
|
|
+ class="v-window-mask"
|
|
|
+ :style="{
|
|
|
+ display:
|
|
|
+ notifyShowAllContant.clearAllNotifyData
|
|
|
+ .clearAllNotifyMessageDisplay,
|
|
|
+ }"
|
|
|
+ @click.stop.self="maskClick()"
|
|
|
+ >
|
|
|
+ <div
|
|
|
+ class="v-window v-message-box-window auto-height"
|
|
|
+ syno-id="SYNO.SDS.DSMNotify.ShowAll.Window-msgbox"
|
|
|
+ style="
|
|
|
+ position: relative;
|
|
|
+ width: 480px;
|
|
|
+ height: auto;
|
|
|
+ top: 50%;
|
|
|
+ left: 50%;
|
|
|
+ transform: translate(-50%, -50%);
|
|
|
+ "
|
|
|
+ :style="{
|
|
|
+ display:
|
|
|
+ notifyShowAllContant.clearAllNotifyData
|
|
|
+ .clearAllNotifyMessageDisplay,
|
|
|
+ zIndex:
|
|
|
+ notifyShowAllContant.clearAllNotifyData
|
|
|
+ .clearAllNotifyMessageZIndex,
|
|
|
+ }"
|
|
|
+ :class="
|
|
|
+ notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageCls
|
|
|
+ "
|
|
|
+ @click.self="clickClearAllNotifyMessage"
|
|
|
+ >
|
|
|
+ <div>
|
|
|
+ <div class="v-trap-focus-indicator"></div>
|
|
|
+ <div class="v-trap-focus-body">
|
|
|
+ <div class="v-trap-focus-indicator"></div>
|
|
|
+ <div class="v-layout layout-panel-content v-panel message-box">
|
|
|
+ <div class="v-spin-wrapper circle v-panel-wrapper">
|
|
|
+ <div
|
|
|
+ class="v-spin-wrapper-masking"
|
|
|
+ style="display: none"
|
|
|
+ ></div>
|
|
|
+ <div
|
|
|
+ class="v-layout layout-body-wrapper layout-panel-body"
|
|
|
+ style="--panel-in-tabs-padding-top: 0"
|
|
|
+ >
|
|
|
+ <div class="body-wrapper">
|
|
|
+ <div class="message-box-body has-icon">
|
|
|
+ <div class="dialog-icon-wrapper alarm">
|
|
|
+ <div class="dialog-icon alarm"></div>
|
|
|
+ </div>
|
|
|
+ <div class="dialog-content">
|
|
|
+ 所有桌面通知都会被清除。是否确定要继续？
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div
|
|
|
- class="
|
|
|
- v-layout
|
|
|
- layout-panel-fbar
|
|
|
- fbar-wrapper fbar-wrapper--fluid
|
|
|
- "
|
|
|
- >
|
|
|
- <div class="v-status-bar loading" style="display: none">
|
|
|
- <div class="status-text">
|
|
|
- <div class="v-spin-icon">
|
|
|
- <i><i></i></i>
|
|
|
+ <div
|
|
|
+ class="
|
|
|
+ v-layout
|
|
|
+ layout-panel-fbar
|
|
|
+ fbar-wrapper fbar-wrapper--fluid
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <div class="v-status-bar loading" style="display: none">
|
|
|
+ <div class="status-text">
|
|
|
+ <div class="v-spin-icon">
|
|
|
+ <i><i></i></i>
|
|
|
+ </div>
|
|
|
+ 加载中...
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="default pull-right">
|
|
|
+ <button
|
|
|
+ type="button"
|
|
|
+ class="v-btn v-btn-footbar v-btn-cancel"
|
|
|
+ @click.stop="cancelDeleteAllNotifyMessage"
|
|
|
+ >
|
|
|
+ <span>取消</span>
|
|
|
+ </button>
|
|
|
+ <button
|
|
|
+ type="button"
|
|
|
+ class="v-btn v-btn-footbar v-btn-red"
|
|
|
+ @click.stop="confirmDeleteAllNotifyMessage"
|
|
|
+ >
|
|
|
+ <span>删除</span>
|
|
|
+ </button>
|
|
|
</div>
|
|
|
- 加载中...
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="default pull-right">
|
|
|
- <button
|
|
|
- type="button"
|
|
|
- class="v-btn v-btn-footbar v-btn-cancel"
|
|
|
- @click.stop="cancelDeleteAllNotifyMessage"
|
|
|
- >
|
|
|
- <span>取消</span>
|
|
|
- </button>
|
|
|
- <button
|
|
|
- type="button"
|
|
|
- class="v-btn v-btn-footbar v-btn-red"
|
|
|
- @click.stop="confirmDeleteAllNotifyMessage"
|
|
|
- >
|
|
|
- <span>删除</span>
|
|
|
- </button>
|
|
|
- </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="v-trap-focus-indicator"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="v-trap-focus-indicator"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -456,17 +470,17 @@ export default {
|
|
|
display: "none",
|
|
|
zIndex: 9050,
|
|
|
cls: "active-win",
|
|
|
+ clearAllNotifyData: {
|
|
|
+ clearAllNotifyMessageDisplay: "none",
|
|
|
+ clearAllNotifyMessageCls: "deactive-win",
|
|
|
+ clearAllNotifyMessageZIndex: 9050,
|
|
|
+ },
|
|
|
},
|
|
|
loading: false,
|
|
|
maskDisplay: "none",
|
|
|
width: "840px",
|
|
|
height: "480px",
|
|
|
top: "10px",
|
|
|
- clearAllNotifyMessage: {
|
|
|
- clearAllNotifyMessageDisplay: "none",
|
|
|
- clearAllNotifyMessageCls: "",
|
|
|
- clearAllNotifyMessageZIndex: 905,
|
|
|
- },
|
|
|
thContantArray: [
|
|
|
{
|
|
|
id: 0,
|
|
|
@@ -510,6 +524,7 @@ export default {
|
|
|
this.maskDisplay = "block";
|
|
|
this.loading = true;
|
|
|
this.notifyShowAllContant.display = "block";
|
|
|
+ this. clickNotifyShowall()
|
|
|
setTimeout(() => {
|
|
|
this.maskDisplay = "none";
|
|
|
this.loading = false;
|
|
|
@@ -518,7 +533,6 @@ export default {
|
|
|
item.cls1 = "";
|
|
|
});
|
|
|
this.notifyShowallDetail.detailMessageList = detailMessageList1;
|
|
|
- this.clickNotifyShowall();
|
|
|
}, 1000);
|
|
|
},
|
|
|
// 关闭本页面
|
|
|
@@ -608,60 +622,96 @@ export default {
|
|
|
},
|
|
|
// 显示清除全部信息弹出框
|
|
|
showClearAllNotifyMessage() {
|
|
|
- console.log(111);
|
|
|
- // this.$bus.emit("clearAllNotifyMessage")
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageDisplay = "block";
|
|
|
- console.log(
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageZIndex,
|
|
|
- this.defaultZIndex
|
|
|
- );
|
|
|
+ // if(this.notifyShowAllContant.cls === 'deactive-win'){
|
|
|
+ // this.notifyShowAllContant.zIndex = this.defaultZIndex + 10
|
|
|
+ // this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
|
|
|
+ // }
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageDisplay =
|
|
|
+ "block";
|
|
|
+
|
|
|
if (
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageZIndex <
|
|
|
- this.defaultZIndex
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData
|
|
|
+ .clearAllNotifyMessageCls === "deactive-win"
|
|
|
) {
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageZIndex =
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
|
|
|
this.defaultZIndex + 10;
|
|
|
this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
|
|
|
}
|
|
|
- this.$bus.emit("maskShowOrHidden", true);
|
|
|
- window.addEventListener("click", this.WindowClick, false);
|
|
|
- },
|
|
|
- // 点击清除全部信息弹出框
|
|
|
- clickClearAllNotifyMessage() {
|
|
|
console.log(
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageZIndex,
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData
|
|
|
+ .clearAllNotifyMessageZIndex,
|
|
|
this.defaultZIndex
|
|
|
);
|
|
|
+ // this.$bus.emit("maskShowOrHidden", true);
|
|
|
+ this.$bus.emit("showOrHiddenNotifyShowallClearAll", true);
|
|
|
+ window.addEventListener("click", this.windowClick, true);
|
|
|
+ },
|
|
|
+ // 点击清除全部信息弹出框
|
|
|
+ clickClearAllNotifyMessage() {
|
|
|
+ // if(this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageCls === 'deactive-win'
|
|
|
+ // ) {
|
|
|
+ // this.clickNotifyShowall();
|
|
|
+ // }
|
|
|
if (
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageZIndex <
|
|
|
- this.defaultZIndex
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData
|
|
|
+ .clearAllNotifyMessageCls === "deactive-win"
|
|
|
) {
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageZIndex =
|
|
|
+ // this.clickNotifyShowall();
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
|
|
|
this.defaultZIndex + 10;
|
|
|
this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
|
|
|
+ // this.$bus.emit("maskShowOrHidden", true);
|
|
|
+ this.$bus.emit("showOrHiddenNotifyShowallClearAll", true);
|
|
|
}
|
|
|
- this.$bus.emit("maskShowOrHidden", true);
|
|
|
},
|
|
|
// 没关闭清除全部信息弹出框时点击页面
|
|
|
- WindowClick() {
|
|
|
+ windowClick() {
|
|
|
let el = document.querySelector(
|
|
|
- ".notify-showall-window .v-message-box-window active-win"
|
|
|
+ ".notify-showall-window .v-message-box-window"
|
|
|
);
|
|
|
- window.removeEventListener("click", this.WindowClick, false);
|
|
|
+ console.log(el);
|
|
|
+ // for(var i = 0;i<3;i++){
|
|
|
+ // setTimeout(()=>{
|
|
|
+ // console.log(el.className)
|
|
|
+ // if(el.className)
|
|
|
+ // el.className = el.className + ' no-shadow'
|
|
|
+ // setTimeout(()=>{
|
|
|
+ // el.className = el.className.replace(' no-shadow')
|
|
|
+ // },100)
|
|
|
+ // },100)
|
|
|
+ // }
|
|
|
+
|
|
|
+ // if(! el.className.includes(' animate')){
|
|
|
+ // el.className = el.className + ' animate'
|
|
|
+ // }
|
|
|
+ },
|
|
|
+ //没关闭清除全部信息弹出框时点击遮罩层
|
|
|
+ maskClick() {
|
|
|
+ // if (
|
|
|
+ // this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageCls === 'deactive-win'
|
|
|
+ // ) {
|
|
|
+ // this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
|
|
|
+ // this.defaultZIndex + 10;
|
|
|
+ // this.$bus.emit("changeDefaultZIndex", this.defaultZIndex + 10);
|
|
|
+ // window.removeEventListener("click", this.windowClick, true);
|
|
|
+ // }
|
|
|
},
|
|
|
// 取消删除
|
|
|
cancelDeleteAllNotifyMessage(e) {
|
|
|
e.stopPropagation();
|
|
|
console.log("cancel");
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageDisplay = "none";
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageZIndex = 9050;
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageDisplay =
|
|
|
+ "none";
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex = 9050;
|
|
|
this.$bus.emit("changeDefaultZIndex", this.defaultZIndex - 10);
|
|
|
- this.$bus.emit("maskShowOrHidden", false);
|
|
|
+ // this.$bus.emit("maskShowOrHidden", false);
|
|
|
+
|
|
|
+ this.$bus.emit("showOrHiddenNotifyShowallClearAll", false);
|
|
|
},
|
|
|
// 确认删除
|
|
|
confirmDeleteAllNotifyMessage(e) {
|
|
|
e.stopPropagation();
|
|
|
- this.$bus.emit("clearAllNotifyMessage")
|
|
|
+ this.$bus.emit("notifyShowAllContant.clearAllNotifyMessage");
|
|
|
this.notifyShowallDetail.detailMessageList = [];
|
|
|
this.cancelDeleteAllNotifyMessage(e);
|
|
|
},
|
|
|
@@ -669,17 +719,17 @@ export default {
|
|
|
watch: {
|
|
|
defaultZIndex() {
|
|
|
if (
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageZIndex <
|
|
|
- this.defaultZIndex
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData
|
|
|
+ .clearAllNotifyMessageZIndex < this.defaultZIndex
|
|
|
) {
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageCls = "deactive-win";
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
|
|
|
+ "deactive-win";
|
|
|
+ this.$bus.emit("showOrHiddenNotifyShowallClearAll", false);
|
|
|
} else {
|
|
|
- this.clearAllNotifyMessage.clearAllNotifyMessageCls = "active-win";
|
|
|
+ this.notifyShowAllContant.clearAllNotifyData.clearAllNotifyMessageZIndex =
|
|
|
+ "active-win";
|
|
|
}
|
|
|
},
|
|
|
- notifyShowAllData() {
|
|
|
- this.notifyShowAllContant = this.notifyShowAllData;
|
|
|
- },
|
|
|
},
|
|
|
components: {},
|
|
|
name: "NotifyShowall",
|
liupeng