Revert "1"

This reverts commit de086ab56aec6efe6e7927efafd029c614ffdf56.
1
Merge branch 'master' of github.com:zhaochenbing/czmk_proj

Conflicts:
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/GraphUnitsIndex.xml
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/主扇系统/1#风机房1#风机控制.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/主扇系统/1#风机房1#风门控制.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/主扇系统/1#风机房2#风机控制.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/主扇系统/1#风机房2#风门控制.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/主扇系统/1号风井主扇监控系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/主扇系统/2号风井主扇监控系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/主扇系统/3号风井主扇监控系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/主扇系统/4号风井主扇监控系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0801人员实时列表bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0801分站查询面板.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0802人员信息-原来.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0802人员信息0928.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0802人员信息_1.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0802人员信息_2.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0802人员信息bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0803分站信息.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0804区域信息.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0805系统异常bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0806超时报警bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0807超员或进入限制区域报警bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/0808特种工作人员工作异常报警bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/aaaaaa.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/hhhhh.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/人员信息列表.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/实时查询条件.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/人员定位/轨迹查询条件.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域/OCC_DOW-1013.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域/OCC_NAV.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域/OCC_TOP.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域/OCC_TOP1020.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域/OCC_TOP_1_1020.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域/TSMK_DOWN.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域_WEB/OCC_DOW_WEB.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域_WEB/OCC_NAV_WEB.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域_WEB/OCC_TOP_WEB.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共区域_WEB/OCC_TOP_WEB_1-----.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共图形/FM_switch.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共图形/MK_LOG.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共图形/MK_LOGHIS.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共图形/MK_PRIV.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共图形/MK_TRN.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共图形/MK_USER.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共图形/PUB_DFT.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/公共图形/RC_DY.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/1201压风系统总图.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/1202矸井工区压风系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/1203白沙工区压风系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/1204段河工区压风系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/12054#工区压风系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/1206矸井工区设备参数.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/1207白沙工区设备参数.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/1208段河工区设备参数.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/12094#工区设备参数.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/压风系统/1210压风系统实时报警.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/工业电视 - 原控件图形/1603视频小窗口.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/工业电视 - 原控件图形/test_2.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/工业电视 - 原控件图形/大华视频监控.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/工业电视 - 原控件图形/大华视频窗口.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/工业电视 - 原控件图形/海康视频监控.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/工业电视 - 原控件图形/海康视频窗口.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/总貌/0001总貌_报警为图片.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/总貌/0001总貌原图.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/总貌/22222.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/总貌/565.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/总貌/图层控制窗.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/洗选煤系统/1301集控主画面_1.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/瓦斯抽放/1001瓦斯抽放系统_1.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/皮带系统/0301皮带集控总--1013.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/皮带系统/03085103一部皮带.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/皮带系统/0310二五皮带.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/皮带系统/0313北翼皮带机尾给煤机.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/皮带系统/0314泄水巷皮带.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/皮带系统/0315皮带起停记录1023.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/皮带系统/0315皮带起停记录bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/监测监控/0901安全监控监测bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/监测监控/0901模拟量数据-old.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/监测监控/0901模拟量数据1020.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/监测监控/0901模拟量数据bf.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/监测监控/0902开关量数据.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/监测监控/0903监测数据.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/监测监控/0903监测数据_保留.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/综采系统/0421液压支架总图.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/辅运输系统/0401猴车监测.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/辅运输系统/0401猴车监测_1.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/辅运输系统/0402成庄提升系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/辅运输系统/0403段河提升系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/辅运输系统/0403段河提升系统_1.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/辅运输系统/0404矸井提升系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/通风系统/0505二水平局扇.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/通风系统/0506二&三盘区局扇.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/通风系统/0507四盘区局扇.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/通风系统/0508五盘区局扇.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/通风系统/局扇监测系统.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Graph/风水监测/2101风水监测.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Mid/OCC_TOP1020.mxv
	CZMK_PROJECT/Domains/OCC/OCC_ENG/HMIConfig/Mid/OCC_TOP_1_1020.mxv
	Graph/公共区域/OCC_TOP1020.mxv
	Graph/公共区域/OCC_TOP_1_1020.mxv
	Graph/工业电视/GraphIndex.xml
	Graph/总貌/GraphIndex.xml
	Graph/总貌/总貌图的安全监测点示例图.mxv
1