Merge branch 'main_dev' into 'main'

fix: 修复大屏、看板、组织左侧组织树搜索无效 See merge request yunteng/thingskit-front!1327

Merge branch 'main_dev' into 'main'
fix: 修复大屏、看板、组织左侧组织树搜索无效 See merge request yunteng/thingskit-front!1327
xp.Huang
2 parents e1a5cf70 3f14b706
Showing 4 changed files with 40 additions and 8 deletions
src/views/configuration/center/index.vue
src/views/configuration/template/index.vue
src/views/dataview/index.vue
src/views/visual/board/index.vue
--- a/src/views/configuration/center/index.vue
View file @efc1517
+++ b/src/views/configuration/center/index.vue
View file @efc1517
@@ -12,7 +12,7 @@
   import { useRole } from '/@/hooks/business/useRole';
   import configurationSrc from '/@/assets/icons/configuration.svg';
   import { Platform } from '../center/center.data';
-  import { computed, unref } from 'vue';
+  import { computed, unref, reactive } from 'vue';
   import { createScadaPageLink, ScadaModeEnum } from '../center/help';
   import { useDrawer } from '/@/components/Drawer';
   import { usePermission } from '/@/hooks/web/usePermission';
@@ -27,11 +27,14 @@
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ViewTypeEnum, ViewTypeNameEnum } from '../../common/ShareModal/config';
+  const searchInfo = reactive<Recordable>({});
+
   const [register, { reload }] = useCardList({
     api: getPage,
     useSearchForm: true,
     title: '组态列表',
     gutter: 4,
+    searchInfo: searchInfo,
     formConfig: {
       schemas: searchFormSchema,
       labelWidth: 80,
@@ -121,11 +124,16 @@
       await reload();
     } catch (error) {}
   };
+
+  function handleSelect(organization) {
+    searchInfo.organizationId = organization;
+    reload();
+  }
 </script>
 <template>
   <section class="flex w-full h-full">
-    <OrganizationIdTree @register="registerOrgTree" />
+    <OrganizationIdTree @select="handleSelect" @register="registerOrgTree" />
     <BasicCardList class="flex-auto p-4 w-3/4 xl:w-4/5 w-full" @register="register">
       <template #toolbar>
         <div class="flex gap-3 justify-end">
--- a/src/views/configuration/template/index.vue
View file @efc1517
+++ b/src/views/configuration/template/index.vue
View file @efc1517
@@ -11,7 +11,7 @@
   import { useRole } from '/@/hooks/business/useRole';
   import configurationSrc from '/@/assets/icons/configuration.svg';
   import { Platform } from '../center/center.data';
-  import { computed, unref } from 'vue';
+  import { computed, unref, reactive } from 'vue';
   import { createScadaPageLink, ScadaModeEnum } from '../center/help';
   import { useDrawer } from '/@/components/Drawer';
   import { usePermission } from '/@/hooks/web/usePermission';
@@ -22,11 +22,14 @@
   import { OrganizationIdTree, useOrganizationTree } from '../../common/organizationIdTree';
   import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
+  const searchInfo = reactive<Recordable>({});
+
   const [register, { reload }] = useCardList({
     api: getPage,
     useSearchForm: true,
     title: '模板列表',
     gutter: 4,
+    searchInfo: searchInfo,
     formConfig: {
       schemas: searchFormSchema,
       labelWidth: 80,
@@ -92,11 +95,16 @@
       await reload();
     } catch (error) {}
   };
+
+  function handleSelect(organization) {
+    searchInfo.organizationId = organization;
+    reload();
+  }
 </script>
 <template>
   <section class="flex w-full h-full">
-    <OrganizationIdTree @register="registerOrgTree" />
+    <OrganizationIdTree @select="handleSelect" @register="registerOrgTree" />
     <BasicCardList class="flex-auto p-4 w-3/4 xl:w-4/5 w-full" @register="register">
       <template #toolbar>
         <div class="flex gap-3 justify-end">
--- a/src/views/dataview/index.vue
View file @efc1517
+++ b/src/views/dataview/index.vue
View file @efc1517
 <script setup lang="ts">
   import { Card, Button, Tooltip } from 'ant-design-vue';
-  import { computed, unref } from 'vue';
+  import { computed, unref, reactive } from 'vue';
   import { OrganizationIdTree, useOrganizationTree } from '../common/organizationIdTree';
   import {
     bigScreenCancelPublish,
@@ -38,11 +38,14 @@
     },
   });
+  const searchInfo = reactive<Recordable>({});
+
   const [registerCardList, { reload }] = useCardList({
     api: getPage,
     title: '数据大屏',
     useSearchForm: true,
     gutter: 4,
+    searchInfo: searchInfo,
     formConfig: {
       labelWidth: 80,
       schemas: searchFormSchema,
@@ -128,11 +131,16 @@
     createMessage.success(state === 0 ? '发布成功' : '取消发布成功');
     reload();
   };
+
+  function handleSelect(organization) {
+    searchInfo.organizationId = organization;
+    reload();
+  }
 </script>
 <template>
   <PageWrapper dense contentFullHeight contentClass="flex">
-    <OrganizationIdTree @register="registerOrgTree" />
+    <OrganizationIdTree @select="handleSelect" @register="registerOrgTree" />
     <BasicCardList
       @register="registerCardList"
       class="flex-auto p-4 w-3/4 xl:w-4/5 w-full configuration-list"
--- a/src/views/visual/board/index.vue
View file @efc1517
+++ b/src/views/visual/board/index.vue
View file @efc1517
 <script lang="ts" setup>
   import { Card, Statistic, Button, Tooltip } from 'ant-design-vue';
-  import { unref, computed } from 'vue';
+  import { unref, computed, reactive } from 'vue';
   import { MoreOutlined, ShareAltOutlined } from '@ant-design/icons-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import Dropdown from '/@/components/Dropdown/src/Dropdown.vue';
@@ -33,11 +33,14 @@
     onSelect: () => reload(),
   });
+  const searchInfo = reactive<Recordable>({});
+
   const [registerCardList, { reload }] = useCardList({
     title: '数据看板',
     api: getDataBoardList,
     baseLayout: { col: 3, row: 3 },
     useSearchForm: true,
+    searchInfo: searchInfo,
     formConfig: {
       schemas: formSchema,
       labelWidth: 80,
@@ -144,11 +147,16 @@
       router.push(`/visual/board/detail/${boardId}/${boardName}/${platform}/${organizationId}`);
     } else createMessage.warning('没有权限');
   };
+
+  function handleSelect(organization) {
+    searchInfo.organizationId = organization;
+    reload();
+  }
 </script>
 <template>
   <section class="flex">
-    <OrganizationIdTree @register="registerOrgTree" />
+    <OrganizationIdTree @select="handleSelect" @register="registerOrgTree" />
     <BasicCardList class="flex-auto p-4 w-3/4 xl:w-4/5 w-full" @register="registerCardList">
       <template #toolbar>
         <Authority :value="VisualBoardPermission.CREATE">