joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
1,266 Commits 20 Branches 0 Tags 448 MiB
7ae79fd7e4
Commit Graph

720 Commits

Author SHA1 Message Date
joylink_cuiweidong
1943f767c4 对话讲述人和接收人可以互换 2019-08-21 14:08:43 +08:00
fan
7bb5aa785d 合并冲突 2019-08-21 14:04:22 +08:00
fan
9a480393f5 国际化调整+loading调整 2019-08-21 13:54:53 +08:00
ival
6bbfd49150 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 13:48:24 +08:00
ival
b5a93f7ce1 修改国际化 2019-08-21 13:48:06 +08:00
zyy
1132e5fb4c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/index.js
#	src/i18n/langs/zh/global.js
#	src/i18n/langs/zh/index.js
#	src/i18n/langs/zh/rules.js
#	src/views/map/runplan/manage/create.vue
 2019-08-21 13:47:40 +08:00
zyy
c22d97b944 desc: 教学系统国际化 2019-08-21 13:46:36 +08:00
joylink_cuiweidong
300ed72365 指令文字为红色，隐藏修改按钮 
指令和对话添加后原内容不清除
 2019-08-21 12:03:01 +08:00
ival
09af43a690 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 11:29:13 +08:00
ival
4270053326 修改国际化 2019-08-21 11:28:56 +08:00
joylink_cuiweidong
51dcc5e904 剧本编制样式调整 2019-08-21 10:24:55 +08:00
ival
63e8232f8e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 09:29:12 +08:00
ival
6aa82ce2d4 修改权限配置 2019-08-21 09:29:02 +08:00
fan
dc3f334a93 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-21 09:23:08 +08:00
ival
5273554ba0 饼形图增加个数显示 2019-08-21 09:20:40 +08:00
ival
82222027c0 调整坐标布局 2019-08-21 09:18:52 +08:00
ival
73d5b4c4fa Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 09:15:04 +08:00
ival
d8e7965ffd 修改主页表信息 2019-08-21 09:14:54 +08:00
fan
7ef9abe5a9 国际化调整 2019-08-20 18:58:55 +08:00
fan
7334d282dd 调整: 剧本过滤角色调整 2019-08-20 18:57:14 +08:00
ival
474b1fff18 修改仿真暂停字段归属文件 2019-08-20 18:44:02 +08:00
ival
0191158f87 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-20 18:35:59 +08:00
ival
de0fd028ed 设置时间暂停 2019-08-20 18:35:42 +08:00
joylink_cuiweidong
6e6a56903f 剧本编制样式调整 2019-08-20 18:31:48 +08:00
sunzhenyu
0e7805121a Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-08-20 18:30:23 +08:00
sunzhenyu
1fb6353f98 增加测试版车载cctv 2019-08-20 18:30:17 +08:00
joylink_cuiweidong
7f2c741818 剧本列表页面 样式调整 2019-08-20 17:54:40 +08:00
ival
433360f979 增加回放的国际化 2019-08-20 17:22:45 +08:00
ival
402e0537bf Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-20 17:01:20 +08:00
ival
8259b24f6c 增加国际化配置 2019-08-20 17:01:09 +08:00
joylink_cuiweidong
8172457cda 剧本编制模块样式调整 2019-08-20 15:55:32 +08:00
joylink_cuiweidong
4830864424 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-20 15:45:15 +08:00
ival
d1417983cc 修改国际化 2019-08-20 15:44:16 +08:00
joylink_cuiweidong
c6b8ba6794 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-20 15:42:15 +08:00
joylink_cuiweidong
2727309402 剧本录制样式修改 2019-08-20 15:41:54 +08:00
ival
3c11c5fd47 增加交路目的地码 2019-08-20 14:17:53 +08:00
ival
febfddfc15 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-20 14:03:11 +08:00
ival
03eec83e9c 增加交路目的地码的展示 2019-08-20 14:02:55 +08:00
joylink_cuiweidong
2cf92690ec 剧本编制页面布局调整 2019-08-20 13:27:07 +08:00
joylink_cuiweidong
7f907cc6ba Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/display/tipScriptRecord.vue
 2019-08-20 13:22:51 +08:00
joylink_cuiweidong
0db73aba5f 剧本编制页面结构调整 2019-08-20 13:21:38 +08:00
zyy
e376b141cf desc: 国际化 2019-08-20 13:14:02 +08:00
ival
468e624383 修改页面布局问题 2019-08-20 13:03:39 +08:00
ival
424482dd4b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-20 12:47:53 +08:00
ival
21a0110966 增加录制脚本页面布局 2019-08-20 12:47:39 +08:00
zyy
3783eedeb7 desc: 删除多余列车模型 2019-08-20 11:18:59 +08:00
zyy
2f0519488f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
 2019-08-20 11:17:50 +08:00
zyy
74fea0b56e desc: 调整地图绘制样式 2019-08-20 11:17:08 +08:00
ival
adc6828060 修改跳转路由后，页面不加载的问题 2019-08-20 10:34:41 +08:00
ival
c718ea2f41 修改综合演练加入房间未加载地图的问题 2019-08-20 10:23:59 +08:00
ival
28c6e05c41 修改获取列车数据没有刷新，导致加载的问题 2019-08-20 09:55:49 +08:00
ival
0926e6e2d2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-20 09:13:16 +08:00
ival
8c4efb83db 修改国际化导致的界面布局问题 2019-08-20 09:12:54 +08:00
fan
969bb89192 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-19 20:27:43 +08:00
fan
36a1f8e878 调整: 快速入口调整 2019-08-19 20:27:23 +08:00
joylink_cuiweidong
d71e42a84d 剧本编制模块表单修改 2019-08-19 19:42:17 +08:00
joylink_cuiweidong
21e32aa823 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 19:38:17 +08:00
joylink_cuiweidong
d7bf9a172c 剧本编制模块修改 2019-08-19 19:37:52 +08:00
fan
442b3fd686 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-19 19:32:23 +08:00
fan
3e0282784b 调整: 加载剧本button 文字调整 2019-08-19 19:32:08 +08:00
ival
8ca232549f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/orderauthor/order/draft.vue
 2019-08-19 18:51:17 +08:00
ival
67cf6f5a29 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/orderAuthor.js
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/zh/orderAuthor.js
#	src/i18n/langs/zh/rules.js
#	src/views/orderauthor/commodity/index.vue
#	src/views/orderauthor/order/draft.vue
 2019-08-19 18:49:40 +08:00
fan
25bdd09388 调整: 国际化样式调整 2019-08-19 18:44:50 +08:00
ival
68e7eaeeb6 修改字典菜单的国际化 2019-08-19 18:42:53 +08:00
fan
b78e6ad278 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-19 18:31:41 +08:00
fan
c5ecf86107 调整: 国际化+成都三号线人工车显示 2019-08-19 18:31:13 +08:00
joylink_cuiweidong
146be45957 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 18:25:58 +08:00
joylink_cuiweidong
4dbe34cf4f 剧本编制模块修改 2019-08-19 18:24:06 +08:00
fan
dd11b6fed6 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/rules.js
 2019-08-19 16:39:20 +08:00
fan
c91a4efdcc 修改：国际化调整 2019-08-19 16:35:27 +08:00
ival
70e1236099 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 15:59:16 +08:00
ival
ae500285ba 修改实训加载顺序错误的问题 2019-08-19 15:59:04 +08:00
zyy
921f67938e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/zh/rules.js
 2019-08-19 15:54:53 +08:00
zyy
a6b8d8a21a desc: 删除重复的国际化标识， 国际化翻译 2019-08-19 15:53:14 +08:00
fan
30433bfcd0 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-19 15:47:07 +08:00
fan
d0f7bd46a9 修改：国际化调整 2019-08-19 15:46:52 +08:00
ival
2d8f94f47a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 15:19:50 +08:00
ival
94f3659cf3 修改国际化 2019-08-19 15:19:33 +08:00
zyy
91b2674de4 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 15:06:53 +08:00
zyy
fdfa413567 desc: 调整国际化翻译 2019-08-19 15:06:47 +08:00
fan
ecc4885ad0 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-19 14:09:54 +08:00
fan
2115c952cc 修改：loading调整 2019-08-19 14:09:37 +08:00
joylink_cuiweidong
43dfc04281 定时保存数据 
剧本编制页面修改
 2019-08-19 14:09:08 +08:00
ival
9ca049157c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 14:02:32 +08:00
ival
d87a4fff22 国际化处理 2019-08-19 14:02:20 +08:00
zyy
7a7690e898 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 14:01:51 +08:00
zyy
fd5ab1f30d desc: 地图绘制 逻辑修改 2019-08-19 14:01:45 +08:00
fan
a669d093b1 修改：删除全局loading 2019-08-19 13:27:15 +08:00
zyy
b025c78d67 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 11:18:57 +08:00
zyy
138dfe5e06 desc: 修改地图绘制图层配置， 调整道岔时间显示 2019-08-19 11:18:46 +08:00
ival
4da9dc977b 修改右键菜单，文字颜色 2019-08-19 11:16:29 +08:00
ival
068dbdbbde 修改代码 2019-08-19 10:58:14 +08:00
ival
d083482b10 修改代码 2019-08-19 10:31:11 +08:00
ival
00f0fd84a3 修改车站公里表隐藏的问题 2019-08-19 09:38:11 +08:00
ival
54425befb2 界面调整 2019-08-19 09:15:25 +08:00
ival
44aa6442f0 权限条形图分类 2019-08-18 21:12:38 +08:00
joylink_cuiweidong
f7736543a5 修改剧本动作的样式 2019-08-16 20:06:14 +08:00
joylink_cuiweidong
08d00d3f93 修改 动作列表展现 2019-08-16 19:33:40 +08:00
ival
e0a7a5d0fc 修改权限配置 2019-08-16 19:09:44 +08:00
ival
01c9ac1c20 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 18:59:30 +08:00
ival
c99394ea51 修改主页配置 2019-08-16 18:59:19 +08:00
sunzhenyu
d5aa08dd72 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-08-16 18:38:44 +08:00
sunzhenyu
ab23d7932a 修改mmi接收操作模拟器消息 2019-08-16 18:38:35 +08:00
zyy
049ed8f0dd desc: 调整样式 2019-08-16 18:23:36 +08:00
ival
9648263a88 Merge remote-tracking branch 'remotes/origin/test' into dev 2019-08-16 18:18:38 +08:00
ival
b0aade5fa2 修改首页显示 2019-08-16 18:16:19 +08:00
zyy
382e63c6c9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 18:02:56 +08:00
zyy
bb1a98507b desc: 地图编辑区分绘图数据，地图数据 2019-08-16 18:02:50 +08:00
fan
04baa2756e 修改：代码调整 2019-08-16 17:50:57 +08:00
joylink_cuiweidong
ecefa16f5e 剧本编制修改 2019-08-16 17:15:20 +08:00
zyy
50e847ec57 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 17:13:18 +08:00
zyy
e08a400b06 desc: 修改琏计划运行图创建加载 2019-08-16 17:13:12 +08:00
ival
6065853adc 删除测试代码 2019-08-16 16:57:14 +08:00
ival
483f7ac12b 修改主页界面 2019-08-16 16:55:16 +08:00
ival
25e3cb19a4 删除运行图创建 2019-08-16 16:42:26 +08:00
ival
b2d6faa7ba 修改导入没有loading的问题 2019-08-16 16:40:02 +08:00
zyy
75da1291ce Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 16:34:14 +08:00
zyy
25493993d9 desc: 修改路由监听 2019-08-16 16:33:59 +08:00
ival
850b0cf248 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 16:28:22 +08:00
ival
8e431bade1 修改地图导入导出 2019-08-16 16:28:11 +08:00
zyy
e6f83a7998 desc: 修改地图绘制点击事件 2019-08-16 16:27:38 +08:00
zyy
7b22ab377e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 16:19:14 +08:00
zyy
44d021a6ec desc: 修改地图绘制加载问题 2019-08-16 16:19:08 +08:00
ival
7596e980f4 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 15:41:30 +08:00
ival
836c6d383a 修改格式，以及修改综合演练设置车站的stationCode为deviceCode 2019-08-16 15:41:20 +08:00
zyy
cf84618fd4 desc: 修改地图点击事件问题 2019-08-16 15:24:41 +08:00
zyy
2e7715ea0a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/map/mapdraft/mapedit/index.vue
#	src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
 2019-08-16 15:13:58 +08:00
zyy
b84b6ea500 desc: 修改地图编辑页面逻辑 2019-08-16 15:12:03 +08:00
fan
df1994ecfb Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-16 15:03:11 +08:00
fan
5f2fc257f5 修改：剧本调整 2019-08-16 15:02:34 +08:00
ival
37390ff549 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 14:40:52 +08:00
ival
5612c9b1e4 修改主页参数 2019-08-16 14:40:42 +08:00
joylink_cuiweidong
14901a50f2 修改 创建剧本的跳转逻辑 
编制剧本的表单重置
 2019-08-16 14:37:42 +08:00
ival
aae4d4d162 修改车次窗的问题 2019-08-16 14:33:36 +08:00
ival
c154ab28fe Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-08-16 14:25:56 +08:00
ival
e152829561 修改车次窗不能创建的问题 2019-08-16 14:25:20 +08:00
fan
d16ecfd83c 修改：剧本调整 2019-08-16 14:15:43 +08:00
joylink_cuiweidong
b73baebbb8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 13:50:51 +08:00
joylink_cuiweidong
2598087dac Merge remote-tracking branch 'remotes/origin/master' into dev 
# Conflicts:
#	src/i18n/langs/en/map.js
#	src/i18n/langs/en/tip.js
#	src/i18n/langs/zh/map.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/tip.js
#	src/utils/baseUrl.js
#	src/views/map/mapdraft/mapedit/routingoperate/detail.vue
#	src/views/map/mapdraft/mapedit/routingoperate/route.vue
#	src/views/map/mapdraft/mapedit/switchoperate/detail.vue
 2019-08-16 13:45:49 +08:00
fan
50e9549260 剧本接口调整 2019-08-16 13:43:46 +08:00
joylink_cuiweidong
f722a0bc27 录制剧本模块修改 2019-08-16 09:25:12 +08:00
ival
05db53a606 修改echarts配置 2019-08-15 18:44:06 +08:00
ival
561c86ab72 首页数据统计 2019-08-15 18:04:23 +08:00
ival
1720e5e19d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-15 16:19:23 +08:00
ival
4917108e3e 修改绘图card被撑开的问题 2019-08-15 16:19:03 +08:00
zyy
300d1f9638 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-15 16:11:16 +08:00
zyy
ecc9806d61 desc: 修改地图配置 2019-08-15 16:11:09 +08:00
ival
0d8770e9e1 Merge remote-tracking branch 'remotes/origin/master' into dev 
# Conflicts:
#	src/views/demonstration/deomonList/index.vue
 2019-08-15 16:10:13 +08:00
ival
7a08dabc30 修改jenkinsfile-test 2019-08-15 16:06:08 +08:00
ival
11658a283e 修改主页 2019-08-15 15:53:11 +08:00
fan
0b3ad87bc3 创建仿真失败时关闭loading 2019-08-15 15:21:28 +08:00
ival
4519d753e3 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-15 14:28:47 +08:00
ival
d4ba56d31d 修该查询进路的接口 2019-08-15 14:28:31 +08:00
joylink_cuiweidong
2e53745790 剧本管理模块 2019-08-15 14:06:53 +08:00
fan
9787c8aaeb 调整：国际化 2019-08-15 10:47:59 +08:00
fan
1b42eec5e3 调整：国际化 2019-08-15 10:37:47 +08:00
fan
951fdd9719 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/zh/map.js
#	src/i18n/langs/zh/tip.js
#	src/views/map/product/draft.vue
#	src/views/map/product/list.vue
#	src/views/map/skinStyle/draft.vue
#	src/views/map/skinStyle/index.vue
 2019-08-15 10:34:31 +08:00
zyy
7cabec1c1f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-15 10:26:37 +08:00
zyy
fad339f977 desc: 调整地图绘制国际化 2019-08-15 10:26:29 +08:00
fan
414000331e 调整：国际化 2019-08-15 09:45:31 +08:00
joylink_cuiweidong
ca7b21e61e 修改剧本管理界面 2019-08-15 09:04:17 +08:00
ival
68c8757dad 修改配置 2019-08-15 08:58:21 +08:00
ival
fd2b66e984 Merge remote-tracking branch 'remotes/origin/master' into dev 
# Conflicts:
#	src/i18n/langs/zh/rules.js
#	src/views/trainRoom/index.vue
 2019-08-14 16:50:50 +08:00
zyy
7fdedec00f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-14 16:48:03 +08:00
zyy
62674f84ff desc: 修改快速入口提示问题 2019-08-14 16:47:54 +08:00
ival
b1fd1f43e9 删除返回主页的错误 2019-08-14 16:46:44 +08:00
ival
87e35cb38d 同步master代码以及修改交路的问题 2019-08-14 16:37:17 +08:00
zyy
eef2fed8a2 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-14 16:15:50 +08:00
zyy
ed8b14dac2 desc: 修改综合演练，socket创建 2019-08-14 16:15:44 +08:00
ival
3bb449080f Merge remote-tracking branch 'remotes/origin/master' into dev 
# Conflicts:
#	src/i18n/langs/zh/tip.js
#	src/jlmap3d/jl3ddrive/jl3ddrive.js
#	src/views/components/pay/index.vue
#	src/views/demonstration/detail/index.vue
#	src/views/display/index.vue
#	src/views/exam/detail/courseDetail.vue
#	src/views/exam/detail/examDetail.vue
#	src/views/exam/detail/questionDetail.vue
#	src/views/jlmap3d/drive/jl3ddrive.vue
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
#	src/views/jointTraining/index.vue
#	src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
#	src/views/map/mapdraft/mapedit/mapoperate/link.vue
#	src/views/map/mapdraft/mapedit/mapoperate/section.vue
#	src/views/map/mapdraft/mapedit/mapoperate/signal.vue
#	src/views/map/mapdraft/mapedit/mapoperate/station.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
#	src/views/map/mapdraft/mapedit/mapoperate/switch.vue
#	src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
#	src/views/map/mapdraft/mapedit/routeoperate/detail.vue
#	src/views/map/mapdraft/mapedit/routeoperate/preview.vue
#	src/views/map/mapdraft/mapedit/routeoperate/related.vue
#	src/views/map/mapdraft/mapedit/routeoperate/route.vue
#	src/views/map/mapdraft/mapmanage/operateMenu.vue
#	src/views/map/product/draft.vue
#	src/views/map/product/list.vue
#	src/views/map/skinStyle/draft.vue
#	src/views/map/skinStyle/index.vue
#	src/views/planMonitor/detail.vue
#	src/views/planMonitor/editTool/index.vue
#	src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
#	src/views/planMonitor/editTool/schedule.vue
#	src/views/teach/detail/index.vue
#	src/views/teach/practical/index.vue
 2019-08-14 15:57:52 +08:00
ival
6ea6c8a2e9 修改代码 2019-08-14 15:28:15 +08:00
ival
230d118d30 修改name错误的问题 2019-08-14 15:25:01 +08:00
ival
4886587d2d Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/views/map/mapdraft/mapedit/routeoperate/detail.vue
 2019-08-14 15:21:06 +08:00
ival
72d3a5f475 修改进路查询方式 2019-08-14 15:19:11 +08:00
zyy
c304af4811 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-14 15:03:47 +08:00
zyy
3dd56879a4 desc: 修改国际化，调整角色显示 2019-08-14 15:03:41 +08:00
ival
4a224b630f 增加首先显示 2019-08-14 14:52:21 +08:00
ival
6343a79f81 修改接口 2019-08-14 14:01:28 +08:00
ival
72c1f1d4ca 修改搜索 2019-08-14 13:48:06 +08:00
ival
c61a673513 修改添加 2019-08-14 13:42:35 +08:00
ival
ed05cb123e 修改类车添加功能 2019-08-14 13:38:28 +08:00
ival
576ac7eacb 修改导航配置 2019-08-14 10:36:55 +08:00
ival
25479392ff 修改配置 2019-08-14 10:12:51 +08:00
ival
d8480207aa Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-14 09:35:52 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
ival
4e88c02363 修改目录结构 2019-08-14 09:33:24 +08:00
zyy
9a4e982c08 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-13 18:43:40 +08:00
zyy
aa63be299b desc: 增加地图编辑 国际化 2019-08-13 18:43:34 +08:00
fan
8c799d7ee6 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 18:32:48 +08:00
fan
3a0202a1e9 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 18:27:09 +08:00
ival
e0d76d03c5 修改运行图右键菜单 2019-08-13 18:26:36 +08:00
ival
45417f0072 修改代码 2019-08-13 18:14:19 +08:00
fan
2ab09d664f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 18:12:14 +08:00
fan
a3ecc1dfc6 调整：国际化 2019-08-13 18:11:58 +08:00
ival
b84f1fe553 运行图修改接口 2019-08-13 17:46:59 +08:00
ival
db109f2a9e 调整地图进路相关的接口 2019-08-13 16:59:38 +08:00
sunzhenyu
49c3c19c83 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-13 16:23:52 +08:00
sunzhenyu
39002937e1 调整文件结构 2019-08-13 16:23:46 +08:00
zyy
c817cdea7a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-13 15:54:32 +08:00
zyy
9049d793cc desc: 修改琏计划界面样式，修改界面交互 2019-08-13 15:54:26 +08:00
ival
cf66728bc7 修改切换route报错的问题 2019-08-13 13:34:39 +08:00
ival
346459e43a 修改配置 2019-08-13 11:15:39 +08:00
ival
d14d3b3221 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/error.js
#	src/i18n/langs/en/global.js
#	src/i18n/langs/zh/error.js
#	src/i18n/langs/zh/global.js
 2019-08-13 11:13:27 +08:00
ival
0eaa4dbe1f 修改国际化配置 2019-08-13 11:10:55 +08:00
sunzhenyu
8749644fa8 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-13 09:49:46 +08:00
fan
819c46789b Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 09:20:59 +08:00
ival
61fe3c2b2d 调整回放界面布局 2019-08-13 09:09:10 +08:00
fan
e0b7994b80 Merge branch 'master_loading2' into dev 
# Conflicts:
#	src/i18n/langs/en/tip.js
#	src/i18n/langs/zh/tip.js
 2019-08-13 09:02:46 +08:00
fan
e1bd3c8b22 剧本调整 2019-08-12 20:11:23 +08:00
joylink_cuiweidong
e105327af6 加载剧本调整 2019-08-12 20:04:53 +08:00
joylink_cuiweidong
45d0cb0a12 加载剧本列表数据显示修改 2019-08-12 19:30:50 +08:00
fan
13d7e5df8b 调整：国际化 2019-08-12 18:54:32 +08:00
sunzhenyu
74527e79fe 修改三维view文件结构 2019-08-12 18:37:43 +08:00
ival
6785738122 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-12 18:22:29 +08:00
ival
dc0b5301e0 增加导出部分地图数据 2019-08-12 18:22:14 +08:00
joylink_cuiweidong
19d26919fc 处理录制剧本时地图不加载的问题 2019-08-12 17:35:55 +08:00
zyy
e7d1f478be Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-12 15:19:33 +08:00
zyy
fcb6076d64 desc: 增加地图编辑国际化 2019-08-12 15:19:26 +08:00
joylink_cuiweidong
1b01141b88 修改剧本编辑 字段名称 2019-08-12 14:21:32 +08:00
sunzhenyu
2cbf0f0452 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-12 14:12:16 +08:00
fan
df1697e137 调整：代码修改 2019-08-12 14:08:16 +08:00
ival
0289ddf5d1 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-12 14:05:12 +08:00
ival
ffd23c3adb 修改配置 2019-08-12 14:04:57 +08:00
sunzhenyu
46d776a642 pull 2019-08-12 13:43:40 +08:00
sunzhenyu
de7ee56d77 删除不用资源 2019-08-12 13:42:53 +08:00
fan
6f7d87b72c Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2 2019-08-12 13:40:55 +08:00
fan
0b5cfcc9a7 调整：代码修改 2019-08-12 13:40:34 +08:00
joylink_cuiweidong
47b2be3a8b 剧本创建修改查询接口调整 2019-08-12 11:31:43 +08:00
ival
52e9b1f79f 增加国际化配置 2019-08-12 10:18:59 +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
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
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
32a75526ee 修改导入 2019-08-09 15:23:01 +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
b89d99f2a5 修改i18n语言层次 2019-08-09 09:31:09 +08:00
joylink_cuiweidong
bf9a92d6b7 代码调整 2019-08-08 18:41:44 +08:00
joylink_cuiweidong
ee136f8867 获取剧本的地图定位并设置 2019-08-08 17:32:38 +08:00
fan
a504f3cd90 调整：剧本加载页面位置跳转 2019-08-08 17:06:18 +08:00
joylink_cuiweidong
73a7780118 更新定位 2019-08-08 16:56:34 +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
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
ff101dd603 删除debugger 2019-08-08 16:02:58 +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
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
66c599c0da 修改格式问题 2019-08-08 14:32:32 +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
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
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
f231ffd6f1 desc: 增加成都四号线地图配置 2019-08-08 09:47:39 +08:00
zyy
d70953a130 desc: 增加成都四号线模型， 修改地图删除逻辑 2019-08-07 16:23:04 +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
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
sunzhenyu
7edaf938c7 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-06 17:28:17 +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
7573e30a31 修改皮肤配置 2019-08-06 13:09:11 +08:00
ival
d4b995675d 提出字体粗细配置 2019-08-06 13:02:55 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
zyy
d45c154fe0 修改代码 2019-08-05 15:12:06 +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
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
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
a010f71252 调整运行图加载， eventbus代码调整 2019-08-02 10:58:28 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
zyy
ff9e69585d desc: 调整剧本加载，删除城市注释 2019-08-01 15:19:24 +08:00
fan
cba988e5d3 调整：仿真管理地图列表页调整 2019-08-01 08:50:24 +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
ival
0157f32fc0 修改加载代码 2019-07-31 09:13:37 +08:00
zyy
09285fb326 修改代码 2019-07-30 18:02:58 +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
ce82f25422 修改代码 2019-07-30 09:48:14 +08:00
ival
ca433c2eb6 修改设备结构 2019-07-30 09:18:24 +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
00dc541830 调整配置代码 2019-07-29 15:23:55 +08:00
zyy
9e8e5afe41 修改配置文件代码 2019-07-29 10:59:02 +08:00
zyy
c2400c07e1 desc: 增加区段配置 2019-07-29 10:20:18 +08:00
ival
21fd4ec516 修改区段状态变化 2019-07-29 09:27:33 +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
8f2712e3d8 修改代码 2019-07-26 17:35:58 +08:00
ival
ab86340524 修改列车跑车计算 2019-07-26 17:18:27 +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
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +08:00
ival
2192b1eea4 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-26 13:32:56 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00
zyy
797f31f142 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/views/jlmap/index.vue
 2019-07-26 12:18:40 +08:00
zyy
e04e0f1c67 desc: 修改代码 2019-07-26 12:17:53 +08:00
ival
2a0aea6bfe 修改页面点击事件 2019-07-26 10:38:57 +08:00
ival
58911eef1a 修改代码 2019-07-25 18:25:04 +08:00