Skip to content

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

fix(Pad): 井道数回显完成

上级 af224f81
显示空白字符变更
内嵌 并排
正在显示 包含 189 行增加 和 105 行删除
pages/inspectionContent/inspectionContent.vue
浏览文件 @ c58687b4
......@@ -170,13 +170,24 @@ export default {
onLoad(options) {
this.init();
if (options.uid) {
// 获取详情
this.getDetails(options.uid);
} else if (options.isDarf) {
// 获取草稿数据
const darf_data = this.$store.state.darf_data;
this.baseInfo = darf_data.originData.baseInfo;
this.tempForm = darf_data.originData.tempForm;
console.log("获取草稿数据---", darf_data);
this.detailsInfo = darf_data;
}
},
mounted() {
if (this.detailsInfo.inspectionType) {
const fillCheck = this.detailsInfo.fillCheck.split(",")
this.tabList.forEach((item, index) => {
this.setComponentData(index, this.tempForm[index]);
item.isVaild = fillCheck.includes(item.value)
this.tempForm[index] && this.setComponentData(index, this.tempForm[index]);
});
} else {
this.baseInfo = this.$store.state.temp_data;
......@@ -285,7 +296,7 @@ export default {
const tempForm = this.tempForm;
const baseInfo = this.baseInfo;
const fillCheck = tabList.map((item) => item.value).join(",");
const fillCheck = tabList.filter(item => item.isVaild). map((item) => item.value).join(",");
let temp = {
...baseInfo,
isSubmit: 1,
......@@ -459,15 +470,11 @@ export default {
});
// 写入草稿文件 更新 store 草稿内容
this.$store.commit("SET_DARF_DATA", {
...this.tempForm,
...this.baseInfo,
});
// 缓存[巡检信息]
writeDarf({
...this.tempForm,
...this.baseInfo,
}).then((res) => {
const params = this.getParams();
this.$store.commit("SET_DARF_DATA", params);
console.log("--写入草稿文件-", params);
// 缓存草稿
writeDarf(params).then((res) => {
console.log("写入草稿文件成功");
uni.showToast({
icon: "success",
......
pages/inspectionContent/model/batteryRoom.vue
浏览文件 @ c58687b4
......@@ -30,7 +30,7 @@
class="row-item"
label="异常定位"
name="measuredDataArr"
v-if="item.inspectionResult == 1"
>
<view class="tags">
<view
......@@ -47,7 +47,7 @@
<!-- 异常状态时显示 -->
<uni-forms-item
v-if="item.inspectionResult == 1"
required
class="row-item"
label="情况摘要"
......@@ -251,13 +251,13 @@ export default {
align-items: center;
.tag {
background: #f2f3f5;
width: 80px;
width: 55px;
height: 36px;
border-radius: 10px;
text-align: center;
line-height: 36px;
margin-right: 12px;
font-size: 16px;
margin-right: 10px;
font-size: 14px;
color: #4a4a4a;
text-align: center;
font-weight: 400;
......
pages/inspectionContent/model/gatherDataCenter.vue
浏览文件 @ c58687b4
......@@ -47,6 +47,8 @@
<!-- 异常状态时显示 -->
<uni-forms-item
v-if="item.inspectionResult == 1"
required
class="row-item"
label="情况摘要"
......@@ -252,13 +254,13 @@ export default {
align-items: center;
.tag {
background: #f2f3f5;
width: 80px;
width: 55px;
height: 36px;
border-radius: 10px;
text-align: center;
line-height: 36px;
margin-right: 12px;
font-size: 16px;
margin-right: 10px;
font-size: 14px;
color: #4a4a4a;
text-align: center;
font-weight: 400;
......
pages/inspectionContent/model/shieldedComputerRoom.vue
浏览文件 @ c58687b4
......@@ -51,24 +51,24 @@
class="row-item"
label="情况摘要"
name="notes"
v-if="item.inspectionResult == 1"
>
<input type="text" v-model="item.notes" placeholder="请输入内容" />
</uni-forms-item>
</uni-forms>
</view>
</template>
<script>
import {
</template>
<script>
import {
pad_1_2_inspection_items,
pad_1_2_inspection_position,
pad_room_type,
} from "@/utils/dict.js";
} from "@/utils/dict.js";
/**
/**
* 屏蔽机房巡检
*/
export default {
export default {
data() {
return {
list: [],
......@@ -177,7 +177,7 @@
},
// 回显数据
setForm(componentData) {
this.list = componentData
this.list = componentData;
},
// 获取数据
getForm() {
......@@ -211,19 +211,19 @@
return Promise.all(temp).then((res) => {
const allVaildList = res.filter((item) => item.result);
const formData= this.getForm();
const formData = this.getForm();
return {
vaild: this.list.length == allVaildList.length,
formData
formData,
};
});
},
},
};
</script>
};
</script>
<style lang="less" scoped>
.gather-dataCenter {
<style lang="less" scoped>
.gather-dataCenter {
.inspection-item {
border: 1px solid;
margin-bottom: 12px;
......@@ -251,13 +251,13 @@
align-items: center;
.tag {
background: #f2f3f5;
width: 80px;
width: 55px;
height: 36px;
border-radius: 10px;
text-align: center;
line-height: 36px;
margin-right: 12px;
font-size: 16px;
margin-right: 10px;
font-size: 14px;
color: #4a4a4a;
text-align: center;
font-weight: 400;
......@@ -274,6 +274,5 @@
display: flex;
align-items: center;
}
}
</style>
\ No newline at end of file
}
</style>
pages/inspectionManagement/index.vue
浏览文件 @ c58687b4
......@@ -45,9 +45,21 @@ export default {
},
toPage() {
const darf_data = this.$store.state.darf_data || {};
console.log("---读取的草稿数据", darf_data)
if (darf_data.inspectionType == 1) {
uni.navigateTo({
url: `/pages/inspectionContent/inspectionContent?isDarf=1`,
});
} else if (darf_data.inspectionType == 2) {
uni.navigateTo({
url: `/pages/shaftInspection/shaftInspection?isDarf=1`,
});
} else {
uni.navigateTo({
url: "/pages/inspection/inspFirst",
});
}
},
},
};
......
pages/shaftInspection/model/tabContentItem.vue
浏览文件 @ c58687b4
......@@ -194,13 +194,17 @@ export default {
});
this.list = temp;
console.log("---temp", temp);
// console.log("---temp", temp);
},
// 回显数据
setForm(componentData) {
console.log("-componentData---", componentData);
this.list = componentData.temp;
this.form.conclusion = componentData.conclusion
if (componentData.conclusion) {
this.form = {
conclusion: componentData.conclusion,
};
}
},
// 获取数据
getForm() {
......@@ -220,6 +224,7 @@ export default {
async vaildForm() {
return new Promise(async (resolve, reject) => {
let result = "";
console.log("--vaildForm--", this.form);
this.$refs.forms
.validate()
.then((res) => {
......@@ -253,6 +258,8 @@ export default {
// vaild: this.list.length == allVaildList.length,
// formData,
// };
console.log("--result-", result);
console.log("--allVaildList-", allVaildList);
resolve({
vaild: result && this.list.length == allVaildList.length,
......@@ -297,13 +304,13 @@ export default {
align-items: center;
.tag {
background: #f2f3f5;
width: 80px;
width: 55px;
height: 36px;
border-radius: 10px;
text-align: center;
line-height: 36px;
margin-right: 12px;
font-size: 16px;
margin-right: 10px;
font-size: 14px;
color: #4a4a4a;
text-align: center;
font-weight: 400;
......
pages/shaftInspection/model/tabs.vue
浏览文件 @ c58687b4
......@@ -32,8 +32,6 @@
</view>
</template>
<script>
export default {
props: {
options: {
......@@ -46,19 +44,16 @@ export default {
list: [],
};
},
created() {
},
created() {},
mounted() {
this.list = this.options
this.list = this.options;
},
watch: {
options(newData) {
this.list = newData
}
this.list = newData;
},
},
methods: {
tabClick(index, item) {
this.activeIndex = index;
......
pages/shaftInspection/shaftInspection.vue
浏览文件 @ c58687b4
......@@ -49,11 +49,11 @@
<Tabs class="tabs" ref="tabs" :options="tabList" @change="changeTab" />
<TabContentItem
v-for="(item, index) in tabList.length"
v-for="(item, index) in tabList"
:key="index"
:ref="item.refName"
v-show="activeTabIndex == index"
:ref="`TabContentItem_${index}`"
/>
></TabContentItem>
</view>
<view class="fixed-btns">
......@@ -113,23 +113,31 @@ export default {
onLoad(options) {
if (options.uid) {
this.getDetails(options.uid);
} else if (options.isDarf) {
// 获取草稿数据
const darf_data = this.$store.state.darf_data;
this.baseInfo = darf_data.originData.baseInfo;
this.tempForm = darf_data.originData.tempForm;
console.log("获取草稿数据---", darf_data);
this.detailsInfo = darf_data;
}
},
mounted() {
// this.baseInfo = this.$store.state.temp_data;
// console.log("---baseInfo-", this.baseInfo);
this.init().then(() => {
if (this.detailsInfo.inspectionType) {
const fillCheck = this.detailsInfo.fillCheck.split(",");
setTimeout(() => {
this.tabList.forEach((item, index) => {
item.isVaild = fillCheck.includes(item.value);
this.tempForm[index] &&
this.setComponentData(item.refName, this.tempForm[index]);
});
}, 500);
} else {
this.baseInfo = this.$store.state.temp_data;
}
this.tabList.forEach((item, index) => {
this.setComponentData(item.refName, this.tempForm[index]);
});
});
},
......@@ -146,7 +154,6 @@ export default {
refName: `TabContentItem_${index}`,
};
});
resolve();
});
},
......@@ -154,16 +161,14 @@ export default {
getDetails(uid) {
const all_data = this.$store.state.all_data || [];
const detailsInfo = all_data.filter((item) => item.uid == uid)[0] || {};
console.log("--detailsInfo-", detailsInfo);
this.baseInfo = detailsInfo.originData.baseInfo;
this.tempForm = detailsInfo.originData.tempForm;
this.detailsInfo = detailsInfo;
},
// 回显组件数据
setComponentData(refName, componentData) {
console.log("--refs--");
console.log("--refName--", refName);
// this.$refs[refName][0].setForm(componentData);
this.$refs[refName][0].setForm(componentData);
},
//--弹出对话框
dialogInputConfirm2() {
......@@ -188,7 +193,6 @@ export default {
// tab选中change 时间
changeTab(index, item) {
console.log("-index--", index);
this.draft(this.activeTabIndex, false, false).then(() => {
this.activeTabIndex = index;
});
......@@ -207,7 +211,7 @@ export default {
getParams() {
const baseInfo = this.baseInfo;
const tempForm = this.tempForm;
const fillCheck = this.tabList.map((item) => item.value).join(",");
const fillCheck = this.tabList.filter(item => item.isVaild).map((item) => item.value).join(",");
const temp = this.tabList.map((item, index) => {
const items = tempForm[index].temp.map((ele) => {
......@@ -217,6 +221,7 @@ export default {
inspectionResult: ele.inspectionResult,
};
});
// 一个tab栏下的数据，是否有异常
const isException = tempForm[index].temp.filter(
(item) => item.inspectionResult > 0
).length
......@@ -234,7 +239,20 @@ export default {
};
});
return temp;
const item = {
...temp[0],
isException: temp.filter((item) => item.isException > 0).length ? 1 : 0, // 总的数据
items: [],
synchronization: 0, // 是否导出过
submitTime: moment().format("yyyy-MM-DD"), // 记录提交时间
originData: {
baseInfo,
tempForm,
},
};
item[baseInfo.inspectionCode] = temp;
console.log("----item--", item);
return item;
},
// 提交按钮
......@@ -253,19 +271,19 @@ export default {
const params = this.getParams();
const all_data = this.$store.state.all_data;
const temp = {
...params[0],
items: [],
synchronization: 0, // 是否导出过
submitTime: moment().format("yyyy-MM-DD"), // 记录提交时间
// const temp = {
// ...params[0],
// items: [],
// synchronization: 0, // 是否导出过
// submitTime: moment().format("yyyy-MM-DD"), // 记录提交时间
originData: {
baseInfo: this.baseInfo,
tempForm: this.tempForm,
},
};
// originData: {
// baseInfo: this.baseInfo,
// tempForm: this.tempForm,
// },
// };
temp[this.baseInfo.inspectionCode] = params;
// temp[this.baseInfo.inspectionCode] = params;
// const tempItem = all_data[time] || [];
......@@ -282,11 +300,11 @@ export default {
const index = all_data.findIndex(
(element) => element.uid == params.uid
);
all_data[index] = temp;
all_data[index] = params;
logContent = getLogContent(LOG_TYPE_ENUM.edit);
} else {
temp.uid = new Date().getTime(); // 唯一标识 pad 端使用
all_data.push(temp);
params.uid = new Date().getTime(); // 唯一标识 pad 端使用
all_data.push(params);
logContent = getLogContent(LOG_TYPE_ENUM.add);
}
......@@ -338,18 +356,18 @@ export default {
let refName = this.tabList[activeTabIndex].refName;
return new Promise((resolve, reject) => {
this.$refs[refName][0].vaildForm().then(({ vaild, formData }) => {
console.log("---校验---", vaild);
this.$refs.tabs
.setTabVaild(activeTabIndex, vaild, iSwtich)
.then(() => {
this.tempForm[activeTabIndex] = formData;
console.log("--xxxx--", {
...this.tempForm,
...this.baseInfo,
});
console.log("---isSave---", isSave);
const params = this.getParams();
console.log("--保存草稿--", params);
if (isSave) {
// 更新store 和 [草稿文件] 日志数据
console.log("--保存草稿--");
// // 新增日志信息
const logContent = getLogContent(LOG_TYPE_ENUM.darf);
......@@ -361,14 +379,11 @@ export default {
});
// 写入草稿文件 更新 store 草稿内容
this.$store.commit("SET_DARF_DATA", {
...this.tempForm,
...this.baseInfo,
}); // 缓存[巡检信息]
writeDarf({
...this.tempForm,
...this.baseInfo,
}).then((res) => {
const params = this.getParams();
console.log("--保存草稿--", params);
this.$store.commit("SET_DARF_DATA", params); // 缓存[巡检信息]
writeDarf(params).then((res) => {
console.log("写入草稿文件成功");
uni.showToast({
icon: "success",
......
utils/IoReadingAndWriting.js
浏览文件 @ c58687b4
......@@ -128,7 +128,7 @@ export const readDarfData = () => {
resolve({});
} else {
console.log("读取草稿文件--", JSON.parse(Base64.decode(res)));
resolve(JSON.parse(Base64.decode(element)));
resolve(JSON.parse(Base64.decode(res)));
}
})
.catch((error) => {
......
utils/dict.js
浏览文件 @ c58687b4
......@@ -1055,7 +1055,8 @@ export const pad_2_1_inspection_position = {
// 井道巡检_楼层
export const pad_2_1_floor = {
"total": 13,
"msg": "操作成功",
"code": 200,
"rows": [
{
"createBy": "admin",
......@@ -1226,13 +1227,60 @@ export const pad_2_1_floor = {
"isDefault": "N",
"status": "0",
"default": false
},
{
"createBy": "admin",
"createTime": "2024-09-05 16:01:31",
"updateBy": null,
"updateTime": null,
"remark": null,
"dictCode": 1329,
"dictSort": 11,
"dictLabel": "22楼",
"dictValue": "11",
"dictType": "pad_2_1_floor",
"cssClass": null,
"listClass": "default",
"isDefault": "N",
"status": "0",
"default": false
},
{
"createBy": "admin",
"createTime": "2024-09-05 16:01:37",
"updateBy": null,
"updateTime": null,
"remark": null,
"dictCode": 1330,
"dictSort": 12,
"dictLabel": "24楼",
"dictValue": "12",
"dictType": "pad_2_1_floor",
"cssClass": null,
"listClass": "default",
"isDefault": "N",
"status": "0",
"default": false
},
{
"createBy": "admin",
"createTime": "2024-09-05 16:01:46",
"updateBy": null,
"updateTime": null,
"remark": null,
"dictCode": 1331,
"dictSort": 13,
"dictLabel": "26楼",
"dictValue": "13",
"dictType": "pad_2_1_floor",
"cssClass": null,
"listClass": "default",
"isDefault": "N",
"status": "0",
"default": false
}
],
"code": 200,
"msg": "查询成功",
"status": null,
"map": null
};
]
}
// 机房巡检类型
export const pad_room_type ={
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论