Skip to content

I
inspection-pad-web
提交 6ca835ae authored 作者: JaxBBLL's avatar JaxBBLL
浏览文件
操作

Merge branch 'dev' of https://git.yfzx.zjtys.com.cn/privateNetwork/inspection-pad-web into dev

上级 10febf10 1d5ebf7f
隐藏空白字符变更
内嵌 并排
正在显示 包含 350 行增加 和 232 行删除
api/assRoom.js
浏览文件 @ 6ca835ae
import SqlliteDbUtil from "@/utils/sqllitedb"; import SqlliteDbUtil from "@/utils/sqllitedb";
import table from "./sqllite/table.js"; import table from "./sqllite/table.js";
import { fixNullVal } from "@/utils/common"; import {
fixNullVal
} from "@/utils/common";
// 巡检 // 巡检
export default { export default {
async selectList() {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let rs = await sqllitedb.selectSQL(`select * from ${table.assRoomName}`);
return rs;
},
async selectRoomList(roomType = 1) { async selectList() {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let rs = await sqllitedb.selectSQL( try {
`select * from ${table.assRoomName} where roomType = ${roomType}` let rs = await sqllitedb.selectSQL(`select * from ${table.assRoomName}`);
); return rs;
return rs; } catch (e) {
}, console.log(e.message)
} finally {
await sqllitedb.closeDB();
}
async info(id) { },
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let sql = `select * from ${table.assRoomName} where id = '${id}'`; async selectRoomList(roomType = 1) {
let res = await sqllitedb.selectSQL(sql); let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
if (res && res.length > 0) { try {
return res[0]; let rs = await sqllitedb.selectSQL(
} `select * from ${table.assRoomName} where roomType = ${roomType}`
return null; );
}, return rs;
async remove(id) { } catch (e) {
if (!id) { console.log(e.message)
return; } finally {
} await sqllitedb.closeDB();
let sql = `delete from ${table.assRoomName} where id = '${id}'`; }
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
await sqllitedb.executeSQL(sql); },
},
async saveBatch(list) { async info(id) {
if (list.length === 0) { let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
return; try {
} let sql = `select * from ${table.assRoomName} where id = '${id}'`;
console.log('开始保存巡检信息....' + list) let res = await sqllitedb.selectSQL(sql);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() if (res && res.length > 0) {
try { return res[0];
for (let data of list) { }
let column = '' return null;
let values = '' } catch (e) {
let idx = 0 console.log(e.message)
for (let attr in data) { } finally {
let dataField = table['assRoom'].find(v => { await sqllitedb.closeDB();
}
if (v.field === attr) {
return v },
} async remove(id) {
}) if (!id) {
if (!dataField) { return;
continue }
} let sql = `delete from ${table.assRoomName} where id = '${id}'`;
column += dataField.field + ',' try {
values += "'" + fixNullVal(data[attr]) + "'," let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
idx++ await sqllitedb.executeSQL(sql);
} } catch (e) {
console.log(e.message)
column = column.endsWith(',') ? column.substring(0, column.length - 1) : column } finally {
values = values.endsWith(',') ? values.substring(0, values.length - 1) : values await sqllitedb.closeDB();
}
let sql = `insert into ${table.assRoomName}(${column}) values(${values})`
let has = await this.info(data.id) },
if (has && has.id) { async saveBatch(list) {
await this.remove(data.id) if (list.length === 0) {
} return;
await sqllitedb.executeSQL(sql) }
} console.log('开始保存巡检信息....' + list)
} catch (e) { let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
console.log(e.message) try {
} finally { for (let data of list) {
await sqllitedb.closeDB(); let column = ''
} let values = ''
console.log('导入完成...') let idx = 0
} for (let attr in data) {
}; let dataField = table['assRoom'].find(v => {
if (v.field === attr) {
return v
}
})
if (!dataField) {
continue
}
column += dataField.field + ','
values += "'" + fixNullVal(data[attr]) + "',"
idx++
}
column = column.endsWith(',') ? column.substring(0, column.length - 1) : column
values = values.endsWith(',') ? values.substring(0, values.length - 1) : values
let sql = `insert into ${table.assRoomName}(${column}) values(${values})`
let has = await this.info(data.id)
if (has && has.id) {
await this.remove(data.id)
}
await sqllitedb.executeSQL(sql)
}
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
}
console.log('导入完成...')
}
};
\ No newline at end of file
api/hoistway.js
浏览文件 @ 6ca835ae
...@@ -9,24 +9,45 @@ export default { ...@@ -9,24 +9,45 @@ export default {
async selectList() { async selectList() {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
let rs = await sqllitedb.selectSQL(`select * from ${table.assRoomName}`) try {
return rs let rs = await sqllitedb.selectSQL(`select * from ${table.assRoomName}`)
return rs
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
}
}, },
async remove(id) { async remove(id) {
if (!id) { if (!id) {
return return
} }
let sql = `delete from ${table.assRoomName} where id = '${id}'`; let sql = `delete from ${table.assRoomName} where id = '${id}'`;
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() try {
await sqllitedb.executeSQL(sql);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
await sqllitedb.executeSQL(sql);
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
}
}, },
async info(id) { async info(id) {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
let sql = `select * from ${table.assRoomName} where id = '${id}'`; try {
let res = await sqllitedb.selectSQL(sql); let sql = `select * from ${table.assRoomName} where id = '${id}'`;
if (res && res.length > 0) { let res = await sqllitedb.selectSQL(sql);
return res[0] if (res && res.length > 0) {
return res[0]
}
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
} }
}, },
async saveBatch(list) { async saveBatch(list) {
if (list.length === 0) { if (list.length === 0) {
...@@ -41,7 +62,7 @@ export default { ...@@ -41,7 +62,7 @@ export default {
let idx = 0 let idx = 0
for (let attr in data) { for (let attr in data) {
let dataField = table['assBuilding'].find(v => { let dataField = table['assBuilding'].find(v => {
if (v.field === attr) { if (v.field === attr) {
return v return v
} }
......
api/inspect.js
浏览文件 @ 6ca835ae
import SqlliteDbUtil from "@/utils/sqllitedb"; import SqlliteDbUtil from "@/utils/sqllitedb";
import table from "./sqllite/table.js"; import table from "./sqllite/table.js";
import { fixNullVal } from "@/utils/common"; import {
fixNullVal
} from "@/utils/common";
// 巡检 // 巡检
export default { export default {
async selectList() { async selectList() {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let rs = await sqllitedb.selectSQL( try {
`select * from ${table.inspectionRecordName}` let rs = await sqllitedb.selectSQL(
); `select * from ${table.inspectionRecordName}`
return rs; );
}, return rs;
async selectDataForTime() { } catch (e) {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); console.log(e.message);
let rs = await sqllitedb.selectSQL( } finally {
`SELECT *,strftime( '%Y年%m月',createTime) AS yearMonth FROM ${table.inspectionRecordName} order by createTime desc` await sqllitedb.closeDB();
); }
return rs;
},
async info(id) {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let sql = `select * from ${table.inspectionRecordName} where id = '${id}'`;
let res = await sqllitedb.selectSQL(sql);
debugger;
if (res && res.length > 0) {
return res[0];
}
},
async remove(id) {
if (!id) {
return;
}
let sql = `delete from ${table.inspectionRecordName} where id = '${id}'`;
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
await sqllitedb.executeSQL(sql);
},
async saveBatch(list) {
if (list.length === 0) {
return;
}
console.log("开始保存用户信息...." + list.length);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
try {
for (let data of list) {
let column = "";
let values = "";
let idx = 0;
for (let attr in data) {
let dataField = table["inspectionRecord"].find((v) => {
if (v.field === attr) {
return v;
}
});
if (!dataField) {
continue;
}
column += dataField.field + ",";
values += "'" + fixNullVal(data[attr]) + "',";
idx++;
}
column = column.endsWith(",") },
? column.substring(0, column.length - 1) async selectDataForTime() {
: column; let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
values = values.endsWith(",") try {
? values.substring(0, values.length - 1) let rs = await sqllitedb.selectSQL(
: values; `SELECT *,strftime( '%Y年%m月',createTime) AS yearMonth FROM ${table.inspectionRecordName} order by createTime desc`
);
return rs;
} catch (e) {
console.log(e.message);
} finally {
await sqllitedb.closeDB();
}
let sql = `insert into ${table.inspectionRecordName}(${column}) values(${values})`; },
let has = await this.info(data.id); async info(id) {
if (has && has.id) { let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
await this.remove(data.id); try {
} let sql = `select * from ${table.inspectionRecordName} where id = '${id}'`;
await sqllitedb.executeSQL(sql); let res = await sqllitedb.selectSQL(sql);
} debugger;
} catch (e) { if (res && res.length > 0) {
console.log(e.message); return res[0];
} finally { }
await sqllitedb.closeDB(); } catch (e) {
} console.log(e.message);
console.log("导入完成..."); } finally {
}, await sqllitedb.closeDB();
async save(data) { }
console.log("开始保存巡检记录", data);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); },
try { async remove(id) {
let sql = `insert into ${table.inspectionRecordName}( if (!id) {
return;
}
let sql = `delete from ${table.inspectionRecordName} where id = '${id}'`;
try {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
await sqllitedb.executeSQL(sql);
} catch (e) {
console.log(e.message);
} finally {
await sqllitedb.closeDB();
}
},
async saveBatch(list) {
if (list.length === 0) {
return;
}
console.log("开始保存用户信息...." + list.length);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
try {
for (let data of list) {
let column = "";
let values = "";
let idx = 0;
for (let attr in data) {
let dataField = table["inspectionRecord"].find((v) => {
if (v.field === attr) {
return v;
}
});
if (!dataField) {
continue;
}
column += dataField.field + ",";
values += "'" + fixNullVal(data[attr]) + "',";
idx++;
}
column = column.endsWith(",") ?
column.substring(0, column.length - 1) :
column;
values = values.endsWith(",") ?
values.substring(0, values.length - 1) :
values;
let sql = `insert into ${table.inspectionRecordName}(${column}) values(${values})`;
let has = await this.info(data.id);
if (has && has.id) {
await this.remove(data.id);
}
await sqllitedb.executeSQL(sql);
}
} catch (e) {
console.log(e.message);
} finally {
await sqllitedb.closeDB();
}
console.log("导入完成...");
},
async save(data) {
console.log("开始保存巡检记录", data);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
try {
let sql = `insert into ${table.inspectionRecordName}(
inspectionType, inspectionType,
inspectionCode, inspectionCode,
recordName, recordName,
...@@ -115,24 +145,24 @@ export default { ...@@ -115,24 +145,24 @@ export default {
'${JSON.stringify(data.inspectionData)}' '${JSON.stringify(data.inspectionData)}'
); );
`; `;
let result = await sqllitedb.executeReturnDataSQL(sql); let result = await sqllitedb.executeReturnDataSQL(sql);
console.log(result, "有有有有有有"); console.log(result, "有有有有有有");
return result; return result;
} catch (e) { } catch (e) {
console.log(e.message); console.log(e.message);
} finally { } finally {
await sqllitedb.closeDB(); await sqllitedb.closeDB();
} }
console.log("导入完成..."); console.log("导入完成...");
}, },
async update(data) { async update(data) {
console.log("开始更新巡检记录", data); console.log("开始更新巡检记录", data);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
try { try {
if (!data.id) { if (!data.id) {
throw new Error("更新操作需要提供 id"); throw new Error("更新操作需要提供 id");
} }
let sql = `UPDATE ${table.inspectionRecordName} SET let sql = `UPDATE ${table.inspectionRecordName} SET
inspectionType = '${data.inspectionType}', inspectionType = '${data.inspectionType}',
inspectionCode = '${data.inspectionCode}', inspectionCode = '${data.inspectionCode}',
recordName = '${data.recordName}', recordName = '${data.recordName}',
...@@ -147,12 +177,12 @@ export default { ...@@ -147,12 +177,12 @@ export default {
updateTime = '${data.updateTime}', updateTime = '${data.updateTime}',
inspectionData = '${JSON.stringify(data.inspectionData)}' inspectionData = '${JSON.stringify(data.inspectionData)}'
WHERE id = ${data.id}`; WHERE id = ${data.id}`;
await sqllitedb.executeSQL(sql); await sqllitedb.executeSQL(sql);
} catch (e) { } catch (e) {
console.log(e.message); console.log(e.message);
} finally { } finally {
await sqllitedb.closeDB(); await sqllitedb.closeDB();
} }
console.log("更新完成..."); console.log("更新完成...");
}, },
}; };
\ No newline at end of file
api/user.js
浏览文件 @ 6ca835ae
...@@ -9,67 +9,101 @@ export default { ...@@ -9,67 +9,101 @@ export default {
async selectList() { async selectList() {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
let rs = await sqllitedb.selectSQL(`select * from ${table.userName}`) try {
return rs let rs = await sqllitedb.selectSQL(`select * from ${table.userName}`)
return rs
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
}
}, },
async login(data) { async login(data) {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
let { try {
account, let {
pwd account,
} = data pwd
const sql = `select * from ${table.userName} where user = '${account}'` } = data
let res = await sqllitedb.selectSQL(sql); const sql = `select * from ${table.userName} where user = '${account}'`
let res = await sqllitedb.selectSQL(sql);
const user = res[0]
return {
data: user,
msg: '登录成功'
};
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
}
const user = res[0]
return {
data: user,
msg: '登录成功'
};
}, },
async remove(id) { async remove(id) {
if (!id) {
return
}
let sql = `delete from ${table.userName} where userId = '${id}'`;
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
await sqllitedb.executeSQL(sql); try {
if (!id) {
return
}
let sql = `delete from ${table.userName} where userId = '${id}'`;
await sqllitedb.executeSQL(sql);
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
}
}, },
async info(id) { async info(id) {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
let sql = `select * from ${table.userName} where userId = '${id}'`; try {
let res = await sqllitedb.selectSQL(sql); let sql = `select * from ${table.userName} where userId = '${id}'`;
if (res && res.length > 0) { let res = await sqllitedb.selectSQL(sql);
return res[0] if (res && res.length > 0) {
return res[0]
}
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
} }
}, },
async changePwd(data) { async changePwd(data) {
let {
userName,
oldPwd,
newPwd,
userId
} = data
let sqllitedb = await SqlliteDbUtil.initSqlliteDB() let sqllitedb = await SqlliteDbUtil.initSqlliteDB()
const current = await sqllitedb.selectSQL( try {
`select * from ${table.userName} where userId = '${userId}' and user = '${userName}'` let {
); userName,
if (current.passWord !== oldPwd) { oldPwd,
return { newPwd,
data: false, userId
msg: '原密码错误' } = data
}; const current = await sqllitedb.selectSQL(
} `select * from ${table.userName} where userId = '${userId}' and user = '${userName}'`
const update = await sqllitedb.executeSQL( );
`UPDATE ${table.userName} SET passWord = '${newPwd}' if (current.passWord !== oldPwd) {
WHERE userId = '${userId}'` return {
); data: false,
msg: '原密码错误'
};
}
const update = await sqllitedb.executeSQL(
`UPDATE ${table.userName} SET passWord = '${newPwd}'
WHERE userId = '${userId}'`
);
return { return {
data: true, data: true,
msg: '恭喜您，密码更新成功。' msg: '恭喜您，密码更新成功。'
}; };
} catch (e) {
console.log(e.message)
} finally {
await sqllitedb.closeDB();
}
}, },
async saveBatch(list) { async saveBatch(list) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论