|
@@ -493,10 +493,11 @@ export default {
|
|
yssjDate: '',
|
|
yssjDate: '',
|
|
// 是否更换配件
|
|
// 是否更换配件
|
|
isReplaceData: [
|
|
isReplaceData: [
|
|
|
|
+ { id: '全部', name: '全部' },
|
|
{ id: '1', name: '是' },
|
|
{ id: '1', name: '是' },
|
|
{ id: '0', name: '否' }
|
|
{ id: '0', name: '否' }
|
|
],
|
|
],
|
|
- sfghSelect: '',
|
|
|
|
|
|
+ sfghSelect: '全部',
|
|
sbmcInput4: '',
|
|
sbmcInput4: '',
|
|
sbbhInput4: '',
|
|
sbbhInput4: '',
|
|
zysxInput4: '',
|
|
zysxInput4: '',
|
|
@@ -510,6 +511,7 @@ export default {
|
|
size4: 11,
|
|
size4: 11,
|
|
searVal: '',
|
|
searVal: '',
|
|
status: [],
|
|
status: [],
|
|
|
|
+ allArr: [{ id: '全部', name: '全部' }],
|
|
zt: [],
|
|
zt: [],
|
|
sbmcInput5: '',
|
|
sbmcInput5: '',
|
|
sbbhInput5: '',
|
|
sbbhInput5: '',
|
|
@@ -517,8 +519,8 @@ export default {
|
|
rwbhInput5: '',
|
|
rwbhInput5: '',
|
|
ycgdbhInput5: '',
|
|
ycgdbhInput5: '',
|
|
ssmsInput5: '',
|
|
ssmsInput5: '',
|
|
- iszcSelect5: '',
|
|
|
|
- statuSelect5: '',
|
|
|
|
|
|
+ iszcSelect5: '全部',
|
|
|
|
+ statuSelect5: '全部',
|
|
rwksrq: '',
|
|
rwksrq: '',
|
|
rwwcrq: '',
|
|
rwwcrq: '',
|
|
ycgdtbsj: '',
|
|
ycgdtbsj: '',
|
|
@@ -702,7 +704,7 @@ export default {
|
|
size: this.size3,
|
|
size: this.size3,
|
|
orderBy: 'sjjssj,0;location,1'
|
|
orderBy: 'sjjssj,0;location,1'
|
|
}
|
|
}
|
|
- if (this.sfghSelect) {
|
|
|
|
|
|
+ if (this.sfghSelect && this.sfghSelect != '全部') {
|
|
getParams.ismodel = this.sfghSelect
|
|
getParams.ismodel = this.sfghSelect
|
|
}
|
|
}
|
|
// 设备名称、编号
|
|
// 设备名称、编号
|
|
@@ -781,11 +783,11 @@ export default {
|
|
}
|
|
}
|
|
//
|
|
//
|
|
// 是否正常
|
|
// 是否正常
|
|
- if (this.iszcSelect5) {
|
|
|
|
|
|
+ if (this.iszcSelect5 && this.iszcSelect5 != '正常') {
|
|
data.zt = this.iszcSelect5
|
|
data.zt = this.iszcSelect5
|
|
}
|
|
}
|
|
// 任务状态
|
|
// 任务状态
|
|
- if (this.statuSelect5) {
|
|
|
|
|
|
+ if (this.statuSelect5 && this.statuSelect5 != '全部') {
|
|
data.status = this.statuSelect5
|
|
data.status = this.statuSelect5
|
|
}
|
|
}
|
|
if (this.sbmcInput5) {
|
|
if (this.sbmcInput5) {
|
|
@@ -844,7 +846,9 @@ export default {
|
|
querySelect({ data, postParams }).then(res => {
|
|
querySelect({ data, postParams }).then(res => {
|
|
//console.log('下拉框', res)
|
|
//console.log('下拉框', res)
|
|
let status = [],
|
|
let status = [],
|
|
- zt = []
|
|
|
|
|
|
+ zt = [],
|
|
|
|
+ arr = [],
|
|
|
|
+ arr1 = []
|
|
|
|
|
|
status = res.data.data.sms_wbzy.status ? res.data.data.sms_wbzy.status : []
|
|
status = res.data.data.sms_wbzy.status ? res.data.data.sms_wbzy.status : []
|
|
zt = res.data.data.sms_wbzy.zt ? res.data.data.sms_wbzy.zt : []
|
|
zt = res.data.data.sms_wbzy.zt ? res.data.data.sms_wbzy.zt : []
|
|
@@ -854,8 +858,9 @@ export default {
|
|
id: el.key,
|
|
id: el.key,
|
|
name: el.value
|
|
name: el.value
|
|
}
|
|
}
|
|
- this.status.push(obj)
|
|
|
|
|
|
+ arr.push(obj)
|
|
})
|
|
})
|
|
|
|
+ this.status = this.allArr.concat(arr)
|
|
}
|
|
}
|
|
if (zt.length > 0) {
|
|
if (zt.length > 0) {
|
|
zt.forEach(el => {
|
|
zt.forEach(el => {
|
|
@@ -863,8 +868,9 @@ export default {
|
|
id: el.key,
|
|
id: el.key,
|
|
name: el.value == '正常' ? '是' : '否'
|
|
name: el.value == '正常' ? '是' : '否'
|
|
}
|
|
}
|
|
- this.zt.push(obj)
|
|
|
|
|
|
+ arr1.push(obj)
|
|
})
|
|
})
|
|
|
|
+ this.zt = this.allArr.concat(arr1)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|