Commit 93929c38 authored by 华国豪's avatar 华国豪 🙄

截图隐藏窗口按钮,通知消息分类

parent afa87c41
......@@ -181,6 +181,7 @@ export default {
that.atInfo.atName = ''
}
that.MsgBus.$emit("close-copy")
that.MsgBus.$emit("hide-this-winShow")
});
},
methods: {
......
......@@ -16,6 +16,12 @@
<el-tooltip class="item" effect="dark" content="截图,快捷键Ctrl+Alt+Q" placement="top">
<i class="iconfont iconjietu" @click="openScreenhot"></i>
</el-tooltip>
<div style="position: relative;">
<i class="sanjiaoxing" @click.stop="hideThisWin"></i>
<div v-if="hideThisWinShow" class="sethide-box">
<el-radio v-model="hideThisWinActive" label="1" @click.native.prevent="setWinActive">截图时隐藏当前窗口</el-radio>
</div>
</div>
<input
type="file"
ref="fileToSent"
......@@ -66,12 +72,18 @@ export default {
});
},
mounted() {
let that = this;
// 获取截图隐藏窗口
this.hideThisWinActive = window.localStorage.hideThisWinActive ? window.localStorage.hideThisWinActive : ''
this.MsgBus.$on('hide-this-winShow', function(){
that.hideThisWinShow = false
})
// 绑定拖拽时间
this.addDropSupport();
new kscreenshot({
key: 65
});
let that = this;
this.$electron.ipcRenderer.on("sending-process", (event, file) => {
this.GLOBALSENDING.forEach(x => {
if ((x.msgId = file.msgId)) {
......@@ -165,7 +177,11 @@ export default {
inputObj: {
txt: "",
file: []
}
},
hideThisWinActive: '1',
top: 0,
left: 0,
hideThisWinShow: false,
};
},
computed: {
......@@ -192,6 +208,14 @@ export default {
}
},
methods: {
setWinActive(){
this.hideThisWinActive = this.hideThisWinActive == '1' ? '' : '1';
window.localStorage.hideThisWinActive = this.hideThisWinActive
this.hideThisWinShow = false;
},
hideThisWin(){
this.hideThisWinShow = true;
},
forceUpdateChild(obj){
this.inputObj.txt=obj
this.msgToSent=obj
......@@ -616,6 +640,7 @@ export default {
.user-input-box .tool-box {
padding: 5px 10px;
-webkit-user-select: none !important;
display: flex;
}
.user-input-box .tool-box i {
margin-right: 10px;
......@@ -717,4 +742,31 @@ export default {
width: 100%;
height: 100%;
}
.sethide-box{
position: absolute;
top: 20px;
box-shadow: 0 0 2px #ddd;
border-radius: 0;
min-width: 100px;
border: 1px solid #ddd;
padding: 4px 10px;
font-size: 12px;
z-index: 50;
background-color: white;
}
.sethide-box label{
display: flex;
align-items: center;
cursor: pointer;
}
.sanjiaoxing{
width: 0;
border-width: 4px;
border-style: solid;
border-color: #666 transparent transparent transparent; /* transparent 设置边框颜色透明 */
position: absolute;
left: -5px;
top: 8px;
}
</style>
......@@ -8,6 +8,14 @@
</el-tooltip>
</span>
</div>
<div class="notice-class">
<div :class="{ 'active': noticeActive == 1 }" @click="noticeActive = 1, getNotices(1)">
<span>系统</span>
</div>
<div :class="{ 'active': noticeActive == 2}" @click="noticeActive = 2, getNotices(1)">
<span>酒店</span>
</div>
</div>
<div class="notice-content" v-loading="loading">
<div
class="notice"
......@@ -53,7 +61,8 @@ export default {
pageIndex: 1
},
user: null,
loading: false
loading: false,
noticeActive: 1,
};
},
mounted() {
......@@ -86,8 +95,8 @@ export default {
this.pages.pageIndex++;
this.getNotices();
},
getNotices() {
if (this.pageIndex == 1) {
getNotices(load) {
if (this.pageIndex == 1 || load) {
this.notices = [];
}
this.loading = true;
......@@ -101,7 +110,8 @@ export default {
RecPlatform: 2,
Title: "",
Type: "1",
ShowShortcut: "1"
ShowShortcut: "1",
LogType: this.noticeActive
};
this.apipost(
"SystemLog_get_LogGetPageList",
......@@ -179,7 +189,7 @@ export default {
position: absolute;
left: 0;
right: 0;
top: 66px;
top: 78px;
bottom: 10px;
overflow-y: auto;
padding: 0 20px;
......@@ -262,4 +272,25 @@ export default {
font-size: 120px;
color: #bbb;
}
.notice-class{
display: flex;
width: 100%;
height: 30px;
line-height: 30px;
margin-bottom: 20px;
}
.notice-class>div{
flex: 1;
font-size: 14px;
text-align: center;
cursor: pointer;
}
.notice-class>div>span{
padding: 5px 0;
border-bottom: 2px solid transparent;
}
.notice-class>div.active>span{
color: #2d98da;
border-bottom: 2px solid #2d98da;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment