Commit Graph

59 Commits

Author SHA1 Message Date
fan
7e91cb2b3c 删除旧版地图drawWay参数使用 2020-10-26 11:07:49 +08:00
fan
e5d83555af 添加大赛练习 2020-09-16 10:49:16 +08:00
fan
c521f39b2a 设备登录增加退出方式 2020-09-07 16:02:53 +08:00
fan
6008dfc143 运行图调整 2020-08-17 18:12:51 +08:00
fan
150f047552 设备登录添加实训考试运行图编辑 2020-08-14 10:55:32 +08:00
fan
add4a4dc8b 仿真右下侧按钮调整 2020-07-29 14:40:16 +08:00
fan
fff5acab5d 创建考试调整&路由replace调整 2020-07-29 14:14:34 +08:00
fan
7661d36ca4 宁波行调添加单锁&获取操作类型map调整 2020-07-27 15:22:26 +08:00
program-walker
96a32e1e37 Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/layout/components/Title.vue
#	src/scripts/ProjectConfig.js
#	src/views/lesson/lessoncategory/edit/chapter/list.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/login/index.vue
#	src/views/publish/examRule/draft/examFrom.vue
#	src/views/publish/examRule/draft/index.vue
#	src/views/publish/examRule/index.vue
#	src/views/studentManage/index.vue
2020-07-21 19:19:54 +08:00
fan
40402a9a8e 试卷规则bug修复&哈尔滨操作调整 2020-07-13 16:48:23 +08:00
fan
8af4eb6187 设备登录调整 2020-07-09 15:06:15 +08:00
fan
1076eb2215 设备登录调整 2020-07-08 13:11:22 +08:00
fan
413307d6a5 操作类型调整 2020-07-08 11:09:26 +08:00
fan
0847988f81 试卷管理问题调整 2020-07-08 10:43:56 +08:00
fan
de617cde50 设备登录调整&试卷管理调整 2020-07-08 10:31:33 +08:00
zyy
9416ae6729 调整判断 2020-07-07 18:49:14 +08:00
zyy
2c362db7c1 调整贵州项目试卷关联关系 2020-07-07 18:48:12 +08:00
zyy
3c34494608 调整试卷班级关系 2020-07-07 18:33:43 +08:00
zyy
2d9bfeee2e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:17:44 +08:00
zyy
bb500d4c29 调整贵州装备试卷关系,样式 2020-07-07 16:17:29 +08:00
fan
9dd81d0fd1 实训类型调整 2020-07-07 16:07:48 +08:00
joylink_cuiweidong
75244ca959 任何创建者 创建试卷 有试用选项 2020-07-06 13:31:49 +08:00
joylink_cuiweidong
4a32fddddb 绘图 交路代码调整
iscs 系统代码调整
考试保存规则代码调整
2020-05-06 16:56:30 +08:00
fan
7086fb1db6 考试实训类型调整 2020-04-14 11:26:41 +08:00
joylink_fanyuhong
f6be5ef329 试卷规则调整 2020-04-10 20:46:17 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
fan
f2b62f281e 指令调整,公共地图宽度调整 2020-01-06 18:39:44 +08:00
zyy
6e0ab142f7 创建试卷过滤控制,避免其他错误 2020-01-03 16:43:07 +08:00
zyy
59e5c5fef7 调整相关用户的列表 名称变昵称显示 2020-01-02 18:40:30 +08:00
joylink_cuiweidong
eefaf8aad9 实训平台教学 和 设计平台教学管理 prdtype对应接口调整 2019-12-27 17:09:56 +08:00
joylink_cuiweidong
8bc69347e7 实训平台创建试卷代码调整 2019-11-29 17:46:14 +08:00
zyy
1d82ce738f desc: 修改考试规则定义,调整更新商品更新样式 2019-11-25 10:44:48 +08:00
joylink_cuiweidong
859fbe5e4e 修改实训平台考试系统列表按钮显示 2019-11-15 11:40:49 +08:00
joylink_cuiweidong
075cdf5fd9 页面样式调整
代码优化
2019-11-04 10:59:50 +08:00
zyy
dc8524e52a desc: 调整试题高度 2019-10-31 14:47:05 +08:00
zyy
a87372ea2c desc: 发布高度调整 2019-10-31 13:24:45 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +08:00
fan
5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
#	src/components/QueryListPage/QueryForm.vue
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/scriptRecord.js
#	src/i18n/langs/zh/lesson.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/scriptRecord.js
#	src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
#	src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
#	src/permission.js
#	src/router/index.js
#	src/utils/baseUrl.js
#	src/views/demonstration/detail/index.vue
#	src/views/display/tipExamList.vue
#	src/views/lesson/lessoncategory/edit/lesson/publish.vue
#	src/views/lesson/taskmanage/createTask.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/login/index.vue
#	src/views/planMonitor/editTool/statusBar.vue
#	src/views/scriptManage/home.vue
#	src/views/teach/category/tree.vue
#	src/views/trainRoom/index.vue
2019-10-17 09:16:40 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理, 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
joylink_cuiweidong
27d7431b9e 国际化调整 2019-09-24 14:09:26 +08:00
fan
d863e61b33 Revert "revert 01c97f45aea75ec8db5a0726c82a2e83fa14750e"
This reverts commit 6ad0eebb2e.
2019-09-24 13:32:28 +08:00
fan
6ad0eebb2e revert 01c97f45ae 2019-09-24 13:23:50 +08:00
zyy
01c97f45ae desc: 调整琏计划导入excel, 样式, 流程 2019-09-23 13:37:11 +08:00
joylink_cuiweidong
5f4412dd40 国际化调整 2019-09-18 17:28:24 +08:00
joylink_cuiweidong
9ace0842a5 发布内容管理 国际化 2019-09-18 16:04:34 +08:00
zyy
abec58b726 desc: 修改弹窗点击蒙层不取消 2019-09-03 18:59:46 +08:00
zyy
40b67b8cf3 desc: 调整修改权限逻辑 2019-09-03 16:13:23 +08:00
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
ival
94d1103e58 设置全局尺寸变化 2019-09-02 10:38:10 +08:00