Merge branch 'main' into local_dev_ft

@@ -244,7 +244,6 @@
     // selectedTotal.value = unref(selectedRowKeys).length;
     // selectedTotal.value = unref(selectedRowKeys).length;
     pendingTotal.value = unref(pendingTotal) - currentPageSelectRows.length;
     pendingTotal.value = unref(pendingTotal) - currentPageSelectRows.length;
     selectedTotal.value = unref(selectedTotal) + currentPageSelectRows.length;
     selectedTotal.value = unref(selectedTotal) + currentPageSelectRows.length;
-    console.log(unref(pendingTotal));
 
 
     clearPendingSelectedRowKeys();
     clearPendingSelectedRowKeys();
     handleTriggerEmit(unref(selectedRowKeys), unref(selectedRows));
     handleTriggerEmit(unref(selectedRowKeys), unref(selectedRows));

 <script setup lang="ts">
 <script setup lang="ts">
-  import { List, Card, Button, PaginationProps, Popover, Slider, Tooltip } from 'ant-design-vue';
-  import { ReloadOutlined, AppstoreOutlined } from '@ant-design/icons-vue';
+  import { List, Card, Button, PaginationProps, Tooltip } from 'ant-design-vue';
+  import { ReloadOutlined } from '@ant-design/icons-vue';
   import { computed, onMounted, reactive, ref, unref } from 'vue';
   import { computed, onMounted, reactive, ref, unref } from 'vue';
   import { OrganizationIdTree, useResetOrganizationTree } from '../../common/organizationIdTree';
   import { OrganizationIdTree, useResetOrganizationTree } from '../../common/organizationIdTree';
   import {
   import {
@@ -21,7 +21,7 @@
   import { cloneDeep } from 'lodash';
   import { cloneDeep } from 'lodash';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { useGlobSetting } from '/@/hooks/setting';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { AuthIcon } from '/@/components/Widget';
+  import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
   import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
   import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
 
 
   const listColumn = ref(5);
   const listColumn = ref(5);
@@ -34,6 +34,7 @@
     size: 'small',
     size: 'small',
     showTotal: (total: number) => `共 ${total} 条数据`,
     showTotal: (total: number) => `共 ${total} 条数据`,
     current: 1,
     current: 1,
+    pageSize: unref(listColumn) * 2,
     onChange: (page: number) => {
     onChange: (page: number) => {
       pagination.current = page;
       pagination.current = page;
       getListData();
       getListData();
@@ -63,16 +64,16 @@
   async function getListData(value: Recordable = {}) {
   async function getListData(value: Recordable = {}) {
     try {
     try {
       loading.value = true;
       loading.value = true;
-      const pageSize = 4 * unref(listColumn);
+      const pageSize = unref(listColumn) * 2;
       const { items, total } = await getPage({
       const { items, total } = await getPage({
         organizationId: unref(organizationId),
         organizationId: unref(organizationId),
         ...value,
         ...value,
         page: pagination.current!,
         page: pagination.current!,
         pageSize,
         pageSize,
       });
       });
+
       dataSource.value = items;
       dataSource.value = items;
-      pagination.total = total;
-      pagination.pageSize = pageSize;
+      Object.assign(pagination, { total, pageSize });
     } catch (error) {
     } catch (error) {
     } finally {
     } finally {
       loading.value = false;
       loading.value = false;
@@ -138,6 +139,11 @@
     } catch (error) {}
     } catch (error) {}
   };
   };
 
 
+  const handleCardLayoutChange = () => {
+    pagination.current = 1;
+    getListData();
+  };
+
   const listEl = ref<Nullable<ComponentElRef>>(null);
   const listEl = ref<Nullable<ComponentElRef>>(null);
 
 
   onMounted(() => {
   onMounted(() => {
@@ -180,23 +186,7 @@
             <Authority :value="ConfigurationPermission.CREATE">
             <Authority :value="ConfigurationPermission.CREATE">
               <Button type="primary" @click="handleCreateOrUpdate()">新增组态</Button>
               <Button type="primary" @click="handleCreateOrUpdate()">新增组态</Button>
             </Authority>
             </Authority>
-            <Popover :trigger="['hover']">
-              <template #content>
-                <div class="w-50">
-                  <div>每行显示数量</div>
-                  <Slider
-                    v-model:value="listColumn"
-                    :max="12"
-                    :min="4"
-                    :marks="{ 4: 4, 5: 5, 6: 6, 7: 7, 8: 8, 9: 9, 10: 10, 11: 11, 12: 12 }"
-                    @change="getListData"
-                  />
-                </div>
-              </template>
-              <Button type="primary">
-                <AppstoreOutlined />
-              </Button>
-            </Popover>
+            <CardLayoutButton v-model:value="listColumn" @change="handleCardLayoutChange" />
             <Tooltip title="刷新">
             <Tooltip title="刷新">
               <Button type="primary" @click="getListData">
               <Button type="primary" @click="getListData">
                 <ReloadOutlined @click="getListData" />
                 <ReloadOutlined @click="getListData" />
@@ -256,28 +246,6 @@
                   ]"
                   ]"
                   :trigger="['hover']"
                   :trigger="['hover']"
                 />
                 />
-                <!-- <Dropdown
-                  :dropMenuList="[
-                    {
-                      text: '编辑',
-                      auth: ConfigurationPermission.UPDATE,
-                      icon: 'clarity:note-edit-line',
-                      event: '',
-                      onClick: handleCreateOrUpdate.bind(null, item),
-                    },
-                    {
-                      text: '删除',
-                      auth: ConfigurationPermission.DELETE,
-                      icon: 'ant-design:delete-outlined',
-                      color: 'error',
-                      event: '',
-                      onClick: handleDelete.bind(null, item),
-                    },
-                  ]"
-                  :trigger="['hover']"
-                >
-                  <EllipsisOutlined key="ellipsis" />
-                </Dropdown> -->
               </template>
               </template>
               <Card.Meta>
               <Card.Meta>
                 <template #title>
                 <template #title>
@@ -308,6 +276,10 @@
     height: 24px;
     height: 24px;
   }
   }
 
 
+  .configuration-list:deep(.ant-card-body) {
+    padding: 16px !important;
+  }
+
   .configuration-list:deep(.ant-list-empty-text) {
   .configuration-list:deep(.ant-list-empty-text) {
     @apply w-full h-full flex justify-center items-center;
     @apply w-full h-full flex justify-center items-center;
   }
   }

@@ -135,6 +135,11 @@
                     onClick: handleDispatchCustomer.bind(null, record),
                     onClick: handleDispatchCustomer.bind(null, record),
                   },
                   },
               {
               {
+                label: '上下线记录',
+                icon: 'ant-design:rise-outlined',
+                onClick: handleUpAndDownRecord.bind(null, record),
+              },
+              {
                 label: '删除',
                 label: '删除',
                 auth: 'api:yt:device:delete',
                 auth: 'api:yt:device:delete',
                 icon: 'ant-design:delete-outlined',
                 icon: 'ant-design:delete-outlined',
@@ -193,6 +198,7 @@
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
+  import { useRouter } from 'vue-router';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'DeviceManagement',
     name: 'DeviceManagement',
@@ -215,6 +221,7 @@
     setup(_) {
     setup(_) {
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const go = useGo();
       const go = useGo();
+      const ROUTER = useRouter();
       const immediateStatus = ref(false);
       const immediateStatus = ref(false);
       const searchInfo = reactive<Recordable>({});
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
@@ -405,6 +412,13 @@
         openGatewayDetailDrawer(true, data);
         openGatewayDetailDrawer(true, data);
       };
       };
 
 
+      const handleUpAndDownRecord = (record: Record<'name', string>) => {
+        ROUTER.push({
+          path: '/operation/onlinerecord',
+          query: { deviceName: record.name },
+        });
+      };
+
       return {
       return {
         registerTable,
         registerTable,
         handleCreate,
         handleCreate,
@@ -432,6 +446,7 @@
         handleOpenTbDeviceDetail,
         handleOpenTbDeviceDetail,
         handleOpenGatewayDetail,
         handleOpenGatewayDetail,
         registerGatewayDetailDrawer,
         registerGatewayDetailDrawer,
+        handleUpAndDownRecord,
       };
       };
     },
     },
   });
   });

@@ -62,10 +62,13 @@
 
 
   const loading = ref(false);
   const loading = ref(false);
 
 
+  const colNumber = ref(5);
+
   const pagination = reactive<PaginationProps>({
   const pagination = reactive<PaginationProps>({
     size: 'small',
     size: 'small',
     showTotal: (total: number) => `共 ${total} 条数据`,
     showTotal: (total: number) => `共 ${total} 条数据`,
     current: 1,
     current: 1,
+    pageSize: unref(colNumber) * 2,
     onChange: (page: number) => {
     onChange: (page: number) => {
       pagination.current = page;
       pagination.current = page;
       getDataSource();
       getDataSource();
@@ -74,8 +77,6 @@
 
 
   const dataSource = ref<ProfileRecord[]>([]);
   const dataSource = ref<ProfileRecord[]>([]);
 
 
-  const colNumber = ref(5);
-
   const getSelectAllFlag = computed(() => {
   const getSelectAllFlag = computed(() => {
     return unref(dataSource).every((item) => item.checked);
     return unref(dataSource).every((item) => item.checked);
   });
   });
@@ -93,13 +94,14 @@
         setFieldsValue(otherParams);
         setFieldsValue(otherParams);
       }
       }
       const params = getFieldsValue();
       const params = getFieldsValue();
+      const pageSize = unref(colNumber) * 2;
       const { items, total } = await deviceConfigGetQuery({
       const { items, total } = await deviceConfigGetQuery({
         page: pagination.current,
         page: pagination.current,
         pageSize: unref(colNumber) * 2,
         pageSize: unref(colNumber) * 2,
         ...params,
         ...params,
         ...otherParams,
         ...otherParams,
       });
       });
-      pagination.total = total;
+      Object.assign(pagination, { total, pageSize });
       dataSource.value = items.map((item) => ({ ...item, checked: false }));
       dataSource.value = items.map((item) => ({ ...item, checked: false }));
     } catch (error) {
     } catch (error) {
     } finally {
     } finally {
@@ -162,6 +164,12 @@
       throw error;
       throw error;
     }
     }
   };
   };
+
+  const handleCardLayoutChange = () => {
+    pagination.current = 1;
+    getDataSource();
+  };
+
   const { query: routeParams } = useRoute();
   const { query: routeParams } = useRoute();
   onMounted(() => {
   onMounted(() => {
     getDataSource(routeParams);
     getDataSource(routeParams);
@@ -204,7 +212,7 @@
             </Authority>
             </Authority>
 
 
             <ModeSwitchButton :value="$props.mode" @change="handleModeChange" />
             <ModeSwitchButton :value="$props.mode" @change="handleModeChange" />
-            <CardLayoutButton v-model:value="colNumber" @change="getDataSource" />
+            <CardLayoutButton v-model:value="colNumber" @change="handleCardLayoutChange" />
 
 
             <Tooltip title="刷新">
             <Tooltip title="刷新">
               <Button type="primary" @click="getDataSource">
               <Button type="primary" @click="getDataSource">

@@ -48,7 +48,7 @@
 </template>
 </template>
 
 
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { nextTick } from 'vue';
+  import { nextTick, onMounted } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import OnlineRecordDrawer from './OnlineRecordDrawer.vue';
   import OnlineRecordDrawer from './OnlineRecordDrawer.vue';
@@ -58,9 +58,11 @@
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Popconfirm } from 'ant-design-vue';
   import { Popconfirm } from 'ant-design-vue';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
+  import { useRoute } from 'vue-router';
 
 
-  const [registerTable, { setProps, reload }] = useTable({
+  const [registerTable, { setProps, reload, getForm }] = useTable({
     title: '上下线记录',
     title: '上下线记录',
+    immediate: false,
     api: deviceStateLogPage,
     api: deviceStateLogPage,
     columns,
     columns,
     showIndexColumn: false,
     showIndexColumn: false,
@@ -117,4 +119,14 @@
       record,
       record,
     });
     });
   };
   };
+  const ROUTE = useRoute();
+
+  onMounted(async () => {
+    const formActionType = getForm();
+    const params = ROUTE.query;
+    if (params) {
+      await formActionType.setFieldsValue(params);
+    }
+    await reload();
+  });
 </script>
 </script>

@@ -70,8 +70,8 @@ const handleGroupDevice = (options: DeviceRecord[]) => {
     }
     }
   });
   });
   const value = Array.from(map.entries()).map(([product, devices]) => ({ product, devices }));
   const value = Array.from(map.entries()).map(([product, devices]) => ({ product, devices }));
-  console.log(value);
-  return Array.from(map.entries()).map(([product, devices]) => ({ product, devices }));
+
+  return value;
 };
 };
 
 
 const deviceTableFormSchema: FormSchema[] = [
 const deviceTableFormSchema: FormSchema[] = [