Skip to content

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

fix(功能走查)： 功能走查80%

上级 a529e2fc
显示空白字符变更
内嵌 并排
正在显示 包含 98 行增加 和 56 行删除
components/inspectionItem/index.vue
浏览文件 @ 8f6f2d0a
......@@ -12,7 +12,7 @@
details.synchronization == 0 ? "待同步" : "已同步"
}}</text>
<view v-if="details.isException == 1" class="status alarm">
<view v-if="details.isException == 2" class="status alarm">
<text class="iconfont icon-yichang1"></text>
<text>有异常</text></view
>
......
pages/inspection/inspFirst.vue
浏览文件 @ 8f6f2d0a
......@@ -108,7 +108,7 @@ export default {
inspectionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
inspectionBy: this.$store.state.now_user.name,
inspectionById: this.$store.state.now_user.id,
cureatByName: this.$store.state.now_user.user,
createByName: this.$store.state.now_user.user,
isException: "", // 是否有异常
position: "", // 位置
isSubmit: "", // 0 是草稿态； 1 是正式提交
......
pages/inspectionContent/inspectionContent.vue
浏览文件 @ 8f6f2d0a
......@@ -15,7 +15,11 @@
<block slot="right">
<view class="nav-right">
<view v-if="isOperationPermissions" class="uni-nav-bar-text" @click="deleteClick">
<view
v-if="isOperationPermissions"
class="uni-nav-bar-text"
@click="deleteClick"
>
<text class="iconfont icon-delete"></text
></view>
......@@ -82,7 +86,7 @@
></DutyHandover>
</view>
<view v-if=" isOperationPermissions && !isDisable" class="fixed-btns">
<view v-if="isOperationPermissions && !isDisable" class="fixed-btns">
<view class="button-group">
<!-- isSubmit 标识： 0 是草稿态； 1 是正式提交 -->
<view
......@@ -185,16 +189,18 @@ export default {
},
detailsInfo: {}, // 详情
isDisable: false, // 禁用
loading: false,
};
},
computed: {
userInfo() {
return this.$store.state.now_user || {};
},
isOperationPermissions(){ // 是否有操作权限
const {uid, cureatByName} = this.detailsInfo;
return !uid || (uid && cureatByName == this.userInfo.user)
}
isOperationPermissions() {
// 是否有操作权限
const { uid, createByName } = this.detailsInfo;
return !uid || (uid && createByName == this.userInfo.user);
},
},
onLoad(options) {
this.isDisable = options.isDisable == 1 ? true : false;
......@@ -214,7 +220,7 @@ export default {
this.tempForm = darf_data.originData.tempForm;
console.log("获取草稿数据---", darf_data);
this.detailsInfo = darf_data;
this.init()
this.init();
uni.hideLoading();
})
......@@ -229,7 +235,7 @@ export default {
}
},
mounted() {
this.init()
this.init();
},
methods: {
......@@ -256,7 +262,7 @@ export default {
getInspectionDetails(uid)
.then((res) => {
console.log("-getInspectionDetails--", res)
console.log("-getInspectionDetails--", res);
const detailsInfo = res;
this.baseInfo = detailsInfo.originData.baseInfo;
......@@ -266,8 +272,7 @@ export default {
this.isDisable = this.isDisable || detailsInfo.synchronization == 1;
uni.hideLoading();
this.init()
this.init();
})
.catch((error) => {
uni.showToast({
......@@ -329,7 +334,7 @@ export default {
`${detailsInfo.recordName}(${detailsInfo.inspectionCode})`,
"巡检模块"
);
logContent.inspectionType = detailsInfo.inspectionType
logContent.inspectionType = detailsInfo.inspectionType;
log_list.push(logContent);
this.$store.commit("SET_LOG_LIST", log_list);
......@@ -416,8 +421,8 @@ export default {
});
const isException = items.filter((item) => item.inspectionResult > 0)
.length
? 1
: 2;
? 2
: 1;
return {
...temp,
......@@ -437,6 +442,7 @@ export default {
this.draft(this.activeTabIndex, false, false).then(() => {
const vaild = this.$refs.tabs.isAllVails();
const uid = this.detailsInfo.uid;
this.loading = true;
if (vaild) {
/**
......@@ -462,7 +468,6 @@ export default {
`${params.recordName}(${params.inspectionCode})`,
"巡检模块"
);
} else {
params.uid = new Date().getTime(); // 唯一标识 pad 端使用
all_data.push(params);
......@@ -479,7 +484,7 @@ export default {
// 更新日志
const log_list = this.$store.state.log_list;
logContent.inspectionType = params.inspectionType
logContent.inspectionType = params.inspectionType;
log_list.push(logContent);
this.$store.commit("SET_LOG_LIST", log_list);
......@@ -498,13 +503,18 @@ export default {
this.$store.commit("SET_TEMP_DATA", {}); // 缓存[巡检信息]
console.log("--提交--", params);
this.loading = false;
}
uni.showToast({
icon: `${vaild ? "success" : "error"}`,
title: `${vaild ? "校验通过" : "请完善填写内容"}`,
});
if (!vaild) {
this.loading = false;
return;
}
......@@ -541,12 +551,14 @@ export default {
refName = "DutyHandover";
break;
}
if (this.loading) return;
this.$refs[refName].vaildForm().then(({ vaild, formData }) => {
this.$refs.tabs
.setTabVaild(activeTabIndex, vaild, iSwtich)
.then(() => {
this.tempForm[activeTabIndex] = formData;
this.loading = true;
if (isSave) {
console.log("--保存草稿--");
......@@ -571,7 +583,7 @@ export default {
`${params.recordName}(${params.inspectionCode})`,
"巡检模块"
);
logContent.inspectionType = params.inspectionType
logContent.inspectionType = params.inspectionType;
const log_list = this.$store.state.log_list;
log_list.push(logContent);
......@@ -579,7 +591,12 @@ export default {
addLog(log_list).then((res) => {
console.log("日志文件写入成功");
});
this.loading = false;
} else {
this.loading = false;
}
resolve();
});
});
......
pages/shaftInspection/shaftInspection.vue
浏览文件 @ 8f6f2d0a
......@@ -128,8 +128,8 @@ export default {
return this.$store.state.now_user || {};
},
isOperationPermissions(){ // 是否有操作权限
const {uid, cureatByName} = this.detailsInfo;
return !uid || (uid && cureatByName == this.userInfo.user)
const {uid, createByName} = this.detailsInfo;
return !uid || (uid && createByName == this.userInfo.user)
}
},
......@@ -315,8 +315,8 @@ export default {
const isException = ((tempForm[index] || {}).temp || []).filter(
(item) => item.inspectionResult > 0
).length
? 1
: 2;
? 2
: 1;
return {
...baseInfo,
......@@ -333,7 +333,7 @@ export default {
...temp[0],
isSubmit: 0,
isException: temp.filter((item) => item.isException > 0).length ? 1 : 2, // 总的数据
isException: temp.filter((item) => item.isException > 1).length ? 2 : 1, // 总的数据
items: [],
synchronization: 0, // 是否导出过
submitTime: moment().format("yyyy-MM-DD"), // 记录提交时间
......
pages/synchronousManagement/dialog.vue
浏览文件 @ 8f6f2d0a
......@@ -76,7 +76,6 @@ export default {
});
},
methods: {
change(e) {},
close() {
this.$emit("close");
},
......@@ -132,13 +131,12 @@ export default {
originData: [],
};
}); // 机房数据类型是 1
const JDXJ_DATA = notSynchronizationList.filter(
(item) => item.inspectionType == 2
); // 井道数据类型是 2
this.loading = true;
Promise.all([
this.packedData(JFXJ_DATA, JFXJ_DATA_FILE_NAME),
this.packedData(JDXJ_DATA, JDXJ_DATA_FILE_NAME),
......@@ -146,19 +144,31 @@ export default {
.then(() => {
// 更新巡检数据状态
const synchronizationUids = notSynchronizationList.map((item) => {
item.synchronization = 1;
return item.uid;
});
const userData = {};
allList.forEach((item) => {
if (synchronizationUids.includes(item.uid)) {
item.synchronization = 1;
}
if (userData[item.createByName]) {
userData[item.createByName].push(item);
} else {
userData[item.createByName] = [item];
}
});
this.$store.commit("SET_ALL_DATA", allList);
writeInspectionData(allList)
const keys = Object.keys(userData);
const promiseArr = keys.map((key) => {
const val = userData[key];
return writeInspectionData(val, key);
});
Promise.all(promiseArr)
.then(() => {
setTimeout(() => {
uni.showToast({
......@@ -206,9 +216,21 @@ export default {
});
},
// 更新当前用户数据 || 更新所有数据
updateData(userData) {
const keys = Object.keys(userData);
const promiseArr = keys.map((key) => {
const val = userData[key];
return writeInspectionData(val);
});
return Promise.all(promiseArr).then();
},
// 打包文件
packedData(content, fileName) {
const fileContent = setSm2(content);
return createFileWithPlusIO(
`${SYNCHRONIZE_DATA_PAD}/发送数据`,
fileName,
......
utils/IoReadingAndWriting.js
浏览文件 @ 8f6f2d0a
......@@ -10,7 +10,7 @@ import {
readFileContent,
readFilesInDirectory,
checkFileExists,
FILE_ENUM
FILE_ENUM,
} from "./systemCofig";
import moment from "moment";
import lodash from "lodash";
......@@ -77,11 +77,13 @@ export const readLogData = () => {
const now_user = store.state.now_user;
const isAdmin = now_user.isAdmin;
const directoryPath =isAdmin?`${SYNCHRONIZE_DATA_PAD}/日志文件`:`${SYNCHRONIZE_DATA_PAD}/日志文件/${now_user.user}`;
const directoryPath = isAdmin
? `${SYNCHRONIZE_DATA_PAD}/日志文件`
: `${SYNCHRONIZE_DATA_PAD}/日志文件/${now_user.user}`;
return new Promise((resolve, reject) => {
readFilesInDirectory(directoryPath)
.then((res) => {
console.log("--读取日志-, ",directoryPath, res)
console.log("--读取日志-, ", directoryPath, res);
const temp = res.map((element) => {
return JSON.parse(Base64.decode(element));
......@@ -120,10 +122,8 @@ export const readDarfData = () => {
console.log("-directoryPath--", directoryPath);
return new Promise((resolve, reject) => {
checkFileExists(
`${SYNCHRONIZE_DATA_PAD}/草稿文件`,
`${now_user.user}.txt`
).then((fileEntry) => {
checkFileExists(`${SYNCHRONIZE_DATA_PAD}/草稿文件`, `${now_user.user}.txt`)
.then((fileEntry) => {
// 文件存在，
return readFileContent(fileEntry)
.then((res) => {
......@@ -137,10 +137,10 @@ export const readDarfData = () => {
.catch((error) => {
reject(error);
});
}).catch((error) => {
reject(error);
})
.catch((error) => {
reject(error);
});
});
};
......@@ -150,20 +150,21 @@ export const readDarfData = () => {
* @param {*} isEncryption 是否加密
* @returns
*/
export const writeInspectionData = (content, isEncryption = false) => {
export const writeInspectionData = (content, useName) => {
return new Promise((resolve, reject) => {
const now_user = store.state.now_user;
const isAdmin = now_user.isAdmin;
let timeStr = moment().format("yyyy-MM-DD");
let fileName = `${timeStr}.txt`;
console.log("写入-巡检数据--", content);
// isEncryption;
console.log("写入-巡检数据- 路劲-", `${SYNCHRONIZE_DATA_PAD}/巡检数据/${isAdmin ? useName: now_user.user}`);
const temp = Base64.encode(JSON.stringify(content));
const fileContent = isEncryption ? setSm2(temp) : temp;
const fileContent = Base64.encode(JSON.stringify(content));
createFileWithPlusIO(
`${SYNCHRONIZE_DATA_PAD}/巡检数据/${now_user.user}`,
`${SYNCHRONIZE_DATA_PAD}/巡检数据/${isAdmin ? useName: now_user.user}`,
fileName,
fileContent
).then((res) => {
......@@ -178,7 +179,10 @@ export const writeInspectionData = (content, isEncryption = false) => {
export const readInspectionData = () => {
const now_user = store.state.now_user;
const isAdmin = now_user.isAdmin;
const directoryPath = isAdmin?`${SYNCHRONIZE_DATA_PAD}/巡检数据`:`${SYNCHRONIZE_DATA_PAD}/巡检数据/${now_user.user}`;
const directoryPath = isAdmin
? `${SYNCHRONIZE_DATA_PAD}/巡检数据`
: `${SYNCHRONIZE_DATA_PAD}/巡检数据/${now_user.user}`;
console.log("---directoryPath", directoryPath)
return new Promise((resolve, reject) => {
readFilesInDirectory(directoryPath)
......@@ -248,7 +252,7 @@ export function copyDirectory(sourceDirectoryPath, targetDirectoryPath) {
console.error("创建目标目录失败:", error.message);
reject({
...FILE_ENUM.copyFileError
...FILE_ENUM.copyFileError,
});
}
);
......@@ -269,7 +273,7 @@ export function copyDirectory(sourceDirectoryPath, targetDirectoryPath) {
console.error("copyDirectory:", error);
reject({
...FILE_ENUM.createFileError
...FILE_ENUM.createFileError,
});
}
);
......@@ -280,7 +284,7 @@ export function copyDirectory(sourceDirectoryPath, targetDirectoryPath) {
console.error("copyDirectory:", error);
reject({
...FILE_ENUM.readDirectoryError
...FILE_ENUM.readDirectoryError,
});
}
);
......@@ -289,7 +293,7 @@ export function copyDirectory(sourceDirectoryPath, targetDirectoryPath) {
console.error("copyDirectory:", error);
reject({
...FILE_ENUM.readDirectoryError
...FILE_ENUM.readDirectoryError,
});
}
);
......@@ -298,7 +302,7 @@ export function copyDirectory(sourceDirectoryPath, targetDirectoryPath) {
console.error("copyDirectory:", error);
reject({
...FILE_ENUM.getDirectoryError
...FILE_ENUM.getDirectoryError,
});
}
);
......@@ -307,7 +311,7 @@ export function copyDirectory(sourceDirectoryPath, targetDirectoryPath) {
console.error("copyDirectory:", error);
reject({
...FILE_ENUM.fileSystemError
...FILE_ENUM.fileSystemError,
});
}
);
......@@ -356,7 +360,7 @@ export function deleteAllFilesInDirectory(directoryPath) {
console.error("deleteAllFilesInDirectory:", error);
reject({
...FILE_ENUM.deleteFileError
...FILE_ENUM.deleteFileError,
});
}
);
......@@ -367,7 +371,7 @@ export function deleteAllFilesInDirectory(directoryPath) {
console.error("deleteAllFilesInDirectory:", error);
reject({
...FILE_ENUM.readDirectoryError
...FILE_ENUM.readDirectoryError,
});
}
);
......@@ -376,9 +380,8 @@ export function deleteAllFilesInDirectory(directoryPath) {
console.error("deleteAllFilesInDirectory:", error);
reject({
...FILE_ENUM.getDirectoryError
...FILE_ENUM.getDirectoryError,
});
}
);
},
......@@ -386,7 +389,7 @@ export function deleteAllFilesInDirectory(directoryPath) {
console.error("deleteAllFilesInDirectory:", error);
reject({
...FILE_ENUM.fileSystemError
...FILE_ENUM.fileSystemError,
});
}
);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论