Commit Graph

51 Commits

Author SHA1 Message Date
fan
b248e69ffe 导入学生信息添加校验&哈尔滨打包不再区分路由文件 2021-01-11 10:55:07 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
joylink_cuiweidong
e1d979e89a 代码调整 2020-01-02 17:06:35 +08:00
joylink_cuiweidong
59f4a8d253 仿真里面的prdtype调整 2019-12-27 14:20:29 +08:00
joylink_cuiweidong
1ad20fe522 删除实训平台 权限 权限打包 2019-12-27 11:11:38 +08:00
joylink_cuiweidong
044068d4a8 删除实训平台地图权限页面 打包详情按钮
删除设计平台商品管理页面 添加按钮
2019-12-26 19:15:48 +08:00
joylink_cuiweidong
8e82ceab27 权限打包页面接口调整(/api/lesson) 2019-12-26 13:12:23 +08:00
fan
1cb0383aac 暂时注销个人权限管理页面的权限打包功能 2019-11-13 14:42:59 +08:00
fan
bd2e82c0ea 权限分发转赠归属人查询 & 其他问题调整 2019-11-13 14:29:20 +08:00
fan
6ca155617f label 调整 2019-11-11 14:08:54 +08:00
fan
e677b24f6d 调整查询地图列表接口 2019-11-08 16:22:05 +08:00
joylink_cuiweidong
b4400f9226 代码调整 2019-11-07 16:26:55 +08:00
joylink_cuiweidong
5465eb61c1 prdCode改成prdId 2019-11-07 15:54:49 +08:00
zyy
aaa0eeedd8 desc: 调整国际化 2019-11-01 13:51:00 +08:00
zyy
7ec68a75e3 desc: 删除多余文件, 调整路径配置 2019-10-31 17:30:24 +08:00
fan
e5c832aa00 修改接口:/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list 2019-10-30 17:41:29 +08:00
fan
9c99b2f451 queryform 调整 2019-10-28 10:26:33 +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
56878d56ec storage存储关联用户 2019-09-29 13:40:01 +08:00
fan
fd99f913de 城市轨道实训平台调整 2019-09-27 18:02:32 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
fan
e7d7ad76f0 实训平台调整 2019-09-25 13:05:01 +08:00
fan
522b94fcfe 产品分化调整 2019-09-25 09:18:28 +08:00
zyy
c777b3dbcc 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-09-12 16:31:35 +08:00
zyy
f48a513df0 desc: 调整绘图逻辑,流程,字段显示 2019-09-12 16:30:42 +08:00
fan
1afb81bba5 权限打包调整 2019-09-11 17:09:51 +08:00
joylink_cuiweidong
1ced2a4911 国际化调整 2019-09-11 09:34:12 +08:00
zyy
ba21d7af9d desc: 修改权限打包字段, 修改地图绘制区段逻辑 2019-09-06 17:21:54 +08:00
zyy
b96701aceb desc: 调整运行图加载 2019-09-04 11:28:24 +08:00
zyy
abec58b726 desc: 修改弹窗点击蒙层不取消 2019-09-03 18:59:46 +08:00
zyy
5591796596 desc: 调整socket重连问题 2019-09-03 13:15:47 +08:00
zyy
82cfd670c6 desc: 修改弹窗显示title 2019-09-03 11:21:54 +08:00
zyy
870a4de01b desc: 修改socekt断连逻辑, 调整权限显示及细节,样式问题 2019-09-03 10:45:58 +08:00
zyy
f73d7f4b9f desc: 打包权限列表展示 2019-09-02 17:34:34 +08:00
ival
3ade8f6d92 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 15:38:11 +08:00
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
zyy
6fa64dd26b desc: 修改显示字段,增加loading 2019-09-02 11:04:23 +08:00
zyy
6e60afb4e6 desc: 注释永久显示 2019-09-02 09:33:21 +08:00
zyy
d8dc80a001 desc: 修改权限字段显示 2019-08-30 19:14:10 +08:00
zyy
abf1afcdf2 desc: 修改逻辑顺序 2019-08-30 17:09:31 +08:00
zyy
0398179e0d desc: 用户权限流程修改,接口对接 2019-08-30 17:00:18 +08:00
ival
0fe2f1a043 1.修改代码字典首字母大写导致select选项不出来的问题 2019-08-23 13:44:43 +08:00
ival
b5a93f7ce1 修改国际化 2019-08-21 13:48:06 +08:00
ival
de0fd028ed 设置时间暂停 2019-08-20 18:35:42 +08:00
ival
8259b24f6c 增加国际化配置 2019-08-20 17:01:09 +08:00
ival
6343a79f81 修改接口 2019-08-14 14:01:28 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
ival
db109f2a9e 调整地图进路相关的接口 2019-08-13 16:59:38 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00