|
@@ -50,11 +50,11 @@ |
|
|
</el-option> |
|
|
</el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</div> --> |
|
|
</div> --> |
|
|
<div style="margin-left: 26px" v-if="selValue == 1"> |
|
|
|
|
|
|
|
|
<div style="margin-left: 26px" v-if="selValue == 1"> |
|
|
<el-select |
|
|
<el-select |
|
|
v-model="houseId" |
|
|
|
|
|
|
|
|
v-model="houseId" |
|
|
filterable |
|
|
filterable |
|
|
placeholder="默认为全部" |
|
|
|
|
|
|
|
|
placeholder="默认为全部" |
|
|
@change="change" |
|
|
@change="change" |
|
|
> |
|
|
> |
|
|
<el-option |
|
|
<el-option |
|
@@ -69,7 +69,7 @@ |
|
|
<!-- 楼盘 --> |
|
|
<!-- 楼盘 --> |
|
|
<div style="margin-left: 26px" v-else-if="selValue == 2"> |
|
|
<div style="margin-left: 26px" v-else-if="selValue == 2"> |
|
|
<el-select |
|
|
<el-select |
|
|
v-model="houseId" |
|
|
|
|
|
|
|
|
v-model="houseId" |
|
|
filterable |
|
|
filterable |
|
|
placeholder="默认为全部" |
|
|
placeholder="默认为全部" |
|
|
@change="change" |
|
|
@change="change" |
|
@@ -85,7 +85,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div style="margin-left: 26px" v-else> |
|
|
<div style="margin-left: 26px" v-else> |
|
|
<el-select |
|
|
<el-select |
|
|
v-model="houseId" |
|
|
|
|
|
|
|
|
v-model="houseId" |
|
|
filterable |
|
|
filterable |
|
|
placeholder="默认为全部" |
|
|
placeholder="默认为全部" |
|
|
@change="change" |
|
|
@change="change" |
|
@@ -99,7 +99,10 @@ |
|
|
</el-option> |
|
|
</el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</div> |
|
|
</div> |
|
|
<div style="margin-left: auto;margin-right:10px;" v-if="equ_ed_download"> |
|
|
|
|
|
|
|
|
<div |
|
|
|
|
|
style="margin-left: auto; margin-right: 10px" |
|
|
|
|
|
v-if="equ_ed_download" |
|
|
|
|
|
> |
|
|
<el-button @click="downLoad">导出</el-button> |
|
|
<el-button @click="downLoad">导出</el-button> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
@@ -164,7 +167,7 @@ |
|
|
<div style="min-width: 60px"> |
|
|
<div style="min-width: 60px"> |
|
|
{{ selectTime1 ? "时段二: " : "请选择: " }} |
|
|
{{ selectTime1 ? "时段二: " : "请选择: " }} |
|
|
</div> |
|
|
</div> |
|
|
<div v-if="selectTime1" style="display: flex;"> |
|
|
|
|
|
|
|
|
<div v-if="selectTime1" style="display: flex"> |
|
|
<!-- {{ selectTime+ "-" + selectTime1}} --> |
|
|
<!-- {{ selectTime+ "-" + selectTime1}} --> |
|
|
<div style="min-width: 120px; text-align: center"> |
|
|
<div style="min-width: 120px; text-align: center"> |
|
|
{{ selectTime }} |
|
|
{{ selectTime }} |
|
@@ -197,7 +200,7 @@ |
|
|
<div class="alllistbox"> |
|
|
<div class="alllistbox"> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(0,'设备总数')" |
|
|
|
|
|
|
|
|
@click="compareChange(0, '设备总数')" |
|
|
:class="compareFlag == 0 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 0 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">设备总数</div> |
|
|
<div class="alllist-text1">设备总数</div> |
|
@@ -222,7 +225,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(1,'在线设备数')" |
|
|
|
|
|
|
|
|
@click="compareChange(1, '在线设备数')" |
|
|
:class="compareFlag == 1 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 1 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">在线设备数</div> |
|
|
<div class="alllist-text1">在线设备数</div> |
|
@@ -246,7 +249,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(2,'在线设备平均占比')" |
|
|
|
|
|
|
|
|
@click="compareChange(2, '在线设备平均占比')" |
|
|
:class="compareFlag == 2 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 2 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">在线设备平均占比</div> |
|
|
<div class="alllist-text1">在线设备平均占比</div> |
|
@@ -272,7 +275,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(3,'活跃设备数')" |
|
|
|
|
|
|
|
|
@click="compareChange(3, '活跃设备数')" |
|
|
:class="compareFlag == 3 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 3 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">活跃设备数</div> |
|
|
<div class="alllist-text1">活跃设备数</div> |
|
@@ -296,7 +299,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(4,'活跃设备平均占比')" |
|
|
|
|
|
|
|
|
@click="compareChange(4, '活跃设备平均占比')" |
|
|
:class="compareFlag == 4 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 4 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">活跃设备平均占比</div> |
|
|
<div class="alllist-text1">活跃设备平均占比</div> |
|
@@ -322,7 +325,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(5,'指派次数')" |
|
|
|
|
|
|
|
|
@click="compareChange(5, '指派次数')" |
|
|
:class="compareFlag == 5 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 5 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">指派次数</div> |
|
|
<div class="alllist-text1">指派次数</div> |
|
@@ -346,7 +349,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(6,'完整录音次数')" |
|
|
|
|
|
|
|
|
@click="compareChange(6, '完整录音次数')" |
|
|
:class="compareFlag == 6 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 6 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">完整录音次数</div> |
|
|
<div class="alllist-text1">完整录音次数</div> |
|
@@ -372,7 +375,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(7,'完整录音占比')" |
|
|
|
|
|
|
|
|
@click="compareChange(7, '完整录音占比')" |
|
|
:class="compareFlag == 7 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 7 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">完整录音占比</div> |
|
|
<div class="alllist-text1">完整录音占比</div> |
|
@@ -398,7 +401,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(8,'部分录音')" |
|
|
|
|
|
|
|
|
@click="compareChange(8, '部分录音')" |
|
|
:class="compareFlag == 8 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 8 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">部分录音</div> |
|
|
<div class="alllist-text1">部分录音</div> |
|
@@ -426,7 +429,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(9,'未录音')" |
|
|
|
|
|
|
|
|
@click="compareChange(9, '未录音')" |
|
|
:class="compareFlag == 9 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 9 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">未录音</div> |
|
|
<div class="alllist-text1">未录音</div> |
|
@@ -450,7 +453,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(10,'正常关机次数')" |
|
|
|
|
|
|
|
|
@click="compareChange(10, '正常关机次数')" |
|
|
:class="compareFlag == 10 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 10 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">正常关机次数</div> |
|
|
<div class="alllist-text1">正常关机次数</div> |
|
@@ -478,7 +481,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(11,'低电关机次数')" |
|
|
|
|
|
|
|
|
@click="compareChange(11, '低电关机次数')" |
|
|
:class="compareFlag == 11 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 11 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">低电关机次数</div> |
|
|
<div class="alllist-text1">低电关机次数</div> |
|
@@ -506,7 +509,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
<div |
|
|
<div |
|
|
class="alllist" |
|
|
class="alllist" |
|
|
@click="compareChange(12,'异常关机次数')" |
|
|
|
|
|
|
|
|
@click="compareChange(12, '异常关机次数')" |
|
|
:class="compareFlag == 12 ? 'active' : 'noactive'" |
|
|
:class="compareFlag == 12 ? 'active' : 'noactive'" |
|
|
> |
|
|
> |
|
|
<div class="alllist-text1">异常关机次数</div> |
|
|
<div class="alllist-text1">异常关机次数</div> |
|
@@ -535,8 +538,8 @@ |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
<!-- v-if="selectTime1" --> |
|
|
|
|
|
<div style="margin-top: 20px" > |
|
|
|
|
|
|
|
|
<!-- v-if="selectTime1" --> |
|
|
|
|
|
<div style="margin-top: 20px"> |
|
|
<div class="zgutteruo"> |
|
|
<div class="zgutteruo"> |
|
|
<div class="zgutteruo-tit">对比</div> |
|
|
<div class="zgutteruo-tit">对比</div> |
|
|
<div id="compare" style="width: 100%; height: 360px"></div> |
|
|
<div id="compare" style="width: 100%; height: 360px"></div> |
|
@@ -756,14 +759,15 @@ |
|
|
<script> |
|
|
<script> |
|
|
import * as echarts from "echarts"; |
|
|
import * as echarts from "echarts"; |
|
|
import { mapGetters } from "vuex"; |
|
|
import { mapGetters } from "vuex"; |
|
|
import { exportMethodPost} from "@/util/util"; |
|
|
|
|
|
|
|
|
import { exportMethodPost } from "@/util/util"; |
|
|
export default { |
|
|
export default { |
|
|
data() { |
|
|
data() { |
|
|
return { |
|
|
return { |
|
|
houseId: "", |
|
|
houseId: "", |
|
|
timeType: 0, |
|
|
timeType: 0, |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
selValue: localStorage.getItem("orgType") == 0 |
|
|
|
|
|
|
|
|
selValue: |
|
|
|
|
|
localStorage.getItem("orgType") == 0 |
|
|
? "0" |
|
|
? "0" |
|
|
: localStorage.getItem("orgType") == 1 |
|
|
: localStorage.getItem("orgType") == 1 |
|
|
? "1" |
|
|
? "1" |
|
@@ -870,7 +874,7 @@ export default { |
|
|
value: "2,3", |
|
|
value: "2,3", |
|
|
}, |
|
|
}, |
|
|
], |
|
|
], |
|
|
houseTypes:'0,1' |
|
|
|
|
|
|
|
|
houseTypes: "0,1", |
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
computed: { |
|
|
computed: { |
|
@@ -888,6 +892,7 @@ export default { |
|
|
this.flag = true; |
|
|
this.flag = true; |
|
|
this.houseId = theRequest.houseId; |
|
|
this.houseId = theRequest.houseId; |
|
|
this.timeType = theRequest.timeType; |
|
|
this.timeType = theRequest.timeType; |
|
|
|
|
|
this.selValue="2" |
|
|
} else { |
|
|
} else { |
|
|
this.flag = false; |
|
|
this.flag = false; |
|
|
// console.log(1); |
|
|
// console.log(1); |
|
@@ -907,33 +912,52 @@ export default { |
|
|
// this.getTableList() |
|
|
// this.getTableList() |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
downLoad(){ |
|
|
|
|
|
|
|
|
downLoad() { |
|
|
// this.searchForm |
|
|
// this.searchForm |
|
|
let obj = { |
|
|
|
|
|
|
|
|
let obj = { |
|
|
startDate: this.page.openTime, |
|
|
startDate: this.page.openTime, |
|
|
endDate: this.page.closeTime, |
|
|
endDate: this.page.closeTime, |
|
|
agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : null, |
|
|
|
|
|
orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : null, |
|
|
|
|
|
houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : null, |
|
|
|
|
|
|
|
|
agentId: |
|
|
|
|
|
localStorage.getItem("orgType") == 1 |
|
|
|
|
|
? localStorage.getItem("agentId") |
|
|
|
|
|
: this.selValue == 0 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
orgCode: |
|
|
|
|
|
localStorage.getItem("orgType") == 2 |
|
|
|
|
|
? localStorage.getItem("orgCode") |
|
|
|
|
|
: this.selValue == 1 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
houseId: |
|
|
|
|
|
localStorage.getItem("orgType") == 3 |
|
|
|
|
|
? localStorage.getItem("houseId") |
|
|
|
|
|
: this.selValue == 2 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
timeType: this.timeType, |
|
|
timeType: this.timeType, |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
queryOrgType:this.selValue/1+1, |
|
|
|
|
|
|
|
|
queryOrgType: this.selValue / 1 + 1, |
|
|
houseTypes: this.houseTypes, |
|
|
houseTypes: this.houseTypes, |
|
|
}; |
|
|
}; |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
exportMethodPost('autoSR/zk/equipment/detail/equipmentCountDetailExport','设备使用统计',obj) |
|
|
|
|
|
|
|
|
exportMethodPost( |
|
|
|
|
|
"autoSR/zk/equipment/detail/equipmentCountDetailExport", |
|
|
|
|
|
"设备使用统计", |
|
|
|
|
|
obj |
|
|
|
|
|
); |
|
|
}, |
|
|
}, |
|
|
sysChange(){ |
|
|
|
|
|
this.selValue='0' |
|
|
|
|
|
this.choicValue = ""; |
|
|
|
|
|
this.timeType = 4; |
|
|
|
|
|
this.houseId=''; |
|
|
|
|
|
this.getHouseList(); |
|
|
|
|
|
}, |
|
|
|
|
|
selChange() { |
|
|
|
|
|
|
|
|
sysChange() { |
|
|
|
|
|
this.selValue = "0"; |
|
|
this.choicValue = ""; |
|
|
this.choicValue = ""; |
|
|
this.timeType = 4; |
|
|
this.timeType = 4; |
|
|
this.houseId=''; |
|
|
|
|
|
|
|
|
this.houseId = ""; |
|
|
|
|
|
this.getHouseList(); |
|
|
|
|
|
}, |
|
|
|
|
|
selChange() { |
|
|
|
|
|
this.choicValue = ""; |
|
|
|
|
|
this.timeType = 4; |
|
|
|
|
|
this.houseId = ""; |
|
|
this.getHouseList(); |
|
|
this.getHouseList(); |
|
|
// this.getTableList(); |
|
|
// this.getTableList(); |
|
|
// this.getdetail(); |
|
|
// this.getdetail(); |
|
@@ -941,33 +965,47 @@ export default { |
|
|
// this.getcompare(); |
|
|
// this.getcompare(); |
|
|
}, |
|
|
}, |
|
|
// 没有对比时的折线图 |
|
|
// 没有对比时的折线图 |
|
|
getNoCompare(){ |
|
|
|
|
|
|
|
|
getNoCompare() { |
|
|
this.compareFlag = 0; |
|
|
this.compareFlag = 0; |
|
|
let obj = { |
|
|
|
|
|
|
|
|
let obj = { |
|
|
// current: this.pageNum, |
|
|
// current: this.pageNum, |
|
|
// pageSize: this.pageNum, |
|
|
// pageSize: this.pageNum, |
|
|
startDate: this.page.openTime, |
|
|
startDate: this.page.openTime, |
|
|
endDate: this.page.closeTime, |
|
|
endDate: this.page.closeTime, |
|
|
agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : null, |
|
|
|
|
|
orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : null, |
|
|
|
|
|
houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : null, |
|
|
|
|
|
|
|
|
agentId: |
|
|
|
|
|
localStorage.getItem("orgType") == 1 |
|
|
|
|
|
? localStorage.getItem("agentId") |
|
|
|
|
|
: this.selValue == 0 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
orgCode: |
|
|
|
|
|
localStorage.getItem("orgType") == 2 |
|
|
|
|
|
? localStorage.getItem("orgCode") |
|
|
|
|
|
: this.selValue == 1 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
houseId: |
|
|
|
|
|
localStorage.getItem("orgType") == 3 |
|
|
|
|
|
? localStorage.getItem("houseId") |
|
|
|
|
|
: this.selValue == 2 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
timeType: this.timeType, |
|
|
timeType: this.timeType, |
|
|
contrastStartDate: this.selectTime, |
|
|
contrastStartDate: this.selectTime, |
|
|
contrastEndDate: this.selectTime1, |
|
|
contrastEndDate: this.selectTime1, |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
queryOrgType:this.selValue/1+1, |
|
|
|
|
|
|
|
|
queryOrgType: this.selValue / 1 + 1, |
|
|
houseTypes: this.houseTypes, |
|
|
houseTypes: this.houseTypes, |
|
|
}; |
|
|
}; |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
|
|
|
|
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
axios({ |
|
|
axios({ |
|
|
url: `autoSR/zk/equipment/detail/usageTrendContrast`, |
|
|
url: `autoSR/zk/equipment/detail/usageTrendContrast`, |
|
|
method: "get", |
|
|
method: "get", |
|
|
params: obj, |
|
|
params: obj, |
|
|
}) |
|
|
|
|
|
.then(res=>{ |
|
|
|
|
|
|
|
|
}).then((res) => { |
|
|
console.log(res); |
|
|
console.log(res); |
|
|
}) |
|
|
|
|
|
|
|
|
}); |
|
|
}, |
|
|
}, |
|
|
radioChange() { |
|
|
radioChange() { |
|
|
this.selectTime = ""; |
|
|
this.selectTime = ""; |
|
@@ -988,15 +1026,15 @@ export default { |
|
|
}, |
|
|
}, |
|
|
}); |
|
|
}); |
|
|
}, |
|
|
}, |
|
|
compareChange(idx,str) { |
|
|
|
|
|
|
|
|
compareChange(idx, str) { |
|
|
// if (!this.selectTime1) return; |
|
|
// if (!this.selectTime1) return; |
|
|
this.compareFlag = idx; |
|
|
this.compareFlag = idx; |
|
|
this.tabChange(idx,str); |
|
|
|
|
|
|
|
|
this.tabChange(idx, str); |
|
|
}, |
|
|
}, |
|
|
timeChange(e) { |
|
|
timeChange(e) { |
|
|
this.selectTime = ""; |
|
|
this.selectTime = ""; |
|
|
this.selectTime1 = ""; |
|
|
this.selectTime1 = ""; |
|
|
this.pageNum=1 |
|
|
|
|
|
|
|
|
this.pageNum = 1; |
|
|
// this.page.pageNum=1 |
|
|
// this.page.pageNum=1 |
|
|
this.timeSelect(e); |
|
|
this.timeSelect(e); |
|
|
this.getdetail(); |
|
|
this.getdetail(); |
|
@@ -1065,8 +1103,8 @@ export default { |
|
|
this.checked = false; |
|
|
this.checked = false; |
|
|
this.selectTime = ""; |
|
|
this.selectTime = ""; |
|
|
this.selectTime1 = ""; |
|
|
this.selectTime1 = ""; |
|
|
this.pageNum=1 |
|
|
|
|
|
this.page.pageNum=1 |
|
|
|
|
|
|
|
|
this.pageNum = 1; |
|
|
|
|
|
this.page.pageNum = 1; |
|
|
//给时间选择器赋值 |
|
|
//给时间选择器赋值 |
|
|
let num = 24 * 3600 * 1000; |
|
|
let num = 24 * 3600 * 1000; |
|
|
// 获取当前时间戳转换为日期格式 |
|
|
// 获取当前时间戳转换为日期格式 |
|
@@ -1082,14 +1120,14 @@ export default { |
|
|
if (i != -1) { |
|
|
if (i != -1) { |
|
|
this.customtime = [ |
|
|
this.customtime = [ |
|
|
this.timestampToTime(new Date().getTime() - num), |
|
|
this.timestampToTime(new Date().getTime() - num), |
|
|
this.timestampToTime(new Date().getTime()-24 * 3600 * 1000), |
|
|
|
|
|
|
|
|
this.timestampToTime(new Date().getTime() - 24 * 3600 * 1000), |
|
|
]; |
|
|
]; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.$set(this, "time", null); |
|
|
this.$set(this, "time", null); |
|
|
this.getTableList(); |
|
|
this.getTableList(); |
|
|
this.getdetail(); |
|
|
this.getdetail(); |
|
|
this.getcompare() |
|
|
|
|
|
|
|
|
this.getcompare(); |
|
|
}, |
|
|
}, |
|
|
screening() { |
|
|
screening() { |
|
|
this.page.pageNum = 1; |
|
|
this.page.pageNum = 1; |
|
@@ -1115,8 +1153,8 @@ export default { |
|
|
this.timeType = "-1"; |
|
|
this.timeType = "-1"; |
|
|
this.checked = false; |
|
|
this.checked = false; |
|
|
this.selectTime = ""; |
|
|
this.selectTime = ""; |
|
|
this.pageNum=1 |
|
|
|
|
|
this.page.pageNum=1 |
|
|
|
|
|
|
|
|
this.pageNum = 1; |
|
|
|
|
|
this.page.pageNum = 1; |
|
|
this.selectTime1 = ""; |
|
|
this.selectTime1 = ""; |
|
|
this.$set(this, "time", null); |
|
|
this.$set(this, "time", null); |
|
|
console.log(e); |
|
|
console.log(e); |
|
@@ -1125,11 +1163,11 @@ export default { |
|
|
this.page.closeTime = this.customtime[1]; |
|
|
this.page.closeTime = this.customtime[1]; |
|
|
this.getTableList(); |
|
|
this.getTableList(); |
|
|
this.getdetail(); |
|
|
this.getdetail(); |
|
|
this.getcompare() |
|
|
|
|
|
|
|
|
this.getcompare(); |
|
|
}, |
|
|
}, |
|
|
//获取楼盘数据 |
|
|
//获取楼盘数据 |
|
|
getHouseList() { |
|
|
getHouseList() { |
|
|
if (this.selValue == 1) { |
|
|
|
|
|
|
|
|
if (this.selValue == 1) { |
|
|
this.$api.api |
|
|
this.$api.api |
|
|
.findMyOrg({ |
|
|
.findMyOrg({ |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
orgType: localStorage.getItem("orgType"), |
|
@@ -1164,7 +1202,6 @@ export default { |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// this.$api.api.findHouseByUser({ |
|
|
// this.$api.api.findHouseByUser({ |
|
|
// orgType: localStorage.getItem("orgType"), |
|
|
// orgType: localStorage.getItem("orgType"), |
|
|
// agentId: localStorage.getItem("agentId"), |
|
|
// agentId: localStorage.getItem("agentId"), |
|
@@ -1210,14 +1247,29 @@ export default { |
|
|
size: this.pageSize, |
|
|
size: this.pageSize, |
|
|
startDate: this.page.openTime, |
|
|
startDate: this.page.openTime, |
|
|
endDate: this.page.closeTime, |
|
|
endDate: this.page.closeTime, |
|
|
agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : null, |
|
|
|
|
|
orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : null, |
|
|
|
|
|
houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : null, |
|
|
|
|
|
|
|
|
agentId: |
|
|
|
|
|
localStorage.getItem("orgType") == 1 |
|
|
|
|
|
? localStorage.getItem("agentId") |
|
|
|
|
|
: this.selValue == 0 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
orgCode: |
|
|
|
|
|
localStorage.getItem("orgType") == 2 |
|
|
|
|
|
? localStorage.getItem("orgCode") |
|
|
|
|
|
: this.selValue == 1 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
houseId: |
|
|
|
|
|
localStorage.getItem("orgType") == 3 |
|
|
|
|
|
? localStorage.getItem("houseId") |
|
|
|
|
|
: this.selValue == 2 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
timeType: this.timeType, |
|
|
timeType: this.timeType, |
|
|
contrastStartDate: this.selectTime, |
|
|
contrastStartDate: this.selectTime, |
|
|
contrastEndDate: this.selectTime1, |
|
|
contrastEndDate: this.selectTime1, |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
queryOrgType:this.selValue/1+1, |
|
|
|
|
|
|
|
|
queryOrgType: this.selValue / 1 + 1, |
|
|
houseTypes: this.houseTypes, |
|
|
houseTypes: this.houseTypes, |
|
|
}; |
|
|
}; |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
@@ -1227,7 +1279,7 @@ export default { |
|
|
params: obj, |
|
|
params: obj, |
|
|
}) |
|
|
}) |
|
|
.then((res) => { |
|
|
.then((res) => { |
|
|
console.log(res,'获取数据') |
|
|
|
|
|
|
|
|
console.log(res, "获取数据"); |
|
|
this.allCompare = res; |
|
|
this.allCompare = res; |
|
|
this.total = res.data.firstPage.total; |
|
|
this.total = res.data.firstPage.total; |
|
|
// 数据处理 |
|
|
// 数据处理 |
|
@@ -1259,16 +1311,16 @@ export default { |
|
|
}); |
|
|
}); |
|
|
this.compareList = arr; |
|
|
this.compareList = arr; |
|
|
// console.log(this.compareList,'123') |
|
|
// console.log(this.compareList,'123') |
|
|
this.tabChange(0,'设备总数'); |
|
|
|
|
|
|
|
|
this.tabChange(0, "设备总数"); |
|
|
}) |
|
|
}) |
|
|
.catch((err) => { |
|
|
.catch((err) => { |
|
|
// console.log(err) |
|
|
// console.log(err) |
|
|
this.compareList = []; |
|
|
this.compareList = []; |
|
|
this.tabChange(0,'设备总数'); |
|
|
|
|
|
|
|
|
this.tabChange(0, "设备总数"); |
|
|
}); |
|
|
}); |
|
|
}, |
|
|
}, |
|
|
//处理数据 |
|
|
//处理数据 |
|
|
tabChange(idx,str1) { |
|
|
|
|
|
|
|
|
tabChange(idx, str1) { |
|
|
//首先获取到给定的标志,对数据进行操作和赋值 |
|
|
//首先获取到给定的标志,对数据进行操作和赋值 |
|
|
//判断情况 |
|
|
//判断情况 |
|
|
// console.log(idx) |
|
|
// console.log(idx) |
|
@@ -1329,11 +1381,15 @@ export default { |
|
|
// arr2.push(item.second[str]); |
|
|
// arr2.push(item.second[str]); |
|
|
// } |
|
|
// } |
|
|
}); |
|
|
}); |
|
|
this.allCompare.data.first.map((item,idx)=>{ |
|
|
|
|
|
timeDate.push(item.createTime.substring(5)+'VS'+this.allCompare.data.second[idx].createTime.substring(5)) |
|
|
|
|
|
arr1.push(item[str]) |
|
|
|
|
|
arr2.push(this.allCompare.data.second[idx][str]) |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
this.allCompare.data.first.map((item, idx) => { |
|
|
|
|
|
timeDate.push( |
|
|
|
|
|
item.createTime.substring(5) + |
|
|
|
|
|
"VS" + |
|
|
|
|
|
this.allCompare.data.second[idx].createTime.substring(5) |
|
|
|
|
|
); |
|
|
|
|
|
arr1.push(item[str]); |
|
|
|
|
|
arr2.push(this.allCompare.data.second[idx][str]); |
|
|
|
|
|
}); |
|
|
this.compareList = Object.assign([], this.compareList); |
|
|
this.compareList = Object.assign([], this.compareList); |
|
|
this.$forceUpdate(); |
|
|
this.$forceUpdate(); |
|
|
var chartDom = document.getElementById("compare"); |
|
|
var chartDom = document.getElementById("compare"); |
|
@@ -1342,29 +1398,29 @@ export default { |
|
|
var option; |
|
|
var option; |
|
|
|
|
|
|
|
|
option = { |
|
|
option = { |
|
|
color: [ |
|
|
|
|
|
"#66AFF5", |
|
|
|
|
|
"#FABD2B", |
|
|
|
|
|
"#6F8EDC", |
|
|
|
|
|
"#FFCF8F", |
|
|
|
|
|
"#F98120", |
|
|
|
|
|
"#1CC99E", |
|
|
|
|
|
"#9474FB", |
|
|
|
|
|
"#657292", |
|
|
|
|
|
"#7A6A99", |
|
|
|
|
|
"#BF5D52", |
|
|
|
|
|
"#EE6666", |
|
|
|
|
|
"#77B7E4", |
|
|
|
|
|
"#E6A065", |
|
|
|
|
|
"#9D5139", |
|
|
|
|
|
"#C1AA88", |
|
|
|
|
|
"#F87F7A", |
|
|
|
|
|
"#F6CF74", |
|
|
|
|
|
"#7F5506", |
|
|
|
|
|
"#88BB9B", |
|
|
|
|
|
"#6E99AA", |
|
|
|
|
|
"#5789D0", |
|
|
|
|
|
], |
|
|
|
|
|
|
|
|
color: [ |
|
|
|
|
|
"#66AFF5", |
|
|
|
|
|
"#FABD2B", |
|
|
|
|
|
"#6F8EDC", |
|
|
|
|
|
"#FFCF8F", |
|
|
|
|
|
"#F98120", |
|
|
|
|
|
"#1CC99E", |
|
|
|
|
|
"#9474FB", |
|
|
|
|
|
"#657292", |
|
|
|
|
|
"#7A6A99", |
|
|
|
|
|
"#BF5D52", |
|
|
|
|
|
"#EE6666", |
|
|
|
|
|
"#77B7E4", |
|
|
|
|
|
"#E6A065", |
|
|
|
|
|
"#9D5139", |
|
|
|
|
|
"#C1AA88", |
|
|
|
|
|
"#F87F7A", |
|
|
|
|
|
"#F6CF74", |
|
|
|
|
|
"#7F5506", |
|
|
|
|
|
"#88BB9B", |
|
|
|
|
|
"#6E99AA", |
|
|
|
|
|
"#5789D0", |
|
|
|
|
|
], |
|
|
tooltip: { |
|
|
tooltip: { |
|
|
trigger: "axis", |
|
|
trigger: "axis", |
|
|
}, |
|
|
}, |
|
@@ -1443,39 +1499,39 @@ export default { |
|
|
// console.log(this.allCompare,"第一种"); |
|
|
// console.log(this.allCompare,"第一种"); |
|
|
let timeDate = []; |
|
|
let timeDate = []; |
|
|
let arr1 = []; |
|
|
let arr1 = []; |
|
|
this.allCompare.data.first.map(item=>{ |
|
|
|
|
|
timeDate.push(item.createTime.substring(5)) |
|
|
|
|
|
arr1.push(item[str]) |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
this.allCompare.data.first.map((item) => { |
|
|
|
|
|
timeDate.push(item.createTime.substring(5)); |
|
|
|
|
|
arr1.push(item[str]); |
|
|
|
|
|
}); |
|
|
// console.log(timeDate,arr1); |
|
|
// console.log(timeDate,arr1); |
|
|
var chartDom = document.getElementById("compare"); |
|
|
|
|
|
|
|
|
var chartDom = document.getElementById("compare"); |
|
|
echarts.init(chartDom).dispose(); |
|
|
echarts.init(chartDom).dispose(); |
|
|
var myChart = echarts.init(chartDom); |
|
|
var myChart = echarts.init(chartDom); |
|
|
var option; |
|
|
var option; |
|
|
option = { |
|
|
|
|
|
color: [ |
|
|
|
|
|
"#66AFF5", |
|
|
|
|
|
"#FABD2B", |
|
|
|
|
|
"#6F8EDC", |
|
|
|
|
|
"#FFCF8F", |
|
|
|
|
|
"#F98120", |
|
|
|
|
|
"#1CC99E", |
|
|
|
|
|
"#9474FB", |
|
|
|
|
|
"#657292", |
|
|
|
|
|
"#7A6A99", |
|
|
|
|
|
"#BF5D52", |
|
|
|
|
|
"#EE6666", |
|
|
|
|
|
"#77B7E4", |
|
|
|
|
|
"#E6A065", |
|
|
|
|
|
"#9D5139", |
|
|
|
|
|
"#C1AA88", |
|
|
|
|
|
"#F87F7A", |
|
|
|
|
|
"#F6CF74", |
|
|
|
|
|
"#7F5506", |
|
|
|
|
|
"#88BB9B", |
|
|
|
|
|
"#6E99AA", |
|
|
|
|
|
"#5789D0", |
|
|
|
|
|
], |
|
|
|
|
|
|
|
|
option = { |
|
|
|
|
|
color: [ |
|
|
|
|
|
"#66AFF5", |
|
|
|
|
|
"#FABD2B", |
|
|
|
|
|
"#6F8EDC", |
|
|
|
|
|
"#FFCF8F", |
|
|
|
|
|
"#F98120", |
|
|
|
|
|
"#1CC99E", |
|
|
|
|
|
"#9474FB", |
|
|
|
|
|
"#657292", |
|
|
|
|
|
"#7A6A99", |
|
|
|
|
|
"#BF5D52", |
|
|
|
|
|
"#EE6666", |
|
|
|
|
|
"#77B7E4", |
|
|
|
|
|
"#E6A065", |
|
|
|
|
|
"#9D5139", |
|
|
|
|
|
"#C1AA88", |
|
|
|
|
|
"#F87F7A", |
|
|
|
|
|
"#F6CF74", |
|
|
|
|
|
"#7F5506", |
|
|
|
|
|
"#88BB9B", |
|
|
|
|
|
"#6E99AA", |
|
|
|
|
|
"#5789D0", |
|
|
|
|
|
], |
|
|
tooltip: { |
|
|
tooltip: { |
|
|
trigger: "axis", |
|
|
trigger: "axis", |
|
|
}, |
|
|
}, |
|
@@ -1551,14 +1607,29 @@ export default { |
|
|
let obj = { |
|
|
let obj = { |
|
|
startDate: this.page.openTime, |
|
|
startDate: this.page.openTime, |
|
|
endDate: this.page.closeTime, |
|
|
endDate: this.page.closeTime, |
|
|
agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : null, |
|
|
|
|
|
orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : null, |
|
|
|
|
|
houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : null, |
|
|
|
|
|
|
|
|
agentId: |
|
|
|
|
|
localStorage.getItem("orgType") == 1 |
|
|
|
|
|
? localStorage.getItem("agentId") |
|
|
|
|
|
: this.selValue == 0 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
orgCode: |
|
|
|
|
|
localStorage.getItem("orgType") == 2 |
|
|
|
|
|
? localStorage.getItem("orgCode") |
|
|
|
|
|
: this.selValue == 1 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
houseId: |
|
|
|
|
|
localStorage.getItem("orgType") == 3 |
|
|
|
|
|
? localStorage.getItem("houseId") |
|
|
|
|
|
: this.selValue == 2 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
timeType: this.timeType, |
|
|
timeType: this.timeType, |
|
|
contrastStartDate: this.selectTime, |
|
|
contrastStartDate: this.selectTime, |
|
|
contrastEndDate: this.selectTime1, |
|
|
contrastEndDate: this.selectTime1, |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
queryOrgType:this.selValue/1+1, |
|
|
|
|
|
|
|
|
queryOrgType: this.selValue / 1 + 1, |
|
|
houseTypes: this.houseTypes, |
|
|
houseTypes: this.houseTypes, |
|
|
}; |
|
|
}; |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
@@ -1619,7 +1690,7 @@ export default { |
|
|
var myChart = echarts.init(document.getElementById("mane")); |
|
|
var myChart = echarts.init(document.getElementById("mane")); |
|
|
var myChart1 = echarts.init(document.getElementById("mane2")); |
|
|
var myChart1 = echarts.init(document.getElementById("mane2")); |
|
|
var option = { |
|
|
var option = { |
|
|
color: [ |
|
|
|
|
|
|
|
|
color: [ |
|
|
"#66AFF5", |
|
|
"#66AFF5", |
|
|
"#FABD2B", |
|
|
"#FABD2B", |
|
|
"#6F8EDC", |
|
|
"#6F8EDC", |
|
@@ -1660,7 +1731,7 @@ export default { |
|
|
], |
|
|
], |
|
|
}; |
|
|
}; |
|
|
var option1 = { |
|
|
var option1 = { |
|
|
color: [ |
|
|
|
|
|
|
|
|
color: [ |
|
|
"#66AFF5", |
|
|
"#66AFF5", |
|
|
"#FABD2B", |
|
|
"#FABD2B", |
|
|
"#6F8EDC", |
|
|
"#6F8EDC", |
|
@@ -1714,12 +1785,27 @@ export default { |
|
|
pageSize: this.page.pageSize, |
|
|
pageSize: this.page.pageSize, |
|
|
startDate: this.page.openTime, |
|
|
startDate: this.page.openTime, |
|
|
endDate: this.page.closeTime, |
|
|
endDate: this.page.closeTime, |
|
|
agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : null, |
|
|
|
|
|
orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : null, |
|
|
|
|
|
houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : null, |
|
|
|
|
|
|
|
|
agentId: |
|
|
|
|
|
localStorage.getItem("orgType") == 1 |
|
|
|
|
|
? localStorage.getItem("agentId") |
|
|
|
|
|
: this.selValue == 0 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
orgCode: |
|
|
|
|
|
localStorage.getItem("orgType") == 2 |
|
|
|
|
|
? localStorage.getItem("orgCode") |
|
|
|
|
|
: this.selValue == 1 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
|
|
|
houseId: |
|
|
|
|
|
localStorage.getItem("orgType") == 3 |
|
|
|
|
|
? localStorage.getItem("houseId") |
|
|
|
|
|
: this.selValue == 2 |
|
|
|
|
|
? this.houseId |
|
|
|
|
|
: null, |
|
|
timeType: this.timeType, |
|
|
timeType: this.timeType, |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
orgType: localStorage.getItem("orgType"), |
|
|
queryOrgType:this.selValue/1+1, |
|
|
|
|
|
|
|
|
queryOrgType: this.selValue / 1 + 1, |
|
|
houseTypes: this.houseTypes, |
|
|
houseTypes: this.houseTypes, |
|
|
}; |
|
|
}; |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType); |
|
|