From 7e3a5c57f731ee7b33185366368bad41cf8f3980 Mon Sep 17 00:00:00 2001 From: haodd <1903289197@qq.com> Date: Thu, 13 Jul 2023 11:17:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=BF=87=E6=BB=A4=E8=B6=85=E7=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/Role/Detail/components/AddUserDialog.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/system/Role/Detail/components/AddUserDialog.vue b/src/views/system/Role/Detail/components/AddUserDialog.vue index 0492f9c3..f7d29306 100644 --- a/src/views/system/Role/Detail/components/AddUserDialog.vue +++ b/src/views/system/Role/Detail/components/AddUserDialog.vue @@ -60,6 +60,12 @@ const getUserList = (oParams: any) => { column: 'id$in-dimension$role$not', value: props.roleId, }, + { + column: 'username', + value: 'admin', + termType: 'not', + type: 'and' + } ], }, ], From 089a7efbd7ff3a20736e742d2a1e22cf9b09bd61 Mon Sep 17 00:00:00 2001 From: haodd <1903289197@qq.com> Date: Thu, 13 Jul 2023 11:54:06 +0800 Subject: [PATCH 2/6] fix: bug#16280 --- src/views/DataCollect/Collector/Point/index.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue index c730be7c..d207af99 100644 --- a/src/views/DataCollect/Collector/Point/index.vue +++ b/src/views/DataCollect/Collector/Point/index.vue @@ -337,7 +337,7 @@ import BatchUpdate from './components/BatchUpdate/index.vue'; import SaveModBus from './Save/SaveModBus.vue'; import SaveOPCUA from './Save/SaveOPCUA.vue'; import Scan from './Scan/index.vue'; -import { colorMap } from '../data.ts'; +import { colorMap } from '../data'; import { cloneDeep, isNumber, throttle } from 'lodash-es'; import { getWebSocket } from '@/utils/websocket'; import { map } from 'rxjs/operators'; @@ -441,14 +441,6 @@ const columns = [ label: '运行中', value: 'running', }, - { - label: '部分错误', - value: 'partialError', - }, - { - label: '错误', - value: 'failed', - }, { label: '已停止', value: 'stopped', From 1d60415203ebdec5f929b3af908ad8a5cfa702af Mon Sep 17 00:00:00 2001 From: haodd <1903289197@qq.com> Date: Thu, 13 Jul 2023 11:57:57 +0800 Subject: [PATCH 3/6] fix: bug#16312 --- src/views/edge/Device/Save/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/edge/Device/Save/index.vue b/src/views/edge/Device/Save/index.vue index dc8479e6..6d5c0eca 100644 --- a/src/views/edge/Device/Save/index.vue +++ b/src/views/edge/Device/Save/index.vue @@ -184,7 +184,7 @@ const vailId = async (_: Record, value: string) => { if (!props?.data?.id && value) { const resp = await isExists(value); if (resp.status === 200 && resp.result) { - return Promise.reject('ID重复'); + return Promise.reject('该ID已存在'); } else { return Promise.resolve(); } From 8240776b247b00b83c891ec30ead2e26917ca96d Mon Sep 17 00:00:00 2001 From: haodd <1903289197@qq.com> Date: Thu, 13 Jul 2023 13:48:15 +0800 Subject: [PATCH 4/6] fix: bug#16315 --- src/components/Upload/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue index 9cc1c2a6..276a4691 100644 --- a/src/components/Upload/index.vue +++ b/src/components/Upload/index.vue @@ -98,6 +98,10 @@ const props: JUploadProps = defineProps({ borderStyle: { type: Object, default: undefined + }, + size: { + type: Number, + default: undefined, } }); From f6ebb44f9005d1b561715d9eaeac851853330a6c Mon Sep 17 00:00:00 2001 From: 100011797 <2642441182@qq.com> Date: Thu, 13 Jul 2023 13:57:24 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Layout/components/Notice.vue | 91 +++++++++++-------- .../Layout/components/NoticeInfo.vue | 24 ++--- src/views/Northbound/DuerOS/index.vue | 2 +- .../components/NotificationRecord/index.vue | 1 + .../Detail/DeviceAccess/accessModal.vue | 15 ++- src/views/media/Cascade/Channel/index.vue | 6 +- src/views/media/Cascade/Save/index.vue | 22 +++-- src/views/media/SplitScreen/tree.vue | 15 ++- 8 files changed, 97 insertions(+), 79 deletions(-) diff --git a/src/components/Layout/components/Notice.vue b/src/components/Layout/components/Notice.vue index c88db55e..5d8a2142 100644 --- a/src/components/Layout/components/Notice.vue +++ b/src/components/Layout/components/Notice.vue @@ -28,6 +28,7 @@ import { useUserInfo } from '@/store/userInfo'; import { useMenuStore } from '@/store/menu'; import { getAllNotice } from '@/api/account/center'; +import { flatten } from 'lodash-es'; const updateCount = computed(() => useUserInfo().alarmUpdateCount); const menuStory = useMenuStore(); @@ -99,46 +100,6 @@ const read = (type: string, data: any) => { }); }; -// 查询未读数量 -const getList = () => { - if(tabs.value.length <= 0) return; - loading.value = true; - const params = { - sorts: [{ - name: 'notifyTime', - order: 'desc' - }], - terms: [ - { - terms: [ - { - type: 'or', - value: 'unread', - termType: 'eq', - column: 'state', - }, - ], - }, - ], - }; - getList_api(params) - .then((resp: any) => { - total.value = resp.result.total; - }) - .finally(() => (loading.value = false)); -}; - -const visibleChange = (bool: boolean) => { - bool && getList(); -}; - -const handleRead = () => { - visible.value = false; - getList(); -}; - -watch(updateCount, () => getList()); - const tab = [ { key: 'alarm', @@ -163,6 +124,56 @@ const tab = [ }, ]; +// 查询未读数量 +const getList = () => { + if(tabs.value.length <= 0) return; + loading.value = true; + const params = { + sorts: [{ + name: 'notifyTime', + order: 'desc' + }], + terms: [ + { + terms: [ + { + type: 'and', + value: 'unread', + termType: 'eq', + column: 'state', + }, + ], + }, + { + terms: [ + { + type: 'and', + value: flatten(tabs.value.map((i: any) => i?.type)), + termType: 'in', + column: 'topicProvider', + }, + ], + }, + ], + }; + getList_api(params) + .then((resp: any) => { + total.value = resp.result.total; + }) + .finally(() => (loading.value = false)); +}; + +const visibleChange = (bool: boolean) => { + bool && getList(); +}; + +const handleRead = () => { + visible.value = false; + getList(); +}; + +watch(updateCount, () => getList()); + const tabs = ref([]); const queryTypeList = async () => { diff --git a/src/components/Layout/components/NoticeInfo.vue b/src/components/Layout/components/NoticeInfo.vue index 9e41ecd2..60172786 100644 --- a/src/components/Layout/components/NoticeInfo.vue +++ b/src/components/Layout/components/NoticeInfo.vue @@ -16,7 +16,7 @@
- +