Commit Graph

33 Commits

Author SHA1 Message Date
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
ival
0954312cac 修改用户emgail国际化的问题和保存规则提示的问题 2019-08-29 09:02:02 +08:00
ival
5fdc80855d 修改规则编辑的问题 2019-08-27 10:28:24 +08:00
ival
a4d06b7743 修改试题编辑页面的bug 2019-08-26 15:30:36 +08:00
ival
4270053326 修改国际化 2019-08-21 11:28:56 +08:00
ival
8259b24f6c 增加国际化配置 2019-08-20 17:01:09 +08:00
ival
db109f2a9e 调整地图进路相关的接口 2019-08-13 16:59:38 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
ival
66c599c0da 修改格式问题 2019-08-08 14:32:32 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00