管骁翰_修改

main
guanxiaohan 11 months ago
parent cfaf1cce4f
commit da1344605a
  1. 8
      pages/investigation/index.vue
  2. 58
      pages/investigation/task.vue

@ -112,8 +112,8 @@
search: '',
tabbarShow: true,
queryType: '1',
pageStatus: ''
pageStatus: '',
totalResultList: []
}
},
//
@ -181,6 +181,9 @@
this.status = '2';
break;
}
this.totalResultList.forEach(item => {
this.totalData[item.status] = item.count
})
this.getList()
},
@ -190,6 +193,7 @@
}, 'GET').then(res => {
if (res.code === 200) {
// console.log(res.result)
this.totalResultList = res.result
res.result.forEach(item => {
this.totalData[item.status] = item.count
})

@ -70,9 +70,9 @@
<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
<!-- <input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
v-model="formData.roadType" placeholder="请输入道路类型" @focus="focus" /> -->
<view class="Height100" :class="formData.roadType?'':'gary'" v-if="isEdit"
@click="showdlPicker=true">{{ formData.roadType?formData.roadType:'请选择道路类型' }} </view>
<view class="Height100" v-else>{{ formData.roadType }}</view>
<view class="Height100" :class="formData.roadTypeName?'':'gary'" v-if="isEdit"
@click="showdlPicker=true">{{ formData.roadTypeName?formData.roadTypeName:'请选择道路类型' }} </view>
<view class="Height100" v-else>{{ formData.roadTypeName }}</view>
<view class="Height100"></view>
</view>
</uni-forms-item>
@ -344,12 +344,15 @@
<u-row :gutter="0" justify="flex-start" style="flex-wrap: wrap">
<scroll-view style="max-height: 400px;" :scroll-top="0" scroll-y="true" show-scrollbar="true">
<!-- <view>
{{ hiddenDangerList }}
</view> -->
<view v-for="(item,index) in hiddenDangerList" :key="item" v-show="item.pcType!=1"
style="width: 100%" @longpress="onLongPressYH(item)">
<view class="problem-item">
<view style="display: flex; justify-content: space-between">
<view style="width: 80%;line-height: 30px;">
{{ item.hdTermName||item.dangerProblem }}
{{ item.dangerProblem }}
</view>
<image style="width: 30px;height: 30px;" src="../../static/task/3879.png"
v-show="nidYH == item.nid" @click.stop="delYH"></image>
@ -493,7 +496,7 @@
this.getChartsData();
this.getChartsData2()
},
onLoad(e) {
async onLoad(e) {
this.boxHeight = uni.getSystemInfoSync().windowHeight;
if (e.id) {
this.businessId = e.id;
@ -501,10 +504,10 @@
this.name = e.taskName
this.sectionName = e.sectionName
this.type = e.type;
this.getBaseData(e.id);
this.getStreetCommunity()
this.getRoadTypes()
await this.getRoadTypes()
await this.getBaseData(e.id);
await this.getStreetCommunity()
}
this.getLocationInfo();
this.getSystemInfo()
@ -974,8 +977,10 @@
},
pickerdlConfirm(e) {
console.log(e)
this.showdlPicker = false
this.$set(this.formData, 'roadType', e.value[0].label)
this.$set(this.formData, 'roadType', e.value[0].enumvalue)
this.$set(this.formData, 'roadTypeName', e.value[0].label)
},
pickerdlCancel(e) {
this.showdlPicker = false
@ -1249,7 +1254,18 @@
if (res.code === 200) {
// console.log(res,11111)
if (!this.formData.roadType) {
console.log('123123', res.result.sectionType)
this.$set(this.formData, 'roadType', res.result.sectionType)
// this.columnsdlPicker.forEach(item => {
// if(item.enumvalue == res.result.sectionType) {
// this.$set(this.formData, 'roadType', item.enumName)
// }
// })
this.columnsdlPicker[0].forEach(item => {
if(item.enumvalue == res.result.sectionType) {
this.$set(this.formData, 'roadTypeName', item.enumName)
}
})
}
if (!this.formData.roadWidth) {
this.$set(this.formData, 'roadWidth', res.result.width)
@ -1294,6 +1310,12 @@
...this.formData,
...res.result
};
console.log('this.columnsdlPicker', this.columnsdlPicker)
this.columnsdlPicker[0]?.forEach(item => {
if(item.enumvalue == this.formData.roadType) {
this.$set(this.formData, 'roadTypeName', item.enumName)
}
})
this.getStreetCommunityByXq()
this.getBaseDefaultData()
}
@ -1336,6 +1358,7 @@
this.investigationSelectList.map((r) => {
this.troubleshootingData = [...this.troubleshootingData, ...r.dangerItems]
});
console.log('this.troubleshootingData', this.troubleshootingData)
// console.log(this.troubleshootingData, 11111)
this.checked = this.troubleshootingData.map(r => {
if (r.checked == 1) {
@ -1351,6 +1374,7 @@
}
}
this.initCheckedSelect()
// console.log(this.troubleshootingData)
// this.$request
// .globalRequest(
@ -1440,7 +1464,7 @@
"GET"
)
.then((res) => {
if (res.code === 200) {
if (res.code === 200 && res.result.length != 0) {
this.hiddenDangerList.push(...res.result)
console.log(this.troubleshootingData, 123)
console.log(res.result, 321)
@ -1474,11 +1498,12 @@
.then((res) => {
if (res.code == 200) {
this.troubleshootingData[index].extraConfigs.push(...res.result)
// console.log('656666666666666666666666666666666', this.troubleshootingData)
}
console.log('222333333333333333334444444444', this.checked, index)
if (this.checked.length - 1 == index) {
// alert(1111)
this.initCheckedSelect(index)
// this.initCheckedSelect(index)
}
@ -1693,8 +1718,9 @@
if (this.type == 'view') {
return uni.navigateBack();
}
console.log('this.checkedthis.checked', this.checked)
let checkedArr = this.troubleshootingData.filter(r => this.checked.includes(r.id))
// console.log(11111111, checkedArr)
console.log(11111111, checkedArr)
let extraConfigs = [];
checkedArr.map((r) => {
@ -1718,8 +1744,9 @@
});
});
console.log('this.hiddenDangerListthis.hiddenDangerList', this.hiddenDangerList)
let describe = JSON.parse(JSON.stringify(this.hiddenDangerList))
console.log(describe)
console.log('describedescribedescribedescribedescribedescribedescribe', describe)
try {
for (let item of describe) {
if (item.nid) {
@ -2063,6 +2090,7 @@
}
})
this.nidYH = ''
console.log('this.hiddenDangerList', this.hiddenDangerList)
}
},
};

Loading…
Cancel
Save