From 4a9106bbf43ae375d1b3a7e08170f4f449975e0a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 15 Apr 2021 10:39:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/parcel/parcelKind.vue | 20 +++++
src/views/realTimePolice/real.vue | 20 +++++
src/views/animalHeat/animalHeat.vue | 20 +++++
src/views/healthcode/healthcode.vue | 26 +++++
src/views/supervisoryConsole/data.vue | 44 ++++++++--
src/api/report/report.js | 34 ++++----
src/api/parcel/parcel.js | 12 +++
src/views/parcel/parcel.vue | 23 +++++
8 files changed, 168 insertions(+), 31 deletions(-)
diff --git a/src/api/parcel/parcel.js b/src/api/parcel/parcel.js
index ac672c8..3a5376a 100644
--- a/src/api/parcel/parcel.js
+++ b/src/api/parcel/parcel.js
@@ -32,4 +32,16 @@
imgUrl
}
})
+}
+
+export const exportParcelStatis = (current, size, params) => {
+ return request({
+ url: '/api/blade-jfpts/parcel/parcel/export-parcelStatis',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
}
\ No newline at end of file
diff --git a/src/api/report/report.js b/src/api/report/report.js
index 19705ff..16b8d6c 100644
--- a/src/api/report/report.js
+++ b/src/api/report/report.js
@@ -1,22 +1,22 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
- return request({
- url: '/api/blade-report/report/rest/list',
- method: 'get',
- params: {
- ...params,
- current,
- size,
- }
- })
+ return request({
+ url: '/api/blade-report/report/rest/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
}
export const remove = (ids) => {
- return request({
- url: '/api/blade-report/report/rest/remove',
- method: 'post',
- params: {
- ids,
- }
- })
-}
+ return request({
+ url: '/api/blade-report/report/rest/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index 5ec1f5c..cb1b306 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -47,6 +47,12 @@
icon="el-icon-download"
@click="handleExport">导出
</el-button>
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExportStatis">导出报表
+ </el-button>
</template>
</avue-crud>
@@ -247,6 +253,20 @@
window.open(`/api/blade-jfpts/animalHeat/animalHeat/export-animalHeat?begTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&status=${this.$route.query.status}&timeDesc=${this.$route.query.timeDesc}`);
});
},
+ //数据报表导出
+ handleExportStatis() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ let begTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
+ let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
+ let status = this.$route.query.status==undefined? '':this.$route.query.status;
+ let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
+ window.open(`http://localhost:8108/ureport/excel?_u=blade-animalHeat.statis.ureport.xml&begTime=${begTime}&endTime=${endTime}&status=${status}&timeDesc=${timeDesc}`);
+ });
+ },
//修改行颜色
rowStyle({row, column, rowIndex}){
if(row.status=="1"){
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 472764b..2c4adfb 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -48,6 +48,12 @@
icon="el-icon-download"
@click="handleExport">导出
</el-button>
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExportStatis">导出报表
+ </el-button>
</template>
</avue-crud>
@@ -133,7 +139,7 @@
{
label: '省份',
prop: 'province',
- search: true,
+ //search: true,
searchSpan: 3,
type: 'select',
props: {
@@ -149,7 +155,7 @@
prop: 'city',
type: 'select',
searchSpan: 3,
- search: true,
+ //search: true,
props: {
label: 'name',
value: 'name'
@@ -160,7 +166,7 @@
{
label: '区县',
searchSpan: 3,
- search: true,
+ //search: true,
prop: 'district',
type: 'select',
props: {
@@ -298,6 +304,20 @@
window.open(`/api/blade-jfpts/healthcode/healthcode/export-healthcode?begTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&type=${this.$route.query.type}&timeDesc=${this.$route.query.timeDesc}`);
});
},
+ //数据报表导出
+ handleExportStatis() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ let begTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
+ let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
+ let type = this.$route.query.type==undefined? '':this.$route.query.type;
+ let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
+ window.open(`http://localhost:8108/ureport/excel?_u=blade-healthcode.statis.xml.ureport.xml&begTime=${begTime}&endTime=${endTime}&type=${type}&timeDesc=${timeDesc}`);
+ });
+ },
onLoad(page, params = {}) {
const { dateTime } = this.query;
let values = {
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 50df040..0bdd722 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -40,6 +40,13 @@
icon="el-icon-download"
@click="handleExport">导出
</el-button>
+
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExportStatis">导出报表
+ </el-button>
</template>
</avue-crud>
@@ -57,7 +64,7 @@
</template>
<script>
- import {getList, getDetail, getParcelPic} from "@/api/parcel/parcel";
+ import {getList,exportParcelStatis, getParcelPic} from "@/api/parcel/parcel";
import {mapGetters} from "vuex";
import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
@@ -296,6 +303,20 @@
window.open(`/api/blade-jfpts/parcel/parcel/export-parcel?startTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&decisioDiagramResult=${this.$route.query.decisioDiagramResult}`);
});
},
+ //数据报表导出
+ handleExportStatis() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ let startTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
+ let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
+ let decisioDiagramResult = this.$route.query.decisioDiagramResult==undefined? '':this.$route.query.decisioDiagramResult;
+ let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
+ window.open(`http://localhost:8108/ureport/excel?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
+ });
+ },
onLoad(page, params = {}) {
const { dateTime } = this.query;
let values = {
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 72af552..91c7892 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -37,6 +37,12 @@
icon="el-icon-download"
@click="handleExport">导出
</el-button>
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExportStatis">导出报表
+ </el-button>
</template>
</avue-crud>
<template>
@@ -273,6 +279,20 @@
window.open(`/api/blade-jfpts/parcel/parcel/export-parcelKind?startTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&decisioDiagramResult=${this.$route.query.decisioDiagramResult}&timeDesc=${this.$route.query.timeDesc}`);
});
},
+ //数据报表导出
+ handleExportStatis() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ let startTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
+ let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
+ let decisioDiagramResult = this.$route.query.decisioDiagramResult==undefined? '':this.$route.query.decisioDiagramResult;
+ let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
+ window.open(`http://localhost:8108/ureport/excel?_u=blade-parcelKind.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
+ });
+ },
onLoad(page, params = {}) {
const { dateTime } = this.query;
let values = {
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index e0e630c..4739f74 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -78,6 +78,12 @@
icon="el-icon-download"
@click="handleExport">导出
</el-button>
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExportStatis">导出报表
+ </el-button>
</template>
@@ -1459,6 +1465,20 @@
window.open(`/api/blade-jfpts/alarm/alarm/export-alarm?beginTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&waringType=${this.$route.query.waringType}&timeDesc=${this.$route.query.timeDesc}`);
});
},
+ //数据报表导出
+ handleExportStatis() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ let beginTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
+ let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
+ let waringType = this.$route.query.waringType==undefined? '':this.$route.query.waringType;
+ let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
+ window.open(`http://localhost:8108/ureport/excel?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`);
+ });
+ }
},
};
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index 9de54ae..593130d 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -108,7 +108,7 @@
</div>
<div class="head-right">
<div class="head-right offset-right">
- <a href="/#/realTimePolice/index">预警分析</a>
+ <a href="/#/alarmManagement/alarmAnalysis">预警分析</a>
</div>
</div>
</div>
@@ -116,10 +116,10 @@
<div class="alarm-bar">
<div class="alarm-bar-title">
<div class="title-left ng-binding">日累计预警事件数</div>
- <div class="title-right week">
- <span class="ng-binding">0</span
- ><span class="ng-binding">1.00</span>
- </div>
+<!-- <div class="title-right week">-->
+<!-- <span class="ng-binding">0</span-->
+<!-- ><span class="ng-binding">1.00</span>-->
+<!-- </div>-->
</div>
<div class="week-alarm-bar" id="day_warn_echarts"></div>
</div>
@@ -129,10 +129,10 @@
<div class="title-left change-flex-alarm ng-binding">
日累计预警设备数
</div>
- <div class="title-right week">
- <span class="ng-binding">0</span
- ><span class="ng-binding">1.00</span>
- </div>
+<!-- <div class="title-right week">-->
+<!-- <span class="ng-binding">0</span-->
+<!-- ><span class="ng-binding">1.00</span>-->
+<!-- </div>-->
</div>
<div class="week-device-line" id="day_equipment_echarts"></div>
</div>
@@ -316,9 +316,12 @@
if (params.name == "正常"){
//跳转在线设备
that.StartEquipment({dxtype:1});
- }else {
+ }else if(params.name == "掉线"){
//跳转离线设备
that.StartEquipment({dxtype:0});
+ }else if(params.name == "故障"){
+ //跳转故障设备
+ that.StartEquipment({dxtype:3});
}
});
@@ -406,6 +409,7 @@
},
drawPillar(data) {
+ var that = this;
var myChart = this.$echarts.init(
document.getElementById("day_warn_echarts")
);
@@ -480,6 +484,19 @@
],
};
myChart.setOption(option);
+ myChart.on('click', function (params) {
+ var data = [];
+ var date=new Date;
+ var y = date.getFullYear()
+ data.push({
+ startTime: y + "-" + params.name+" 00:00:00",
+ endTime:y + "-" + params.name+" 23:59:59",
+ waringType:'紧急求救',
+ })
+ that.handleStartAlarm(data);
+ });
+
+
},
//在线设备分页数据
StartEquipment(data) {
@@ -488,6 +505,13 @@
query: data,
});
},
+ //日累计预警数量跳转
+ handleStartAlarm(data) {
+ this.$router.push({
+ path: `/realTimePolice/index`,
+ query: data[0],
+ });
+ },
},
};
--
Gitblit v1.9.3