dev-xjf #45

Merged

xiaojinfei merged 8 commits from dev-xjf into master 3 weeks ago

Author	SHA1	Message	Date
肖晋飞	9f7f685c59	feat:修改浮动按钮功能	3 weeks ago
肖晋飞	434e1da621	feat:设备样例展示demo	3 weeks ago
肖晋飞	ae8bdeb120	fix:更改大loading为正式logo	3 weeks ago
肖晋飞	69216ea7bb	fix:更改loading大logo	3 weeks ago
肖晋飞	eb51a69a6d	fix:运行中心-预警实例配置	3 weeks ago
肖晋飞	74053a529d	Merge branch 'master' into dev-xjf	3 weeks ago
肖晋飞	71492d157b	feat:预警回算	3 weeks ago
肖晋飞	9a41177294	Merge remote-tracking branch 'origin/master' into dev-xjf	2 months ago