From dcf0b05bc73e856b30c048576ed83f237637d832 Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Thu, 2 Mar 2023 17:52:12 +0800 Subject: [PATCH 1/9] =?UTF-8?q?update:=20=E8=A1=A8=E6=A0=BC=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E4=B8=BAJProTable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/media/Cascade/Channel/BindChannel/index.vue | 4 ++-- src/views/media/Cascade/Channel/index.vue | 4 ++-- src/views/media/Cascade/index.vue | 4 ++-- src/views/media/Device/Channel/index.vue | 4 ++-- src/views/media/Device/index.vue | 4 ++-- src/views/notice/Config/Log/index.vue | 4 ++-- src/views/notice/Config/SyncUser/index.vue | 4 ++-- src/views/notice/Config/index.vue | 4 ++-- src/views/notice/Template/Log/index.vue | 4 ++-- src/views/notice/Template/index.vue | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/media/Cascade/Channel/BindChannel/index.vue b/src/views/media/Cascade/Channel/BindChannel/index.vue index 5881472f..137a0b19 100644 --- a/src/views/media/Cascade/Channel/BindChannel/index.vue +++ b/src/views/media/Cascade/Channel/BindChannel/index.vue @@ -17,7 +17,7 @@ @search="handleSearch" /> - - + diff --git a/src/views/media/Cascade/Channel/index.vue b/src/views/media/Cascade/Channel/index.vue index ac020ed7..679c15ca 100644 --- a/src/views/media/Cascade/Channel/index.vue +++ b/src/views/media/Cascade/Channel/index.vue @@ -8,7 +8,7 @@ @search="handleSearch" /> - - + diff --git a/src/views/media/Cascade/index.vue b/src/views/media/Cascade/index.vue index 90dede0e..49d2b4d0 100644 --- a/src/views/media/Cascade/index.vue +++ b/src/views/media/Cascade/index.vue @@ -6,7 +6,7 @@ @search="handleSearch" /> - --> - + diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue index ee54a902..c1bbee39 100644 --- a/src/views/media/Device/Channel/index.vue +++ b/src/views/media/Device/Channel/index.vue @@ -8,7 +8,7 @@ @search="handleSearch" /> - - + - - + diff --git a/src/views/notice/Config/Log/index.vue b/src/views/notice/Config/Log/index.vue index 54cd8e7a..99c93aa6 100644 --- a/src/views/notice/Config/Log/index.vue +++ b/src/views/notice/Config/Log/index.vue @@ -7,7 +7,7 @@ @search="handleSearch" /> - - + diff --git a/src/views/notice/Config/SyncUser/index.vue b/src/views/notice/Config/SyncUser/index.vue index cd985723..dede2518 100644 --- a/src/views/notice/Config/SyncUser/index.vue +++ b/src/views/notice/Config/SyncUser/index.vue @@ -34,7 +34,7 @@ - - + diff --git a/src/views/notice/Config/index.vue b/src/views/notice/Config/index.vue index 2ac2df0e..a56c20d1 100644 --- a/src/views/notice/Config/index.vue +++ b/src/views/notice/Config/index.vue @@ -5,7 +5,7 @@ target="notice-config" @search="handleSearch" /> - - + diff --git a/src/views/notice/Template/Log/index.vue b/src/views/notice/Template/Log/index.vue index 0933690c..583f445a 100644 --- a/src/views/notice/Template/Log/index.vue +++ b/src/views/notice/Template/Log/index.vue @@ -7,7 +7,7 @@ @search="handleSearch" /> - - + diff --git a/src/views/notice/Template/index.vue b/src/views/notice/Template/index.vue index e18ec895..ef4f9831 100644 --- a/src/views/notice/Template/index.vue +++ b/src/views/notice/Template/index.vue @@ -5,7 +5,7 @@ target="notice-config" @search="handleSearch" /> - - + From f7fac417439a90e31b354fea3a573b41f37cba4e Mon Sep 17 00:00:00 2001 From: 100011797 <2642441182@qq.com> Date: Thu, 2 Mar 2023 17:55:28 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=BAprotable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/notice/config.ts | 6 +- src/api/notice/template.ts | 3 +- src/components/BadgeStatus/index.vue | 4 +- src/components/CardBox/index.vue | 26 +-- src/components/PermissionButton/index.vue | 36 ++-- .../Detail/Info/components/Config/Save.vue | 18 +- .../Detail/Info/components/Config/index.vue | 28 +-- .../Detail/Info/components/Relation/Save.vue | 22 +-- .../Detail/Info/components/Relation/index.vue | 12 +- .../Detail/Info/components/Tags/Save.vue | 10 +- .../Detail/Info/components/Tags/index.vue | 8 +- .../device/Instance/Detail/Info/index.vue | 56 +++--- .../device/Instance/Detail/Log/index.vue | 16 +- .../Detail/Running/Property/index.vue | 24 +-- .../device/Instance/Detail/Running/index.vue | 12 +- src/views/device/Instance/Save/index.vue | 70 +++---- src/views/device/Instance/index.vue | 68 +++---- .../rule-engine/Scene/Save/Device/index.vue | 2 + .../Scene/Save/action/Delay/index.vue | 63 +++++++ .../Scene/Save/action/Device/index.vue | 22 +++ .../Scene/Save/action/ListItem/Item.vue | 3 + .../Scene/Save/action/ListItem/List.vue | 74 ++++++++ .../Scene/Save/action/ListItem/index.ts | 2 + .../Scene/Save/action/Modal/index.vue | 105 +++++++++++ .../Scene/Save/action/Notify/NotifyConfig.vue | 178 ++++++++++++++++++ .../Save/action/Notify/NotifyTemplate.vue | 167 ++++++++++++++++ .../Scene/Save/action/Notify/NotifyWay.vue | 61 ++++++ .../action/Notify/VariableDefinitions.vue | 70 +++++++ .../Scene/Save/action/Notify/index.vue | 146 ++++++++++++++ .../action/Notify/variableItem/BuildIn.vue | 3 + .../action/Notify/variableItem/InputFile.vue | 3 + .../Save/action/Notify/variableItem/Org.vue | 3 + .../Save/action/Notify/variableItem/Tag.vue | 3 + .../Save/action/Notify/variableItem/User.vue | 3 + .../rule-engine/Scene/Save/action/index.vue | 133 +++++++++++++ .../Save/components/ShakeLimit/index.vue | 85 +++++++++ src/views/rule-engine/Scene/index.vue | 14 +- 37 files changed, 1333 insertions(+), 226 deletions(-) create mode 100644 src/views/rule-engine/Scene/Save/action/Delay/index.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Device/index.vue create mode 100644 src/views/rule-engine/Scene/Save/action/ListItem/Item.vue create mode 100644 src/views/rule-engine/Scene/Save/action/ListItem/List.vue create mode 100644 src/views/rule-engine/Scene/Save/action/ListItem/index.ts create mode 100644 src/views/rule-engine/Scene/Save/action/Modal/index.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/NotifyWay.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/VariableDefinitions.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/index.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/variableItem/BuildIn.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/variableItem/InputFile.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/variableItem/Org.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/variableItem/Tag.vue create mode 100644 src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue create mode 100644 src/views/rule-engine/Scene/Save/action/index.vue create mode 100644 src/views/rule-engine/Scene/Save/components/ShakeLimit/index.vue diff --git a/src/api/notice/config.ts b/src/api/notice/config.ts index 467455d6..0dfa289e 100644 --- a/src/api/notice/config.ts +++ b/src/api/notice/config.ts @@ -34,5 +34,9 @@ export default { // 微信绑定用户 weChatBindUser: (data: any, id: string) => patch(`/user/third-party/weixin_corpMessage/${id}`, data), // 解绑 - unBindUser: (data: any, id: string) => post(`/user/third-party/${id}/_unbind`, data) + unBindUser: (data: any, id: string) => post(`/user/third-party/${id}/_unbind`, data), + //通知类型 + queryMessageType: () => get(`/notifier/config/types`), + // 不分页-列表 + queryListNoPaging: (data: any) => post(`/notifier/config/_query/no-paging?paging=false`, data) } \ No newline at end of file diff --git a/src/api/notice/template.ts b/src/api/notice/template.ts index 712ed67b..975f4533 100644 --- a/src/api/notice/template.ts +++ b/src/api/notice/template.ts @@ -23,5 +23,6 @@ export default { // 语音/短信获取阿里云模板 getAliTemplate: (id: any) => get(`/notifier/sms/aliyun/${id}/templates`), // 短信获取签名 - getSigns: (id: any) => get(`/notifier/sms/aliyun/${id}/signs`) + getSigns: (id: any) => get(`/notifier/sms/aliyun/${id}/signs`), + getListByConfigId: (id: string, data: any): any => post(`/notifier/template/${id}/_query`, data), } \ No newline at end of file diff --git a/src/components/BadgeStatus/index.vue b/src/components/BadgeStatus/index.vue index 067ee58b..6929f8bb 100644 --- a/src/components/BadgeStatus/index.vue +++ b/src/components/BadgeStatus/index.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/index.vue new file mode 100644 index 00000000..9247a368 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Device/index.vue @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue new file mode 100644 index 00000000..e31931e7 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue new file mode 100644 index 00000000..d63761c3 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/index.ts b/src/views/rule-engine/Scene/Save/action/ListItem/index.ts new file mode 100644 index 00000000..01ae677d --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/ListItem/index.ts @@ -0,0 +1,2 @@ +export { default as List } from './List.vue'; +export { default as Item } from './Item.vue'; diff --git a/src/views/rule-engine/Scene/Save/action/Modal/index.vue b/src/views/rule-engine/Scene/Save/action/Modal/index.vue new file mode 100644 index 00000000..52e74e53 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Modal/index.vue @@ -0,0 +1,105 @@ + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue new file mode 100644 index 00000000..267c0cd1 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue @@ -0,0 +1,178 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue new file mode 100644 index 00000000..f8486de6 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue @@ -0,0 +1,167 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyWay.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyWay.vue new file mode 100644 index 00000000..9833c40c --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyWay.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/VariableDefinitions.vue b/src/views/rule-engine/Scene/Save/action/Notify/VariableDefinitions.vue new file mode 100644 index 00000000..9da5902e --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/VariableDefinitions.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/index.vue b/src/views/rule-engine/Scene/Save/action/Notify/index.vue new file mode 100644 index 00000000..a5836cfe --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/index.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/BuildIn.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/BuildIn.vue new file mode 100644 index 00000000..8f5ada65 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/BuildIn.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/InputFile.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/InputFile.vue new file mode 100644 index 00000000..ab803572 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/InputFile.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/Org.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/Org.vue new file mode 100644 index 00000000..812f1dd2 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/Org.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/Tag.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/Tag.vue new file mode 100644 index 00000000..0e35727a --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/Tag.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue new file mode 100644 index 00000000..91482aa7 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/action/index.vue b/src/views/rule-engine/Scene/Save/action/index.vue new file mode 100644 index 00000000..14b1778d --- /dev/null +++ b/src/views/rule-engine/Scene/Save/action/index.vue @@ -0,0 +1,133 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/components/ShakeLimit/index.vue b/src/views/rule-engine/Scene/Save/components/ShakeLimit/index.vue new file mode 100644 index 00000000..40aa98b4 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/ShakeLimit/index.vue @@ -0,0 +1,85 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue index 093f192c..9d49e85d 100644 --- a/src/views/rule-engine/Scene/index.vue +++ b/src/views/rule-engine/Scene/index.vue @@ -1,7 +1,7 @@ - + From 32c200e08c2a8cf2f44c0d8f8963ddbf87b05bbb Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Thu, 2 Mar 2023 18:10:53 +0800 Subject: [PATCH 3/9] =?UTF-8?q?feat:=20=E8=A7=86=E9=A2=91=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AIcon/index.tsx | 6 ++ src/components/Player/index.vue | 4 +- src/components/Player/mediaTool.less | 128 +++++++++++++++++++++++++++ src/components/Player/mediaTool.vue | 32 ++++++- 4 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 src/components/Player/mediaTool.less diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx index ce47069b..6f2e9734 100644 --- a/src/components/AIcon/index.tsx +++ b/src/components/AIcon/index.tsx @@ -64,6 +64,12 @@ const iconKeys = [ 'ToolOutlined', 'FileOutlined', 'LikeOutlined', + 'CaretUpOutlined', + 'CaretRightOutlined', + 'CaretLeftOutlined', + 'CaretDownOutlined', + 'MinusOutlined', + 'AudioOutlined', ] const Icon = (props: {type: string}) => { diff --git a/src/components/Player/index.vue b/src/components/Player/index.vue index 9a8ec8bc..a23db048 100644 --- a/src/components/Player/index.vue +++ b/src/components/Player/index.vue @@ -11,8 +11,8 @@ import 'vue3-video-play/dist/style.css'; import vue3videoPlay from 'vue3-video-play'; const options = reactive({ - width: '800px', //播放器高度 - height: '450px', //播放器高度 + width: '500px', //播放器高度 + height: '280px', //播放器高度 color: '#409eff', //主题色 title: '', //视频名称 src: 'https://cdn.jsdelivr.net/gh/xdlumia/files/video-play/IronMan.mp4', //视频源 diff --git a/src/components/Player/mediaTool.less b/src/components/Player/mediaTool.less new file mode 100644 index 00000000..68edb215 --- /dev/null +++ b/src/components/Player/mediaTool.less @@ -0,0 +1,128 @@ +.live-player-tools { + display: flex; + flex-basis: 250px; + flex-direction: column; + justify-content: center; + margin-left: 24px; + padding: 0 12px; + + .direction { + position: relative; + display: grid; + grid-gap: 2px; + grid-template-rows: 1fr 1fr; + grid-template-columns: 1fr 1fr; + margin-bottom: 30px; + overflow: hidden; + border-radius: 50%; + transform: rotateZ(45deg); + + .direction-item { + position: relative; + display: flex; + align-items: center; + justify-content: center; + padding-bottom: 100%; + font-size: 36px; + background-color: rgba(#000, 0.1); + transition: background-color 0.3s; + + .direction-icon { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%) rotateZ(-45deg); + } + } + + .direction-audio { + position: absolute; + top: 50%; + left: 50%; + display: flex; + align-items: center; + justify-content: center; + width: 45%; + height: 45%; + font-size: 30px; + background-color: #fff; + border-radius: 50%; + transform: translate(-50%, -50%) rotateZ(-45deg); + } + + .zoom .zoom-item, + & .direction-item { + &:hover { + color: #fff; + background-color: @primary-color-hover; + } + + &:active { + color: #fff; + background-color: @primary-color-active; + } + } + + > div { + cursor: pointer; + &.disable { + color: @disabled-color; + } + } + } + + .zoom { + display: grid; + grid-gap: 2px; + grid-template-columns: 1fr 1fr; + + .zoom-item { + padding: 8px 0; + font-size: 24px; + text-align: center; + background-color: rgba(#000, 0.1); + cursor: pointer; + + &:hover { + color: #fff; + background-color: @primary-color-hover; + } + + &:active { + color: #fff; + background-color: @primary-color-active; + } + } + + .zoom-in { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + } + + .zoom-out { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + } + } +} + +@media screen { + @media (min-width: 1300px) { + .live-player-tools { + flex-basis: 150px; + margin-left: 16px; + + .direction { + .direction-item { + font-size: 24px; + } + } + + .zoom { + .zoom-item { + font-size: 16px; + } + } + } + } +} diff --git a/src/components/Player/mediaTool.vue b/src/components/Player/mediaTool.vue index 40538e8f..64a2b6ab 100644 --- a/src/components/Player/mediaTool.vue +++ b/src/components/Player/mediaTool.vue @@ -1,8 +1,36 @@ - + From c401da070be411cadc39b7b681fbc106420dac04 Mon Sep 17 00:00:00 2001 From: wangshuaiswim Date: Thu, 2 Mar 2023 19:12:01 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/components/Metadata/Base/index.vue | 13 ++++---- .../device/components/Metadata/Cat/index.vue | 2 +- .../device/components/Metadata/index.vue | 33 +++++++++---------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue index c7cae06d..eadd3543 100644 --- a/src/views/device/components/Metadata/Base/index.vue +++ b/src/views/device/components/Metadata/Base/index.vue @@ -1,5 +1,5 @@ - + - - diff --git a/src/components/Player/mediaTool.vue b/src/components/Player/mediaTool.vue index 64a2b6ab..c5f707d0 100644 --- a/src/components/Player/mediaTool.vue +++ b/src/components/Player/mediaTool.vue @@ -2,16 +2,32 @@ - + \ No newline at end of file diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue new file mode 100644 index 00000000..449b40fb --- /dev/null +++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue @@ -0,0 +1,233 @@ + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue index 016a7a4c..4e24527d 100644 --- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue +++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue @@ -1,9 +1,174 @@ \ No newline at end of file diff --git a/src/views/rule-engine/Alarm/Configuration/Save/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/index.vue index bafdcba7..3de8d357 100644 --- a/src/views/rule-engine/Alarm/Configuration/Save/index.vue +++ b/src/views/rule-engine/Alarm/Configuration/Save/index.vue @@ -8,7 +8,9 @@ - + + + @@ -17,7 +19,8 @@ \ No newline at end of file diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue index 6a05b5e9..0962cc7d 100644 --- a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue +++ b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue @@ -280,11 +280,6 @@ let params = ref({ sorts: [{ name: 'alarmTime', order: 'desc' }], terms: [], }); -let param = reactive({ - pageSize: 10, - terms: [], -}); - const handleSearch = async (params: any) => { const resp = await query(params); if (resp.status === 200) { From 376d54fdb42b621d0bf55fcfb5fe6b9fb08127e5 Mon Sep 17 00:00:00 2001 From: wzyyy <1175160654@qq.com> Date: Thu, 2 Mar 2023 20:45:37 +0800 Subject: [PATCH 8/9] fix: a-rang-picker --- src/views/iot-card/components/TimeSelect.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/iot-card/components/TimeSelect.vue b/src/views/iot-card/components/TimeSelect.vue index 073cf4f2..de656b5e 100644 --- a/src/views/iot-card/components/TimeSelect.vue +++ b/src/views/iot-card/components/TimeSelect.vue @@ -15,7 +15,7 @@ {{ item.label }} - - + From 6467b4ef4f5e24b6392f20cede87832dc2c271e9 Mon Sep 17 00:00:00 2001 From: wzyyy <1175160654@qq.com> Date: Thu, 2 Mar 2023 20:58:56 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E7=89=A9=E8=81=94=E5=8D=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iot-card/CardManagement/index.vue | 73 +++++++++++---------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue index 56564f63..80b5d4c7 100644 --- a/src/views/iot-card/CardManagement/index.vue +++ b/src/views/iot-card/CardManagement/index.vue @@ -9,30 +9,33 @@ }" @cancelSelect="cancelSelect" :params="params" :gridColumn="3"> - --> + --> @@ -244,7 +247,7 @@ }} - +