fan
|
cd414962eb
|
调整提交
|
2020-04-01 18:14:48 +08:00 |
|
fan
|
9d02306fda
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section/index.vue
|
2020-04-01 18:00:58 +08:00 |
|
sunzhenyu
|
12b4599e39
|
注释
|
2020-04-01 17:09:47 +08:00 |
|
sunzhenyu
|
f31f048846
|
merge
|
2020-04-01 16:54:01 +08:00 |
|
sunzhenyu
|
e401081214
|
修改三维设备模型道岔动画时间
|
2020-04-01 16:53:07 +08:00 |
|
joylink_cuiweidong
|
bced2eb7d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 16:50:53 +08:00 |
|
joylink_cuiweidong
|
7bf650bd8d
|
代码调整
|
2020-04-01 16:36:20 +08:00 |
|
fan
|
4351d982e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 16:24:17 +08:00 |
|
fan
|
8f30d436ee
|
调整绘图&三维跳转页面icon
|
2020-04-01 16:24:03 +08:00 |
|
sunzhenyu
|
fba612403a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 16:03:16 +08:00 |
|
sunzhenyu
|
d7fd261c07
|
修改三维客流视图画面
|
2020-04-01 16:03:09 +08:00 |
|
zyy
|
c7f7f0bc6f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 15:45:31 +08:00 |
|
zyy
|
02583b96e4
|
调整代码
|
2020-04-01 15:44:54 +08:00 |
|
fan
|
ebd90d2485
|
本地项目调整&elementUI升版本至2.12.0
|
2020-04-01 15:32:06 +08:00 |
|
fan
|
c1abbaed49
|
关闭gzip
|
2020-04-01 15:01:08 +08:00 |
|
fan
|
a743469796
|
关闭gzip
|
2020-04-01 14:40:46 +08:00 |
|
fan
|
848875bd57
|
关闭gzip
|
2020-04-01 14:39:29 +08:00 |
|
fan
|
b1a80173b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 14:30:39 +08:00 |
|
fan
|
e344e63469
|
宁波停站时间调整
|
2020-04-01 14:30:11 +08:00 |
|
joylink_cuiweidong
|
5d10d40ea3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 14:15:09 +08:00 |
|
joylink_cuiweidong
|
f64c7d5317
|
代码调整
|
2020-04-01 14:14:55 +08:00 |
|
fan
|
fe8caec435
|
列车方向箭头调整
|
2020-04-01 14:01:31 +08:00 |
|
fan
|
2a59c51b00
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 13:49:18 +08:00 |
|
fan
|
225a739f60
|
打包本地项目不进行cdn加载
|
2020-04-01 13:47:29 +08:00 |
|
joylink_cuiweidong
|
995460afdf
|
仿真界面添加列车详情
|
2020-04-01 12:53:58 +08:00 |
|
fan
|
b778621329
|
Merge branch 'dev_pack' into test
# Conflicts:
# package.json
# vue.config.js
|
2020-04-01 10:33:26 +08:00 |
|
fan
|
8e3d9b541c
|
调整本地项目加入新房间失败提示&除dev其他打包开启gzip
|
2020-04-01 10:22:03 +08:00 |
|
fan
|
358c3dce46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 09:26:03 +08:00 |
|
fan
|
df933b2b0d
|
调整本地项目本地启动
|
2020-04-01 09:25:46 +08:00 |
|
sunzhenyu
|
65fb03834f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 09:14:40 +08:00 |
|
sunzhenyu
|
97a829598b
|
修改三维驾驶车组号显示
|
2020-04-01 09:14:33 +08:00 |
|
fan
|
7df417424e
|
调整本地项目快速入口
|
2020-04-01 09:07:42 +08:00 |
|
joylink_cuiweidong
|
046cfe8318
|
Merge branch 'dev' into test
|
2020-03-31 19:13:42 +08:00 |
|
joylink_cuiweidong
|
06a6087f0c
|
代码调整
|
2020-03-31 19:12:30 +08:00 |
|
joylink_cuiweidong
|
955ddacbe0
|
Merge branch 'dev' into test
|
2020-03-31 19:09:06 +08:00 |
|
joylink_cuiweidong
|
bc6940f80b
|
仿真界面添加列车详情(未完成)
|
2020-03-31 19:06:23 +08:00 |
|
sunzhenyu
|
51f1ef4b62
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-31 18:52:11 +08:00 |
|
sunzhenyu
|
6ae459b910
|
merge
|
2020-03-31 18:52:05 +08:00 |
|
fan
|
eddca622df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-31 18:51:02 +08:00 |
|
fan
|
bfd5b07145
|
调整本地项目综合演练
|
2020-03-31 18:50:16 +08:00 |
|
sunzhenyu
|
ec0f59682b
|
merge
|
2020-03-31 18:45:00 +08:00 |
|
sunzhenyu
|
3bbd28c17b
|
限制只有新数据有驾驶面板
|
2020-03-31 18:42:38 +08:00 |
|
sunzhenyu
|
d4f7da9c8b
|
添加驾驶操作面板，三维模型资源改本地
|
2020-03-31 18:30:15 +08:00 |
|
zyy
|
3ab182f3c4
|
调整逻辑区段显示，过滤框选逻辑区段
|
2020-03-31 17:52:53 +08:00 |
|
fan
|
335132c9b9
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-31 16:55:58 +08:00 |
|
fan
|
007c3658c6
|
调整本地项目
|
2020-03-31 16:54:04 +08:00 |
|
zyy
|
d0739816da
|
调整步骤发送数据
|
2020-03-31 16:03:34 +08:00 |
|
zyy
|
10afb6192b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 15:35:10 +08:00 |
|
zyy
|
4ef3c69f9f
|
调整显示内容 判断
|
2020-03-31 15:34:55 +08:00 |
|
fan
|
e35149248d
|
调整本地项目
|
2020-03-31 15:11:20 +08:00 |
|