fix：移除之前写的组织列表显示隐藏

fengtao
1 parent 4365929b
Showing 7 changed files with 9 additions and 129 deletions
src/views/alarm/config/index.vue
src/views/alarm/contacts/index.vue
src/views/camera/manage/index.vue
src/views/common/organizationIdTree/src/OrganizationIdTree.vue
src/views/configuration/center/index.vue
src/views/device/list/index.vue
src/views/system/account/index.vue
--- a/src/views/alarm/config/index.vue
View file @5e2c819
+++ b/src/views/alarm/config/index.vue
View file @5e2c819
@@ -6,8 +6,6 @@
         @select="handleSelect"
         style="position: relative"
         ref="organizationIdTreeRef"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
       />
       <BasicTable
         style="flex: auto"
@@ -15,7 +13,6 @@
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
         :clickToRowSelect="false"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:alarm:profile:post">
@@ -86,7 +83,7 @@
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, h, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, h, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { useDrawer } from '/@/components/Drawer';
@@ -115,8 +112,6 @@
       Authority,
     },
     setup() {
-      const isFold = ref(true);
-
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 刷新
@@ -244,13 +239,6 @@
           reload();
         }
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
       return {
         searchInfo,
         hasBatchDelete,
@@ -264,8 +252,6 @@
         showAlarmContact,
         showMessageMode,
         statusChange,
-        changeWidth,
-        isFold,
       };
     },
   });
--- a/src/views/alarm/contacts/index.vue
View file @5e2c819
+++ b/src/views/alarm/contacts/index.vue
View file @5e2c819
@@ -2,10 +2,7 @@
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
       <OrganizationIdTree
-        style="position: relative"
         class="w-1/4 xl:w-1/5"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
         @select="handleSelect"
         ref="organizationIdTreeRef"
       />
@@ -14,7 +11,6 @@
         @register="registerTable"
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:alarmContact:post">
@@ -81,7 +77,6 @@
       Authority,
     },
     setup() {
-      const isFold = ref(true);
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 表格hooks
@@ -140,13 +135,6 @@
         searchInfo.organizationId = organizationId;
         handleSuccess();
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
       return {
         searchInfo,
         hasBatchDelete,
@@ -157,8 +145,6 @@
         registerTable,
         registerDrawer,
         organizationIdTreeRef,
-        changeWidth,
-        isFold,
       };
     },
   });
--- a/src/views/camera/manage/index.vue
View file @5e2c819
+++ b/src/views/camera/manage/index.vue
View file @5e2c819
@@ -6,8 +6,6 @@
         @select="handleSelect"
         ref="organizationIdTreeRef"
         style="position: relative"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
       />
       <BasicTable
         style="flex: auto"
@@ -15,7 +13,6 @@
         @register="registerTable"
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:video:post">
@@ -80,7 +77,7 @@
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { useDrawer } from '/@/components/Drawer';
@@ -105,7 +102,6 @@
       Authority,
     },
     setup() {
-      const isFold = ref(true);
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
@@ -174,13 +170,6 @@
           record,
         });
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
       return {
         searchInfo,
         hasBatchDelete,
@@ -193,8 +182,6 @@
         organizationIdTreeRef,
         handleViewVideo,
         registerModal,
-        changeWidth,
-        isFold,
       };
     },
   });
--- a/src/views/common/organizationIdTree/src/OrganizationIdTree.vue
View file @5e2c819
+++ b/src/views/common/organizationIdTree/src/OrganizationIdTree.vue
View file @5e2c819
 <template>
-  <div :style="foldIconStyle">
-    <Tooltip v-if="isFold">
-      <template #title>隐藏组织</template>
-      <MenuFoldOutlined @click="changeWidth(true)" />
-    </Tooltip>
-    <Tooltip v-else>
-      <template #title>打开组织</template>
-      <MenuUnfoldOutlined @click="changeWidth(false)" />
-    </Tooltip>
-  </div>
-  <div v-show="isFold" class="bg-white m-4 mr-0 overflow-hidden">
+  <div style="position: absolute"> </div>
+  <div class="bg-white m-4 mr-0 overflow-hidden">
     <BasicTree
       title="组织列表"
       toolbar
@@ -24,39 +15,13 @@
   </div>
 </template>
 <script lang="ts" setup name="OrganizationIdTree">
-  import { onMounted, ref, unref } from 'vue';
+  import { onMounted, ref } from 'vue';
   import { BasicTree, TreeItem } from '/@/components/Tree';
   import { getOrganizationList } from '/@/api/system/system';
-  import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons-vue';
-  import { computed } from '@vue/reactivity';
   const emit = defineEmits(['select']);
   const treeData = ref<TreeItem[]>([]);
   const selectedKeys = ref<string[]>();
   const treeExpandData = ref([]);
-
-  const isFold = ref(false);
-
-  const changeWidth = (e) => {
-    if (e) {
-      isFold.value = false;
-    } else {
-      isFold.value = true;
-    }
-  };
-
-  const foldIconStyle = computed(() => {
-    return unref(isFold)
-      ? {
-          padding: '22px 0 0 16px',
-          position: 'absolute',
-          left: '85px',
-          lineHeight: '24px',
-        }
-      : {
-          padding: '22px 0 0 16px',
-        };
-  });
-
   //获取所有父级id
   function findForAllId(data = [], arr = []) {
     for (const item of data) {
--- a/src/views/configuration/center/index.vue
View file @5e2c819
+++ b/src/views/configuration/center/index.vue
View file @5e2c819
@@ -6,8 +6,6 @@
         @select="handleSelect"
         ref="organizationIdTreeRef"
         style="position: relative"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
       />
       <BasicTable
         style="flex: auto"
@@ -15,7 +13,6 @@
         @register="registerTable"
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:admin:addConfiguration">
@@ -73,7 +70,7 @@
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { useDrawer } from '/@/components/Drawer';
@@ -98,7 +95,6 @@
       Authority,
     },
     setup() {
-      const isFold = ref(true);
       const { VITE_GLOB_CONFIGURATION } = getAppEnvConfig();
       const isDev = isDevMode();
       const searchInfo = reactive<Recordable>({});
@@ -174,13 +170,7 @@
           `${VITE_GLOB_CONFIGURATION}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}`
         );
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
+
       return {
         searchInfo,
         hasBatchDelete,
@@ -193,8 +183,6 @@
         registerTable,
         registerDrawer,
         organizationIdTreeRef,
-        changeWidth,
-        isFold,
       };
     },
   });
--- a/src/views/device/list/index.vue
View file @5e2c819
+++ b/src/views/device/list/index.vue
View file @5e2c819
@@ -4,16 +4,9 @@
       <OrganizationIdTree
         class="w-1/6 xl:w-1/5"
         @select="handleSelect"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
         ref="organizationIdTreeRef"
       />
-      <BasicTable
-        style="flex: auto"
-        @register="registerTable"
-        class="w-5/6 xl:w-4/5"
-        :class="[!isFold ? 'w-423 xl:w-423' : 'w-5/6 xl:w-4/5']"
-      >
+      <BasicTable style="flex: auto" @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
           <Authority value="api:yt:device:post">
             <a-button type="primary" @click="handleCreate" v-if="authBtn(role)">
@@ -210,8 +203,6 @@
       Authority,
     },
     setup(_) {
-      const isFold = ref(true);
-
       const { createMessage } = useMessage();
       const go = useGo();
       const searchInfo = reactive<Recordable>({});
@@ -323,13 +314,6 @@
           createMessage.success('复制成功~');
         }
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
       return {
         registerTable,
@@ -354,8 +338,6 @@
         hasBatchDelete,
         handleDeleteOrBatchDelete,
         handleReload,
-        changeWidth,
-        isFold,
       };
     },
   });
--- a/src/views/system/account/index.vue
View file @5e2c819
+++ b/src/views/system/account/index.vue
View file @5e2c819
@@ -5,16 +5,12 @@
         class="w-1/4 xl:w-1/5"
         @select="handleSelect"
         ref="organizationIdTreeRef"
-        style="position: relative"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
       />
       <BasicTable
         style="flex: auto"
         :clickToRowSelect="false"
         @register="registerTable"
         class="w-3/4 xl:w-4/5"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:user:post">
@@ -89,7 +85,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { deleteUser, getAccountList } from '/@/api/system/system';
   import { PageWrapper } from '/@/components/Page';
@@ -114,7 +110,6 @@
       Authority,
     },
     setup() {
-      const isFold = ref(true);
       const go = useGo();
       const [registerModal, { openModal }] = useModal();
       let searchInfo = reactive<Recordable>({});
@@ -173,13 +168,6 @@
       function handleView(record: Recordable) {
         go('/system/account_detail/' + record.id);
       }
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
       return {
         registerTable,
@@ -192,8 +180,6 @@
         organizationIdTreeRef,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
-        changeWidth,
-        isFold,
       };
     },
   });