diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue
index 0f476ca..a571e4d 100644
--- a/src/views/Customer/AgentManagement.vue
+++ b/src/views/Customer/AgentManagement.vue
@@ -239,10 +239,10 @@
-->
-
+
-
+
@@ -232,7 +232,7 @@
:style="
compare.assignQuantity > 0 ? 'color:red;' : 'color:green;'
"
- >{{ compare.assignQuantity + "%" }}{{ compare.assignQuantity }}
@@ -258,7 +258,7 @@
? 'color:red;'
: 'color:green;'
"
- >{{ compare.normalRecordQuantity + "%" }}{{ compare.normalRecordQuantity }}
@@ -284,7 +284,7 @@
:style="
compare.fullRecordRate > 0 ? 'color:red;' : 'color:green;'
"
- >{{ compare.fullRecordRate + "%" }}{{ compare.fullRecordRate }}
@@ -312,7 +312,7 @@
? 'color:red;'
: 'color:green;'
"
- >{{ compare.snippetRecordQuantity + "%" }}{{ compare.snippetRecordQuantity }}
@@ -336,7 +336,7 @@
:style="
compare.noRecordQuantity > 0 ? 'color:red;' : 'color:green;'
"
- >{{ compare.noRecordQuantity + "%" }}{{ compare.noRecordQuantity }}
@@ -364,7 +364,7 @@
? 'color:red;'
: 'color:green;'
"
- >{{ compare.normalShutdownQuantity + "%" }}{{ compare.normalShutdownQuantity}}
@@ -392,7 +392,7 @@
? 'color:red;'
: 'color:green;'
"
- >{{ compare.lowElectricityQuantity + "%" }}{{ compare.lowElectricityQuantity}}
@@ -420,7 +420,7 @@
? 'color:red;'
: 'color:green;'
"
- >{{ compare.abnormalShutdownQuantity + "%" }}{{ compare.abnormalShutdownQuantity }}
@@ -595,8 +595,16 @@
+
+ {{row.time}}%
+ {{row.time}}
+
+
+ {{row.time1}}%
+ {{row.time1}}
+
@@ -773,15 +781,6 @@ export default {
},
goinfo(row, idx) {
console.log(row, "信息");
- // location.href =
- // "${jypath}/equipment/onlinerecord/index?houseId=" +
- // this.houseId +
- // "&startDate=" +
- // row.createTime +
- // "&endDate=" +
- // row.createTime +
- // "&flag=" +
- // idx;
this.$router.push({
path: "/Equipment/equipmentOnlineRecordList",
query: {
@@ -798,10 +797,6 @@ export default {
this.tabChange(idx);
},
timeChange(e) {
- // console.log(e)
- // this.selectTime=e
- // 对数据进行处理
- // 当当前选择的为自定义时间时
this.selectTime = "";
this.selectTime1 = "";
this.timeSelect(e);
@@ -811,10 +806,6 @@ export default {
timeSelect(e) {
console.log(this.$refs.time);
if (this.timeType == -1) {
- // 将两者的时间戳相减，然后在在选择的自定义时间的时间戳想加
- // console.log(e,this.page.openTime,this.page.closeTime)
- // console.log(new Date(e).getTime(),new Date(this.page.openTime).getTime(),new Date(this.page.closeTime).getTime(),'时间戳')
- // console.log(this.timestampToTime(new Date(e).getTime()+new Date(this.page.closeTime).getTime()-new Date(this.page.openTime).getTime()))
this.selectTime = e;
this.selectTime1 = this.timestampToTime(
new Date(e).getTime() +
@@ -835,16 +826,12 @@ export default {
if (this.timeType == 6) {
num = 24 * 3600 * 1000 * 29;
}
- // console.log(-this.timeType*num)
- // this.selectTime=this.timestampToTime(new Date().getTime()-this.timeType*num)
this.selectTime = e;
this.selectTime1 = this.timestampToTime(new Date(e).getTime() + num);
}
},
timestampToTime(timestamp) {
var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
- // var date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-
var yyyy = date.getFullYear() + "-";
var MM =
@@ -852,20 +839,9 @@ export default {
? "0" + (date.getMonth() + 1)
: date.getMonth() + 1) + "-";
- // var dd = date.getDate() + ' ';
var dd =
(date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
- // var HH = date.getHours() + ':';
- // var HH = (date.getHours() < 10 ? '0'+(date.getHours()) : date.getHours()) + ':';
- //
- // // var mm = date.getMinutes() + ':';
- // var mm = (date.getMinutes() < 10 ? '0'+(date.getMinutes()) : date.getMinutes()) + ':';
- //
- // // var ss = date.getSeconds();
- // var ss = (date.getSeconds() < 10 ? '0'+(date.getSeconds()) : date.getSeconds());
-
- // return yyyy+MM+dd+HH+mm+ss;
return yyyy + MM + dd;
},
change() {
@@ -910,7 +886,6 @@ export default {
}
this.$set(this, "time", null);
- // console.log(this.customtime);
this.getTableList();
this.getdetail();
},
@@ -936,12 +911,6 @@ export default {
//时间选择
confirmtime(e) {
this.timeType = "-1";
- // if(this.customtime==''){ }else{
- // const d = new Date(this.customtime[0])
- // this.page.openTime = d.getFullYear() + '-' + this.Zeropadding((d.getMonth() + 1)) + '-' + this.Zeropadding(d.getDate())
- // const c = new Date(this.customtime[1])
- // this.page.closeTime = c.getFullYear() + '-' + this.Zeropadding((c.getMonth() + 1)) + '-' + this.Zeropadding(c.getDate())
- // }
this.checked = false;
this.selectTime = "";
this.selectTime1 = "";
@@ -960,8 +929,6 @@ export default {
orgType: localStorage.getItem("orgType"),
})
.then((res) => {
- // console.log(res.data.obj)
-
this.houseList = res.data;
if (!this.flag) {
// console.log(this.flag, "12");
@@ -970,18 +937,11 @@ export default {
} else {
this.houseId = res.data[0].id;
}
- // this.houseId = res.data[0].id;
}
// console.log(this.flag,'12')
this.tabtimetap(this.timeType);
// return
this.getTableList();
- // this.getdetail()
- // res.data.obj.results.forEach((item,index)=>{
- // item.index=index+1
- // })
- // this.tableData=res.data.obj.results;
- // this.page.total = res.data.obj.totalRecord;
});
},
handleSizeChange(val) {
@@ -1124,12 +1084,8 @@ export default {
arr2.push(item.second[str])
}
});
- // console.log(arr1,arr2,timeDate);
- // console.log(this.compareList)
this.compareList = Object.assign([], this.compareList);
this.$forceUpdate();
- // console.log(str)
- // 处理数据同时将echar进行渲染
var chartDom = document.getElementById("compare");
var myChart = echarts.init(chartDom);
var option;
@@ -1256,8 +1212,6 @@ export default {
itemobj.objopts = arr;
}
let itemobj1 = {
- // total:'50',
- // total:this.detail.normalRecordQuantity,
objopts: [
{
value: this.details.normalShutdownQuantity || 0,
@@ -1276,7 +1230,6 @@ export default {
let arr1 = itemobj1.objopts.filter((item) => {
return item.value;
});
- // console.log(arr1,'123')
if (arr1.length > 0) {
itemobj1.objopts = arr1;
}
@@ -1342,13 +1295,12 @@ export default {
method: "get",
params: obj,
}).then((res) => {
- // console.log(res)
if (res.code == 0) {
res.data.records.forEach((item, index) => {
item.index = index + 1;
});
this.tableData = res.data.records;
- this.page.total = res.data.totalRecord;
+ this.page.total = res.data.current;
}
});
},
diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue
index e5c1908..d0b069e 100644
--- a/src/views/Equipment/state.vue
+++ b/src/views/Equipment/state.vue
@@ -165,6 +165,10 @@
+