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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
XieYongHong 2023-07-15 19:47:07 +08:00
parent 6093e544b9 c35120f4d3
commit 6b9bf45825
6 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/FRuleEditor/Debug/index.vue
View File

@ -197,6 +197,7 @@ const runScript = () => {
onlyMessage('请编辑规则', 'warning'); onlyMessage('请编辑规则', 'warning');
return; return;
} }
ws.value = getWebSocket( ws.value = getWebSocket(
`virtual-property-debug-${props.id}-${new Date().getTime()}`, `virtual-property-debug-${props.id}-${new Date().getTime()}`,
'/virtual-property-debug', '/virtual-property-debug',

4
src/components/FRuleEditor/index.vue
View File

@ -94,10 +94,6 @@ const addOperatorValue = (val: string) => {
editor.value.addOperatorValue(val); editor.value.addOperatorValue(val);
}; };
watchEffect(() => {
console.log(props.value, _value.value, 'hhhhh')
})
watch(() => _value.value, () => { watch(() => _value.value, () => {
_disabled.value = true _disabled.value = true
}) })

35
src/views/account/Center/components/Subscribe/components/Bind.vue
View File

@ -1,6 +1,21 @@
<template> <template>
<j-modal :width="'900px'" visible @cancel="emit('close')" :zIndex="1100"> <j-modal :width="'900px'" visible @cancel="emit('close')" :zIndex="1100">
<template v-if="getType === 'notifier-dingTalk'"> <template v-if="getType === 'notifier-weixin'">
<j-spin :spinning="loading">
<div class="code" style="height: 450px">
<iframe
id="notifier_iframe"
class="code-item"
width="100%"
height="100%"
:src="url"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
v-if="!loading"
></iframe>
</div>
</j-spin>
</template>
<template v-else-if="getType === 'notifier-dingTalk'">
<j-spin :spinning="loading"> <j-spin :spinning="loading">
<div class="code" style="height: 600px;"> <div class="code" style="height: 600px;">
<iframe <iframe
@ -14,20 +29,7 @@
</div> </div>
</j-spin> </j-spin>
</template> </template>
<template v-else-if="getType === 'notifier-weixin'">
<j-spin :spinning="loading">
<div class="code" style="height: 450px">
<iframe
id="notifier_iframe"
class="code-item"
width="100%"
height="100%"
:src="url"
v-if="!loading"
></iframe>
</div>
</j-spin>
</template>
<template #footer> <template #footer>
<j-button @click="emit('close')">关闭</j-button> <j-button @click="emit('close')">关闭</j-button>
<!-- <j-button type="primary" @click="emit('close')">确定</j-button> --> <!-- <j-button type="primary" @click="emit('close')">确定</j-button> -->
@ -103,8 +105,9 @@ const updateIframeStyle = () => {
const iframe = document.querySelector( const iframe = document.querySelector(
'#notifier_iframe', '#notifier_iframe',
) as HTMLIFrameElement; ) as HTMLIFrameElement;
console.log(iframe)
iframe.onload = () => { iframe.onload = () => {
console.log(iframe?.contentWindow) console.log(iframe?.contentWindow, '123')
const currentUrl = iframe?.contentWindow?.location?.search || ''; const currentUrl = iframe?.contentWindow?.location?.search || '';
let authCode = ''; let authCode = '';
if (currentUrl.startsWith('?')) { if (currentUrl.startsWith('?')) {

4
src/views/device/components/Metadata/Base/components/VirtualRule/Rule.vue
View File

@ -29,10 +29,6 @@ const onChange = (val: string | undefined) => {
onClose() onClose()
} }
watchEffect(() => {
console.log(props.virtualRule, props.value, '123')
})
const onClose = () => { const onClose = () => {
visible.value = false visible.value = false
} }

16
src/views/link/AccessConfig/components/Edge/index.vue
View File

@ -52,8 +52,8 @@
> >
<template #other> <template #other>
<div class="other"> <div class="other">
<j-tooltip placement="topLeft"> <j-tooltip placement="top" :title="addressesTip(item.addresses)">
<div <!-- <div
v-if=" v-if="
(item.addresses || []) (item.addresses || [])
.length > 1 .length > 1
@ -69,7 +69,7 @@
:status="getColor(i)" :status="getColor(i)"
/>{{ i.address }} />{{ i.address }}
</div> </div>
</div> </div> -->
<div <div
v-for="i in ( v-for="i in (
item.addresses || [] item.addresses || []
@ -86,7 +86,7 @@
(item.addresses || []) (item.addresses || [])
.length > 1 .length > 1
" "
>...</span >等{{ item.addresses.length }}条</span
> >
</div> </div>
</j-tooltip> </j-tooltip>
@ -354,6 +354,14 @@ watch(
immediate: true, immediate: true,
}, },
); );
const addressesTip = (data:any)=>{
let tip:any = ''
data.forEach((item:any)=>{
tip = tip + " " +item.address
})
return tip
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

29
src/views/link/AccessConfig/components/Network/index.vue
View File

@ -50,24 +50,7 @@
> >
<template #other> <template #other>
<div class="other"> <div class="other">
<j-tooltip placement="topLeft"> <j-tooltip placement="top" :title="addressesTip(item.addresses)">
<div
v-if="
(item.addresses || [])
.length > 1
"
>
<div
v-for="i in item.addresses ||
[]"
:key="i.address"
class="item"
>
<j-badge
:status="getColor(i)"
/>{{ i.address }}
</div>
</div>
<div <div
v-for="i in ( v-for="i in (
item.addresses || [] item.addresses || []
@ -84,7 +67,7 @@
(item.addresses || []) (item.addresses || [])
.length > 1 .length > 1
" "
>...</span >等{{ item.addresses.length }}条</span
> >
</div> </div>
</j-tooltip> </j-tooltip>
@ -652,6 +635,14 @@ watch(
immediate: true, immediate: true,
}, },
); );
const addressesTip = (data:any)=>{
let tip:any = ''
data.forEach((item:any)=>{
tip = tip + " " +item.address
})
return tip
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>