|
|
@@ -2154,6 +2154,13 @@ export default {
|
|
|
self.forthMachine = false;
|
|
|
self.productImage = self.imgUrl+'/product/YJH20.png'
|
|
|
}
|
|
|
+ let typeArr = [7,8,9,10,11,12];
|
|
|
+ for (let i = 0; i < typeArr.length; i++) {
|
|
|
+ let typeMa = typeArr[i];
|
|
|
+ if(typeMa == self.deviceType){
|
|
|
+ self.forthMachine = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
self.fixImage(heng);
|
|
|
self.$forceUpdate();
|
|
|
});
|
|
|
@@ -2204,7 +2211,7 @@ export default {
|
|
|
let enumList = this.deviceInfo.enumList;
|
|
|
for (let enumListElement of enumList) {
|
|
|
let id = enumListElement.id;
|
|
|
- if(id.indexOf("LockControl") !=-1){
|
|
|
+ if(id == 'LockControl'){
|
|
|
let shadow = enumListElement.shadow;
|
|
|
this.lock.item = enumListElement;
|
|
|
if(shadow == 1){
|
|
|
@@ -2217,7 +2224,7 @@ export default {
|
|
|
this.lock.loading = true;
|
|
|
}
|
|
|
}
|
|
|
- if(id.indexOf("PowerControl") !=-1){
|
|
|
+ if(id == 'PowerControl'){
|
|
|
let shadow = enumListElement.shadow;
|
|
|
if(this.oneToMul){
|
|
|
if(!this.firstTab){
|
|
|
@@ -2235,7 +2242,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if(id.indexOf("PowerCtl") !=-1){
|
|
|
+ if(id == 'PowerCtl'){
|
|
|
if(this.oneToMul && this.firstTab){
|
|
|
let shadow = enumListElement.shadow;
|
|
|
if(shadow == 1){
|
|
|
@@ -2253,7 +2260,7 @@ export default {
|
|
|
this.formatValue(id,enumListElement,"PackageSwitch","baozhuangTurn");
|
|
|
|
|
|
//pressTurn resetTurn
|
|
|
- if(id.indexOf("PressTurn") !=-1){
|
|
|
+ if(id == 'PressTurn'){
|
|
|
let shadow = enumListElement.shadow;
|
|
|
if(!shadow){
|
|
|
shadow = 0;
|
|
|
@@ -2265,7 +2272,7 @@ export default {
|
|
|
|
|
|
}
|
|
|
|
|
|
- if(id.indexOf("ResetTurn") !=-1){
|
|
|
+ if(id == 'ResetTurn'){
|
|
|
let shadow = enumListElement.shadow;
|
|
|
if(!shadow){
|
|
|
shadow = 0;
|
|
|
@@ -2275,7 +2282,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(id.indexOf("WorkMode") !=-1){
|
|
|
+ if(id == 'WorkMode'){
|
|
|
let shadow = enumListElement.shadow;
|
|
|
if(!shadow){
|
|
|
shadow = 1;
|
|
|
@@ -2292,7 +2299,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
formatValue(id,enumListElement,key,propkey){
|
|
|
- if(id.indexOf(key) !=-1){
|
|
|
+ if(id == key){
|
|
|
let shadow = enumListElement.shadow;
|
|
|
if(shadow == 1){
|
|
|
this[propkey] = true;
|
|
|
@@ -2747,11 +2754,11 @@ export default {
|
|
|
let curKeyId = modelData.id;
|
|
|
if(!this.decoctControlOnOffStatus){
|
|
|
if(oneToMul){
|
|
|
- if(curKeyId.indexOf("PowerCtl") !=-1){
|
|
|
+ if(curKeyId == 'PowerCtl'){
|
|
|
isKaijiKey = true;
|
|
|
}
|
|
|
}else{
|
|
|
- if(curKeyId.indexOf("PowerControl") !=-1){
|
|
|
+ if(curKeyId == 'PowerControl'){
|
|
|
isKaijiKey = true;
|
|
|
}
|
|
|
}
|
|
|
@@ -2769,7 +2776,7 @@ export default {
|
|
|
let modelData = modelList[0];
|
|
|
let curKeyId = modelData.id;
|
|
|
if(!this.packageControlOnOffStatus){
|
|
|
- if(curKeyId.indexOf("PackagePowerControl") !=-1){
|
|
|
+ if(curKeyId == 'PackagePowerControl'){
|
|
|
isKaijiKey = true;
|
|
|
}
|
|
|
}else{
|
