update

src/views/EquipmentManager/HomePage.vue

@@ -77,7 +77,7 @@
         <div class="row-3">
           <!-- 设备备件管理 -->
           <techy-container :title="'设备备件管理'" icon="清单齿轮">
-            <div class="table-wrapper">
+            <div class="table-wrapper fix-table-exception-report">
               <techy-table
                 :page="1"
                 :limit="7"

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));
 }

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 {

src/views/EquipmentManager/mockData.js

@@ -27,8 +27,8 @@ const PriorityComponent = {
     }
   },
   methods: {},
-  render: function(h) {
+  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)
+    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 = [
+      const colors = [green, orange, blue, red
-        '#67ff55',
+        // '#67ff55',
-        'green',
+        // '#e0e0e0',
-        '#ffb70c',
+        // '#ffb70c',
-        '#0b58ff',
+        // '#0b58ff',
-        '#ff0c0c'
+        // '#ff0c0c'
       ]
       return colors[this.injectData.status - 1]
     },
     statusText() {
       return [
         '已完成',
-        '已下发',
+        // '已下发',
         '已暂定',
         '进行中',
         '已结束'
       ][this.injectData.status - 1]
     }
   },
-  render: function(h) {
+  render: function (h) {
-    return h('span', { style: { display: 'flex', /** justifyContent: 'center', */ alignItems: 'center', color: '#ffffffb3' }}, [
+    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))' }}, ''),
+      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_3719', 'eq': 'A2一次固化机', 'pl': 'E线', 'status': 1, 'charger': '任洋', 'duration': 5 },
-  { 'orderId': 'OD_6564', 'eq': 'B1二次镀膜机', 'pl': 'D线', 'status': 2, 'charger': '廖丽', 'duration': 6 },
+  { '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 },
 ]

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));
 }

src/views/QualityManager/mockData.js

@@ -30,8 +30,8 @@ const PriorityComponent = {
     console.log(this.injectData.priority)
   },
   methods: {},
-  render: function(h) {
+  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)
+    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) {
+  render: function (h) {
-    return h('span', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', color: '#fff' }}, [
+    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', { 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: 'charger', align: 'center', width: 100 },
-  { label: '完成情况', prop: 'status', align: 'center', subcomponent: StatusComponent, width: 150 }
+  // { 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': 2, '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': 1, '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': 1, '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': 2, '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': 3, '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': 3, 'charger': '侯磊', 'status': 1 },
   { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 4 }
 ]