Commit Graph

87 Commits

Author SHA1 Message Date
joylink_cuiweidong
cf03ac1e3d 综合演练的分发按钮去掉
所有的转增按钮去掉
2019-12-18 11:16:35 +08:00
zyy
7c9d9c6373 调整站台显示样式问题,修改代码 2019-12-12 15:31:01 +08:00
zyy
9aec1ef099 调整拖拽逻辑 2019-12-10 16:57:31 +08:00
zyy
640b38285a 调整车站默认字体大小,皮肤调整 2019-12-10 15:44:46 +08:00
lVAL
899f4a4216 修改跳转bug 2019-11-25 18:21:56 +08:00
zyy
fa3d0cb099 desc: 调整代码书写逻辑 2019-11-20 16:31:41 +08:00
joylink_cuiweidong
6fcba825f2 运行图设计代码调整 2019-11-14 10:50:11 +08:00
fan
3f69644b11 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-14 09:02:32 +08:00
fan
38c002166d 分发转增日期不能选择今天之前 2019-11-14 09:02:18 +08:00
joylink_cuiweidong
9d8a3270d8 权限转赠代码调整 2019-11-13 14:57:08 +08:00
joylink_cuiweidong
96dead378a 剧本录制添加行调和现地切换 2019-11-12 17:58:45 +08:00
fan
e069821071 路由跳转调整 2019-11-11 18:53:11 +08:00
fan
c35cef4800 样式调整 2019-11-11 18:42:14 +08:00
fan
6ca155617f label 调整 2019-11-11 14:08:54 +08:00
joylink_cuiweidong
aade09a303 权限分发调整 2019-11-11 13:10:23 +08:00
fan
c203f7b839 skinCode 调整 2019-11-08 10:08:28 +08:00
joylink_cuiweidong
5465eb61c1 prdCode改成prdId 2019-11-07 15:54:49 +08:00
joylink_cuiweidong
521a50ccb6 代码调整 2019-11-06 18:38:28 +08:00
joylink_cuiweidong
9424dfb001 权限分发调整 2019-11-06 13:41:02 +08:00
joylink_cuiweidong
5b4f9084d2 代码调整 2019-11-05 19:22:21 +08:00
joylink_cuiweidong
6a2a0b0b5e 代码调整
权限分发国际化调整
2019-11-05 19:03:20 +08:00
joylink_cuiweidong
2228b1f089 权限转增接口调整 2019-11-05 17:21:05 +08:00
joylink_cuiweidong
f8298400f1 代码优化
权限分发转赠接口调整
2019-11-05 16:53:39 +08:00
joylink_cuiweidong
1a13c9ad2c 权限分发接口调整 2019-11-05 13:20:27 +08:00
zyy
aaa0eeedd8 desc: 调整国际化 2019-11-01 13:51:00 +08:00
fan
5bca5be2e4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 18:03:42 +08:00
fan
fa1fc4c3cf 删除接口:/api/mapPrd/tree 2019-10-30 18:03:30 +08:00
ival
7d1d7758e4 增加时间北京颜色 2019-10-30 17:26:16 +08:00
fan
6fa98a6585 代码调整 2019-10-24 18:19:06 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +08:00
ival
36950a331e 修改比例 2019-10-18 18:31:14 +08:00
ival
0864369b35 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 17:54:10 +08:00
ival
9a14de60ef 修改电子显示屏 2019-10-18 17:53:57 +08:00
fan
911b8a9057 接口调整 2019-10-18 17:23:25 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +08:00
joylink_cuiweidong
1b342fee6e 地图列表获取城市列表样式调整 2019-10-18 16:57:40 +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
joylink_cuiweidong
62621b77a0 产品分化 设计平台页面调整 2019-10-09 11:28:11 +08:00
joylink_cuiweidong
0aa02cc85c 产品分化 地图右键操作调整 2019-09-29 15:25:23 +08:00
joylink_cuiweidong
a502d0a118 产品分化 设计平台页面调整以及接口调整 2019-09-29 14:21:06 +08:00
joylink_cuiweidong
2a9f7b38df Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/router/index.js
2019-09-27 18:20:10 +08:00
joylink_cuiweidong
1e95cae5e5 产品分化 设计系统界面调整 2019-09-27 18:16:27 +08:00
fan
fd99f913de 城市轨道实训平台调整 2019-09-27 18:02:32 +08:00
fan
0fac6ce22e 产品分化调整 2019-09-25 18:56:30 +08:00
fan
37dd77bc55 上下拖拽尺寸调整 2019-09-25 15:32:44 +08:00
fan
6e14ba3382 设计平台调整 2019-09-25 14:52:21 +08:00
joylink_cuiweidong
0d1a4982ee 解决 支付产品名称没有拿到的问题 2019-09-24 13:44:35 +08:00
fan
ce7decc188 产品分化调整 2019-09-24 11:05:10 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00