责任制+消息组件

src/api/forest.js

@@ -318,23 +318,24 @@ export function dutysystemRemove(param) {
 // 事件短信联系人
 export function userFeginlist(param) {
   return request({
-    url: '/center-resources/VisuForestCloudMapController/userFeginlist',
-    method: 'post'
+    url: '/system/user/selectUserWithPostByDeptId',
+    method: 'get',
+    params:param
   })
 }
 
 
 // 获取消息个数
-export function selectMessageCount(userId) {
+export function selectMessageCount(userId,deptId) {
   return request({
-    url: '/center-message/centerMessageFeign/selectMessageCount/'+userId,
+    url: '/center-message/centerMessageFeign/selectMessageCount/'+userId+'/'+deptId,
     method: 'get'
   })
 }
 // 获取消息列表
-export function selectMessageList(userId) {
+export function selectMessageList(userId,deptId) {
   return request({
-    url: '/center-message/centerMessageFeign/selectMessageList/'+userId,
+    url: '/center-message/centerMessageFeign/selectMessageList/'+userId+'/'+deptId,
     method: 'get'
   })
 }

src/assets/styles/base.scss

@@ -232,7 +232,7 @@ ul {
 }
 //tips样式
 .js-tps{
-    
+
   // background-image: -moz-linear-gradient($boxBG)!important;
   // background-image: -webkit-linear-gradient($boxBG) !important;
   // background-image: linear-gradient($boxBG)!important;
@@ -3278,3 +3278,6 @@ div::-webkit-scrollbar {
 .no_hover .no-weight h4{
 	color:#2bacf7!important;
 }
+.el-message{
+  z-index: 9999 !important;
+}

src/views/monitor.vue

@@ -203,7 +203,8 @@
         this.selectKeyAreaList()
         this.bottomMenuList() //获取底部公共组件消息和任务
         this.getTreeselect()
-        this.deptId = Cookies.get("deptId")
+        this.deptId = parseInt(Cookies.get("deptId"));
+
         // this.chuanSet()
         this.getMonitorDeviceAndDataLists()
         this.getDlblistBydeptIds(-1)
@@ -458,7 +459,7 @@
         this.onChuan = false
         this.localMark = 'la'
         this.placeholderMsg = "请输入云广播名称"
-        this.deptId = Cookies.get("deptId")
+        // this.deptId = Cookies.get("deptId")
         this.getDlblistBydeptId()
         // this.$refs.supermap.clearG();
       },
@@ -468,7 +469,7 @@
         this.onChuan = true
         this.localMark = 'chuan'
         this.placeholderMsg = "请输入传感器名称"
-        this.deptId = Cookies.get("deptId")
+        // this.deptId = Cookies.get("deptId")
         this.getMonitorDeviceAndDataList()
         // this.$refs.supermap.clearG();
       },