Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc

src/main/webapp/HG/PZ/HGPZ009.jsp

@@ -37,7 +37,7 @@
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
 		</EF:EFGrid>
 		<br/>
-		<span style='color: red;font-size: 13px;'>说明：新增企业时会同步新增企业管理员账户，账户=登录前缀0000，例如：登录前缀是HG，初始账账户就是HG0000，密码与账账户相同</span></br>
+		<span style='color: red;font-size: 13px;'>说明：新增企业时会同步新增企业管理员账户，账户=登录前缀0000，例如：登录前缀是HG，初始账户就是HG0000，密码与账户相同</span></br>
 	</EF:EFRegion>
 
 </EF:EFPage>

src/main/webapp/HG/WD/HGWD002A1.js

@@ -62,14 +62,14 @@ function previewFile(url, docType) {
 	$("#descDiv").css('display', 'none');
 	if (isXml(docType)) {
 		previewXml(url);
-	} else if (isExcel(docType)) {
-		previewExcel(url);
 	} else if (isWord(docType)) {
 		previewDocx(url);
 	} else {
 		previewOnline(url);
 	}
-	// else if (isText(docType)) {
+	// else if (isExcel(docType)) {
+	// 	previewExcel(url);
+	// } else if (isText(docType)) {
 	// 	previewText(url);
 	// } else if (isImage(docType)) {
 	// 	previewImage(url);