Merge pull request 'lb' (#27) from lb into master

Reviewed-on: #27

src/views/3DOverview/components/LeftContentPublicConsume.vue

@@ -186,6 +186,7 @@ export default {
 
 .row > .amount {
   text-align: right;
+  width: 15%;
 }
 
 .diy-process-bar {
@@ -216,13 +217,13 @@ export default {
   width: 99%;
 }
 .bar-width-4::after {
-  width: 20%;
+  width: 42%;
 }
 .bar-width-5::after {
-  width: 29%;
+  width: 61%;
 }
 .bar-width-6::after {
-  width: 79%;
+  width: 31%;
 }
 
 .diy-process-bar.color-1::after {

src/views/3DOverview/index.vue

@@ -170,6 +170,7 @@ export default {
     },
     handle3DClick() {
       this.eqId = document.getElementById('V3DData').rel
+      // alert(this.eqId)
       if (this.eqId) {
         this.currentEquipment = eqList.find(item => item.id === this.eqId)
       }

src/views/3DOverview/v3dApp/data.js

@@ -1,21 +1,23 @@
 export default [
+  { id: 'C123-1', pl: 'A', name: 'A钢化', amount: 32, status: '生产中' },
+  { id: 'C456-1', pl: 'B', name: 'B钢化', amount: 32, status: '生产中' },
+
   { id: 'C1-0', pl: 'A1', name: 'A1上片', amount: 32, status: '生产中' },
   { id: 'C1-1', pl: 'A1', name: 'A1磨边', amount: 32, status: '生产中' },
-  { id: 'C1-2', pl: 'A1', name: 'A1磨边后清洗', amount: 32, status: '调试中' },
+  { id: 'C1-2', pl: 'A1', name: 'A1磨边后清洗', amount: 32, status: '生产中' },
   { id: 'C1-3', pl: 'A1', name: 'A1打孔', amount: 32, status: '生产中' },
   { id: 'C1-4', pl: 'A1', name: 'A1打孔后清洗', amount: 32, status: '生产中' },
   { id: 'C1-5', pl: 'A1', name: 'A1丝印', amount: 32, status: '生产中' },
   { id: 'C1-6', pl: 'A1', name: 'A1固化', amount: 32, status: '生产中' },
   { id: 'C1-7', pl: 'A1', name: 'A1储片', amount: 32, status: '生产中' },
-  { id: 'C1-8', pl: 'A1', name: 'A钢化', amount: 32, status: '生产中' },
-  { id: 'C1-9', pl: 'A1', name: 'A1钢化后清洗', amount: 32, status: '生产中' },
-  { id: 'C1-10', pl: 'A1', name: 'A1下片', amount: 32, status: '生产中' },
+  { id: 'C1-8', pl: 'A1', name: 'A1钢化后清洗', amount: 32, status: '生产中' },
+  { id: 'C1-9', pl: 'A1', name: 'A1下片', amount: 32, status: '生产中' },
 
   { id: 'C2-0', pl: 'A2', name: 'A2上片', amount: 32, status: '调试中' },
   { id: 'C2-1', pl: 'A2', name: 'A2磨边', amount: 32, status: '生产中' },
   { id: 'C2-2', pl: 'A2', name: 'A2磨边后清洗', amount: 32, status: '调试中' },
   { id: 'C2-3', pl: 'A2', name: 'A2打孔', amount: 32, status: '调试中' },
-  { id: 'C2-4', pl: 'A2', name: 'A2打孔后清洗', amount: 32, status: '调试中' },
+  { id: 'C2-4', pl: 'A2', name: 'A2打孔后清洗', amount: 32, status: '生产中' },
   { id: 'C2-5', pl: 'A2', name: 'A2丝印', amount: 32, status: '生产中' },
   { id: 'C2-6', pl: 'A2', name: 'A2固化', amount: 32, status: '生产中' },
   { id: 'C2-7', pl: 'A2', name: 'A2储片', amount: 32, status: '生产中' },
@@ -26,8 +28,8 @@ export default [
   { id: 'C3-1', pl: 'A3', name: 'A3磨边', amount: 32, status: '生产中' },
   { id: 'C3-2', pl: 'A3', name: 'A3磨边后清洗', amount: 32, status: '生产中' },
   { id: 'C3-3', pl: 'A3', name: 'A3打孔', amount: 32, status: '生产中' },
-  { id: 'C3-4', pl: 'A3', name: 'A3打孔后清洗', amount: 32, status: '生产中' },
-  { id: 'C3-5', pl: 'A3', name: 'A3丝印', amount: 32, status: '故障' },
+  { id: 'C3-4', pl: 'A3', name: 'A3打孔后清洗', amount: 32, status: '故障' },
+  { id: 'C3-5', pl: 'A3', name: 'A3丝印', amount: 32, status: '生产中' },
   { id: 'C3-6', pl: 'A3', name: 'A3固化', amount: 32, status: '生产中' },
   { id: 'C3-7', pl: 'A3', name: 'A3储片', amount: 32, status: '生产中' },
   { id: 'C3-8', pl: 'A3', name: 'A3钢化后清洗', amount: 32, status: '生产中' },
@@ -35,15 +37,14 @@ export default [
 
   { id: 'C4-0', pl: 'B1', name: 'B1上片', amount: 32, status: '故障' },
   { id: 'C4-1', pl: 'B1', name: 'B1磨边', amount: 32, status: '生产中' },
-  { id: 'C4-2', pl: 'B1', name: 'B1磨边后清洗', amount: 32, status: '生产中' },
+  { id: 'C4-2', pl: 'B1', name: 'B1磨边后清洗', amount: 32, status: '故障' },
   { id: 'C4-3', pl: 'B1', name: 'B1打孔', amount: 32, status: '故障' },
-  { id: 'C4-4', pl: 'B1', name: 'B1打孔后清洗', amount: 32, status: '故障' },
+  { id: 'C4-4', pl: 'B1', name: 'B1打孔后清洗', amount: 32, status: '生产中' },
   { id: 'C4-5', pl: 'B1', name: 'B1丝印', amount: 32, status: '生产中' },
   { id: 'C4-6', pl: 'B1', name: 'B1固化', amount: 32, status: '生产中' },
   { id: 'C4-7', pl: 'B1', name: 'B1储片', amount: 32, status: '生产中' },
-  { id: 'C4-8', pl: 'B1', name: 'B钢化', amount: 32, status: '生产中' },
-  { id: 'C4-9', pl: 'B1', name: 'B1钢化后清洗', amount: 32, status: '生产中' },
-  { id: 'C4-10', pl: 'B1', name: 'B下片', amount: 32, status: '生产中' },
+  { id: 'C4-8', pl: 'B1', name: 'B1钢化后清洗', amount: 32, status: '生产中' },
+  { id: 'C4-9', pl: 'B1', name: 'B下片', amount: 32, status: '生产中' },
 
   { id: 'C5-0', pl: 'B2', name: 'B2上片', amount: 32, status: '生产中' },
   { id: 'C5-1', pl: 'B2', name: 'B2磨边', amount: 32, status: '生产中' },
@@ -61,6 +62,6 @@ export default [
   { id: 'C6-3', pl: 'B3', name: 'B3打孔', amount: 32, status: '生产中' },
   { id: 'C6-4', pl: 'B3', name: 'B3打孔后清洗', amount: 32, status: '生产中' },
   { id: 'C6-5', pl: 'B3', name: 'B3丝印', amount: 32, status: '生产中' },
-  { id: 'C6-6', pl: 'B3', name: 'B3固化', amount: 32, status: '生产中' },
-  { id: 'C6-7', pl: 'B3', name: 'B3储片', amount: 32, status: '故障' },
+  { id: 'C6-6', pl: 'B3', name: 'B3固化', amount: 32, status: '故障' },
+  { id: 'C6-7', pl: 'B3', name: 'B3储片', amount: 32, status: '故障' }
 ]