提交 ee4bbb68 authored 作者: BaoChunXian's avatar BaoChunXian

feat: 替换文件上传组件、井道巡检正/异常状态修改

上级 19bf2018
...@@ -99,7 +99,8 @@ ...@@ -99,7 +99,8 @@
<text class="form-label" <text class="form-label"
><text class="required">*</text>现场照片</text ><text class="required">*</text>现场照片</text
> >
<view class="photo-box"> <CommonUpload v-model="list[activeTab].photos" :max-count="5"> </CommonUpload>
<!-- <view class="photo-box">
<view class="photo-container"> <view class="photo-container">
<view <view
v-for="(photo, index) in list[activeTab] && v-for="(photo, index) in list[activeTab] &&
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
<view class="photo-limit" <view class="photo-limit"
>请对检查项进行拍照留存(限5张)。发现“异常、告警”时,需拍照留存。</view >请对检查项进行拍照留存(限5张)。发现“异常、告警”时,需拍照留存。</view
> >
</view> </view> -->
</view></template </view></template
> >
</view> </view>
...@@ -161,7 +162,7 @@ import { ...@@ -161,7 +162,7 @@ import {
writeDarf, writeDarf,
writeInspectionData, writeInspectionData,
} from "@/utils/IoReadingAndWriting.js"; } from "@/utils/IoReadingAndWriting.js";
import CommonUpload from "@/components/CommonUpload/index.vue";
import { getInspectionDetails, getDarft } from "@/request/index.js"; import { getInspectionDetails, getDarft } from "@/request/index.js";
import moment from "moment"; import moment from "moment";
import customPopup from "./model/customPopup.vue"; import customPopup from "./model/customPopup.vue";
...@@ -172,6 +173,7 @@ import { sqlToData, dataToSql } from "./shared"; ...@@ -172,6 +173,7 @@ import { sqlToData, dataToSql } from "./shared";
export default { export default {
components: { components: {
customPopup, customPopup,
CommonUpload
}, },
data() { data() {
return { return {
......
...@@ -3,7 +3,7 @@ import store from "@/store"; ...@@ -3,7 +3,7 @@ import store from "@/store";
// 将现有机房巡检数据转换为SQL数据所需要格式 // 将现有机房巡检数据转换为SQL数据所需要格式
export function dataToSql(data) { export function dataToSql(data) {
let synFlag = 0, isException = data.isException; let synFlag = 0;
// 是否有草稿状态的井道 // 是否有草稿状态的井道
let hasDraft; let hasDraft;
hasDraft = !(data.originData.reduce((acc,cur) => { hasDraft = !(data.originData.reduce((acc,cur) => {
...@@ -15,7 +15,6 @@ export function dataToSql(data) { ...@@ -15,7 +15,6 @@ export function dataToSql(data) {
} else { } else {
if(hasDraft) { if(hasDraft) {
synFlag = 2 synFlag = 2
isException = 2
} else { } else {
synFlag = 0 synFlag = 0
} }
...@@ -25,7 +24,7 @@ export function dataToSql(data) { ...@@ -25,7 +24,7 @@ export function dataToSql(data) {
inspectionCode: data.inspectionCode, inspectionCode: data.inspectionCode,
recordName: `${moment().format("yyyyMMDD")}-井道巡检`, recordName: `${moment().format("yyyyMMDD")}-井道巡检`,
inspectionTime: moment().format("yyyy-MM-DD HH:mm"), inspectionTime: moment().format("yyyy-MM-DD HH:mm"),
isException: 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,
synFlag: synFlag, // 0.未同步,1.已同步,2.编辑 synFlag: synFlag, // 0.未同步,1.已同步,2.编辑
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论