deepsea 1 年間 前
コミット
10b03204a3

+ 12 - 6
src/components/BenchDetail/index.vue

@@ -21,6 +21,11 @@
                 <el-col :span="6">Carline: {{bench.Carline}}</el-col>
                 <el-col :span="6">Cluster: {{bench.Cluster}}</el-col>
               </el-row>
+              <el-row>
+                <el-col :span="6">Display: {{bench.Display}}</el-col>
+                <el-col :span="6">VIN: {{bench.vin}}</el-col>
+                <el-col :span="6">Precondition: <span style="font-size: 12px;">{{bench.Precondition.join(',')}}</span></el-col>
+              </el-row>
               <el-row>
                 <el-col :span="6">AED SW: {{bench.AED_SW}}</el-col>
                 <el-col :span="6">MU SW: {{bench.MU_SW}}</el-col>
@@ -48,9 +53,9 @@
                   <div>Mac Adress</div>
                 </el-col>
                 <el-col :span=8>
-                  <div> {{ bench.slave[1].status }}</div>
-                  <div> {{ bench.slave[1].ip }}</div>
-                  <div> {{ bench.slave[1].mac }}</div>
+                  <div> {{ bench.slave[0].status }}</div>
+                  <div> {{ bench.slave[0].ip }}</div>
+                  <div> {{ bench.slave[0].mac }}</div>
                 </el-col>
               </el-row>
               </el-col>
@@ -63,9 +68,9 @@
                   <div>Mac Adress</div>
                 </el-col>
                 <el-col :span=8>
-                  <div> {{ bench.slave[0].status }}</div>
-                  <div> {{ bench.slave[0].ip }}</div>
-                  <div> {{ bench.slave[0].mac }}</div>
+                  <div> {{ bench.slave[1].status }}</div>
+                  <div> {{ bench.slave[1].ip }}</div>
+                  <div> {{ bench.slave[1].mac }}</div>
                 </el-col>
               </div>
               </el-col>
@@ -160,6 +165,7 @@ export default {
   },
   watch: {
     bench(newValue, oldValue) {
+      debugger
       this.equipmentTableData.pop();
       this.equipmentTableData.push({
           ...this.bench.equipment

+ 1 - 1
src/store/modules/bench/mutations.js

@@ -16,7 +16,7 @@ export default {
         bench.top = Math.random() * 80 + (i * (Math.random() * 10 + 10)) + 200;
         bench.isFixed = true;
       }
-
+      bench.vin = bench.groups["VIN"] ? bench.groups["VIN"].VIN : 0;
       bench.status = "ready";
       bench.name = "";
       bench.type = 1;

+ 1 - 1
src/store/modules/case/mutations.js

@@ -31,7 +31,7 @@ export default {
       }
     }
     let rate = (finished / length) * 100;
-    state.autoTaskPercentMap[uuid] = rate.toFixed(2);
+    state.autoTaskPercentMap[uuid] = rate.toFixed(1);
   },
   setAutoCaseList(state, data) {
     let autoCaseList = data.autoCaseList;