提交 31968363 authored 作者: zs's avatar zs

edit

上级 e9d41ec2
......@@ -20,13 +20,12 @@ export default {
}
},
async selectDataForTime(data) {
console.log('传进来了',data.inspectionTime)
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
try {
let inspectionTimeCondition = '';
if (Array.isArray(data.inspectionTime) && data.inspectionTime.length === 2) {
const startTime = new Date(data.inspectionTime[0]).getTime();
const endTime = new Date(data.inspectionTime[1]).getTime();
const endTime = new Date(data.inspectionTime[1]+'T23:59:59').getTime();
inspectionTimeCondition = `AND inspectionTime >= '${startTime}' AND inspectionTime <= '${endTime}'`;
}
let rs = await sqllitedb.selectSQL(
......@@ -47,7 +46,6 @@ export default {
and delFlag = 0
order by createTime desc`
);
return rs;
} catch (e) {
console.log(e.message);
......@@ -83,10 +81,22 @@ export default {
// await sqllitedb.closeDB();
}
},
//更新同步
async updateSyncData(data){
let ids = '(' + data.join(',') + ')'
let sql = `update ${table.inspectionRecordName} set synFlag=1 where id in ${ids}`;
try {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let rs = await sqllitedb.executeReturnDataSQL(sql);
return rs
} catch (e) {
console.log(e.message);
} finally {
// await sqllitedb.closeDB();
}
},
async batchRemove(id) {
let sql = `update ${table.inspectionRecordName} set delFlag=1 where id = '${id}'`;
console.log(sql)
try {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let rs = await sqllitedb.executeReturnDataSQL(sql);
......@@ -94,7 +104,7 @@ export default {
} catch (e) {
console.log(e.message);
} finally {
// await sqllitedb.closeDB();
await sqllitedb.closeDB();
}
},
......
......@@ -58,7 +58,7 @@ import {
import moment from "moment";
import { getAllInspections } from "@/request/index.js";
import { Base64 } from "js-base64";
import inspectApi from "@/api/inspect";
export default {
props: {
list: {
......@@ -99,14 +99,7 @@ export default {
methods: {
init() {
const temp = [];
this.list.forEach((item) => {
temp.push(...(item.list || []));
});
console.log("this.list", this.list);
console.log("temp", temp);
this.notSynchronizationList = temp.filter(
(item) => item.synchronization == 0 && item.isSign === true
);
this.notSynchronizationList = this.list
getAllInspections().then((res) => {
this.allList = res;
......@@ -214,14 +207,15 @@ export default {
});
Promise.all(promiseArr)
.then(() => {
setTimeout(() => {
.then(async () => {
setTimeout(async () => {
uni.showToast({
title: "打包成功",
icon: "none",
duration: 2000,
});
let ids = this.list.map(e => e.id)
await inspectApi.updateSyncData(ids)
this.close();
this.loading = false;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论