670小问题修复
This commit is contained in:
@ -406,7 +406,7 @@
|
||||
rgb565Data: [],
|
||||
videoHexArray: [],
|
||||
picPath: "",
|
||||
permissions:[]//权限列表
|
||||
permissions: [] //权限列表
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@ -438,13 +438,13 @@
|
||||
var device = data.data;
|
||||
these.Status.apiType = data.apiType;
|
||||
these.device = device;
|
||||
if(data.apiType!=='listA'){
|
||||
Common.getdeviceShareId(data.data.id).then(res=>{
|
||||
if(res.code==200){
|
||||
if(res.data.permission){
|
||||
these.permissions=res.data.permission.split(',');
|
||||
}
|
||||
}
|
||||
if (data.apiType !== 'listA') {
|
||||
Common.getdeviceShareId(data.data.id).then(res => {
|
||||
if (res.code == 200) {
|
||||
if (res.data.permission) {
|
||||
these.permissions = res.data.permission.split(',');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
if (these.device.deviceImei) {
|
||||
@ -611,10 +611,12 @@
|
||||
},
|
||||
success: (res) => {
|
||||
debugger;
|
||||
let json={persissonType:'670'};
|
||||
Object.assign(json,this.device);
|
||||
let json = {
|
||||
persissonType: '670'
|
||||
};
|
||||
Object.assign(json, this.device);
|
||||
res.eventChannel.emit('share', {
|
||||
data:json
|
||||
data: json
|
||||
});
|
||||
}
|
||||
})
|
||||
@ -863,8 +865,8 @@
|
||||
|
||||
},
|
||||
lightSetting: function(type) {
|
||||
if(!this.permissions.includes('1') && this.Status.apiType!=='listA'){
|
||||
|
||||
if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
|
||||
|
||||
this.showPop({
|
||||
message: '无操作权限',
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
|
||||
@ -1050,9 +1052,9 @@
|
||||
});
|
||||
},
|
||||
sosSetting: function(type) {
|
||||
|
||||
if(!this.permissions.includes('42') && this.Status.apiType!=='listA'){
|
||||
|
||||
debugger;
|
||||
if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
|
||||
|
||||
this.showPop({
|
||||
message: '无操作权限',
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
|
||||
@ -1063,7 +1065,7 @@
|
||||
})
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (this.formData.SOS == type) {
|
||||
type = "close";
|
||||
}
|
||||
@ -1183,16 +1185,16 @@
|
||||
|
||||
|
||||
if (type == 'rb') { //红蓝报警
|
||||
console.log("11111");
|
||||
console.log("11111");
|
||||
let sendRb = () => {
|
||||
this.formData.SOS = type;
|
||||
bleSendCmd();
|
||||
these.formData.qzwarn=false;
|
||||
this.Status.staticWarn.time=0;
|
||||
these.formData.qzwarn = false;
|
||||
this.Status.staticWarn.time = 0;
|
||||
return;
|
||||
}
|
||||
if (these.formData.qzwarn) {
|
||||
console.log("222222");
|
||||
if (these.formData.qzwarn && these.Status.staticWarn.inteval) {
|
||||
console.log("222222");
|
||||
these.showQzWarn(sendRb);
|
||||
} else {
|
||||
sendRb();
|
||||
@ -1212,7 +1214,7 @@
|
||||
return;
|
||||
} else if (type == 'close') {
|
||||
|
||||
if (this.formData.SOS = 'sg') { //解除声光报警
|
||||
if (this.formData.SOS = 'sg' && this.Status.staticWarn.inteval) { //解除声光报警
|
||||
this.CloseWarn(true);
|
||||
} else {
|
||||
this.formData.SOS = type;
|
||||
@ -1227,8 +1229,8 @@
|
||||
setTimeout(task, 0);
|
||||
},
|
||||
GearSetting: function(type) { //档位设置
|
||||
if(!this.permissions.includes('41') && this.Status.apiType!=='listA'){
|
||||
|
||||
if (!this.permissions.includes('41') && this.Status.apiType !== 'listA') {
|
||||
|
||||
this.showPop({
|
||||
message: '无操作权限',
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
|
||||
@ -1323,27 +1325,27 @@
|
||||
|
||||
setTimeout(task, 0);
|
||||
},
|
||||
proDetail:function(type){
|
||||
if(!this.permissions.includes('41') && this.Status.apiType!=='listA'){
|
||||
|
||||
this.showPop({
|
||||
message: '无操作权限',
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
okCallback: null,
|
||||
buttonText: "确定"
|
||||
})
|
||||
return;
|
||||
}
|
||||
proDetail: function(type) {
|
||||
if (!this.permissions.includes('41') && this.Status.apiType !== 'listA') {
|
||||
|
||||
this.showPop({
|
||||
message: '无操作权限',
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
okCallback: null,
|
||||
buttonText: "确定"
|
||||
})
|
||||
return;
|
||||
}
|
||||
uni.navigateTo({
|
||||
url: '/pages/common/'+type+'/index?id=' + this.device.id,
|
||||
url: '/pages/common/' + type + '/index?id=' + this.device.id,
|
||||
success(ev) {
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
checkImgUpload: function(type, index) {
|
||||
console.log("123213213213");
|
||||
let f = these.getDevice();
|
||||
@ -1881,8 +1883,8 @@
|
||||
|
||||
},
|
||||
ShowUpload: function() {
|
||||
if(!this.permissions.includes('3') && this.Status.apiType!=='listA'){
|
||||
|
||||
if (!this.permissions.includes('3') && this.Status.apiType !== 'listA') {
|
||||
|
||||
this.showPop({
|
||||
message: '无操作权限',
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
|
||||
@ -1987,8 +1989,8 @@
|
||||
this.Status.Pop.showPop = true;
|
||||
},
|
||||
sendUsr: function(ReSendNo) {
|
||||
|
||||
if(!this.permissions.includes('4') && this.Status.apiType!=='listA'){
|
||||
|
||||
if (!this.permissions.includes('4') && this.Status.apiType !== 'listA') {
|
||||
|
||||
this.showPop({
|
||||
message: '无操作权限',
|
||||
@ -2194,9 +2196,9 @@
|
||||
|
||||
},
|
||||
sendUrgent(type) {
|
||||
|
||||
if(!this.permissions.includes('5') && this.Status.apiType!=='listA'){
|
||||
|
||||
|
||||
if (!this.permissions.includes('5') && this.Status.apiType !== 'listA') {
|
||||
|
||||
this.showPop({
|
||||
message: '无操作权限',
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
|
||||
|
||||
Reference in New Issue
Block a user