feat（面色漆作业区）：功能联调

src/views/Monitor/components/ComplexionPaint.vue

@@ -715,7 +715,6 @@ export default {
 
     mounted () {
         this.getComplexionPaintInformation();
-        console.log(this.$route);
     },
 
     methods: {
@@ -731,6 +730,13 @@ export default {
         },
         judgeCarTypeAndcarStationstyle (outOrIn, station) {
             //根据车位编码Station 判断是否该车位已经被定位
+            let stateTemp = this.$route.query;
+            console.log('aaa', stateTemp);
+            this.$fetch('area-controller/busNo-get', {stateTemp}).then(res => {
+                console.log(res);
+            }).catch(error => {
+                reject(error);
+            })
             /* .... */
             console.log('outorin', outOrIn);
             console.log('车位', station);

src/views/Monitor/components/Electrophoresis.vue

@@ -188,6 +188,13 @@
             >
                 <p>CDA11323</p>
             </div>
+            <div
+                class="elect-row-8-4"
+                v-if="query.hasOwnProperty('HDG1-31') && query['HDG1-31'].state !== 'FREE'"
+                :class="judgeCarTypeAndcarStationstyle(query['HDG1-31'].busType, 'HDG1-31')"
+            >
+                <p>CDA11323</p>
+            </div>
             <!-- 第 9 行 -->
             <div
                 class="elect-row-9-1"
@@ -217,6 +224,13 @@
             >
                 <p>CDA11323</p>
             </div>
+            <div
+                class="elect-row-9-5"
+                v-if="query.hasOwnProperty('HDG1-31') && query['HDG1-31'].state !== 'FREE'"
+                :class="judgeCarTypeAndcarStationstyle(query['HDG1-31'].busType, 'HDG1-31')"
+            >
+                <p>CDA11323</p>
+            </div>
             <!-- 第 10 行 -->
             <div
                 class="elect-row-10-1"
@@ -325,6 +339,13 @@
             >
                 <p>CDA11323</p>
             </div>
+            <div
+                class="elect-row-12-6"
+                v-if="query.hasOwnProperty('HDG1-31') && query['HDG1-31'].state !== 'FREE'"
+                :class="judgeCarTypeAndcarStationstyle(query['HDG1-31'].busType, 'HDG1-31')"
+            >
+                <p>CDA11323</p>
+            </div>
             <!-- 第 13 行 -->
             <div
                 class="elect-row-13-1"
@@ -414,7 +435,7 @@ export default {
                     areaId: 0,
                     areaName: 'DF205411010',
                     busNo: 'DF20191010',
-                    busType: 'OTHER', //IN/OUT
+                    busType: 'OWN', //IN/OUT
                     code: 'string',
                     id: 0,
                     keyStation: true,
@@ -523,10 +544,12 @@ export default {
         .elect-row-8-1,
         .elect-row-8-2,
         .elect-row-8-3,
+        .elect-row-8-4,
         .elect-row-9-1,
         .elect-row-9-2,
         .elect-row-9-3,
         .elect-row-9-4,
+        .elect-row-9-5,
         .elect-row-10-1,
         .elect-row-10-2,
         .elect-row-10-3,
@@ -542,6 +565,7 @@ export default {
         .elect-row-12-3,
         .elect-row-12-4,
         .elect-row-12-5,
+        .elect-row-12-6,
         .elect-row-13-1,
         .elect-row-13-2,
         .elect-row-13-3,
@@ -667,21 +691,24 @@ export default {
         // ?第八行
         .elect-row-8-1,
         .elect-row-8-2,
-        .elect-row-8-3 {
+        .elect-row-8-3,
+        .elect-row-8-4 {
             top: 542px;
         }
         // ?第九行
         .elect-row-9-1,
         .elect-row-9-2,
         .elect-row-9-3,
-        .elect-row-9-4 {
+        .elect-row-9-4,
+        .elect-row-9-5 {
             top: 596px;
         }
         .elect-row-9-1,
         .elect-row-10-1,
         .elect-row-11-1,
         .elect-row-12-1,
-        .elect-row-13-1 {
+        .elect-row-13-1,
+        .elect-row-12-6 {
             left: 420px;
         }
         .elect-row-9-2 {
@@ -741,7 +768,8 @@ export default {
         .elect-row-12-2,
         .elect-row-12-3,
         .elect-row-12-4,
-        .elect-row-12-5 {
+        .elect-row-12-5,
+        .elect-row-12-6 {
             top: 782px;
         }
         .elect-row-12-3,
@@ -763,6 +791,9 @@ export default {
         .elect-row-13-2 {
             left: 708px;
         }
+        .elect-row-8-4,.elect-row-9-5 {
+            left: 830px;
+        }
         .carOutFactory {
             background: url("../../../assets/images/Monitor/monitor_car_external.png")
                 no-repeat;