 menghao
|
0bdc6a56f0
|
新增航线时航点的id获取逻辑、航线实体属性更改
|
2 months ago |
|
menghao
|
b27a2a52f3
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into mh
# Conflicts:
# ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
# ruoyi-ui/src/views/cesiumMap/index.vue
# ruoyi-ui/src/views/selectRoom/index.vue
|
2 months ago |
|
menghao
|
25a31b1e42
|
新增航点实体及相关增删改查
|
2 months ago |
 wangxinping
|
6fe49fe29a
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into wxp
# Conflicts:
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
 ctw
|
826e345062
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
|
ctw
|
1f058f433c
|
合并
|
2 months ago |
 sd
|
bff6373ab2
|
Merge branch 'ctw' of http://124.70.32.114:3100/woka/cesium-map-object into lbj
# Conflicts:
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
|
sd
|
43d7c663a3
|
1
|
2 months ago |
|
wangxinping
|
2c022637bf
|
Signed-off-by: wangxinping <753819757@qq.com>
|
2 months ago |
|
sd
|
d262de819c
|
脑袋搬家了
|
2 months ago |
|
wangxinping
|
e3075442df
|
1
Signed-off-by: wangxinping <753819757@qq.com>
|
2 months ago |
|
wangxinping
|
39158c7a22
|
Merge branch 'ctw' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/src/views/childRoom/RightPanel.vue
|
2 months ago |
|
wangxinping
|
8146cd8a0c
|
1
|
2 months ago |
|
ctw
|
c0e0b63d8d
|
最新版
|
2 months ago |
|
ctw
|
59b07d42ff
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
# ruoyi-ui/package.json
# ruoyi-ui/src/permission.js
# ruoyi-ui/src/views/cesiumMap/index.vue
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
|
ctw
|
89be5cd84a
|
添加航点
|
2 months ago |
|
ctw
|
2bd160c907
|
Merge branch 'mh' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
|
2 months ago |
|
ctw
|
0470eaa64c
|
添加航点
|
2 months ago |
|
menghao
|
60d451cbe9
|
注册时角色的权限写入、房间管理bug修复
|
2 months ago |
|
sd
|
ffbf92930f
|
移花接木
|
2 months ago |
|
ctw
|
12af902062
|
Merge branch 'mh' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/src/views/selectRoom/index.vue
|
2 months ago |
|
ctw
|
8f19edbebd
|
测试，别拉
|
2 months ago |
|
menghao
|
d12d1fb6ef
|
房间管理页面的前后端对接
|
2 months ago |
|
sd
|
d687bce796
|
Merge branch 'ctw' of http://124.70.32.114:3100/woka/cesium-map-object into lbj
# Conflicts:
# ruoyi-admin/src/main/resources/application-druid.yml
# ruoyi-ui/package.json
# ruoyi-ui/src/permission.js
# ruoyi-ui/src/views/cesiumMap/index.vue
# ruoyi-ui/src/views/childRoom/index.vue
# ruoyi-ui/src/views/selectRoom/index.vue
|
2 months ago |
|
sd
|
b6dd5b8e94
|
111
|
2 months ago |
|
sd
|
3693974170
|
1
|
2 months ago |
|
ctw
|
22e37e1548
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
|
3 months ago |
|
sd
|
c34b9666fa
|
侧边栏
|
3 months ago |
|
ctw
|
4cdcb7426f
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/package.json
# ruoyi-ui/src/permission.js
# ruoyi-ui/src/views/cesiumMap/index.vue
# ruoyi-ui/src/views/childRoom/index.vue
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/selectRoom/index.vue
|
3 months ago |
|
menghao
|
8afdbd1ff8
|
Merge branch 'ctw' of http://124.70.32.114:3100/woka/cesium-map-object into mh
# Conflicts:
# ruoyi-ui/src/views/cesiumMap/index.vue
|
3 months ago |
|
menghao
|
6c0fb3b387
|
测试git
|
3 months ago |
|
ctw
|
a8ae3f9dbd
|
Merge branch 'mh' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/src/views/cesiumMap/index.vue
|
3 months ago |
|
ctw
|
d9ebcfbffe
|
增加经纬度定位功能
|
3 months ago |
|
menghao
|
b2282d8dc5
|
测试git
|
3 months ago |
|
sd
|
f73fdb933d
|
Changes
|
3 months ago |
 hanyuqing
|
1e3c7f0a9f
|
登录注册
|
3 months ago |
|
ctw
|
41feed779c
|
修复能够删除矩形和圆形
|
3 months ago |
|
ctw
|
a7c52546d2
|
优化点线面绘制，优化测距测面积
|
3 months ago |
|
ctw
|
05eb3de823
|
子房间弹出框版本
|
3 months ago |
|
ctw
|
f1c5ef330f
|
Merge branch 'master' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/src/views/cesiumMap/index.vue
|
3 months ago |
|
ctw
|
75a03068e7
|
1
|
3 months ago |
|
ctw
|
8ee7117a35
|
地图能加载了
|
3 months ago |
|
wangxinping
|
0375757fe4
|
新版界面
|
3 months ago |
|
ctw
|
e01248731a
|
登录选房间修改
|
3 months ago |
|
sd
|
26d04427d5
|
Merge branch 'master' of http://124.70.32.114:3100/woka/cesium-map-object into lbj
|
3 months ago |
|
wangxinping
|
c8db824f41
|
工具样式
|
3 months ago |
|
sd
|
575fd8871e
|
logon
|
3 months ago |
|
sd
|
8a18dfd0b7
|
登录界面和房间选择
|
3 months ago |
|
ctw
|
aa8e798d9a
|
Merge branch 'master' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
|
3 months ago |
 ycc
|
3be8d15df0
|
收起工具栏
|
3 months ago |
