瀏覽代碼

#IQRV #comment: 错误页调用健康获取集中配置失败问题修复

陈纪林80310970 5 月之前
父節點
當前提交
52d09ad449

+ 7 - 7
addin/res/ManagerDesktop/css/errType.css

@@ -382,29 +382,29 @@ nav ul li::before{
 	margin-right: 5px;
 	content: '';
 }
-nav ul li:nth-child(1)::before{
+/* nav ul li:nth-child(1)::before{
 	background: url('../images/config.png');
 	background-size: cover;
-}
+} */
 
-nav ul li:nth-child(2)::before{
+nav ul li:nth-child(1)::before{
 	background: url('../images/reset.png');
 	background-size: cover;
 }
 
-nav ul li:nth-child(3)::before{
+nav ul li:nth-child(2)::before{
 	background: url('../images/restart_a.png');
 	background-size: cover;
 }
-nav ul li:nth-child(4)::before{
+nav ul li:nth-child(3)::before{
 	background: url('../images/restart_c.png');
 	background-size: cover;
 }
-nav ul li:nth-child(5)::before{
+nav ul li:nth-child(4)::before{
 	background: url('../images/off.png');
 	background-size: cover;
 }
-nav ul li:nth-child(6)::before{
+nav ul li:nth-child(5)::before{
 	background: url('../images/min.png');
 	background-size: cover;
 }

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

@@ -40,7 +40,6 @@
 				<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>
@@ -160,106 +159,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 - 1
addin/res/ManagerDesktop/js/getTerminalInfo.js

@@ -131,7 +131,7 @@ function hardwareConfig(module){ //todo
  */
 function getCertainAceessUrl(){
 	let req = new Request()
-	req.reqName = 'HostUrl'
+	req['{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}'] ={entity:'AccessAuthorization',key:'HostUrl'}
 	let timeoutFn= setTimeout(function(){
 		let tips = 'ReadCenterConfigStr 请求超时'
 		ModalPrompt(tips, 'pathN')

+ 2 - 9
addin/res/ManagerDesktop/js/navOprator.js

@@ -88,11 +88,7 @@ function downLoadv3(value){
 			}
 		})
 	}else{
-		$('#ManuallyDownloadError').html("");
-		$('#ManuallyDownloadError').hide();
-		let req = new Request(),reqIn ={};
-		let data = document.getElementsByTagName('input');
-		reqIn.reqCenterConfigUrl = data['centerConfigUrl'].value;
+		let req = new Request(),reqIn ={}
 		req = Object.assign({},req,reqIn)
 		$('#loading_mask').fadeIn('slow');
 		let timeoutFn= setTimeout(function(){
@@ -251,12 +247,9 @@ function stopAnimation(){
 
 // 退出
 function exit(){
-	document.getElementsByTagName('input')['centerConfigUrl'].value="";
-	$('#ManuallyDownloadError').html("");
-	$('#ManuallyDownloadError').hide();
 	$('#btn-downLoad').attr('disabled','disabled');
 	// 进入的方式,决定退出的方式
-	if(window.location.href.indexOf('entityCheck')>-1||window.location.href.indexOf('serverNoAccess')>-1||window.location.href.indexOf('audioErr')>-1){
+	if(window.location.href.indexOf('entityCheck')>-1||window.location.href.indexOf('serverNoAccess')>-1||window.location.href.indexOf('audioErr')>-1||window.location.href.indexOf('homePageErr')>-1){
 		$('#scanIdentity').fadeOut(); //二维码关闭
 		$('#RSAReseting').fadeOut(); //重置密钥中···关闭
 		$('#ManuallyDownload').fadeOut();

+ 1 - 102
addin/res/ManagerDesktop/serverNoAccess.html

@@ -52,7 +52,6 @@
 				<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>
@@ -156,107 +155,7 @@
 			</div>
 		</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>