Skip to content

M
monthReport_smzx
提交 409b2861 authored 作者: 邓文彬's avatar 邓文彬
浏览文件
操作

fix(pad)： 与PCj数据交互格式处理完成，数据使用方式待处理

上级 95bfd4aa
隐藏空白字符变更
内嵌 并排
正在显示 包含 383 行增加 和 163 行删除
pages/inspection/inspFirst.vue
浏览文件 @ 409b2861
...@@ -91,6 +91,19 @@ export default { ...@@ -91,6 +91,19 @@ export default {
recordName: `${moment().format("yyyyMMDD")}-机房巡检记录`, recordName: `${moment().format("yyyyMMDD")}-机房巡检记录`,
inspectionTime: moment().format("yyyy-MM-DD HH:MM:ss"), inspectionTime: moment().format("yyyy-MM-DD HH:MM:ss"),
inspectionBy: this.$store.state.now_user.name, inspectionBy: this.$store.state.now_user.name,
inspectionById: this.$store.state.now_user.id,
isException: "", // 是否有异常
position: "", // 位置
isSubmit: "", // 0 是草稿态； 1 是正式提交
conclusion: "", //结论
"fillCheck": "", // tab字典的value值, 校验通过的
items:[
// {
// "itemCode": "1", // 检查项
// "measuredData": "2,3", // 异常的楼层
// "inspectionResult": "1" // 检查项的结果， 1是异常 0 是正常
// },
]
}; };
}, },
......
pages/inspectionContent/inspectionContent.vue
浏览文件 @ 409b2861
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<view class="content_header">巡检项目（pm）</view> <view class="content_header">巡检项目（pm）</view>
<!-- tabls --> <!-- tabls -->
<Tabs class="tabs" ref="tabs" @change="changeTab" /> <Tabs class="tabs" ref="tabs" :options="tabList" @change="changeTab" />
<GatherDataCenter v-show="activeTabIndex == 0" ref="GatherDataCenter" /> <GatherDataCenter v-show="activeTabIndex == 0" ref="GatherDataCenter" />
<ShieldedComputerRoom <ShieldedComputerRoom
...@@ -70,8 +70,15 @@ import { ...@@ -70,8 +70,15 @@ import {
addLog, addLog,
getLogContent, getLogContent,
LOG_TYPE_ENUM, LOG_TYPE_ENUM,
writeDarf writeDarf,
writeInspectionData,
} from "@/utils/IoReadingAndWriting.js"; } from "@/utils/IoReadingAndWriting.js";
import {
pad_1_1_inspection_position,
pad_1_2_inspection_position,
pad_1_3_inspection_position,
pad_room_type,
} from "@/utils/dict.js";
export default { export default {
components: { components: {
...@@ -84,6 +91,39 @@ export default { ...@@ -84,6 +91,39 @@ export default {
}, },
data() { data() {
return { return {
tabList: [
{
name: "汇聚机房",
isVaild: false, // 校验通过
position: pad_1_1_inspection_position.rows,
descript:
"痕迹检查地面、墙壁、天花板、是否有裂痕、水渍，机房内是否有鼠患、蚁患、蟑螂活动的痕迹，温湿度取最高值，正常室温：20~25℃，湿度：40~60%。",
},
{
name: "屏蔽机房",
isVaild: false, // 校验通过
position: pad_1_2_inspection_position.rows,
descript: "UPS检查包含UPS主机、UPS输入柜、UPS输出柜。",
},
{
name: "电池间",
isVaild: false, // 校验通过
position: pad_1_3_inspection_position.rows,
descript: "痕迹检查",
},
{
name: "机房值班",
isVaild: false, // 校验通过
descript: "记录哪些人员进出机房、总计次数。",
position: [],
},
{
name: "值班交接",
isVaild: false, // 校验通过
descript: "未完事项交换。",
position: [],
},
],
activeTabIndex: 0, activeTabIndex: 0,
baseInfo: {}, // 基础信息 baseInfo: {}, // 基础信息
tempForm: { tempForm: {
...@@ -91,12 +131,19 @@ export default { ...@@ -91,12 +131,19 @@ export default {
}, },
}; };
}, },
onLoad() {}, onLoad() {
this.init();
},
mounted() { mounted() {
this.baseInfo = this.$store.state.temp_data; this.baseInfo = this.$store.state.temp_data;
}, },
methods: { methods: {
init() {
pad_room_type.rows.forEach((item, index) => {
this.tabList[index].value = item.dictValue;
});
},
// tab选中change 时间 // tab选中change 时间
changeTab(index, item) { changeTab(index, item) {
this.draft(this.activeTabIndex, false, false).then(() => { this.draft(this.activeTabIndex, false, false).then(() => {
...@@ -108,54 +155,116 @@ export default { ...@@ -108,54 +155,116 @@ export default {
uni.navigateBack(); uni.navigateBack();
}, },
// 处理提交数据
getParams() {
const tabList = this.tabList;
const tempForm = this.tempForm;
const baseInfo = this.baseInfo;
const fillCheck = tabList.map((item) => item.value).join(",");
let temp = {
...baseInfo,
isSubmit: 1,
fillCheck,
isException: "",
roomWatch: "",
dutyHandover: "",
successor: "",
handoverPerson: "",
};
const tempItems = [];
tabList.forEach((element, index) => {
if (Array.isArray(tempForm[index])) {
console.log("---ARRAY", tempForm[index]);
tempItems.push(...tempForm[index]);
} else {
temp = {
...temp,
...tempForm[index],
};
}
});
console.log("---getParams", tempItems);
const items = tempItems.map((item) => {
return {
itemCode: item.itemCode,
measuredData: item.measuredData,
notes: item.notes,
inspectionResult: item.inspectionResult,
roomType: item.roomType,
};
});
const isException = items.filter((item) => item.inspectionResult > 0)
.length
? 1
: 0;
return {
...temp,
items,
isException,
originData: {
baseInfo,
tempForm,
},
};
},
// 提交按钮 // 提交按钮
submit() { submit() {
this.draft(this.activeTabIndex, false, false).then(() => { this.draft(this.activeTabIndex, false, false).then(() => {
const vaild = this.$refs.tabs.isAllVails(); const vaild = this.$refs.tabs.isAllVails();
uni.showToast({
icon: `${vaild ? "success" : "error"}`,
title: `${vaild ? "校验通过" : "请完善填写内容"}`,
});
if (vaild) { if (vaild) {
/** /**
* 校验通过, * 校验通过,
* 1.更新 store数据, * 1.更新 store 数据,
* 2. 巡检list文件 * 2. 巡检list文件
* 3.清空草稿文件数据、store草稿数据 * 3.清空草稿文件数据、store草稿数据
*/ */
const params = this.getParams();
const all_user_data = this.$store.state.all_user_data;
// const temp = params;
// temp[this.baseInfo.inspectionCode] = params;
all_user_data.push(params);
// 更新巡检list
this.$store.commit("SET_ALL_USER_DATA", all_user_data);
writeInspectionData(all_user_data);
// 更新日志
const logContent = getLogContent(LOG_TYPE_ENUM.add);
const log_list = this.$store.state.log_list;
log_list.push(logContent);
this.$store.commit("SET_LOG_LIST", log_list);
addLog(log_list).then((res) => {
console.log("日志文件写入成功");
});
// 清空草稿数据
this.$store.commit("SET_DARF_DATA", {}); // 缓存[巡检信息]
writeDarf("").then((res) => {
console.log("写入草稿文件成功");
});
// 清空基础缓存信息
this.$store.commit("SET_TEMP_DATA", {}); // 缓存[巡检信息]
console.log("--提交--", params);
} }
console.log("基础信息", this.baseInfo); uni.showToast({
console.log("巡检信息", this.baseInfo); icon: `${vaild ? "success" : "error"}`,
title: `${vaild ? "校验通过" : "请完善填写内容"}`,
});
}); });
}, },
// // 表单填写结果
// isAllVails(vaild, formData) {
// console.log("--this.activeTabIndex---", this.$refs.tabs.setTabVaild);
// switch (this.activeTabIndex) {
// case 0:
// this.$refs.tabs.setTabVaild(this.activeTabIndex, vaild); // 给tab栏设置状态,全部填写会高亮icon图标
// console.log("--formData", formData);
// break;
// case 1:
// this.$refs.tabs.setTabVaild(this.activeTabIndex, vaild);
// break;
// case 2:
// this.$refs.tabs.setTabVaild(this.activeTabIndex, vaild);
// break;
// case 3:
// this.$refs.tabs.setTabVaild(this.activeTabIndex, vaild);
// break;
// case 4:
// this.$refs.tabs.setTabVaild(this.activeTabIndex, vaild);
// break;
// }
// },
// 保存草稿按钮 // 保存草稿按钮
draft(activeTabIndex, isSave = true, iSwtich = true) { draft(activeTabIndex, isSave = true, iSwtich = true) {
let refName = ""; let refName = "";
...@@ -186,14 +295,12 @@ export default { ...@@ -186,14 +295,12 @@ export default {
.setTabVaild(activeTabIndex, vaild, iSwtich) .setTabVaild(activeTabIndex, vaild, iSwtich)
.then(() => { .then(() => {
this.tempForm[activeTabIndex] = formData; this.tempForm[activeTabIndex] = formData;
console.log("--this.tempForm--", formData); // console.log("--this.tempForm--", formData);
if (isSave) { if (isSave) {
// 更新store 和 [草稿文件] 日志数据
console.log("--保存草稿--"); console.log("--保存草稿--");
this.$store.commit("SET_DARF_DATA", this.tempForm); // 缓存[巡检信息]
// // 新增日志信息 // 新增日志信息
const logContent = getLogContent(LOG_TYPE_ENUM.darf); const logContent = getLogContent(LOG_TYPE_ENUM.darf);
const log_list = this.$store.state.log_list; const log_list = this.$store.state.log_list;
log_list.push(logContent); log_list.push(logContent);
...@@ -202,9 +309,16 @@ export default { ...@@ -202,9 +309,16 @@ export default {
console.log("日志文件写入成功"); console.log("日志文件写入成功");
}); });
// 写入草稿文件 // 写入草稿文件 更新 store 草稿内容
// ...BatteryRoom.. this.$store.commit("SET_DARF_DATA", {
writeDarf(this.tempForm).then((res) => { ...this.tempForm,
...this.baseInfo,
});
// 缓存[巡检信息]
writeDarf({
...this.tempForm,
...this.baseInfo,
}).then((res) => {
console.log("写入草稿文件成功"); console.log("写入草稿文件成功");
uni.showToast({ uni.showToast({
icon: "success", icon: "success",
......
pages/inspectionContent/model/computerRoomDuty.vue
浏览文件 @ 409b2861
...@@ -170,7 +170,8 @@ export default { ...@@ -170,7 +170,8 @@ export default {
display: inline-block; display: inline-block;
border: 1px solid rgba(242, 242, 242, 1); border: 1px solid rgba(242, 242, 242, 1);
border-radius: 8px; border-radius: 8px;
width: 72px; padding: 0 10px;
height: 32px; height: 32px;
font-size: 12px; font-size: 12px;
color: #4a4a4a; color: #4a4a4a;
......
pages/inspectionContent/model/dutyHandover.vue
浏览文件 @ 409b2861
...@@ -202,7 +202,8 @@ export default { ...@@ -202,7 +202,8 @@ export default {
display: inline-block; display: inline-block;
border: 1px solid rgba(242, 242, 242, 1); border: 1px solid rgba(242, 242, 242, 1);
border-radius: 8px; border-radius: 8px;
width: 72px; // width: 72px;
padding: 0 10px;
height: 32px; height: 32px;
font-size: 12px; font-size: 12px;
color: #4a4a4a; color: #4a4a4a;
......
pages/inspectionContent/model/tabs.vue
浏览文件 @ 409b2861
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
</view> </view>
<!-- 描述 --> <!-- 描述 -->
<view class="descript"> <view v-if="(list[activeIndex]|| {}).value" class="descript">
<view v-if="list[activeIndex].position" class="descript-item"> <view v-if="list[activeIndex].position || []" class="descript-item">
<text class="name">巡检位置</text> <text class="name">巡检位置</text>
<text class="text">{{ <text class="text">{{
list[activeIndex].position.map((item) => item.dictLabel).join("、") list[activeIndex].position.map((item) => item.dictLabel).join("、")
...@@ -47,44 +47,17 @@ export default { ...@@ -47,44 +47,17 @@ export default {
data() { data() {
return { return {
activeIndex: 0, activeIndex: 0,
list: [ list: [],
{
name: "汇聚机房",
isVaild: false, // 校验通过
type: 1, // 枚举值
position: pad_1_1_inspection_position.rows,
descript:
"痕迹检查地面、墙壁、天花板、是否有裂痕、水渍，机房内是否有鼠患、蚁患、蟑螂活动的痕迹，温湿度取最高值，正常室温：20~25℃，湿度：40~60%。",
},
{
name: "屏蔽机房",
isVaild: false, // 校验通过
type: 1, // 枚举值
position: pad_1_2_inspection_position.rows,
descript: "UPS检查包含UPS主机、UPS输入柜、UPS输出柜。",
},
{
name: "电池间",
isVaild: false, // 校验通过
type: 1, // 枚举值
position: pad_1_3_inspection_position.rows,
descript: "痕迹检查",
},
{
name: "机房值班",
isVaild: false, // 校验通过
type: 1, // 枚举值
descript: "记录哪些人员进出机房、总计次数。",
},
{
name: "值班交接",
isVaild: false, // 校验通过
type: 1, // 枚举值
descript: "未完事项交换。",
},
],
}; };
}, },
mounted() {
this.list = this.options;
},
watch: {
options(newData) {
this.list = newData;
},
},
methods: { methods: {
tabClick(index, item) { tabClick(index, item) {
this.activeIndex = index; this.activeIndex = index;
...@@ -93,21 +66,19 @@ export default { ...@@ -93,21 +66,19 @@ export default {
}, },
/** /**
* 设置单个校验状态 * 设置单个校验状态
* @param index * @param index
* @param vaild * @param vaild
* @param iSwtich 是否自动切换到下一个tab * @param iSwtich 是否自动切换到下一个tab
*/ */
setTabVaild(index, vaild = false, iSwtich=true) { setTabVaild(index, vaild = false, iSwtich = true) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.list[index].isVaild = vaild; this.list[index].isVaild = vaild;
if (iSwtich && index < this.list.length - 1) { if (iSwtich && index < this.list.length - 1) {
this.tabClick(index + 1, {}); this.tabClick(index + 1, {});
} }
resolve() resolve();
}); });
}, },
......
pages/shaftInspection/model/tabContentItem.vue
浏览文件 @ 409b2861
...@@ -167,7 +167,7 @@ export default { ...@@ -167,7 +167,7 @@ export default {
dictLabel: item.dictLabel, dictLabel: item.dictLabel,
dictValue: item.dictValue, dictValue: item.dictValue,
notes: "", // 情况摘要 notes: "", // 情况摘要
inspectionResult: 0, // 异常 inspectionResult: 0, // 异常结论
itemCode: item.dictValue, // 检查项 如:门禁 itemCode: item.dictValue, // 检查项 如:门禁
roomType, // 机房类型 roomType, // 机房类型
resultArr: [ resultArr: [
......
pages/shaftInspection/shaftInspection.vue
浏览文件 @ 409b2861
...@@ -56,9 +56,16 @@ import { ...@@ -56,9 +56,16 @@ import {
addLog, addLog,
getLogContent, getLogContent,
LOG_TYPE_ENUM, LOG_TYPE_ENUM,
writeDarf,
writeInspectionData,
} from "@/utils/IoReadingAndWriting.js"; } from "@/utils/IoReadingAndWriting.js";
import { pad_2_1_inspection_position } from "@/utils/dict.js"; import { pad_2_1_inspection_position } from "@/utils/dict.js";
const TEST =
"{"0":{"conclusion":"阿三DA","temp":[{"dictLabel":"门禁","dictValue":"1","notes":"","inspectionResult":0,"itemCode":"1","roomType":"1","resultArr":[{"value":0,"label":"正常","isActive":true},{"value":1,"label":"异常","isActive":false}],"measuredData":"","measuredDataArr":[],"postionList":[{"createBy":"admin","createTime":"2024-09-05 16:00:20","updateBy":null,"updateTime":null,"remark":null,"dictCode":1319,"dictSort":1,"dictLabel":"2楼","dictValue":"1","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:27","updateBy":null,"updateTime":null,"remark":null,"dictCode":1320,"dictSort":2,"dictLabel":"4楼","dictValue":"2","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:34","updateBy":null,"updateTime":null,"remark":null,"dictCode":1321,"dictSort":3,"dictLabel":"6楼","dictValue":"3","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:41","updateBy":null,"updateTime":null,"remark":null,"dictCode":1322,"dictSort":4,"dictLabel":"8楼","dictValue":"4","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:46","updateBy":null,"updateTime":null,"remark":null,"dictCode":1323,"dictSort":5,"dictLabel":"10楼","dictValue":"5","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:51","updateBy":null,"updateTime":null,"remark":null,"dictCode":1324,"dictSort":6,"dictLabel":"12楼","dictValue":"6","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:57","updateBy":null,"updateTime":null,"remark":null,"dictCode":1325,"dictSort":7,"dictLabel":"14楼","dictValue":"7","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:08","updateBy":null,"updateTime":null,"remark":null,"dictCode":1326,"dictSort":8,"dictLabel":"16楼","dictValue":"8","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:17","updateBy":null,"updateTime":null,"remark":null,"dictCode":1327,"dictSort":9,"dictLabel":"18楼","dictValue":"9","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:26","updateBy":null,"updateTime":null,"remark":null,"dictCode":1328,"dictSort":10,"dictLabel":"20楼","dictValue":"10","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false}]},{"dictLabel":"卫生","dictValue":"2","notes":"","inspectionResult":0,"itemCode":"2","roomType":"1","resultArr":[{"value":0,"label":"正常","isActive":true},{"value":1,"label":"异常","isActive":false}],"measuredData":"","measuredDataArr":[],"postionList":[{"createBy":"admin","createTime":"2024-09-05 16:00:20","updateBy":null,"updateTime":null,"remark":null,"dictCode":1319,"dictSort":1,"dictLabel":"2楼","dictValue":"1","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:27","updateBy":null,"updateTime":null,"remark":null,"dictCode":1320,"dictSort":2,"dictLabel":"4楼","dictValue":"2","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:34","updateBy":null,"updateTime":null,"remark":null,"dictCode":1321,"dictSort":3,"dictLabel":"6楼","dictValue":"3","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:41","updateBy":null,"updateTime":null,"remark":null,"dictCode":1322,"dictSort":4,"dictLabel":"8楼","dictValue":"4","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:46","updateBy":null,"updateTime":null,"remark":null,"dictCode":1323,"dictSort":5,"dictLabel":"10楼","dictValue":"5","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:51","updateBy":null,"updateTime":null,"remark":null,"dictCode":1324,"dictSort":6,"dictLabel":"12楼","dictValue":"6","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:57","updateBy":null,"updateTime":null,"remark":null,"dictCode":1325,"dictSort":7,"dictLabel":"14楼","dictValue":"7","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:08","updateBy":null,"updateTime":null,"remark":null,"dictCode":1326,"dictSort":8,"dictLabel":"16楼","dictValue":"8","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:17","updateBy":null,"updateTime":null,"remark":null,"dictCode":1327,"dictSort":9,"dictLabel":"18楼","dictValue":"9","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:26","updateBy":null,"updateTime":null,"remark":null,"dictCode":1328,"dictSort":10,"dictLabel":"20楼","dictValue":"10","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false}]},{"dictLabel":"设备告警","dictValue":"3","notes":"","inspectionResult":0,"itemCode":"3","roomType":"1","resultArr":[{"value":0,"label":"正常","isActive":true},{"value":1,"label":"异常","isActive":false}],"measuredData":"","measuredDataArr":[],"postionList":[{"createBy":"admin","createTime":"2024-09-05 16:00:20","updateBy":null,"updateTime":null,"remark":null,"dictCode":1319,"dictSort":1,"dictLabel":"2楼","dictValue":"1","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:27","updateBy":null,"updateTime":null,"remark":null,"dictCode":1320,"dictSort":2,"dictLabel":"4楼","dictValue":"2","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:34","updateBy":null,"updateTime":null,"remark":null,"dictCode":1321,"dictSort":3,"dictLabel":"6楼","dictValue":"3","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:41","updateBy":null,"updateTime":null,"remark":null,"dictCode":1322,"dictSort":4,"dictLabel":"8楼","dictValue":"4","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:46","updateBy":null,"updateTime":null,"remark":null,"dictCode":1323,"dictSort":5,"dictLabel":"10楼","dictValue":"5","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:51","updateBy":null,"updateTime":null,"remark":null,"dictCode":1324,"dictSort":6,"dictLabel":"12楼","dictValue":"6","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:00:57","updateBy":null,"updateTime":null,"remark":null,"dictCode":1325,"dictSort":7,"dictLabel":"14楼","dictValue":"7","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:08","updateBy":null,"updateTime":null,"remark":null,"dictCode":1326,"dictSort":8,"dictLabel":"16楼","dictValue":"8","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:17","updateBy":null,"updateTime":null,"remark":null,"dictCode":1327,"dictSort":9,"dictLabel":"18楼","dictValue":"9","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false},{"createBy":"admin","createTime":"2024-09-05 16:01:26","updateBy":null,"updateTime":null,"remark":null,"dictCode":1328,"dictSort":10,"dictLabel":"20楼","dictValue":"10","dictType":"pad_2_1_floor","cssClass":null,"listClass":"default","isDefault":"N","status":"0","default":false,"isActive":false}]}]}}";
import { Base64 } from "js-base64";
export default { export default {
components: { components: {
Tabs, Tabs,
...@@ -78,6 +85,9 @@ export default { ...@@ -78,6 +85,9 @@ export default {
mounted() { mounted() {
this.baseInfo = this.$store.state.temp_data; this.baseInfo = this.$store.state.temp_data;
this.init(); this.init();
// const test = Base64.decode(TEST)
// console.log("------",JSON.parse(test))
}, },
methods: { methods: {
...@@ -85,6 +95,7 @@ export default { ...@@ -85,6 +95,7 @@ export default {
this.tabList = pad_2_1_inspection_position.rows.map((item, index) => { this.tabList = pad_2_1_inspection_position.rows.map((item, index) => {
return { return {
name: item.dictLabel, name: item.dictLabel,
value: item.dictValue,
isVaild: false, // 校验通过 isVaild: false, // 校验通过
// type: 1, // 枚举值 // type: 1, // 枚举值
position: pad_2_1_inspection_position.rows, position: pad_2_1_inspection_position.rows,
...@@ -105,26 +116,96 @@ export default { ...@@ -105,26 +116,96 @@ export default {
uni.navigateBack(); uni.navigateBack();
}, },
// 处理提交数据
getParams() {
const baseInfo = this.baseInfo;
const tempForm = this.tempForm;
const fillCheck = this.tabList.map((item) => item.value).join(",");
const temp = this.tabList.map((item, index) => {
const items = tempForm[index].temp.map((ele) => {
return {
itemCode: ele.itemCode,
measuredData: ele.measuredData,
inspectionResult: ele.inspectionResult,
};
});
const isException = tempForm[index].temp.filter(
(item) => item.inspectionResult > 0
).length
? 1
: 0;
return {
...baseInfo,
isSubmit: 1,
conclusion: tempForm[index].conclusion,
fillCheck,
position: item.value,
isException,
items,
};
});
return temp;
},
// 提交按钮 // 提交按钮
submit() { submit() {
this.draft(this.activeTabIndex, false, false).then(() => { this.draft(this.activeTabIndex, false, false).then(() => {
const vaild = this.$refs.tabs.isAllVails(); const vaild = this.$refs.tabs.isAllVails();
uni.showToast({
icon: `${vaild ? "success" : "error"}`,
title: `${vaild ? "校验通过" : "请完善填写内容"}`,
});
if (vaild) { if (vaild) {
/** /**
* 校验通过, * 校验通过,
* 1.更新 store数据, * 1.更新 store 数据,
* 2. 巡检list文件 * 2. 巡检list文件
* 3.清空草稿文件数据、store草稿数据 * 3.清空草稿文件数据、store草稿数据
*/ */
const params = this.getParams();
const all_user_data = this.$store.state.all_user_data;
const temp = {
...params[0],
items: [],
originData: {
baseInfo: this.baseInfo,
tempForm: this.tempForm,
},
};
temp[this.baseInfo.inspectionCode] = params;
all_user_data.push(temp);
// 更新巡检list
this.$store.commit("SET_ALL_USER_DATA", all_user_data);
writeInspectionData(all_user_data);
// 更新日志
const logContent = getLogContent(LOG_TYPE_ENUM.add);
const log_list = this.$store.state.log_list;
log_list.push(logContent);
this.$store.commit("SET_LOG_LIST", log_list);
addLog(log_list).then((res) => {
console.log("日志文件写入成功");
});
// 清空草稿数据
this.$store.commit("SET_DARF_DATA", {}); // 缓存[巡检信息]
writeDarf("").then((res) => {
console.log("写入草稿文件成功");
});
// 清空基础缓存信息
this.$store.commit("SET_TEMP_DATA", {}); // 缓存[巡检信息]
console.log("--提交--", params);
} }
console.log("基础信息", this.baseInfo); uni.showToast({
console.log("巡检信息", this.baseInfo); icon: `${vaild ? "success" : "error"}`,
title: `${vaild ? "提交成功" : "请完善填写内容"}`,
});
}); });
}, },
...@@ -137,30 +218,39 @@ export default { ...@@ -137,30 +218,39 @@ export default {
.setTabVaild(activeTabIndex, vaild, iSwtich) .setTabVaild(activeTabIndex, vaild, iSwtich)
.then(() => { .then(() => {
this.tempForm[activeTabIndex] = formData; this.tempForm[activeTabIndex] = formData;
console.log("--this.tempForm--", formData); console.log("--xxxx--", {
...this.tempForm,
...this.baseInfo,
});
if (isSave) { if (isSave) {
// 更新store 和 [草稿文件] 日志数据 // 更新store 和 [草稿文件] 日志数据
console.log("--保存草稿--"); console.log("--保存草稿--");
this.$store.commit("SET_DARF_DATA", this.tempForm); // 缓存[巡检信息]
// // 新增日志信息 // // 新增日志信息
// const logContent = getLogContent(LOG_TYPE_ENUM.darf); const logContent = getLogContent(LOG_TYPE_ENUM.darf);
// const log_list = this.$store.state.log_list const log_list = this.$store.state.log_list;
// console.log("-SET_LOG_LIST--", log_list , logContent); log_list.push(logContent);
this.$store.commit("SET_LOG_LIST", log_list);
// const temp = [...log_list] addLog(log_list).then((res) => {
console.log("日志文件写入成功");
// console.log("-xxxxx--", temp); });
// // this.$store.commit("SET_LOG_LIST", []); // 写入草稿文件 更新 store 草稿内容
this.$store.commit("SET_DARF_DATA", {
// addLog(temp).then((res) => { ...this.tempForm,
// console.log("日志文件写入成功"); ...this.baseInfo,
// }); }); // 缓存[巡检信息]
writeDarf({
// 写入草稿文件 ...this.tempForm,
// ...BatteryRoom.. ...this.baseInfo,
}).then((res) => {
console.log("写入草稿文件成功");
uni.showToast({
icon: "success",
title: "保存草稿成功",
});
});
} }
resolve(); resolve();
}); });
......
pages/synchronousManagement/dialog.vue
浏览文件 @ 409b2861
...@@ -43,9 +43,10 @@ import { ...@@ -43,9 +43,10 @@ import {
checkAndCreateDirectory, checkAndCreateDirectory,
createFileWithPlusIO, createFileWithPlusIO,
setSm2, setSm2,
TEST,
} from "@/utils/systemCofig"; } from "@/utils/systemCofig";
import getDateTime from "@/common/getdateTime.js"; import getDateTime from "@/common/getdateTime.js";
import { Base64 } from "js-base64";
export default { export default {
components: {}, components: {},
...@@ -64,10 +65,11 @@ export default { ...@@ -64,10 +65,11 @@ export default {
packedData() { packedData() {
this.loading = true; this.loading = true;
const userName = this.$store.state.now_user.name; const userName = this.$store.state.now_user.name;
const all_user_data = this.$store.state.all_user_data;
let timeStr = getDateTime.dateTimeStr("y-m-d h-i-s"); let timeStr = getDateTime.dateTimeStr("y-m-d h-i-s");
let fileName = `${userName}${timeStr}.txt`; let fileName = `${userName}${timeStr}.txt`;
const fileContent = setSm2(TEST); const fileContent = setSm2( Base64.encode(JSON.stringify(all_user_data)));
createFileWithPlusIO( createFileWithPlusIO(
`${SYNCHRONIZE_DATA_PAD}/同步数据`, `${SYNCHRONIZE_DATA_PAD}/同步数据`,
fileName, fileName,
...@@ -76,24 +78,25 @@ export default { ...@@ -76,24 +78,25 @@ export default {
.then((res) => { .then((res) => {
console.log("---写入成功", res); console.log("---写入成功", res);
setTimeout(() => {
uni.showToast({ uni.showToast({
title: "打包成功", title: "打包成功",
icon: "none", icon: "none",
duration: 2000, duration: 2000,
}); });
this.close();
this.loading = false; this.loading = false;
this.close() }, 2 * 1000);
}) })
.catch(() => { .catch(() => {
uni.showToast({ setTimeout(() => {
title: "打包失败", uni.showToast({
icon: "none", title: "打包失败",
duration: 2000, icon: "none",
}); duration: 2000,
this.loading = false; });
this.loading = false;
}, 2 * 1000);
}); });
}, },
}, },
......
pages/synchronousManagement/index.vue
浏览文件 @ 409b2861
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
<!-- 结果 --> <!-- 结果 -->
<view class="synchronous-management-content"> <view class="synchronous-management-content">
<view class="count-tatal"> <view class="count-tatal">
<text class="num">123条</text> <text class="num">{{ list.length || 0 }}条</text>
<text>查询结果</text> <text>查询结果</text>
</view> </view>
<view class="month-list"> <view class="month-list">
<!-- 每月记录 --> <!-- 每月记录 -->
<view class="month-record-item" v-for="item in 20" :key="item"> <view class="month-record-item" v-for="(item, index) in list" :key="index">
<view class="seconed-title"> 2024年08月 </view> <view class="seconed-title"> 2024年08月 </view>
<view class="inspect-list"> <view class="inspect-list">
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
<!-- 数据打包 --> <!-- 数据打包 -->
<view class="synchronous-button" @click="openDialog(true)">数据打包</view> <view class="synchronous-button" @click="openDialog(true)">数据打包</view>
<!-- 打包弹窗 --> <!-- 打包弹窗 -->
<Dialog v-show="isDialog" @close="openDialog(false)"></Dialog> <Dialog v-show="isDialog" @close="openDialog(false)"></Dialog>
...@@ -37,25 +36,30 @@ import SearchCom from "@/components/searchCom/index.vue"; ...@@ -37,25 +36,30 @@ import SearchCom from "@/components/searchCom/index.vue";
import InspectionItem from "@/components/inspectionItem/index.vue"; import InspectionItem from "@/components/inspectionItem/index.vue";
import Dialog from "./dialog.vue"; import Dialog from "./dialog.vue";
export default { export default {
components: { components: {
SearchCom, SearchCom,
InspectionItem, InspectionItem,
Dialog Dialog,
}, },
data() { data() {
return { return {
isDialog: false, // isDialog: false, //
list: [], // 展示数据
all_user_data: [], // 所有数据
}; };
}, },
mounted() {
this.all_user_data = this.list = this.$store.state.all_user_data || [];
console.log("this.all_user_data", this.all_user_data)
},
methods: { methods: {
change(e) { change(e) {
console.log("----", e); console.log("----", e);
}, },
openDialog(show){ openDialog(show) {
this.isDialog = show; this.isDialog = show;
} },
}, },
}; };
</script> </script>
......
store/index.js
浏览文件 @ 409b2861
...@@ -76,8 +76,8 @@ const store = new Vuex.Store({ ...@@ -76,8 +76,8 @@ const store = new Vuex.Store({
state.all_user_data = payload; state.all_user_data = payload;
}, },
SET_LOG_LIST(state, payload) { SET_LOG_LIST(state, payload) {
console.log("payload", payload) console.log("payload", payload);
// 保存 日志文件 // 保存 日志文件
state.log_list = payload; state.log_list = payload;
}, },
}, },
......
unpackage/dist/dev/app-plus/app-service.js
浏览文件 @ 409b2861
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/app-view.js
浏览文件 @ 409b2861
This source diff could not be displayed because it is too large. You can view the blob instead.
utils/IoReadingAndWriting.js
浏览文件 @ 409b2861
...@@ -11,6 +11,8 @@ import { ...@@ -11,6 +11,8 @@ import {
import moment from "moment"; import moment from "moment";
import store from "../store/index"; import store from "../store/index";
import { Base64 } from "js-base64";
//日志类型 //日志类型
export const LOG_TYPE_ENUM = { export const LOG_TYPE_ENUM = {
login: "登录", login: "登录",
...@@ -46,11 +48,10 @@ export const addLog = (content) => { ...@@ -46,11 +48,10 @@ export const addLog = (content) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const now_user = store.state.now_user; const now_user = store.state.now_user;
let timeStr = moment().format("yyyy-MM-DD"); let timeStr = moment().format("yyyy-MM-DD");
let fileName = `${now_user.user}${timeStr}.txt`; let fileName = `${now_user.user}.txt`;
const fileContent = JSON.stringify(content); // 方便验证 const fileContent = Base64.encode(JSON.stringify(content)); // 方便验证
// const fileContent = setSm2(content) // 正式使用 console.log("-fileContent-", fileContent);
console.log('-fileContent-', fileContent)
createFileWithPlusIO( createFileWithPlusIO(
`${SYNCHRONIZE_DATA_PAD}/日志文件`, `${SYNCHRONIZE_DATA_PAD}/日志文件`,
...@@ -67,22 +68,45 @@ export const addLog = (content) => { ...@@ -67,22 +68,45 @@ export const addLog = (content) => {
// 读取日志 // 读取日志
export const getLog = () => {}; export const getLog = () => {};
// 写入草稿文件 // 写入草稿文件
export const writeDarf = (content) => { export const writeDarf = (content) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const now_user = store.state.now_user; const now_user = store.state.now_user;
let fileName = `${now_user.user}.txt`; let fileName = `${now_user.user}.txt`;
const fileContent = JSON.stringify(content); let fileContent =
resolve.length == 0 ? "" : Base64.encode(JSON.stringify(content));
createFileWithPlusIO( createFileWithPlusIO(
`${SYNCHRONIZE_DATA_PAD}/草稿文件/`, `${SYNCHRONIZE_DATA_PAD}/草稿文件`,
fileName, fileName,
fileContent fileContent
).then((res) => { ).then((res) => {
// console.log("---写入成功", res); // console.log("---写入成功", res);
resolve(); resolve();
}); });
}) });
} };
\ No newline at end of file
// 写入【巡检数据】文件
export const writeInspectionData = (content) => {
return new Promise((resolve, reject) => {
const now_user = store.state.now_user;
let timeStr = moment().format("yyyy-MM-DD");
let fileName = `${timeStr}.txt`;
const temp = Base64.encode(JSON.stringify(content));
const fileContent = setSm2(temp) // 正式使用
console.log("-fileContent-", fileContent);
createFileWithPlusIO(
`${SYNCHRONIZE_DATA_PAD}/巡检数据/${now_user.user}`,
fileName,
fileContent
).then((res) => {
// console.log("---写入成功", res);
resolve();
});
});
};
utils/systemCofig.js
浏览文件 @ 409b2861
...@@ -25,7 +25,7 @@ export const USER_LiST = [ ...@@ -25,7 +25,7 @@ export const USER_LiST = [
oid: "scq", oid: "scq",
}, },
{ {
id: 2, id: 3,
user: "sbjxj", // 测试账号 user: "sbjxj", // 测试账号
passWord: "JF85250920", passWord: "JF85250920",
areaName: "市本级", areaName: "市本级",
...@@ -34,7 +34,7 @@ export const USER_LiST = [ ...@@ -34,7 +34,7 @@ export const USER_LiST = [
oid: "sbj", oid: "sbj",
}, },
{ {
id: 3, id: 4,
user: "xhqxj", user: "xhqxj",
passWord: "JF85250920", passWord: "JF85250920",
areaName: "西湖区", areaName: "西湖区",
...@@ -43,7 +43,7 @@ export const USER_LiST = [ ...@@ -43,7 +43,7 @@ export const USER_LiST = [
oid: "xhq", oid: "xhq",
}, },
{ {
id: 4, id: 5,
user: "scqxj", user: "scqxj",
passWord: "JF85250920", passWord: "JF85250920",
areaName: "上城区", areaName: "上城区",
...@@ -52,7 +52,7 @@ export const USER_LiST = [ ...@@ -52,7 +52,7 @@ export const USER_LiST = [
oid: "scq", oid: "scq",
}, },
{ {
id: 5, id: 6,
user: "gsqxj", user: "gsqxj",
passWord: "JF85250920", passWord: "JF85250920",
areaName: "拱墅区", areaName: "拱墅区",
...@@ -61,7 +61,7 @@ export const USER_LiST = [ ...@@ -61,7 +61,7 @@ export const USER_LiST = [
oid: "gsq", oid: "gsq",
}, },
{ {
id: 6, id: 7,
user: "bjqxj", user: "bjqxj",
passWord: "JF85250920", passWord: "JF85250920",
areaName: "滨江区", areaName: "滨江区",
...@@ -70,7 +70,7 @@ export const USER_LiST = [ ...@@ -70,7 +70,7 @@ export const USER_LiST = [
oid: "bjq", oid: "bjq",
}, },
{ {
id: 7, id: 8,
user: "xsqxj", user: "xsqxj",
passWord: "JF85250920", passWord: "JF85250920",
areaName: "萧山区", areaName: "萧山区",
...@@ -79,7 +79,7 @@ export const USER_LiST = [ ...@@ -79,7 +79,7 @@ export const USER_LiST = [
oid: "xsq", oid: "xsq",
}, },
{ {
id: 8, id: 9,
user: "lpqxj", user: "lpqxj",
passWord: "JF85250920", passWord: "JF85250920",
areaName: "临平区", areaName: "临平区",
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论