diff --git a/dsBase/ExtendJar/aspose-words-20.12-jdk17-crack.jar b/dsBase/ExtendJar/aspose-words-21.6.0-jdk17.jar similarity index 63% rename from dsBase/ExtendJar/aspose-words-20.12-jdk17-crack.jar rename to dsBase/ExtendJar/aspose-words-21.6.0-jdk17.jar index 01b7c6f9..4f9163ba 100644 Binary files a/dsBase/ExtendJar/aspose-words-20.12-jdk17-crack.jar and b/dsBase/ExtendJar/aspose-words-21.6.0-jdk17.jar differ diff --git a/dsBase/ExtendJar/引用外置jar包.md b/dsBase/ExtendJar/引用外置jar包.md index 10c4e843..c876affa 100644 --- a/dsBase/ExtendJar/引用外置jar包.md +++ b/dsBase/ExtendJar/引用外置jar包.md @@ -1,9 +1,10 @@ ```shell 将第三方包打进本地仓库,然后依赖本地仓库 - mvn install:install-file -Dfile=D:/dsWork/dsProject/ds-base/ExtendJar/aspose-words-20.12-jdk17-crack.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=20.12 -Dpackaging=jar - mvn install:install-file -Dfile=D:/dsWork/dsProject/ds-base/ExtendJar/aspose-cells-23.4.jar -DgroupId=com.aspose -DartifactId=aspose-cells -Dversion=23.4 -Dpackaging=jar - mvn install:install-file -Dfile=D:/dsWork/dsProject/ds-base/ExtendJar/aspose.slides-19.3.jar -DgroupId=com.aspose -DartifactId=aspose-slides -Dversion=19.3 -Dpackaging=jar - mvn install:install-file -Dfile=D:/dsWork/dsProject/ds-base/ExtendJar/aspose-pdf-22.7.1.cracked.jar -DgroupId=com.aspose -DartifactId=aspose-pdf -Dversion=22.7.1 -Dpackaging=jar + mvn install:install-file -Dfile=D:/dsWork/dsProject/dsBase/ExtendJar/aspose-words-21.6.0-jdk17.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=21.6.0 -Dpackaging=jar + + mvn install:install-file -Dfile=D:/dsWork/dsProject/dsBase/ExtendJar/aspose-cells-23.4.jar -DgroupId=com.aspose -DartifactId=aspose-cells -Dversion=23.4 -Dpackaging=jar + mvn install:install-file -Dfile=D:/dsWork/dsProject/dsBase/ExtendJar/aspose.slides-19.3.jar -DgroupId=com.aspose -DartifactId=aspose-slides -Dversion=19.3 -Dpackaging=jar + mvn install:install-file -Dfile=D:/dsWork/dsProject/dsBase/ExtendJar/aspose-pdf-22.7.1.cracked.jar -DgroupId=com.aspose -DartifactId=aspose-pdf -Dversion=22.7.1 -Dpackaging=jar ``` ```xml diff --git a/dsBaseWeb/ds-base/html/pages/ylt/renameEquipment/index.html b/dsBaseWeb/ds-base/html/pages/ylt/renameEquipment/index.html index dd91d092..0c162a68 100644 --- a/dsBaseWeb/ds-base/html/pages/ylt/renameEquipment/index.html +++ b/dsBaseWeb/ds-base/html/pages/ylt/renameEquipment/index.html @@ -239,8 +239,6 @@ table.on('tool(data-table)', function (obj) { if (obj.event === 'edit') { - console.log(obj.data); - layer.open({ type: 2, title: '修改名称', diff --git a/dsBaseWeb/ds-base/html/pages/ylt/sendSmsLog/index.html b/dsBaseWeb/ds-base/html/pages/ylt/sendSmsLog/index.html index a83bed30..955f09cb 100644 --- a/dsBaseWeb/ds-base/html/pages/ylt/sendSmsLog/index.html +++ b/dsBaseWeb/ds-base/html/pages/ylt/sendSmsLog/index.html @@ -127,7 +127,7 @@ } }); return token; - } + } getStationList(); @@ -167,7 +167,7 @@ form.render(); } }); - } + } tableRender(); @@ -197,7 +197,6 @@ { title: '发送时间', field: 'send_time', align: 'center' }, { title: '手机号', field: 'telephone', align: 'center', width: 130 }, { title: '发送内容', field: 'send_message', align: 'left', width: "30%" }, - ]], skin: 'line', defaultToolbar: [] diff --git a/操作文档/7、DataEase.md b/操作文档/7、DataEase.md index 3336acd8..1360c54e 100644 --- a/操作文档/7、DataEase.md +++ b/操作文档/7、DataEase.md @@ -194,6 +194,14 @@ tar -xjf dataease.tar.bz2 -C / service dataease start ``` +#### 图片的位置 + +``` +/opt/dataease2.0/data/static-resource +``` + + + ### 六、运维 @@ -450,3 +458,39 @@ password: Password123@mysql ``` ![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202411011316944.png) + + + +### 九、一些问题的处理办法 + +云南大屏的一个问题: +$Q$:因为大屏的地图无法通过传递外部参数进行切换城市或县区,我们还想只开发一个页面解决所有的市州问题,就只能自己想其它办法: + +黄海给出的策略是:当点击省中某个市州的地图时,调用外部链接传递参数给黄海新开发的一个接口: + +``` +http://10.10.21.20:9000/dsBase/dataease/route?city_name=%E6%98%86%E6%98%8E%E5%B8%82 +``` + +其中$city\_name$就是市州名称,比如昆明市。 +然后此接口负责将昆明市对应的$city\_code$更新掉大屏在数据库中的数据,也就是修改了配置值。 +这样再次调用此大屏时,就变成了昆明市的地图。然后路由再将城市名称拼接成外部参数,继续向大屏传递,大屏的其它仪表盘可以接收此参数进行过滤(只有地图无法接收,只能自己想办法) + +但这样实现有一个问题: +就是当用户打开了昆明市后,又打开了楚雄州,回来刷新了一下昆明市,就会发现地图是楚雄州的了~ + +打补丁的办法: + +开发基于OpenResty的拦截器,发现现在的链接是 +http://10.10.14.203:8100/#/de-link/X4l1qGNH + +就读取后面的attachParams参数,decodeBase64,还原成{"city_name":"昆明市"} +然后调用黄海提供的写地图城市接口,先写入后再访问此页面,就可以解决刷新的问题了 + +http://10.10.14.203:8100/#/de-link/X4l1qGNH?attachParams=eyJjaXR5X25hbWUiOiLmmIbmmI7luIIifQ== + + + +access.lua + +TODO