夜笙歌
|
9bc96b7ecb
|
修改问题
|
3 days ago |
|
夜笙歌
|
425baeb520
|
修改问题
|
3 days ago |
|
夜笙歌
|
e84c1b5b3a
|
修改问题
|
6 days ago |
|
夜笙歌
|
c2c358188c
|
修改问题
|
6 days ago |
 xs
|
b0549805fa
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
夜笙歌
|
3bdd9bf39d
|
修改问题
|
5 months ago |
|
夜笙歌
|
1eddf7e7ee
|
修改问题
|
5 months ago |
|
夜笙歌
|
dc9d0306ed
|
修改问题
|
5 months ago |
|
xs
|
342274b2be
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
夜笙歌
|
d46eaf0410
|
修改问题
|
5 months ago |
|
夜笙歌
|
91814231b2
|
修改请求方法名称
|
5 months ago |
|
夜笙歌
|
675cdb1c79
|
修改显示
|
6 months ago |
|
xs
|
ebfa380334
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
夜笙歌
|
350b2b20d9
|
修改场景跳转
|
6 months ago |
|
夜笙歌
|
55125477fc
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
夜笙歌
|
c1de49cbe7
|
添加组态化
|
6 months ago |
|
xs
|
2716401586
|
Merge remote-tracking branch 'origin/breach-zhy'
# Conflicts:
# ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/PlcDeviceController.java
# ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/PlcDeviceService.java
# ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/PlcDeviceServiceImpl.java
# ruoyi-ui/src/views/plc/plcEquipment/index.vue
# ruoyi-ui/src/views/plc/plcModel/index.vue
|
6 months ago |
|
xs
|
8b54538f4b
|
3.0.8
门户网站管理：关于我们信息、关于我们详情、联系我们信息完善
|
6 months ago |
|
xs
|
db180ca6de
|
3.0.4
门户网站功能完善：包括门户网站配置、门户网站配置类型、产品信息配置和案例内容
|
6 months ago |
maxw@mesnac.com
|
d08e7012ff
|
plc协议前端开发
|
6 months ago |
|
xs
|
e82d993dd7
|
3.0.3
门户网站配置和门户网站配置类型完善
|
6 months ago |
|
xs
|
0b0a8f5f90
|
3.0.2
门户网站配置完善
|
6 months ago |
|
夜笙歌
|
97420b1cb9
|
增加plc页面
|
6 months ago |
|
夜笙歌
|
f6db1a14d6
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
夜笙歌
|
480986236d
|
增加plc页面
|
6 months ago |
|
xs
|
84b1de6f3b
|
3.0.1
门户网站功能配置，包括前端和后端
|
6 months 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
|
6 months ago |
|
夜笙歌
|
8bd5a00d87
|
修复问题
|
8 months ago |
|
夜笙歌
|
e5ad285ad4
|
修复问题
|
8 months ago |
|
夜笙歌
|
2f529c4cd8
|
添加页面
|
8 months ago |
|
夜笙歌
|
db5ceeadba
|
添加页面
|
8 months ago |
 zch
|
5f7b5d0c03
|
change - 新增报警管理-报警信息页面
- 新增报警信息增删改查相关API和控制器方法
- 在HwAlarmInfo实体类中添加新的属性，如deviceName、tenantName等
- 在Mapper接口和XML中增加更新报警信息的方法和对应SQL
|
8 months ago |
|
夜笙歌
|
df4fc3b03a
|
修改问题
|
8 months ago |
|
夜笙歌
|
8ddd4e5cfc
|
修改问题
|
8 months ago |
|
夜笙歌
|
b531a4f47c
|
修改问题
|
9 months ago |
|
夜笙歌
|
135f53f331
|
修改地图标点
|
10 months ago |
|
夜笙歌
|
7e8b434406
|
修改后台问题
|
10 months ago |
|
夜笙歌
|
6f12728a60
|
修改地图标点
|
11 months ago |
|
夜笙歌
|
a1341c2de1
|
修改地图标点
|
11 months ago |
|
夜笙歌
|
bdcef51b98
|
修改界面
|
12 months ago |
|
夜笙歌
|
02d0cb01b6
|
修改界面
|
12 months ago |
|
夜笙歌
|
761cad494d
|
修改地图
|
12 months ago |
|
夜笙歌
|
76b32b1cee
|
修改界面
|
12 months ago |
|
夜笙歌
|
72be646f66
|
修改界面
|
12 months ago |
|
夜笙歌
|
e1e17b10ac
|
修改界面
|
12 months ago |
|
夜笙歌
|
433df36af4
|
修改界面
|
12 months ago |
|
夜笙歌
|
cd90ec25ab
|
修改界面
|
12 months ago |
|
夜笙歌
|
d756f06cae
|
修改界面
|
12 months ago |
|
夜笙歌
|
a1f54dd4f0
|
修改界面
|
12 months ago |
|
夜笙歌
|
4b528a983f
|
修改界面
|
12 months ago |