Compare commits

..

No commits in common. '16025289b2744c0c6cacc1e1ff5c2d9a905547d6' and 'fae5d2cb7995414d450c2cb7c19d261cee2f8ec5' have entirely different histories.

  1. 38
      pages/investigation/task.vue

@ -17,7 +17,7 @@
stepCircleActive: item.i === active, stepCircleActive: item.i === active,
stepCircle: true, stepCircle: true,
}"> }">
{{ item.i == 3 ? item.i - 1 : item.i }} {{ item.i }}
</view> </view>
<view class="stepText PositionA" <view class="stepText PositionA"
:style="{ color: item.i === active ? '#000000' : '#bcc3cd' }"> :style="{ color: item.i === active ? '#000000' : '#bcc3cd' }">
@ -90,7 +90,7 @@
<input v-if="isEdit" type="number" class="BorderNone Height100 formInput" <input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
v-model="formData.laneCount" placeholder="请输入车道数" @focus="focus" @blur="blur" /> v-model="formData.laneCount" placeholder="请输入车道数" @focus="focus" @blur="blur" />
<view class="Height100" v-else>{{ formData.laneCount }}</view> <view class="Height100" v-else>{{ formData.laneCount }}</view>
<view class="Height100"></view> <view class="Height100"></view>
</view> </view>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="路面结构"> <uni-forms-item label="路面结构">
@ -461,9 +461,8 @@
<bottom-button :type="type" v-else-if="active === 2" :secondText="isEditStep2?'取消':'更改'" <bottom-button :type="type" v-else-if="active === 2" :secondText="isEditStep2?'取消':'更改'"
@second="isEditStep2 = !isEditStep2" @first="active = 1;pageScrollTo()" @last="active = 3;pageScrollTo()" /> @second="isEditStep2 = !isEditStep2" @first="active = 1;pageScrollTo()" @last="active = 3;pageScrollTo()" />
<!-- 下面原本active = 2 --> <bottom-button isSubmit :type="type" v-else-if="active === 3" :secondText="'暂存'"
<bottom-button isSubmit :type="type" v-else-if="active === 3" :secondText="'暂存'" @first="active = 1;pageScrollTo()" @first="active = 2;pageScrollTo()" @second="submit(false)" @last="submit(true)" />
@second="submit(false)" @last="submit(true)" />
<u-modal :show="modalShow" content="您未录入任何隐患问题,该点段将以“无隐患”结论提交结果,请确认是否提交?" confirm-text="确定" cancel-text="取消" <u-modal :show="modalShow" content="您未录入任何隐患问题,该点段将以“无隐患”结论提交结果,请确认是否提交?" confirm-text="确定" cancel-text="取消"
:showConfirmButton="true" :showCancelButton="true" @confirm="postSaveManualInvestigation" :showConfirmButton="true" :showCancelButton="true" @confirm="postSaveManualInvestigation"
@cancel="modalShow = false" :closeOnClickOverlay="false"></u-modal> @cancel="modalShow = false" :closeOnClickOverlay="false"></u-modal>
@ -484,7 +483,6 @@
import InvestigationItem2 from "./components/investigation-item2.vue"; import InvestigationItem2 from "./components/investigation-item2.vue";
import ProblemTreeItem from "./components/problem-tree-item.vue"; import ProblemTreeItem from "./components/problem-tree-item.vue";
import ProblemBox from "./components/problem-box.vue"; import ProblemBox from "./components/problem-box.vue";
import $ from '@/common/globalJs/globalJs.js'
export default { export default {
components: { components: {
TopTitle, TopTitle,
@ -583,15 +581,15 @@
title: "基本信息", title: "基本信息",
type: "point" type: "point"
}, },
// { {
// title: "", title: "统计信息",
// type: "item", type: "item",
// i: 2 i: 2
// }, },
// { {
// title: "", title: "统计信息",
// type: "point" type: "point"
// }, },
{ {
title: "隐患排查", title: "隐患排查",
type: "item", type: "item",
@ -841,7 +839,7 @@
if (!t) { if (!t) {
this.boxHeight = uni.getSystemInfoSync().windowHeight; this.boxHeight = uni.getSystemInfoSync().windowHeight;
} }
} },
}, },
computed: { computed: {
reversedTroubleshootingData() { reversedTroubleshootingData() {
@ -1163,10 +1161,9 @@
hdTerm: "", hdTerm: "",
hdDesc: "", hdDesc: "",
hdPic: "", hdPic: "",
hdInfo: "" hdInfo: "",
}; };
this.fileList = []; this.fileList = [];
console.log('123123', this.describe)
}, },
addFL() { addFL() {
if (this.type == 'add') { if (this.type == 'add') {
@ -1563,7 +1560,6 @@
hdTermName: this.hiddenDangerList2[2].itemname, hdTermName: this.hiddenDangerList2[2].itemname,
hdDesc: this.describe.hdDesc, hdDesc: this.describe.hdDesc,
hdPic: hdPic, hdPic: hdPic,
nid: $.createUUID(),
hdInfo: this.describe.hdInfo, hdInfo: this.describe.hdInfo,
dangerProblem: this.hiddenDangerList2[0].itemname + '/' + this.hiddenDangerList2[1].itemname + dangerProblem: this.hiddenDangerList2[0].itemname + '/' + this.hiddenDangerList2[1].itemname +
'/' + this.hiddenDangerList2[2].itemname '/' + this.hiddenDangerList2[2].itemname
@ -1573,7 +1569,6 @@
} else { } else {
this.$set(this.hiddenDangerList, this.addInvestigationInfo.index, form) this.$set(this.hiddenDangerList, this.addInvestigationInfo.index, form)
} }
console.log(this.hiddenDangerList)
} }
this.showProblem = false; this.showProblem = false;
@ -1700,7 +1695,7 @@
} }
this.pageScrollTo() this.pageScrollTo()
this.isEdit = false; this.isEdit = false;
this.active = 3; this.active = 2;
}, },
submit(temporary) { submit(temporary) {
// //
@ -2074,7 +2069,6 @@
} }
}, },
delYH() { delYH() {
console.log('this.hiddenDangerList', this.hiddenDangerList, this.nidYH)
this.hiddenDangerList = this.hiddenDangerList.filter(r => { this.hiddenDangerList = this.hiddenDangerList.filter(r => {
if (r.nid != this.nidYH) { if (r.nid != this.nidYH) {
return r return r

Loading…
Cancel
Save