add: 新增立库监控前后端

lms/nladmin-system/src/main/java/org/nl/AppRun.java

@@ -1,10 +1,16 @@
 package org.nl;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
 import com.alicp.jetcache.anno.config.EnableMethodCache;
 import io.swagger.annotations.Api;
 import org.mybatis.spring.annotation.MapperScan;
+import org.nl.common.utils.MapOf;
+import org.nl.modules.wql.WQL;
+import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -70,5 +76,108 @@ public class AppRun {
     public String index() {
         return "Backend service started successfully";
     }
+    @GetMapping("/w") // 最后可以去掉这个方法
+    @SaIgnore
+    public String index2() {
+        // 采用循环+判断进行铺设图标, 可以通过舞台编辑协助完成
+        WQLObject stageTab = WQLObject.getWQLObject("stage");
+        WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
+        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 = 2; i < 23; i=i+2) { // 第几块，每两块为一块
+            // 获取列数col_num
+            System.out.println( (i>=10?"3":"30") + i);
+            JSONObject jsonObject = WQL.getWO("ss").addParamMap(MapOf.of("flag", "1"
+                    , "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?"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);
+                    if (object.getString("is_delete").equals("1")) {
+                        x = x + step + nodeSizeW;
+                        continue;
+                    }
+                    // 设置节点，只需要struct_id, 自定义参数数据都加载properties对象里面
+                    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", object.getString("struct_id")); // 灵活配置，其他为固定参数
+                    node.put("properties", properties);
+                    node.put("zIndex", "2023");
+                    x = x + step + nodeSizeW;
+                    nodes.add(node);
+                    if (k+1 < array.size()) { // 如果块与块不同,空一个距离
+                        JSONObject object2 = array.getJSONObject(k+1);
+                        if (!object2.getString("block_num").equals(object.getString("block_num"))) {
+                            JSONObject node2 = new JSONObject();
+                            node2.put("id", IdUtil.getSnowflake(1,1).nextIdStr());
+                            node2.put("type", type);
+                            node2.put("x", x);
+                            node2.put("y", y);
+                            JSONObject properties2 = new JSONObject();
+                            JSONObject nodeSize2 = new JSONObject();
+                            nodeSize2.put("width", nodeSizeW);
+                            nodeSize2.put("height", nodeSizeH);
+                            properties2.put("nodeSize", nodeSize2);
+                            properties2.put("flag", "1");
+                            properties2.put("transform", 90);
+                            node2.put("properties", properties2);
+                            node2.put("zIndex", "2023");
+                            x = x + step + nodeSizeW;
+                            nodes.add(node2);
+                        }
+                    }
+                }
+                // 下一列
+                x = 50;
+                y = y + step + nodeSizeH;
+            }
+            // 下一个块
+            x = 50;
+            for (int j = 0; j < 16; j++) { // 铺设一行道路
+                JSONObject node2 = new JSONObject();
+                node2.put("id", IdUtil.getSnowflake(1,1).nextIdStr());
+                node2.put("type", type);
+                node2.put("x", x);
+                node2.put("y", y);
+                JSONObject properties2 = new JSONObject();
+                JSONObject nodeSize2 = new JSONObject();
+                nodeSize2.put("width", nodeSizeW);
+                nodeSize2.put("height", nodeSizeH);
+                properties2.put("nodeSize", nodeSize2);
+                properties2.put("flag", "1");
+                node2.put("properties", properties2);
+                node2.put("zIndex", "2023");
+                x = x + step + nodeSizeW;
+                nodes.add(node2);
+            }
+            x = 50;
+            y = y + step + nodeSizeH;
+        }
+        save.put("nodes", nodes);
+        save.put("edges", edges);
+        JSONObject jsonObject = stageTab.query("stage_code = 'AS_3'").uniqueResult(0);
+        jsonObject.put("stage_data", save);
+        stageTab.update(jsonObject);
+        return "Backend service started successfully";
+    }
 }
 

lms/nladmin-system/src/main/java/org/nl/ss.wql

@@ -0,0 +1,54 @@
+[交易说明]
+	交易名：	半成品出库
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.block_num					TYPEAS s_string
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+	IF 输入.flag = "1"
+		QUERY
+			SELECT
+			    MAX(col_num) as num
+            FROM
+            	`st_ivt_structattr`
+            WHERE
+            1=1
+                 OPTION 输入.block_num <> ""
+                    block_num = 输入.block_num
+                ENDOPTION
+			ENDSELECT
+		ENDQUERY
+	ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java

@@ -2,6 +2,7 @@
 package org.nl.wms.basedata.st.rest;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -73,4 +74,12 @@ public class StructattrController {
         structattrService.changeActive(json);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+
+    @PostMapping("/getStructByCodes")
+    @Log("获取仓位信息")
+    @ApiOperation("获取仓位信息")
+    public ResponseEntity<Object> getStructByCodes(@RequestBody String json){
+        JSONArray jsonArray = JSONArray.parseArray(json);
+        return new ResponseEntity<>(structattrService.getStructByCodes(jsonArray), HttpStatus.OK);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java

@@ -1,6 +1,7 @@
 
 package org.nl.wms.basedata.st.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.basedata.st.service.dto.StructattrDto;
 import org.springframework.data.domain.Pageable;
@@ -69,4 +70,9 @@ public interface StructattrService {
      */
     void changeActive(JSONObject json);
 
+    /**
+     * 获取仓位信息
+     * @return
+     */
+    JSONArray getStructByCodes(JSONArray json);
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java

@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.MapOf;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.basedata.st.service.SectattrService;
@@ -240,4 +241,52 @@ public class StructattrServiceImpl implements StructattrService {
         WQLObject.getWQLObject("sch_base_point").update(json, " point_id = '" + struct_id + "'");
     }
 
+    @Override
+    public JSONArray getStructByCodes(JSONArray jsonArray) {
+        /**
+         * jsonArry: 所有组件的信息，包括组件本身的id以及仓位id，组件id是用来给前端做对应筛选使用，如果没有仓位id证明不是
+         * 仓位组件，故不做处理，可以不用返回数据。
+         */
+        WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
+        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", "1"))
+                    .process()
+                    .getResultJSONArray(0);
+            // 获取仓位表中的信息
+            JSONObject strInfo = attrTab
+                    .query("struct_id = '" + struct_id + "'")
+                    .uniqueResult(0);
+            if (strInfo.getString("is_delete").equals("1")) {
+                // 被删掉
+                struct_status = 4;
+            } else if (ObjectUtil.isEmpty(strInfo.getString("storagevehicle_code"))) {
+                // 空位
+                struct_status = 3;
+            } else if (ObjectUtil.isNotEmpty(strInfo.getString("storagevehicle_code"))
+                    && strInfo.getString("sect_code").equals("KTP01")) {
+                struct_status = 1;
+            }
+            // 剩余层数货位信息没统计，统计可以用obj.put(key, value)返给前端，前端在initStatus()就可以遍历去获取，给节点赋值
+            obj.put("data", array);
+            obj.put("struct_status", struct_status);
+            obj.put("struct_id", strInfo.getString("struct_id"));
+            obj.put("struct_code", strInfo.getString("struct_code"));
+            obj.put("id", js.getString("id")); // 设备不存在就只保留id，方便前端查看
+            arr.add(obj);
+        }
+        return arr;
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTATTR.wql

@@ -0,0 +1,62 @@
+[交易说明]
+	交易名：	将海亮的物料导入mysql
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					                    TYPEAS s_string
+	输入.struct_id					            TYPEAS s_string
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		QUERY
+			SELECT
+            	attr.*,
+            	sub.package_box_sn,
+            	sub.quanlity_in_box,
+            	sub.box_weight,
+            	sub.sale_order_name,
+            	sub.container_name,
+            	sub.product_description,
+            	sub.net_weight
+            FROM
+            	st_ivt_structattr attr
+            	LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = attr.storagevehicle_code
+            WHERE
+                1 = 1
+                OPTION 输入.struct_id <> ""
+                    attr.struct_id = 输入.struct_id
+                ENDOPTION
+			ENDSELECT
+		ENDQUERY
+	ENDIF

lms/nladmin-ui/package.json

@@ -33,7 +33,7 @@
     "url": "https://github.com/elunez/eladmin/issues"
   },
   "dependencies": {
-    "@logicflow/core": "^1.1.22",
+    "@logicflow/core": "^1.2.3",
     "@logicflow/extension": "^1.1.22",
     "@riophae/vue-treeselect": "0.4.0",
     "af-table-column": "^1.0.3",

lms/nladmin-ui/src/assets/icons/svg/clear.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660786702479" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9117" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M736 128l-32-64H320l-32 64H128v128h768V128H736zM192 896a64 64 0 0 0 64 64h512a64 64 0 0 0 64-64V320H192z" p-id="9118" fill="#000000"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/downAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785745738" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4619" width="200" height="200" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 896h896v64H64z" fill="#000000" p-id="4620"></path><path d="M192 832V64h256v768z" fill="#000000" p-id="4621"></path><path d="M576 832V320h256v512z" fill="#000000" p-id="4622"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/horizontalAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660787363495" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11210" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 480h896v64H64z" fill="#000000" p-id="11211"></path><path d="M832 256v512H576V256z" fill="#000000" p-id="11212"></path><path d="M448 128v768H192V128z" fill="#000000" p-id="11213"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/horizontalDistribution.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660786338362" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6924" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M768 938.666667V85.333333h59.733333v853.333334zM196.266667 938.666667V85.333333H256v853.333334z m251.733333-128A64 64 0 0 1 384 746.666667v-469.333334A64 64 0 0 1 448 213.333333h128A64 64 0 0 1 640 277.333333v469.333334a64 64 0 0 1-64 64z" p-id="6925" fill="#000000"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/leftAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785822800" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5157" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 64h64v896H64z" fill="#000000" p-id="5158"></path><path d="M192 192h515v256H192z" fill="#000000" p-id="5159"></path><path d="M192 576h768v256H192z" fill="#000000" p-id="5160"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/rightAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785927475" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5880" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M896 64h64v896h-64z" fill="#000000" p-id="5881"></path><path d="M320 192h512v256H320z" fill="#000000" p-id="5882"></path><path d="M64 576h768v256H64z" fill="#000000" p-id="5883"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/save.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660786920066" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10198" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M643.85952427 262.90530987c-18.01693867 0-32.75707733 14.614528-32.75707734 32.48401066v81.20456534c0 17.86948267 14.74013867 32.489472 32.75707734 32.489472s32.75707733-14.61998933 32.75707733-32.489472v-81.20456534c0-17.86948267-14.74013867-32.48401067-32.75707733-32.48401066z" fill="#2c2c2c" p-id="10199"></path><path d="M910.47417173 313.84644267l-145.784832-207.89111467c-13.09627733-17.86948267-34.39547733-29.23451733-58.966016-30.86199467H175.01825707c-36.03933867 0-65.519616 29.23451733-65.519616 64.96802134v745.49930666c0 35.733504 29.48027733 63.34600533 65.519616 63.34600534h689.586176c36.03933867 0 63.88667733-29.23997867 63.88667733-63.34600534v-526.23223466c1.6384-17.86948267-6.54813867-34.111488-18.01693867-45.481984zM205.0555904 171.87908267h517.59786667v220.889088c0 30.85653333-26.2144 58.46903467-58.966016 58.46903466H264.0216064c-32.76253867 0-58.966016-25.985024-58.966016-58.46903466V171.87908267z m544.25572693 665.059328h-462.60770133c-24.6382592 0-44.61253973-20.29431467-44.61253973-45.32906667s19.97318827-45.32906667 44.61253973-45.32906667h462.60770133c24.6382592 0 44.61253973 20.29431467 44.61253974 45.32906667s-19.97428053 45.32906667-44.61253974 45.32906667z m0.00109227-167.10587734H286.70252373c-24.6382592 0-44.61253973-20.29431467-44.61253973-45.32906666s19.97318827-45.32906667 44.61253973-45.32906667h462.61097814c24.6382592 0 44.61253973 20.29431467 44.61253973 45.32906667s-19.97428053 45.32906667-44.613632 45.32906666z" fill="#000000" p-id="10200"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/upAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785897716" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5639" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 64h896v64H64z" fill="#000000" p-id="5640"></path><path d="M192 960V192h256v768z" fill="#000000" p-id="5641"></path><path d="M576 704V192h256v512z" fill="#000000" p-id="5642"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/verticalAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785982322" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6318" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M480 64h64v896h-64z" fill="#000000" p-id="6319"></path><path d="M256 192h512v256H256z" fill="#000000" p-id="6320"></path><path d="M128 576h768v256H128z" fill="#000000" p-id="6321"></path></svg>

lms/nladmin-ui/src/assets/icons/svg/verticalDistribution.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660786309837" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6643" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M85.333333 827.733333V768h853.333334v59.733333zM277.333333 640A64 64 0 0 1 213.333333 576v-128A64 64 0 0 1 277.333333 384h469.333334a64 64 0 0 1 64 64v128a64 64 0 0 1-64 64zM85.333333 256V196.266667h853.333334V256z" p-id="6644" fill="#000000"></path></svg>

lms/nladmin-ui/src/views/system/logicflow/editor/components/DiagramToolbar.vue

@@ -24,43 +24,67 @@
       <step-foward size="18" />
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_lock">锁定</el-button>
+      <el-tooltip class="item" effect="dark" content="锁定" placement="top">
+        <svg-icon class="toolbar-item" icon-class="lock" @click="$_lock"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_unlock">解锁</el-button>
+      <el-tooltip class="item" effect="dark" content="解锁" placement="top">
+        <svg-icon class="toolbar-item" icon-class="unlock" @click="$_unlock"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_verticalAlign">垂直居中</el-button>
+      <el-tooltip class="item" effect="dark" content="垂直对齐" placement="top">
+        <svg-icon class="toolbar-item" icon-class="verticalAlign" @click="$_verticalAlign"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_horizontalAlign">水平居中</el-button>
+      <el-tooltip class="item" effect="dark" content="水平对齐" placement="top">
+        <svg-icon class="toolbar-item" icon-class="horizontalAlign" @click="$_horizontalAlign"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_leftAlign">向左对齐</el-button>
+      <el-tooltip class="item" effect="dark" content="左边对齐" placement="top">
+        <svg-icon class="toolbar-item" icon-class="leftAlign" @click="$_leftAlign"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_rightAlign">向右对齐</el-button>
+      <el-tooltip class="item" effect="dark" content="右边对齐" placement="top">
+        <svg-icon class="toolbar-item" icon-class="rightAlign" @click="$_rightAlign"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_upAlign">向上对齐</el-button>
+      <el-tooltip class="item" effect="dark" content="顶部对齐" placement="top">
+        <svg-icon class="toolbar-item" icon-class="upAlign" @click="$_upAlign"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_downAlign">向下对齐</el-button>
+      <el-tooltip class="item" effect="dark" content="底部对齐" placement="top">
+        <svg-icon class="toolbar-item" icon-class="downAlign" @click="$_downAlign"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_horizontalDistribution">水平分布</el-button>
+      <el-tooltip class="item" effect="dark" content="水平分布" placement="top">
+        <svg-icon class="toolbar-item" icon-class="verticalDistribution" @click="$_horizontalDistribution"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_verticalDistribution">垂直分布</el-button>
+      <el-tooltip class="item" effect="dark" content="垂直分布" placement="top">
+        <svg-icon class="toolbar-item" icon-class="horizontalDistribution" @click="$_verticalDistribution"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_cleanGraph">清空画布</el-button>
+      <el-tooltip class="item" effect="dark" content="清空画布" placement="top">
+        <svg-icon class="toolbar-item" icon-class="clear" @click="$_cleanGraph"/>
+      </el-tooltip>
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_saveGraph">保存</el-button>
+      <el-tooltip class="item" effect="dark" content="保存" placement="top">
+        <svg-icon class="toolbar-item" icon-class="save" @click="$_saveGraph"/>
+      </el-tooltip>
     </div>
     <div>
-      <el-select v-model="linetype" size="mini" @change="$_changeLineType" style="width: 80px">
+      <el-select v-model="linetype" size="mini" style="width: 80px" @change="$_changeLineType">
         <el-option
           v-for="item in lineOptions"
           :key="item.value"
@@ -71,7 +95,7 @@
     </div>
     <div>
       <span style="font-size: 14px; margin-left: 5px">舞台:</span>
-      <el-select v-model="stage_code" placeholder="请选择" @change="$_changeStage">
+      <el-select v-model="stage_code" placeholder="请选择" @change="$_changeStage" size="mini">
         <el-option
           v-for="item in stageSelectList"
           :key="item.stage_code"

lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js

@@ -1,13 +1,16 @@
 import { HtmlResize } from '@logicflow/extension'
-import defaultUrl from '../../../image/agv.svg'
+import defaultUrl from '../../../image/Empty_state_money.svg'
+import vehicle from '../../../image/vehicle.svg'
 import api from '@/store/modules/api'
-import tray from '../../../image/托盘.svg'
+import rold from '../../../image/rold.svg'
-import icon_alert from '../../../image/icon_alert.png'
+import wood from '../../../image/wood.svg'
+import empty from '../../../image/empty.svg'
+import ban from '../../../image/ban.svg'
 class ButtonNodeModel extends HtmlResize.model {
   initNodeData(data) {
     super.initNodeData(data)
-    this.width = 100
+    this.width = 50
-    this.height = 100
+    this.height = 50
     this.text.draggable = true
     this.text.editable = false
   }
@@ -25,50 +28,46 @@ class ButtonNode extends HtmlResize.view {
     // console.log('oldNode', oldNode)
     // 路径前缀
     const baseUrl = api.state.baseApi
-    // 颜色
-    let statusColor = '#1a912a'
     // 默认图片
     // let imageUrl = baseUrl + '/file/图片/专机-20220722094234555.png'
     let imageUrl = defaultUrl
-    // 托盘图片
+    // todo: 根据字段参数来判断图片怎么显示
-    const goods = tray
+    if (properties.struct_status) {
-    const trayHeight = Math.round(2 / 3 * oldNode._height)
+      switch (properties.struct_status) {
-    const trayWidth = Math.round(2 / 3 * oldNode._width)
+        case 1:
-    let trayDisplay = 'none'
+          imageUrl = vehicle
-    // 故障图片
+          break
-    const fault = icon_alert
+        case 2:
-    let faultDisplay = 'none'
+          imageUrl = wood
+          break
+        case 3:
+          imageUrl = empty
+          break
+        case 4:
+          imageUrl = ban
+          break
+        default:
+          break
+      }
+    }
     if (properties.imageUrl) { // 与图片尾部拼接
       imageUrl = baseUrl + '/file/图片/' + properties.imageUrl
     }
+    if (properties.flag == '1') {
+      imageUrl = rold
+    }
     if (!properties.transform) { // 如果没有值，设置默认为0度
       properties.transform = 0
     }
-    if (properties.isOnline) {
-      statusColor = '#54dc5f'
-    }
-    if (!properties.device) {
-      statusColor = 'rgba(255,255,255,0)'
-    }
-    if (properties.hasGoods) {
-      // 显示图片，并设置宽高
-      trayDisplay = 'flex'
-    }
-    if (properties.isError) {
-      // 显示图片，并设置宽高
-      faultDisplay = 'flex'
-    }
     if (properties.isLock !== undefined) {
       oldNode.draggable = !properties.isLock
     }
     const el = document.createElement('div')
     el.className = 'uml-wrapper'
     // el.id = 'uml-app'
+    // 节点显示数据html
     const html = `
       <div>
-        <div style="height: 15px; width: 15px; background-color: ${statusColor}; position: absolute; border-radius: 100px; z-index: 9999"></div>
-        <img src="${goods}" style="position: absolute; height: ${trayHeight}px; width: ${trayWidth}px; top: 15%; left: 15%; display: ${trayDisplay}">
-        <img src="${fault}" style="position: absolute; height: ${trayHeight}px; width: ${trayWidth}px; top: 15%; left: 15%; display: ${faultDisplay}">
         <img style="transform: rotate(${properties.transform}deg);" height="${oldNode._height}" width="${oldNode._width}" src="${imageUrl}">
       </div>
     `

lms/nladmin-ui/src/views/system/logicflow/editor/image/ban.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681192570476" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2046" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M891.050667 248.149333A101.888 101.888 0 0 0 820.352 213.333333H205.056a114.773333 114.773333 0 0 0-73.088 33.536C112.426667 266.410667 0 447.914667 0 486.144v244.053333c0.170667 18.432 7.68 36.053333 20.821333 48.896 13.397333 12.970667 31.317333 20.181333 49.92 20.053334h882.56c18.56 0.128 36.522667-7.082667 49.877334-20.096 13.141333-12.885333 20.650667-30.378667 20.821333-48.810667v-244.053333c0-38.272-132.992-238.037333-132.992-238.037334z m-227.669334 216.362667a32.981333 32.981333 0 0 0-33.792 23.765333v4.992a115.285333 115.285333 0 0 1-230.4-6.570666 36.437333 36.437333 0 0 0-32.682666-22.442667H76.288l98.901333-167.253333s19.797333-32.426667 38.613334-32.213334h616.021333c13.866667 7.296 25.344 18.346667 33.237333 31.914667l97.066667 167.808h-296.874667 0.128z" fill="#cdcdcd" p-id="2047"></path></svg>

lms/nladmin-ui/src/views/system/logicflow/editor/image/default.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681284873241" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1037" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M511.1296 490.1376l385.536-222.464a73.216 73.216 0 0 0-15.36-11.9808L546.8672 65.536a72.2432 72.2432 0 0 0-72.2432 0.4608l-331.776 194.56a70.912 70.912 0 0 0-10.24 7.5264zM487.2192 526.2336L109.4144 304.5888a72.0896 72.0896 0 0 0-2.304 18.5344l2.4576 384.5632a72.192 72.192 0 0 0 36.5056 62.3104l334.2336 190.1568c2.2528 1.28 4.608 2.3552 6.912 3.3792zM916.48 306.1248l-385.9968 222.7712v439.0912a70.144 70.144 0 0 0 22.016-8.2944l331.8272-194.56a72.192 72.192 0 0 0 35.84-62.7712l-2.4064-384.5632a76.4928 76.4928 0 0 0-1.28-11.6736z" fill="#bfbfbf" p-id="1038"></path></svg>

lms/nladmin-ui/src/views/system/logicflow/editor/image/empty.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681192570476" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2046" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M891.050667 248.149333A101.888 101.888 0 0 0 820.352 213.333333H205.056a114.773333 114.773333 0 0 0-73.088 33.536C112.426667 266.410667 0 447.914667 0 486.144v244.053333c0.170667 18.432 7.68 36.053333 20.821333 48.896 13.397333 12.970667 31.317333 20.181333 49.92 20.053334h882.56c18.56 0.128 36.522667-7.082667 49.877334-20.096 13.141333-12.885333 20.650667-30.378667 20.821333-48.810667v-244.053333c0-38.272-132.992-238.037333-132.992-238.037334z m-227.669334 216.362667a32.981333 32.981333 0 0 0-33.792 23.765333v4.992a115.285333 115.285333 0 0 1-230.4-6.570666 36.437333 36.437333 0 0 0-32.682666-22.442667H76.288l98.901333-167.253333s19.797333-32.426667 38.613334-32.213334h616.021333c13.866667 7.296 25.344 18.346667 33.237333 31.914667l97.066667 167.808h-296.874667 0.128z" fill="#228B22" p-id="2047"></path></svg>

lms/nladmin-ui/src/views/system/logicflow/editor/image/k.svg

@@ -0,0 +1,63 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1024 1024" height="1024px" width="1024px">
+    <title>没有数据</title>
+    <defs>
+        <linearGradient id="linearGradient-1" y2="-2.47145299e-14%" x2="50%" y1="100%" x1="50%">
+            <stop offset="0%" stop-opacity="0.1" stop-color="#FFFFFF"></stop>
+            <stop offset="13%" stop-opacity="0.19" stop-color="#FBFDFF"></stop>
+            <stop offset="41%" stop-opacity="0.43" stop-color="#F1F7FF"></stop>
+            <stop offset="81%" stop-opacity="0.82" stop-color="#E1EEFF"></stop>
+            <stop offset="100%" stop-color="#D9E9FF"></stop>
+        </linearGradient>
+        <filter id="filter-2" filterUnits="objectBoundingBox" height="566.7%" width="152.5%" y="-233.3%" x="-26.3%">
+            <feGaussianBlur in="SourceGraphic" stdDeviation="34.4615385"></feGaussianBlur>
+        </filter>
+        <linearGradient id="linearGradient-3" y2="50.0060613%" x2="99.5602054%" y1="50.0060613%" x1="0.334514458%">
+            <stop offset="0%" stop-color="#B3D0FD"></stop>
+            <stop offset="100%" stop-color="#B8D0FF"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-4" y2="50.0060613%" x2="99.5602054%" y1="50.0060613%" x1="0.334514458%">
+            <stop offset="0%" stop-color="#E2ECFF"></stop>
+            <stop offset="100%" stop-color="#99C0FF"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-5" y2="68.7464504%" x2="83.1961591%" y1="53.8713182%" x1="16.8038409%">
+            <stop offset="0%" stop-color="#A0CDFF"></stop>
+            <stop offset="100%" stop-color="#568BFF"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-6" y2="59.6198704%" x2="25.8284716%" y1="44.0234802%" x1="74.1715284%">
+            <stop offset="0%" stop-color="#B5D8FF"></stop>
+            <stop offset="100%" stop-color="#75A0FF"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-7" y2="50%" x2="-14.8903051%" y1="50%" x1="100%">
+            <stop offset="0%" stop-color="#FFFFFF"></stop>
+            <stop offset="6%" stop-color="#F9FCFF"></stop>
+            <stop offset="67.4804304%" stop-color="#DAEAFF"></stop>
+            <stop offset="84.9696706%" stop-color="#C7DFFF"></stop>
+            <stop offset="100%" stop-color="#C0DBFF"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-8" y2="-4054.70568%" x2="-1316.74401%" y1="-4054.70568%" x1="-1416.74401%">
+            <stop offset="0%" stop-color="#CBE2FC"></stop>
+            <stop offset="4%" stop-color="#FCFDFF"></stop>
+            <stop offset="35%" stop-color="#E9F3FF"></stop>
+            <stop offset="66%" stop-color="#DEECFF"></stop>
+            <stop offset="100%" stop-color="#DAEAFF"></stop>
+        </linearGradient>
+    </defs>
+    <g fill-rule="evenodd" fill="none" stroke-width="1" stroke="none" id="没有数据">
+        <g id="编组">
+            <rect height="1024" width="1024" y="0" x="0" fill="#FFFFFF" id="矩形"></rect>
+            <g transform="translate(221.538462, 226.461538)" id="编组-33">
+                <g id="编组-32">
+                    <path fill-rule="nonzero" fill="url(#linearGradient-1)" id="形状结合备份-13" d="M0,551.384615 L0,113.230769 L125.538,113.23 L125.538462,0 L324.923077,0 L324.923,167.384 L435.692308,167.384615 L435.692308,551.384615 L0,551.384615 Z M484.923077,113.230769 L580.923077,113.230769 L580.923077,551.384615 L484.923077,551.384615 L484.923077,113.230769 Z"></path>
+                    <ellipse ry="22.1538462" rx="196.923077" cy="551.384615" cx="290.461538" filter="url(#filter-2)" fill="#C2D5FF" id="椭圆形备份-9"></ellipse>
+                    <polygon points="443.111189 512 285.538462 491.043405 285.538462 317.538462 443.111189 337.230769" fill-rule="nonzero" fill="url(#linearGradient-3)" id="路径"></polygon>
+                    <polygon points="140.307692 512 285.538462 490.805339 285.538462 317.538462 140.307692 339.692308" fill-rule="nonzero" fill="url(#linearGradient-4)" id="路径"></polygon>
+                    <polygon points="302.769231 539.076923 140.307692 513.50918 140.307692 339.692308 302.769231 365.235724" fill="url(#linearGradient-5)" id="路径"></polygon>
+                    <polygon points="302.769231 539.076923 443.111189 512 443.111189 337.230769 302.769231 364.220259" fill="url(#linearGradient-6)" id="路径"></polygon>
+                    <polygon points="258.256172 406.153846 93.5384615 381.063661 138.05152 339.692308 302.769231 364.758619" fill-rule="nonzero" fill="url(#linearGradient-7)" id="路径"></polygon>
+                    <polygon points="344.581117 403.692308 487.384615 377.852661 443.111189 337.230769 302.769231 364.220259" fill-rule="nonzero" fill="url(#linearGradient-8)" id="路径"></polygon>
+                </g>
+                <g transform="translate(93.538462, 317.538462)" id="编组-5备份"></g>
+            </g>
+        </g>
+    </g>
+</svg>

lms/nladmin-ui/src/views/system/logicflow/editor/image/rold.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681208813752" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6697" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M544 480V64h-64v416H64v64h416v416h64V544h416v-64z" fill="#727272" p-id="6698"></path><path d="M123.7 241.1h119.5v64H123.7zM302.9 241.1h119.5v64H302.9zM601.6 241.1h119.5v64H601.6zM780.8 241.1h119.5v64H780.8zM123.7 718.9h119.5v64H123.7zM302.9 718.9h119.5v64H302.9zM601.6 718.9h119.5v64H601.6zM780.8 718.9h119.5v64H780.8z" fill="#B2B2B2" p-id="6699"></path></svg>

lms/nladmin-ui/src/views/system/logicflow/editor/image/vehicle.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681192570476" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2046" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M891.050667 248.149333A101.888 101.888 0 0 0 820.352 213.333333H205.056a114.773333 114.773333 0 0 0-73.088 33.536C112.426667 266.410667 0 447.914667 0 486.144v244.053333c0.170667 18.432 7.68 36.053333 20.821333 48.896 13.397333 12.970667 31.317333 20.181333 49.92 20.053334h882.56c18.56 0.128 36.522667-7.082667 49.877334-20.096 13.141333-12.885333 20.650667-30.378667 20.821333-48.810667v-244.053333c0-38.272-132.992-238.037333-132.992-238.037334z m-227.669334 216.362667a32.981333 32.981333 0 0 0-33.792 23.765333v4.992a115.285333 115.285333 0 0 1-230.4-6.570666 36.437333 36.437333 0 0 0-32.682666-22.442667H76.288l98.901333-167.253333s19.797333-32.426667 38.613334-32.213334h616.021333c13.866667 7.296 25.344 18.346667 33.237333 31.914667l97.066667 167.808h-296.874667 0.128z" fill="#1296db" p-id="2047"></path></svg>

lms/nladmin-ui/src/views/system/logicflow/editor/image/wood.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681192570476" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2046" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M891.050667 248.149333A101.888 101.888 0 0 0 820.352 213.333333H205.056a114.773333 114.773333 0 0 0-73.088 33.536C112.426667 266.410667 0 447.914667 0 486.144v244.053333c0.170667 18.432 7.68 36.053333 20.821333 48.896 13.397333 12.970667 31.317333 20.181333 49.92 20.053334h882.56c18.56 0.128 36.522667-7.082667 49.877334-20.096 13.141333-12.885333 20.650667-30.378667 20.821333-48.810667v-244.053333c0-38.272-132.992-238.037333-132.992-238.037334z m-227.669334 216.362667a32.981333 32.981333 0 0 0-33.792 23.765333v4.992a115.285333 115.285333 0 0 1-230.4-6.570666 36.437333 36.437333 0 0 0-32.682666-22.442667H76.288l98.901333-167.253333s19.797333-32.426667 38.613334-32.213334h616.021333c13.866667 7.296 25.344 18.346667 33.237333 31.914667l97.066667 167.808h-296.874667 0.128z" fill="#1afa29" p-id="2047"></path></svg>

lms/nladmin-ui/src/views/system/logicflow/index.vue

@@ -46,7 +46,7 @@
         <el-table-column prop="create_time" label="创建时间" min-width="135" />
         <el-table-column prop="update_by" label="修改者" />
         <el-table-column prop="update_time" label="修改时间" min-width="135" />
-        <el-table-column v-permission="['admin','stage:edit','stage:del']" label="操作" width="150px" align="center">
+        <el-table-column label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -101,9 +101,6 @@ export default {
   data() {
     return {
       permission: {
-        add: ['admin', 'stage:add'],
-        edit: ['admin', 'stage:edit'],
-        del: ['admin', 'stage:del']
       },
       rules: {
         stage_code: [

lms/nladmin-ui/src/views/system/monitor/device/index.vue

@@ -3,24 +3,50 @@
     <el-row>
       <div id="container" className="container" />
     </el-row>
+    <!--点击设备显示信息-->
+    <el-dialog
+      id="dialogs"
+      title="仓位信息"
+      class="newDialog"
+      :visible.sync="dialogDeviceMsgVisible"
+      width="22%"
+      :top="tops"
+      :show-close="false"
+      :modal="false"
+    >
+      <el-table
+        :data="arr"
+        style="width: 100%"
+        max-height="500px"
+      >
+        <el-table-column
+          prop="name"
+          label="监控项"
+        />
+        <el-table-column
+          prop="value"
+          label="当前值"
+        />
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import crudStage from '@/api/logicflow/stage'
-import paramCrud from '@/views/system/param/param'
 import '@logicflow/core/dist/style/index.css'
 import '@logicflow/extension/lib/style/index.css'
 
 import { LogicFlow } from '@logicflow/core'
 import { registerCustomElement } from '@/views/system/logicflow/editor/components/node'
+import { getStructByCodes } from '@/views/system/monitor/device/structStage'
 let data = {}
 let lf = ''
 export default {
   name: 'MonitorDevice',
   data() {
     return {
-      stageParam: 'test', // 舞台参数
+      stageParam: 'AS', // 舞台参数
       dialogDeviceMsgVisible: false,
       device_code: null,
       tops: '20vh',
@@ -41,7 +67,7 @@ export default {
         requireSucess: '',
         fullrequireSucess: ''
       },
-      allDeviceMsg: [],
+      allStructMsg: [],
       msgTop: '200px',
       msgLeft: '200px'
     }
@@ -49,6 +75,11 @@ export default {
   mounted() {
     this.init()
   },
+  beforeDestroy() {
+    // js提供的clearInterval方法用来清除定时器
+    console.log('定时器销毁')
+    clearInterval(this.timer)
+  },
   methods: {
     // 流程图初始化
     init() {
@@ -65,7 +96,7 @@ export default {
           size: 5
         },
         background: {
-          backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
+          // backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
           backgroundRepeat: 'repeat'
         },
         adjustEdge: false,
@@ -91,26 +122,110 @@ export default {
         nodeMenu: false
       })
       lf.on('node:click', (data, e) => { // 鼠标点击节点
-        // 展开显示设备信息
+        // 展开显示设备信息 todo: 1
-        console.log('1')
+        if (data.data.type !== 'pro-rect' && data.data.type !== 'pro-circle' && data.data.type !== 'triangle' && data.data.type !== 'rect-radius') {
-      })
+          if (data.data.properties.struct_id) {
-      lf.on('node:contextmenu', (data, e, position) => { // 右键
+            this.moveShow(data.data) // 传递节点数据，用来获取id做比对
-        console.log('2')
+            this.dialogDeviceMsgVisible = true
+            this.struct_id = data.data.properties.struct_id // ?暂时没用
+            this.tops = data.e.y + 'px'
+            document.getElementsByClassName('el-dialog')[0].style.marginLeft = data.e.x + 'px'
+          }
+        }
       })
+      // lf.on('node:mouseleave', (data, e) => {
+      //   this.dialogDeviceMsgVisible = false
+      // })
       // 开始渲染
       lf.render(data)
       this.initStageData()
     },
     initStageData() {
       // 获取舞台编码
-      this.getValueByCode(this.stageParam).then(res => {
+      crudStage.getNewStageDataByCode(this.stageParam).then(res => {
-        if (res.value !== undefined) {
+        data = JSON.parse(res.stage_data)
-          crudStage.getNewStageDataByCode(res.value).then(res => {
+        lf.render(data)
-            data = JSON.parse(res.stage_data)
+        this.initStatus()
-            lf.render(data)
+      })
-          })
+      // todo: 定时器
+      // this.timer = setInterval(() => { // 定时刷新设备的状态信息
+      //   console.log('定时器启动')
+      //   this.initStatus()
+      // }, 10000)
+    },
+    initStatus() { // 初始化数据
+      let resion = {}
+      resion = lf.getGraphData().nodes.map(item => ({ id: item.id, struct_id: item.properties.struct_id }))
+      getStructByCodes(resion).then(res => {
+        this.allStructMsg = res
+        // 实时设置状态信息
+        for (var item of res) { // 循环设置属性
+          if (item.struct_status != undefined) {
+            lf.setProperties(item.id, {
+              struct_status: item.struct_status
+            })
+          }
+        }
+        // 设置动态实时显示设备信息
+        const { nodes } = lf.getSelectElements() // 获取选中的节点
+        if (nodes.length === 1) { // 因为是定时器，没有选中则不用实时更新显示数据
+          this.moveShow(nodes[0]) // 监控模式下不可能托选，因此就只有一个数据
         }
       })
+    },
+    moveShow(nodeData) { // 点击之后显示出来的数据----只需要设备信息
+      let item = ''
+      // 查找点击节点的id
+      item = this.allStructMsg.find((structMsg) => structMsg.id === nodeData.id)
+      this.arr = [] // 清空
+      if (item.struct_id && item.data) { // item.data是数组
+        this.arr = [
+          { name: '货位编号', value: item.struct_code }
+        ]
+        const data1 = item.data[0] // 至少有一条
+        const data = item.data // 总的data数据
+        // 以下是设置参数显示值
+        for (const val in data1) {
+          if (val === 'storagevehicle_code' && data1.storagevehicle_code) {
+            const obj = { name: '木箱号', value: data1[val] }
+            this.arr.push(obj)
+          }
+          if (val === 'quanlity_in_box' && data1.quanlity_in_box) {
+            const obj = { name: '子卷数', value: data1[val] }
+            this.arr.push(obj)
+          }
+          if (val === 'sale_order_name' && data1.sale_order_name) {
+            const obj = { name: '订单号', value: data1[val] }
+            this.arr.push(obj)
+          }
+          if (val === 'product_description' && data1.product_description) {
+            const obj = { name: '物料', value: data1[val] }
+            this.arr.push(obj)
+          }
+          if (val === 'box_weight' && data1.box_weight) {
+            const obj = { name: '木箱总重', value: data1[val] }
+            this.arr.push(obj)
+          }
+        }
+        if (data.length > 1) { // 显示子卷
+          for (let i = 0; i < data.length; i++) {
+            let container_name
+            let net_weight
+            for (const val in data[i]) {
+              if (val === 'container_name' && data[i].container_name) {
+                container_name = data[i][val]
+              }
+              if (val === 'net_weight' && data[i].net_weight) {
+                net_weight = data[i][val]
+              }
+            }
+            if (container_name && net_weight) {
+              const obj = { name: container_name, value: net_weight }
+              this.arr.push(obj)
+            }
+          }
+        }
+      }
     }
   }
 }

lms/nladmin-ui/src/views/system/monitor/device/structStage.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getStructByCodes(data) { // 获取舞台上设备信息
+  return request({
+    url: 'api/structattr/getStructByCodes',
+    method: 'post',
+    data: data
+  })
+}