fan
|
1e8d304249
|
Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
# src/scripts/cmdPlugin/CommandEnum.js
# src/utils/baseUrl.js
|
2020-03-20 15:16:08 +08:00 |
|
zyy
|
933f0c1bba
|
调整综合演练ibp获取数据
|
2020-03-16 16:06:50 +08:00 |
|
fan
|
4ab462ed5d
|
合并代码
|
2020-03-16 15:32:00 +08:00 |
|
zyy
|
1745bfbcf1
|
ibp盘绘制更新保存流程调整完成
|
2020-03-16 14:47:59 +08:00 |
|
zyy
|
1c78d52fed
|
调整ibp文件配置路径
|
2020-03-16 11:02:33 +08:00 |
|
zyy
|
5dbd676ccf
|
调整代码
|
2020-03-13 19:04:28 +08:00 |
|
zyy
|
ce21ff9d91
|
调整接口
|
2020-03-13 19:01:59 +08:00 |
|
zyy
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +08:00 |
|
ival
|
6df897316b
|
移植system
|
2019-10-31 15:43:37 +08:00 |
|
fan
|
11190ef66f
|
代码整合调整
|
2019-10-17 10:13:08 +08:00 |
|
fan
|
dd8c1e07f4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-16 14:01:40 +08:00 |
|
fan
|
1caad290e5
|
ibp盘添加扣车关联
|
2019-10-16 14:00:30 +08:00 |
|
zyy
|
6faa018c71
|
desc: 新增剧本编辑页面可拖拽宽度
|
2019-10-15 15:24:41 +08:00 |
|
fan
|
a24603aedf
|
综合仿真页面跳转调整
|
2019-10-12 11:03:15 +08:00 |
|
fan
|
3326f1c917
|
ibp调整
|
2019-10-11 17:17:05 +08:00 |
|
joylink_cuiweidong
|
672c075ada
|
ibp 车站名称以及上下行车站名称修改
|
2019-10-08 15:51:19 +08:00 |
|
fan
|
517ddbcff0
|
国际化调整
|
2019-09-23 09:48:13 +08:00 |
|
fan
|
a182d7d0b2
|
国际化调整
|
2019-09-19 18:51:57 +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 |
|
fan
|
760aa02496
|
ibp调整页面
|
2019-09-06 18:17:54 +08:00 |
|
fan
|
6b96fc928d
|
ibp删除console
|
2019-09-06 17:42:36 +08:00 |
|
fan
|
3faf8f3906
|
ibp盘调整
|
2019-09-06 16:54:55 +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
|
ceccbbc825
|
ibp盘调整
|
2019-09-06 14:48:06 +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
|
8df4cfd6e1
|
ibp代码调整
|
2019-09-04 18:47:49 +08:00 |
|
fan
|
f065661cd4
|
ibp代码调整
|
2019-09-04 14:42:04 +08:00 |
|
fan
|
8a9092b2b4
|
ibp代码调整
|
2019-09-04 13:06:15 +08:00 |
|
fan
|
743fa388c4
|
代码调整
|
2019-09-04 10:56:44 +08:00 |
|
fan
|
ce5d0424d5
|
ibp代码调整
|
2019-09-03 18:45:02 +08:00 |
|
fan
|
ae853226d7
|
ibp调整
|
2019-09-03 16:14:00 +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
|
cb1d6cc4ff
|
ibp调整
|
2019-09-03 13:46:59 +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
|
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 |
|
ival
|
61de3c222d
|
App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入
|
2019-09-02 15:37:57 +08:00 |
|