From d79121d8aa8725de35184af87acbc90602fa60b5 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 15 Dec 2023 01:52:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/vite.config.js b/vite.config.js index eacdd94d..e1930ba1 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,24 +12,8 @@ export default ({ mode, command }) => { port: 2888, proxy: { '/api': { - // target: 'http://192.168.10.126:8889', - // hy - // target: 'http://192.168.10.48:13000', - // lmy - // target: 'http://192.168.10.123:8889', - // target: 'http://192.168.10.101:8888', - // 老zyc - // target: 'http://192.168.10.75:8777', - // 新zyc - // target: 'http://192.168.6.116:8777', - - target: 'http://192.168.6.122:8777', - // target: 'http://192.168.6.116:8777', - // tjj - // sst - // target: 'http://192.168.10.94:8888', - // target: 'http://192.168.10.29:13000', - // target: 'http://h5uapi.huitongys.com', + + // target: 'http://test.api.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, From 9bb0f30e8db43c1eb554f30cbc700316a73aca03 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 20 Dec 2023 19:54:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/vite.config.js b/vite.config.js index 1ecee3d4..3d832a12 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,32 +12,7 @@ export default ({ mode, command }) => { port: 2888, proxy: { '/api': { -<<<<<<< HEAD - target: 'http://test.api.huitongys.com', -======= - // target: 'http://192.168.10.126:8889', - // hy - // target: 'http://192.168.10.48:13000', - // lmy - // target: 'http://192.168.10.123:8889', - // target: 'http://192.168.10.101:8888', - // 老zyc - // target: 'http://192.168.10.75:8777', - // 新zyc - // target: 'http://192.168.6.116:8777', - target: 'http://192.168.6.122:8777', - // target: 'http://192.168.10.25:13000', - // target: 'http://192.168.10.57:13000', - // target: 'http://192.168.6.122:8777', - // target: 'http://192.168.6.116:8777', - // tjj - // sst - // target: 'http://192.168.10.94:8888', - // target: 'http://192.168.10.29:13000', - // target: 'http://h5uapi.huitongys.com', - // target: 'http://test.api.huitongys.com', ->>>>>>> dev changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, From 02c01d5a77399eac1338f2de0a6b3f72cefef012 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 21 Dec 2023 11:04:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tablecmt/tablecmt.vue | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 18e858b4..2f6dc893 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -171,13 +171,13 @@ -
+
@@ -479,16 +479,16 @@ function timechange(value, column: TableColumnType) { } const handleSelectionChange = (param: TableDataType[]) => { // 重置数据 - selectCount.value.forEach(item => { - item.value = 0; - }); + // selectCount.value.forEach(item => { + // item.value = 0; + // }); - selectarr.value = param; - selectarr.value.forEach(val => { - selectCount.value.forEach( - item => (item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result) - ); - }); + // selectarr.value = param; + // selectarr.value.forEach(val => { + // selectCount.value.forEach( + // item => (item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result) + // ); + // }); emit('selection', param); }; function inputclear(value, column: TableColumnType) { @@ -528,7 +528,7 @@ const getSummaries = (param: any) => { newarr[index] = null; } }); - selectCount.value = _arr; + // selectCount.value = _arr; // console.log(columns) return newarr; }; From 7bcca25b75bb34fca08c48edbd1e752821343808 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 21 Dec 2023 11:51:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tablecmt/tablecmt.vue | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 2f6dc893..78c6a1df 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -171,13 +171,13 @@ - + @@ -339,10 +339,15 @@ let selectarr = ref([]); /** 设置每行颜色 */ const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => { let sfcheck = false; - selectarr.value.map(item => { - if (item == row) { + selectarr.value.forEach((val, index) => { + if (val == row) { sfcheck = true; } + + selectCount.value.forEach(item => { + if (index === 0) item.value = 0; + item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result; + }); }); if (sfcheck) { return 'table-SelectedRow-bgcolor'; @@ -483,11 +488,12 @@ const handleSelectionChange = (param: TableDataType[]) => { // item.value = 0; // }); - // selectarr.value = param; - // selectarr.value.forEach(val => { - // selectCount.value.forEach( - // item => (item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result) - // ); + selectarr.value = param; + // selectarr.value.forEach((val, index) => { + // selectCount.value.forEach(item => { + // if (index === 0) item.value = 0; + // item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result; + // }); // }); emit('selection', param); }; @@ -528,7 +534,7 @@ const getSummaries = (param: any) => { newarr[index] = null; } }); - // selectCount.value = _arr; + selectCount.value = _arr; // console.log(columns) return newarr; };