Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-04-16 e476ccd1a9f16dd6e832850e21dbda1f4478368c

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 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}`);
        });
      },
      //修改行颜色

 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"

 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>

 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"

 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>
</style>

 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>
</style>

 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"

 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,