From 77aab033bca84f1f4ed186689644e4c72b57d7fc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 02 十一月 2023 16:15:00 +0800
Subject: [PATCH] 1.递交
---
src/views/reportManager/personSalaryList.vue | 4 ++--
vue.config.js | 4 ++--
src/views/reportManager/groupSalaryList.vue | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/reportManager/groupSalaryList.vue b/src/views/reportManager/groupSalaryList.vue
index 24aa029..f9fbfae 100644
--- a/src/views/reportManager/groupSalaryList.vue
+++ b/src/views/reportManager/groupSalaryList.vue
@@ -662,7 +662,7 @@
const sums = []
columns.forEach((column, index) => {
- if (index === 10) {
+ if (index === 12) {
sums[index] = '鎬讳环'
return
}
diff --git a/src/views/reportManager/personSalaryList.vue b/src/views/reportManager/personSalaryList.vue
index 4cf701a..6ccdfbc 100644
--- a/src/views/reportManager/personSalaryList.vue
+++ b/src/views/reportManager/personSalaryList.vue
@@ -635,7 +635,7 @@
const { columns, data } = param
const sums = []
- const i = this.form.compute === 'last' ? 11 : 10
+ const i = this.form.compute === 'last' ? 13 : 12
columns.forEach((column, index) => {
if (index === i) {
@@ -785,7 +785,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 255
+ this.tableHeight = this.mainHeight - 245
this.$refs.tableDataRef.doLayout()
this.$refs.tableDataRef2.doLayout()
})
diff --git a/vue.config.js b/vue.config.js
index e579143..faa8fdd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,8 +52,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- // target: 'http://121.196.36.24:8017', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- target: 'http://192.168.94.59:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�
+ target: 'http://121.196.36.24:8017', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
+ // target: 'http://192.168.94.59:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3