Jelajahi Sumber

监控中心bug修改,底部消息修改

王通 1 tahun lalu
induk
melakukan
6f988ed5ad
4 mengubah file dengan 1693 tambahan dan 981 penghapusan
  1. 4 4
      src/api/forest.js
  2. 6 1
      src/assets/styles/base.scss
  3. 1682 975
      src/components/vBottomMenu.vue
  4. 1 1
      src/views/monitor.vue

+ 4 - 4
src/api/forest.js

@@ -292,16 +292,16 @@ export function userFeginlist(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'
   })
 }

+ 6 - 1
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;
@@ -3274,3 +3274,8 @@ div::-webkit-scrollbar {
 .no_hover .no-weight h4{
 	color:#2bacf7!important;
 }
+
+.el-message{
+  z-index: 9999 !important;
+}
+

File diff ditekan karena terlalu besar
+ 1682 - 975
src/components/vBottomMenu.vue


+ 1 - 1
src/views/monitor.vue

@@ -271,7 +271,7 @@ export default {
       this.selectKeyAreaList();
       this.bottomMenuList(); //获取底部公共组件消息和任务
       this.getTreeselect();
-      this.deptId = Cookies.get("deptId");
+      this.deptId = parseInt(Cookies.get("deptId"));
       this.getMonitorDeviceAndDataLists(this.deptId);
        this.getDlblistBydeptIds();
       this.selectDeviceType(-1);