joylink_cuiweidong
|
e4bf88ddf5
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-16 13:20:01 +08:00 |
|
joylink_cuiweidong
|
394c5b776c
|
iscs 冷冻泵/冷却泵添加
|
2020-01-16 13:15:52 +08:00 |
|
fan
|
9b26c70100
|
FAS子系统测试PSD
|
2020-01-16 13:03:44 +08:00 |
|
fan
|
69850add99
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 09:23:48 +08:00 |
|
fan
|
de7176ac5e
|
FAS子系统测试
|
2020-01-16 09:23:37 +08:00 |
|
joylink_cuiweidong
|
02b2ce19f1
|
iscs bas代码调整
|
2020-01-15 17:56:31 +08:00 |
|
fan
|
308e0960b0
|
iscs调整
|
2020-01-15 14:04:33 +08:00 |
|
fan
|
f13f7c9964
|
iscs调整
|
2020-01-15 14:03:25 +08:00 |
|
fan
|
31f6277107
|
iscs调整
|
2020-01-15 13:33:11 +08:00 |
|
fan
|
a03b002beb
|
iscs调整
|
2020-01-15 13:27:07 +08:00 |
|
fan
|
9233728346
|
iscs调整
|
2020-01-15 10:11:26 +08:00 |
|
fan
|
e8039732ab
|
iscs调整
|
2020-01-14 18:17:51 +08:00 |
|
fan
|
e4ccfa40d2
|
iscs 绘图
|
2020-01-14 09:55:57 +08:00 |
|
fan
|
365f36edef
|
iscs 绘图
|
2020-01-14 09:06:03 +08:00 |
|
fan
|
f9930a084d
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:57:01 +08:00 |
|
zyy
|
6feb0ec9c0
|
新版地图: 调整默认状态，站台状态配置完成。其他元素暂未配置
|
2020-01-13 13:45:39 +08:00 |
|
fan
|
dba81ee41d
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:35:13 +08:00 |
|
zyy
|
d79641e0e4
|
调整指令字典中条件参数
|
2020-01-08 17:21:17 +08:00 |
|
fan
|
b84f86916f
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-08 09:42:36 +08:00 |
|
fan
|
1a2ab7018c
|
设备管理-配置编辑 提示文字修改
|
2020-01-07 13:20:47 +08:00 |
|
fan
|
9a2d5f4602
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 13:11:57 +08:00 |
|
fan
|
f4c8832133
|
设备管理-配置编辑 信号机配置调整
|
2020-01-07 13:11:13 +08:00 |
|
fan
|
e4678d6f1a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 13:06:16 +08:00 |
|
fan
|
5dc3eb83f8
|
设备管理-配置编辑 信号机配置调整
|
2020-01-07 13:05:06 +08:00 |
|
fan
|
c09021067a
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:36:19 +08:00 |
|
fan
|
9944bdef33
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:27:49 +08:00 |
|
fan
|
cf34d61746
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:18:06 +08:00 |
|
fan
|
2554ed1135
|
代码调整
|
2020-01-06 14:43:08 +08:00 |
|
fan
|
68a7171495
|
国际化调整
|
2020-01-06 11:25:07 +08:00 |
|
fan
|
673df154b4
|
国际化和连接真实设备调整
|
2020-01-03 17:00:33 +08:00 |
|
fan
|
cb0f21a183
|
网关字地址可以为0，所有数据不可为小数
|
2020-01-03 13:49:40 +08:00 |
|
fan
|
dd57e3e85c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-03 11:18:36 +08:00 |
|
fan
|
e022b00a00
|
项目设备综合演练调整
|
2020-01-03 11:18:18 +08:00 |
|
zyy
|
2c01e8ace1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-02 18:40:36 +08:00 |
|
zyy
|
59e5c5fef7
|
调整相关用户的列表 名称变昵称显示
|
2020-01-02 18:40:30 +08:00 |
|
fan
|
c8a6e0d8ec
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-02 17:01:23 +08:00 |
|
fan
|
65b766e27f
|
项目设备管理
|
2020-01-02 17:01:11 +08:00 |
|
fan
|
0504a2a2a6
|
迁移cmd分支
|
2019-12-31 14:32:04 +08:00 |
|
joylink_cuiweidong
|
ca6ca0ecc4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-30 18:45:17 +08:00 |
|
fan
|
24ef3fd71d
|
添加贵州装备制造职业学院项目
|
2019-12-30 18:06:40 +08:00 |
|
joylink_cuiweidong
|
40bc4840e7
|
prdType 接口调整
|
2019-12-27 19:36:29 +08:00 |
|
joylink_cuiweidong
|
d15eca77ea
|
删除系统管理产品编辑
删除发布内容管理产品状态
|
2019-12-27 10:04:09 +08:00 |
|
joylink_cuiweidong
|
11de837332
|
设计平台课程设计实训管理 生成实训/删除实训/修改实训 调整
|
2019-12-26 19:58:34 +08:00 |
|
joylink_cuiweidong
|
d157dc0a88
|
删除权限管理的权限打包按钮
删除权限分发管理的权限打包按钮
|
2019-12-26 18:07:43 +08:00 |
|
joylink_cuiweidong
|
cd5e923c52
|
用户实训统计，用户仿真统计 产品类型修改
|
2019-12-26 16:32:03 +08:00 |
|
joylink_cuiweidong
|
8e82ceab27
|
权限打包页面接口调整（/api/lesson）
|
2019-12-26 13:12:23 +08:00 |
|
joylink_cuiweidong
|
b70daac9bf
|
定制-产品名称改为产品类型
展示页面产品名称改为产品类型
|
2019-12-25 19:28:03 +08:00 |
|
joylink_cuiweidong
|
cb1ca75eb7
|
用户仿真统计
新增-产品名称改为产品类型
前端维护一个产品类型枚举
|
2019-12-25 18:56:25 +08:00 |
|
zyy
|
bfe6c5a537
|
调整线路配置项流程，对接字段
|
2019-12-20 14:02:11 +08:00 |
|
zyy
|
3101af9948
|
增加线路皮肤配置，调整联锁站台显示列表
|
2019-12-19 18:04:28 +08:00 |
|
fan
|
28e9abe13a
|
ibp绘图部分设备添加操作表示关联设备
|
2019-12-09 11:00:25 +08:00 |
|
zyy
|
fa3d0cb099
|
desc: 调整代码书写逻辑
|
2019-11-20 16:31:41 +08:00 |
|
ival
|
0c6d17647a
|
修改代码
|
2019-11-20 10:39:46 +08:00 |
|
zyy
|
f3798aa2c9
|
desc: 增加屏蔽门list
|
2019-11-19 17:48:32 +08:00 |
|
zyy
|
00877ac164
|
修改代码 调整绘图逻辑
|
2019-11-19 16:39:24 +08:00 |
|
zyy
|
4144621be8
|
desc: 修改代码
|
2019-11-19 13:00:36 +08:00 |
|
zyy
|
8d05730dc4
|
desc: 修改代码
|
2019-11-18 14:29:43 +08:00 |
|
zyy
|
9bfad2fdeb
|
desc: 修改代码
|
2019-11-15 16:31:48 +08:00 |
|
zyy
|
558f359c77
|
删除elementui 改用cdn方式加载
|
2019-11-14 14:10:20 +08:00 |
|
ival
|
9e5838c647
|
删除多余指令
|
2019-11-12 09:24:11 +08:00 |
|
fan
|
daec7d5e4d
|
bug 调整
|
2019-11-08 18:43:46 +08:00 |
|
fan
|
e677b24f6d
|
调整查询地图列表接口
|
2019-11-08 16:22:05 +08:00 |
|
joylink_cuiweidong
|
713f411ffc
|
运行图设计调整
|
2019-11-08 13:47:51 +08:00 |
|
fan
|
c203f7b839
|
skinCode 调整
|
2019-11-08 10:08:28 +08:00 |
|
zyy
|
5a2ff68b15
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 18:46:23 +08:00 |
|
zyy
|
16e13f38b5
|
desc: 调整格式
|
2019-11-07 18:46:17 +08:00 |
|
fan
|
a82474dc14
|
产品编码修改
|
2019-11-07 17:18:08 +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 |
|
joylink_cuiweidong
|
5cb7fe51b9
|
skinCode处理
|
2019-11-07 10:25:34 +08:00 |
|
joylink_cuiweidong
|
6a2a0b0b5e
|
代码调整
权限分发国际化调整
|
2019-11-05 19:03:20 +08:00 |
|
joylink_cuiweidong
|
f8298400f1
|
代码优化
权限分发转赠接口调整
|
2019-11-05 16:53:39 +08:00 |
|
joylink_cuiweidong
|
cf69d44833
|
代码优化
系统管理用户实训统计接口调整
|
2019-11-04 14:05:55 +08:00 |
|
zyy
|
3bcb637d1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 13:51:08 +08:00 |
|
zyy
|
aaa0eeedd8
|
desc: 调整国际化
|
2019-11-01 13:51:00 +08:00 |
|
joylink_cuiweidong
|
76e904455a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 10:07:00 +08:00 |
|
joylink_cuiweidong
|
d0608dd29e
|
接口调整
文件位置调整
|
2019-11-01 10:06:47 +08:00 |
|
zyy
|
53d4483081
|
desc: 修改代码
|
2019-10-31 18:43:05 +08:00 |
|
ival
|
6df897316b
|
移植system
|
2019-10-31 15:43:37 +08:00 |
|
ival
|
07ef079f1b
|
修改代码
|
2019-10-31 15:34:38 +08:00 |
|
fan
|
1242c7e3d7
|
修改接口：/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId}
|
2019-10-30 18:18:09 +08:00 |
|
fan
|
fa1fc4c3cf
|
删除接口：/api/mapPrd/tree
|
2019-10-30 18:03:30 +08:00 |
|
zyy
|
443051edc3
|
desc: 调整代码
|
2019-10-30 13:58:34 +08:00 |
|
zyy
|
6aa05c217f
|
desc: 修改代码
|
2019-10-30 10:15:18 +08:00 |
|