diff --git a/lms/nladmin-system/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/src/main/java/org/nl/AppRun.java index 8bae8c58d..01c57210e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/lms/nladmin-system/src/main/java/org/nl/AppRun.java @@ -76,7 +76,7 @@ public class AppRun { public String index() { return "Backend service started successfully"; } - @GetMapping("/w") // 最后可以去掉这个方法 + @GetMapping("/w") // 立库监控初始化 @SaIgnore public String index2() { // 采用循环+判断进行铺设图标, 可以通过舞台编辑协助完成 @@ -93,15 +93,15 @@ public class AppRun { int nodeSizeH = 50; for (int i = 2; i < 23; i=i+2) { // 第几块,每两块为一块 // 获取列数col_num - System.out.println( (i>=10?"1":"10") + i); + System.out.println( (i>=10?"3":"30") + i); JSONObject jsonObject = WQL.getWO("ss").addParamMap(MapOf.of("flag", "1" - , "block_num", (i>=10?"1":"10") + i)).process().uniqueResult(0); + , "block_num", (i>=10?"3":"30") + i)).process().uniqueResult(0); int num = Integer.parseInt(jsonObject.getString("num")); for (int j = 1; j <= num; j++) {// 层数 // 获取2,1....块的数据 - JSONArray array = attrTab.query("block_num IN ('" + (i>=10?"1":"10") + i + "','" + - ((i-1)>=10?"1":"10") + (i - 1) + "') AND " + - "layer_num = 1 AND col_num = " + j, "block_num DESC, row_num DESC").getResultJSONArray(0); + JSONArray array = attrTab.query("block_num IN ('" + (i>=10?"3":"30") + i + "','" + + ((i-1)>=10?"3":"30") + (i - 1) + "') AND " + + "layer_num = 3 AND col_num = " + j, "block_num DESC, row_num DESC").getResultJSONArray(0); for (int k = 0; k < array.size(); k++) { // 1,2...块的每列数据 JSONObject object = array.getJSONObject(k); @@ -178,7 +178,58 @@ public class AppRun { } save.put("nodes", nodes); save.put("edges", edges); - JSONObject jsonObject = stageTab.query("stage_code = 'AS'").uniqueResult(0); + JSONObject jsonObject = stageTab.query("stage_code = 'AS_3'").uniqueResult(0); + jsonObject.put("stage_data", save); + stageTab.update(jsonObject); + return "Backend service started successfully"; + } + + @GetMapping("/f") // 发货区监控初始化 + @SaIgnore + public String index3() { + // 采用循环+判断进行铺设图标, 可以通过舞台编辑协助完成 + WQLObject stageTab = WQLObject.getWQLObject("stage"); + WQLObject attrTab = WQLObject.getWQLObject("sch_base_point"); + JSONObject save = new JSONObject(); + JSONArray nodes = new JSONArray(); + JSONArray edges = new JSONArray(); + int x = 50; // 首个位置 + int y = 50; + int step = 5; + String type = "html-node"; + int nodeSizeW = 50; + int nodeSizeH = 50; + for (int i = 1; i <= 4; i++) { + + JSONArray resultJSONArray = attrTab.query("col_num = '" + i + "' and point_type = '9' and layer_num = '1' order by row_num ASC").getResultJSONArray(0); + + for (int j = 0; j < resultJSONArray.size(); j++) { + JSONObject json = resultJSONArray.getJSONObject(j); + + JSONObject node = new JSONObject(); + node.put("id", IdUtil.getSnowflake(1,1).nextIdStr()); + node.put("type", type); + node.put("x", x); + node.put("y", y); + JSONObject properties = new JSONObject(); + JSONObject nodeSize = new JSONObject(); + nodeSize.put("width", nodeSizeW); + nodeSize.put("height", nodeSizeH); + properties.put("nodeSize", nodeSize); + properties.put("struct_id", json.getString("point_id")); // 灵活配置,其他为固定参数 + node.put("properties", properties); + node.put("zIndex", "2023"); + x = x + step + nodeSizeW; + nodes.add(node); + + } + + x = 50; + y = y + step + nodeSizeH; + } + save.put("nodes", nodes); + save.put("edges", edges); + JSONObject jsonObject = stageTab.query("stage_code = 'FS'").uniqueResult(0); jsonObject.put("stage_data", save); stageTab.update(jsonObject); return "Backend service started successfully"; diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/AutoRiKuService.java b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/AutoRiKuService.java new file mode 100644 index 000000000..3a916c61e --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/AutoRiKuService.java @@ -0,0 +1,28 @@ +package org.nl.modules.mnt.service; + + +import com.alibaba.fastjson.JSONObject; + +public interface AutoRiKuService { + + /** + * 获取立库一层货位 + * */ + JSONObject getOnePoint(); + + /** + * 获取立库二层货位 + * */ + JSONObject getTwoPoint(); + + /** + * 获取立库三层货位 + * */ + JSONObject getThreePoint(); + + /** + * 获取全部货位 + * */ + JSONObject getAllPoint(); + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java new file mode 100644 index 000000000..294252fdc --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java @@ -0,0 +1,173 @@ +package org.nl.modules.mnt.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import org.nl.modules.mnt.service.AutoRiKuService; +import org.nl.modules.wql.core.bean.WQLObject; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AutoRiKuServiceImpl implements AutoRiKuService { + @Override + public JSONObject getOnePoint() { + WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); + + JSONObject jsonAll = new JSONObject(); + JSONArray dataArr = new JSONArray(); + + // 获取有货货位 + JSONArray haveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') <> '' and layer_num = '1' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonHave = new JSONObject(); + jsonHave.put("name", "有货"); + jsonHave.put("value", haveArr.size()); + + // 获取无货货位 + JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '1' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonNotHave = new JSONObject(); + jsonNotHave.put("name", "空闲"); + jsonNotHave.put("value", notHaveArr.size()); + + // 获取禁用货位 + JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '1' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonUsed = new JSONObject(); + jsonUsed.put("name", "禁用"); + jsonUsed.put("value", usedArr.size()); + + dataArr.add(jsonHave); + dataArr.add(jsonNotHave); + dataArr.add(jsonUsed); + + int num = haveArr.size() + notHaveArr.size() + usedArr.size(); + jsonAll.put("pieSubTest", "总仓位:"+num); + jsonAll.put("data", dataArr); + jsonAll.put("name", "立库1层统计"); + + return jsonAll; + } + + @Override + public JSONObject getTwoPoint() { + WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); + + JSONObject jsonAll = new JSONObject(); + JSONArray dataArr = new JSONArray(); + + // 获取有货货位 + JSONArray haveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') <> '' and layer_num = '2' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonHave = new JSONObject(); + jsonHave.put("name", "有货"); + jsonHave.put("value", haveArr.size()); + + // 获取无货货位 + JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '2' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonNotHave = new JSONObject(); + jsonNotHave.put("name", "空闲"); + jsonNotHave.put("value", notHaveArr.size()); + + // 获取禁用货位 + JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '2' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonUsed = new JSONObject(); + jsonUsed.put("name", "禁用"); + jsonUsed.put("value", usedArr.size()); + + dataArr.add(jsonHave); + dataArr.add(jsonNotHave); + dataArr.add(jsonUsed); + + int num = haveArr.size() + notHaveArr.size() + usedArr.size(); + jsonAll.put("pieSubTest", "总仓位:"+num); + jsonAll.put("data", dataArr); + jsonAll.put("name", "立库2层统计"); + + return jsonAll; + } + + @Override + public JSONObject getThreePoint() { + WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); + + JSONObject jsonAll = new JSONObject(); + JSONArray dataArr = new JSONArray(); + + // 获取有货货位 + JSONArray haveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') <> '' and layer_num = '3' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonHave = new JSONObject(); + jsonHave.put("name", "有货"); + jsonHave.put("value", haveArr.size()); + + // 获取无货货位 + JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '3' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonNotHave = new JSONObject(); + jsonNotHave.put("name", "空闲"); + jsonNotHave.put("value", notHaveArr.size()); + + // 获取禁用货位 + JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '3' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonUsed = new JSONObject(); + jsonUsed.put("name", "禁用"); + jsonUsed.put("value", usedArr.size()); + + dataArr.add(jsonHave); + dataArr.add(jsonNotHave); + dataArr.add(jsonUsed); + + int num = haveArr.size() + notHaveArr.size() + usedArr.size(); + jsonAll.put("pieSubTest", "总仓位:"+num); + jsonAll.put("data", dataArr); + jsonAll.put("name", "立库3层统计"); + + return jsonAll; + } + + @Override + public JSONObject getAllPoint() { + WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); + + JSONObject jsonAll = new JSONObject(); + JSONArray dataArr = new JSONArray(); + + // 获取有货货位 + JSONArray haveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') <> '' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonHave = new JSONObject(); + jsonHave.put("name", "有货"); + jsonHave.put("value", haveArr.size()); + + // 获取无货货位 + JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') = '' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonNotHave = new JSONObject(); + jsonNotHave.put("name", "空闲"); + jsonNotHave.put("value", notHaveArr.size()); + + // 获取禁用货位 + JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and is_delete = '0'").getResultJSONArray(0); + + JSONObject jsonUsed = new JSONObject(); + jsonUsed.put("name", "禁用"); + jsonUsed.put("value", usedArr.size()); + + dataArr.add(jsonHave); + dataArr.add(jsonNotHave); + dataArr.add(jsonUsed); + + int num = haveArr.size() + notHaveArr.size() + usedArr.size(); + jsonAll.put("pieSubTest", "总仓位:"+num); + jsonAll.put("data", dataArr); + jsonAll.put("name", "立库汇总统计"); + + return jsonAll; + } + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/AutoWebSocketRiKu.java b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/AutoWebSocketRiKu.java new file mode 100644 index 000000000..0ef94b083 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/AutoWebSocketRiKu.java @@ -0,0 +1,40 @@ +package org.nl.modules.mnt.websocket; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.logging.annotation.Log; +import org.nl.modules.mnt.service.AutoRiKuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.Map; + +@RestController +@RequiredArgsConstructor +@Api(tags = "定时任务") +@RequestMapping("/api/autoWeb") +@Slf4j +public class AutoWebSocketRiKu { + @Autowired + private AutoRiKuService autoRiKuService; + + @PostMapping("/query") + @Log("查询数据") + @ApiOperation("查询数据") + public ResponseEntity query(){ + JSONObject data = new JSONObject(); + data.put("one",autoRiKuService.getOnePoint()); + data.put("two",autoRiKuService.getTwoPoint()); + data.put("three",autoRiKuService.getThreePoint()); + data.put("all",autoRiKuService.getAllPoint()); + + return new ResponseEntity<>(data, HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java index 6f663ebe1..aad1cef10 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java @@ -194,4 +194,9 @@ public class CustomerbaseDto implements Serializable { * 送货单明细数 */ private String shd_dtl_num; + + /** + * 是否自动贴标 + */ + private String is_auto_table; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java index 3c1928112..423a5ee1a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java @@ -82,4 +82,19 @@ public class StructattrController { JSONArray jsonArray = JSONArray.parseArray(json); return new ResponseEntity<>(structattrService.getStructByCodes(jsonArray), HttpStatus.OK); } + + @PostMapping("/getStructByCodesFs") + @Log("获取点位信息") + @ApiOperation("获取点位信息") + public ResponseEntity getStructByCodesFs(@RequestBody String json){ + JSONArray jsonArray = JSONArray.parseArray(json); + return new ResponseEntity<>(structattrService.getStructByCodesFs(jsonArray), HttpStatus.OK); + } + + @PostMapping("/unLockPoint") + @Log("解锁点位") + @ApiOperation("解锁点位") + public ResponseEntity unLockPoint(@RequestBody JSONObject whereJson){ + return new ResponseEntity<>(structattrService.unLockPoint(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java index 388838755..258ccded5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java @@ -75,4 +75,16 @@ public interface StructattrService { * @return */ JSONArray getStructByCodes(JSONArray json); + + /** + * 获取点位信息 + * @return + */ + JSONArray getStructByCodesFs(JSONArray json); + + /** + * 解锁点位 + * @return + */ + JSONObject unLockPoint(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index c7516d023..b03984dbc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java @@ -289,4 +289,60 @@ public class StructattrServiceImpl implements StructattrService { return arr; } + @Override + public JSONArray getStructByCodesFs(JSONArray jsonArray) { + WQLObject attrTab = WQLObject.getWQLObject("sch_base_point"); + JSONArray arr = new JSONArray(); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject obj = new JSONObject(); + JSONObject js = jsonArray.getJSONObject(i); + String struct_id = js.getString("struct_id"); + + if (ObjectUtil.isEmpty(struct_id)) continue; + + int struct_status = 2; + // 获取信息 1蓝色空载具 2黄色木箱 3绿色空位 4灰色禁用 + // 查找详细信息, 这里可能是有多条数据 + JSONArray array = WQL + .getWO("QST_STRUCTATTR") + .addParamMap(MapOf.of("struct_id", struct_id, "flag", "2")) + .process() + .getResultJSONArray(0); + // 获取仓位表中的信息 + JSONObject strInfo = attrTab + .query("point_id = '" + struct_id + "'") + .uniqueResult(0); + if (ObjectUtil.isEmpty(strInfo.getString("vehicle_code"))) { + // 空位 + struct_status = 3; + } + + // 剩余层数货位信息没统计,统计可以用obj.put(key, value)返给前端,前端在initStatus()就可以遍历去获取,给节点赋值 + obj.put("data", array); + obj.put("struct_status", struct_status); + obj.put("struct_id", strInfo.getString("point_id")); + obj.put("struct_code", strInfo.getString("point_code")); + obj.put("id", js.getString("id")); // 设备不存在就只保留id,方便前端查看 + arr.add(obj); + } + return arr; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public JSONObject unLockPoint(JSONObject whereJson) { + WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + + String point_code = whereJson.getString("point_code"); + JSONObject jsonPoint = pointTab.query("point_code = '" + point_code + "'").uniqueResult(0); + + jsonPoint.put("point_status", "1"); + jsonPoint.put("vehicle_code", ""); + jsonPoint.put("lock_type", "1"); + + pointTab.update(jsonPoint); + + return null; + } + } diff --git a/lms/nladmin-ui/src/layout/components/Sidebar/SidebarItem.vue b/lms/nladmin-ui/src/layout/components/Sidebar/SidebarItem.vue index 2d49dd879..09fecf9b8 100644 --- a/lms/nladmin-ui/src/layout/components/Sidebar/SidebarItem.vue +++ b/lms/nladmin-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -62,13 +62,13 @@ export default { if (item.hidden) { return false } else { - // Temp set(will be used if only has one showing child) + // Temp set(will be used if only has rikuone showing child) this.onlyOneChild = item return true } }) - // When there is only one child router, the child router is displayed by default + // When there is only rikuone child router, the child router is displayed by default if (showingChildren.length === 1) { return true } diff --git a/lms/nladmin-ui/src/utils/index.js b/lms/nladmin-ui/src/utils/index.js index ab7ad3048..f458cce79 100644 --- a/lms/nladmin-ui/src/utils/index.js +++ b/lms/nladmin-ui/src/utils/index.js @@ -185,7 +185,7 @@ export function html2Text(val) { } /** - * Merges two objects, giving the last one precedence + * Merges two objects, giving the last rikuone precedence * @param {Object} target * @param {(Object|Array)} source * @returns {Object} diff --git a/lms/nladmin-ui/src/views/system/build/utils/index.js b/lms/nladmin-ui/src/views/system/build/utils/index.js index a704a65a0..7eb638b98 100644 --- a/lms/nladmin-ui/src/views/system/build/utils/index.js +++ b/lms/nladmin-ui/src/views/system/build/utils/index.js @@ -154,7 +154,7 @@ export function html2Text(val) { } /** - * Merges two objects, giving the last one precedence + * Merges two objects, giving the last rikuone precedence * @param {Object} target * @param {(Object|Array)} source * @returns {Object} diff --git a/lms/nladmin-ui/src/views/system/monitor/device/structStage.js b/lms/nladmin-ui/src/views/system/monitor/device/structStage.js index a70e0e623..11cd4133e 100644 --- a/lms/nladmin-ui/src/views/system/monitor/device/structStage.js +++ b/lms/nladmin-ui/src/views/system/monitor/device/structStage.js @@ -7,3 +7,26 @@ export function getStructByCodes(data) { // 获取仓位信息 data: data }) } + +export function getStructByCodesFs(data) { // 获取点位信息 + return request({ + url: 'api/structattr/getStructByCodesFs', + method: 'post', + data: data + }) +} + +export function unLockPoint(data) { // 解锁点位 + return request({ + url: 'api/structattr/unLockPoint', + method: 'post', + data: data + }) +} + +export function autoWeb() { // 查询立库监控数据 + return request({ + url: 'api/autoWeb/query', + method: 'post' + }) +} diff --git a/lms/nladmin-ui/src/views/wms/mnt/ibraryone/index.vue b/lms/nladmin-ui/src/views/wms/riku/rikuone/index.vue similarity index 97% rename from lms/nladmin-ui/src/views/wms/mnt/ibraryone/index.vue rename to lms/nladmin-ui/src/views/wms/riku/rikuone/index.vue index ebaaed711..34ac82a40 100644 --- a/lms/nladmin-ui/src/views/wms/mnt/ibraryone/index.vue +++ b/lms/nladmin-ui/src/views/wms/riku/rikuone/index.vue @@ -43,10 +43,11 @@ import { getStructByCodes } from '@/views/system/monitor/device/structStage' let data = {} let lf = '' export default { - name: 'MonitorDevice', + // 立库监控1层 + name: 'Ibraryone', data() { return { - stageParam: 'AS', // 舞台参数 + stageParam: 'AS_1', // 舞台参数 dialogDeviceMsgVisible: false, device_code: null, tops: '20vh', @@ -148,10 +149,10 @@ export default { this.initStatus() }) // todo: 定时器 - // this.timer = setInterval(() => { // 定时刷新设备的状态信息 - // console.log('定时器启动') - // this.initStatus() - // }, 10000) + this.timer = setInterval(() => { // 定时刷新设备的状态信息 + console.log('定时器启动') + this.initStatus() + }, 10000) }, initStatus() { // 初始化数据 let resion = {} diff --git a/lms/nladmin-ui/src/views/wms/riku/rikustat/PieChart.vue b/lms/nladmin-ui/src/views/wms/riku/rikustat/PieChart.vue new file mode 100644 index 000000000..a478720ce --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/riku/rikustat/PieChart.vue @@ -0,0 +1,100 @@ + + + diff --git a/lms/nladmin-ui/src/views/wms/riku/rikustat/index.vue b/lms/nladmin-ui/src/views/wms/riku/rikustat/index.vue new file mode 100644 index 000000000..4abeb3dc8 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/riku/rikustat/index.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/riku/rikutthree/index.vue b/lms/nladmin-ui/src/views/wms/riku/rikutthree/index.vue new file mode 100644 index 000000000..3b319a850 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/riku/rikutthree/index.vue @@ -0,0 +1,270 @@ + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/riku/rikutwo/index.vue b/lms/nladmin-ui/src/views/wms/riku/rikutwo/index.vue new file mode 100644 index 000000000..66950aadf --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/riku/rikutwo/index.vue @@ -0,0 +1,270 @@ + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue b/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue new file mode 100644 index 000000000..f7a2d070b --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue @@ -0,0 +1,313 @@ + + + + + +