Browse Source

Merge remote-tracking branch 'origin/master'

master
lxc 2 years ago
parent
commit
b5e40eee81
  1. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165755210.png
  2. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165939624.png
  3. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170250269.png
  4. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170409719.png
  5. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170533693.png
  6. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170552294.png
  7. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170729180.png
  8. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170859949.png
  9. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170920065.png
  10. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171011984.png
  11. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171044642.png
  12. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171142608.png
  13. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171421269.png
  14. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171521816.png
  15. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171608689.png
  16. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171638814.png
  17. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172155807.png
  18. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172345382.png
  19. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172527998.png
  20. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172615401.png
  21. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172737439.png
  22. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173314418.png
  23. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173503162.png
  24. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173600524.png
  25. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173812784.png
  26. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173954514.png
  27. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174027870.png
  28. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174455421.png
  29. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174532295.png
  30. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174614023.png
  31. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174647838.png
  32. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174727315.png
  33. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174735524.png
  34. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174958976.png
  35. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175057359.png
  36. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175300760.png
  37. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175430367.png
  38. BIN
      lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175630615.png
  39. 124
      lpro/src/main/resources/开发辅助文档/开发辅助文档.md
  40. 12
      lpro/src/main/webapp/page/visual/index.html
  41. 32
      lpro/src/main/webapp/page/visual/js/cfg.js
  42. BIN
      开发文档/开发辅助文档.docx

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165755210.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165939624.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170250269.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170409719.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170533693.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170552294.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170729180.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170859949.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170920065.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171011984.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171044642.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171142608.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171421269.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171521816.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171608689.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171638814.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172155807.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172345382.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172527998.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172615401.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172737439.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173314418.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173503162.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173600524.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173812784.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173954514.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174027870.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174455421.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174532295.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174614023.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174647838.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174727315.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174735524.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174958976.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175057359.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175300760.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175430367.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

BIN
lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175630615.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

124
lpro/src/main/resources/开发辅助文档/开发辅助文档.md

@ -1,124 +0,0 @@
# 组态管理
## 组态列表
### 可视化管理
#### 编辑
##### 相关文件位置
![image-20220927165755210](开发辅助文档.assets/image-20220927165755210.png)
##### 节点拖入画布的添加节点方法
![image-20220927170250269](开发辅助文档.assets/image-20220927170250269.png)
重要代码 前面都是调整样式
![image-20220927170552294](开发辅助文档.assets/image-20220927170552294.png)
新增echart数据,液位图在5
![image-20220927170729180](开发辅助文档.assets/image-20220927170729180.png)
##### 初始化模板列表
![image-20220927170920065](开发辅助文档.assets/image-20220927170920065.png)
###### 液位图
![image-20220927171011984](开发辅助文档.assets/image-20220927171011984.png)
液位图相关方法
![image-20220927171142608](开发辅助文档.assets/image-20220927171142608.png)
##### 点击元素回显事件
![image-20220927172345382](开发辅助文档.assets/image-20220927172345382.png)
##### Html页面中相关的属性和事件
###### 液位图最大值
**液位图最大值**的修改,最大值**Vue**属性**charMax**,**节点元素**属性**max**
![image-20220927171421269](开发辅助文档.assets/image-20220927171421269.png)
###### 边框
**有无边框的修改**
![image-20220927171638814](开发辅助文档.assets/image-20220927171638814.png)
```javascript
optnj.series[0].outline.show=[false|true] // 边框显隐藏
eval("("+ cl.children(".chartStyle").attr("option") +")"); // 字符串转换为对象
```
**setChartOption**更新echart数据
![image-20220927172155807](开发辅助文档.assets/image-20220927172155807.png)
###### 动画和形状
**禁用动画和形状选择事件**
![image-20220927172527998](开发辅助文档.assets/image-20220927172527998.png)
**cfg.current_edit_obj**
这个对象是当前选中组件的容器元素,一个div。
![image-20220927172737439](开发辅助文档.assets/image-20220927172737439.png)
元素属性enableanimationn取反就是vue属性isDisableAnimation的值
元素属性shape与vue属性shape值一致
###### 相关属性截图
![image-20220927173314418](开发辅助文档.assets/image-20220927173314418.png)
###### 保存调用方法与接口
![image-20220927173600524](开发辅助文档.assets/image-20220927173600524.png)
![image-20220927173812784](开发辅助文档.assets/image-20220927173812784.png)
###### 预览调用方法与接口
![image-20220927174027870](开发辅助文档.assets/image-20220927174027870.png)
![image-20220927173954514](开发辅助文档.assets/image-20220927173954514.png)
# 系统管理
## LPM管理
### 相关文件路径
![image-20220927174614023](开发辅助文档.assets/image-20220927174614023.png)
**相关页面**
![image-20220927174735524](开发辅助文档.assets/image-20220927174735524.png)
### ip和port效验
![image-20220927174958976](开发辅助文档.assets/image-20220927174958976.png)
![image-20220927175057359](开发辅助文档.assets/image-20220927175057359.png)
**使用正则对象的地方**
![image-20220927175300760](开发辅助文档.assets/image-20220927175300760.png)
![image-20220927175430367](开发辅助文档.assets/image-20220927175430367.png)
### 效验规则在页面中使用场景
![image-20220927175630615](开发辅助文档.assets/image-20220927175630615.png)

12
lpro/src/main/webapp/page/visual/index.html

@ -1848,7 +1848,7 @@
// 写入元素属性 // 写入元素属性
cl.attr("max" , this.chartMax ) ; cl.attr("max" , this.chartMax ) ;
// @新增 更新label 显示设置 // @新增 更新label 显示设置
updateChartsOption(); // updateChartsOption();
}, },
changeChartColumn(){ changeChartColumn(){
// 增加边框 // 增加边框
@ -1858,11 +1858,11 @@
var cid = cl.attr("cid") ; var cid = cl.attr("cid") ;
var optnj = eval("("+ cl.children(".chartStyle").attr("option") +")"); var optnj = eval("("+ cl.children(".chartStyle").attr("option") +")");
// @新增 格式化lable 显示属性 // @新增 格式化lable 显示属性
optnj.series[0].label.formatter=function(param){ // optnj.series[0].label.formatter=function(param){
return param.seriesName + '\n' // return param.seriesName + '\n'
+ param.name + '\n' // + param.name + '\n'
+ max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; // + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)';
}; // };
if(this.columnVal == 0){ if(this.columnVal == 0){
optnj.series[0].outline.show = false ; optnj.series[0].outline.show = false ;
}else if(this.columnVal == 1){ }else if(this.columnVal == 1){

32
lpro/src/main/webapp/page/visual/js/cfg.js

@ -868,13 +868,13 @@ function initSensorLiquidChart(){
} }
}, },
label:{ label:{
formatter:function(param){ // formatter:function(param){
// @修订 // // @修订
// param.seriesName + '\n'+ param.name + '\n'+ max +'单位/'+ xn +'单位('+param.value*100+'%)'; // // param.seriesName + '\n'+ param.name + '\n'+ max +'单位/'+ xn +'单位('+param.value*100+'%)';
return param.seriesName + '\n' // return param.seriesName + '\n'
+ param.name + '\n' // + param.name + '\n'
+ max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; // + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)';
}, // },
fontSize:siz, fontSize:siz,
}, },
backgroundStyle://内图背景色边 backgroundStyle://内图背景色边
@ -939,8 +939,8 @@ function disableLiquidFillAnimation(nodeId){
function updateChartsOption(propertyName,value){ function updateChartsOption(propertyName,value){
// 当前地图容器 // 当前地图容器
var current_edit_obj = cfg.current_edit_obj; var current_edit_obj = cfg.current_edit_obj;
let max=current_edit_obj.attr("max"); // let max=current_edit_obj.attr("max");
max=max?max:1000; // max=max?max:1000;
// 当前地图数据节点 // 当前地图数据节点
const optionNode=current_edit_obj.children()[0]; const optionNode=current_edit_obj.children()[0];
// 获取数据属性 // 获取数据属性
@ -955,11 +955,11 @@ function updateChartsOption(propertyName,value){
// 写入属性 // 写入属性
optionNode.setAttribute("option",JSON.stringify(option)); optionNode.setAttribute("option",JSON.stringify(option));
// 设置lable显示格式 // 设置lable显示格式
option.series[0].label.formatter=function(param){ // option.series[0].label.formatter=function(param){
return param.seriesName + '\n' // return param.seriesName + '\n'
+ param.name + '\n' // + param.name + '\n'
+ max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; // + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)';
}; // };
// 更新地图 // 更新地图
chart.setOption(option); chart.setOption(option);
} }
@ -1264,6 +1264,10 @@ function resetNodeData(id,type){
} else if(cid == "3"){ //仪表盘 } else if(cid == "3"){ //仪表盘
initSensorDashChart(); initSensorDashChart();
} else if(cid == "4"){ //液位图 } else if(cid == "4"){ //液位图
// 液位图绑定数据 不进行初始化数据
if(id!=null){
return;;
}
initSensorLiquidChart(); initSensorLiquidChart();
} }
} else if(nid=="6"){ //地图 } else if(nid=="6"){ //地图

BIN
开发文档/开发辅助文档.docx

Binary file not shown.
Loading…
Cancel
Save