|
@@ -62,7 +62,7 @@
|
|
|
</li> -->
|
|
|
<li @click="signOut">
|
|
|
<span class="st-icons st-icons-out"></span>退出登录
|
|
|
- </li>
|
|
|
+ </li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -326,28 +326,36 @@
|
|
|
>
|
|
|
</el-breadcrumb>
|
|
|
</div>
|
|
|
- <div class="sl-header-li-websocket">
|
|
|
+ <div class="sl-header-li-websocket" @mouseenter="updatecss" @mouseleave="leave">
|
|
|
<el-badge
|
|
|
- :value="task1Num + task2Num"
|
|
|
+ :value="taskAllNum"
|
|
|
:max="99"
|
|
|
class="item"
|
|
|
style="margin-right: 20px"
|
|
|
- v-if="task1Num + task2Num > 0"
|
|
|
>
|
|
|
<el-button type="text" size="small" @click="goMyTaskPage"
|
|
|
>待办任务</el-button
|
|
|
>
|
|
|
</el-badge>
|
|
|
- <el-badge
|
|
|
- :value="myMessageLength"
|
|
|
- :max="99"
|
|
|
- class="item"
|
|
|
- v-if="myMessageLength > 0"
|
|
|
- >
|
|
|
- <el-button type="text" size="small" @click="goNoticePage"
|
|
|
- >公告</el-button
|
|
|
- >
|
|
|
- </el-badge>
|
|
|
+ <div class="Web_Notice" v-show="socketshow">
|
|
|
+ <div class="workspace_row-grid_mytask" >
|
|
|
+ <div class="workspace_message" v-for="(item, index) in noticedata" :key="index" @click="seeTaskContent(item)">
|
|
|
+ <div class="workspace_message-title">
|
|
|
+ 标题: {{ item.noticetitle }}
|
|
|
+ </div>
|
|
|
+ <div class="workspace_message-date">
|
|
|
+ 时间:{{ item.inserttime }}
|
|
|
+ </div>
|
|
|
+ <div class="workspace_message-content">
|
|
|
+ 内容:{{ item.noticecontent }}
|
|
|
+ </div>
|
|
|
+ <div class="workspace_message-from">
|
|
|
+ 来自: {{ item.insertusername }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="workspace_replace_item"></div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="theme-defined">
|
|
|
<div
|
|
@@ -398,7 +406,7 @@
|
|
|
"
|
|
|
:style="minHeight"
|
|
|
></iframe>
|
|
|
-
|
|
|
+
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
<div class="contextmenu">
|
|
@@ -640,8 +648,16 @@
|
|
|
>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <!--通知-->
|
|
|
+<!-- <div class="Web_Notice">
|
|
|
+ <span class="margin_R10">
|
|
|
+ <i class="el-icon-message iconImg"></i>
|
|
|
+ <el-badge :value="taskAllNum" :max="99" :hidden="taskAllNum < 1"></el-badge>
|
|
|
+ </span>
|
|
|
+ </div>-->
|
|
|
</div>
|
|
|
-</template>
|
|
|
+</template>
|
|
|
|
|
|
<script>
|
|
|
import element_css_json_import from "../assets/json/element_css.js";
|
|
@@ -883,7 +899,11 @@ export default {
|
|
|
styleControll: false,
|
|
|
dutyId: "",
|
|
|
appId: '',
|
|
|
- defaultActiveIndex: ''
|
|
|
+ defaultActiveIndex: '',
|
|
|
+ taskAllNum: '',//任务数目
|
|
|
+ socketshow: false,//通知框的显示
|
|
|
+ orgcodezs: '',//cookie中的orgcode
|
|
|
+ noticedata: [],//通知的数据
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -899,6 +919,7 @@ export default {
|
|
|
} else {
|
|
|
this.styleControll = false;
|
|
|
}
|
|
|
+ this.getinformation();
|
|
|
},
|
|
|
destroyed() {
|
|
|
// 销毁浏览器返回监听
|
|
@@ -911,6 +932,7 @@ export default {
|
|
|
beforeCreate() {
|
|
|
let userId = getCookie("userId");
|
|
|
this.appId = getCookie("appId");
|
|
|
+ this.orgcodezs=getCookie("orgCode");
|
|
|
let menuId = window.top.localStorage.getItem("activeMenu");
|
|
|
let companyId = window.top.localStorage.getItem("companyId");
|
|
|
},
|
|
@@ -1065,7 +1087,7 @@ export default {
|
|
|
var arr = ["#/authManage"];
|
|
|
if($.inArray(location.hash, arr) == -1){
|
|
|
//that.getMyToDoDelegateTask();
|
|
|
- //that.getMyToDoTask();
|
|
|
+ //that.getMyToDoTask();
|
|
|
}
|
|
|
|
|
|
that.getMyMessage();
|
|
@@ -2447,7 +2469,7 @@ export default {
|
|
|
if (tree[i].menuId == menuId){
|
|
|
tree[i]["menuIndex"] = menuIndex;
|
|
|
return tree[i];
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
if (
|
|
|
tree[i].hasOwnProperty("children") &&
|
|
@@ -2502,12 +2524,43 @@ export default {
|
|
|
path: "/",
|
|
|
});
|
|
|
},
|
|
|
+ updatecss () {
|
|
|
+ this.socketshow=true;
|
|
|
+ let height = document.body.clientHeight - 125;
|
|
|
+ this.$nextTick(() => {
|
|
|
+ $('.Web_Notice')[0].style.height = height + 'px;'
|
|
|
+ })
|
|
|
+ },
|
|
|
+ leave(){
|
|
|
+ this.socketshow=false;
|
|
|
+ },
|
|
|
+ getinformation(){
|
|
|
+ this.axios.post("/api/v1/ams/getNotice",{orgcodezs:this.orgcodezs}).then((res)=>{
|
|
|
+ this.noticedata=res.data.data;
|
|
|
+ this.taskAllNum=res.data.data[0].taskAllNum
|
|
|
+ console.log(this.noticedata)
|
|
|
+ console.log(this.taskAllNum)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 查看待办任务详情
|
|
|
+ seeTaskContent (item) {
|
|
|
+ this.$refs.defaultpage.seeTaskContent(item);
|
|
|
+ // // this.dialogVisible = true;
|
|
|
+ // this.itemTask = item;
|
|
|
+ },
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
<!-- Add "scoped" attribute to limit CSS to this component only -->
|
|
|
|
|
|
<style lang="less" scoped>
|
|
|
+
|
|
|
+.Web_Notice{
|
|
|
+ width: 300px;
|
|
|
+ position: absolute;
|
|
|
+ left: -100px;
|
|
|
+ background-color: #f1f6fd;
|
|
|
+}
|
|
|
/deep/ .privilegeArea {
|
|
|
.el-dialog {
|
|
|
min-width: 400px;
|