Z991239-5462 #comment fea: add start page

addin/res/ManagerDesktop/js/entityCheck.js

@@ -223,59 +223,12 @@ function getBizLinkDetect(url,urlTitle,idx){
 }
 // 网卡连接-删除后，检测按钮异常，临时方案
 function getNetCardLink(){
+  retest[1] = 'Y'
+  set_retest(retest,test)
   testResult[1] = 'Y'
   set_testResult(testResult,goBusiHome)
 }
-// // 网卡连接
-// function getNetCardLink(){
-//   let date = +new Date
-//   let dateTime = getFamtterTimer(date)
-
-//   let req = new Request()
-
-// 	let timeoutFn= setTimeout(function(){
-// 		// '请求超时'
-//     $('.netCardLink').fadeIn();
-//     let elem = document.querySelector('.netCardLink .icon-type');
-// 		elem&&elem.classList.add('icon-err')
-//     $('.netCardLink p').html('「'+dateTime+'」网卡连接失败')
-//     retest[1] = 'Y'
-//     set_retest(retest,test)
-//     testResult[1] = 'N'
-//     set_testResult(testResult,goBusiHome)
-// 	},60000)
-
-// 	AccessAuthService.GetNetMsg(req, function(res) {
-// 		logEvent("GetNetMsg ret: "+JSON.stringify(res));
-// 		if(res){
-// 			clearTimeout(timeoutFn);
-//       retest[1] = 'Y'
-//       set_retest(retest,test)
-
-//       $('.netCardLink').fadeIn();
-//       let elem = document.querySelector('.netCardLink .icon-type');
-//       if(res.errorCode==0)
-//       { 
-//         if(res.netStatus==1){
-//           elem&&elem.classList.add('icon-suc')
-//           $('.netCardLink p').html('「'+dateTime+'」网卡连接成功')
-//           testResult[1] = 'Y'
-//           set_testResult(testResult,goBusiHome)
-//         }else{
-//           elem&&elem.classList.add('icon-err')
-//           $('.netCardLink p').html('「'+dateTime+'」网卡连接失败')
-//           testResult[1] = 'N'
-//           set_testResult(testResult,goBusiHome)
-//         }
-//       }else{
-//         elem&&elem.classList.add('icon-err')
-//         $('.netCardLink p').html('「'+dateTime+'」网卡连接失败')
-//         testResult[1] = 'N'
-//         set_testResult(testResult,goBusiHome)
-//       }
-// 		}
-// 	})
-// }
+
 
 function retestFn(){
   IsRetest = true

addin/res/ManagerDesktop/js/entityService.js

@@ -701,4 +701,90 @@ var BroadCastService={
     SendBroadCast:function(req){
         WebSocketBase.broadCast(req);
     }
-}
+}
+
+var GUIConsoleService={
+    _serviceBase:{
+        entityName : 'GUIConsole',
+        className : 'GUIConsoleService'
+    },
+    _methodID : {
+        OpenLogSender: 0,
+        CloseLogSender: 1,
+        GetBasicInformation: 9
+    },
+            
+    _methodSignature :{
+        OpenLogSender: -744778557,
+        CloseLogSender: -1838250527,
+        GetBasicInformation: -1553978632
+    },
+    _eventType: {
+        LogInfo:  1,
+    },
+    _eventSignature : {
+        LogInfo:  -174026948,
+    },
+    init:function(){
+        //start session
+        var sessionMsg = new Session();
+        sessionMsg.entity = this._serviceBase.entityName;
+        sessionMsg.class = this._serviceBase.className;
+        WebSocketBase.startSession(sessionMsg, () => {
+            logEvent("ResourceWatcherService startSession callback");
+        });
+
+        var registerMsg = new Register();
+        registerMsg.entity = this._serviceBase.entityName;
+        registerMsg.class = this._serviceBase.className;
+        WebSocketBase.registerEvent(registerMsg, (data) => {
+            logEvent("ResourceWatcherService registerEvent ret:"+JSON.stringify(data));
+            this.dispatchEvent(data);
+        });
+    },
+
+    OpenLogSender:function(req,callback){
+        req.entity = this._serviceBase.entityName;
+		req.class = this._serviceBase.className;
+		req.methodID = this._methodID.OpenLogSender;
+		req.signature = this._methodSignature.OpenLogSender;
+		WebSocketBase.sendMsg(req, (data) =>  {
+            var jsondata = JSON.parse(data);
+            callback(jsondata);
+        });
+    },
+    CloseLogSender:function(req,callback){
+        req.entity = this._serviceBase.entityName;
+		req.class = this._serviceBase.className;
+		req.methodID = this._methodID.CloseLogSender;
+		req.signature = this._methodSignature.CloseLogSender;
+        console.log('CloseLogSender callback',req)
+		WebSocketBase.sendMsg(req, function(data) {
+            var jsondata = JSON.parse(data);
+            callback(jsondata);
+        });
+    },
+    GetBasicInformation:function(req,callback){
+        req.entity = this._serviceBase.entityName;
+		req.class = this._serviceBase.className;
+		req.methodID = this._methodID.GetBasicInformation;
+        req.signature = this._methodSignature.GetBasicInformation;
+        console.log('GetBasicInformation callback',req)
+
+		WebSocketBase.sendMsg(req, function(data) {
+            var jsondata = JSON.parse(data);
+            callback(jsondata);
+        });
+    },
+    
+    dispatchEvent:function(msg) {
+        var recvEvt = JSON.parse(msg);
+        var { eventID, signatureID } = recvEvt;
+        // var _recvEvt = recvEvt;
+        // var eventID = _recvEvt.eventID;
+        // var signatureID = _recvEvt.signatureID
+        if(eventID == this._eventType.LogInfo && signatureID == this._eventSignature.LogInfo) {
+            EventEmitter.dispatch('LogInfo', recvEvt);
+        }
+    }
+};

addin/res/ManagerDesktop/startPage.html

@@ -0,0 +1,155 @@
+<!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/loading.css" />
+		<link rel="stylesheet" type="text/css" href="css/non-ie-style.css" /> 
+		<link rel="stylesheet" type="text/css" href="css/loading.css" />
+
+		<style>
+			.start_page .logo{
+				height: 15px;
+				margin: 12px 30px;
+				padding: 13px 0px;
+			}
+			h3{
+				font-family: PingFangSC-Semibold;
+				font-size: 12px;
+				color: #333333;
+				letter-spacing: 0;
+				font-weight: 600;
+				text-align: center;
+				margin-bottom: 18px;
+			}
+			.entity_list{
+				padding: 15px 30px;
+				height: 120px;
+				overflow: auto;
+			}
+			.entity_list li{
+				font-family: HYQiHei-EES;
+				font-size: 8px;
+				color: #555555;
+				font-weight: 400;
+				padding: 2px 0px;
+				
+			}
+			.entity_list li:last-child{
+				background: #D8D8D8;
+			}
+			.start_page .footer{
+				display: flex;
+				justify-content: space-between;
+				padding: 0px 30px;
+			}
+			.start_page .footer button{
+				font-family: HYQiHei-FES;
+				font-size: 10px;
+				color: #4D7BFE;
+				letter-spacing: 0;
+				text-align: center;
+				font-weight: 500;
+			}
+			.start_page .footer ul li{
+				font-family: HYQiHei-EES;
+				font-size: 8px;
+				color: #555555;
+				text-align: right;
+				font-weight: 400;
+			}
+			
+			@media screen and (max-width:1300px) {
+				.start_page{
+					
+				}
+			}
+		</style>
+	</head>
+	<body class="start_page">
+		<div class="logo">
+			<img height="100%" src="./images/logo_cmb.png" />
+		</div>
+		<h3 id="entityNum">正在启动（2/3）</h3>
+		<ul class="entity_list" id="logList">
+			<!-- <li>[-06-20 21:30:37] GUIConnsole 实体启动成功</li>-->
+		</ul>
+	
+		<div class="footer">
+			<button onclick="CloseLogSender()">退出</button>
+			<ul>
+				<li id="versionNo">V7.5.1.1</li>
+				<li id="terminalNo">7555980183</li>
+				<li>-TESTver</li>
+			</ul>
+		</div>
+	</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>
+		GUIConsoleService.init()
+		GetBasicInformation()
+		// 轮询查基础信息，日志启动数量/总数
+		let timer= setInterval(() => {
+			GetBasicInformation()
+		}, 5000);
+		function GetBasicInformation(){
+			let req = new Request()
+			req.reserved1 = 0;
+			req.reserved2 = 0;
+			req.reserved3 = '';
+			GUIConsoleService.GetBasicInformation(req,function(ret){
+				console.log('GetBasicInformation---',ret)
+				if(ret.errorCode===0){
+					let data = JSON.parse(ret['{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}'])
+					console.log('GetBasicInformation---data',data)
+					document.getElementById('entityNum').innerHTML = '正在启动（'+data.Idle_entityNum+'/'+data.total_entityNum+'）'
+					document.getElementById('terminalNo').innerHTML = data.terminalNo
+					document.getElementById('versionNo').innerHTML = 'V'+data.versionNo
+				}
+			})
+		}
+
+		OpenLogSender()
+		function OpenLogSender(){
+			let req = new Request()
+			req.LogType = 'Event';
+			req.reserved2 = 0;
+			req.reserved3 = '';
+			GUIConsoleService.OpenLogSender(req,function(ret){
+				console.log('OpenLogSender---',ret)
+			})
+		}
+
+		//退出页面，关闭日志订阅；清除定时器
+		function CloseLogSender(){
+			clearInterval(timer) 
+			let req = new Request()
+			req.reserved1 = 0;
+			req.reserved2 = 0;
+			req.reserved3 = '';
+			GUIConsoleService.CloseLogSender(req,function(ret){
+				console.log('CloseLogSender---',ret)
+			})
+		}
+
+		let eventID = "showStatus";
+		let thread = ''
+		EventEmitter.subscribe('LogInfo', eventID, (evt)=> {
+			console.log("LogInfo data:"+ evt['{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}']);
+			let result = JSON.parse(evt['{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}'])
+			thread+='<li>'+result.timeStr+' '+result.entityName+'  '+result.message+'</li>'
+			logList.innerHTML = thread
+		});
+        
+	</script>
+</html>