joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
678 Commits 20 Branches 0 Tags 448 MiB
07f13bc0ae
Commit Graph

662 Commits

Author SHA1 Message Date
fan
358b3cf6d0 调整：代码修改 2019-08-12 10:14:19 +08:00
ival
94e16353f3 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-12 09:36:43 +08:00
ival
fc6279efdf 修改加载方式 2019-08-12 09:36:27 +08:00
joylink_cuiweidong
f1b3906973 任务目标模块国际化 2019-08-09 19:00:37 +08:00
ival
6d960f82e2 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 18:29:26 +08:00
ival
763cff0a7c 修改页面不刷新的问题 2019-08-09 18:29:08 +08:00
joylink_cuiweidong
ddd282f5ca 国际化修改 2019-08-09 18:24:13 +08:00
joylink_cuiweidong
b82393366c Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/i18n/langs/en/index.js
#	src/i18n/langs/zh/index.js
 2019-08-09 18:20:34 +08:00
zyy
ff44562b2c Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 17:41:20 +08:00
zyy
7cde547775 desc: 增加英文文件内容 2019-08-09 17:40:53 +08:00
fan
367edf0118 调整：代码修改 2019-08-09 17:38:20 +08:00
fan
19eb3314c8 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2 2019-08-09 17:37:24 +08:00
zyy
ca0cdeb7f9 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/i18n/langs/zh/index.js
 2019-08-09 17:37:12 +08:00
zyy
374bf96525 desc: 增加规则，提示信息国际化 2019-08-09 17:36:20 +08:00
fan
a3b7ed0522 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2 2019-08-09 17:34:13 +08:00
joylink_cuiweidong
6951bf9f3a 页面样式修改 
国际化添加
 2019-08-09 17:26:33 +08:00
ival
bfddddf7e6 修改代码 2019-08-09 17:25:45 +08:00
ival
b208926795 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 16:57:28 +08:00
ival
6fad38621b 修改运行图编辑因为家在地图数据而报错的问题 2019-08-09 16:57:07 +08:00
fan
74f7785663 调整：限制仿真多次加载 2019-08-09 15:52:55 +08:00
zyy
fdd28f3c45 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/i18n/langs/en/index.js
#	src/i18n/langs/zh/index.js
 2019-08-09 15:41:39 +08:00
zyy
de5ca5225a desc: 配置地图国际化语言 2019-08-09 15:40:33 +08:00
ival
378be47db0 Merge remote-tracking branch 'remotes/origin/master' into test 2019-08-09 15:24:05 +08:00
ival
e466d49036 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 15:23:14 +08:00
ival
32a75526ee 修改导入 2019-08-09 15:23:01 +08:00
fan
40b71c5a4d 调整：代码修改 2019-08-09 15:17:19 +08:00
ival
05aa351a85 修改代码 2019-08-09 15:13:16 +08:00
ival
be0b7f7a2f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 15:10:28 +08:00
ival
7af324ab1e 国际化配置 2019-08-09 15:10:13 +08:00
joylink_cuiweidong
fe38c3dfb1 代码调整 2019-08-09 10:33:11 +08:00
ival
2db20932e1 精简配置 2019-08-09 10:10:26 +08:00
ival
66a13e6ede 修改运行图 2019-08-09 09:33:35 +08:00
ival
b89d99f2a5 修改i18n语言层次 2019-08-09 09:31:09 +08:00
joylink_cuiweidong
bf9a92d6b7 代码调整 2019-08-08 18:41:44 +08:00
joylink_cuiweidong
50c57837eb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:39:05 +08:00
zyy
a288a21456 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:34:41 +08:00
zyy
b20686c0fa desc: 修改 订阅综合演练房间号发送判断，修改代码格式 2019-08-08 18:34:35 +08:00
ival
c89c781735 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:09:52 +08:00
ival
4f9478d495 修改代码格式 2019-08-08 18:09:10 +08:00
fan
62d9b6fc5d 调整：title修改 2019-08-08 18:00:30 +08:00
joylink_cuiweidong
7abbadd603 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 17:33:18 +08:00
joylink_cuiweidong
ee136f8867 获取剧本的地图定位并设置 2019-08-08 17:32:38 +08:00
fan
212fce48bb 调整：代码调整 2019-08-08 17:26:50 +08:00
fan
a504f3cd90 调整：剧本加载页面位置跳转 2019-08-08 17:06:18 +08:00
joylink_cuiweidong
73a7780118 更新定位 2019-08-08 16:56:34 +08:00
zyy
399006e31f desc: 修改传入select默认值 2019-08-08 16:54:49 +08:00
zyy
40ab6b247b Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/theme/beijing_01/menus/index.vue
 2019-08-08 16:48:06 +08:00
zyy
6c5469ec90 修改代码格式 2019-08-08 16:47:34 +08:00
fan
6c7c08483f Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 16:45:37 +08:00
fan
aac75df8f7 调整：控制模式模式跳转disable状态调整 2019-08-08 16:45:22 +08:00
ival
01b871fa77 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 16:37:31 +08:00
ival
3adc1aafb1 修改界面菜单栏加载后出发 缩放按钮重新调整位置 
删除代码中的无用代码
 2019-08-08 16:37:15 +08:00
fan
b7679a6337 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 16:26:54 +08:00
fan
e379696f46 调整：位置跳转测试 2019-08-08 16:26:34 +08:00
zyy
a250833772 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 16:03:15 +08:00
zyy
ff101dd603 删除debugger 2019-08-08 16:02:58 +08:00
fan
503991a758 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 15:59:17 +08:00
fan
4a36ed4d3e 调整：修改修改列车识别号操作 2019-08-08 15:59:07 +08:00
zyy
4068555199 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 15:57:42 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
joylink_cuiweidong
66c0939e6c 代码调整 2019-08-08 15:48:43 +08:00
zyy
b67a37bc33 desc: 修改查询问题 2019-08-08 15:27:30 +08:00
zyy
837ba489b6 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 14:47:39 +08:00
zyy
2443fd102c desc: 调整站台字段 2019-08-08 14:47:34 +08:00
fan
33844220d3 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 14:37:39 +08:00
fan
289bffb435 调整：代码迁移(暂时注释掉位置跳转) 2019-08-08 14:36:57 +08:00
ival
842c7f9df2 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 14:32:47 +08:00
ival
66c599c0da 修改格式问题 2019-08-08 14:32:32 +08:00
sunzhenyu
f95b9eb1b7 merge 2019-08-08 14:20:00 +08:00
sunzhenyu
2aa7bfd759 修改js挂载 2019-08-08 14:19:03 +08:00
zyy
debecfba5a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 14:08:09 +08:00
zyy
ea67901aa1 修改格式 2019-08-08 14:08:02 +08:00
fan
6b21fefaeb Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 13:47:39 +08:00
fan
bcf73c78c2 调整：代码迁移+列车调整 2019-08-08 13:47:30 +08:00
ival
dbc3cbf482 修改运行图编辑工具报错bug 2019-08-08 13:36:53 +08:00
ival
45295404c3 1. 修改福州线，取消扣车被禁用的问题 
2. 修改i18n的获取当前语言的函数
 2019-08-08 13:23:54 +08:00
ival
7a41260bae 增加国际化配置 2019-08-08 11:33:06 +08:00
ival
b15a7feb23 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/main.js
 2019-08-08 11:31:36 +08:00
ival
c66d72a049 增加i18n国际化配置 2019-08-08 11:29:03 +08:00
zyy
577aaab9b9 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 11:11:38 +08:00
zyy
0a010eca04 修改格式 2019-08-08 11:11:32 +08:00
sunzhenyu
b326cbf73f push 2019-08-08 10:53:19 +08:00
sunzhenyu
6da9552dc7 pull 2019-08-08 10:52:43 +08:00
sunzhenyu
9f9236361a 修改threejs挂载 2019-08-08 10:52:06 +08:00
joylink_cuiweidong
b166dbd769 剧本 任务录制模块提交 2019-08-08 10:31:46 +08:00
zyy
d014007d25 desc: 修改仿真系统，教学系统，考试系统默认首页设置 2019-08-08 10:16:14 +08:00
zyy
af61917dbf Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/theme/factory.js
 2019-08-08 09:48:14 +08:00
zyy
f231ffd6f1 desc: 增加成都四号线地图配置 2019-08-08 09:47:39 +08:00
ival
9ffce4d702 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 09:37:46 +08:00
ival
c855925ae3 修改配置 2019-08-08 09:37:35 +08:00
fan
05e4fd73bb 调整：列车调整 2019-08-08 09:35:28 +08:00
zyy
fe9b59e2de Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-07 16:23:11 +08:00
zyy
d70953a130 desc: 增加成都四号线模型， 修改地图删除逻辑 2019-08-07 16:23:04 +08:00
ival
0cbe7901c7 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-07 15:32:50 +08:00
ival
7feea79e44 成都三号线运行图解析 2019-08-07 15:32:35 +08:00
sunzhenyu
e86be938f3 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-07 11:29:03 +08:00
sunzhenyu
5899fe1347 修改界面自适应 2019-08-07 11:28:46 +08:00
zyy
83faa429fe 修改列车详情显示问题 2019-08-07 11:22:33 +08:00
zyy
f492d38c47 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-07 10:24:21 +08:00
zyy
e3a8d5c525 desc: 修改代码 2019-08-07 10:24:13 +08:00
ival
3751748979 修改lz zc 等鼠标事件统一接口处理 2019-08-07 09:16:55 +08:00
ival
a02a948f17 修改bug 2019-08-06 18:42:18 +08:00
ival
165362dfcb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 17:46:55 +08:00
ival
b6baa2e420 修改 设置设备名称的设置方法 2019-08-06 17:46:41 +08:00
sunzhenyu
7edaf938c7 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-06 17:28:17 +08:00
zyy
888756dc35 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/Section/EMouse.js
 2019-08-06 17:02:32 +08:00
zyy
37c13f6672 调整代码格式，福州线状态处理 2019-08-06 17:02:04 +08:00
ival
167e483b10 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 17:00:36 +08:00
ival
f85139b4ae 修改鼠标关联操作 2019-08-06 17:00:24 +08:00
sunzhenyu
c27aed050f 挂载threejs，添加静态文件插件 2019-08-06 14:10:21 +08:00
zyy
e4364c600e Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 13:56:48 +08:00
zyy
8fe358896e desc: 修改车次窗菜单BUG 2019-08-06 13:56:42 +08:00
ival
86c5a5f58f 抽离车次窗配置 2019-08-06 13:19:30 +08:00
ival
7573e30a31 修改皮肤配置 2019-08-06 13:09:11 +08:00
ival
d4b995675d 提出字体粗细配置 2019-08-06 13:02:55 +08:00
zyy
e71c68f7bc 修改signal 状态管理 2019-08-06 10:54:22 +08:00
zyy
71381ff174 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 10:11:43 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
ival
ea0a3b9d16 修改默认选中状态，无未选中 2019-08-06 09:32:55 +08:00
ival
2ee8e24897 增加鼠标操作 2019-08-06 09:27:12 +08:00
ival
3ae415d6e9 修改背景线，鼠标特效 2019-08-05 18:42:37 +08:00
ival
530a1c473e 修改 代码接口名称 2019-08-05 17:46:41 +08:00
ival
44481b2cbb 修改代码bug 2019-08-05 17:36:16 +08:00
ival
fb33bde94c 设置状态时，无需关注model变化，render时，model已经引用到view上 2019-08-05 17:24:20 +08:00
ival
78e7e344aa 修改操作问题 2019-08-05 17:09:16 +08:00
ival
79bd163d8f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 16:55:47 +08:00
ival
d2887ee34e 调整道岔名称的y轴设置 2019-08-05 16:55:36 +08:00
zyy
d7a80d3bc3 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 16:43:59 +08:00
zyy
87177a347b desc: 修改代码 2019-08-05 16:43:52 +08:00
ival
b8fb7fc210 修改代码 2019-08-05 16:21:43 +08:00
ival
1e5ad7e522 修改bug 2019-08-05 16:17:46 +08:00
ival
efa91ae5a0 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 16:14:53 +08:00
ival
7c526a94c6 修改代码 2019-08-05 16:14:40 +08:00
fan
6bc62094ba Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整 2019-08-05 15:20:04 +08:00
fan
dbc16a1172 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整 
# Conflicts:
#	src/jmap/config/skinStyle/chengdu_03.js
 2019-08-05 15:19:32 +08:00
fan
a55ab7b57e Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整 
# Conflicts:
#	src/jmap/config/skinStyle/chengdu_03.js
 2019-08-05 15:18:40 +08:00
fan
fd8b2402ad 调整：列车成都线调整 2019-08-05 15:13:49 +08:00
ival
9792a2547a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 15:13:41 +08:00
ival
6f73920532 增加信号机变现变化处理 2019-08-05 15:13:31 +08:00
zyy
386f79128a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 15:12:13 +08:00
zyy
d45c154fe0 修改代码 2019-08-05 15:12:06 +08:00
ival
555664aaeb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 15:01:03 +08:00
ival
042e6c0e59 修改区段名称的问题 2019-08-05 15:00:51 +08:00
fan
824c6ed834 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整 2019-08-05 13:36:14 +08:00
fan
15d0ea03e5 调整：列车调整 2019-08-05 13:36:00 +08:00
zyy
6b5c1790c6 修改代码 2019-08-05 10:36:41 +08:00
zyy
f37f441d33 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/config/skinStyle/bejing_01.js
#	src/jmap/config/skinStyle/fuzhou_01.js
 2019-08-05 10:36:28 +08:00
zyy
5134feec56 desc: 修改代码 2019-08-05 10:33:31 +08:00
ival
5e8f1899ff 修改代码 2019-08-05 09:59:08 +08:00
ival
dd9c8220b1 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 09:58:45 +08:00
ival
711534599f 修改代码 2019-08-05 09:58:33 +08:00
fan
072495709a 调整：列车配置项结构调整 2019-08-05 09:36:15 +08:00
fan
ee16c35aaa 调整：standControl调整 2019-08-05 08:42:45 +08:00
ival
1e6a5510ac 修改格式 2019-08-02 18:09:25 +08:00
ival
ad6e98da39 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-02 18:05:17 +08:00
ival
77db948f68 修改皮肤配置 2019-08-02 18:05:08 +08:00
fan
9c51e10ec1 调整：皮肤调整 2019-08-02 17:57:14 +08:00
fan
e385704360 调整：代码修改 2019-08-02 17:41:12 +08:00
fan
7dec924ac4 调整：代码修改 2019-08-02 17:38:21 +08:00
fan
ce5600c173 调整：代码修改 2019-08-02 17:22:23 +08:00
fan
b7e021d737 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/config/skinStyle/chengdu_03.js
 2019-08-02 17:14:21 +08:00
fan
af0fd392d1 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/config/skinStyle/chengdu_03.js
 2019-08-02 17:14:02 +08:00
fan
44a1d197cb 调整：代码调整 2019-08-02 17:06:37 +08:00
ival
803dd3f823 修改皮肤配置 2019-08-02 17:02:43 +08:00
fan
33c71a20f6 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-02 16:31:49 +08:00
ival
347db0d6eb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-02 14:55:02 +08:00
ival
e64a26f621 修改eventBus大小问题 2019-08-02 14:54:51 +08:00
fan
3ad9becbd8 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-02 14:38:27 +08:00
fan
02ba15964c 调整：代码调整 2019-08-02 14:38:05 +08:00
zyy
0b93d7ef16 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/config/deviceStyle.js
#	src/utils/baseUrl.js
#	src/views/map/runplan/manage/operateMenu.vue
 2019-08-02 14:32:42 +08:00
zyy
4cf032df11 desc: 增加区段折返箭头代码 2019-08-02 14:31:29 +08:00
fan
0abe6e61e6 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-02 14:29:43 +08:00
ival
b1db745ed6 修改 zc不显示 2019-08-02 14:29:18 +08:00
fan
92bdbf7a99 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-02 14:26:58 +08:00
fan
d68daaa837 调整：代码调整 2019-08-02 14:26:50 +08:00
ival
543b05f848 修改配置 2019-08-02 14:23:37 +08:00
ival
dd5218dae5 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/views/jlmap/index.vue
#	src/views/map/runplan/manage/operateMenu.vue
 2019-08-02 14:19:06 +08:00
ival
60aa181598 修改皮肤配置 2019-08-02 14:17:43 +08:00
zyy
4ff4d812a9 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-02 10:58:34 +08:00
zyy
a010f71252 调整运行图加载， eventbus代码调整 2019-08-02 10:58:28 +08:00
fan
7162f5ce42 调整：stationControl调整 2019-08-02 10:39:59 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
zyy
ff9e69585d desc: 调整剧本加载，删除城市注释 2019-08-01 15:19:24 +08:00
fan
4be4c87327 调整：福州control调整 2019-08-01 09:57:29 +08:00
fan
cba988e5d3 调整：仿真管理地图列表页调整 2019-08-01 08:50:24 +08:00
zyy
7bba3d49d6 desc: 修改代码 2019-07-31 19:09:45 +08:00
zyy
5af196522e Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-31 18:46:51 +08:00
zyy
99bcfa56ac 修改代码 2019-07-31 18:46:37 +08:00
fan
0d379faf11 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/LcControl/index.js
#	src/jmap/shape/LimitControl/index.js
#	src/jmap/shape/StationControl/index.js
#	src/jmap/shape/ZcControl/index.js
 2019-07-31 18:39:08 +08:00
fan
a03798a748 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/LcControl/index.js
#	src/jmap/shape/LimitControl/index.js
#	src/jmap/shape/StationControl/index.js
#	src/jmap/shape/ZcControl/index.js
 2019-07-31 18:38:29 +08:00
fan
0fc306714b 调整：control增加悬浮移出事件 2019-07-31 18:24:28 +08:00
zyy
cfbb21b9bb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/Section/index.js
#	src/jmap/shape/Switch/index.js
 2019-07-31 18:20:39 +08:00
zyy
1a44bfb002 修改代码 2019-07-31 18:19:15 +08:00
ival
871a9fbbe2 修改代码 2019-07-31 15:54:20 +08:00
ival
3042cf229d 修改代码 2019-07-31 14:59:38 +08:00
fan
1d18028d41 调整：福州列车从左往右不显示 2019-07-31 13:56:44 +08:00
ival
5270c0bc2a 删除无用代码，增加信号机和站台鼠标代码 2019-07-31 11:06:14 +08:00
ival
0157f32fc0 修改加载代码 2019-07-31 09:13:37 +08:00
zyy
851c0a4a6a desc: 修改代码 2019-07-30 18:45:32 +08:00
zyy
deccfc537a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-30 18:03:04 +08:00
zyy
09285fb326 修改代码 2019-07-30 18:02:58 +08:00
fan
2919ae5a15 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-07-30 17:27:39 +08:00
fan
dd4d83f02b 调整：代码调整 2019-07-30 17:27:29 +08:00
ival
b00bb22a8c 修改菜单状态控制 2019-07-30 16:57:08 +08:00
ival
7a71fc42ae Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-30 16:47:22 +08:00
ival
276f68e7bc 修改优化代码 2019-07-30 16:47:11 +08:00
zyy
82c49c97e2 调整代码 2019-07-30 15:52:30 +08:00
zyy
2099c6f8ba Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/map.js
 2019-07-30 13:30:33 +08:00
zyy
d65f7fb334 desc: 修改代码 2019-07-30 13:29:54 +08:00
ival
66b2406d91 修改回拉设置bug 2019-07-30 12:44:51 +08:00
ival
9152b6a55e 增加 Line 和 Text 设备移植，以及调试代码 2019-07-30 12:37:31 +08:00
ival
5b4cbba9eb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-30 09:48:23 +08:00
ival
ce82f25422 修改代码 2019-07-30 09:48:14 +08:00
fan
d580c31e58 调整：table页form表头不生效 2019-07-30 09:45:52 +08:00
ival
0742f9b633 修改操作 2019-07-30 09:35:00 +08:00
ival
a59d579d57 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/Signal/index.js
 2019-07-30 09:19:18 +08:00
ival
ca433c2eb6 修改设备结构 2019-07-30 09:18:24 +08:00
fan
4b69c12542 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-07-29 18:15:11 +08:00
fan
42caa08fc2 调整：跑图调整 2019-07-29 18:11:33 +08:00
ival
33e6b6ab43 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/store/modules/map.js
 2019-07-29 17:57:55 +08:00
ival
c4a6b076da 修改菜单处理 2019-07-29 17:57:00 +08:00
zyy
5517f5a467 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 17:10:37 +08:00
zyy
264eea1d78 修改 车站 道岔地图绘制 配置 2019-07-29 17:10:30 +08:00
ival
cdccd7b41f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 16:03:27 +08:00
ival
05c90f1079 修改代码 2019-07-29 16:03:14 +08:00
zyy
4da098c1fd desc: 调整绘图数据 2019-07-29 15:49:28 +08:00
zyy
c05db4daed 调整格式 2019-07-29 15:30:11 +08:00
zyy
d5e5f3b644 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 15:24:04 +08:00
zyy
00dc541830 调整配置代码 2019-07-29 15:23:55 +08:00
ival
9693c2a2f9 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 13:45:53 +08:00
ival
69ed6c5eea 处理菜单 2019-07-29 13:45:38 +08:00
fan
1eb577a2ed 调整：代码修改 2019-07-29 13:38:02 +08:00
fan
b50fd1aae3 调整：代码修改 2019-07-29 13:29:30 +08:00
ival
ca01e0aeb7 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/Section/index.js
#	src/jmap/shape/Switch/index.js
 2019-07-29 11:20:20 +08:00
ival
33442905be 修改道岔状态变化 2019-07-29 11:18:50 +08:00
zyy
9e8e5afe41 修改配置文件代码 2019-07-29 10:59:02 +08:00
zyy
c2400c07e1 desc: 增加区段配置 2019-07-29 10:20:18 +08:00
ival
10cd98fe6f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 09:27:49 +08:00
ival
21fd4ec516 修改区段状态变化 2019-07-29 09:27:33 +08:00
fan
9241e91364 调整：列车问题调整 2019-07-29 08:46:29 +08:00
ival
a74053360d Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-26 18:54:52 +08:00
ival
02bd1e9d40 调试跑车 2019-07-26 18:54:42 +08:00
zyy
a9127022fd Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-26 18:53:51 +08:00
zyy
06c5c60364 desc: 增加section配置 2019-07-26 18:53:44 +08:00
ival
ed01ac7180 修改代码 2019-07-26 17:39:05 +08:00
ival
8f2712e3d8 修改代码 2019-07-26 17:35:58 +08:00
ival
ab86340524 修改列车跑车计算 2019-07-26 17:18:27 +08:00
ival
c161f19b1b 修改跑车 2019-07-26 17:13:03 +08:00
zyy
7be6ca66fc Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/views/map/mapdraft/mapedit/mapoperate/link.vue
 2019-07-26 16:01:18 +08:00
zyy
1305046304 修改代码 2019-07-26 15:59:31 +08:00