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

#IQRV #comment: 集中配置用户桌面功能下线

陈纪林80310970 5 сар өмнө
parent
commit
3baa5a4203

+ 0 - 100
addin/res/ManagerDesktop/audioErr.html

@@ -142,106 +142,6 @@
 		</div>
 		<!-- 退出提示框 -->
 
-		<!-- 下载集中配置 Start -->
-		<div class="toast_box" id="ManuallyDownload">
-			<div class="modal_warpper">
-				<div class="box_wrapper" style="margin-top: 50px;">
-					<div class="modal_title">手动下载</div>
-					<div class="input_wrapper">
-						<input name="centerConfigUrl" placeholder="请输入集中配置下载地址" class="inputURL" oninput="changeInput(this)"/>
-					</div>
-					<div id="ManuallyDownloadError" class="input_error">集中配置下载失败</div>
-				</div>
-				<div class="btn_wrapper">
-					<div class="btn_cancel"  onclick="exit()">返回</div>
-					<button class="btn_confirm" onclick="downLoadv3('manual')" disabled="true" id="btn-downLoad">下载</button>
-				</div>
-			</div>
-		</div>
-
-		<div class="toast_box" id="toastErrorBox">
-			<div class="toast_wrapper">
-				<div class="box_wrapper">
-					<img src="./images/warningCircle.png" class="wran_icon"/>
-					<p id="toastErrTips">下载集中配置成功</p>
-				</div>
-			</div>
-		</div>
-
-		<div class="toast_box" id="modalErrorBox">
-			<div class="modal_warpper">
-				<div class="box_wrapper" style="margin-top: 50px;">
-					<div class="modal_title">下载集中配置</div>
-					<div id="modalErrTips">目标地址异常,请联系总行信息技术部处理,是否进行手动下载?</div>
-				</div>
-				<div class="btn_wrapper">
-					<div class="btn_cancel" onclick="closeModal('toast')">返回</div>
-					<div class="btn_confirm" onclick="showManuallyDownloadModal()">确认</div>
-				</div>
-			</div>
-		</div>
-
-		<div class="toast_box" id="boxRestart">
-			<div class="modal_warpper">
-				<div class="box_wrapper" style="margin-top: 20px;">
-					<div class="modal_title">重启应用</div>
-					<div class="restart_span">
-						集中配置已完成下载,重启后生效
-					</div>
-				</div>
-				<div class="rows_restart">
-					<span>
-						<span id="restart-time">29</span>
-						<span>秒后自动重启</span>
-					</span>
-					<button class="btn_confirm" onclick="restart()">重启应用</button>
-				</div>
-			</div>
-		</div>
-
-		<div id='loading_mask'>
-			<div class='loading_wrapper'>
-				<!-- loading 菊花旋转-->
-				<div class='loading_icon_wrapper'>
-					<div class='loading_icon'>
-						<div class="load-line rotate-0">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-30">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-60">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-90">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-120">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-150">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div id="circle-center"></div>
-					</div>
-				</div>
-				<!-- loading 菊花旋转-->
-				<div class='loading_title'>
-					<span>正在下载中</span>
-					<span class="loading_point"></span>
-					<span class="loading_point"></span>
-					<span class="loading_point"></span>
-				</div>
-			</div>
-		</div>
-		<!-- 下载集中配置 End-->
-
 		<!-- loading -->
 		<div id='loadContent'>
 			<div class="back_cover" ></div>

+ 0 - 100
addin/res/ManagerDesktop/entityCheck.html

@@ -160,106 +160,6 @@
 		</div>
 		<!-- 退出提示框 -->
 
-		<!-- 下载集中配置 Start -->
-		<div class="toast_box" id="ManuallyDownload">
-			<div class="modal_warpper">
-				<div class="box_wrapper" style="margin-top: 50px;">
-					<div class="modal_title">手动下载</div>
-					<div class="input_wrapper">
-						<input name="centerConfigUrl" placeholder="请输入集中配置下载地址" class="inputURL" oninput="changeInput(this)"/>
-					</div>
-					<div id="ManuallyDownloadError" class="input_error">集中配置下载失败</div>
-				</div>
-				<div class="btn_wrapper">
-					<div class="btn_cancel"  onclick="exit()">返回</div>
-					<button class="btn_confirm" onclick="downLoadv3('manual')" disabled="true" id="btn-downLoad">下载</button>
-				</div>
-			</div>
-		</div>
-
-		<div class="toast_box" id="toastErrorBox">
-			<div class="toast_wrapper">
-				<div class="box_wrapper">
-					<img src="./images/warningCircle.png" class="wran_icon"/>
-					<p id="toastErrTips">下载集中配置成功</p>
-				</div>
-			</div>
-		</div>
-
-		<div class="toast_box" id="modalErrorBox">
-			<div class="modal_warpper">
-				<div class="box_wrapper" style="margin-top: 50px;">
-					<div class="modal_title">下载集中配置</div>
-					<div id="modalErrTips">目标地址异常,请联系总行信息技术部处理,是否进行手动下载?</div>
-				</div>
-				<div class="btn_wrapper">
-					<div class="btn_cancel" onclick="closeModal('toast')">返回</div>
-					<div class="btn_confirm" onclick="showManuallyDownloadModal()">确认</div>
-				</div>
-			</div>
-		</div>
-
-		<div class="toast_box" id="boxRestart">
-			<div class="modal_warpper">
-				<div class="box_wrapper" style="margin-top: 20px;">
-					<div class="modal_title">重启应用</div>
-					<div class="restart_span">
-						集中配置已完成下载,重启后生效
-					</div>
-				</div>
-				<div class="rows_restart">
-					<span>
-						<span id="restart-time">29</span>
-						<span>秒后自动重启</span>
-					</span>
-					<button class="btn_confirm" onclick="restart()">重启应用</button>
-				</div>
-			</div>
-		</div>
-
-		<div id='loading_mask'>
-			<div class='loading_wrapper'>
-				<!-- loading 菊花旋转-->
-				<div class='loading_icon_wrapper'>
-					<div class='loading_icon'>
-						<div class="load-line rotate-0">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-30">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-60">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-90">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-120">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div class="load-line rotate-150">
-							<span class="left"></span>
-							<span class="right"></span>
-						</div>
-						<div id="circle-center"></div>
-					</div>
-				</div>
-				<!-- loading 菊花旋转-->
-				<div class='loading_title'>
-					<span>正在下载中</span>
-					<span class="loading_point"></span>
-					<span class="loading_point"></span>
-					<span class="loading_point"></span>
-				</div>
-			</div>
-		</div>
-		<!-- 下载集中配置 End-->
-
 		<!-- loading -->
 		<div id='loadContent'>
 			<div class="back_cover" ></div>

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

@@ -14,6 +14,7 @@
 				<img width="100%" src="./images/logo_cmb.png" />
 			</div>
 			<ul id="navBtns">
+				<li class="fz_24" id="downLoadConfig" onclick="downLoadv3('auto')">	下载集中配置 </li>
 				<li class="fz_24" id="resetPsd" onclick="resetRSA()">	重置密钥 </li>
 				<li class="fz_24" onclick="RebootShell()">	重启应用 </li>
 				<li class="fz_24" onclick="RebootComputer()">	重启计算机 </li>

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

@@ -40,6 +40,7 @@
 				<img width="100%" src="./images/logo_cmb.png" />
 			</div>
 			<ul id="navBtns">
+				<li class="fz_20" id="downLoadConfig" onclick="downLoadv3('auto')">	下载集中配置 </li>
 				<li class="fz_20" id="resetPsd" onclick="resetRSA()">	重置密钥 </li>
 				<li class="fz_20" onclick="RebootShell()">	重启应用 </li>
 				<li class="fz_20" onclick="RebootComputer()">	重启计算机 </li>

+ 5 - 39
addin/res/ManagerDesktop/js/getTerminalInfo.js

@@ -34,7 +34,6 @@ window.onload=function(){
 	}
 
   HealthManagerService.init();
-  CenterSettingService.init();
 	ResourceWatcherService.init();
   getHardwareInfo()
   // getAccessUrl()
@@ -125,32 +124,6 @@ function hardwareConfig(module){ //todo
 }
 
 
-/**
- * @description: 查询初始化地址
- * @param {} 
- * @return: HostUrl
- */
-let HostUrl = ''
-function getAccessUrl(){
-	let req = new Request()
-	let timeoutFn= setTimeout(function(){
-		let tips = 'GetAccessUrl 请求超时'
-		ModalPrompt(tips, 'pathN')
-	},60000)
-		
-	CenterSettingService.GetAccessUrl(req, function(ret) {
-		logEvent("GetAccessUrl ret: "+JSON.stringify(ret));
-		console.log("GetAccessUrl ret: "+JSON.stringify(ret));
-		if(ret){
-			clearTimeout(timeoutFn);
-			HostUrl = ret.HostUrl
-			// $('.urlAccessAddr').html(ret.HostUrl)
-		}
-		
-	})
-}
-
-
 /**
  * @description: 查询准入地址
  * @param {reqName:'HostUrl'} 
@@ -160,26 +133,22 @@ function getCertainAceessUrl(){
 	let req = new Request()
 	req.reqName = 'HostUrl'
 	let timeoutFn= setTimeout(function(){
-		let tips = 'GetCertainAceessUrl 请求超时'
+		let tips = 'ReadCenterConfigStr 请求超时'
 		ModalPrompt(tips, 'pathN')
 	},60000)
 		
-	CenterSettingService.GetCertainAceessUrl(req, function(ret) {
-		logEvent("GetCertainAceessUrl ret: "+JSON.stringify(ret));
-		console.log("GetCertainAceessUrl ret: "+JSON.stringify(ret));
+	HealthManagerService.ReadCenterConfigStr(req, function(ret) {
+		logEvent("ReadCenterConfigStr ret: "+JSON.stringify(ret));
+		console.log("ReadCenterConfigStr ret: "+JSON.stringify(ret));
 		if(ret){
 			clearTimeout(timeoutFn);
-			HostUrl = ret.CertainAceessUrl
-			$('.urlAccessAddr').html(ret.CertainAceessUrl) 
+			$('.urlAccessAddr').html(ret.value) 
 		}
-		
 	})
 }
 
 
 
-
-
 /**
  * @description: modal显示设置
  * @param {tips: 提示信息,pathType:pathY|pathN 提示类型,origion:选填 来源 InitializeNew| } 
@@ -215,7 +184,6 @@ function closeModal(type){
 
 			$('#scanIdentity').fadeOut(); //二维码关闭
 			$('#RSAReseting').fadeOut(); //重置密钥中···关闭
-			$('#ManuallyDownload').fadeOut();
 
 			setTimeout(()=>{ //延时显示,避免内容污染
 				$('#entityCheckout').fadeIn('slow')
@@ -223,8 +191,6 @@ function closeModal(type){
 				$('#navBtns').fadeIn('slow')
 			},500)
 		}
-	}else if(type=='toast'){
-		$('#modalErrorBox').fadeOut('slow')
 	} else{
 		$('#modalConfirm').fadeOut('slow')
 	}

+ 2 - 286
addin/res/ManagerDesktop/js/initPsd.js

@@ -9,9 +9,7 @@ window.onload=function(){
 		}
 	}
 	
-	CenterSettingService.init();
 	AccessAuthService.init();
-	HealthManagerService.init();
 
 	WebSocketBase.socket.onerror = function () {
 		logEvent("HealthManagerService startSession callback");
@@ -28,30 +26,11 @@ window.onload=function(){
  * @return: 
  */
 function ModalStyle(tips,pathType){
-	$('#modalBox').fadeIn('slow')
 	$('#loadContent').fadeOut('slow')
-
 	$('#errTips').html(tips);
 	let path = (pathType == 'pathY') ? './images/success.png' :  './images/fail.png'
-	$('#modalBox img').attr('src', path)
-}
-
-function showToast(title){
-	$('#toastErrTips').html(title);
-	$('#loading_mask').hide();
-	$('#toastErrorBox').fadeIn('slow')
-	setTimeout(()=>{
-		$('#toastErrorBox').fadeOut('slow')
-	},2000)
 }
 
-function changeInput(obj){
-	if(obj.value!=''){
-		$('#btn-downLoad').removeAttr('disabled');
-	}else{
-		$('#btn-downLoad').attr('disabled','disabled');
-	}
-}
 
 /**
  * @description: 输入不为null校验
@@ -73,30 +52,6 @@ function RegExpNull(vals){
 	return IsNull;
 }
 
-/**
- * @description: IP地址校验
- * @param {type} 
- * @return: 
- */
-function onblurAddr(IPType){
-	let RegxIP = new RegExp("^((25[0-5]|2[0-4]\\d|[1]{1}\\d{1}\\d{1}|[1-9]{1}\\d{1}|\\d{1})($|(?!\\.$)\\.)){4}$");
-	let tips,IpAddr
-	switch(IPType)
-	{
-		case 'config': 
-			IpAddr = $(".config input[name='configAddr']").val(); 
-			tips = '集中配置地址格式不正确'
-			break;
-		case 'access': 
-			IpAddr = $(".setting input[name='accessAddr']").val();
-			tips = '准入服务地址格式不正确'
-			break;
-	}
-	if(IpAddr=='')return
-	if( !RegxIP.test(IpAddr) ){
-		ModalStyle(tips,'pathN')
-	}
-}
 
 let timeout=60000;
 /**
@@ -129,207 +84,6 @@ function restart(){
 	DeviceService.RebootShell();
 }
 
-function downLoad(){
-	let req = new Request(),reqIn ={};
-	// req.downloadv2 = 1;
-
-	let IsNull = RegExpNull(reqIn)
-	if(IsNull) return false
-	$('#loadContent').fadeIn('slow')
-	// timeoutFn
-	let timeoutFn= setTimeout(function(){
-		$('#loadContent').fadeOut('slow')
-		let tips = '请求超时'
-		showToast(tips);
-	},timeout)
-
-	CenterSettingService.Downloadv2(req, function(ret) {
-		logEvent("Download ret: "+JSON.stringify(ret));
-		console.log("Download ret: "+JSON.stringify(ret));
-		
-		if(ret){
-			clearTimeout(timeoutFn);
-			$('#loadContent').fadeOut('slow')
-			if(ret.downloadStat==2){
-				let tips = ret.strErrMsg
-				ModalStyle(tips,'pathN');
-				return false
-			}
-			let tips = '下载集中配置成功'
-				ModalStyle(tips,'pathY')
-				document.getElementById("urlConfigAddr").innerHTML = ret.CenterConfigUrl;
-		}
-		
-	})
-}
-
-function downLoadv3(value){
-	if(value=='auto'){
-		let req = new Request();
-		$('#loading_mask').fadeIn('slow');
-		let timeoutFn= setTimeout(function(){
-			$('#loading_mask').fadeOut('slow');
-			let tips = '请求超时'
-			showToast(tips);
-		},timeout)
-
-		CenterSettingService.Downloadv3(req, function(ret) {
-			logEvent("Download ret: "+JSON.stringify(ret));
-			console.log("Download ret: "+JSON.stringify(ret));
-			
-			if(ret){
-				clearInterval(timeChange);
-				clearTimeout(timeoutFn);
-				$('#loading_mask').fadeOut('slow');
-				if(ret.downloadStat==1){
-					// document.getElementById("configUrl").innerHTML = ret.retCenterConfigUrl;
-					$('#boxRestart').fadeIn();
-					timeChange = setInterval(clock, 1000);
-				}else if(ret.downloadStat==3 || ret.downloadStat==2){
-					let tips = ret.strErrMsg?ret.strErrMsg:'集中配置下载失败';
-					showToast(tips);
-					return false
-				}else {
-					let msg = ret.strErrMsg?ret.strErrMsg:'集中配置下载失败';
-					let tips = msg + ',请联系总行信息部处理,是否进行手动下载?';
-					$('#modalErrorBox').fadeIn('slow');
-					$('#modalErrTips').html(tips);
-					return false
-				}
-			}
-		})
-	}else{
-		$('#ManuallyDownloadError').html("");
-		$('#ManuallyDownloadError').hide();
-		let req = new Request(),reqIn ={};
-		let data = document.getElementsByTagName('input');
-		reqIn.reqCenterConfigUrl = data['centerConfigUrl'].value;
-		req = Object.assign({},req,reqIn)
-		$('#loading_mask').fadeIn('slow');
-		let timeoutFn= setTimeout(function(){
-			$('#loading_mask').fadeOut('slow');
-			let tips = '请求超时'
-			ModalStyle(tips,'pathN')
-		},timeout)
-
-		CenterSettingService.Downloadv3(req, function(ret) {
-			logEvent("Download ret: "+JSON.stringify(ret));
-			console.log("Download ret: "+JSON.stringify(ret));
-			if(ret){
-				clearInterval(timeChange);
-				clearTimeout(timeoutFn);
-				$('#loading_mask').fadeOut('slow');
-				if(ret.downloadStat==1){
-					exit();
-					// document.getElementById("configUrl").innerHTML = ret.retCenterConfigUrl;
-					$('#boxRestart').fadeIn();
-					timeChange = setInterval(clock, 1000);
-				}else if(ret.downloadStat==3){
-					exit();
-					let tips = ret.strErrMsg?ret.strErrMsg:'集中配置是最新版本';
-					showToast(tips);
-					return false
-				}else {
-					let msg = ret.strErrMsg?ret.strErrMsg:'集中配置下载失败';
-					$('#ManuallyDownloadError').html(msg);
-					$('#ManuallyDownloadError').show();
-					return false
-				}
-			}
-		})
-	}
-	
-}
-
-
-let HostUrl = "" //准入服务地址
-function getAccessUrl(){
-	let req = new Request()
-	let timeoutFn= setTimeout(function(){
-		$('#loadContent').fadeOut('slow');
-		let tips = '请求超时'
-		showToast(tips);
-	},5000)
-		
-	CenterSettingService.GetAccessUrl(req, function(ret) {
-		logEvent("GetAccessUrl ret: "+JSON.stringify(ret));
-		console.log("GetAccessUrl ret: "+JSON.stringify(ret));
-		if(ret){
-			clearTimeout(timeoutFn);
-			$('#loadContent').fadeOut('slow')
-			
-			// let tips = '获取准入服务地址成功'
-			// ModalStyle(tips,'pathY')
-			HostUrl = ret.HostUrl
-			document.getElementById("urlAccessAddr").innerHTML= ret.HostUrl;
-		}
-		
-	})
-}
-
-/**
- * @description: 读取集中配置文件,注入密钥初始化url,port
- * @param {type} 
- * @return: 
- */
-function ReadCenterConfig(readType,readConfig){
-	$('#loadContent').fadeIn('slow');
-	let timeoutFn= setTimeout(function(){
-		$('#loadContent').fadeOut('slow')
-		let tips = '请求超时'
-		ModalStyle(tips,'pathN')
-		console.log('timeoutFn--ReadCenterConfig-setTimeout222->')
-	},timeout)
-
-	let req = new Request(),reqIn ={};
-	if(readType==='access'){
-		req.entityName = 'AccessAuthorization' 
-		req.key = 'Server' 
-	}else{
-		req.entityName = 'CenterSetting' 
-		req.key = 'Server' 
-	}
-	req.reserved1 = 0
-	req.reserved2 = 0
-	req.reserved3 = ''
-	req.reserved4 = ''
-	req.timeout = 60000
-	logEvent("HealthManagerService->ReadCenterConfigStr");
-	
-	HealthManagerService.ReadCenterConfigStr(req, function(ret) {
-		logEvent("ReadCenterConfigStr ret: "+JSON.stringify(ret));
-		console.log('ReadCenterConfigStr----',ret)
-		if(ret){
-			$('#loadContent').fadeOut('slow');
-			clearTimeout(timeoutFn)
-		}
-
-		if(ret.errorCode ===0){
-			let result = JSON.parse(ret['{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}'] )
-			let addr = result.value.split(' ')[0]
-			let port = result.value.split(' ')[1]
-
-			if(readType==='access'){
-				$('.setting input[name=accessAddr]').val(addr)
-				$('.setting input[name=accessPort]').val(port)
-			}else{
-				$('.config input[name=configAddr]').val(addr)
-				$('.config input[name=configPoint]').val(port)
-			}
-			
-
-		}else{
-			let tips ='读取集中配置失败'+ret.errorCode.toString(16)
-			if(readConfig==='readConfig'){
-				ModalStyle(tips,'pathN')	
-
-			}
-		}
-		
-	})
-}
-
-
 // 扫码登录后接收code
 window.onmessage = (event) => {
   console.log('event----',event)
@@ -351,20 +105,9 @@ window.onmessage = (event) => {
  * @return: 
  */
 function ResetRSA(code){
-		let data = document.getElementsByTagName('input');
-
     let req = new Request(),reqIn={};
-    reqIn.strAuthServer = HostUrl; 
-    // reqIn.nAuthPort = Number( data['accessPort'].value)   todo
-    reqIn.strUserID =  code //data['account'].value 
-		// let agentId = data['account'].value;
-		// if(Number(reqIn.strUserID) ){
-		// 	if (agentId.trim().length == 8) {
-		// 		reqIn.strUserID = "SP" + agentId.trim();
-		// 	} else {
-		// 		reqIn.strUserID = "ST" + agentId.trim();
-		// 	}
-		// }
+    // reqIn.strAuthServer = HostUrl; 
+    reqIn.strUserID =  code 
 		reqIn.strPassword = '88888888' //默认值,后台不做校验
 
 		req.timeout = 60000
@@ -374,14 +117,7 @@ function ResetRSA(code){
 			ModalStyle(tips,'pathN')
 			return;
 		}
-		// if(reqIn.strPassword==''){
-		// 	let tips = '密码不能为空'
-		// 	ModalStyle(tips,'pathN')
-		// 	return;
-		// }
 
-		let IsNull = RegExpNull(reqIn)
-		if(IsNull) return false
 		$('#loadContent').fadeIn('slow')
 		// timeoutFn
 		let timeoutFn= setTimeout(function(){
@@ -421,33 +157,13 @@ function ResetRSA(code){
 		});
 }
 
-function closeModal(value){
-	if(value=='modal'){
-		$('#modalBox').fadeOut('slow')
-	}else{
-		$('#modalErrorBox').fadeOut('slow')
-	}
-}
-
-function showManuallyDownloadModal(){
-	$('#modalErrorBox').fadeOut('slow');
-	$('#ManuallyDownload').fadeIn('slow');
-}
-
 
 function exit(){
-	// document.getElementById("urlConfigAddr").innerHTML ="";
-	// document.getElementById("urlAccessAddr").innerHTML = "";
-	// document.getElementsByTagName('input')['centerConfigUrl'].value="";
-	$('#ManuallyDownloadError').html("");
-	$('#ManuallyDownloadError').hide();
-	$('#btn-downLoad').attr('disabled','disabled');
 	// 进入的方式,决定退出的方式
 	if(window.location.href.indexOf('errPage')>-1){
 		$('.iframeDiv').fadeOut();
 		$('.iframe-box').fadeOut();
 		$('.result-wrap').fadeOut();
-		$('#ManuallyDownload').fadeOut();
 	}else{
 		let req = {};
 		req.messageType = 0;

+ 106 - 0
addin/res/ManagerDesktop/upgradeRestart.html

@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<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/errType.css" />
+		<link rel="stylesheet" type="text/css" href="css/non-ie-style.css" /> 
+		<link rel="stylesheet" type="text/css" href="css/loading.css" />
+
+		<style>
+			.upgrade-restart h3{
+				margin-bottom: 40px;
+			}
+		</style>
+	</head>
+	<body class="errType">
+		<nav>
+			<div class="logo">
+				<img width="100%" src="./images/logo_cmb.png" />
+			</div>
+		</nav>
+		<div class="hareword-info upgrade-restart">
+			<h3 class="fz_44">系统升级中,稍后自动重启应用<dot class="dot">●●●●●●</dot></h3>
+			<!-- <p id="errorInfo">
+				该设备硬件地址信息和后台记录不一致,请联系分行设备管理员扫描下方二维码。
+			</p> -->
+			<div class="result-wrap">
+				<div class="result-item">
+					<label class="fz_28">终端号</label>
+					<span class="fz_28 terminalNo"></span>
+				</div>
+				<div class="result-item">
+					<label class="fz_28">当前时间</label>
+					<span class="fz_28 currDate"></span>
+				</div>
+				<div class="result-item">
+					<label class="fz_28">终端版本</label>
+					<span class="fz_28 termVersion"></span>
+				</div>
+				<div class="result-item">
+					<label class="fz_28">准入地址</label>
+					<span class="fz_28 urlAccessAddr"></span>
+				</div>
+			</div>
+
+			<!-- 二维码授权验证start -->
+			<!-- <div class="scan-verify">
+				<iframe frameborder="no" border="0" allowtransparency="yes" allow="microphone;camera;midi;encrypted-media;"
+				  id="iframeSrc"
+					src="https://one-account-gateway.paasuat.cmbchina.cn/auth-plugin/v2/identity-authentication?clientId=6898ec10629f499187d7b31fbe9823a4&ui=eyJhdXRoVHlwZXMiOlsicXJDb2RlIl0sImhlYWRlciI6dHJ1ZSwicXJDb2RlU2l6ZSI6MTQ1fQ%253D%253D"
+					></iframe>
+				<p>完成扫码授权后</br>请重置密钥</p>
+				<button class="btn-blue" onclick="exit()">重置密钥</button>
+			</div> -->
+			<!-- 二维码授权验证end -->
+		</div>
+
+		<!-- 提示框 -->
+		<div class="modal-box" id="modalBox">
+			<div class="coverBg"></div>
+			<div class="modal" id="modal">
+				<img src="./images/success.png" />
+				<p class="fz_24" id="errTips"></p>
+				<button class="fz_23" onclick="closeModal('modal')">确定</button>
+			</div>
+		</div>
+		<!-- 提示框 -->
+
+		<!-- loading -->
+		<div id='loadContent'>
+			<div class="back_cover" ></div>
+			<div class='loading' id='loading'>
+				<div class='circle circle1'>
+					<span></span>
+					<span></span>
+					<span></span>
+					<span></span>
+				</div>
+				<div class='circle circle2'>
+					<span></span>
+					<span></span>
+					<span></span>
+					<span></span>
+				</div>
+				<div class='circle circle3'>
+					<span></span>
+					<span></span>
+					<span></span>
+					<span></span>
+				</div>
+			</div>
+		</div>
+		<!-- loading -->
+	</body>
+	<script type="text/javascript" src="js/common.js"></script>
+	<script type="text/javascript" src="js/websocket.js"></script>
+	<script type="text/javascript" src="js/webSocketBase.js"></script>
+	<script type="text/javascript" src="js/entityMessage.js"></script>
+	<script type="text/javascript" src="js/eventEmitter.js"></script>
+	<script type="text/javascript" src="js/innerEventEmitter.js"></script>
+	<script type="text/javascript" src="js/errorCodeEnum.js"></script>
+	<script type="text/javascript" src="js/entityService.js"></script>
+	<script type="text/javascript" src="Include/jQuery/js/jquery.min.js" ></script>
+	<script type="text/javascript" src="js/getTerminalInfo.js"></script>
+</html>