diff --git a/App.vue b/App.vue index 2afe5f9..bff618e 100644 --- a/App.vue +++ b/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 diff --git a/pages/assets/index.vue b/pages/assets/index.vue index 964c160..de34ebd 100644 --- a/pages/assets/index.vue +++ b/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', diff --git a/pages/scan/index.vue b/pages/scan/index.vue index b0c06eb..ed5c2e1 100644 --- a/pages/scan/index.vue +++ b/pages/scan/index.vue @@ -147,12 +147,16 @@ isShowSelect: false, action: `${ROOTPATH}/index.php?s=/Home/Worker/upload.html`, statusList: [{ - value: 1, - label: "正常" + value: "待处置", + label: "待处置" }, { - value: 2, - label: "维修" + value: "闲置", + 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() { - this.getWorkers(); + }, + onShow() { + 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; } - + diff --git a/static/logo.png b/static/logo.png deleted file mode 100644 index e779a2e..0000000 Binary files a/static/logo.png and /dev/null differ diff --git a/static/upload-active.png b/static/upload-active.png deleted file mode 100644 index 2bf9254..0000000 Binary files a/static/upload-active.png and /dev/null differ