From ae90134810a34707e39597e2311778180cc77a27 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 13 Oct 2023 20:04:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4icon=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tablecmt/tablecmt.vue | 3 +++ vite.config.js | 17 +++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index ffb1c38b..44df37f3 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -160,6 +160,9 @@ {{ column.label }} + diff --git a/vite.config.js b/vite.config.js index 2df1ebbf..528ccce5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -16,14 +16,15 @@ export default ({ mode, command }) => { // hy // target: 'http://192.168.10.48:8888', // lmy - // target: 'http://192.168.10.123:8889', + // target: 'http://192.168.10.123:8889', // caoge // target: 'http://192.168.10.101:8888', // cyz // target: 'http://192.168.10.75:8777', // tjj - target: 'http://192.168.10.29:13000', - // target: 'http://test.api.huitongys.com', + // target: 'http://192.168.10.29:13000', + target: 'http://test.api.huitongys.com', + // target: 'http://h5uapi.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, @@ -45,16 +46,12 @@ export default ({ mode, command }) => { output: { // 分包 manualChunks(id) { - if (id.includes("node_modules")) { - return id - .toString() - .split("node_modules/")[1] - .split("/")[0] - .toString(); + if (id.includes('node_modules')) { + return id.toString().split('node_modules/')[1].split('/')[0].toString(); } }, }, }, - } + }, }); }; From a76fc033bfdc903d516b0e0589d0e2a953e1cc50 Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Sat, 14 Oct 2023 10:17:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=B6=85=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/pda/basicPda.vue | 30 +++++++++++++++++++ .../warehouse/basicdataWarehouse.vue | 30 ++++++++++--------- vite.config.js | 4 +-- 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/views/basic/pda/basicPda.vue b/src/views/basic/pda/basicPda.vue index 25829dc8..06f60e46 100644 --- a/src/views/basic/pda/basicPda.vue +++ b/src/views/basic/pda/basicPda.vue @@ -38,6 +38,34 @@ 查看 + + + + + + + + + + @@ -316,8 +344,10 @@ export default { }; getList(page.currentPage, page.pageSize, values).then(res => { + console.log(res.data.data.records,'res'); const data = res.data.data; this.page.total = data.total; + console.log(data.total,'sss'); this.data = data.records; this.loading = false; this.selectionClear(); diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue index f6123310..97b1ce76 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue @@ -313,6 +313,9 @@ export default { search: true, multiple: true, span: 12, + expand: true, + maxHeight: '100', + overHidden: true, //表格高度超过多少显示省略 placeholder: '省/市/区', dicUrl: '/blade-system/region/lazy-listAll', checkStrictly: true, @@ -1176,26 +1179,25 @@ export default { } - \ No newline at end of file + diff --git a/vite.config.js b/vite.config.js index 528ccce5..3e6be6d8 100644 --- a/vite.config.js +++ b/vite.config.js @@ -20,10 +20,10 @@ export default ({ mode, command }) => { // caoge // target: 'http://192.168.10.101:8888', // cyz - // target: 'http://192.168.10.75:8777', + target: 'http://192.168.10.75:8777', // tjj // target: 'http://192.168.10.29:13000', - target: 'http://test.api.huitongys.com', + // target: 'http://test.api.huitongys.com', // target: 'http://h5uapi.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), From 191026a0c50bcd0a2041138b51e1637767dfebd3 Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Sun, 15 Oct 2023 09:25:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86css?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=87=8D=E6=9E=84avue=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/basicPda.js | 8 +- src/components/basic-container/main.vue | 4 +- src/components/tablecmt/tablecmt.vue | 2 +- src/css/common.css | 1 - src/router/page/index.js | 16 ++ src/styles/common.scss | 1 - src/views/basic/pda/basicPda.vue | 110 ++++------ .../printTemplate/basicPrintTemplateFrom.vue | 1 - src/views/datadetail/ToolUpdate.vue | 206 ++++++++++++++++++ 9 files changed, 269 insertions(+), 80 deletions(-) create mode 100644 src/views/datadetail/ToolUpdate.vue diff --git a/src/api/basic/basicPda.js b/src/api/basic/basicPda.js index 93bf4fae..101624ee 100644 --- a/src/api/basic/basicPda.js +++ b/src/api/basic/basicPda.js @@ -11,7 +11,13 @@ export const getList = (current, size, params) => { } }) } - +export const $_TableList = (params) => { + return request({ + url: '/api/logpm-basic/pda/list', + method: 'GET', + params, + }); +}; export const getDetail = (id) => { return request({ url: '/api/logpm-basic/pda/detail', diff --git a/src/components/basic-container/main.vue b/src/components/basic-container/main.vue index e98f5201..aa1242bc 100644 --- a/src/components/basic-container/main.vue +++ b/src/components/basic-container/main.vue @@ -34,8 +34,8 @@ export default { diff --git a/src/views/basic/printTemplate/basicPrintTemplateFrom.vue b/src/views/basic/printTemplate/basicPrintTemplateFrom.vue index f501a9e2..a01ebcf2 100644 --- a/src/views/basic/printTemplate/basicPrintTemplateFrom.vue +++ b/src/views/basic/printTemplate/basicPrintTemplateFrom.vue @@ -430,7 +430,6 @@ export default { flex: 1; overflow-y: auto; overflow-x: hidden; - margin-bottom: 10px; background-color: white; } diff --git a/src/views/datadetail/ToolUpdate.vue b/src/views/datadetail/ToolUpdate.vue new file mode 100644 index 00000000..1a17f904 --- /dev/null +++ b/src/views/datadetail/ToolUpdate.vue @@ -0,0 +1,206 @@ + + + + + \ No newline at end of file