From b1dab929657a8d796f4c83f9d7f6ac54cc15c4bf Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Sun, 28 Apr 2024 14:08:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-screen/src/App.vue | 75 +++++++++++++++++++ .../src/components/Pagination/index.vue | 3 +- .../home/fixMaterialAnalysisDialog.vue | 24 ++++-- .../components/home/getMaterialsDialog.vue | 6 +- .../home/inputStoreAnalysisDialog.vue | 6 +- .../src/components/home/inventoryDialog.vue | 6 +- .../home/materialAnalysisDialog.vue | 6 +- .../home/returnMaterialAnalysisDialog.vue | 6 +- .../components/home/returnMaterialsDialog.vue | 6 +- .../components/home/scrapAnalysisDialog.vue | 6 +- 10 files changed, 115 insertions(+), 29 deletions(-) diff --git a/sgzb-screen/src/App.vue b/sgzb-screen/src/App.vue index db667d31..1118af46 100644 --- a/sgzb-screen/src/App.vue +++ b/sgzb-screen/src/App.vue @@ -40,5 +40,80 @@ export default { .el-form-item__label { color: #fff; } + + .el-table th { + // #253855 #30619B 背景色从上到下渐变 + background: linear-gradient(to bottom, #2B313D, #3267A7); + color: #fff; + border-bottom: 1px solid #84FCFD !important; + } + .el-table tr { + background-color: #335684; + color: #fff; + } + .el-table--striped .el-table__body tr.el-table__row--striped td { + background-color: #25447D; + color: #fff; + } + .el-table td,.building-top .el-table th.is-leaf { + border-bottom: 1px solid #6983A5; + } + .el-table::before{ + border-bottom: 1px solid #6983A5; + background-color: #6983A5; + height: 1px; + } + .el-table--enable-row-hover .el-table__body tr:hover>td { + background-color: #6983A5; + } + .el-pagination__total { + color: #E1E3E6; + } + .el-pagination__jump { + color: #E1E3E6; + } + .el-input__inner { + background-color: transparent; + border: 1px solid #77E2E7; + color: #E1E3E6; + } + .el-pagination__sizes .el-input .el-input__inner { + color: #E3E4E7; + border: 1px solid #E3E4E7; + } + .el-pagination__editor.el-input .el-input__inner { + color: #E3E4E7; + border: 1px solid #E3E4E7; + } + .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li { + color: #E3E4E7; + border: 1px solid #E3E4E7; + background-color: transparent; + } + .el-pagination.is-background .btn-next { + color: #E3E4E7; + border: 1px solid #E3E4E7; + background-color: transparent; + } + .el-pagination.is-background .el-pager li:not(.disabled).active { + background-color: #98F4FB; + color: #000; + } + .el-button--primary { + background-color: #84FCFD; + border: #84FCFD; + color: #285050; + } + .el-button--default { + background-color: transparent; + border: 1px solid #84FCFD; + color: #D5D6DA; + } + .el-table__empty-block { + background-color: #335684; + .el-table__empty-text { + color: #D5D6DA; + } + } } diff --git a/sgzb-screen/src/components/Pagination/index.vue b/sgzb-screen/src/components/Pagination/index.vue index 1f991f9d..8472ceea 100644 --- a/sgzb-screen/src/components/Pagination/index.vue +++ b/sgzb-screen/src/components/Pagination/index.vue @@ -11,6 +11,7 @@ v-bind="$attrs" @size-change="handleSizeChange" @current-change="handleCurrentChange" + style="color: #E1E3E6;" /> @@ -106,7 +107,7 @@ export default { \ No newline at end of file diff --git a/sgzb-screen/src/components/home/getMaterialsDialog.vue b/sgzb-screen/src/components/home/getMaterialsDialog.vue index c2607d2e..eaafcc55 100644 --- a/sgzb-screen/src/components/home/getMaterialsDialog.vue +++ b/sgzb-screen/src/components/home/getMaterialsDialog.vue @@ -48,7 +48,7 @@ - + - + diff --git a/sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue b/sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue index 19e5b80d..bf1bd49f 100644 --- a/sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue @@ -25,7 +25,7 @@ - + - + diff --git a/sgzb-screen/src/components/home/inventoryDialog.vue b/sgzb-screen/src/components/home/inventoryDialog.vue index 2aa675ab..1148345c 100644 --- a/sgzb-screen/src/components/home/inventoryDialog.vue +++ b/sgzb-screen/src/components/home/inventoryDialog.vue @@ -25,7 +25,7 @@ - + - + diff --git a/sgzb-screen/src/components/home/materialAnalysisDialog.vue b/sgzb-screen/src/components/home/materialAnalysisDialog.vue index 31701621..c831efa9 100644 --- a/sgzb-screen/src/components/home/materialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/materialAnalysisDialog.vue @@ -39,7 +39,7 @@ - + - + diff --git a/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue b/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue index 2d0429a4..e4b0ef4d 100644 --- a/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue @@ -39,7 +39,7 @@ - + - + diff --git a/sgzb-screen/src/components/home/returnMaterialsDialog.vue b/sgzb-screen/src/components/home/returnMaterialsDialog.vue index ec08ba0f..c41eb5a2 100644 --- a/sgzb-screen/src/components/home/returnMaterialsDialog.vue +++ b/sgzb-screen/src/components/home/returnMaterialsDialog.vue @@ -48,7 +48,7 @@ - + - + diff --git a/sgzb-screen/src/components/home/scrapAnalysisDialog.vue b/sgzb-screen/src/components/home/scrapAnalysisDialog.vue index 927c6807..21a155b2 100644 --- a/sgzb-screen/src/components/home/scrapAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/scrapAnalysisDialog.vue @@ -48,7 +48,7 @@ - + - + From c6e9d286dce92202af9aa3b708bea0ac22cae8be Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Sun, 28 Apr 2024 14:51:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue b/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue index 6c65a89b..c6531dca 100644 --- a/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue @@ -232,7 +232,7 @@ export default { }) if (barData.yAxisData.length > 5) barData.yAxisData = barData.yAxisData.slice(0, 5) - if(barData.seriesData.length > 5) barData.seriesData = barData.seriesData.slice(0, 5) + if (barData.seriesData.length > 5) barData.seriesData = barData.seriesData.slice(0, 5) console.log('🚀 ~ getChart ~ barData:', barData); this.myPieChart(pieData) this.myBarChart(barData) @@ -248,8 +248,6 @@ export default { left: 'left', textStyle: { color: '#fff', - // 背景图片 - backgroundColor: 'url(../../../../assets/img/dialog/Heading.png)' } }, tooltip: { From 8ac830e90a355ca253c28e6df8176d5e7fb2753e Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Sun, 28 Apr 2024 15:43:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/home/fixMaterialAnalysisDialog.vue | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue b/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue index c6531dca..f936b49f 100644 --- a/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue @@ -148,7 +148,7 @@ export default { }, { label: '维修状态', - prop: 'repairStatus', + prop: 'statusName', align: 'center' } ], @@ -224,6 +224,10 @@ export default { if (key === 'num2' && data[key]) pieData.push({ value: data[key], name: '维修合格' }) if (key === 'num3' && data[key]) pieData.push({ value: data[key], name: '维修报废' }) } + pieData.sort((a, b) => { + const order = ['待维修', '维修合格', '维修报废']; + return order.indexOf(a.name) - order.indexOf(b.name); + }); data.accessVoList.forEach(item => { if (item.partName && item.partNum) { barData.yAxisData.push(item.partName) @@ -233,7 +237,6 @@ export default { if (barData.yAxisData.length > 5) barData.yAxisData = barData.yAxisData.slice(0, 5) if (barData.seriesData.length > 5) barData.seriesData = barData.seriesData.slice(0, 5) - console.log('🚀 ~ getChart ~ barData:', barData); this.myPieChart(pieData) this.myBarChart(barData) }, @@ -366,9 +369,6 @@ export default { background-repeat: no-repeat; background-position: 0 10px; padding-left: 10px; - .el-form--inline .el-form-item__label { - color: red; - } .chart { width: 39vw; height: 400px; @@ -378,7 +378,4 @@ export default { margin-left: 60px; } } -.el-form-item__label { - font-size: large !important; -} \ No newline at end of file From a202afc1896dab0a23a76b9725589c51ab39731a Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Sun, 28 Apr 2024 16:15:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/home/fixMaterialAnalysisDialog.vue | 6 +++--- sgzb-screen/src/components/home/getMaterialsDialog.vue | 4 ++-- sgzb-screen/src/components/home/inventoryDialog.vue | 4 ++-- sgzb-screen/src/components/home/materialAnalysisDialog.vue | 4 ++-- .../src/components/home/returnMaterialAnalysisDialog.vue | 4 ++-- sgzb-screen/src/components/home/returnMaterialsDialog.vue | 4 ++-- sgzb-screen/src/components/home/scrapAnalysisDialog.vue | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue b/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue index f936b49f..5c39c185 100644 --- a/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/fixMaterialAnalysisDialog.vue @@ -162,8 +162,8 @@ export default { }, methods: { setOpen(params) { - this.open = params.open, - this.maType = params.maType, + this.open = params.open + this.maType = params.maType this.tableData = [] this.total = 0 setTimeout(() => { @@ -179,7 +179,7 @@ export default { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize, maType: this.maType, - materialCode: this.formData.repairCode.trim(), + repairCode: this.formData.repairCode.trim(), unitId: this.formData.materialReqUnitValue, projectId: this.formData.materialReqProjectValue, } diff --git a/sgzb-screen/src/components/home/getMaterialsDialog.vue b/sgzb-screen/src/components/home/getMaterialsDialog.vue index eaafcc55..972868d8 100644 --- a/sgzb-screen/src/components/home/getMaterialsDialog.vue +++ b/sgzb-screen/src/components/home/getMaterialsDialog.vue @@ -164,8 +164,8 @@ export default { }, methods: { setOpen(params) { - this.open = params.open, - this.maType = params.maType, + this.open = params.open + this.maType = params.maType this.tableData = [] this.total = 0 setTimeout(() => { diff --git a/sgzb-screen/src/components/home/inventoryDialog.vue b/sgzb-screen/src/components/home/inventoryDialog.vue index 1148345c..778ddbba 100644 --- a/sgzb-screen/src/components/home/inventoryDialog.vue +++ b/sgzb-screen/src/components/home/inventoryDialog.vue @@ -139,8 +139,8 @@ export default { }, methods: { setOpen(params) { - this.open = params.open, - this.maType = params.maType, + this.open = params.open + this.maType = params.maType this.tableData = [] this.total = 0 setTimeout(() => { diff --git a/sgzb-screen/src/components/home/materialAnalysisDialog.vue b/sgzb-screen/src/components/home/materialAnalysisDialog.vue index c831efa9..ecddbe36 100644 --- a/sgzb-screen/src/components/home/materialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/materialAnalysisDialog.vue @@ -141,8 +141,8 @@ export default { }, methods: { setOpen(params) { - this.open = params.open, - this.maType = params.maType, + this.open = params.open + this.maType = params.maType this.tableData = [] this.total = 0 setTimeout(() => { diff --git a/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue b/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue index e4b0ef4d..97911c81 100644 --- a/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue @@ -141,8 +141,8 @@ export default { }, methods: { setOpen(params) { - this.open = params.open, - this.maType = params.maType, + this.open = params.open + this.maType = params.maType this.tableData = [] this.total = 0 setTimeout(() => { diff --git a/sgzb-screen/src/components/home/returnMaterialsDialog.vue b/sgzb-screen/src/components/home/returnMaterialsDialog.vue index c41eb5a2..f4aec5bf 100644 --- a/sgzb-screen/src/components/home/returnMaterialsDialog.vue +++ b/sgzb-screen/src/components/home/returnMaterialsDialog.vue @@ -164,8 +164,8 @@ export default { }, methods: { setOpen(params) { - this.open = params.open, - this.maType = params.maType, + this.open = params.open + this.maType = params.maType this.tableData = [] this.total = 0 setTimeout(() => { diff --git a/sgzb-screen/src/components/home/scrapAnalysisDialog.vue b/sgzb-screen/src/components/home/scrapAnalysisDialog.vue index 21a155b2..932061b1 100644 --- a/sgzb-screen/src/components/home/scrapAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/scrapAnalysisDialog.vue @@ -191,8 +191,8 @@ export default { }, methods: { setOpen(params) { - this.open = params.open, - this.maType = params.maType, + this.open = params.open + this.maType = params.maType this.tableData = [] this.total = 0 setTimeout(() => {