From d74b495736f0c04522ec54274b70fed0ded2878d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 11:30:06 +0800
Subject: [PATCH] 任务新增导出
---
src/views/examination/examination.vue | 6 +++---
vue.config.js | 2 +-
src/views/activitys/real.vue | 12 ++++++------
src/views/activitys/real_xc.vue | 10 +++++-----
src/views/activitys/real_px.vue | 10 +++++-----
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/views/activitys/real.vue b/src/views/activitys/real.vue
index 3d32dce..f638be4 100644
--- a/src/views/activitys/real.vue
+++ b/src/views/activitys/real.vue
@@ -64,7 +64,7 @@
</el-button>
</template> -->
- <!-- <template slot="menuLeft">
+ <template slot="menuLeft">
<el-button
type="warning"
size="mini"
@@ -73,15 +73,15 @@
@click="handleExport"
>导出
</el-button>
- <el-button
+ <!-- <el-button
type="warning"
size="mini"
plain
icon="el-icon-pie-chart"
@click="handleExportStatis"
>导出报表
- </el-button>
- </template> -->
+ </el-button> -->
+ </template>
<template slot-scope="{ row }" slot="jtype">
<el-tag
@@ -1359,13 +1359,13 @@
//数据导出
handleExport() {
- this.$confirm("是否导出实时警情数据?", "提示", {
+ this.$confirm("是否导出任务数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
window.open(
- `/api/alarm/alarm/export-alarm?beginTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&waringType=${this.$route.query.waringType}&timeDesc=${this.$route.query.timeDesc}`
+ `/api/taskqd/export-task?rname=${this.$route.query.rname}&jurisdiction=${this.$route.query.jurisdiction}&rtype=${this.$route.query.rtype}&tasktype=0`
);
});
},
diff --git a/src/views/activitys/real_px.vue b/src/views/activitys/real_px.vue
index 9ea16b4..d0a70ef 100644
--- a/src/views/activitys/real_px.vue
+++ b/src/views/activitys/real_px.vue
@@ -64,7 +64,7 @@
</el-button>
</template> -->
- <!-- <template slot="menuLeft">
+ <template slot="menuLeft">
<el-button
type="warning"
size="mini"
@@ -73,15 +73,15 @@
@click="handleExport"
>导出
</el-button>
- <el-button
+ <!-- <el-button
type="warning"
size="mini"
plain
icon="el-icon-pie-chart"
@click="handleExportStatis"
>导出报表
- </el-button>
- </template> -->
+ </el-button> -->
+ </template>
<template slot-scope="{ row }" slot="jtype">
<el-tag
@@ -1364,7 +1364,7 @@
type: "warning",
}).then(() => {
window.open(
- `/api/alarm/alarm/export-alarm?beginTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&waringType=${this.$route.query.waringType}&timeDesc=${this.$route.query.timeDesc}`
+ `/api/taskqd/export-task?rname=${this.$route.query.rname}&jurisdiction=${this.$route.query.jurisdiction}&rtype=${this.$route.query.rtype}&tasktype=2`
);
});
},
diff --git a/src/views/activitys/real_xc.vue b/src/views/activitys/real_xc.vue
index de61221..4289ec5 100644
--- a/src/views/activitys/real_xc.vue
+++ b/src/views/activitys/real_xc.vue
@@ -64,7 +64,7 @@
</el-button>
</template> -->
- <!-- <template slot="menuLeft">
+ <template slot="menuLeft">
<el-button
type="warning"
size="mini"
@@ -73,15 +73,15 @@
@click="handleExport"
>导出
</el-button>
- <el-button
+ <!-- <el-button
type="warning"
size="mini"
plain
icon="el-icon-pie-chart"
@click="handleExportStatis"
>导出报表
- </el-button>
- </template> -->
+ </el-button> -->
+ </template>
<template slot-scope="{ row }" slot="jtype">
<el-tag
@@ -1338,7 +1338,7 @@
type: "warning",
}).then(() => {
window.open(
- `/api/alarm/alarm/export-alarm?beginTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&waringType=${this.$route.query.waringType}&timeDesc=${this.$route.query.timeDesc}`
+ `/api/taskqd/export-task?rname=${this.$route.query.rname}&jurisdiction=${this.$route.query.jurisdiction}&rtype=${this.$route.query.rtype}&tasktype=1`
);
});
},
diff --git a/src/views/examination/examination.vue b/src/views/examination/examination.vue
index 62baaab..268ea44 100644
--- a/src/views/examination/examination.vue
+++ b/src/views/examination/examination.vue
@@ -28,7 +28,7 @@
</el-button>
</template>
<template slot-scope="{row}" slot="type">
- <el-tag>{{row.type==='0'?'未审核':row.type==='1'?'审核通过':'审核未通过'}}</el-tag>
+ <el-tag>{{row.type==='0'?'未审核':row.type==='1'?'审核通过':'审核不通过'}}</el-tag>
</template>
<template slot-scope="{ row }" slot="examination_type">
@@ -37,7 +37,7 @@
row.examination_type == "0" ? "正常"
:row.examination_type == null? "正常"
:row.examination_type == ""? "正常"
- : "异常"
+ : "审核不通过"
}}
</el-tag>
</template>
@@ -188,7 +188,7 @@
value: "0",
},
{
- label: "异常",
+ label: "审核不通过",
value: "1",
},
],
diff --git a/vue.config.js b/vue.config.js
index f5aa3dc..91d480e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,7 +37,7 @@
proxy: {
'/api': {
//本地服务接口地址
- //target: 'http://106.225.193.35:83/api/',
+ // target: 'http://106.225.193.35:83/api/',
target: 'http://localhost:8383/',
ws: true,
pathRewrite: {
--
Gitblit v1.9.3