0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#12017

This commit is contained in:
xieyonghong 2023-04-24 13:39:36 +08:00
parent 1e42dd9475
commit 50ba72b1c5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue
View File

@ -10,6 +10,7 @@
:getPopupContainer='getPopupContainer' :getPopupContainer='getPopupContainer'
popupClassName='manual-time-picker-popup' popupClassName='manual-time-picker-popup'
@change='change' @change='change'
@ok='change'
/> />
<j-date-picker <j-date-picker
v-else v-else
@ -21,6 +22,7 @@
:getPopupContainer='getPopupContainer' :getPopupContainer='getPopupContainer'
popupClassName='manual-time-picker-popup' popupClassName='manual-time-picker-popup'
@change='change' @change='change'
@ok='change'
/> />
</div> </div>
</template> </template>
@ -58,6 +60,7 @@ const getPopupContainer = (trigger: HTMLElement) => {
} }
const change = (e: string) => { const change = (e: string) => {
console.log('Time',e)
myValue.value = e myValue.value = e
emit('update:value', e) emit('update:value', e)
emit('change', e) emit('change', e)

2
src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
View File

@ -315,7 +315,6 @@ const termsTypeSelect = (e: { key: string, name: string }) => {
} }
const valueSelect = (v: any, label: string, labelObj: Record<number, any>, option: any) => { const valueSelect = (v: any, label: string, labelObj: Record<number, any>, option: any) => {
console.log(paramsValue.value?.source)
if (paramsValue.value?.source === 'metric') { if (paramsValue.value?.source === 'metric') {
paramsValue.metric = option?.id paramsValue.metric = option?.id
} }
@ -326,7 +325,6 @@ const valueSelect = (v: any, label: string, labelObj: Record<number, any>, optio
delete newValues.metric delete newValues.metric
} }
console.log(newValues)
emit('update:value', { ...newValues }) emit('update:value', { ...newValues })
formItemContext.onFieldChange() formItemContext.onFieldChange()
formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName][2] = labelObj formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName][2] = labelObj