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
..
cacheControl	修改代码	2019-10-31 15:34:38 +08:00
commandDictionary	新版地图: 调整默认状态，站台状态配置完成。其他元素暂未配置	2020-01-13 13:45:39 +08:00
configLine	调整线路配置项流程，对接字段	2019-12-20 14:02:11 +08:00
deviceManage	设备管理-配置编辑 提示文字修改	2020-01-07 13:20:47 +08:00
dictionary	修改代码	2019-10-31 15:34:38 +08:00
dictionaryDetail	修改代码	2019-10-31 15:34:38 +08:00
existingSimulation	prdType 接口调整	2019-12-27 19:36:29 +08:00
ibpDraw	ibp绘图部分设备添加操作表示关联设备	2019-12-09 11:00:25 +08:00
iscsDesign	iscs bas代码调整	2020-01-15 17:56:31 +08:00
iscsDraw	Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs	2020-01-16 14:54:24 +08:00
news	删除elementui 改用cdn方式加载	2019-11-14 14:10:20 +08:00
systemGenerate	Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev	2019-12-30 18:45:17 +08:00
userControl	调整查询地图列表接口	2019-11-08 16:22:05 +08:00
userExam	调整相关用户的列表 名称变昵称显示	2020-01-02 18:40:30 +08:00
userSimulation	调整相关用户的列表 名称变昵称显示	2020-01-02 18:40:30 +08:00
userTraining	调整相关用户的列表 名称变昵称显示	2020-01-02 18:40:30 +08:00