Skip to content

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

fix

上级 6ca835ae
隐藏空白字符变更
内嵌 并排
正在显示 包含 139 行增加 和 155 行删除
api/inspect.js
浏览文件 @ 25410e74
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();
try { try {
let rs = await sqllitedb.selectSQL( let rs = await sqllitedb.selectSQL(
`select * from ${table.inspectionRecordName}` `select * from ${table.inspectionRecordName}`
); );
return rs; return rs;
} catch (e) { } catch (e) {
console.log(e.message); console.log(e.message);
} finally { } finally {
await sqllitedb.closeDB(); await sqllitedb.closeDB();
} }
},
async selectDataForTime() {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
try {
let rs = await sqllitedb.selectSQL(
`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();
}
},
async info(id) {
let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
try {
let sql = `select * from ${table.inspectionRecordName} where id = '${id}'`;
let res = await sqllitedb.selectSQL(sql);
if (res && res.length > 0) {
return res[0];
}
} catch (e) {
console.log(e.message);
} finally {
await sqllitedb.closeDB();
}
},
async remove(id) {
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(",")
async selectDataForTime() { ? column.substring(0, column.length - 1)
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); : column;
try { values = values.endsWith(",")
let rs = await sqllitedb.selectSQL( ? values.substring(0, values.length - 1)
`SELECT *,strftime( '%Y年%m月',createTime) AS yearMonth FROM ${table.inspectionRecordName} order by createTime desc` : values;
);
return rs;
} catch (e) {
console.log(e.message);
} finally {
await sqllitedb.closeDB();
}
}, let sql = `insert into ${table.inspectionRecordName}(${column}) values(${values})`;
async info(id) { let has = await this.info(data.id);
let sqllitedb = await SqlliteDbUtil.initSqlliteDB(); if (has && has.id) {
try { await this.remove(data.id);
let sql = `select * from ${table.inspectionRecordName} where id = '${id}'`; }
let res = await sqllitedb.selectSQL(sql); await sqllitedb.executeSQL(sql);
debugger; }
if (res && res.length > 0) { } catch (e) {
return res[0]; console.log(e.message);
} } finally {
} catch (e) { await sqllitedb.closeDB();
console.log(e.message); }
} finally { console.log("导入完成...");
await sqllitedb.closeDB(); },
} async save(data) {
console.log("开始保存巡检记录", data);
}, let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
async remove(id) { try {
if (!id) { let sql = `insert into ${table.inspectionRecordName}(
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,
...@@ -145,24 +138,24 @@ export default { ...@@ -145,24 +138,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}',
...@@ -177,12 +170,12 @@ export default { ...@@ -177,12 +170,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
pages/inspectionContent/components/qt.vue
浏览文件 @ 25410e74
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<CommonUpload <CommonUpload
v-model="item.photos" v-model="item.photos"
:max-count="9999" :max-count="9999"
@change="onPhotoChange" @input="onPhotoChange"
> >
</CommonUpload> </CommonUpload>
</view> </view>
...@@ -112,10 +112,7 @@ export default { ...@@ -112,10 +112,7 @@ export default {
// 处理弹窗确认 // 处理弹窗确认
handlePopupConfirm(summary) { handlePopupConfirm(summary) {
this.itemData.detail[this.currentIndex].conclusion = summary; // 回显到文字显示区域 this.itemData.detail[this.currentIndex].conclusion = summary; // 回显到文字显示区域
this.$emit("sync", { this.$emit("sync", this.itemData);
conclusion: summary,
photos: this.itemData.detail[this.currentIndex].photos,
});
}, },
// 处理】数据 // 处理】数据
getFromData() { getFromData() {
...@@ -163,10 +160,7 @@ export default { ...@@ -163,10 +160,7 @@ export default {
}, },
onPhotoChange(val) { onPhotoChange(val) {
this.itemData.detail[this.currentIndex].photos = val; this.itemData.detail[this.currentIndex].photos = val;
this.$emit("sync", { this.$emit("sync", this.itemData);
conclusion: this.itemData.detail[this.currentIndex].conclusion,
photos: val,
});
}, },
}, },
}; };
......
pages/inspectionContent/inspectionContentList.vue
浏览文件 @ 25410e74
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<view class="profile-left"> <view class="profile-left">
<view class="avatar"> <view class="avatar">
<image <image
src="@/static/img/add-img/home1.png" src="@/static/img/add-img/defaultAvatar.png"
mode="aspectFit" mode="aspectFit"
></image> ></image>
</view> </view>
......
pages/inspectionContent/inspectionContentNew.vue
浏览文件 @ 25410e74
...@@ -761,12 +761,10 @@ export default { ...@@ -761,12 +761,10 @@ export default {
this.switchTab((this.activeTab + 1) % this.tabs.length); this.switchTab((this.activeTab + 1) % this.tabs.length);
}, },
setQtValue(data) { setQtValue(data) {
console.log("setQtValue", data);
this.detailsInfo.originData.forEach((item) => { this.detailsInfo.originData.forEach((item) => {
if (item.details && item.details.qt && item.details.qt.detail) { if (item.details) {
item.details.qt.detail.forEach((current) => { item.details.qt = data;
item.conclusion = data.conclusion;
item.photos = data.photos;
});
} }
}); });
console.log("setQtValue", this.detailsInfo); console.log("setQtValue", this.detailsInfo);
......
pages/inspectionContent/shared.js
浏览文件 @ 25410e74
...@@ -13,7 +13,7 @@ export function dataToSql(data) { ...@@ -13,7 +13,7 @@ export function dataToSql(data) {
inspectionType: data.inspectionType, inspectionType: data.inspectionType,
inspectionCode: data.inspectionCode, inspectionCode: data.inspectionCode,
recordName: `${moment().format("yyyyMMDD")}-机房巡检`, recordName: `${moment().format("yyyyMMDD")}-机房巡检`,
inspectionTime: moment().format("yyyy-MM-DD HH:mm"), inspectionTime: `${new Date().getTime()}`,
isException: data.isException, // 是否异常：0 否 1 是 2 巡检中 isException: data.isException, // 是否异常：0 否 1 是 2 巡检中
userId: store.state.now_user.userId, userId: store.state.now_user.userId,
userName: store.state.now_user.user, userName: store.state.now_user.user,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论