Эх сурвалжийг харах

Z991239-1017 #comment fea 初始化页自动读取集中配置

陈良瑜80374463 4 жил өмнө
parent
commit
b63bce294a

+ 7 - 3
addin/cfg/HealthManager.ini

@@ -11,13 +11,17 @@ CustMngrAuth=0
 ;please use --test to boot up the entity
 ;TestDeamon=0
 Chromium=0
+ScannerSet=0
+RemoteController=0
+ResourceWatcher=0
+Gpio=0
 
 [SafeLoad.RVC.Stand2S]
 Initializer=2
 CenterSetting=2
 AccessAuthorization=2
 ;SystemCustomization=2
-SelfChecker=2
+;SelfChecker=2
 HeartBeat=2
 ;Alarm=1
 ;DeviceSwitch=2
@@ -59,8 +63,8 @@ ResourceWatcher=0
 [Operating.RVC.Stand2S]
 CardIssuer=0
 IDCertificate=0
-Gpio=0
-ScannerSet=0
+
+
 ContactlessCard=0
 ThermalPrint=0
 FingerPrint=0

+ 1 - 0
addin/res/ManagerDesktop/errPage.html

@@ -5,6 +5,7 @@
 		<title>错误页</title>
 		<meta name="viewport" content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
 		<link rel="stylesheet" type="text/css" href="css/ininPsd.css" />
+		<link rel="stylesheet" type="text/css" href="css/loading.css" />
 
 		<script type="text/javascript" src="js/common.js"></script>
 		<script type="text/javascript" src="js/websocket.js"></script>

+ 2 - 1
addin/res/ManagerDesktop/js/errPage.js

@@ -15,8 +15,8 @@ window.onload=function(){
     ModalStyle(tips, 'pathN')
 
   }
-
   showErrTips();
+
 }
 
 
@@ -94,6 +94,7 @@ function GetRequest() {
 
   //重置密钥
   function resetRSA(){
+    ReadCenterConfig('centerSetting')
     $('.iframeDiv').fadeIn();
   }
 

+ 5 - 5
addin/res/ManagerDesktop/js/initPsd.js

@@ -17,9 +17,7 @@ window.onload=function(){
 		let tips = "终端链接失败"
 		ModalStyle(tips, 'pathN')
 	};
-
-	ReadCenterConfig('centerSetting')
-
+  ReadCenterConfig('centerSetting')
 };
 
 /**
@@ -136,6 +134,7 @@ function downLoad(){
  * @return: 
  */
 function ReadCenterConfig(readType){
+	$('#loadContent').fadeIn('slow')
 	let req = new Request(),reqIn ={};
 	if(readType==='access'){
 		req.entityName = 'AccessAuthorization' 
@@ -144,7 +143,7 @@ function ReadCenterConfig(readType){
 		req.entityName = 'CenterSetting' 
 		req.key = 'Server' 
 	}
-	
+	console.log('readType---->', readType)
 	req.reserved1 = 0
 	req.reserved2 = 0
 	req.reserved3 = ''
@@ -153,7 +152,8 @@ function ReadCenterConfig(readType){
 
 	DeviceControlService.ReadCenterConfigStr(req, (ret)=> {
 		logEvent("ReadCenterConfigStr ret: "+JSON.stringify(ret));
-		
+		console.log('readType---->', ret)
+
 		$('#loadContent').fadeOut('slow');
 		if(ret.errorCode ===0){
 			let result = JSON.parse(ret['{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}'] )