Z991239-5462 #comment update startup page

Module/mod_chromium/CModTools.cpp

@@ -816,7 +816,7 @@ namespace Chromium {
 		 else if (reason._to_integral() == ERR_PAGE_REASON::startup)
 		{
 			auto url = std::string(R"(file:///)") + getErrUrl(reason).second;
-			auto strCmdline = generateCommonPage(url, (+ERR_PAGE_REASON::startup)._to_string(), "800*600", "", (int)HWND_NOTOPMOST);
+			auto strCmdline = generateCommonPage(url, (+ERR_PAGE_REASON::startup)._to_string(), "900*600", "", (int)HWND_NOTOPMOST);
 			auto openCefRet = openCef(strCmdline, false);
 			if (Error_Succeed == openCefRet.first)
 				return std::make_pair(Error_Succeed, openCefRet.second);
@@ -827,7 +827,7 @@ namespace Chromium {
 		 else if (reason._to_integral() == ERR_PAGE_REASON::performance_monitor)
 		{
 			auto url = std::string(R"(file:///)") + getErrUrl(reason).second;
-			auto strCmdline = generateCommonPage(url, (+ERR_PAGE_REASON::performance_monitor)._to_string(), "800*600", "", (int)HWND_NOTOPMOST);
+			auto strCmdline = generateCommonPage(url, (+ERR_PAGE_REASON::performance_monitor)._to_string(), "900*600", "", (int)HWND_NOTOPMOST);
 			auto openCefRet = openCef(strCmdline, false);
 			if (Error_Succeed == openCefRet.first)
 				return std::make_pair(Error_Succeed, openCefRet.second);

addin/res/ManagerDesktop/js/entityService.js

@@ -711,13 +711,15 @@ var GUIConsoleService={
     _methodID : {
         OpenLogSender: 0,
         CloseLogSender: 1,
-        GetBasicInformation: 9
+        GetBasicInformation: 9,
+        VTMSystemControl: 6
     },
             
     _methodSignature :{
         OpenLogSender: -744778557,
         CloseLogSender: -1838250527,
-        GetBasicInformation: -1553978632
+        GetBasicInformation: -1553978632,
+        VTMSystemControl: -1084584417
     },
     _eventType: {
         LogInfo:  1,
@@ -764,6 +766,17 @@ var GUIConsoleService={
             callback(jsondata);
         });
     },
+    VTMSystemControl:function(req,callback){
+        req.entity = this._serviceBase.entityName;
+		req.class = this._serviceBase.className;
+		req.methodID = this._methodID.VTMSystemControl;
+		req.signature = this._methodSignature.VTMSystemControl;
+        console.log('VTMSystemControl 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;
@@ -774,7 +787,6 @@ var GUIConsoleService={
             callback(jsondata);
         });
     },
-    
     dispatchEvent:function(msg) {
         var recvEvt = JSON.parse(msg);
         var { eventID, signatureID } = recvEvt;

addin/res/ManagerDesktop/startPage.html

@@ -48,7 +48,7 @@
 				background: #ff9d58;
 			}
 			.entity_list .error{
-				color: #f4616c;
+				color: #fc0212;
 			}
 			.entity_list .error:last-child{
 				color: #333;
@@ -97,9 +97,9 @@
 		<div class="footer">
 			<button onclick="CloseLogSender()">退出</button>
 			<ul>
-				<li id="versionNo">V7.5.1.1</li>
-				<li id="terminalNo">7555980183</li>
-				<li id="env">-TESTver</li>
+				<li id="versionNo"></li>
+				<!-- <li id="terminalNo"></li> -->
+				<li id="env"></li>
 			</ul>
 		</div>
 	</body>
@@ -129,8 +129,8 @@
 				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('entityNum').innerHTML = '「'+data.terminalNo+'」正在启动（'+data.Idle_entityNum+'/'+data.total_entityNum+'）'
+					// document.getElementById('terminalNo').innerHTML = data.terminalNo
 					document.getElementById('versionNo').innerHTML = 'V'+data.versionNo
 					document.getElementById('env').innerHTML = data.machineType+'-'+data.Env+'ver'
 					
@@ -156,9 +156,23 @@
 			req.reserved1 = 0;
 			req.reserved2 = 0;
 			req.reserved3 = '';
+			console.log('CloseLogSender---req',req)
 			GUIConsoleService.CloseLogSender(req,function(ret){
 				console.log('CloseLogSender---',ret)
 			})
+			VTMSystemControl('ExitApp')
+		}
+
+		// 退出-退出整个应用
+		function VTMSystemControl(rebootFun){
+			let req = new Request()
+			req.rebootFunction = rebootFun;
+			req.reserved2 = 0;
+			req.reserved3 = '';
+			console.log('VTMSystemControl---req',req)
+			GUIConsoleService.VTMSystemControl(req,function(ret){
+				console.log('VTMSystemControl---',ret)
+			})
 		}
 
 		let eventID = "showStatus";