fan
|
6544f37307
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:55:20 +08:00 |
|
fan
|
3011285293
|
发布地图管理调整
|
2020-01-20 09:54:59 +08:00 |
|
joylink_cuiweidong
|
6d37d2aa16
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:26:11 +08:00 |
|
joylink_cuiweidong
|
33a1918b75
|
issc 组件代码修改
|
2020-01-20 09:25:58 +08:00 |
|
zyy
|
a033690502
|
调整综合监控文件位置及加载方式
|
2020-01-20 09:20:09 +08:00 |
|
fan
|
b2cd2dd4ca
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:06:15 +08:00 |
|
fan
|
0f93d8f203
|
iscs系统调整
|
2020-01-20 09:05:52 +08:00 |
|
joylink_cuiweidong
|
10e2c426e9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:56:48 +08:00 |
|
joylink_cuiweidong
|
8d948c82b1
|
iscs系统 乘客信息页面调整
|
2020-01-19 18:56:36 +08:00 |
|
zyy
|
1e78cb64f8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:36:23 +08:00 |
|
zyy
|
f42c48a0c4
|
调整iscs为新的系统
|
2020-01-19 18:36:17 +08:00 |
|
joylink_cuiweidong
|
caed94f56d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:35:02 +08:00 |
|
joylink_cuiweidong
|
2d30c5f0e7
|
iscs 组件代码调整
|
2020-01-19 18:34:28 +08:00 |
|
fan
|
7048991824
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 17:34:25 +08:00 |
|
fan
|
155f8abb96
|
新版绘图停车点偏移量调整+国际化调整
|
2020-01-19 17:34:03 +08:00 |
|
fan
|
53a89cc970
|
iscs调整
|
2020-01-19 15:29:05 +08:00 |
|
joylink_cuiweidong
|
0d3a095a81
|
iscs 绘图组件代码调整
|
2020-01-19 14:56:22 +08:00 |
|
fan
|
40cca79ce8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:23:17 +08:00 |
|
fan
|
e858a6d25b
|
iscs调整
|
2020-01-19 14:22:37 +08:00 |
|
zyy
|
9d0c88633d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:21:28 +08:00 |
|
zyy
|
323eda0e07
|
调整iscs样式
|
2020-01-19 14:21:22 +08:00 |
|
joylink_cuiweidong
|
8b47257b6e
|
iscs 组件代码调整
|
2020-01-19 14:15:09 +08:00 |
|
joylink_cuiweidong
|
0247dce3aa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:09:31 +08:00 |
|
joylink_cuiweidong
|
1d56688732
|
iscs 各组件生成uid方法修改
|
2020-01-19 14:09:15 +08:00 |
|
fan
|
0f50e1b00a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:03:51 +08:00 |
|
fan
|
df39d836dc
|
iscs调整
|
2020-01-19 14:03:32 +08:00 |
|
joylink_cuiweidong
|
d8086e1311
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/utils/parser.js
|
2020-01-19 13:52:24 +08:00 |
|
joylink_cuiweidong
|
d957ea049b
|
iscs 生成uid代码调整
|
2020-01-19 13:49:55 +08:00 |
|
zyy
|
298dddf718
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 11:22:58 +08:00 |
|
zyy
|
2d5074d6d1
|
增加进路数据状态维护
|
2020-01-19 11:22:48 +08:00 |
|
fan
|
d9c15d961e
|
连接真实设备按钮仅车站值班员可见
|
2020-01-19 11:17:51 +08:00 |
|
fan
|
ea74886ba3
|
调整打开新页面时sessionStorage复制导致的路由处理错误
|
2020-01-19 10:26:40 +08:00 |
|
fan
|
15ca63be84
|
iscs调整
|
2020-01-19 10:05:55 +08:00 |
|
fan
|
d744d7a69e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-17 18:49:15 +08:00 |
|
fan
|
87e62a6631
|
iscs综合监控
|
2020-01-17 18:45:28 +08:00 |
|
zyy
|
0bee3cc61d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 17:48:15 +08:00 |
|
zyy
|
1779f856be
|
新增iscs系统
|
2020-01-17 17:48:08 +08:00 |
|
joylink_cuiweidong
|
0bb7b11271
|
iscs bas 状态管理代码调整 生成uid代码调整 组件代码调整
|
2020-01-17 17:27:11 +08:00 |
|
joylink_cuiweidong
|
7987f6bd12
|
iscs bas 组件 uid 代码修改
|
2020-01-17 15:42:20 +08:00 |
|
zyy
|
3ec7d0a7e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 15:32:08 +08:00 |
|
zyy
|
e4b20395c4
|
增加iscs系统，调整成都一号线运行图导入
|
2020-01-17 15:31:58 +08:00 |
|
joylink_cuiweidong
|
22419fa6c9
|
iscs bas 组件代码调整
|
2020-01-17 15:15:58 +08:00 |
|
fan
|
95e5c9f603
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 14:20:49 +08:00 |
|
fan
|
582fc354db
|
快速入口增加参数projectCode
|
2020-01-17 14:20:31 +08:00 |
|
zyy
|
d4b352d4ba
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 14:15:21 +08:00 |
|
zyy
|
b9de20f22a
|
iscs绘制元素
|
2020-01-17 14:15:14 +08:00 |
|
joylink_cuiweidong
|
d7b43924bb
|
iscs bas 组件代码调整
|
2020-01-17 14:10:40 +08:00 |
|
joylink_cuiweidong
|
9d0b565142
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 13:37:22 +08:00 |
|
joylink_cuiweidong
|
219e24cbcd
|
iscs bas 组件 添加
|
2020-01-17 13:37:08 +08:00 |
|
fan
|
02a6954ffd
|
仿真接口报错提示调整
|
2020-01-17 13:17:12 +08:00 |
|
fan
|
22657aa935
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 11:32:11 +08:00 |
|
fan
|
269cef7673
|
仿真接口调整
|
2020-01-17 11:31:53 +08:00 |
|
joylink_cuiweidong
|
45fafdd0ee
|
iscs 排风机 冷水机组绘图代码调整
|
2020-01-17 11:07:44 +08:00 |
|
fan
|
fb08f43afd
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:23:20 +08:00 |
|
fan
|
019ca66662
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:16:23 +08:00 |
|
joylink_cuiweidong
|
91c722f288
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-16 18:11:40 +08:00 |
|
fan
|
8676bef502
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceRender.js
|
2020-01-16 18:07:18 +08:00 |
|
joylink_cuiweidong
|
eb99102c6c
|
iscs 冷水机组，冷却塔组件布局
|
2020-01-16 18:07:02 +08:00 |
|
fan
|
027518132a
|
psd子系统
|
2020-01-16 18:06:00 +08:00 |
|
zyy
|
4c140a7c2a
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 18:03:06 +08:00 |
|
zyy
|
27257482ab
|
调整线路配置项，增加 ISCS 绘图元素
|
2020-01-16 18:02:57 +08:00 |
|
fan
|
dba419a524
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 16:25:47 +08:00 |
|
fan
|
3b26366935
|
Psd子系统
|
2020-01-16 16:25:33 +08:00 |
|
joylink_cuiweidong
|
1cd35488e8
|
房间socket代码修改
|
2020-01-16 16:15:58 +08:00 |
|
joylink_cuiweidong
|
5357d5c23c
|
解决 页面刷新 用户进入房间的问题
|
2020-01-16 15:08:03 +08:00 |
|
zyy
|
4a67f2b096
|
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
# src/views/system/iscsDraw/iscsOperate/index.vue
|
2020-01-16 14:54:24 +08:00 |
|
zyy
|
714c55ec8b
|
增加iscs绘制
|
2020-01-16 14:52:45 +08:00 |
|
joylink_cuiweidong
|
4103f1db8b
|
iscs 冷水机组 组件
|
2020-01-16 13:41:10 +08:00 |
|
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 |
|
joylink_cuiweidong
|
e0824e33a0
|
房间的订阅代码调整
|
2020-01-15 13:20:48 +08:00 |
|
fan
|
f9bca1759d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-15 10:31:24 +08:00 |
|
fan
|
e80c0cd07f
|
延续保护解锁区段不可修改
|
2020-01-15 10:30:59 +08:00 |
|
zyy
|
77791a00ad
|
调整车次窗表单样式，调整事件阻止
|
2020-01-15 10:29:30 +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
|
9688838869
|
哈尔滨盈达科技调整
|
2020-01-14 16:58:23 +08:00 |
|
fan
|
8d597eccfd
|
哈尔滨盈达科技调整
|
2020-01-14 16:53:46 +08:00 |
|
fan
|
e9499916f5
|
登录页面添加备案号
|
2020-01-14 16:39:26 +08:00 |
|
fan
|
0ba7385e9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-14 16:21:35 +08:00 |
|
fan
|
fbc0e5b28a
|
哈尔滨盈达调整
|
2020-01-14 16:19:36 +08:00 |
|
sunzhenyu
|
31d2381e13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-14 16:09:30 +08:00 |
|
sunzhenyu
|
e19e44835f
|
修改背景自适应，修改三维地图编辑逻辑存读以及三维沙盘加载
|
2020-01-14 16:09:08 +08:00 |
|
zyy
|
8569ee4635
|
Merge branch 'dev' into test
|
2020-01-14 09:58:12 +08:00 |
|
fan
|
e4ccfa40d2
|
iscs 绘图
|
2020-01-14 09:55:57 +08:00 |
|
fan
|
365f36edef
|
iscs 绘图
|
2020-01-14 09:06:03 +08:00 |
|
zyy
|
9d42feb47e
|
增加绘图图层 全选
|
2020-01-13 17:31:58 +08:00 |
|
joylink_cuiweidong
|
557b1cbfeb
|
新版绘图 生成道岔计轴区段代码调整
|
2020-01-13 16:46:10 +08:00 |
|
fan
|
b1bb638af3
|
修复：路由改变未在地图数据改变前及时清除定时器导致的地图数据污染保存的问题
|
2020-01-13 16:30:38 +08:00 |
|
fan
|
f9930a084d
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:57:01 +08:00 |
|
fan
|
d81a87caa2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 13:56:22 +08:00 |
|
fan
|
a6476ea5d9
|
添加登录页哈尔滨盈达科技
|
2020-01-13 13:56:03 +08:00 |
|