diff --git a/device-manager-ui/admin/src/views/Home.vue b/device-manager-ui/admin/src/views/Home.vue
index fbffcd97a53937e1e2744a984de22aa4163cc86f..f883a5cfc0597365976b1040bfc8129d70e919bc 100644
--- a/device-manager-ui/admin/src/views/Home.vue
+++ b/device-manager-ui/admin/src/views/Home.vue
@@ -126,190 +126,7 @@
</p>
</div>
</div>
- <!-- <el-row
- :gutter="20"
- style="height: 80px; align-items: center; margin-top: 10px"
- >
- <el-col :span="3">
- <el-row type="flex" justify="center">
- <span style="font-size: 20px"
- ><b>{{ statData.deviceTotalCount }}</b></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <span style="font-size: 12px"
- ><span style="color: #6182f6">鏄ㄦ棩 </span
- ><span
- v-bind:class="{
- success: statData.deviceAddCount >= 0,
- warn: statData.deviceAddCount < 0,
- }"
- >{{
- statData.deviceAddCount >= 0
- ? "+" + statData.deviceAddCount
- : "-" + statData.deviceAddCount
- }}</span
- ></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <i class="el-icon-mobile customIcon"> 璁惧鎬绘暟</i>
- </el-row>
- </el-col>
- <el-col :span="3">
- <el-row type="flex" justify="center"
- ><span style="font-size: 20px"
- ><b>{{ statData.siteTotalCount }}</b></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <span style="font-size: 12px"
- ><span style="color: #6182f6">鏄ㄦ棩 </span
- ><span
- v-bind:class="{
- success: statData.siteAddCount >= 0,
- warn: statData.siteAddCount < 0,
- }"
- >{{
- statData.siteAddCount >= 0
- ? "+" + statData.siteAddCount
- : "-" + statData.siteAddCount
- }}</span
- ></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <i class="el-icon-place customIcon"> 鐩戞帶绔欑偣鏁�</i>
- </el-row>
- </el-col>
- <el-col :span="3">
- <el-row type="flex" justify="center"
- ><span style="font-size: 20px"
- ><b>{{ statData.deviceOnlineCount }}</b></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <span style="font-size: 12px"
- ><span style="color: #6182f6">涓婄嚎鐜� </span
- ><span
- v-bind:class="{ success: statData.deviceOnlineRatio >= 0 }"
- >{{ statData.deviceOnlineRatio * 100 }}%</span
- ></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <i class="el-icon-data-line customIcon"> 鍦ㄧ嚎璁惧</i>
- </el-row>
- </el-col>
- <el-col :span="3">
- <el-row type="flex" justify="center"
- ><span style="font-size: 20px"
- ><b>{{ statData.deviceOfflineCount }}</b></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <span style="font-size: 12px"
- ><span style="color: #6182f6">绂荤嚎鐜� </span
- ><span v-bind:class="{ warn: statData.deviceOfflineRatio >= 0 }"
- >{{ statData.deviceOfflineRatio * 100 }}%</span
- ></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <i class="el-icon-data-board customIcon"> 绂荤嚎璁惧</i>
- </el-row>
- </el-col>
- <el-col :span="3">
- <el-row type="flex" justify="center"
- ><span style="font-size: 20px"
- ><b>{{ statData.deviceStopRatio }}</b></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <span style="font-size: 12px"
- ><span style="color: #6182f6">鍋滅敤鐜� </span
- ><span v-bind:class="{ warn: statData.deviceStopRatio >= 0 }"
- >{{ statData.deviceStopRatio * 100 }}%</span
- ></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <i class="el-icon-data-board customIcon">鍋滅敤璁惧</i>
- </el-row>
- </el-col>
- <el-col :span="3">
- <el-row type="flex" justify="center"
- ><span style="font-size: 20px"
- ><b>{{ statData.alarmTotalCount }}</b></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <span style="font-size: 12px"
- ><span style="color: #6182f6">鏄ㄦ棩 </span
- ><span
- v-bind:class="{
- success: statData.alarmAddCount >= 0,
- warn: statData.alarmAddCount < 0,
- }"
- >{{
- statData.alarmAddCount >= 0
- ? "+" + statData.alarmAddCount
- : "-" + statData.alarmAddCount
- }}</span
- ></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <i class="el-icon-data-board customIcon"> 浠婃棩鍛婅娆℃暟</i>
- </el-row>
- </el-col>
- <el-col :span="3">
- <el-row type="flex" justify="center"
- ><span style="font-size: 20px"
- ><b>{{ statData.pushTotalCount }}</b></span
- ></el-row
- >
-
- <el-row type="flex" justify="center">
- <span style="font-size: 12px"
- ><span style="color: #6182f6">鏄ㄦ棩 </span
- ><span
- v-bind:class="{
- success: statData.pushAddCount >= 0,
- warn: statData.pushAddCount < 0,
- }"
- >{{
- statData.pushAddCount >= 0
- ? "+" + statData.pushAddCount
- : "-" + statData.pushAddCount
- }}</span
- ></span
- ></el-row
- >
-
- <el-row type="flex" justify="center">
- <i class="el-icon-data-board customIcon"> 浠婃棩娑堟伅鎺ㄩ€�</i>
- </el-row>
- </el-col>
- <el-col :span="3" type="flex" style="height: 100%">
- <el-row type="flex" style="margin-top: 6px" justify="center"
- ><span style="font-size: 13px"
- ><span style="color: #6182f6">浠婃棩涓嬪彂鍛戒护 </span>
- <b>{{ statData.uploadMessageTotalCount }}</b></span
- ></el-row
- >
- <el-row type="flex" style="margin-top: 6px" justify="center"
- ><span style="font-size: 13px"
- ><span style="color: #6182f6">浠婃棩涓嬪彂鍛戒护 </span>
- <b>{{ statData.downloadMessageTotalCount }}</b></span
- ></el-row
- >
- <el-row type="flex" justify="center">
- <i class="el-icon-data-board customIcon"> 鏁版嵁鑾峰彇</i>
- </el-row>
- </el-col>
- </el-row> -->
</el-card>
</el-row>
@@ -319,7 +136,7 @@
<el-card class="box-card">
<div id="deviceTotal" style="width: 100%; height: 300px"></div>
<!-- 澶╂暟閫夋嫨 -->
- <el-select class="change-day" v-model="myEchartsDay" size="mini" placeholder="璇烽€夋嫨">
+ <el-select class="change-day" v-model="myEchartsDay" @change="changeEchartDay(1)" size="mini" placeholder="璇烽€夋嫨">
<el-option label="杩�15澶�" :value="15"> </el-option>
<el-option label="杩�30澶�" :value="30"> </el-option>
</el-select>
@@ -330,7 +147,7 @@
<el-card class="box-card">
<div id="deviceStat" style="width: 100%; height: 300px"></div>
<!-- 澶╂暟閫夋嫨 -->
- <el-select class="change-day" size="mini" placeholder="璇烽€夋嫨" v-model="deviceStatEchartsDay">
+ <el-select class="change-day" size="mini" placeholder="璇烽€夋嫨" @change="changeEchartDay(2)" v-model="deviceStatEchartsDay">
<el-option label="杩�15澶�" :value="15"> </el-option>
<el-option label="杩�30澶�" :value="30"> </el-option>
</el-select>
@@ -345,7 +162,7 @@
<div id="deviceAlarm" style="width: 70%; height: 300px"></div>
<div id="PieEcharts" style="width: 30%; height: 300px"></div>
<!-- 澶╂暟閫夋嫨 -->
- <el-select class="change-day" v-model="deviceAlarmEchartsDay" size="mini" placeholder="璇烽€夋嫨">
+ <el-select class="change-day" v-model="deviceAlarmEchartsDay" @change="changeEchartDay(3)" size="mini" placeholder="璇烽€夋嫨">
<el-option label="杩�15澶�" :value="15"> </el-option>
<el-option label="杩�30澶�" :value="30"> </el-option>
</el-select>
@@ -356,7 +173,7 @@
<el-card class="box-card">
<div id="devicePush" style="width: 100%; height: 300px"></div>
<!-- 澶╂暟閫夋嫨 -->
- <el-select class="change-day" v-model="devicePushEchartsDay" size="mini" placeholder="璇烽€夋嫨">
+ <el-select class="change-day" v-model="devicePushEchartsDay" @change="changeEchartDay(4)" size="mini" placeholder="璇烽€夋嫨">
<el-option label="杩�15澶�" :value="15"> </el-option>
<el-option label="杩�30澶�" :value="30"> </el-option>
</el-select>
@@ -567,6 +384,26 @@ export default {
});
},
+ changeEchartDay(type){
+ let beforeday = new Date(today);
+ if(type==1){
+ beforeday.setDate(beforeday.getDate() - this.myEchartsDay);
+ this.findDeviceTotalStat(beforeday);
+ }
+ if(type==2){
+ beforeday.setDate(beforeday.getDate() - this.myEchartsDay);
+ this.deviceStatEchartsDay(beforeday);
+ }
+ if(type==3){
+ beforeday.setDate(beforeday.getDate() - this.deviceAlarmEchartsDay);
+ this.findDeviceAlarm(beforeday);
+ }
+ if(type==4){
+ beforeday.setDate(beforeday.getDate() - this.devicePushEchartsDay);
+ this.findDevicePush(beforeday);
+ }
+ },
+
// 璁惧鏁版嵁鍥�
myEcharts() {
// 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥