diff --git a/.env.chengyang-prod b/.env.chengyang-prod new file mode 100644 index 000000000..d6f2ffe8d --- /dev/null +++ b/.env.chengyang-prod @@ -0,0 +1,6 @@ +NODE_ENV=production +# VUE_APP_API_SERVER = http://120.27.18.76/api +VUE_APP_API_SERVER = http://10.60.156.4/api +VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route +VUE_APP_NODE_ENV=preview +VUE_APP_PUBLIC_PATH=epmet-work-pc \ No newline at end of file diff --git a/.env.dongming-prod b/.env.dongming-prod new file mode 100644 index 000000000..54a85611d --- /dev/null +++ b/.env.dongming-prod @@ -0,0 +1,6 @@ +NODE_ENV=production +# VUE_APP_API_SERVER = http://120.27.18.76/api +VUE_APP_API_SERVER = https://epmet-dongming.elinkservice.cn/api +VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route +VUE_APP_NODE_ENV=preview +VUE_APP_PUBLIC_PATH=epmet-work-pc \ No newline at end of file diff --git a/.env.production.sit b/.env.production.sit index 93172b43e..3b2567d35 100644 --- a/.env.production.sit +++ b/.env.production.sit @@ -1,6 +1,6 @@ NODE_ENV=production # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api -VUE_APP_API_SERVER = http://219.146.91.110:30801/api +VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = http://192.168.1.60:8080/api VUE_APP_BIPASS_API_SERVER = http://dcommunity-dev.elinkservice.cn:30801/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=prod:sit diff --git a/package.json b/package.json index a85b0da9e..42a7a8716 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,8 @@ "build:uat": "vue-cli-service build --mode production.uat", "build:development": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode development", "build:preview": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode preview", + "build:chengyang-prod": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode chengyang-prod", + "build:dongming-prod": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode dongming-prod", "build:prod": "vue-cli-service build --mode production", "build:test": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode test", "build:shibei_prod": "vue-cli-service build --mode shibei_production", diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 38343d3df..6138264bb 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -565,11 +565,12 @@ export default { _obj.agencyId = agencyId[agencyId.length - 1]; }else if(agencyId){ _obj.agencyId = agencyId; - }else{ + } else { _obj.agencyId = ""; } _obj.level = level || ""; _obj.orgType = level || ""; + _obj = { ...this.searchAgencyObj , ..._obj}; if (type) { this.currentPage = 1; } diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue index fcf968399..803884c68 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue @@ -294,7 +294,7 @@ export default { }, mounted() { this.user = this.$store.state.user; - if (this.eventId) { + if (this.eventId) {// this.info = JSON.parse(JSON.stringify(this.eventDetailData)); if(this.info.gridId){ this.$emit("handelCLickGridId", this.info.gridId);