Browse Source

Merge branch 'prod' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into prod

shibei_master
dai 4 years ago
parent
commit
020e132014
  1. 2
      .env.production.uat
  2. 2
      public/index.html
  3. 11
      src/views/modules/communityParty/regionalParty/activitys.vue

2
.env.production.uat

@ -1,4 +1,4 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
VUE_APP_NODE_ENV=prod:uat VUE_APP_NODE_ENV=prod:uat
VUE_APP_PUBLIC_PATH=epmet-oper VUE_APP_PUBLIC_PATH=epmet-oper

2
public/index.html

@ -57,7 +57,7 @@
<!-- 验收测试环境 aliyun --> <!-- 验收测试环境 aliyun -->
<% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %> <% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api' window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
</script> </script>
<% } %> <% } %>
<!-- 生产环境 --> <!-- 生产环境 -->

11
src/views/modules/communityParty/regionalParty/activitys.vue

@ -99,6 +99,7 @@
size="small" size="small"
type="red">导入</el-button> type="red">导入</el-button>
</el-upload> --> </el-upload> -->
</div> </div>
@ -469,14 +470,14 @@ export default {
// //
async handleExport () { async handleExport () {
let title = '联建活动列表' let title = '联建活动列表'
const url = "/heart/icpartyactivity/export" const url = "/heart/icpartyactivity/export"
let params = { let params = {
ownerName: this.ownerName, agencyId: this.agencyId,
ownerPhone: this.ownerPhone,
level: this.agencyObj.level, ...this.formData
id: this.agencyObj.id
} }
app.ajax.exportFilePost( app.ajax.exportFilePost(

Loading…
Cancel
Save