Commit Graph

4123 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
3472860fbd 新版 剧本编制 添加动作指令操作添加 以及 动作指令展示 2020-03-31 14:52:19 +08:00
zyy
900489638c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-31 14:41:30 +08:00
zyy
1873898adc 调整回车内容不修改 2020-03-31 14:41:17 +08:00
fan
2093dea56d 调整哈尔滨项目路由调整 2020-03-31 14:03:44 +08:00
fan
724e198f79 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 13:47:25 +08:00
fan
5563212ec0 调整哈尔滨项目 2020-03-31 13:45:45 +08:00
fan
28e8cf53af 调整icon图标 2020-03-31 13:33:09 +08:00
fan
437491c9e7 调整 2020-03-31 13:13:21 +08:00
fan
d7b8879c8d 调整 2020-03-31 11:25:04 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
fan
a7a0fa4b41 个人信息修改调整 2020-03-31 11:08:22 +08:00
fan
7dfd5967eb 哈尔滨调整 2020-03-31 11:02:11 +08:00