diff --git a/src/views/active/activity.vue b/src/views/active/activity.vue
index a653924..2625a3c 100644
--- a/src/views/active/activity.vue
+++ b/src/views/active/activity.vue
@@ -16,7 +16,7 @@
-
+
@@ -343,7 +343,7 @@
title: "截止时间",
type: "string",
align: "center",
- width: 160
+ width: 220
},
{
field: "status",
diff --git a/src/views/report/activeRpt.vue b/src/views/report/activeRpt.vue
index 7c26329..5d64593 100644
--- a/src/views/report/activeRpt.vue
+++ b/src/views/report/activeRpt.vue
@@ -31,6 +31,10 @@
+
+
+
+
diff --git a/src/views/report/parkRpt.vue b/src/views/report/parkRpt.vue
index 93882e9..0e392e5 100644
--- a/src/views/report/parkRpt.vue
+++ b/src/views/report/parkRpt.vue
@@ -31,6 +31,10 @@
+
+
+
+
diff --git a/src/views/report/visit/ageRpt.vue b/src/views/report/visit/ageRpt.vue
index b170f27..bf845d0 100644
--- a/src/views/report/visit/ageRpt.vue
+++ b/src/views/report/visit/ageRpt.vue
@@ -32,6 +32,10 @@
+
+
+
+
diff --git a/src/views/report/visit/infoRpt.vue b/src/views/report/visit/infoRpt.vue
index f4a4a71..437f8c2 100644
--- a/src/views/report/visit/infoRpt.vue
+++ b/src/views/report/visit/infoRpt.vue
@@ -32,6 +32,10 @@
+
+
+
+
diff --git a/src/views/report/visit/monthRpt.vue b/src/views/report/visit/monthRpt.vue
index ea2fdab..73840a0 100644
--- a/src/views/report/visit/monthRpt.vue
+++ b/src/views/report/visit/monthRpt.vue
@@ -31,6 +31,10 @@
+
+
+
+
diff --git a/src/views/report/visit/periodRpt.vue b/src/views/report/visit/periodRpt.vue
index 372ee54..9f493cf 100644
--- a/src/views/report/visit/periodRpt.vue
+++ b/src/views/report/visit/periodRpt.vue
@@ -31,6 +31,10 @@
+
+
+
+
diff --git a/src/views/report/visit/seasonRpt.vue b/src/views/report/visit/seasonRpt.vue
index aaaa2ee..162f920 100644
--- a/src/views/report/visit/seasonRpt.vue
+++ b/src/views/report/visit/seasonRpt.vue
@@ -31,6 +31,10 @@
+
+
+
+
@@ -147,6 +151,8 @@
datelist:m.value,
plan_total:res[m.id].plan_total,
use_total:res[m.id].use_total,
+ cancel_total:res[m.id].cancel_total,
+ expire_total:res[m.id].expire_total,
per:res[m.id].per
})
}
diff --git a/src/views/report/visit/sexRpt.vue b/src/views/report/visit/sexRpt.vue
index 669665b..1d2ee46 100644
--- a/src/views/report/visit/sexRpt.vue
+++ b/src/views/report/visit/sexRpt.vue
@@ -28,7 +28,13 @@
+
+
+
+
+
+
diff --git a/src/views/report/visit/timeRpt.vue b/src/views/report/visit/timeRpt.vue
index 7627370..c981b44 100644
--- a/src/views/report/visit/timeRpt.vue
+++ b/src/views/report/visit/timeRpt.vue
@@ -11,7 +11,7 @@
-
+
@@ -25,6 +25,10 @@
+
+
+
+
@@ -145,6 +149,8 @@
datelist:m.value,
plan_total:res[m.id].plan_total,
use_total:res[m.id].use_total,
+ cancel_total:res[m.id].cancel_total,
+ expire_total:res[m.id].expire_total,
per:res[m.id].per
})
}
diff --git a/src/views/resource/addressinfo.vue b/src/views/resource/addressinfo.vue
index 437c67f..2b250ae 100644
--- a/src/views/resource/addressinfo.vue
+++ b/src/views/resource/addressinfo.vue
@@ -8,7 +8,7 @@
-
+
diff --git a/src/views/resource/notice.vue b/src/views/resource/notice.vue
index bad4b55..3628c34 100644
--- a/src/views/resource/notice.vue
+++ b/src/views/resource/notice.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/src/views/resource/parkrule.vue b/src/views/resource/parkrule.vue
index 8c4ccbc..d23e6a3 100644
--- a/src/views/resource/parkrule.vue
+++ b/src/views/resource/parkrule.vue
@@ -8,7 +8,7 @@
-
+
diff --git a/src/views/resource/visit/complaint.vue b/src/views/resource/visit/complaint.vue
index 15f0452..3bc4d91 100644
--- a/src/views/resource/visit/complaint.vue
+++ b/src/views/resource/visit/complaint.vue
@@ -7,7 +7,7 @@
-
+
@@ -75,7 +75,7 @@
clientHeight: 0,
//查询条件字段
searchFields: {
- KeyWord: ""
+ keyword: ""
},
paginations: {
page: 1,
@@ -128,7 +128,8 @@
listtip({
page: this.paginations.page,
page_size: this.paginations.page_size,
- name: this.searchFields.name
+ name: this.searchFields.name,
+ ...this.searchFields
}).then(res => {
this.tableData = res.data;
this.paginations.total = res.total
diff --git a/src/views/resource/visitresource.vue b/src/views/resource/visitresource.vue
index b4afc23..4bdffc1 100644
--- a/src/views/resource/visitresource.vue
+++ b/src/views/resource/visitresource.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/src/views/resource/visitspecial.vue b/src/views/resource/visitspecial.vue
index 3bbf8ec..2a1923f 100644
--- a/src/views/resource/visitspecial.vue
+++ b/src/views/resource/visitspecial.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/vue.config.js b/vue.config.js
index 761f3c9..2c8688f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,9 +46,9 @@ module.exports = {
//before: require('./mock/mock-server.js'),
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: 'https://leyiyuyue.szgmbwg.org.cn/',
+ //target: 'https://leyiyuyue.szgmbwg.org.cn/',
// target: 'https://dangxingjiaoyujidi.langye.net/',
- // target: 'http://leyitest.ali251.langye.net/',
+ target: 'http://leyitest.ali251.langye.net/',
changeOrigin: true, //配置跨域
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''