diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index c3196f9..741e66c 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -578,13 +578,15 @@ if (arrid.value.includes(item.stType)) { properties.id = item.pid || item.id; } - if(item.stType=="waterlogging"){ + if(item.stType=="waterlogging"||item.stType=="rainwater_pipeline_quality"){ Getproperties.value.peopleUser=item.watchId + Getproperties.value.useTitle=item.stName }else { Getproperties.value.peopleUser = null; + Getproperties.value.useTitle = null; } console.log('Getproperties', Getproperties.value); - debugger + // debugger GetBoxmenu('', item.stType); } @@ -613,6 +615,7 @@ Getproperties.value.geometry = item.geometry || item.geometrys; dialogConfig.visible = true; } + debugger }); bus.on('closedia', e => { closediaMeth(); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index c3196f9..741e66c 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -578,13 +578,15 @@ if (arrid.value.includes(item.stType)) { properties.id = item.pid || item.id; } - if(item.stType=="waterlogging"){ + if(item.stType=="waterlogging"||item.stType=="rainwater_pipeline_quality"){ Getproperties.value.peopleUser=item.watchId + Getproperties.value.useTitle=item.stName }else { Getproperties.value.peopleUser = null; + Getproperties.value.useTitle = null; } console.log('Getproperties', Getproperties.value); - debugger + // debugger GetBoxmenu('', item.stType); } @@ -613,6 +615,7 @@ Getproperties.value.geometry = item.geometry || item.geometrys; dialogConfig.visible = true; } + debugger }); bus.on('closedia', e => { closediaMeth(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue index 3b72bf6..7611e49 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue @@ -198,6 +198,9 @@ typeName: { type: String, }, + title: { + type: String, + }, }); console.log(props) let carData =ref([]) @@ -207,8 +210,8 @@ let dispatchInstruct =ref('') let baseInfo=ref({ - name:props.dataCode=="waterlogging"?props.Getproperties.wellCode:props.Getproperties.name, - user:props.dataCode=="waterlogging"?props.Getproperties.peopleUser:props.Getproperties.watchAreaId, + name:props.dataCode=="waterlogging_scheduling"?props.Getproperties.name:props.Getproperties.useTitle, + user:props.dataCode=="waterlogging_scheduling"?props.Getproperties.watchAreaId:props.Getproperties.peopleUser, }) let form =ref({ @@ -234,6 +237,24 @@ { required: true, message: '请选择预计执行时间', trigger: 'change' }, ], }) +// 表单重置 +function reset() { + form.value = { + dispatchType:'2', + qk:`${baseInfo.value.name}可能发生内涝`, + goodList:[ + { + supplyGoodId:'', + supplyGoodNum:0 + } + ], + dispatchUser:[], + dispatchCar:[], + watchPointId:props.dataID, + fileList:[] + }; + proxy.resetForm('ruleForm') +} // 添加物资列表 function addGoodList(){ form.value.goodList.push( @@ -266,7 +287,7 @@ parms.rainBeginTime=`${proxy.moment().format("YYYY-MM-DD")} 08:00:00` parms.rainEndTime=`${proxy.moment().add(1, 'days').format("YYYY-MM-DD")} 08:00:00` parms.dispatchImageAttachUrl= parms.fileList.length>0?(parms.fileList.map(i=>{return i.url})).join(','):'' - parms.taskType=props.dataCode=="waterlogging"?1:props.dataCode=="waterlogging_scheduling"?2:3 + parms.taskType=props.dataCode=="waterlogging"?2:props.dataCode=="waterlogging_scheduling"?1:3 delete parms.datetimerange distributeTask(parms).then(res => { @@ -280,7 +301,8 @@ dispatchOutbound(params).then(res => { if (res && res.code == 200) { proxy.$modal.msgSuccess("已下发") - emit('closePop',true) + reset() + getTable() }else{ proxy.$modal.msgError(res.msg) } @@ -298,11 +320,7 @@ /** 查询用户tree列表 */ function getData() { - watchDispatchList({watchPointId:props.dataID,taskType:props.dataCode=="waterlogging"?1:props.dataCode=="waterlogging_scheduling"?2:3}).then(res=>{ - if(res.code==200){ - tableData.value=res.data - } - }) + getTable() areaPersonList({id:baseInfo.value.user}).then(res => { userData.value = res.data; }); @@ -313,7 +331,13 @@ wzList.value = res.data; }); } - +function getTable() { + watchDispatchList({watchPointId:props.dataID,taskType:props.dataCode=="waterlogging"?2:props.dataCode=="waterlogging_scheduling"?1:3}).then(res=>{ + if(res.code==200){ + tableData.value=res.data + } + }) +} function handleClick(row) { form.value.goodList=row.goodList form.value.dispatchUser=(row.dispatchUser.split(',')).map(Number) @@ -396,6 +420,9 @@ :deep(.el-input__inner){ color: #CCDFFF !important; } +:deep(.el-range-input){ + color: #CCDFFF !important; +} :deep(.el-textarea__inner){ box-shadow:0 0 0 1px #4364ac inset !important; }