Sfoglia il codice sorgente

增加看板字段

liuyanpeng 1 anno fa
parent
commit
a39cc19390
2 ha cambiato i file con 19 aggiunte e 8 eliminazioni
  1. 1 1
      js/common.js
  2. 18 7
      templates/mouldBoard.html

+ 1 - 1
js/common.js

@@ -3,7 +3,7 @@ const getRootPath = () => {
     const host = window.location.host;
     const localhostPath = protocol + '//' + host;
 
-    return 'http://192.168.1.6:8083';
+    return 'http://192.168.1.110:8083';
     // return localhostPath;
 
 }

+ 18 - 7
templates/mouldBoard.html

@@ -98,7 +98,7 @@
             <div class="count_box line2">{{count.fixtureProduceQuantity}}</div>
 
             <img src="../images/group4.png" class="group-common2 group4" />
-            <span class="count gauge_repair">检具维修保养</span>
+            <span class="count gauge_repair">检具校准数量</span>
             <div class="count_box repair2">
               {{count.fixtureMaintenanceAndRepairQuantity}}
             </div>
@@ -163,6 +163,8 @@
             maintainHeader: [
               '<span style="color:#ffffff;font-size:0.16rem"></span>',
               '<span style="color:#ffffff;font-size:0.16rem">零件号</span>',
+              '<span style="color:#ffffff;font-size:0.16rem">生产数量</span>',
+              '<span style="color:#ffffff;font-size:0.16rem">生产数量阈值</span>',
               '<span style="color:#ffffff;font-size:0.16rem">保养时间</span>',
               '<span style="color:#ffffff;font-size:0.16rem">货位号</span>',
             ],
@@ -253,7 +255,7 @@
             _self.inventoryDatas = [];
 
             if (dtos && dtos.length) {
-              const datas = _self.inventoryHandler(dtos)
+              const datas = _self.inventoryHandler(dtos);
               _self.inventoryDatas = datas.map((item) => {
                 return [
                   '<div class="table-img" ><img src="../images/icon.png"/></div>',
@@ -313,6 +315,8 @@
               _self.maintainDatas = dtos.map((item) => [
                 '<div class="table-img" ><img src="../images/icon.png"/></div>',
                 item.inventoryType,
+                item.productSingle,
+                item.productThreshold,
                 item.maintenanceDate,
                 item.positionName,
               ]);
@@ -322,8 +326,15 @@
               header: _self.maintainHeader,
               data: _self.maintainDatas,
               rowNum: 10,
-              align: ["center", "center", "center", "center"],
-              columnWidth: [66, 280, 210, 200],
+              align: [
+                "center",
+                "center",
+                "center",
+                "center",
+                "center",
+                "center",
+              ],
+              columnWidth: [66, 300, 166, 232, 250, 160],
               ..._self.commonConfig,
             };
           },
@@ -338,7 +349,7 @@
                 item.inventoryType,
                 item.repairDate,
                 item.positionName,
-                item.status
+                item.status,
               ]);
             }
             _self.repairDatas = _self.addEmpty(12, "table4");
@@ -346,8 +357,8 @@
               header: _self.repairHeader,
               data: _self.repairDatas,
               rowNum: 12,
-              align: ["center", "center", "center", "center","center"],
-              columnWidth: [66, 360, 260, 120,120],
+              align: ["center", "center", "center", "center", "center"],
+              columnWidth: [66, 360, 266, 120, 120],
               ..._self.commonConfig,
             };
           },