Commit 54920a97 authored by lei's avatar lei

add:监测监控历史数据导出、人员定位监测监控图示、统计分析接口

parent 82da31e5
...@@ -50,6 +50,12 @@ ...@@ -50,6 +50,12 @@
</div> </div>
<!-- 中间 --> <!-- 中间 -->
<div class="main-area"> <div class="main-area">
<!--一中、二中。。。-->
<span class="main-example" style="left: 0px; top: 190px">一中</span>
<span class="main-example" style="left: 0px; top: 321px">二中</span>
<span class="main-example" style="left: 0px; top: 446px">三中</span>
<span class="main-example" style="left: 0px; top: 569px">四中</span>
<span class="main-example" style="left: 0px; top: 705px">五中</span>
<!-- 设备点位 --> <!-- 设备点位 -->
<div <div
class="dot" class="dot"
...@@ -1586,6 +1592,14 @@ export default { ...@@ -1586,6 +1592,14 @@ export default {
position: relative; position: relative;
pointer-events: auto; pointer-events: auto;
z-index: 999; z-index: 999;
.main-example {
font-size: 18px;
color: #2ed5ff;
line-height: 36px;
font-weight: bold;
position: absolute;
font-family: "fangsong";
}
.dot { .dot {
width: 42px; width: 42px;
height: 70px; height: 70px;
......
...@@ -100,6 +100,12 @@ ...@@ -100,6 +100,12 @@
<!-- 中间 --> <!-- 中间 -->
<div class="main-area"> <div class="main-area">
<!--一中、二中。。。-->
<span class="main-example" style="left: 499px; top: 374px">一中</span>
<span class="main-example" style="left: 499px; top: 504px">二中</span>
<span class="main-example" style="left: 499px; top: 625px">三中</span>
<span class="main-example" style="left: 499px; top: 756px">四中</span>
<span class="main-example" style="left: 499px; top: 887px">五中</span>
<!-- 人员点位 --> <!-- 人员点位 -->
<div <div
v-for="(subStation, index) in subStationMid" v-for="(subStation, index) in subStationMid"
...@@ -1034,6 +1040,14 @@ export default { ...@@ -1034,6 +1040,14 @@ export default {
background: url("~@/assets/images/screen/bg3.png") no-repeat center; background: url("~@/assets/images/screen/bg3.png") no-repeat center;
background-size: 100%; background-size: 100%;
text-align: center; text-align: center;
.main-example {
font-size: 18px;
color: #2ed5ff;
line-height: 36px;
font-weight: bold;
position: absolute;
font-family: "fangsong";
}
} }
/* 实时分布图区域 */ /* 实时分布图区域 */
...@@ -1387,7 +1401,7 @@ export default { ...@@ -1387,7 +1401,7 @@ export default {
} }
.warp2 { .warp2 {
width: 100%; width: 100%;
max-height: 400px; max-height: 284px;
overflow: hidden; overflow: hidden;
ul { ul {
margin: 0; margin: 0;
......
...@@ -211,19 +211,19 @@ ...@@ -211,19 +211,19 @@
> >
<span <span
class="custom-item-content custom-item-content1" class="custom-item-content custom-item-content1"
v-text="item.name" v-text="item.deviceName"
></span> ></span>
<span <span
class="custom-item-content custom-item-content1" class="custom-item-content custom-item-content1"
v-text="item.per" v-text="item.maintainUserName"
></span> ></span>
<span <span
class="custom-item-content custom-item-content1" class="custom-item-content custom-item-content1"
v-text="item.status" v-text="item.maintainState"
></span> ></span>
<span <span
class="custom-item-content custom-item-content1" class="custom-item-content custom-item-content1"
v-text="item.date" v-text="item.maintainDate"
></span> ></span>
</li> </li>
</ul> </ul>
...@@ -301,50 +301,7 @@ export default { ...@@ -301,50 +301,7 @@ export default {
hoverStop: true, hoverStop: true,
autoPlay: true, autoPlay: true,
}, },
weeklyRepairData: [ weeklyRepairData: [],
{
name: "一中风机一中风机",
per: "张三",
status: "维修中",
date: "2023-01-01",
},
{
name: "一中风机一中风机",
per: "李四",
status: "维修中",
date: "2023-01-01",
},
{
name: "一中风机一中风机",
per: "王五",
status: "维修中",
date: "2023-01-01",
},
{
name: "一中风机一中风机",
per: "赵六",
status: "维修中",
date: "2023-01-01",
},
{
name: "一中风机一中风机",
per: "王二",
status: "维修中",
date: "2023-01-01",
},
{
name: "一中风机一中风机",
per: "王三",
status: "维修中",
date: "2023-01-01",
},
{
name: "一中风机一中风机",
per: "王四",
status: "维修中",
date: "2023-01-01",
},
],
}; };
}, },
created() {}, created() {},
...@@ -390,6 +347,8 @@ export default { ...@@ -390,6 +347,8 @@ export default {
name: `${day}/${month}`, // 修改为 "02/07" 格式 name: `${day}/${month}`, // 修改为 "02/07" 格式
}; };
}); });
this.departmentRankData = response.data.deptMonthCheckCount;
this.weeklyRepairData = response.data.weekDeviceMaintenance;
this.monthlyPowerChart(); this.monthlyPowerChart();
this.monthlyTishengChart(); this.monthlyTishengChart();
this.yearPowerChart(); this.yearPowerChart();
...@@ -1219,7 +1178,7 @@ export default { ...@@ -1219,7 +1178,7 @@ export default {
} }
&.custom-item2 { &.custom-item2 {
display: grid; display: grid;
grid-template-columns: 0.2fr 0.5fr 3fr 0.5fr; grid-template-columns: 0.2fr 1fr 3fr 0.5fr;
text-align: center; text-align: center;
line-height: 36px; line-height: 36px;
.progressbar { .progressbar {
......
...@@ -52,6 +52,14 @@ ...@@ -52,6 +52,14 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
<el-button
icon="el-icon-download"
size="mini"
type="primary"
plain
@click="exportData"
>导出</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -237,6 +245,14 @@ export default { ...@@ -237,6 +245,14 @@ export default {
`2502_${new Date().getTime()}.xlsx` `2502_${new Date().getTime()}.xlsx`
); );
}, },
exportData() {
// window.open(this.baseURL + "/business/history/export");
this.download(
"/business/history/export",
{},
`2502_${new Date().getTime()}.xlsx`
);
},
}, },
}; };
</script> </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment