操作界面增加剩余钢坯数量

.env.development

@@ -6,13 +6,13 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 # VITE_PROXY = [["/jeecgboot","http://192.168.0.105:9999"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY = [["/jeecgboot","http://192.168.1.32:9999"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://192.168.0.119:9999"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
 # VITE_GLOB_DOMAIN_URL=http://localhost:9999
 # VITE_GLOB_DOMAIN_URL=http://192.168.0.105:8080/jeecg-boot
 # VITE_GLOB_DOMAIN_URL=http://192.168.6.24:8080/jeecg-boot
-VITE_GLOB_DOMAIN_URL=http://192.168.1.32:9999
+VITE_GLOB_DOMAIN_URL=http://192.168.0.119:9999
 
 
 

src/views/billet/operator/operator.data.ts

@@ -216,11 +216,35 @@ export const columns: BasicColumn[] = [
     dataIndex: 'totalInfo',
     customRender({ record }) {
       try {
-        const { totalInfo } = record;
+        const { totalInfo, hotCharge, stacking, hotSend, directRolling } = record;
         if (totalInfo) {
           const obj = JSON.parse(totalInfo);
           // return obj.totalCount + ' / ' + obj.totalWeight;
-          return renderNum(obj.totalCount, obj.totalWeight);
+          let quXiaongGen = 0;
+          // 热装
+          if (hotCharge) {
+            const hotChargeObj = JSON.parse(hotCharge);
+            quXiaongGen = quXiaongGen + (hotChargeObj.hotChargeTotalCount || 0);
+          }
+          // 堆垛
+          if (stacking) {
+            const stackingObj = JSON.parse(stacking);
+            quXiaongGen = quXiaongGen + (stackingObj.stackingTotalCount || 0);
+          }
+          // 棒一或者高线
+          if (directRolling) {
+            const directRollingObj = JSON.parse(directRolling);
+            quXiaongGen = quXiaongGen + (directRollingObj.directRollingTotalCount || 0);
+          }
+          if (hotSend) {
+            const hotSendObj = JSON.parse(hotSend);
+            quXiaongGen = quXiaongGen + (hotSendObj.hotSendTotalCount || 0);
+          }
+
+          return renderNum(
+            h('span', {}, [h('span', {}, obj.totalCount), h('span', { style: { color: '#999' } }, '/' + (obj.totalCount - quXiaongGen))]),
+            obj.totalWeight
+          );
         }
       } catch (error) {}
       return '';