Commit Graph

174 Commits (e0d09a46855ee27e098abf44456c8d31e26e4a64)

Author SHA1 Message Date
xs db180ca6de 3.0.4
门户网站功能完善:包括门户网站配置、门户网站配置类型、产品信息配置和案例内容
2 weeks ago
xs e82d993dd7 3.0.3
门户网站配置和门户网站配置类型完善
3 weeks ago
xs 0b0a8f5f90 3.0.2
门户网站配置完善
4 weeks ago
夜笙歌 97420b1cb9 增加plc页面 4 weeks ago
夜笙歌 f6db1a14d6 Merge remote-tracking branch 'origin/master' 4 weeks ago
夜笙歌 480986236d 增加plc页面 4 weeks ago
xs 84b1de6f3b 3.0.1
门户网站功能配置,包括前端和后端
4 weeks ago
xs f4eb21a6c4 Merge remote-tracking branch 'origin/breach-zhy'
# Conflicts:
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutConfigController.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutDescController.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutConfig.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutDesc.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutConfigDao.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutDescDao.java
#	ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutConfigDao.xml
#	ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutDescDao.xml
#	ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDevice.java
#	ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwElectronicFence.java
#	ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
#	ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml
#	ruoyi-ui/vue.config.js
1 month ago
夜笙歌 8bd5a00d87 修复问题 3 months ago
夜笙歌 e5ad285ad4 修复问题 3 months ago
夜笙歌 2f529c4cd8 添加页面 3 months ago
夜笙歌 db5ceeadba 添加页面 3 months ago
zch 5f7b5d0c03 change - 新增报警管理-报警信息页面
- 新增报警信息增删改查相关API和控制器方法
- 在HwAlarmInfo实体类中添加新的属性,如deviceName、tenantName等
- 在Mapper接口和XML中增加更新报警信息的方法和对应SQL
3 months ago
夜笙歌 df4fc3b03a 修改问题 3 months ago
夜笙歌 8ddd4e5cfc 修改问题 3 months ago
夜笙歌 b531a4f47c 修改问题 3 months ago
夜笙歌 135f53f331 修改地图标点 5 months ago
夜笙歌 7e8b434406 修改后台问题 5 months ago
夜笙歌 6f12728a60 修改地图标点 6 months ago
夜笙歌 a1341c2de1 修改地图标点 6 months ago
夜笙歌 bdcef51b98 修改界面 7 months ago
夜笙歌 02d0cb01b6 修改界面 7 months ago
夜笙歌 761cad494d 修改地图 7 months ago
夜笙歌 76b32b1cee 修改界面 7 months ago
夜笙歌 72be646f66 修改界面 7 months ago
夜笙歌 e1e17b10ac 修改界面 7 months ago
夜笙歌 433df36af4 修改界面 7 months ago
夜笙歌 cd90ec25ab 修改界面 7 months ago
夜笙歌 d756f06cae 修改界面 7 months ago
夜笙歌 a1f54dd4f0 修改界面 7 months ago
夜笙歌 4b528a983f 修改界面 7 months ago
夜笙歌 16c4117fba 修改界面 7 months ago
夜笙歌 8f0adc13ec 修改界面 7 months ago
夜笙歌 c53c26f2f2 修改界面 7 months ago
夜笙歌 4b9026168d 修改界面 7 months ago
夜笙歌 cb6abd016d 修改界面 7 months ago
夜笙歌 a0a0182d58 修改界面 7 months ago
夜笙歌 cd0210f77c 修改界面 7 months ago
夜笙歌 f6947e86eb 修改界面 7 months ago
夜笙歌 62bf09dd4a 修改传感器汇总界面 7 months ago
zhouhy fdd2532ced 金瑞铭需求修改 7 months ago
夜笙歌 ecdc356fd2 修改地图 7 months ago
夜笙歌 f52e3319f3 修改地图 7 months ago
夜笙歌 dedabc579f 修改地图 8 months ago
夜笙歌 e239834c9e 修改地图 8 months ago
夜笙歌 f53be7b70d 修改设备监测无字段时显示 9 months ago
夜笙歌 adde2017b0 修改地图 9 months ago
夜笙歌 500582d191 修改地图 9 months ago
夜笙歌 fb251e7ccb 修改背景图 9 months ago
夜笙歌 0b9239a98f Revert "修改地图"
This reverts commit ea612ad905.

# Conflicts:
#	ruoyi-ui/src/assets/board/senso/bg2.jpg
9 months ago