 menghao
|
b4d4f4a71e
|
Merge branch 'ctw' of http://124.70.32.114:3100/woka/cesium-map-object into mh
# Conflicts:
# ruoyi-ui/src/views/childRoom/RightPanel.vue
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
 ctw
|
1a4434d9f6
|
右侧树形菜单栏
|
2 months ago |
|
menghao
|
1dad49ca22
|
级联删除逻辑
|
2 months ago |
 sd
|
716e23df59
|
菜单栏优化
|
2 months ago |
|
ctw
|
51015fea0c
|
优化文本，图片插入
|
2 months ago |
|
ctw
|
8fbfd14b96
|
Merge branch 'mh' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/src/views/cesiumMap/index.vue
# ruoyi-ui/src/views/childRoom/RightPanel.vue
# ruoyi-ui/src/views/childRoom/index.vue
# ruoyi-ui/vue.config.js
|
2 months ago |
|
menghao
|
d02f4392d8
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into mh
# Conflicts:
# ruoyi-ui/src/views/childRoom/RightPanel.vue
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
|
ctw
|
c50e8afd6e
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/src/views/cesiumMap/index.vue
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
|
menghao
|
9f1f028bee
|
新增航线的展示、可多选、查询航线的逻辑变动
|
2 months ago |
|
sd
|
66007c79ae
|
左侧导航栏可调节，上侧菜单栏优化
|
2 months ago |
|
ctw
|
1838c436f3
|
优化左右菜单栏显示隐藏逻辑
|
2 months ago |
|
ctw
|
d40be59b6f
|
增加线的悬停显示
|
2 months ago |
|
ctw
|
84cf5fd996
|
增加单个删除功能，修改线的绘制逻辑
|
2 months ago |
|
ctw
|
65ed6b13d9
|
优化所有地图绘制
|
2 months ago |
|
ctw
|
33f4b0f047
|
实现扇形，箭头绘制，插入文本图片功能并增加对应图标
|
2 months ago |
|
sd
|
16e0823752
|
Merge branch 'wxp' 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
|
3d83bff547
|
Merge branch 'mh' 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
|
c168784055
|
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
|
7ff5c079a8
|
1
|
2 months ago |
|
menghao
|
f5afff2216
|
Merge branch 'wxp' of http://124.70.32.114:3100/woka/cesium-map-object into mh
# Conflicts:
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
|
menghao
|
7435d2b294
|
Merge branch 'lbj' of http://124.70.32.114:3100/woka/cesium-map-object into mh
# Conflicts:
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
|
ctw
|
8ac638bd63
|
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 |
 wangxinping
|
d02ea9662e
|
logo
|
2 months ago |
|
wangxinping
|
b6389f8007
|
顶部以及聊天室
|
2 months ago |
|
menghao
|
b2bc649f3f
|
1
|
2 months ago |
|
sd
|
7a9907d5ca
|
左侧菜单可更改
|
2 months ago |
|
menghao
|
7ac9e8dc3c
|
去掉冗余代码
|
2 months ago |
|
menghao
|
a520050992
|
Merge branch 'ctw' of http://124.70.32.114:3100/woka/cesium-map-object into mh
# Conflicts:
# ruoyi-ui/src/views/childRoom/RightPanel.vue
# ruoyi-ui/src/views/childRoom/index.vue
|
2 months ago |
|
menghao
|
bfa13563be
|
去掉冗余代码
|
2 months ago |
|
ctw
|
0e7f9e1c3c
|
修改航线航点弹窗
|
2 months ago |
|
ctw
|
14d86d9f99
|
Merge branch 'mh' of http://124.70.32.114:3100/woka/cesium-map-object into ctw
# Conflicts:
# ruoyi-ui/src/views/cesiumMap/index.vue
|
2 months ago |
|
ctw
|
42ddd9f73d
|
1
|
2 months ago |
|
ctw
|
e7b6319538
|
修改航线航点弹出框
|
2 months ago |
|
menghao
|
9b1daba6fe
|
去掉冗余代码
|
2 months ago |
|
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 |
