diff --git a/main.js b/main.js
index 924e5f13..18ffa21e 100644
--- a/main.js
+++ b/main.js
@@ -305,19 +305,6 @@ Vue.prototype.sendRequest = function(param) {
}
});
}
-
-// 按钮权限控制指令
-Vue.directive('permission', {
- inserted: (el, binding) => {
- const {
- value
- } = binding;
- // 判断当前用户是否拥有该按钮权限
- if (!Vue.prototype.checkPermission(value)) {
- el.parentNode.removeChild(el);
- }
- }
-});
// 判断权限的函数
Vue.prototype.checkPermission = function(permission) {
var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList;
diff --git a/pages/messageCenter/messageCenter.vue b/pages/messageCenter/messageCenter.vue
index 10e6b728..e0f595d8 100644
--- a/pages/messageCenter/messageCenter.vue
+++ b/pages/messageCenter/messageCenter.vue
@@ -11,6 +11,7 @@
安全
AI
通知公告
+ 安全履职预警
@@ -172,6 +173,8 @@
json.type = 8
} else if (this.checkedTab == 5) {
json.notInType = "8,10,11"
+ } else if (this.checkedTab == 6) {
+ json.type = 35
}
var that = this
this.sendRequest({
@@ -202,7 +205,8 @@
box-shadow: 0 0 10px rgba(194, 194, 194, 0.5);
.tabType {
- width: 33%;
+ // width: 33%;
+ width: max-content;
line-height: 43px;
border-bottom: 1px solid rgba(194, 194, 194, 0.2);
}
diff --git a/pages/projectEnd/carManage/index.vue b/pages/projectEnd/carManage/index.vue
index 58238397..4e3ac89b 100644
--- a/pages/projectEnd/carManage/index.vue
+++ b/pages/projectEnd/carManage/index.vue
@@ -129,7 +129,7 @@
-
diff --git a/pages/projectEnd/scan/saoSao.vue b/pages/projectEnd/scan/saoSao.vue
index d387973b..3630b9af 100644
--- a/pages/projectEnd/scan/saoSao.vue
+++ b/pages/projectEnd/scan/saoSao.vue
@@ -1,11 +1,11 @@
-
+
-
+
巡检信息
@@ -107,9 +107,11 @@
sendData: "",
nowTime: 0,
time: 0,
+ statusBarHeight:0,
}
},
onLoad(e) {
+ this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight
this.checkOpenGPSServiceByAndroid()
console.log(e.data, '我的测试数据')
console.log(e, '我的测试数据')
@@ -415,6 +417,18 @@