diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165755210.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165755210.png deleted file mode 100644 index 1ebda19..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165755210.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165939624.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165939624.png deleted file mode 100644 index 498566c..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927165939624.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170250269.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170250269.png deleted file mode 100644 index a965614..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170250269.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170409719.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170409719.png deleted file mode 100644 index 8b07bc8..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170409719.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170533693.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170533693.png deleted file mode 100644 index 831efc9..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170533693.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170552294.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170552294.png deleted file mode 100644 index 831efc9..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170552294.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170729180.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170729180.png deleted file mode 100644 index 11b8f25..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170729180.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170859949.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170859949.png deleted file mode 100644 index f7d9374..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170859949.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170920065.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170920065.png deleted file mode 100644 index f7d9374..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927170920065.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171011984.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171011984.png deleted file mode 100644 index 5ad649e..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171011984.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171044642.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171044642.png deleted file mode 100644 index 1f7f1fd..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171044642.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171142608.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171142608.png deleted file mode 100644 index 59ecab0..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171142608.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171421269.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171421269.png deleted file mode 100644 index c39beff..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171421269.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171521816.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171521816.png deleted file mode 100644 index c39beff..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171521816.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171608689.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171608689.png deleted file mode 100644 index 186baf0..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171608689.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171638814.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171638814.png deleted file mode 100644 index 186baf0..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927171638814.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172155807.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172155807.png deleted file mode 100644 index 6584e80..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172155807.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172345382.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172345382.png deleted file mode 100644 index 359f422..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172345382.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172527998.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172527998.png deleted file mode 100644 index 83042a7..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172527998.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172615401.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172615401.png deleted file mode 100644 index 83042a7..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172615401.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172737439.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172737439.png deleted file mode 100644 index 1f75d39..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927172737439.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173314418.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173314418.png deleted file mode 100644 index bea5052..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173314418.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173503162.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173503162.png deleted file mode 100644 index 691bc8c..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173503162.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173600524.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173600524.png deleted file mode 100644 index cf1b345..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173600524.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173812784.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173812784.png deleted file mode 100644 index a951d30..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173812784.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173954514.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173954514.png deleted file mode 100644 index bf13154..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927173954514.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174027870.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174027870.png deleted file mode 100644 index 801623f..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174027870.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174455421.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174455421.png deleted file mode 100644 index 5192bf4..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174455421.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174532295.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174532295.png deleted file mode 100644 index 45cc0f5..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174532295.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174614023.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174614023.png deleted file mode 100644 index 53dabe0..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174614023.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174647838.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174647838.png deleted file mode 100644 index 3669e06..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174647838.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174727315.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174727315.png deleted file mode 100644 index 3669e06..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174727315.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174735524.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174735524.png deleted file mode 100644 index 3669e06..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174735524.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174958976.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174958976.png deleted file mode 100644 index ffddba1..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927174958976.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175057359.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175057359.png deleted file mode 100644 index 8a4b2b7..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175057359.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175300760.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175300760.png deleted file mode 100644 index 5024700..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175300760.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175430367.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175430367.png deleted file mode 100644 index 1ae0640..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175430367.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175630615.png b/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175630615.png deleted file mode 100644 index 7efbfdc..0000000 Binary files a/lpro/src/main/resources/开发辅助文档/开发辅助文档.assets/image-20220927175630615.png and /dev/null differ diff --git a/lpro/src/main/resources/开发辅助文档/开发辅助文档.md b/lpro/src/main/resources/开发辅助文档/开发辅助文档.md deleted file mode 100644 index 1edc8cf..0000000 --- a/lpro/src/main/resources/开发辅助文档/开发辅助文档.md +++ /dev/null @@ -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) \ No newline at end of file diff --git a/lpro/src/main/webapp/page/visual/index.html b/lpro/src/main/webapp/page/visual/index.html index 8409f15..561f555 100644 --- a/lpro/src/main/webapp/page/visual/index.html +++ b/lpro/src/main/webapp/page/visual/index.html @@ -1848,7 +1848,7 @@ // 写入元素属性 cl.attr("max" , this.chartMax ) ; // @新增 更新label 显示设置 - updateChartsOption(); + // updateChartsOption(); }, changeChartColumn(){ // 增加边框 @@ -1858,11 +1858,11 @@ var cid = cl.attr("cid") ; var optnj = eval("("+ cl.children(".chartStyle").attr("option") +")"); // @新增 格式化lable 显示属性 - optnj.series[0].label.formatter=function(param){ - return param.seriesName + '\n' - + param.name + '\n' - + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; - }; + // optnj.series[0].label.formatter=function(param){ + // return param.seriesName + '\n' + // + param.name + '\n' + // + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; + // }; if(this.columnVal == 0){ optnj.series[0].outline.show = false ; }else if(this.columnVal == 1){ diff --git a/lpro/src/main/webapp/page/visual/js/cfg.js b/lpro/src/main/webapp/page/visual/js/cfg.js index 0a2c1ac..5e4b634 100644 --- a/lpro/src/main/webapp/page/visual/js/cfg.js +++ b/lpro/src/main/webapp/page/visual/js/cfg.js @@ -868,13 +868,13 @@ function initSensorLiquidChart(){ } }, label:{ - formatter:function(param){ - // @修订 - // param.seriesName + '\n'+ param.name + '\n'+ max +'单位/'+ xn +'单位('+param.value*100+'%)'; - return param.seriesName + '\n' - + param.name + '\n' - + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; - }, + // formatter:function(param){ + // // @修订 + // // param.seriesName + '\n'+ param.name + '\n'+ max +'单位/'+ xn +'单位('+param.value*100+'%)'; + // return param.seriesName + '\n' + // + param.name + '\n' + // + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; + // }, fontSize:siz, }, backgroundStyle://内图背景色边 @@ -939,8 +939,8 @@ function disableLiquidFillAnimation(nodeId){ function updateChartsOption(propertyName,value){ // 当前地图容器 var current_edit_obj = cfg.current_edit_obj; - let max=current_edit_obj.attr("max"); - max=max?max:1000; + // let max=current_edit_obj.attr("max"); + // max=max?max:1000; // 当前地图数据节点 const optionNode=current_edit_obj.children()[0]; // 获取数据属性 @@ -955,11 +955,11 @@ function updateChartsOption(propertyName,value){ // 写入属性 optionNode.setAttribute("option",JSON.stringify(option)); // 设置lable显示格式 - option.series[0].label.formatter=function(param){ - return param.seriesName + '\n' - + param.name + '\n' - + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; - }; + // option.series[0].label.formatter=function(param){ + // return param.seriesName + '\n' + // + param.name + '\n' + // + max +'单位/'+ param.value*max +'单位('+param.value*100+'%)'; + // }; // 更新地图 chart.setOption(option); } @@ -1264,6 +1264,10 @@ function resetNodeData(id,type){ } else if(cid == "3"){ //仪表盘 initSensorDashChart(); } else if(cid == "4"){ //液位图 + // 液位图绑定数据 不进行初始化数据 + if(id!=null){ + return;; + } initSensorLiquidChart(); } } else if(nid=="6"){ //地图 diff --git a/开发文档/开发辅助文档.docx b/开发文档/开发辅助文档.docx new file mode 100644 index 0000000..c45b623 Binary files /dev/null and b/开发文档/开发辅助文档.docx differ