diff --git a/.env.development b/.env.development index 2bec093..a9f1c2e 100644 --- a/.env.development +++ b/.env.development @@ -5,4 +5,4 @@ ENV = 'development' VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net' -#VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net' +#VUE_APP_BASE_API = ' https://gbyuyue.szgmbwg.org.cn' diff --git a/.env.production b/.env.production index 9a8f863..3605b1d 100644 --- a/.env.production +++ b/.env.production @@ -4,4 +4,4 @@ ENV = 'production' # base api #VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net' -VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net' +VUE_APP_BASE_API = 'https://gbyuyue.szgmbwg.org.cn' diff --git a/src/utils/request.js b/src/utils/request.js index 280253e..bdb6177 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,12 +7,19 @@ import store from '@/store' import { getToken } from '@/utils/auth' - -// create an axios instance -const service = axios.create({ - baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url - // withCredentials: true, // send cookies when cross-domain requests - timeout: 50000 // request timeout + + +let baseUrl = '' +if(window.location.origin.indexOf('localhost')>-1){ + baseUrl = process.env.VUE_APP_BASE_API +}else{ + baseUrl = window.location.origin + '/' +} +const service = axios.create({ + baseURL: baseUrl, // url = base url + request url + // withCredentials: true, // send cookies when cross-domain requests + timeout: 50000, // request timeout + // isLoading:true }) // request interceptor diff --git a/src/views/exhibit/component/addExhibit.vue b/src/views/exhibit/component/addExhibit.vue index af257ba..a14b386 100644 --- a/src/views/exhibit/component/addExhibit.vue +++ b/src/views/exhibit/component/addExhibit.vue @@ -91,9 +91,11 @@ 结束时间：
- + +
diff --git a/src/views/exhibit/index.vue b/src/views/exhibit/index.vue index 3da6420..a4da7cd 100644 --- a/src/views/exhibit/index.vue +++ b/src/views/exhibit/index.vue @@ -157,7 +157,7 @@ export default { const res = await index({ page_size:this.select.pageSize, page:this.select.pageIndex, - title:this.select.name, + name:this.select.name, sort_name:'state', sort_name_tow:'release_time', sort_type:"DESC", diff --git a/src/views/report/activeRpt.vue b/src/views/report/activeRpt.vue index 6ae145d..856e5eb 100644 --- a/src/views/report/activeRpt.vue +++ b/src/views/report/activeRpt.vue @@ -7,14 +7,14 @@
- - + -->
diff --git a/src/views/report/visit/ageRpt.vue b/src/views/report/visit/ageRpt.vue index bf845d0..4fe472a 100644 --- a/src/views/report/visit/ageRpt.vue +++ b/src/views/report/visit/ageRpt.vue @@ -10,6 +10,8 @@ @@ -66,10 +68,10 @@ }, mounted() {}, data() { - return { - daterange:"", + return { showData: false, - searchFields: {}, + daterange:[], + select: {}, tableData: [], tableHeight: 0, btnText:"数据展示", @@ -109,11 +111,23 @@ let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20; that.tableHeight = tableHeight; that.chartHeight = that.tableHeight + "px" + }, + dateChange(e){ + if(e){ + this.select.start_date = e[0] + this.select.end_date = e[1] + }else{ + this.select.start_date = '' + this.select.end_date = '' + } }, load() { // this.showData = true; var arr = []; - ageRpt().then((res) => { + ageRpt({ + start_date:this.select.start_date, + end_date:this.select.end_date + }).then((res) => { for (var m of res) { m.per = ((m.use_total / (m.plan_total == 0 ? 1 : m.plan_total)) * 100).toFixed(2) + "%" diff --git a/src/views/report/visit/infoRpt.vue b/src/views/report/visit/infoRpt.vue index 437f8c2..8d141b9 100644 --- a/src/views/report/visit/infoRpt.vue +++ b/src/views/report/visit/infoRpt.vue @@ -10,6 +10,8 @@ @@ -18,7 +20,7 @@ - + @@ -68,8 +70,8 @@ data() { return { showData: false, - daterange:"", - searchFields: {}, + daterange:[], + select: {}, tableData: [], tableHeight: 0, chartHeight:"", @@ -112,13 +114,25 @@ that.tableHeight = tableHeight; that.chartHeight = tableHeight+"px" + }, + dateChange(e){ + if(e){ + this.select.start_date = e[0] + this.select.end_date = e[1] + }else{ + this.select.start_date = '' + this.select.end_date = '' + } }, load() { // this.showData = true; var xarr = []; var planarr=[]; var usearr=[]; - visitdetailRpt().then((res) => { + visitdetailRpt({ + start_date:this.select.start_date, + end_date:this.select.end_date + }).then((res) => { for (var m of res) { m.per = ((m.use_total / (m.plan_total == 0 ? 1 : m.plan_total)) * 100).toFixed(2) + "%" xarr.push(m.date); diff --git a/src/views/report/visit/seasonRpt.vue b/src/views/report/visit/seasonRpt.vue index 162f920..ebc0e29 100644 --- a/src/views/report/visit/seasonRpt.vue +++ b/src/views/report/visit/seasonRpt.vue @@ -7,14 +7,14 @@
- - + --> diff --git a/src/views/report/visit/timeRpt.vue b/src/views/report/visit/timeRpt.vue index c981b44..e6bcc48 100644 --- a/src/views/report/visit/timeRpt.vue +++ b/src/views/report/visit/timeRpt.vue @@ -8,7 +8,7 @@
- + diff --git a/src/views/resource/visit/complaint.vue b/src/views/resource/visit/complaint.vue index 85b9f9d..550240f 100644 --- a/src/views/resource/visit/complaint.vue +++ b/src/views/resource/visit/complaint.vue @@ -251,7 +251,8 @@ resetForm(formName) { var that = this; this.$refs[formName].resetFields(); - that.dialogFormVisible = false; + that.dialogFormVisible = false; + that.dialogFormEditVisible = false }, handleCurrentChange(page) { this.paginations.page = page; diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue index 70b8f5e..a43aa53 100644 --- a/src/views/system/menu.vue +++ b/src/views/system/menu.vue @@ -7,8 +7,8 @@
- - +
diff --git a/src/views/system/role.vue b/src/views/system/role.vue index 16aba68..7900482 100644 --- a/src/views/system/role.vue +++ b/src/views/system/role.vue @@ -7,8 +7,8 @@
- - +
diff --git a/src/views/system/user.vue b/src/views/system/user.vue index c19fd26..62b4021 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -7,8 +7,8 @@
- - +
@@ -143,7 +143,7 @@ tableHeight: 0, //查询条件字段 searchFields: { - KeyWord: "" + keyword: "" }, tableData: [] }