From 81bb76e0e9f70b0ab4c19174868058b116b4650e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 28 九月 2024 13:36:07 +0800
Subject: [PATCH] 1.入库检验新增报检数量 2.照片上传效率优化

---
 pages/CangKuManage/pictrue_add.html |   55 +++++++++++++++------------
 pages/CangKuManage/RKJ_check.html   |   24 +++++++++++
 2 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/pages/CangKuManage/RKJ_check.html b/pages/CangKuManage/RKJ_check.html
index 9762511..ba327dc 100644
--- a/pages/CangKuManage/RKJ_check.html
+++ b/pages/CangKuManage/RKJ_check.html
@@ -112,7 +112,8 @@
 				</div>
 
 				<div class="mui-input-row">
-					<label>鍏ュ簱妫�鐢宠鍗�</label>
+					<!-- <label>鍏ュ簱妫�鐢宠鍗�</label> -->
+					<label id="saomiaolb" style="color:#0062CC">鐐瑰嚮鍚姩鎵弿</label>
 					<!-- <input type="text" class="mui-input" style="width:10%;float:left;background-color: #ffffff;"
 						id="selectModeNo"> -->
 					<!-- 	<a class="mui-navigate-right1"> -->
@@ -153,6 +154,11 @@
 				<div class="mui-input-row">
 					<label>鍥惧彿</label>
 					<input id="tuhao" type="text" class="mui-input" disabled="disabled">
+				</div>
+				
+				<div class="mui-input-row">
+					<label>鎶ユ鏁伴噺</label>
+					<input id="BJSL" type="text" class="mui-input" disabled="disabled">
 				</div>
 				<div>
 					<!-- 鍋囪杩欐槸浣犵殑鎸夐挳锛岀偣鍑诲悗浼氳Е鍙慉JAX璇锋眰 -->
@@ -259,6 +265,21 @@
 				//doAppearance()
 
 			})
+			
+			document.getElementById('saomiaolb').addEventListener('tap', function() {
+				console.log(12);
+				var url = 'getScanCode1.html';
+				mui.openWindow({
+			
+					url: url,
+					extras: {},
+					waiting: {
+						autoShow: true,
+						title: '鍔犺浇涓�'
+					}
+				});
+			
+			}, false)
 
 
 			function getData() {
@@ -504,6 +525,7 @@
 							$("#productName").val(pdata[0].ITEMNAME)
 							$("#ptype").val(pdata[0].ITEMMODEL)
 							$("#tuhao").val(pdata[0].WL008)
+							$("#BJSL").val(pdata[0].SUMBJNUM)
 							//$("#process").val(pdata[0].鐢熶骇宸ュ簭)
 							$("#checkMan").val(user_id)
 
diff --git a/pages/CangKuManage/pictrue_add.html b/pages/CangKuManage/pictrue_add.html
index 7330bdb..266e405 100644
--- a/pages/CangKuManage/pictrue_add.html
+++ b/pages/CangKuManage/pictrue_add.html
@@ -400,29 +400,34 @@
 	  }
 	  
 	  // 娉ㄦ剰鍥剧墖鐨勶紝onload鏄紓姝ョ殑锛屽鏋滆灏佽鎴愬伐鍏峰嚱鏁帮紝闇�瑕佺敤promise鍖呰涓�涓�
-	  async function imgToBase64(url) {
-	  	return new Promise((resolve, reject) => {
-	  		const image = new Image()
-	  		image.src = url
-	  		image.onload = () => {
-	  			const canvas = document.createElement('canvas')
-	  			canvas.width = image.Width // 浣跨敤 naturalWidth 涓轰簡淇濊瘉鍥剧墖鐨勬竻鏅板害
-	  			canvas.height = image.Height
-	  			canvas.style.width = `${canvas.width / window.devicePixelRatio}px`
-	  			canvas.style.height = `${canvas.height / window.devicePixelRatio}px`
-	  			const ctx = canvas.getContext('2d')
-	  			if (!ctx) {
-	  				return null
-	  			}
-	  			ctx.drawImage(image, 0, 0)
-	  			const base64 = canvas.toDataURL(url)
-	  			return resolve(base64)
-	  		}
-	  		image.onerror = (err) => {
-	  			return reject(err);
-	  		}
-	  	})
-	  }
+	 async function imgToBase64(url) {
+	     return new Promise((resolve, reject) => {
+	         const image = new Image();
+	         image.src = url;
+	         image.onload = () => {
+	             const canvas = document.createElement('canvas');
+	             // 璁剧疆鐩爣瀹介珮锛屽亣璁鹃檷浣庡埌鍘熷鐨� 50%
+	             const targetWidth = image.naturalWidth / 2; 
+	             const targetHeight = image.naturalHeight / 2;
+	 
+	             canvas.width = targetWidth;
+	             canvas.height = targetHeight;
+	 
+	             const ctx = canvas.getContext('2d');
+	             if (!ctx) {
+	                 return reject(new Error('Canvas context not found'));
+	             }
+	 
+	             ctx.drawImage(image, 0, 0, targetWidth, targetHeight);
+	             const base64 = canvas.toDataURL('image/jpeg', 0.7); // 璁剧疆璐ㄩ噺涓� 0.7
+	             return resolve(base64);
+	         };
+	         image.onerror = (err) => {
+	             return reject(err);
+	         };
+	     });
+	 }
+
 	   
 	  // 寮曞叆椤圭洰涓殑鍥剧墖
 	  // const imgUrl = require('xxx.png');
@@ -453,7 +458,9 @@
 								console.log(files[i].path.toString())
 							//	console.log(filesbase64[0].toString())
 						//filesbase64[i]=getBase64Image(files[i].path.toString());
-		
+						console.log("鍥剧焊鍐呭:");
+						console.log(filesbase64[i]);
+						
 						
 						
 					}

--
Gitblit v1.9.3