|
|
@@ -101,7 +101,8 @@
|
|
|
return {
|
|
|
staticData: '',
|
|
|
indicator:[],
|
|
|
- datavalue:[],
|
|
|
+ datavalue:[],
|
|
|
+ dataname:[],
|
|
|
alarmCount: json.staticData.data[0].alarmCount,
|
|
|
cuIconList: json.cuIconList,
|
|
|
Inv: 0,
|
|
|
@@ -320,8 +321,31 @@
|
|
|
this.flag = !this.flag;
|
|
|
},
|
|
|
// 下拉选择
|
|
|
- clickSelectItem(item, index) {
|
|
|
- this.staticData = '';
|
|
|
+ clickSelectItem(item, index) {
|
|
|
+ this.staticData = '';
|
|
|
+ this.datavalue='';
|
|
|
+ // this.dataname='';
|
|
|
+
|
|
|
+
|
|
|
+ /** 数组对象去重方法一 */
|
|
|
+
|
|
|
+ // let obj1 = {};
|
|
|
+ // let res1 = [];
|
|
|
+ // this.indicator.forEach((item)=> {
|
|
|
+ // if(!obj1[item.color]) {
|
|
|
+ // res1.push(item);
|
|
|
+ // obj1[item.color] = true;
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // console.log(res1);
|
|
|
+ // this.indicator=res1;
|
|
|
+ // console.log('this.indicator');
|
|
|
+ // console.log(this.indicator);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // this.indicator=null;
|
|
|
this.selectedCode = item.owner_code;
|
|
|
uni.setStorageSync('selectedCode', item.owner_code);
|
|
|
uni.setStorageSync('selectedName', item.owner_name);
|
|
|
@@ -379,7 +403,8 @@
|
|
|
aa = aa.pop();
|
|
|
var datamax = [aa, aa, aa, aa, aa];
|
|
|
|
|
|
- this.datavalue = datavalue
|
|
|
+ this.datavalue = datavalue;
|
|
|
+ this.dataname=dataname;
|
|
|
|
|
|
dataname.map((val, ind) => {
|
|
|
this.indicator.push({
|
|
|
@@ -390,8 +415,8 @@
|
|
|
})
|
|
|
|
|
|
|
|
|
- console.log('父组件staticData.fire_water_count')
|
|
|
- console.log(this.staticData.fire_water_count)
|
|
|
+ console.log('父组件staticData.alarm_host_count')
|
|
|
+ console.log(this.staticData.alarm_host_count)
|
|
|
},
|
|
|
// 未处理告警请求
|
|
|
async getHandleData(param = {}) {
|
Ming