Skip to content

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

fix

上级 b5d355e2
隐藏空白字符变更
内嵌 并排
正在显示 包含 120 行增加 和 114 行删除
api/inspect.js
浏览文件 @ 6233bd56
import SqlliteDbUtil from "@/utils/sqllitedb"; import SqlliteDbUtil from "@/utils/sqllitedb";
import table from "./sqllite/table.js"; import table from "./sqllite/table.js";
import { import { fixNullVal } from "@/utils/common";
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( let rs = await sqllitedb.selectSQL(
`select * from ${table.inspectionRecordName}` `select * from ${table.inspectionRecordName}`
); );
return rs; return rs;
}, },
async selectDataForTime() { async selectDataForTime() {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let rs = await sqllitedb.selectSQL( let rs = await sqllitedb.selectSQL(
`SELECT *,strftime( '%Y年%m月',createTime) AS yearMonth FROM ${table.inspectionRecordName} order by createTime desc` `SELECT *,strftime( '%Y年%m月',createTime) AS yearMonth FROM ${table.inspectionRecordName} order by createTime desc`
); );
return rs; return rs;
}, },
async info(id) { async info(id) {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
let sql = `select * from ${table.inspectionRecordName} where id = '${id}'`; let sql = `select * from ${table.inspectionRecordName} where id = '${id}'`;
let res = await sqllitedb.selectSQL(sql); let res = await sqllitedb.selectSQL(sql);
if (res && res.length > 0) { debugger;
return res[0]; if (res && res.length > 0) {
} return res[0];
}, }
async remove(id) { },
if (!id) { async remove(id) {
return; if (!id) {
} return;
let sql = `delete from ${table.inspectionRecordName} where id = '${id}'`; }
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); let sql = `delete from ${table.inspectionRecordName} where id = '${id}'`;
await sqllitedb.executeSQL(sql); let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
}, await sqllitedb.executeSQL(sql);
async saveBatch(list) { },
if (list.length === 0) { async saveBatch(list) {
return; if (list.length === 0) {
} return;
console.log("开始保存用户信息...." + list.length); }
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); console.log("开始保存用户信息...." + list.length);
try { let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
for (let data of list) { try {
let column = ""; for (let data of list) {
let values = ""; let column = "";
let idx = 0; let values = "";
for (let attr in data) { let idx = 0;
let dataField = table["inspectionRecord"].find((v) => { for (let attr in data) {
if (v.field === attr) { let dataField = table["inspectionRecord"].find((v) => {
return v; if (v.field === attr) {
} return v;
}); }
if (!dataField) { });
continue; if (!dataField) {
} continue;
column += dataField.field + ","; }
values += "'" + fixNullVal(data[attr]) + "',"; column += dataField.field + ",";
idx++; values += "'" + fixNullVal(data[attr]) + "',";
} idx++;
}
column = column.endsWith(",") ? column = column.endsWith(",")
column.substring(0, column.length - 1) : ? column.substring(0, column.length - 1)
column; : column;
values = values.endsWith(",") ? values = values.endsWith(",")
values.substring(0, values.length - 1) : ? values.substring(0, values.length - 1)
values; : values;
let sql = `insert into ${table.inspectionRecordName}(${column}) values(${values})`; let sql = `insert into ${table.inspectionRecordName}(${column}) values(${values})`;
let has = await this.info(data.id); let has = await this.info(data.id);
if (has && has.id) { if (has && has.id) {
await this.remove(data.id); await this.remove(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("导入完成...");
}, },
async save(data) { async save(data) {
console.log("开始保存巡检记录", data); console.log("开始保存巡检记录", data);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
try { try {
let sql = `insert into ${table.inspectionRecordName}( let sql = `insert into ${table.inspectionRecordName}(
inspectionType, inspectionType,
inspectionCode, inspectionCode,
recordName, recordName,
...@@ -116,24 +115,24 @@ export default { ...@@ -116,24 +115,24 @@ export default {
'${JSON.stringify(data.inspectionData)}' '${JSON.stringify(data.inspectionData)}'
); );
`; `;
debugger let result = await sqllitedb.executeReturnDataSQL(sql);
let result = await sqllitedb.executeReturnDataSQL(sql); console.log(result, "有有有有有有");
console.log(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}',
...@@ -148,12 +147,12 @@ debugger ...@@ -148,12 +147,12 @@ debugger
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
pages/inspectionContent/inspectionContentList.vue
浏览文件 @ 6233bd56
...@@ -102,10 +102,9 @@ ...@@ -102,10 +102,9 @@
class="iconfont icon-shibai1" class="iconfont icon-shibai1"
></text> ></text>
</template> </template>
<text class="status" v-if="card.isSubmit == 0">草稿</text> <text class="status" v-if="card.isSubmit == 0">草稿</text>
<text class="status" v-else="card.isSubmit == 1">{{ <text class="status" v-else>{{ card.statusLable }}</text>
card.statusLable
}}</text>
</view> </view>
<view class="second-row"> <view class="second-row">
<text class="location">{{ card.name }}</text> <text class="location">{{ card.name }}</text>
......
pages/inspectionContent/inspectionContentNew.vue
浏览文件 @ 6233bd56
...@@ -250,6 +250,7 @@ export default { ...@@ -250,6 +250,7 @@ export default {
: this.deepClone(tabsInfo1); : this.deepClone(tabsInfo1);
console.log("机房查看options", options); console.log("机房查看options", options);
this.all_data = this.$store.state.all_data || []; this.all_data = this.$store.state.all_data || [];
if (options.uid) { if (options.uid) {
this.getDetails(options.uid); this.getDetails(options.uid);
} else { } else {
...@@ -299,6 +300,7 @@ export default { ...@@ -299,6 +300,7 @@ export default {
}, },
// 回显数据 // 回显数据
getDetails(uid) { getDetails(uid) {
console.log("getDetails", uid);
uni.showLoading(); uni.showLoading();
inspectApi inspectApi
.info(uid) .info(uid)
...@@ -495,7 +497,14 @@ export default { ...@@ -495,7 +497,14 @@ export default {
const send = dataToSql(data); const send = dataToSql(data);
const api = this.uid ? inspectApi.update : inspectApi.save; const api = this.uid ? inspectApi.update : inspectApi.save;
api(this.uid ? { id: this.uid, ...send } : send).then((res) => { api(this.uid ? { id: this.uid, ...send } : send).then((res) => {
console.log("保存成功",res); // if (!this.uid) {
console.log(this.uid);
this.uid = res.lastInsertId;
setTimeout(() => {
this.getDetails(res.lastInsertId);
}, 300);
// }
console.log("保存成功", res);
}); });
}, },
// 提交 // 提交
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论