joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
1,535 Commits 20 Branches 0 Tags 448 MiB
515a9a60ae
Commit Graph

930 Commits

Author SHA1 Message Date
joylink_cuiweidong
0d1a4982ee 解决 支付产品名称没有拿到的问题 2019-09-24 13:44:35 +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
fan
17b4d631d4 演练室样式微调 2019-09-24 13:16:14 +08:00
fan
d4ec49ea16 国际化调整 2019-09-24 12:58:41 +08:00
fan
bc3ec657d2 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-24 11:33:06 +08:00
fan
1f047ea340 Merge remote-tracking branch 'origin/test' into dev 2019-09-24 11:32:44 +08:00
fan
e95023fcf3 国际化调整 2019-09-24 11:26:28 +08:00
fan
ce7decc188 产品分化调整 2019-09-24 11:05:10 +08:00
joylink_cuiweidong
823eb02b90 产品分化菜单栏调整 2019-09-24 10:51:41 +08:00
fan
622ba7b5f2 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:53:16 +08:00
joylink_cuiweidong
fd8a1817c5 菜单栏调整 2019-09-23 17:52:44 +08:00
fan
9c3071dc4b Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:51:34 +08:00
joylink_cuiweidong
7514a7657f 菜单栏调整 2019-09-23 17:50:07 +08:00
fan
b7043ff7de Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:49:16 +08:00
fan
d063625c45 产品分化调整 2019-09-23 17:49:04 +08:00
joylink_cuiweidong
5ba93805c1 菜单栏调整 2019-09-23 17:47:54 +08:00
zyy
2d60c78a74 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
 2019-09-23 13:37:59 +08:00
zyy
01c97f45ae desc: 调整琏计划导入excel, 样式， 流程 2019-09-23 13:37:11 +08:00
fan
517ddbcff0 国际化调整 2019-09-23 09:48:13 +08:00
fan
dc5edddde0 国际化调整 2019-09-19 18:53:28 +08:00
fan
a182d7d0b2 国际化调整 2019-09-19 18:51:57 +08:00
zyy
9371d956af desc: 调整冲突, 增加导入运行图国际化 2019-09-19 17:34:04 +08:00
zyy
b5b9f4c1ff Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/tip.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/tip.js
#	src/views/planMonitor/editTool/menuBar.vue
#	src/views/planMonitor/editTool/menus/createEmptyPlan.vue
#	src/views/planMonitor/editTool/menus/editPlanName.vue
#	src/views/planMonitor/editTool/menus/modifyingTask.vue
#	src/views/planMonitor/editTool/menus/openRunPlan.vue
 2019-09-19 17:28:31 +08:00
zyy
48ea44a980 desc: 调整权限国际化，调整琏计划导入运行图逻辑 2019-09-19 17:22:48 +08:00
joylink_cuiweidong
98054a93ff Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-19 17:11:11 +08:00
joylink_cuiweidong
706a9502d8 国际化调整 2019-09-19 17:11:00 +08:00
fan
9b40afa4ea Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-19 16:12:22 +08:00
fan
676fc71ee5 国际化调整 2019-09-19 16:12:05 +08:00
joylink_cuiweidong
94eeeb0916 国际化调整 2019-09-19 14:58:41 +08:00
fan
607abd877f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-19 14:15:22 +08:00
fan
cf8f562a48 国际化调整 2019-09-19 14:14:49 +08:00
joylink_cuiweidong
0e7fdb354c 国际化调整 2019-09-19 13:19:35 +08:00
zyy
4f716b502c desc: 恢复权限创建按钮 2019-09-19 09:34:18 +08:00
ival
8b4aee040a 注释掉订单入口 2019-09-18 18:45:18 +08:00
zyy
591110ddec Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/zh/orderAuthor.js
#	src/i18n/langs/zh/permission.js
#	src/views/orderauthor/permission/create/order.vue
 2019-09-18 18:41:46 +08:00
zyy
1d26a9f1fb desc: 新增创建权限流程 2019-09-18 18:39:55 +08:00
joylink_cuiweidong
5f4412dd40 国际化调整 2019-09-18 17:28:24 +08:00
joylink_cuiweidong
9ace0842a5 发布内容管理 国际化 2019-09-18 16:04:34 +08:00
joylink_cuiweidong
ae68018734 发布内容管理 国际化 2019-09-18 13:36:57 +08:00
joylink_cuiweidong
9bc06e4f59 地图绘制国际化调整 2019-09-18 11:11:23 +08:00
ival
f13685da07 修改代码 2019-09-18 10:03:58 +08:00
ival
7b0cf81d45 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-09-17 16:54:14 +08:00
ival
0b7b0e39c1 过滤首页订阅的地图没有name的数据 2019-09-17 16:53:29 +08:00
joylink_cuiweidong
ffdba3dc22 国际化调整 2019-09-17 16:08:11 +08:00
joylink_cuiweidong
a116539d80 国际化调整 2019-09-17 13:54:10 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00
zyy
815c2e6db4 desc: 调整信号机显示位置 2019-09-16 17:58:01 +08:00
zyy
c5c71253df desc: 调整信号机字段显示，调整创建权限逻辑 2019-09-16 17:31:12 +08:00
zyy
7abab1ba28 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-16 16:00:09 +08:00
zyy
ab9a02e232 desc: 调整琏计划运行图样式 2019-09-16 15:59:53 +08:00
ival
0cd99f16f1 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/publish/publishMap/index.vue
 2019-09-16 14:31:56 +08:00
ival
b52bb52888 修改地图导出以及登录失败错误信息提示 2019-09-16 14:29:43 +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
joylink_cuiweidong
b08cddc237 地图菜单国际化 2019-09-12 15:14:13 +08:00
joylink_cuiweidong
71a0f2d921 仿真国际化 2019-09-12 13:35:25 +08:00
fan
cf45174dad Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-12 13:22:40 +08:00
fan
2dffe78baf 国际化调整 2019-09-12 13:22:30 +08:00
joylink_cuiweidong
22a77b63fd 仿真 国际化调整 2019-09-12 09:37:40 +08:00
fan
7a284fea4a 国际化调整 2019-09-12 09:25:33 +08:00
fan
b06f4d1ad4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-11 17:12:00 +08:00
fan
436cd0418f 国际化调整 2019-09-11 17:11:51 +08:00
fan
1afb81bba5 权限打包调整 2019-09-11 17:09:51 +08:00
joylink_cuiweidong
1830952064 仿真 国际化调整 2019-09-11 15:33:00 +08:00
fan
6b80ac2452 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-11 15:26:57 +08:00
fan
0c11453197 权限打包搜索条件调整 2019-09-11 15:26:40 +08:00
joylink_cuiweidong
37f1631585 仿真国际化调整 2019-09-11 14:35:26 +08:00
fan
fd4c2de338 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/index.js
#	src/i18n/langs/zh/index.js
 2019-09-11 14:31:32 +08:00
fan
d1c146f9da 权限回收调整 2019-09-11 14:28:22 +08:00
joylink_cuiweidong
ef5d425942 考试 仿真国际化调整 2019-09-11 13:40:46 +08:00
fan
9c5f1f7633 国际化调整 2019-09-11 13:20:03 +08:00
joylink_cuiweidong
5c184755e2 教学仿真 国际化调整 2019-09-11 11:30:44 +08:00
joylink_cuiweidong
d31f4e8493 教学和考试的仿真 国际化调整 2019-09-11 11:02:18 +08:00
fan
fa4ccafc58 权限分发调整 2019-09-11 10:42:15 +08:00
fan
5c2e2cebe8 权限分发调整 2019-09-11 10:35:34 +08:00
joylink_cuiweidong
1ced2a4911 国际化调整 2019-09-11 09:34:12 +08:00
fan
7bb4ac4a06 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-11 09:26:38 +08:00
fan
3e1bd3fcd7 国际化考试系统大屏统计系统 2019-09-11 09:25:16 +08:00
joylink_cuiweidong
e1378c0961 国际化调整 2019-09-10 19:08:48 +08:00
joylink_cuiweidong
875d5d6c64 国际化调整 2019-09-10 17:32:41 +08:00
joylink_cuiweidong
4b8a3acca8 国际化调整以及ibp盘调整 2019-09-10 16:14:54 +08:00
fan
c96260215c ibp调整代码 2019-09-10 14:27:53 +08:00
fan
8083656e16 ibp删除钥匙孔 2019-09-10 10:26:18 +08:00
fan
0c9e367f3d ibp修改扶梯框边框宽度，调整select默认状态 2019-09-10 10:16:02 +08:00
joylink_cuiweidong
26472da421 钥匙组件代码重新封装 2019-09-09 19:03:23 +08:00
fan
a32bda33f1 ibp调整代码 2019-09-09 18:03:32 +08:00
fan
80ce4e19a8 ibp调整 2019-09-09 16:11:43 +08:00
sunzhenyu
4e1f95e900 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-09 10:22:21 +08:00
fan
760aa02496 ibp调整页面 2019-09-06 18:17:54 +08:00
fan
6b96fc928d ibp删除console 2019-09-06 17:42:36 +08:00
zyy
46a3f64f4d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 17:22:03 +08:00
zyy
ba21d7af9d desc: 修改权限打包字段， 修改地图绘制区段逻辑 2019-09-06 17:21:54 +08:00
fan
ddfeeb6718 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 16:55:31 +08:00
fan
3faf8f3906 ibp盘调整 2019-09-06 16:54:55 +08:00
zyy
10c4083ad3 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 15:54:11 +08:00
zyy
7b0b0d6d0c desc: 修改绘制地图赋值 2019-09-06 15:54:05 +08:00
fan
327c35355f ibp盘调整 2019-09-06 15:21:21 +08:00
fan
80edc1ad20 ibp盘调整 2019-09-06 15:08:47 +08:00
fan
32dab2fa7d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 14:48:47 +08:00
fan
ceccbbc825 ibp盘调整 2019-09-06 14:48:06 +08:00
zyy
1faa4e0add Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 14:21:08 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口，调整地图绘制优化 2019-09-06 14:21:01 +08:00
fan
20acc0e667 ibp盘调整 2019-09-06 10:27:13 +08:00
fan
fa604188b0 ibp盘调整 2019-09-06 09:55:16 +08:00
fan
455202a851 ibp盘调整 2019-09-05 18:54:54 +08:00
fan
c4bf259918 销毁实例前清除ibp数据 2019-09-05 09:35:32 +08:00
fan
063b6392fc 查询剧本列表接口调整展示调整 2019-09-05 09:07:16 +08:00
zyy
935e42fa5b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 19:07:04 +08:00
zyy
921ef7c03d desc: 调整接口请求次数 2019-09-04 19:06:55 +08:00
ival
33c4a3afc2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 19:00:38 +08:00
ival
02fc21e544 增加仿真的大屏角色以及IBP角色 2019-09-04 19:00:22 +08:00
fan
e24a0e1b4d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-04 18:48:10 +08:00
fan
8df4cfd6e1 ibp代码调整 2019-09-04 18:47:49 +08:00
zyy
0f9b0f84a5 desc: 删除多余打印 2019-09-04 18:29:47 +08:00
zyy
1d7809bc33 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 17:58:56 +08:00
zyy
509e5218a7 desc: 调整引用问题 2019-09-04 17:58:22 +08:00
sunzhenyu
ebd1b211d1 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-04 17:36:15 +08:00
ival
8b56d035eb 修改按钮顺序 2019-09-04 17:19:26 +08:00
ival
92531836fe Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 16:58:25 +08:00
ival
f925043e41 增加大屏角色 2019-09-04 16:58:13 +08:00
zyy
118ed1296c desc: 增加琏计划运行图修改 2019-09-04 16:32:41 +08:00
zyy
6b9047c919 desc: 调整请求位置 2019-09-04 15:06:26 +08:00
zyy
949d51923e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 14:47:58 +08:00
zyy
a037937627 desc: 调整运行图生成逻辑 2019-09-04 14:47:52 +08:00
fan
f065661cd4 ibp代码调整 2019-09-04 14:42:04 +08:00
fan
d303ca087e Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-04 13:07:09 +08:00
fan
8a9092b2b4 ibp代码调整 2019-09-04 13:06:15 +08:00
ival
ec51f2de2c 修改代码 2019-09-04 13:04:56 +08:00
ival
eb7dafd1b2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 13:02:43 +08:00
ival
89fc3c0547 增加角色分配统计 2019-09-04 13:02:28 +08:00
zyy
8e06abcad9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 11:28:36 +08:00
zyy
b96701aceb desc: 调整运行图加载 2019-09-04 11:28:24 +08:00
joylink_cuiweidong
67f925ef7f 代码调整 2019-09-04 11:05:57 +08:00
joylink_cuiweidong
969fe6ac5a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/ibp/shape/background.js
 2019-09-04 11:02:02 +08:00
fan
eb26f87560 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-04 10:57:14 +08:00
fan
743fa388c4 代码调整 2019-09-04 10:56:44 +08:00
ival
d7fb121c2b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 10:13:42 +08:00
ival
df839856d9 修改IBP盘角色修改 2019-09-04 10:13:26 +08:00
zyy
51274a044b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 18:59:52 +08:00
zyy
abec58b726 desc: 修改弹窗点击蒙层不取消 2019-09-03 18:59:46 +08:00
fan
cb7d08bc93 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-03 18:45:39 +08:00
fan
ce5d0424d5 ibp代码调整 2019-09-03 18:45:02 +08:00
ival
0879aef961 增加派班计划loading 2019-09-03 18:37:00 +08:00
ival
c1af062bbd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-09-03 17:36:01 +08:00
ival
c97996fceb 设置冲突列颜色 2019-09-03 17:35:23 +08:00
zyy
bd494599a6 desc: 修改显示权限title 2019-09-03 17:03:05 +08:00
sunzhenyu
1af9b755d7 t ：Merge branch 'test' into dev 2019-09-03 16:56:20 +08:00
sunzhenyu
6fc5f991ef 区分cctv和正常镜头渲染，减少通信驱动的循环体，减少循环遍历的数据中内容，修改场景背景 2019-09-03 16:45:56 +08:00
fan
dafa95baed Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-03 16:14:13 +08:00
fan
ae853226d7 ibp调整 2019-09-03 16:14:00 +08:00
zyy
0372dd202d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 16:13:29 +08:00
zyy
40b67b8cf3 desc: 调整修改权限逻辑 2019-09-03 16:13:23 +08:00
ival
b8d2f43ebd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 15:46:31 +08:00
ival
dfcdb5628f 优化IBP盘代码 2019-09-03 15:46:16 +08:00
zyy
10ab09451b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 15:22:58 +08:00
zyy
27f05bdd0d desc: 增加缓存列表 2019-09-03 15:22:50 +08:00
ival
6eb0ac89b8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 14:40:02 +08:00
ival
c433cb5045 添加加载脚本失败后，提示后台错误 2019-09-03 14:39:50 +08:00
zyy
8c69b7afd0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 14:38:11 +08:00
zyy
7fbadc2bd3 desc: 修改权限编辑 2019-09-03 14:38:05 +08:00
ival
c239e98ae8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 14:04:39 +08:00
ival
ca1b07595e 修改IBP界面尺寸的问题 2019-09-03 14:04:25 +08:00
fan
8718df9dc6 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-03 13:47:38 +08:00
fan
cb1d6cc4ff ibp调整 2019-09-03 13:46:59 +08:00
ival
c954305440 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 13:22:34 +08:00
ival
310b3fca21 精简角色分配后删除角色的操作 2019-09-03 13:22:16 +08:00
zyy
8d06b98ba1 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 13:15:53 +08:00
zyy
5591796596 desc: 调整socket重连问题 2019-09-03 13:15:47 +08:00
ival
a29bce2751 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 13:04:30 +08:00
ival
19634821ba 删除无用注释代码 2019-09-03 13:04:19 +08:00
zyy
24f21a09aa Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 11:22:03 +08:00
zyy
82cfd670c6 desc: 修改弹窗显示title 2019-09-03 11:21:54 +08:00
ival
f1ab89a131 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 11:13:00 +08:00
ival
d60c989405 增加IBP盘操作 2019-09-03 11:12:48 +08:00
zyy
0938be08f5 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 10:46:04 +08:00
zyy
870a4de01b desc: 修改socekt断连逻辑, 调整权限显示及细节，样式问题 2019-09-03 10:45:58 +08:00
fan
1ee0aeb785 ibp布局调整 2019-09-03 10:10:09 +08:00
ival
2e10b39892 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/ibp/index.vue
 2019-09-03 09:36:10 +08:00
ival
41111ebab2 修改IPB盘尺寸问题 2019-09-03 09:34:21 +08:00
fan
914c9dc168 删除ibp按钮 2019-09-03 09:18:21 +08:00
fan
e86c1b025c Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/router/index.js
#	src/views/ibp/index.vue
 2019-09-03 09:03:00 +08:00
fan
cc4a60687a ibp盘调整 2019-09-03 08:56:14 +08:00
zyy
d53661e6ed desc: 增加权限一键生成接口,调整显示位置，字段内容 2019-09-02 18:43:05 +08:00
zyy
95e6008c50 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 17:34:40 +08:00
zyy
f73d7f4b9f desc: 打包权限列表展示 2019-09-02 17:34:34 +08:00
ival
827bb6e870 修改支付页面和订单页面高度错误问题 2019-09-02 17:24:42 +08:00
ival
cc17426731 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 17:11:31 +08:00
ival
de2b6a52b1 修改主页和尺寸 2019-09-02 17:11:19 +08:00
zyy
fa91bc22d9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/orderauthor/author/draft/ruleForm.vue
 2019-09-02 17:06:32 +08:00
zyy
d38b3761b8 desc: 对接权限编辑接口，修改显示字段内容 2019-09-02 17:05:53 +08:00
ival
417dbbe585 修改首页布局 2019-09-02 15:46:05 +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
0388b2a1df desc: 修改权限列表显示字段内容，逻辑流程 2019-09-02 14:43:16 +08:00
zyy
4a466e6a8c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 11:04:30 +08:00
zyy
6fa64dd26b desc: 修改显示字段，增加loading 2019-09-02 11:04:23 +08:00
ival
94d1103e58 设置全局尺寸变化 2019-09-02 10:38:10 +08:00
ival
327bf6f32b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 10:12:08 +08:00
ival
03daccff77 修改登录session的问题 2019-09-02 10:11:57 +08:00
fan
e9c7016c19 ibp盘调整 2019-09-02 09:57:15 +08:00
fan
6000ac9df5 调整代码 2019-09-02 09:56:25 +08:00
fan
8dda6d4dbe ibp盘调整 2019-09-02 09:53:21 +08:00
zyy
6e60afb4e6 desc: 注释永久显示 2019-09-02 09:33:21 +08:00
ival
923ded894b 修改代码 2019-08-30 19:36:36 +08:00
ival
f428bd71f1 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-30 19:27:17 +08:00
ival
0031b51f55 增加字典详情删除时给出提示 2019-08-30 19:27:03 +08:00
zyy
6c617d3e4a desc: 修改获取商品字段 2019-08-30 19:19:48 +08:00
zyy
d8dc80a001 desc: 修改权限字段显示 2019-08-30 19:14:10 +08:00
zyy
5d1c9d02bf desc: 修改琏计划 2019-08-30 19:10:08 +08:00
fan
bf23362b2b Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-30 17:43:50 +08:00
fan
8fa43ce797 ibp盘调整 2019-08-30 17:43:17 +08:00
ival
9b9be66ea0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-30 17:12:52 +08:00
ival
36facbb67d 修改重新生成排班计划的页面 2019-08-30 17:12:39 +08:00
zyy
abf1afcdf2 desc: 修改逻辑顺序 2019-08-30 17:09:31 +08:00
zyy
22beeffc53 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
#	src/views/screenMonitor/list/demonList.vue
 2019-08-30 17:03:51 +08:00
zyy
0398179e0d desc: 用户权限流程修改，接口对接 2019-08-30 17:00:18 +08:00
ival
d3ff24c4f8 设置时间组件为可清空组件 2019-08-30 16:41:55 +08:00
ival
ff94ade817 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-30 16:35:24 +08:00
ival
1dabf22fd6 修改数据显示 2019-08-30 16:35:13 +08:00
fan
ed3f31972d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-30 16:22:21 +08:00
fan
0503afb4c9 ibp盘调整 2019-08-30 16:22:10 +08:00
ival
5574df0e9d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-30 15:46:23 +08:00
ival
546957e926 增加排版计划处理 2019-08-30 15:46:08 +08:00
fan
b2b28f8c9d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
#	src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
 2019-08-30 15:06:08 +08:00
fan
755754ebd3 ibp调整 2019-08-30 15:01:37 +08:00
joylink_cuiweidong
dec0da6c1a 电话端子添加到页面中 2019-08-30 14:15:10 +08:00
joylink_cuiweidong
9cea1f91a9 ibp盘右侧样式调整 2019-08-30 13:32:56 +08:00
joylink_cuiweidong
911d269562 钥匙层级调整 2019-08-30 11:21:34 +08:00
joylink_cuiweidong
e865e6de3b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/ibp/shape/alarm.js
 2019-08-30 10:59:14 +08:00
joylink_cuiweidong
64c939c8be 钥匙组件添加到页面 2019-08-30 10:55:34 +08:00
fan
240268a65f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/ibp/shape/button.js
 2019-08-30 10:34:25 +08:00
fan
5350e6ad39 ibp盘提交 2019-08-30 10:31:56 +08:00
ival
3da74652c5 增加派班计划 2019-08-30 09:00:36 +08:00
joylink_cuiweidong
c9937ffc48 电梯组件添加到页面中 2019-08-29 18:45:20 +08:00
ival
fd03ed6d59 修改每日运行图查询接口 2019-08-29 14:48:26 +08:00
ival
dce9903175 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-29 13:52:48 +08:00
ival
1616639f6f 修改运行图接口 2019-08-29 13:52:34 +08:00
joylink_cuiweidong
eaec6c4446 修复 剧本修改时候重置剧本的bug 2019-08-29 13:05:30 +08:00
ival
30e590afc7 封装车次窗鼠标事件以及车次窗操作 2019-08-29 11:26:05 +08:00
ival
c14e0c6055 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/display/index.vue
 2019-08-29 10:35:55 +08:00
ival
cc54830f01 修改代码格式以及操作的bug 2019-08-29 10:33:50 +08:00
zyy
32cc251ef6 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/display/index.vue
#	src/views/display/menuDemon.vue
 2019-08-29 09:33:42 +08:00
zyy
2d906ef9be desc: 调整权限列表接口对接 2019-08-29 09:31:58 +08:00
fan
be04a992c0 关闭ibp盘开关 2019-08-29 09:30:09 +08:00
fan
094476bdb5 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-29 09:26:27 +08:00
fan
453a909f01 ibp盘 2019-08-29 09:26:14 +08:00
fan
94f803072f ibp盘提交 2019-08-29 09:25:06 +08:00
ival
0954312cac 修改用户emgail国际化的问题和保存规则提示的问题 2019-08-29 09:02:02 +08:00
fan
3393a65f0d 代码调整：ibp盘 2019-08-28 13:22:17 +08:00