选择打印机增加关键字搜索 (#2392)

* 选择打印机增加关键字搜索 * revert more format changes --------- Co-authored-by: ZdDroid <[email protected]> Co-authored-by: SoftFever <[email protected]>
SoftFever · Oct 12, 2023 · a178b96 · a178b96
1 parent 3f9db60
commit a178b96
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 39 deletions.
diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js
@@ -46,15 +46,15 @@ function HandleModelList(pVal) {
 	if (!pVal.hasOwnProperty("model"))
 		return;
 
-	pModel = pVal['model'];
-
+    pModel = pVal['model'];
+	
 	let nTotal = pModel.length;
 	let ModelHtml = {};
 	for (let n = 0; n < nTotal; n++) {
 		let OneModel = pModel[n];
-
+		
 		let strVendor = OneModel['vendor'];
-
+		
 		//Add Vendor Html Node
 		if ($(".OneVendorBlock[vendor='" + strVendor + "']").length == 0) {
 			let sVV = strVendor;
@@ -228,6 +228,11 @@ function FilterModelList(keyword) {
 	TranslatePage();
 }
 
+function SelectPrinterAll( sVendor )
+{
+	$("input[vendor='"+sVendor+"']").prop("checked", true);
+}
+
 
 function SelectPrinterAll(sVendor) {
 	$("input[vendor='" + sVendor + "']").prop("checked", true);

diff --git a/resources/web/guide/24/index.html b/resources/web/guide/24/index.html
@@ -2,31 +2,31 @@
 <html>
 
 <head>
-	<meta charset="utf-8">
-	<meta http-equiv="Cache-Control" content="max-age=7200" />
-	<title>引导_P21</title>
-	<link rel="stylesheet" type="text/css" href="../css/common.css" />
-	<link rel="stylesheet" type="text/css" href="24.css" />
-	<link rel="stylesheet" type="text/css" href="../css/dark.css" />
-	<!-- <script type="text/javascript" src="test.js"></script> -->
-	<script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script>
-	<script type="text/javascript" src="../js/json2.js"></script>
-	<script type="text/javascript" src="../../data/text.js"></script>
-	<script type="text/javascript" src="../js/globalapi.js"></script>
-	<!-- <script type="text/javascript" src="../js/common.js"></script> -->
-	<script type="text/javascript" src="24.js"></script>
+<meta charset="utf-8">
+<meta http-equiv="Cache-Control" content="max-age=7200" />
+<title>引导_P21</title>
+<link rel="stylesheet" type="text/css" href="../css/common.css" />	
+<link rel="stylesheet" type="text/css" href="24.css" />
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />	
+<!-- <script type="text/javascript" src="test.js"></script> -->
+<script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script>
+<script type="text/javascript" src="../js/json2.js"></script>	
+<script type="text/javascript" src="../../data/text.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
+<!-- <script type="text/javascript" src="../js/common.js"></script> -->
+<script type="text/javascript" src="24.js"></script>		
 </head>
 
 <body onLoad="OnInit()">
-	<div id="Title">
-		<div class="trans" tid="t10">Printer Selection</div>
-	</div>
-	<div class="wrap">
-		<div class="search">
-			<input type="text" class="searchTerm" placeholder="Device keyword" oninput="textInput(this)">
-		</div>
+<div id="Title">
+	<div class="trans" tid="t10">Printer Selection</div>
+</div>
+<div class="wrap">
+	<div class="search">
+		<input type="text" class="searchTerm" placeholder="Device keyword" oninput="textInput(this)">
 	</div>
-	<div id="Content" class="ZScrol" s>
+</div>
+<div id="Content" class="ZScrol" s>
 
 		<!--<div class="OneVendorBlock" Vendor="BBL">	
 <div class="BlockBanner">
@@ -93,22 +93,12 @@
 		<div class="NormalBtn trans" tid="t39" id="AcceptBtn" onclick="ConfirmSelect()">Confirm</div>
 		<div class="GrayBtn trans" tid="t38" id="PreBtn" onclick="CancelSelect()">Cancel</div>
 	</div>
-
-	<div id="NoticeMask"></div>
-	<div id="NoticeBody">
-		<div id="NoticeBar" class="trans" tid="t18">error</div>
-		<div id="NoticeContent">
-			<div id="NoticeText" class="trans" tid="t37">At least one printer must be selected.</div>
-			<div id="NoticeBtns">
-				<div class="SmallBtn trans" tid="t36" onClick="ShowNotice(0)">ok</div>
-			</div>
-		</div>
-	</div>
-
-
+</div>	
+
+
 </body>
 <script>
-	let pModel;
+		let pModel;
 	function textInput(obj) {
 		FilterModelList(obj.value);
 	}