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 |
|