From 191ca7d774d9993c020037297c4a9730cf143625 Mon Sep 17 00:00:00 2001 From: woody Date: Thu, 15 May 2025 16:21:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(waterPv):=20=E6=B3=A8=E6=B0=B4?= =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E5=8F=AA=E4=BF=9D=E7=95=99=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=90=8E=E5=B7=A6=E5=8F=B3=E5=8C=BA=E4=B8=9A=E7=BB=A9=E7=BB=93?= =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../information/specialBusiness/waterPv.vue | 105 +----------------- vue.config.js | 2 +- 2 files changed, 6 insertions(+), 101 deletions(-) diff --git a/src/views/information/specialBusiness/waterPv.vue b/src/views/information/specialBusiness/waterPv.vue index 98af2f8..13d3095 100644 --- a/src/views/information/specialBusiness/waterPv.vue +++ b/src/views/information/specialBusiness/waterPv.vue @@ -660,126 +660,31 @@ export default { text: '全选', checked: true }, - { - id: 21, - text: `${'变更后左区真实业绩'}(${isOther()})`, - checked: true, - prop: 'asumRealModifyPv' - }, - { - id: 22, - text: `${'变更后右区真实业绩'}(${isOther()})`, - checked: true, - prop: 'bsumRealModifyPv' - }, { id: 23, - text: `${'变更后左区首购业绩'}(${isOther()})`, + text: `${'变更后左区业绩'}(${isOther()})`, checked: true, prop: 'afirstModifyPv' }, { id: 24, - text: `${'变更后右区首购业绩'}(${isOther()})`, + text: `${'变更后右区业绩'}(${isOther()})`, checked: true, prop: 'bfirstModifyPv' }, { id: 25, - text: `${'变更后左区首购结余'}`, + text: `${'变更后左区结余'}`, checked: true, prop: 'repAFirstModifyBalance' }, { id: 26, - text: `${'变更后右区首购结余'}`, + text: `${'变更后右区结余'}`, checked: true, prop: 'repBFirstModifyBalance' - }, - { - id: 27, - text: `${'变更后左区复购业绩'}(${isOther()})`, - checked: true, - prop: 'repAModifySumPv' - }, - { - id: 28, - text: `${'变更后右区复购业绩'}(${isOther()})`, - checked: true, - prop: 'repBModifySumPv' - }, - { - id: 29, - text: `${'变更后左区复购结余'}`, - checked: false, - prop: 'repAModifyBalance' - }, - { - id: 30, - text: `${'变更后右区复购结余'}`, - checked: false, - prop: 'repBModifyBalance' - }, - { - id: 31, - text: `${'变更前左区真实业绩'}(${isOther()})`, - checked: false, - prop: 'asumRealPv' - }, - { - id: 32, - text: `${'变更前右区真实业绩'}(${isOther()})`, - checked: false, - prop: 'bsumRealPv' - }, - { - id: 33, - text: `${'变更前左区首购业绩'}(${isOther()})`, - checked: false, - prop: 'asumPv' - }, - { - id: 34, - text: `${'变更前右区首购业绩'}(${isOther()})`, - checked: false, - prop: 'bsumPv' - }, - { - id: 35, - text: `${'变更前左区首购结余'}`, - checked: false, - prop: 'abalance' - }, - { - id: 36, - text: `${'变更前右区首购结余'}`, - checked: false, - prop: 'bbalance' - }, - { - id: 37, - text: `${'变更前左区复购业绩'}(${isOther()})`, - checked: false, - prop: 'repASumPv' - }, - { - id: 38, - text: `${'变更前右区复购业绩'}(${isOther()})`, - checked: false, - prop: 'repBSumPv' - }, - { - id: 39, - text: `${'变更前左区复购结余'}`, - checked: false, - prop: 'repABalance' - }, - { - id: 40, - text: `${'变更前右区复购结余'}`, - checked: false, - prop: 'repBBalance' } + ], // 表头筛选 headerList: [], errorData: [], diff --git a/vue.config.js b/vue.config.js index 788cbd7..da6df08 100644 --- a/vue.config.js +++ b/vue.config.js @@ -44,7 +44,7 @@ module.exports = { }, proxy: { '/prod-api': { - target: 'http://localhost:8080/', + target: 'http://192.168.0.104:8080', changeOrigin: true, pathRewrite: { '^/prod-api': '' From d2b9b86f2ca0e4260d5ab9d8d5976bf9d9a37148 Mon Sep 17 00:00:00 2001 From: woody Date: Thu, 15 May 2025 16:23:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(waterPv):=20=E6=B3=A8=E6=B0=B4?= =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E5=88=97=E8=A1=A8=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=9A=B6=E5=B1=9E=E4=BD=93=E7=B3=BB=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/information/specialBusiness/waterPv.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/information/specialBusiness/waterPv.vue b/src/views/information/specialBusiness/waterPv.vue index 13d3095..407a596 100644 --- a/src/views/information/specialBusiness/waterPv.vue +++ b/src/views/information/specialBusiness/waterPv.vue @@ -202,6 +202,7 @@ align="center" prop="vertexName" :label="'隶属体系'" + min-width="150px" /> Date: Sat, 24 May 2025 13:24:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(waterPv):=20=E6=B3=A8=E6=B0=B4?= =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../information/specialBusiness/waterPv.vue | 97 ++++++++++++++++++- vue.config.js | 22 ++--- 2 files changed, 107 insertions(+), 12 deletions(-) diff --git a/src/views/information/specialBusiness/waterPv.vue b/src/views/information/specialBusiness/waterPv.vue index 407a596..85fc3ed 100644 --- a/src/views/information/specialBusiness/waterPv.vue +++ b/src/views/information/specialBusiness/waterPv.vue @@ -661,6 +661,18 @@ export default { text: '全选', checked: true }, + // { + // id: 21, + // text: `${'变更后左区真实业绩'}(${isOther()})`, + // checked: true, + // prop: 'asumRealModifyPv' + // }, + // { + // id: 22, + // text: `${'变更后右区真实业绩'}(${isOther()})`, + // checked: true, + // prop: 'bsumRealModifyPv' + // }, { id: 23, text: `${'变更后左区业绩'}(${isOther()})`, @@ -685,7 +697,90 @@ export default { checked: true, prop: 'repBFirstModifyBalance' } - + // { + // id: 27, + // text: `${'变更后左区复购业绩'}(${isOther()})`, + // checked: true, + // prop: 'repAModifySumPv' + // }, + // { + // id: 28, + // text: `${'变更后右区复购业绩'}(${isOther()})`, + // checked: true, + // prop: 'repBModifySumPv' + // }, + // { + // id: 29, + // text: `${'变更后左区复购结余'}`, + // checked: false, + // prop: 'repAModifyBalance' + // }, + // { + // id: 30, + // text: `${'变更后右区复购结余'}`, + // checked: false, + // prop: 'repBModifyBalance' + // } + // { + // id: 31, + // text: `${'变更前左区真实业绩'}(${isOther()})`, + // checked: false, + // prop: 'asumRealPv' + // }, + // { + // id: 32, + // text: `${'变更前右区真实业绩'}(${isOther()})`, + // checked: false, + // prop: 'bsumRealPv' + // }, + // { + // id: 33, + // text: `${'变更前左区业绩'}(${isOther()})`, + // checked: false, + // prop: 'asumPv' + // }, + // { + // id: 34, + // text: `${'变更前右区业绩'}(${isOther()})`, + // checked: false, + // prop: 'bsumPv' + // }, + // { + // id: 35, + // text: `${'变更前左区结余'}`, + // checked: false, + // prop: 'abalance' + // }, + // { + // id: 36, + // text: `${'变更前右区结余'}`, + // checked: false, + // prop: 'bbalance' + // } + // { + // id: 37, + // text: `${'变更前左区复购业绩'}(${isOther()})`, + // checked: false, + // prop: 'repASumPv' + // }, + // { + // id: 38, + // text: `${'变更前右区复购业绩'}(${isOther()})`, + // checked: false, + // prop: 'repBSumPv' + // }, + // { + // id: 39, + // text: `${'变更前左区复购结余'}`, + // checked: false, + // prop: 'repABalance' + // }, + // { + // id: 40, + // text: `${'变更前右区复购结余'}`, + // checked: false, + // prop: 'repBBalance' + // } ], // 表头筛选 headerList: [], errorData: [], diff --git a/vue.config.js b/vue.config.js index da6df08..7308d63 100644 --- a/vue.config.js +++ b/vue.config.js @@ -42,21 +42,21 @@ module.exports = { warnings: false, errors: true }, - proxy: { - '/prod-api': { - target: 'http://192.168.0.104:8080', - changeOrigin: true, - pathRewrite: { - '^/prod-api': '' - } - } - } // proxy: { // '/prod-api': { - // target: 'http://t-mana.beida413.com/', - // changeOrigin: true + // target: 'http://localhost:8080/', + // changeOrigin: true, + // pathRewrite: { + // '^/prod-api': '' + // } // } // } + proxy: { + '/prod-api': { + target: 'http://t-mana.beida413.com/', + changeOrigin: true + } + } // before: require('./mock/mock-server.js') }, configureWebpack: {