From a944f9e41effdbab16addf349b2de4838c36f0bb Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 13 Apr 2021 14:41:40 +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 | 22 +++++++
src/views/animalHeat/animalHeat.vue | 24 +++++++-
src/views/healthcode/healthcode.vue | 25 +++++++-
src/views/security/security.vue | 21 ++++++
src/views/parcel/parcel.vue | 19 ++++++
6 files changed, 124 insertions(+), 7 deletions(-)
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index ce28534..5ec1f5c 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -23,21 +23,29 @@
<template slot="menuLeft">
<el-button
v-bind:class="activeClass == 0 ? 'btn-color' : ''"
- size="medium "
+ size="small "
@click="getAnimalData(0)"
>本日
</el-button>
<el-button
v-bind:class="activeClass == 1 ? 'btn-color' : ''"
- size="medium "
+ size="small "
@click="getAnimalData(1)"
>本周
</el-button>
<el-button
v-bind:class="activeClass == 2 ? 'btn-color' : ''"
- size="medium "
+ size="small "
@click="getAnimalData(2)"
>本月
+ </el-button>
+ </template>
+ <template slot="menuLeft">
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExport">导出
</el-button>
</template>
</avue-crud>
@@ -229,6 +237,16 @@
}
return '';
},
+ //数据导出
+ handleExport() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ 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}`);
+ });
+ },
//修改行颜色
rowStyle({row, column, rowIndex}){
if(row.status=="1"){
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 1b8f741..472764b 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -23,21 +23,30 @@
<template slot="menuLeft">
<el-button
v-bind:class="activeClass == 0 ? 'btn-color' : ''"
- size="medium "
+ size="small "
@click="getHealthcodeData(0)"
>本日
</el-button>
<el-button
v-bind:class="activeClass == 1 ? 'btn-color' : ''"
- size="medium "
+ size="small "
@click="getHealthcodeData(1)"
>本周
</el-button>
<el-button
v-bind:class="activeClass == 2 ? 'btn-color' : ''"
- size="medium "
+ size="small "
@click="getHealthcodeData(2)"
>本月
+ </el-button>
+ </template>
+
+ <template slot="menuLeft">
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExport">导出
</el-button>
</template>
@@ -279,6 +288,16 @@
this.page.currentPage = 1;
this.onLoad(this.page, params);
},
+ //数据导出
+ handleExport() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ 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}`);
+ });
+ },
onLoad(page, params = {}) {
const { dateTime } = this.query;
let values = {
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 3bad401..50df040 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -33,6 +33,15 @@
</el-button>
</template> -->
+ <template slot="menuLeft">
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExport">导出
+ </el-button>
+ </template>
+
</avue-crud>
<template>
<div>
@@ -277,6 +286,16 @@
}
}
},
+ //数据导出
+ handleExport() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ window.open(`/api/blade-jfpts/parcel/parcel/export-parcel?startTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&decisioDiagramResult=${this.$route.query.decisioDiagramResult}`);
+ });
+ },
onLoad(page, params = {}) {
const { dateTime } = this.query;
let values = {
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 0653231..72af552 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -30,6 +30,14 @@
>查看包裹图片
</el-button>
</template> -->
+ <template slot="menuLeft">
+ <el-button type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExport">导出
+ </el-button>
+ </template>
</avue-crud>
<template>
<div>
@@ -253,6 +261,18 @@
color:"#fe1515"
}
},
+ //数据导出
+ handleExport() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+
+ console.log(this.$route.query.timeDesc,111);
+ 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}`);
+ });
+ },
onLoad(page, params = {}) {
const { dateTime } = this.query;
let values = {
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index f3cbe31..e0e630c 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -71,6 +71,16 @@
</span>
</template>
+ <template slot="menuLeft">
+ <el-button type="warning"
+ size="mini"
+ plain
+ icon="el-icon-download"
+ @click="handleExport">导出
+ </el-button>
+ </template>
+
+
<template slot-scope="{ row }" slot="jtype">
<el-tag
>{{
@@ -502,6 +512,7 @@
type: "datetime",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
+ searchValue:[this.getStartTime(),this.getEndTime()],
searchRange: true,
searchSpan: 5,
hide: true,
@@ -1438,6 +1449,17 @@
Recorder.getPermission().then(() => {});
this.videoConversationReal = true;
},
+ //数据导出
+ handleExport() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ 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}`);
+ });
+ },
+
},
};
</script>
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 65accab..cbda06b 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -62,7 +62,8 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- border: true,
+ border: false,
+ stripe: true,
index: true,
viewBtn: true,
selection: true,
@@ -95,6 +96,23 @@
message: "请输入名称",
trigger: "blur"
}]
+ },
+ {
+ label: "所属部门",
+ prop: "deptName"
+ },
+ {
+ label: "在线状态",
+ prop: "online_status",
+ dicData: [{
+ label: "离线",
+ value: 0
+ },
+ {
+ label: "在线",
+ value: 1
+ },
+ ],
},
{
label: "性别",
@@ -140,6 +158,7 @@
{
label: "创建时间",
prop: "createTime",
+ width:160,
display: false,
rules: [{
required: true,
--
Gitblit v1.9.3