Commit Graph

96 Commits

Author SHA1 Message Date
fan
ac3b2d85fd ibp 添加屏蔽门操作 2019-12-06 17:54:38 +08:00
lVAL
3a190f8fbf 修改 2019-11-25 19:01:31 +08:00
lVAL
9eea637a70 修改 2019-11-25 18:57:17 +08:00
zyy
44f9da4383 desc: 调整绘图进路数据,调整权限修改逻辑,调整设置link中心点BUG 2019-11-22 15:28:02 +08:00
joylink_cuiweidong
5ac012fc79 运行图代码调整 2019-11-21 09:34:55 +08:00
ival
6b23ca6f0d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-20 10:39:58 +08:00
ival
0c6d17647a 修改代码 2019-11-20 10:39:46 +08:00
joylink_cuiweidong
c264b61f65 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-20 10:39:14 +08:00
joylink_cuiweidong
58d151f9ea 代码调整 2019-11-20 10:39:00 +08:00
ival
898135a61b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 18:35:49 +08:00
ival
cd6e2ea224 修改代码 2019-11-19 18:35:31 +08:00
joylink_cuiweidong
5fca43650b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/plugin/CommandHandler.js
2019-11-19 17:44:18 +08:00
joylink_cuiweidong
13a5df8571 代码调整 2019-11-19 17:06:13 +08:00
ival
09af7d91b4 修改代码 2019-11-19 16:41:21 +08:00
ival
d08d673781 修改带小写 2019-11-19 13:13:08 +08:00
ival
ed7acb5abe 修改目录大小写 2019-11-19 13:11:52 +08:00
zyy
ec711c2a7f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 13:00:47 +08:00
zyy
4144621be8 desc: 修改代码 2019-11-19 13:00:36 +08:00
ival
307081aee4 修改代码 2019-11-19 08:59:06 +08:00
ival
f26275e03c 修改代码 2019-11-18 18:47:02 +08:00
ival
ee6237be6b 关闭新执行流程 2019-11-18 14:48:53 +08:00
ival
aee164fb4f 修改大小写 2019-11-18 14:47:19 +08:00
ival
a80b010bfa 修改大小写 2019-11-18 14:46:57 +08:00
ival
3cffd163ad 增加文件 2019-11-18 14:45:23 +08:00
ival
5a4f6f5999 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-18 14:44:13 +08:00
ival
50e9a242e7 修改代码 2019-11-18 14:44:01 +08:00
zyy
7938876d85 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/GlobalPlugin.js
2019-11-18 14:30:25 +08:00
zyy
8d05730dc4 desc: 修改代码 2019-11-18 14:29:43 +08:00
joylink_cuiweidong
744bd60d9e 代码调整 2019-11-18 12:28:08 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
zyy
42a5f7076a desc: 调整区段绘图逻辑优化 2019-11-07 15:20:39 +08:00
fan
42d9e1e7a1 浏览器图标调整
# Conflicts:
#	src/App.vue
2019-11-06 10:49:32 +08:00
fan
d381ed6a88 西铁院title、logo修改,综合演练房间角色调整后,角色顺序不再变化 2019-11-04 11:29:35 +08:00
zyy
aaa0eeedd8 desc: 调整国际化 2019-11-01 13:51:00 +08:00
joylink_cuiweidong
681ac5e886 路由调整
接口调整
2019-10-31 13:56:42 +08:00
joylink_cuiweidong
b5b08a0afd 接口调整 2019-10-31 11:03:19 +08:00
fan
3dff70d821 运行图调整 2019-10-30 19:04:21 +08:00
zyy
3fa60b2e8b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/ConstDic.js
#	src/views/lesson/lessoncategory/edit/sorttree/index.vue
#	src/views/lesson/lessoncategory/index.vue
#	src/views/login/index.vue
2019-10-29 17:36:48 +08:00
zyy
df8d104bd1 desc: 高度修改,登陆页面英文调整 2019-10-29 17:33:11 +08:00
fan
973168970c 西铁院项目调整 2019-10-29 14:14:14 +08:00
fan
42cdacbcd0 西铁院项目路由调整 2019-10-28 17:08:22 +08:00
fan
62541373f1 导航栏右侧menu调整 2019-10-24 15:15:52 +08:00
fan
b6ffc55efd 登录页面整合 2019-10-24 14:03:19 +08:00
joylink_cuiweidong
df4113ff29 代码结构整理
修改 退出系统仍然自动登录的bug
子系统生成接口调整
2019-10-22 14:43:27 +08:00
zyy
0c6de0e011 desc: 修改代码 2019-10-22 13:41:23 +08:00
joylink_cuiweidong
c04abcc67a 设计平台 系统管理 子系统 创建子系统接口调整 2019-10-22 09:36:37 +08:00
joylink_cuiweidong
9fcdda5d60 设计平台 系统管理 子系统 创建子系统接口 2019-10-21 18:03:13 +08:00
joylink_cuiweidong
1a046c2b7f 设计平台系统管理子系统生成页面调整 2019-10-21 15:50:15 +08:00
zyy
74a2bbb1c6 desc: 调整成都三号现地,行调实训操作 2019-10-18 18:20:17 +08:00
zyy
b006de669d desc: 调整信号机自排开,自排关,流程 2019-10-17 17:56:24 +08:00