diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/DialogCalendar.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/DialogCalendar.vue index dca5ce33..6f9b33b3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/DialogCalendar.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/DialogCalendar.vue @@ -1,11 +1,11 @@ -
@@ -35,9 +35,19 @@ export default { }, watch: { mon: { - handler(newValue, oldValue) { + handler (val, oldVal) { + if ( + val && + moment(val).toDate() < moment(oldVal).startOf("month").toDate() + ) { this.getData(); - }, + } else if ( + val && + moment(val).toDate() > moment(oldVal).endOf("month").toDate() + ) { + this.getData(); + } + }, deep: true, } }, @@ -70,9 +80,18 @@ export default { diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index dc46ec67..7ce00f5e 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -38,14 +38,14 @@ module.exports = { [process.env.VUE_APP_BASE_API]: { // target: `http://127.0.0.1:8087`, // target:`http://localhost:3001`, - target:`http://10.0.111.11:8097`, // target:`http://10.0.111.11:8097`, - // target: `http://10.168.66.196:8087`, //刘文阁 + // target:`http://10.0.111.11:8097`, + target: `http://10.168.66.196:8087`, //刘文阁 // target: `http://10.168.68.42:8087`, //王思祥 // target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟凡峰 // target: `http://10.168.79.46:8089`, //王家宝 - target: `http://10.168.77.128:8087`, //王兴琳 + // target: `http://10.168.77.128:8087`, //王兴琳 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",