From 9b8f796100c1eb349b202b885c12a96d5e315174 Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 18 Nov 2022 14:50:57 +0800 Subject: [PATCH] update --- .../3DOverview/components/TechyTable.vue | 4 +- .../components/TechyTable.vue | 11 ++-- src/views/EquipmentManager/mockData.js | 22 ++++---- src/views/QualityManager/HomePage.vue | 4 +- .../QualityManager/components/TechyTable.vue | 8 +-- .../charts/PlFaultAnalysisPieChart.vue | 24 +++++---- .../components/charts/newLineStack.vue | 28 ++++++++--- src/views/QualityManager/mockData.js | 50 +++++++++---------- 8 files changed, 84 insertions(+), 67 deletions(-) diff --git a/src/views/3DOverview/components/TechyTable.vue b/src/views/3DOverview/components/TechyTable.vue index 56f1ed1..2bb759a 100644 --- a/src/views/3DOverview/components/TechyTable.vue +++ b/src/views/3DOverview/components/TechyTable.vue @@ -200,11 +200,11 @@ export default { } .visual-base-table-container >>> .el-table tbody tr:nth-child(odd) { - background-color: #0e203e90; + background-color: #0e203ecc; } .visual-base-table-container >>> .el-table tbody tr:nth-child(even), .visual-base-table-container >>> .el-table thead { - background-color: #20376090; + background-color: #213961cc; } diff --git a/src/views/EquipmentManager/components/TechyTable.vue b/src/views/EquipmentManager/components/TechyTable.vue index d753a82..eb63835 100644 --- a/src/views/EquipmentManager/components/TechyTable.vue +++ b/src/views/EquipmentManager/components/TechyTable.vue @@ -126,14 +126,14 @@ export default { } .visual-base-table-container >>> ::-webkit-scrollbar-button { - width: calc(8px * var(--beilv));; - height: calc(8px * var(--beilv));; + width: calc(8px * var(--beilv)); + height: calc(8px * var(--beilv)); background: #5bc4bf9f; position: relative; } .visual-base-table-container >>> ::-webkit-scrollbar-thumb { - border-radius: calc(8px * var(--beilv));; + border-radius: calc(8px * var(--beilv)); background: #5bc4bf9f; } @@ -200,12 +200,11 @@ export default { } .visual-base-table-container >>> .el-table tbody tr:nth-child(odd) { - background-color: #0e203e; - /* background-color: #0e203e; */ + background-color: #0e203ecc; } .visual-base-table-container >>> .el-table tbody tr:nth-child(even), .visual-base-table-container >>> .el-table thead { - background-color: #203760; + background-color: #213961cc; } diff --git a/src/views/EquipmentManager/mockData.js b/src/views/EquipmentManager/mockData.js index 3641be6..b3f9a61 100644 --- a/src/views/EquipmentManager/mockData.js +++ b/src/views/EquipmentManager/mockData.js @@ -33,12 +33,12 @@ const PriorityComponent = { } export const equipmentExceptionProps = [ - { label: '设备名称', prop: 'eqName', align: 'center', 'min-width': 60 }, - { label: '所属产线', prop: 'pl', align: 'center', 'min-width': 60 }, + { label: '设备名称', prop: 'eqName', align: 'center', 'min-width': 55 }, + { label: '所属产线', prop: 'pl', align: 'center', 'min-width': 55 }, { label: '报修/异常内容', prop: 'content', align: 'center', 'min-width': 80 }, - { label: '报修/发现人', prop: 'creator', align: 'center', width: 110 }, + { label: '报修/发现人', prop: 'creator', align: 'center', 'min-width': 60 }, { label: '时间', prop: 'time', align: 'center', 'min-width': 80 }, - { label: '优先级', prop: 'priority', align: 'center', subcomponent: PriorityComponent, 'min-width': 60 } + { label: '优先级', prop: 'priority', align: 'center', subcomponent: PriorityComponent, 'min-width': 55 } ] export const equipmentExceptionDatalist = [ @@ -51,9 +51,9 @@ export const equipmentExceptionDatalist = [ { "eqName": "打孔", "pl": "B", "content": "际从定接花她变人周而导总流西更观史。", "creator": "赵静", "time": "2021-01-20 03:36:47", "priority": 2 }, { "eqName": "下片", "pl": "A", "content": "厂积各克性型世型我地得圆与时速。", "creator": "姜洋", "time": "2021-11-30 07:56:26", "priority": 3 }, { "eqName": "钢化", "pl": "A", "content": "证法作无群只放科可少头生广水。", "creator": "赖艳", "time": "2022-10-10 12:01:14", "priority": 1 }, - { "eqName": "磨边", "pl": "A", "content": "极满具究极力入矿电适花军系象。", "creator": "熊静", "time": "2021-01-27 03:24:33", "priority": 4 }, + { "eqName": "磨边", "pl": "A", "content": "极满具究极力入矿电适花军系象。", "creator": "熊静", "time": "2021-01-27 03:24:33", "priority": 1 }, { "eqName": "二镀", "pl": "B", "content": "科传军正战没题许青生面发用矿科。", "creator": "龚明", "time": "2022-02-28 16:26:11", "priority": 2 }, - { "eqName": "磨边", "pl": "A", "content": "入以品切中算极同三那性当。", "creator": "万娟", "time": "2022-08-23 08:44:41", "priority": 4 }, + { "eqName": "磨边", "pl": "A", "content": "入以品切中算极同三那性当。", "creator": "万娟", "time": "2022-08-23 08:44:41", "priority": 2 }, { "eqName": "固化", "pl": "B", "content": "火音红建活先以它法对所重间量马斗将。", "creator": "徐丽", "time": "2021-07-30 21:15:10", "priority": 2 }, { "eqName": "一镀", "pl": "A", "content": "位构命利整线两计统被约张以导理。", "creator": "叶娜", "time": "2022-05-05 22:45:13", "priority": 1 }, { "eqName": "冷却", "pl": "A", "content": "东改近装商了整标革并该青外育放般体。", "creator": "田磊", "time": "2021-12-01 07:24:59", "priority": 2 }, @@ -116,13 +116,13 @@ export const equipmentAlarmDatalist = [ { "pl": "A", "eqName": "打孔后清洗机", "eqCode": "A3CAP20200727075125", "content": "员因江单话况质己家小展矿指到之组她。", "priority": 3 }, - { "pl": "A", "eqName": "磨边", "eqCode": "A7ED20200512213432", "content": "观长因带至成为也越效飞约况面的。", "priority": 4 }, + { "pl": "A", "eqName": "磨边", "eqCode": "A7ED20200512213432", "content": "观长因带至成为也越效飞约况面的。", "priority": 3 }, { "pl": "A", "eqName": "固化", "eqCode": "A4CO20220608145053", "content": "回状边及族值强第手听存派治严农象江。", "priority": 2 }, { "pl": "B", "eqName": "冷却", "eqCode": "B4CL20200526045602", "content": "采料这百他打体拉素但即面之。", "priority": 1 }, { - "pl": "B", "eqName": "打孔", "eqCode": "B6LP20220326162041", "content": "列保己问向九青保自济习后长而类月段斗。", "priority": 4 + "pl": "B", "eqName": "打孔", "eqCode": "B6LP20220326162041", "content": "列保己问向九青保自济习后长而类月段斗。", "priority": 2 }, { "pl": "A", "eqName": "磨边", "eqCode": "A4ED20200325081934", "content": "产矿身断通者和意层价前就知头。", "priority": 2 }, { @@ -133,9 +133,9 @@ export const equipmentAlarmDatalist = [ { "pl": "B", "eqName": "预热", "eqCode": "B1PR20200323134700", "content": "消选们度周料革理观构平活组事件。", "priority": 3 }, { "pl": "A", "eqName": "打孔", "eqCode": "A1LP20200513020427", "content": "华家是可路议自商取半也五。", "priority": 1 }, { "pl": "A", "eqName": "钢化", "eqCode": "A7TF20210928172616", "content": "点量都酸较此结同去写群论被千。", "priority": 2 }, - { "pl": "A", "eqName": "二镀", "eqCode": "A5SC20210104132647", "content": "切提个水铁外步油好连身相争外群儿此。", "priority": 4 }, - { "pl": "A", "eqName": "磨边后清洗机", "eqCode": "A4CAE20210225140150", "content": "学七直以半去江内后上知往值质值。", "priority": 4 }, - { "pl": "B", "eqName": "打孔后清洗机", "eqCode": "B6CAP20200831083210", "content": "活小着许今取图国步成流海分就适转院容。", "priority": 4 }, + { "pl": "A", "eqName": "二镀", "eqCode": "A5SC20210104132647", "content": "切提个水铁外步油好连身相争外群儿此。", "priority": 1 }, + { "pl": "A", "eqName": "磨边后清洗机", "eqCode": "A4CAE20210225140150", "content": "学七直以半去江内后上知往值质值。", "priority": 1 }, + { "pl": "B", "eqName": "打孔后清洗机", "eqCode": "B6CAP20200831083210", "content": "活小着许今取图国步成流海分就适转院容。", "priority": 2 }, ] /** 设备分析 */ diff --git a/src/views/QualityManager/HomePage.vue b/src/views/QualityManager/HomePage.vue index fbc5562..0f90051 100644 --- a/src/views/QualityManager/HomePage.vue +++ b/src/views/QualityManager/HomePage.vue @@ -156,7 +156,9 @@
产品成品率 - +
+ +
>> .el-table tbody tr:nth-child(odd) { - background-color: #0e203e; - /* background-color: #0e203e90; */ + /* background-color: #0e203e; */ + background-color: #0e203ecc; } .visual-base-table-container >>> .el-table tbody tr:nth-child(even), .visual-base-table-container >>> .el-table thead { - background-color: #203760; - /* background-color: #20376090; */ + /* background-color: #203760; */ + background-color: #213961cc; } diff --git a/src/views/QualityManager/components/charts/PlFaultAnalysisPieChart.vue b/src/views/QualityManager/components/charts/PlFaultAnalysisPieChart.vue index e014214..27fb0df 100644 --- a/src/views/QualityManager/components/charts/PlFaultAnalysisPieChart.vue +++ b/src/views/QualityManager/components/charts/PlFaultAnalysisPieChart.vue @@ -108,6 +108,7 @@ export default { configs: { title: { textAlign: 'center', + textVerticalAlign: 'middle', left: '69%', top: '46%', text: '', @@ -120,8 +121,7 @@ export default { subtext: '总数/片', subtextStyle: { color: '#fff', - fontSize: 12, - fontWeight: 'lighter' + fontSize: 12 } }, legend: { @@ -300,13 +300,15 @@ export default { const fs5 = this.calcFontsize(5 /** px*/) const fs8 = this.calcFontsize(8 /** px*/) const fs10 = this.calcFontsize(10 /** px*/) - const fs14 = this.calcFontsize(14 /** px*/) + const fs12 = this.calcFontsize(12 /** px*/) + const fs13 = this.calcFontsize(13 /** px*/) const fs18 = this.calcFontsize(18 /** px*/) + const fs20 = this.calcFontsize(20 /** px*/) const legendTopRate = this.calcFontsize(30 /** % */) this.configs.title.text = this.dataList.reduce((prev, curr) => prev + curr.value * 1000, 0) - this.configs.title.textStyle.fontSize = fs18 - this.configs.title.subtextStyle.fontSize = fs14 + this.configs.title.textStyle.fontSize = fs20 + this.configs.title.subtextStyle.fontSize = fs13 this.configs.legend.top = legendTopRate + '%' this.configs.legend.left = 0 + '%' @@ -336,12 +338,12 @@ export default { this.configs.legend.textStyle.rich.h.height = fs10 this.configs.legend.textStyle.rich.h.borderRadius = fs5 - this.configs.series[0].label.rich.first.fontSize = fs10 - this.configs.series[0].label.rich.second.fontSize = fs10 - this.configs.series[0].label.rich.third.fontSize = fs10 - this.configs.series[0].label.rich.fourth.fontSize = fs10 - this.configs.series[0].label.rich.fifth.fontSize = fs10 - this.configs.series[0].label.rich.sixth.fontSize = fs10 + this.configs.series[0].label.rich.first.fontSize = fs12 + this.configs.series[0].label.rich.second.fontSize = fs12 + this.configs.series[0].label.rich.third.fontSize = fs12 + this.configs.series[0].label.rich.fourth.fontSize = fs12 + this.configs.series[0].label.rich.fifth.fontSize = fs12 + this.configs.series[0].label.rich.sixth.fontSize = fs12 if (datalist) this.configs.series[0].data = datalist this.chart.setOption(this.configs) } diff --git a/src/views/QualityManager/components/charts/newLineStack.vue b/src/views/QualityManager/components/charts/newLineStack.vue index 6bc8865..33ee4c1 100644 --- a/src/views/QualityManager/components/charts/newLineStack.vue +++ b/src/views/QualityManager/components/charts/newLineStack.vue @@ -1,5 +1,5 @@