fan
|
e2e9978cbd
|
大赛信息添加
|
2020-12-04 18:34:58 +08:00 |
|
joylink_cuiweidong
|
cd39147257
|
实训平台代码调整
|
2020-12-04 18:10:07 +08:00 |
|
zyy
|
85cc4ee3d5
|
过滤报错提示
|
2020-12-04 17:22:58 +08:00 |
|
zyy
|
f466ec6fee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 17:10:14 +08:00 |
|
zyy
|
7054f6c1e6
|
增加运行图编辑
|
2020-12-04 17:10:03 +08:00 |
|
joylink_cuiweidong
|
a0e3875e69
|
实训平台样式调整
|
2020-12-04 15:46:45 +08:00 |
|
joylink_cuiweidong
|
e36e9e84e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 13:21:59 +08:00 |
|
joylink_cuiweidong
|
0884f6d227
|
实训平台 样式调整
|
2020-12-04 13:21:41 +08:00 |
|
fan
|
2c9225e939
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 10:08:07 +08:00 |
|
fan
|
ac8f9bc978
|
哈尔滨限速调整
|
2020-12-04 10:07:55 +08:00 |
|
joylink_cuiweidong
|
c6f58607be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 09:32:20 +08:00 |
|
joylink_cuiweidong
|
666ff5afbb
|
实训平台样式调整
代码调整
|
2020-12-04 09:31:45 +08:00 |
|
fan
|
1b6d212e7d
|
试题定义 placeholder 调整
|
2020-12-04 09:17:34 +08:00 |
|
fan
|
915cd1963c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:45:13 +08:00 |
|
fan
|
386e742a31
|
注释单位
|
2020-12-03 18:44:51 +08:00 |
|
joylink_cuiweidong
|
8a81682170
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:40:13 +08:00 |
|
joylink_cuiweidong
|
ce001395ff
|
代码调整
|
2020-12-03 18:39:57 +08:00 |
|
fan
|
817c5bdb9b
|
哈尔滨限速调整
|
2020-12-03 18:39:27 +08:00 |
|
fan
|
8accd0c664
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:22:24 +08:00 |
|
fan
|
05f6324413
|
company update
|
2020-12-03 18:22:04 +08:00 |
|
sunzhenyu
|
5a8025b7ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:49:46 +08:00 |
|
sunzhenyu
|
a61bba357a
|
修改三维编辑器剔除文件bug
|
2020-12-03 16:49:38 +08:00 |
|
joylink_cuiweidong
|
fa7eefbeba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:36:39 +08:00 |
|
joylink_cuiweidong
|
ddd6905a0c
|
代码调整
|
2020-12-03 16:36:21 +08:00 |
|
sunzhenyu
|
ce48a13715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:23:23 +08:00 |
|
sunzhenyu
|
66c8fd8de9
|
剔除三维编辑器中旧的模块
|
2020-12-03 16:23:14 +08:00 |
|
joylink_cuiweidong
|
0933930011
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 15:30:03 +08:00 |
|
joylink_cuiweidong
|
a52c9786c1
|
发布地图 导出地图 代码调整
|
2020-12-03 15:29:45 +08:00 |
|
zyy
|
704356cec9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 14:01:27 +08:00 |
|
zyy
|
dfbeb6b604
|
删除多余配置
|
2020-12-03 14:01:15 +08:00 |
|
joylink_cuiweidong
|
7dc23a645d
|
代码调整
|
2020-12-03 13:52:51 +08:00 |
|
joylink_cuiweidong
|
3c004ab7a5
|
实训代码调整
|
2020-12-03 13:45:18 +08:00 |
|
joylink_cuiweidong
|
646d585ecf
|
实训/设计平台 左侧地图列表样式调整
|
2020-12-03 11:00:50 +08:00 |
|
fan
|
111f117ff8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 09:23:48 +08:00 |
|
fan
|
338743036e
|
注释用户信息 公司
|
2020-12-03 09:23:31 +08:00 |
|
fan
|
cdbd7a0d5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 18:38:40 +08:00 |
|
fan
|
6cc64d7cfc
|
导入学生信息添加loading&哈尔滨日志
|
2020-12-02 18:38:28 +08:00 |
|
joylink_cuiweidong
|
23cbc94c78
|
代码调整
|
2020-12-02 18:37:32 +08:00 |
|
joylink_cuiweidong
|
95c685bfab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/demonMenu.vue
|
2020-12-02 17:49:08 +08:00 |
|
joylink_cuiweidong
|
b51ebde280
|
北交大客流仿真系统代码调整
|
2020-12-02 17:45:19 +08:00 |
|
fan
|
c2cb4ce764
|
展示绑定单位管理人员
|
2020-12-02 16:27:44 +08:00 |
|
fan
|
3d672ce15b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 15:23:34 +08:00 |
|
fan
|
d96df1ce68
|
个人信息关闭后终止状态&贵装备展示留言板
|
2020-12-02 15:23:23 +08:00 |
|
joylink_cuiweidong
|
84d7d145c2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 14:25:40 +08:00 |
|
joylink_cuiweidong
|
caeb8aa457
|
福州一号线新版 配置文件调整
|
2020-12-02 14:25:20 +08:00 |
|
fan
|
706c2343a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 14:22:53 +08:00 |
|
fan
|
d8f8acfe02
|
单位调整&哈尔滨区段限速调整
|
2020-12-02 14:22:26 +08:00 |
|
zyy
|
ccd6e4ef74
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 09:31:39 +08:00 |
|
zyy
|
de081382fa
|
增加运行图交路设置
|
2020-12-02 09:31:23 +08:00 |
|
fan
|
422ed21415
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 19:00:37 +08:00 |
|
fan
|
9c06b3ed27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 18:50:32 +08:00 |
|
fan
|
4ac37c5d18
|
单位调整
|
2020-12-01 18:50:23 +08:00 |
|
joylink_cuiweidong
|
dd50c9ac58
|
删除购买按钮 删除暂时无用的文件
|
2020-12-01 18:47:47 +08:00 |
|
joylink_cuiweidong
|
eb8f171bdd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 17:22:39 +08:00 |
|
joylink_cuiweidong
|
941f57e02c
|
代码调整
|
2020-12-01 17:20:44 +08:00 |
|
fan
|
ab7ff394ce
|
单位调整
|
2020-12-01 15:20:34 +08:00 |
|
sunzhenyu
|
42e37af6ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 10:27:15 +08:00 |
|
sunzhenyu
|
5911e330bf
|
限制三维客流镜头移动
|
2020-12-01 10:27:02 +08:00 |
|
sunzhenyu
|
01993cf65e
|
修改三维客流人物坐动画，修改重置动作bug
|
2020-12-01 10:26:15 +08:00 |
|
zyy
|
b93af93af3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 10:21:06 +08:00 |
|
zyy
|
20e774c8b8
|
删除多余配置
|
2020-12-01 10:20:54 +08:00 |
|
fan
|
388f9a14ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-30 18:25:41 +08:00 |
|
fan
|
97a373b9d9
|
代码调整
|
2020-11-30 18:22:22 +08:00 |
|
joylink_cuiweidong
|
798d4589cf
|
代码调整
|
2020-11-30 18:06:32 +08:00 |
|
joylink_cuiweidong
|
888001c65e
|
删除暂时无用代码
|
2020-11-30 16:12:24 +08:00 |
|
joylink_cuiweidong
|
19d1a6e0b1
|
设计平台 用户实训管理 用户仿真管理 代码调整
|
2020-11-30 13:56:42 +08:00 |
|
joylink_cuiweidong
|
572dc1b3bd
|
实训平台 地图列表 代码调整
|
2020-11-30 11:14:52 +08:00 |
|
joylink_cuiweidong
|
706335aadf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-30 10:23:47 +08:00 |
|
joylink_cuiweidong
|
f9bac6886a
|
删除暂时无用代码
|
2020-11-30 10:23:32 +08:00 |
|
sunleking
|
bf1377fc27
|
修改三维客流列车乘员更新bug
|
2020-11-27 21:39:06 +08:00 |
|
joylink_cuiweidong
|
afa5b72281
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 18:37:24 +08:00 |
|
joylink_cuiweidong
|
6fadd63dfd
|
代码调整
|
2020-11-27 18:37:07 +08:00 |
|
sunzhenyu
|
e26c6dc080
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 18:20:14 +08:00 |
|
sunzhenyu
|
c243303e74
|
修改三维模块获取站场图数据接口
|
2020-11-27 18:20:06 +08:00 |
|
fan
|
360973274c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 18:10:16 +08:00 |
|
fan
|
f824b15bc1
|
退出按钮展示条件判断
|
2020-11-27 18:09:58 +08:00 |
|
sunzhenyu
|
dda3cedf30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:50:39 +08:00 |
|
sunzhenyu
|
7491a63b42
|
三维客流退出样式
|
2020-11-27 17:50:33 +08:00 |
|
joylink_cuiweidong
|
34424f11a0
|
地图缓存代码调整
|
2020-11-27 17:49:21 +08:00 |
|
joylink_cuiweidong
|
6a9406054d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:37:30 +08:00 |
|
joylink_cuiweidong
|
c1507b01e1
|
地图数据加载到缓存store里（刷新之后数据会丢失）
删除暂时无用的代码
|
2020-11-27 17:37:13 +08:00 |
|
sunzhenyu
|
7068b73585
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:25:02 +08:00 |
|
sunzhenyu
|
c8cdf34397
|
修改三维客流退出页面取消订阅
|
2020-11-27 17:24:52 +08:00 |
|
zyy
|
ef45842dfc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 16:26:53 +08:00 |
|
zyy
|
900064a767
|
调整福州线路实训操作
|
2020-11-27 16:26:42 +08:00 |
|
joylink_cuiweidong
|
b3f538fa09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 15:04:15 +08:00 |
|
joylink_cuiweidong
|
93e936a766
|
北交大 客流项目代码调整
|
2020-11-27 15:03:55 +08:00 |
|
fan
|
056570c096
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:18:42 +08:00 |
|
fan
|
76f9db3eb6
|
留言板添加至新标签页
(cherry picked from commit a509af1e09)
|
2020-11-27 14:17:54 +08:00 |
|
zyy
|
eabb4b8782
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:15:32 +08:00 |
|
zyy
|
6b8bfffd21
|
调整限速实训流程
|
2020-11-27 14:15:19 +08:00 |
|
joylink_cuiweidong
|
90ec120603
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:05:28 +08:00 |
|
joylink_cuiweidong
|
c2cd9e73d5
|
考试系统代码调整
|
2020-11-27 14:05:10 +08:00 |
|
sunzhenyu
|
c3a8ab7929
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:00:05 +08:00 |
|
sunzhenyu
|
c2f2698092
|
修改三维客流窗口操作
|
2020-11-27 13:59:54 +08:00 |
|
zyy
|
032c3036b8
|
调整国赛系统样式名称
|
2020-11-27 09:22:25 +08:00 |
|
joylink_cuiweidong
|
1f7c3f3bf7
|
宁波一号线 人解进路更换指令（之前为信号机取消引导，换为人解进路）
|
2020-11-26 18:52:53 +08:00 |
|
joylink_cuiweidong
|
3132506382
|
宁波一号线 取消进路 指令 换成 总取消
|
2020-11-26 18:21:57 +08:00 |
|
joylink_cuiweidong
|
2dad05d63f
|
福州一号线 西安三号线 实训定义代码调整
|
2020-11-26 17:22:49 +08:00 |
|
joylink_cuiweidong
|
00e60e877c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 16:43:23 +08:00 |
|
joylink_cuiweidong
|
d1eec65783
|
西安三号线 福州一号线 实训定义代码调整
|
2020-11-26 16:43:00 +08:00 |
|
sunzhenyu
|
9794e37274
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:52:58 +08:00 |
|
fan
|
43c0de245d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:54:58 +08:00 |
|
fan
|
5abdfc9883
|
哈尔滨操作调整
|
2020-11-26 14:54:37 +08:00 |
|
sunzhenyu
|
3dba656827
|
修复三维客流列车初始画面更新人物显示
|
2020-11-26 14:47:40 +08:00 |
|
joylink_cuiweidong
|
17e5f13202
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:39:15 +08:00 |
|
joylink_cuiweidong
|
5d02a56646
|
福州线路新版 操作调整
|
2020-11-26 14:37:48 +08:00 |
|
fan
|
b98ab0ae4b
|
merge
|
2020-11-26 14:27:45 +08:00 |
|
fan
|
8b8b5bd028
|
哈尔滨操作调整
|
2020-11-26 14:26:35 +08:00 |
|
joylink_cuiweidong
|
c6ec7c9049
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 11:15:42 +08:00 |
|
joylink_cuiweidong
|
e1ab504ddb
|
屏蔽门绘图调整
|
2020-11-26 11:15:25 +08:00 |
|
sunzhenyu
|
e56cc5f146
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 10:24:36 +08:00 |
|
sunzhenyu
|
ec5d118b80
|
修改三维通号故障内容初始化
|
2020-11-26 10:24:26 +08:00 |
|
sunzhenyu
|
d82ec7e6c0
|
修改三维通号故障内容
|
2020-11-26 10:21:59 +08:00 |
|
fan
|
a84120c2e5
|
语音路径调整
|
2020-11-26 09:33:30 +08:00 |
|
fan
|
10d8b674b4
|
哈尔滨操作调整
|
2020-11-25 18:41:35 +08:00 |
|
joylink_cuiweidong
|
a5dad072ca
|
实训平台代码调整
|
2020-11-25 18:28:20 +08:00 |
|
joylink_cuiweidong
|
10c007e9cf
|
福州一号线/西安三号线 实训定义调整
|
2020-11-25 17:32:07 +08:00 |
|
joylink_cuiweidong
|
2732e60a94
|
教学系统 实训代码调整
|
2020-11-25 15:52:52 +08:00 |
|
joylink_cuiweidong
|
1949d81cac
|
实训平台代码调整
|
2020-11-25 15:08:18 +08:00 |
|
joylink_cuiweidong
|
8c054f492f
|
实训平台 代码调整
|
2020-11-25 13:31:36 +08:00 |
|
fan
|
7e0c3696ab
|
地图发布管理导入数据后重置table数据
|
2020-11-25 11:20:55 +08:00 |
|
fan
|
9ef4299527
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-25 10:29:14 +08:00 |
|
fan
|
dad52de123
|
发布地图管理编辑信息添加数据版本
|
2020-11-25 10:28:47 +08:00 |
|
joylink_cuiweidong
|
e355191291
|
教学系统 实训代码调整
|
2020-11-25 09:45:59 +08:00 |
|
joylink_cuiweidong
|
b99f0d7551
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 19:17:27 +08:00 |
|
joylink_cuiweidong
|
c7a98096a2
|
教学系统 代码调整
|
2020-11-24 19:17:10 +08:00 |
|
fan
|
31c0a1f466
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 18:28:31 +08:00 |
|
fan
|
db9bcd0cc1
|
进入iscs路径添加lineCode
|
2020-11-24 18:28:15 +08:00 |
|
joylink_cuiweidong
|
8388bf42b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 18:07:45 +08:00 |
|
joylink_cuiweidong
|
275b44e056
|
北交大 客流仿真 提示添加
|
2020-11-24 18:07:09 +08:00 |
|
fan
|
a69d3b45a5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 18:01:07 +08:00 |
|
fan
|
345b676cbc
|
调整登录错误码
|
2020-11-24 17:48:36 +08:00 |
|
zyy
|
e249c344eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 17:35:27 +08:00 |
|
zyy
|
9ba73cbb77
|
调整哈尔滨综合监控数据
|
2020-11-24 17:35:14 +08:00 |
|
sunzhenyu
|
6ce808b8f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 17:32:43 +08:00 |
|
sunzhenyu
|
7ef4994a09
|
修改三维客流视窗跳转方式
|
2020-11-24 17:32:37 +08:00 |
|
joylink_cuiweidong
|
465e0e5860
|
北交大系统 仿真页面代码调整
教学 实训列表文字调整
|
2020-11-24 17:11:00 +08:00 |
|
joylink_cuiweidong
|
872824dff1
|
绘图代码调整
|
2020-11-24 16:53:13 +08:00 |
|
sunzhenyu
|
69e97c635f
|
修复三维cctv自适应dom界面
|
2020-11-24 15:17:27 +08:00 |
|
sunzhenyu
|
7463dce8f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 11:31:39 +08:00 |
|
sunzhenyu
|
86462394a8
|
修改三维资源路径
|
2020-11-24 11:31:29 +08:00 |
|
fan
|
dd17d48fa7
|
通用排班计划生成接口调整
|
2020-11-23 18:06:03 +08:00 |
|
fan
|
906208b236
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 18:04:02 +08:00 |
|
fan
|
84ccf357f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 18:03:41 +08:00 |
|
fan
|
6cba317525
|
哈尔滨打包调整
|
2020-11-23 18:03:23 +08:00 |
|
joylink_cuiweidong
|
d746206be0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 18:01:05 +08:00 |
|
joylink_cuiweidong
|
96a57af6fc
|
代码调整
|
2020-11-23 18:00:45 +08:00 |
|
fan
|
93f3e485fc
|
老旧接口调整
|
2020-11-23 18:00:12 +08:00 |
|
sunzhenyu
|
a12b80599c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 17:57:09 +08:00 |
|
sunzhenyu
|
9aa16839d0
|
修改三维驾驶列车坐标修正值
|
2020-11-23 17:57:01 +08:00 |
|
joylink_cuiweidong
|
c8256de5c7
|
屏蔽暂时无用代码
|
2020-11-23 17:32:17 +08:00 |
|
joylink_cuiweidong
|
ce5287964b
|
删除无效代码
|
2020-11-23 17:09:27 +08:00 |
|
joylink_cuiweidong
|
0599da13aa
|
综合演练暂时无用代码删除
|
2020-11-23 17:05:16 +08:00 |
|
sunzhenyu
|
28d0891365
|
merge
|
2020-11-23 14:27:22 +08:00 |
|
sunzhenyu
|
23411b5ddc
|
剔除项目三维本地模型
|
2020-11-23 14:26:33 +08:00 |
|
zyy
|
af2cac53ad
|
删除多余指令
|
2020-11-23 13:45:13 +08:00 |
|
joylink_cuiweidong
|
dc1ccfe699
|
地图绘制代码调整
|
2020-11-23 13:41:19 +08:00 |
|
joylink_cuiweidong
|
acd3e5c6ff
|
删除无效的文件
|
2020-11-23 10:47:33 +08:00 |
|
zyy
|
c65fe8dd37
|
调整指令错误提示
|
2020-11-23 10:43:52 +08:00 |
|
joylink_cuiweidong
|
5056e18e0a
|
删除暂时无用的枚举
|
2020-11-23 10:14:42 +08:00 |
|
joylink_cuiweidong
|
c32dc326c4
|
北交大 客流站场仿真页面 订阅顺序调整 图例调整
|
2020-11-20 17:37:17 +08:00 |
|
joylink_cuiweidong
|
504f23e84f
|
代码调整
|
2020-11-20 15:36:28 +08:00 |
|
joylink_cuiweidong
|
a131fd12d7
|
代码调整
|
2020-11-20 14:59:24 +08:00 |
|
joylink_cuiweidong
|
fece30a51d
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:53:50 +08:00 |
|
joylink_cuiweidong
|
756aca9281
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 14:22:15 +08:00 |
|
joylink_cuiweidong
|
1010df5613
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:21:57 +08:00 |
|
fan
|
9de00dba1c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 13:47:53 +08:00 |
|
fan
|
3f241fc598
|
留言板表情包调整&删除张赛说的接口
|
2020-11-20 13:47:34 +08:00 |
|
zyy
|
a50264a8df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 13:22:19 +08:00 |
|
zyy
|
a6e0808092
|
调整客流量流程
|
2020-11-20 13:22:03 +08:00 |
|
fan
|
4ae8979563
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 11:22:42 +08:00 |
|
fan
|
9d4f0d6804
|
留言板表情包调整
|
2020-11-20 11:22:21 +08:00 |
|
zyy
|
c10283c256
|
增加客流量数据渲染
|
2020-11-20 11:13:47 +08:00 |
|
sunzhenyu
|
5fab868d50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 18:11:24 +08:00 |
|
sunzhenyu
|
3827cff0cd
|
三维加载模型字符错误
|
2020-11-19 18:11:17 +08:00 |
|
joylink_cuiweidong
|
99e7abd361
|
运行图编制代码调整
|
2020-11-19 17:02:55 +08:00 |
|
fan
|
9b9fcd01e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 14:17:46 +08:00 |
|
fan
|
11b54cef43
|
留言板表情包
|
2020-11-19 14:17:01 +08:00 |
|
joylink_cuiweidong
|
3052bf2843
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 13:48:30 +08:00 |
|
joylink_cuiweidong
|
954cb25ab0
|
北京交大项目 添加客流视图（未处理状态）
|
2020-11-19 13:48:11 +08:00 |
|
zyy
|
c098f68702
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 09:40:17 +08:00 |
|
zyy
|
648f38e68d
|
调整运行图间距
|
2020-11-19 09:40:03 +08:00 |
|
sunzhenyu
|
4b28d2b9f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 18:04:17 +08:00 |
|
sunzhenyu
|
4e61d7270d
|
修改三维列车车站车门动画逻辑
|
2020-11-18 18:04:09 +08:00 |
|
lVAL
|
516920d24c
|
修改文本样式
|
2020-11-18 17:01:15 +08:00 |
|
lVAL
|
fd5467a741
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 15:42:13 +08:00 |
|
lVAL
|
a3651cde07
|
优化 AUSTool 配置
|
2020-11-18 15:41:37 +08:00 |
|
joylink_cuiweidong
|
224ca3785d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 13:24:16 +08:00 |
|
joylink_cuiweidong
|
88ac007ebd
|
运行图代码调整
|
2020-11-18 13:22:53 +08:00 |
|
zyy
|
6897317693
|
增加索引
|
2020-11-18 13:16:47 +08:00 |
|
zyy
|
d8c25dde1e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 13:15:40 +08:00 |
|
zyy
|
83e74cc53b
|
增加运行图客流量配置
|
2020-11-18 13:15:28 +08:00 |
|
fan
|
4c7e601406
|
调整北交大按钮顺序
|
2020-11-18 11:01:22 +08:00 |
|
fan
|
ba77b1b052
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 10:55:30 +08:00 |
|
fan
|
c1a357fe28
|
留言板项目接口调整
|
2020-11-18 10:55:11 +08:00 |
|
sunzhenyu
|
6bb859e27d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 09:52:58 +08:00 |
|
sunzhenyu
|
a06a7d24ac
|
url merge
|
2020-11-18 09:52:50 +08:00 |
|
sunzhenyu
|
c54b9edcd3
|
修改三维客流人数显示
|
2020-11-18 09:51:49 +08:00 |
|
fan
|
dc57a1a82b
|
北交大添加留言板&联系方式&背景图片压缩
|
2020-11-18 09:31:10 +08:00 |
|
fan
|
6bd3f751c8
|
留言板调整
(cherry picked from commit cd59d4e26e)
|
2020-11-17 19:18:31 +08:00 |
|
fan
|
9a470268b2
|
留言板调整
|
2020-11-17 19:06:59 +08:00 |
|
fan
|
842c10a3f3
|
留言板调整
(cherry picked from commit c53c744edc)
|
2020-11-17 18:51:38 +08:00 |
|
fan
|
731a2af939
|
留言板报错调整
|
2020-11-17 18:39:11 +08:00 |
|
fan
|
6e35c6446e
|
展示更多距离调整
|
2020-11-17 18:33:21 +08:00 |
|
fan
|
d48d2564bc
|
留言板问题调整
|
2020-11-17 18:31:29 +08:00 |
|
fan
|
a22dd39077
|
留言板问题调整
|
2020-11-17 18:29:03 +08:00 |
|
fan
|
46ad5e4b68
|
quill 添加图片上传超限提示
|
2020-11-17 17:25:34 +08:00 |
|
fan
|
242ca313a0
|
删除接口调整
|
2020-11-17 17:17:23 +08:00 |
|
fan
|
3d7a5ddde0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-17 16:55:15 +08:00 |
|
fan
|
19a03ab258
|
留言板调整
|
2020-11-17 16:55:05 +08:00 |
|
sunzhenyu
|
05d4e319f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-17 10:20:23 +08:00 |
|
sunzhenyu
|
ea6103a861
|
修改三维客流列车显示
|
2020-11-17 10:19:59 +08:00 |
|
fan
|
df386dcb75
|
按钮判断条件调整
(cherry picked from commit 45bb150440)
|
2020-11-16 19:38:37 +08:00 |
|
fan
|
d477f46bc7
|
调整场景列表高度
|
2020-11-16 19:35:12 +08:00 |
|
fan
|
2c54e68928
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/views/newMap/displayNew/demonMenu.vue
# src/views/newMap/displayNew/dispatherContest/sceneList.vue
|
2020-11-16 19:29:49 +08:00 |
|
fan
|
1de24c5d31
|
留言板功能部分实现
|
2020-11-16 19:26:23 +08:00 |
|
sunzhenyu
|
c5212b67ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 18:22:36 +08:00 |
|
joylink_cuiweidong
|
79673768f0
|
竞赛平台 代码调整
|
2020-11-16 18:22:21 +08:00 |
|
sunzhenyu
|
5c8beedb15
|
修改三维客流模块，区分列车和车站视角，修改车站初始视角
|
2020-11-16 18:22:04 +08:00 |
|
joylink_cuiweidong
|
3b8a59a24f
|
系统管理 数据字典管理代码调整
|
2020-11-16 17:33:17 +08:00 |
|
joylink_cuiweidong
|
64ecefcf6d
|
代码调整
|
2020-11-16 15:01:43 +08:00 |
|
joylink_cuiweidong
|
8bb621a4ef
|
仿真 初始化 按计划行车 代码调整
|
2020-11-16 14:37:35 +08:00 |
|
joylink_cuiweidong
|
bc0aa31a50
|
代码调整
|
2020-11-16 13:32:19 +08:00 |
|
joylink_cuiweidong
|
389bac03a4
|
竞赛平台添加 联系我们按钮及弹窗
|
2020-11-16 13:10:10 +08:00 |
|
zyy
|
3d3138b6a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:57:56 +08:00 |
|
zyy
|
3cb0d10704
|
调整实操场景样式，说明点击问题
|
2020-11-16 10:57:44 +08:00 |
|
fan
|
c63f8097e7
|
合并区域控制器故障
|
2020-11-16 10:54:25 +08:00 |
|
joylink_cuiweidong
|
59940ece21
|
竞赛平台 实操删除 切换地图 按钮
|
2020-11-16 10:53:16 +08:00 |
|
fan
|
217ae8c2de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:11:57 +08:00 |
|
fan
|
a520ca5676
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:11:30 +08:00 |
|
fan
|
697dfdd365
|
样式调整
|
2020-11-16 10:11:07 +08:00 |
|
joylink_cuiweidong
|
a4af480ab8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:08:58 +08:00 |
|
joylink_cuiweidong
|
e3b4e46f2e
|
车站绘图代码调整
|
2020-11-16 10:08:37 +08:00 |
|
sunzhenyu
|
301ffac035
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:07:44 +08:00 |
|
sunzhenyu
|
4f9a8dd379
|
修改三维客流车门动画重置
|
2020-11-16 10:07:33 +08:00 |
|
joylink_cuiweidong
|
c1c9e4ee49
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 09:33:16 +08:00 |
|
joylink_cuiweidong
|
c986a37eb0
|
删除无用文件
|
2020-11-16 09:33:02 +08:00 |
|
sunleking
|
dd3de164d0
|
增加三维客流加载
|
2020-11-13 21:48:52 +08:00 |
|
sunzhenyu
|
ea4ce90b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 18:31:55 +08:00 |
|
sunzhenyu
|
c02d37872c
|
修改北交大三维客流显示
|
2020-11-13 18:31:48 +08:00 |
|
joylink_cuiweidong
|
d57d5bdd2b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 18:29:19 +08:00 |
|
joylink_cuiweidong
|
90a2e6d228
|
代码调整
|
2020-11-13 18:29:01 +08:00 |
|
sunzhenyu
|
f32137ad7f
|
merge
|
2020-11-13 18:27:12 +08:00 |
|
sunzhenyu
|
015632678f
|
修改三维客流模块
|
2020-11-13 18:26:22 +08:00 |
|
fan
|
c4dd7aa559
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 17:11:51 +08:00 |
|
fan
|
affba7de60
|
merge
|
2020-11-13 17:11:31 +08:00 |
|
joylink_cuiweidong
|
7745a78fa1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 17:11:13 +08:00 |
|
joylink_cuiweidong
|
bdc9be6465
|
仿真运行图 表号排序 代码调整
|
2020-11-13 17:10:54 +08:00 |
|
fan
|
64fbcc1223
|
问题调整
|
2020-11-13 17:07:26 +08:00 |
|