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

edit

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