From e476ccd1a9f16dd6e832850e21dbda1f4478368c Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 16 Apr 2021 17:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/parcel/parcelKind.vue | 1 +
src/views/policeInformationDistribution/patrolManagement.vue | 4 ++--
src/views/realTimePolice/real.vue | 1 +
vue.config.js | 2 +-
src/views/animalHeat/animalHeat.vue | 4 ++--
src/views/healthcode/healthcode.vue | 1 +
src/views/policeInformationDistribution/policeManagementTeam.vue | 4 ++--
src/views/parcel/parcel.vue | 1 +
8 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index cb1b306..7699961 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -50,7 +50,7 @@
<el-button type="warning"
size="small"
plain
- icon="el-icon-download"
+ icon="el-icon-pie-chart"
@click="handleExportStatis">导出报表
</el-button>
</template>
@@ -264,7 +264,7 @@
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}`);
+ window.open(`/api/blade-jfpts/animalHeat/animalHeat/getAnimalHeatStatis?begTime=${begTime}&endTime=${endTime}&status=${status}&timeDesc=${timeDesc}`);
});
},
//修改行颜色
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 2c4adfb..e003b15 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -49,6 +49,7 @@
@click="handleExport">导出
</el-button>
<el-button type="warning"
+ style="display:none"
size="small"
plain
icon="el-icon-download"
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 0bdd722..bf3ac6f 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -44,6 +44,7 @@
<el-button type="warning"
size="small"
plain
+ style="display:none"
icon="el-icon-download"
@click="handleExportStatis">导出报表
</el-button>
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 91c7892..0d2559d 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -38,6 +38,7 @@
@click="handleExport">导出
</el-button>
<el-button type="warning"
+ style="display:none"
size="small"
plain
icon="el-icon-download"
diff --git a/src/views/policeInformationDistribution/patrolManagement.vue b/src/views/policeInformationDistribution/patrolManagement.vue
index a0419c3..287fb02 100644
--- a/src/views/policeInformationDistribution/patrolManagement.vue
+++ b/src/views/policeInformationDistribution/patrolManagement.vue
@@ -1,5 +1,5 @@
<template>
-<iframe src="/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe>
+<iframe src="https://web.byisf.com/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe>
</template>
<script>
@@ -11,4 +11,4 @@
<style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/policeInformationDistribution/policeManagementTeam.vue b/src/views/policeInformationDistribution/policeManagementTeam.vue
index 9ec8e37..3af82cf 100644
--- a/src/views/policeInformationDistribution/policeManagementTeam.vue
+++ b/src/views/policeInformationDistribution/policeManagementTeam.vue
@@ -1,5 +1,5 @@
<template>
-<iframe src="/map/index.html?openid=APoliceTeam" style="width: 100%;height: 100%" frameborder="0"></iframe>
+<iframe src="https://web.byisf.com/map/index.html?openid=APoliceTeam" style="width: 100%;height: 100%" frameborder="0"></iframe>
</template>
<script>
@@ -11,4 +11,4 @@
<style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 4739f74..aab76df 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -79,6 +79,7 @@
@click="handleExport">导出
</el-button>
<el-button type="warning"
+ style="display:none"
size="small"
plain
icon="el-icon-download"
diff --git a/vue.config.js b/vue.config.js
index 480af14..906b7b2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@
'/api': {
//本地服务接口地址
// target: 'http://localhost:82/',
- target: 'https://web.byisf.com/api/',
+ target: 'https://web.byisf.com/api/',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3