Эх сурвалжийг харах

修改静态初始化数据和解决表格展示bug

oyq28 2 сар өмнө
parent
commit
b18daf7e92

+ 6 - 3
api/login.uts

@@ -7,8 +7,11 @@ import {selectTableData, insertTableData} from '@/utils/sqlite'
 
 export function offlineData(data:UTSJSONObject):Promise<UTSJSONObject> {
 	return new Promise((resolve, reject) => {	
-		let result = JSON.parseObject(JSON.stringify(data)) as UTSJSONObject 
-		resolve(result)
+		let result = JSON.parseObject(JSON.stringify(data)) as UTSJSONObject
+		let ret = {} as UTSJSONObject
+		ret['errMsg']= 'ok'
+		ret['data'] = [result]
+		resolve(ret)
 	});	
 }
 
@@ -26,7 +29,7 @@ export function login(username:string, password:string, code:string, uuid:string
     password: "admin123",
     code: "",
     uuid: '1',
-  	token: '123456', 
+  	token: '123456',
 	roles:[] as string[]
   } as UTSJSONObject
   

+ 18 - 3
pages/work/download/DownloadList.uvue

@@ -141,10 +141,15 @@
     workorder: "632-P-01",
     invname: "箱间段",
     productno: "1CFA1040-00#S",
+	graphid: '',
+	ver: '',
     cardno: "LK20230707070012",
     processno: "Pb/XXX-E11",
     updatetime: "2025-06-23",
-    progress: "3/3",
+	createtime : "2025-06-23",
+	totalRecord : 3,
+	statusRecordCount : 3,
+	uploadflag: 1,    
     status: 3
 
   }, {
@@ -152,20 +157,30 @@
     workorder: "712-SY-10-6",
     invname: "级间架",
     productno: "1XA1020-00A",
+	graphid: '',
+	ver: '',
     cardno: "LK20250215003",
     processno: "Pb/XXX-E11",
+	createtime : "2025-06-23",
     updatetime: "2025-08-25",
-    progress: "2/4",
+    totalRecord : 4,
+    statusRecordCount : 2,
+    uploadflag: 1,
     status: 2
   }, {
     pdid: 3,
     workorder: "712-SY-10-6",
     invname: "级间架",
     productno: "1XA1020-00A",
+	graphid: '',
+	ver: '',
     cardno: "LK20250215003",
     processno: "Pb/XXX-E11",
+	createtime : "2025-06-23",
     updatetime: "2025-08-25",
-    progress: "0/4",
+    totalRecord : 4,
+    statusRecordCount : 0,
+    uploadflag: 1,
     status: 1
   }] as Download[];
 

+ 1 - 1
pages/work/record/InfoDetail.uvue

@@ -94,7 +94,7 @@
 	})
 
 	// #ifdef H5
-	download = {
+	download.value = {
 		pdid: 1,
 		workorder: "632-P-01",
 		invname: "箱间段",

+ 23 - 3
pages/work/record/InfoList.uvue

@@ -137,32 +137,50 @@
     pdid: 1,
     workorder: "632-P-01",
     invname: "箱间段",
+	graphid : "",
     productno: "1CFA1040-00#S",
     cardno: "LK20230707070012",
     processno: "Pb/XXX-E11",
+	createtime: "2025-06-23",
     updatetime: "2025-06-23",
-    progress: "3/3",
+	progress : "3/3",
+    totalRecord : 3,
+    statusRecordCount : 3,
+    status4RecordCount : 3,
+    uploadflag: 1,
     status: 3
 
   }, {
     pdid: 2,
     workorder: "712-SY-10-6",
     invname: "级间架",
+	graphid : "",
     productno: "1XA1020-00A",
     cardno: "LK20250215003",
     processno: "Pb/XXX-E11",
+	createtime: "2025-06-23",
     updatetime: "2025-08-25",
-    progress: "2/4",
+	progress : "2/4",
+    totalRecord : 4,
+    statusRecordCount : 2,
+    status4RecordCount : 2,
+    uploadflag: 1,
     status: 2
   }, {
     pdid: 3,
     workorder: "712-SY-10-6",
     invname: "级间架",
+	graphid : "",
     productno: "1XA1020-00A",
     cardno: "LK20250215003",
     processno: "Pb/XXX-E11",
+	createtime: "2025-06-23",
     updatetime: "2025-08-25",
-    progress: "0/4",
+    totalRecord : 4,
+	progress : "0/4",
+    statusRecordCount : 0,
+    status4RecordCount : 0,
+    uploadflag: 1,
     status: 1
   }] as Download[];
 
@@ -301,8 +319,10 @@
   .info-row {
     display: flex;
     flex-direction: row;
+	/* #ifdef H5 */
     font-size: 28rpx;
     color: #33475b;
+	/* #endif */
     align-items: center;
   }
 

+ 4 - 0
pages/work/record/RecordList.uvue

@@ -405,8 +405,10 @@
 	.info-row {
 		display: flex;
 		flex-direction: row;
+		/* #ifdef H5 */
 		font-size: 28rpx;
 		color: #33475b;
+		/* #endif */
 		align-items: center;
 	}
 
@@ -485,7 +487,9 @@
 		flex-direction: row;
 		flex-wrap: nowrap;
 		width: auto;
+		/* #ifdef H5 */
 		min-width: 100%;
+		/* #endif */
 		/* 确保容器宽度至少为屏幕宽度 */
 	}
 

+ 2 - 2
uni_modules/uni-table/components/uni-tr/table-checkbox.vue

@@ -96,13 +96,13 @@
 		.checkbox__inner {
 			/* #ifndef APP-NVUE */
 			flex-shrink: 0;
-			box-sizing: border-box;
+			box-sizing: border-box;			
 			/* #endif */
 			position: relative;
 			width: 16px;
 			height: 16px;
-			border: 1px solid $border-color;
 			border-radius: 2px;
+			/*border: 1px solid $border-color;*/
 			background-color: #fff;
 			z-index: 1;
 

+ 2 - 2
uni_modules/uni-table/components/uni-tr/uni-tr.vue

@@ -167,9 +167,9 @@ $border-color: #ebeef5;
 	/* #ifdef H5 */
 	font-size: 14px;
 	color: #333;
-	/* #endif */
-	border-bottom: 1px $border-color solid;
 	
+	border-bottom: 1px $border-color solid;
+	/* #endif */
 	// text-align: center;
 }