From c02f3959dc3ae1cf0c0d2a1dc2ccb5c223728ec5 Mon Sep 17 00:00:00 2001 From: lb Date: Mon, 14 Nov 2022 13:58:40 +0800 Subject: [PATCH] update --- src/views/EquipmentManager/HomePage.vue | 2 +- src/views/EquipmentManager/blue.png | Bin 0 -> 3574 bytes .../components/TechyTable.vue | 2 +- .../components/TechyVerticalTable.vue | 9 ++-- src/views/EquipmentManager/green.png | Bin 0 -> 4106 bytes src/views/EquipmentManager/mockData.js | 49 ++++++++++-------- src/views/EquipmentManager/orange.png | Bin 0 -> 3631 bytes src/views/EquipmentManager/red.png | Bin 0 -> 3263 bytes .../QualityManager/components/TechyTable.vue | 2 +- src/views/QualityManager/mockData.js | 32 ++++++------ 10 files changed, 51 insertions(+), 45 deletions(-) create mode 100644 src/views/EquipmentManager/blue.png create mode 100644 src/views/EquipmentManager/green.png create mode 100644 src/views/EquipmentManager/orange.png create mode 100644 src/views/EquipmentManager/red.png diff --git a/src/views/EquipmentManager/HomePage.vue b/src/views/EquipmentManager/HomePage.vue index 2bda564..2ae2f9b 100644 --- a/src/views/EquipmentManager/HomePage.vue +++ b/src/views/EquipmentManager/HomePage.vue @@ -77,7 +77,7 @@
-
+
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 literal 0 HcmV?d00001 diff --git a/src/views/EquipmentManager/components/TechyTable.vue b/src/views/EquipmentManager/components/TechyTable.vue index 7898339..d753a82 100644 --- a/src/views/EquipmentManager/components/TechyTable.vue +++ b/src/views/EquipmentManager/components/TechyTable.vue @@ -178,7 +178,7 @@ export default { } .visual-base-table-container >>> td span { - color: #ffffff50; + color: #ffffffb3; font-size: calc(12px * var(--beilv)); line-height: calc(14px * var(--beilv)); } diff --git a/src/views/EquipmentManager/components/TechyVerticalTable.vue b/src/views/EquipmentManager/components/TechyVerticalTable.vue index eed6f7c..1369150 100644 --- a/src/views/EquipmentManager/components/TechyVerticalTable.vue +++ b/src/views/EquipmentManager/components/TechyVerticalTable.vue @@ -61,7 +61,9 @@ export default { white-space: nowrap; overflow: hidden; margin-right: 1px; - text-align: center; + text-align: left; + padding-left: calc(12px * var(--beilv)); + padding-right: calc(12px * var(--beilv)); font-weight: 400; } @@ -74,11 +76,8 @@ export default { .tbody { width: 24%; color: rgba(255, 255, 255, 0.7); - font-size: calc(12px * var(--beilv)); + font-size: calc(12px * var(--beilv)); line-height: 2; - text-align: left; - padding-left: calc(12px * var(--beilv)); - padding-right: calc(12px * var(--beilv)); } .tbody:last-child { diff --git a/src/views/EquipmentManager/green.png b/src/views/EquipmentManager/green.png new file mode 100644 index 0000000000000000000000000000000000000000..225665aea59dbd4b1f34d85772b194a05417042f GIT binary patch literal 4106 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 IM6N<$f-=6K;Q#;t literal 0 HcmV?d00001 diff --git a/src/views/EquipmentManager/mockData.js b/src/views/EquipmentManager/mockData.js index e415ddd..67b6722 100644 --- a/src/views/EquipmentManager/mockData.js +++ b/src/views/EquipmentManager/mockData.js @@ -27,8 +27,8 @@ const PriorityComponent = { } }, methods: {}, - render: function(h) { - return h('span', { style: { display: 'inline-block', borderRadius: '2px', padding: '2px 8px', color: '#fff', opacity: '0.6', backgroundColor: this.bgColor }}, this.priorityText) + render: function (h) { + return h('span', { style: { display: 'inline-block', borderRadius: '2px', padding: '2px 8px', color: '#fff', opacity: '0.6', backgroundColor: this.bgColor } }, this.priorityText) } } @@ -70,12 +70,12 @@ const LifeRemainComponent = { } }, - render: function(h) { + render: function (h) { return h('span', { style: { position: 'absolute', top: 0, left: 0, right: 0, bottom: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', opacity: '0.8', backgroundColor: this.statusColor, color: '#fff' } }, - this.injectData.remain) + this.injectData.remain) } } @@ -132,20 +132,27 @@ export const sparepartsProps = [ ] export const sparepartsDatalist = [ - { 'name': '激光打印', 'eq': 'A2一次固化机', 'pl': 'C线', 'update_time': '2007-08-31 09:15:24', 'remain': -32, 'stock': 457, 'location': '库位74' }, + { 'name': '激光打孔', 'eq': 'A2一次固化机', 'pl': 'C线', 'update_time': '2007-08-31 09:15:24', 'remain': -32, 'stock': 457, 'location': '库位74' }, { 'name': '磨边单元', 'eq': 'B1一次冷却机', 'pl': 'C线', 'update_time': '2016-10-02 22:23:09', 'remain': -95, 'stock': 5600, 'location': '库位10' }, - { 'name': '激光打印', 'eq': 'B1一次冷却机', 'pl': 'C线', 'update_time': '1996-09-17 08:57:52', 'remain': 46, 'stock': 6069, 'location': '库位87' }, + { 'name': '激光打孔', 'eq': 'B1一次冷却机', 'pl': 'C线', 'update_time': '1996-09-17 08:57:52', 'remain': 46, 'stock': 6069, 'location': '库位87' }, { 'name': '磨边单元', 'eq': 'A2一次固化机', 'pl': 'D线', 'update_time': '2018-07-18 13:15:01', 'remain': 86, 'stock': 2342, 'location': '库位83' }, { 'name': '上片机器人', 'eq': 'A2一次固化机', 'pl': 'E线', 'update_time': '1998-06-11 09:01:10', 'remain': 84, 'stock': 4359, 'location': '库位12' }, { 'name': '丝印', 'eq': 'A1一次固化机', 'pl': 'E线', 'update_time': '2016-02-13 16:20:01', 'remain': -23, 'stock': 888, 'location': '库位69' }, - { 'name': '激光打印', 'eq': 'A1磨边清洗机', 'pl': 'B线', 'update_time': '2002-04-07 19:13:29', 'remain': 62, 'stock': 4366, 'location': '库位99' }, + { 'name': '激光打孔', 'eq': 'A1磨边清洗机', 'pl': 'B线', 'update_time': '2002-04-07 19:13:29', 'remain': 62, 'stock': 4366, 'location': '库位99' }, { 'name': '丝印', 'eq': 'A1一次固化机', 'update_time': '1980-01-17 04:29:56', 'remain': 73, 'stock': 305, 'location': '库位68' }, - { 'name': '激光打印', 'eq': 'A2一次冷却机', 'pl': 'B线', 'update_time': '2014-02-25 17:19:43', 'remain': 36, 'stock': 199, 'location': '库位86' }, + { 'name': '激光打孔', 'eq': 'A2一次冷却机', 'pl': 'B线', 'update_time': '2014-02-25 17:19:43', 'remain': 36, 'stock': 199, 'location': '库位86' }, { 'name': '上片机器人', 'eq': 'A2一次冷却机', 'pl': 'C线', 'update_time': '2017-01-23 17:01:29', 'remain': -3, 'stock': 146, 'location': '库位79' }, { 'name': '镀膜', 'eq': 'A2一次固化机', 'pl': 'D线', 'update_time': '2013-02-19 01:29:19', 'remain': 37, 'stock': 6977, 'location': '库位85' }, - { 'name': '激光打印', 'eq': 'A1预热机', 'pl': 'B线', 'update_time': '1972-04-26 06:54:43', 'remain': -82, 'stock': 5039, 'location': '库位38' } + { 'name': '激光打孔', 'eq': 'A1预热机', 'pl': 'B线', 'update_time': '1972-04-26 06:54:43', 'remain': -82, 'stock': 5039, 'location': '库位38' } ] +import { default as blue } from './blue.png' +import { default as orange } from './orange.png' +import { default as green } from './green.png' +import { default as red } from './red.png' + +console.log('blue', blue) + const StatusComponent = { name: 'StatusComponent', props: { @@ -153,28 +160,28 @@ const StatusComponent = { }, computed: { statusColor() { - const colors = [ - '#67ff55', - 'green', - '#ffb70c', - '#0b58ff', - '#ff0c0c' + const colors = [green, orange, blue, red + // '#67ff55', + // '#e0e0e0', + // '#ffb70c', + // '#0b58ff', + // '#ff0c0c' ] return colors[this.injectData.status - 1] }, statusText() { return [ '已完成', - '已下发', + // '已下发', '已暂定', '进行中', '已结束' ][this.injectData.status - 1] } }, - render: function(h) { - return h('span', { style: { display: 'flex', /** justifyContent: 'center', */ alignItems: 'center', color: '#ffffffb3' }}, [ - h('span', { style: { width: 'calc(6px * var(--beilv))', height: 'calc(6px * var(--beilv))', borderRadius: '50%', backgroundColor: this.statusColor, boxShadow: '0 0 2px 2px ' + this.statusColor, marginRight: 'calc(8px * var(--beilv))' }}, ''), + render: function (h) { + return h('span', { style: { display: 'flex', /** justifyContent: 'center', */ alignItems: 'center', color: '#ffffffb3' } }, [ + h('span', { style: { width: 'calc(16px * var(--beilv))', height: 'calc(16px * var(--beilv))', background: `url(${this.statusColor}) no-repeat`, backgroundSize: '100%', marginRight: 'calc(8px * var(--beilv))' } }, ''), h('span', this.statusText) ]) } @@ -190,8 +197,8 @@ export const rightSideProps = [ ] export const rightSideDatalist = [ - { 'orderId': 'OD_3719', 'eq': 'A2一次固化机', 'pl': 'E线', 'status': 2, 'charger': '任洋', 'duration': 5 }, - { 'orderId': 'OD_6564', 'eq': 'B1二次镀膜机', 'pl': 'D线', 'status': 2, 'charger': '廖丽', 'duration': 6 }, + { 'orderId': 'OD_3719', 'eq': 'A2一次固化机', 'pl': 'E线', 'status': 1, 'charger': '任洋', 'duration': 5 }, + { 'orderId': 'OD_6564', 'eq': 'B1二次镀膜机', 'pl': 'D线', 'status': 1, 'charger': '廖丽', 'duration': 6 }, { 'orderId': 'OD_125', 'eq': 'A钢化炉', 'pl': 'E线', 'status': 3, 'charger': '赖秀兰', 'duration': 2 } // { "orderId": "OD_7103", "pl": "C线", "status": 3, "charger": "邱伟", "duration": 7 }, ] diff --git a/src/views/EquipmentManager/orange.png b/src/views/EquipmentManager/orange.png new file mode 100644 index 0000000000000000000000000000000000000000..db4380887bb3a6c40d734b67e9676e073c6fe798 GIT binary patch literal 3631 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 literal 0 HcmV?d00001 diff --git a/src/views/QualityManager/components/TechyTable.vue b/src/views/QualityManager/components/TechyTable.vue index bfe7e0e..34ab2bf 100644 --- a/src/views/QualityManager/components/TechyTable.vue +++ b/src/views/QualityManager/components/TechyTable.vue @@ -178,7 +178,7 @@ export default { } .visual-base-table-container >>> td span { - color: #ffffff50; + color: #ffffffb3; font-size: calc(12px * var(--beilv)); line-height: calc(14px * var(--beilv)); } diff --git a/src/views/QualityManager/mockData.js b/src/views/QualityManager/mockData.js index 4ed3d5e..5dcac77 100644 --- a/src/views/QualityManager/mockData.js +++ b/src/views/QualityManager/mockData.js @@ -30,8 +30,8 @@ const PriorityComponent = { console.log(this.injectData.priority) }, methods: {}, - render: function(h) { - return h('span', { style: { display: 'inline-block', borderRadius: '2px', padding: '2px 8px', color: '#fff', opacity: '0.6', backgroundColor: this.bgColor }}, this.priorityText) + render: function (h) { + return h('span', { style: { display: 'inline-block', borderRadius: '2px', padding: '2px 8px', color: '#fff', opacity: '0.6', backgroundColor: this.bgColor } }, this.priorityText) } } @@ -78,7 +78,7 @@ const StatusComponent = { statusColor() { const colors = [ '#67ff55', - 'green', + '#e0e0e0', '#ffb70c', '#0b58ff', '#ff0c0c' @@ -95,9 +95,9 @@ const StatusComponent = { ][this.injectData.status - 1] } }, - render: function(h) { - return h('span', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', color: '#fff' }}, [ - h('span', { style: { width: '6px', height: '6px', borderRadius: '50%', backgroundColor: this.statusColor, boxShadow: '0 0 2px 2px ' + this.statusColor, marginRight: '6px' }}, ''), + render: function (h) { + return h('span', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', color: '#fff' } }, [ + h('span', { style: { width: '6px', height: '6px', borderRadius: '50%', backgroundColor: this.statusColor, boxShadow: '0 0 2px 2px ' + this.statusColor, marginRight: '6px' } }, ''), h('span', this.statusText) ]) } @@ -110,26 +110,26 @@ export const qualityExceptionTableProps = [ { label: '发现人', prop: 'creator', align: 'center', width: 100 }, { label: '时间', prop: 'time', align: 'center' }, { label: '优先级', prop: 'priority', align: 'center', subcomponent: PriorityComponent, width: 100 }, - { label: '处理人', prop: 'charger', align: 'center', width: 100 }, - { label: '完成情况', prop: 'status', align: 'center', subcomponent: StatusComponent, width: 150 } + // { label: '处理人', prop: 'charger', align: 'center', width: 100 }, + // { label: '完成情况', prop: 'status', align: 'center', subcomponent: StatusComponent, width: 150 } ] export const qualityExceptionDatalist = [ { 'wsName': '工序0', 'pl': '产线1', 'content': '说红要称或各眼华家书', 'creator': '罗霞', 'time': '2013-04-08 15:23:55', 'priority': 1, 'charger': '冯敏', 'status': 4 }, - { 'wsName': '工序1', 'pl': '产线9', 'content': '积已反老支人后条办', 'creator': '龚芳', 'time': '1984-06-22 09:44:24', 'priority': 1, 'charger': '万静', 'status': 2 }, + { 'wsName': '工序1', 'pl': '产线9', 'content': '积已反老支人后条办', 'creator': '龚芳', 'time': '1984-06-22 09:44:24', 'priority': 2, 'charger': '万静', 'status': 2 }, { 'wsName': '工序2', 'pl': '产线10', 'content': '铁收王', 'creator': '黎艳', 'time': '2006-10-25 19:20:41', 'priority': 2, 'charger': '徐秀兰', 'status': 1 }, - { 'wsName': '工序3', 'pl': '产线10', 'content': '过又条政理质系', 'creator': '郝强', 'time': '2020-03-06 12:11:52', 'priority': 5, 'charger': '白秀兰', 'status': 2 }, + { 'wsName': '工序3', 'pl': '产线10', 'content': '过又条政理质系', 'creator': '郝强', 'time': '2020-03-06 12:11:52', 'priority': 3, 'charger': '白秀兰', 'status': 2 }, { 'wsName': '工序4', 'pl': '产线3', 'content': '特适院', 'creator': '魏超', 'time': '1982-12-26 16:19:57', 'priority': 1, 'charger': '姚静', 'status': 3 }, { 'wsName': '工序5', 'pl': '产线1', 'content': '快准很问无', 'creator': '于桂英', 'time': '1976-09-26 21:53:11', 'priority': 4, 'charger': '白刚', 'status': 2 }, { 'wsName': '工序6', 'pl': '产线7', 'content': '研开', 'creator': '何桂英', 'time': '1977-04-23 05:34:45', 'priority': 3, 'charger': '秦涛', 'status': 4 }, { 'wsName': '工序7', 'pl': '产线2', 'content': '四取各广水儿强想华', 'creator': '唐军', 'time': '1988-03-11 22:40:42', 'priority': 2, 'charger': '龙艳', 'status': 1 }, { 'wsName': '工序8', 'pl': '产线7', 'content': '样无商口', 'creator': '高娟', 'time': '2012-03-14 06:40:16', 'priority': 3, 'charger': '沈涛', 'status': 1 }, { 'wsName': '工序9', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 4 }, - { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 3 }, - { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 1 }, - { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 2 }, - { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 3 }, - { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 2 }, - { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 1 }, + { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 2, 'charger': '侯磊', 'status': 3 }, + { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 1, 'charger': '侯磊', 'status': 1 }, + { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 1, 'charger': '侯磊', 'status': 2 }, + { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 2, 'charger': '侯磊', 'status': 3 }, + { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 3, 'charger': '侯磊', 'status': 2 }, + { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 3, 'charger': '侯磊', 'status': 1 }, { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 4 } ]