Commit Graph

637 Commits

Author SHA1 Message Date
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
zyy
0388b2a1df desc: 修改权限列表显示字段内容,逻辑流程 2019-09-02 14:43:16 +08:00
zyy
4a466e6a8c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 11:04:30 +08:00
zyy
6fa64dd26b desc: 修改显示字段,增加loading 2019-09-02 11:04:23 +08:00
ival
94d1103e58 设置全局尺寸变化 2019-09-02 10:38:10 +08:00
ival
327bf6f32b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 10:12:08 +08:00
ival
03daccff77 修改登录session的问题 2019-09-02 10:11:57 +08:00
fan
e9c7016c19 ibp盘调整 2019-09-02 09:57:15 +08:00
fan
6000ac9df5 调整代码 2019-09-02 09:56:25 +08:00
fan
8dda6d4dbe ibp盘调整 2019-09-02 09:53:21 +08:00
zyy
6e60afb4e6 desc: 注释永久显示 2019-09-02 09:33:21 +08:00
ival
923ded894b 修改代码 2019-08-30 19:36:36 +08:00
ival
f428bd71f1 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-30 19:27:17 +08:00
ival
0031b51f55 增加字典详情删除时给出提示 2019-08-30 19:27:03 +08:00
zyy
6c617d3e4a desc: 修改获取商品字段 2019-08-30 19:19:48 +08:00
zyy
d8dc80a001 desc: 修改权限字段显示 2019-08-30 19:14:10 +08:00
zyy
5d1c9d02bf desc: 修改琏计划 2019-08-30 19:10:08 +08:00
fan
bf23362b2b Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-30 17:43:50 +08:00
fan
8fa43ce797 ibp盘调整 2019-08-30 17:43:17 +08:00
ival
9b9be66ea0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-30 17:12:52 +08:00
ival
36facbb67d 修改重新生成排班计划的页面 2019-08-30 17:12:39 +08:00
zyy
abf1afcdf2 desc: 修改逻辑顺序 2019-08-30 17:09:31 +08:00
zyy
22beeffc53 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/utils/baseUrl.js
#	src/views/screenMonitor/list/demonList.vue
2019-08-30 17:03:51 +08:00
zyy
0398179e0d desc: 用户权限流程修改,接口对接 2019-08-30 17:00:18 +08:00
ival
d3ff24c4f8 设置时间组件为可清空组件 2019-08-30 16:41:55 +08:00
ival
ff94ade817 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-30 16:35:24 +08:00
ival
1dabf22fd6 修改数据显示 2019-08-30 16:35:13 +08:00
fan
ed3f31972d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-30 16:22:21 +08:00
fan
0503afb4c9 ibp盘调整 2019-08-30 16:22:10 +08:00
ival
5574df0e9d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-30 15:46:23 +08:00
ival
546957e926 增加排版计划处理 2019-08-30 15:46:08 +08:00
fan
b2b28f8c9d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
2019-08-30 15:06:08 +08:00
fan
755754ebd3 ibp调整 2019-08-30 15:01:37 +08:00
joylink_cuiweidong
dec0da6c1a 电话端子添加到页面中 2019-08-30 14:15:10 +08:00
joylink_cuiweidong
9cea1f91a9 ibp盘右侧样式调整 2019-08-30 13:32:56 +08:00
joylink_cuiweidong
911d269562 钥匙层级调整 2019-08-30 11:21:34 +08:00
joylink_cuiweidong
e865e6de3b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/ibp/shape/alarm.js
2019-08-30 10:59:14 +08:00
joylink_cuiweidong
64c939c8be 钥匙组件添加到页面 2019-08-30 10:55:34 +08:00
fan
240268a65f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/ibp/shape/button.js
2019-08-30 10:34:25 +08:00
fan
5350e6ad39 ibp盘提交 2019-08-30 10:31:56 +08:00
ival
3da74652c5 增加派班计划 2019-08-30 09:00:36 +08:00
joylink_cuiweidong
c9937ffc48 电梯组件添加到页面中 2019-08-29 18:45:20 +08:00
ival
fd03ed6d59 修改每日运行图查询接口 2019-08-29 14:48:26 +08:00
ival
dce9903175 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-29 13:52:48 +08:00
ival
1616639f6f 修改运行图接口 2019-08-29 13:52:34 +08:00
joylink_cuiweidong
eaec6c4446 修复 剧本修改时候重置剧本的bug 2019-08-29 13:05:30 +08:00
ival
30e590afc7 封装车次窗鼠标事件以及车次窗操作 2019-08-29 11:26:05 +08:00
ival
c14e0c6055 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/display/index.vue
2019-08-29 10:35:55 +08:00
ival
cc54830f01 修改代码格式以及操作的bug 2019-08-29 10:33:50 +08:00
zyy
32cc251ef6 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/display/index.vue
#	src/views/display/menuDemon.vue
2019-08-29 09:33:42 +08:00
zyy
2d906ef9be desc: 调整权限列表接口对接 2019-08-29 09:31:58 +08:00
fan
be04a992c0 关闭ibp盘开关 2019-08-29 09:30:09 +08:00
fan
094476bdb5 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-29 09:26:27 +08:00
fan
453a909f01 ibp盘 2019-08-29 09:26:14 +08:00
fan
94f803072f ibp盘提交 2019-08-29 09:25:06 +08:00
ival
0954312cac 修改用户emgail国际化的问题和保存规则提示的问题 2019-08-29 09:02:02 +08:00
fan
3393a65f0d 代码调整:ibp盘 2019-08-28 13:22:17 +08:00
fan
f0f7ac1111 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
#	src/views/ibp/ibpDraft/ibpEdit/index.vue
2019-08-28 10:02:42 +08:00
fan
6a0d41f09a 调整代码: ibp 2019-08-28 09:57:32 +08:00
ival
0fa4d4c204 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-28 09:55:55 +08:00
ival
a3b43e1e43 限制平局拖动范围 2019-08-28 09:55:40 +08:00
zyy
01a2b42912 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-27 18:32:32 +08:00
zyy
498f093866 desc: 新增按钮类型 2019-08-27 18:32:26 +08:00
fan
12b6535254 调整代码: 关闭ibp入口 2019-08-27 17:07:32 +08:00
fan
846b267e64 调整代码: ibp盘宽高显示 2019-08-27 16:45:43 +08:00
fan
044f66d9d9 调整代码: ibp盘 2019-08-27 16:37:33 +08:00
fan
1f2d2a1794 调整代码: ibp盘 2019-08-27 16:35:41 +08:00
fan
75a6b2ee58 合并 2019-08-27 15:22:55 +08:00
fan
68898a3861 ibp盘 2019-08-27 15:19:50 +08:00
zyy
1908954ca8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-27 15:03:01 +08:00
zyy
02aa4a5b65 desc: 道岔创建字段补充,修改字段名称,描述 2019-08-27 15:02:55 +08:00
fan
7eafd16896 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-27 14:18:22 +08:00
fan
b2eb2076b0 ibp 2019-08-27 14:17:36 +08:00
ival
5fdc80855d 修改规则编辑的问题 2019-08-27 10:28:24 +08:00
zyy
72355448a1 desc: 修改地图绘制显示问题 2019-08-27 09:36:22 +08:00
ival
a4d06b7743 修改试题编辑页面的bug 2019-08-26 15:30:36 +08:00
ival
9230df4ed3 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-26 14:30:21 +08:00
ival
0255a3250e 增加绘图的默认状态设置 2019-08-26 14:30:01 +08:00
fan
7757094ce3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-26 10:13:05 +08:00
fan
4b7873c2d7 ibp盘 2019-08-26 10:12:39 +08:00
zyy
b9b2fd5b77 desc: 调整地图绘制数据逻辑, 新增发布历史列表 2019-08-23 18:40:02 +08:00
zyy
7cf12c2c7e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-23 14:24:36 +08:00
zyy
2250bc970d desc: 修改名称显示放到皮肤配置中 2019-08-23 14:24:30 +08:00
ival
554db95dd6 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-23 13:44:56 +08:00
ival
0fe2f1a043 1.修改代码字典首字母大写导致select选项不出来的问题 2019-08-23 13:44:43 +08:00
zyy
f30084539a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-23 09:14:27 +08:00
zyy
6a6bb3a405 desc: 修改地图绘制样式,逻辑调整 2019-08-23 09:14:21 +08:00
joylink_cuiweidong
2abda64836 剧本录制模块页面结构调整 2019-08-22 18:13:55 +08:00
fan
0ca2235549 加载剧本是先清除地图状态 2019-08-22 14:12:16 +08:00
zyy
69d4d2be72 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-22 10:25:29 +08:00
zyy
fde4d41727 desc: 修改样式,地图更新坐标 2019-08-22 10:25:23 +08:00
fan
b5a157fecd Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-22 10:12:55 +08:00
fan
d068a74a6e 加载剧本前列车视图 2019-08-22 10:12:35 +08:00
ival
52bacce3a3 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-22 09:45:31 +08:00
ival
977b47892f 增加综合仿真获取系统暂停状态的代码以及增加右侧偏移量的设置 2019-08-22 09:45:21 +08:00
fan
64ca6af5d6 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-22 09:15:06 +08:00
fan
b41c85b78e 合并代码 2019-08-22 09:12:29 +08:00
joylink_cuiweidong
1212d30677 调整剧本不能修改问题 2019-08-22 09:09:35 +08:00
fan
614aae8be0 国际化调整 2019-08-22 09:06:48 +08:00
program-walker
cdb7ca645a 修改剧本编制界面样式 2019-08-21 20:40:02 +08:00
program-walker
c9dfbb0749 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/scriptManage/scriptRecord/addRole.vue
2019-08-21 20:34:47 +08:00
joylink_cuiweidong
8318fc6349 剧本编制 重置剧本调整 取消剧本角色处理 2019-08-21 20:32:37 +08:00
program-walker
22f83008e8 修改剧本编制界面样式 2019-08-21 20:16:47 +08:00
joylink_cuiweidong
005cb8ba78 剧本编制 成员角色调整 2019-08-21 20:11:16 +08:00
zyy
895841164e desc: 保存字段新增 2019-08-21 18:51:16 +08:00
zyy
4d6776e6f9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 18:49:46 +08:00
zyy
5f5fc61b68 desc: 修改地图更改坐标,调整绘制样式 2019-08-21 18:49:39 +08:00
joylink_cuiweidong
aab5bcc995 剧本录制添加成员角色 2019-08-21 18:45:16 +08:00
zyy
6d42719731 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 17:34:15 +08:00
zyy
6712d1cd5b desc: 修改地图编辑样式 2019-08-21 17:34:08 +08:00
ival
1eea945778 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 15:34:18 +08:00
ival
1ade3d38ca 添加列车模型重复名称数据提示 2019-08-21 15:34:01 +08:00
zyy
e89eb2ecf8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/i18n/langs/zh/tip.js
2019-08-21 15:15:37 +08:00
zyy
e4a5d77f20 desc: 支付组件国际化, 调整地图加载位置 2019-08-21 15:15:08 +08:00
ival
1993de8548 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 15:01:13 +08:00
ival
242e082dc7 修改列车操作 2019-08-21 15:00:58 +08:00
joylink_cuiweidong
52c4106a75 背景只能保存一次 2019-08-21 14:28:34 +08:00
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