2023-4-28

App.vue

@@ -25,7 +25,7 @@
 					  "position" TEXT,
 					  "worker_name" TEXT,
 					  "worker_id" INTEGER,
-					  "assets_status" INTEGER,
+					  "assets_status" TEXT,
 					  "photo" TEXT,
 					  "content" TEXT,
 					  "is_check" INTEGER DEFAULT 0

pages/assets/index.vue

@@ -98,6 +98,7 @@
 			
 			testConnect() {
 				this.$u.api.test().then(res => {
+					console.log(res);
 					if(res.data.msg === '链接成功'){
 						this.isConnect = true
 					}else{
@@ -108,6 +109,7 @@
 						})
 					}
 				}).catch(err => {
+					console.log(err);
 					this.isConnect = false
 					uni.showToast({
 						icon:'none',

pages/scan/index.vue

@@ -147,12 +147,16 @@
 				isShowSelect: false,
 				action: `${ROOTPATH}/index.php?s=/Home/Worker/upload.html`,
 				statusList: [{
-						value: 1,
+						value: "待处置",
-						label: "正常"
+						label: "待处置"
 					},
 					{
-						value: 2,
+						value: "闲置",
-						label: "维修"
+						label: "闲置"
+					},
+					{
+						value: "在用",
+						label: "在用"
 					}
 				],
 
@@ -368,7 +372,7 @@
 				}
 			},
 			activeWorkerFormat() {
-				return function(worker_id) { 
+				return function(worker_id) {
 					return this.workers.find(i => i.id == worker_id)?.name || ""
 				}
 			}
@@ -389,9 +393,9 @@
 			androidModule.close()
 			main.unregisterReceiver(receiver)
 			// #endif
-		},
+		},
-		onShow() {
+		onShow() {
-		  	this.getWorkers();
+		  	this.getWorkers();
 		},
 		mounted() {
 			// #ifdef APP-PLUS
@@ -450,7 +454,7 @@
 			padding-left: 10rpx;
 		}
 
-		&:nth-last-child() {
+		&:nth-last-child(1) {
 			padding-bottom: 0;
 		}
 	}
@@ -466,4 +470,4 @@
 		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
-</style>
+</style>