From f08e28560aab95f3658944057f52c7bdf9e40856 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 30 Mar 2023 17:18:43 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=92=91=E6=BB=A1=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Apply/index.vue              | 326 ++++++-----
 src/views/system/Basis/index.vue              | 540 +++++++++---------
 src/views/system/DataSource/index.vue         | 251 ++++----
 src/views/system/Department/device/index.vue  | 323 +++++------
 src/views/system/Department/product/index.vue | 372 ++++++------
 src/views/system/Department/user/index.vue    | 126 ++--
 src/views/system/Menu/index.vue               | 121 ++--
 src/views/system/Permission/index.vue         | 248 ++++----
 src/views/system/Relationship/index.vue       | 101 ++--
 src/views/system/Role/index.vue               | 113 ++--
 src/views/system/User/index.vue               | 228 ++++----
 11 files changed, 1406 insertions(+), 1343 deletions(-)

diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index cc6fbb52..0cef67fd 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -6,166 +6,176 @@
                 target="category"
                 @search="(params:any)=>queryParams = {...params}"
             />
-
-            <j-pro-table
-                ref="tableRef"
-                :columns="columns"
-                :request="getApplyList_api"
-                :defaultParams="{
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                }"
-                :params="queryParams"
-                :gridColumn="3"
-            >
-                <template #headerTitle>
-                    <div style="display: flex; align-items: center">
-                        <PermissionButton
-                            :hasPermission="`${permission}:add`"
-                            type="primary"
-                            @click="() => table.toSave()"
-                        >
-                            <AIcon type="PlusOutlined" />新增
-                        </PermissionButton>
-                        <p style="margin: 0 0 0 30px; color: #0000008c">
-                            <AIcon
-                                type="ExclamationCircleOutlined"
-                                style="margin-right: 12px"
-                            />
-                            应用管理将多个应用系统的登录简化为一次登录，实现多处访问、集中管控的业务场景。
-                        </p>
-                    </div>
-                </template>
-                <template #card="slotProps">
-                    <CardBox
-                        :value="slotProps"
-                        :actions="table.getActions(slotProps, 'card')"
-                        v-bind="slotProps"
-                        :status="slotProps.state?.value"
-                        :statusText="slotProps.state?.text"
-                        :statusNames="{
-                            enabled: 'success',
-                            disabled: 'error',
-                        }"
-                    >
-                        <template #img>
-                            <slot name="img">
-                                <img :src="getImage('/apply.png')" />
-                            </slot>
-                        </template>
-                        <template #content>
-                            <h3 class="card-item-content-title">
-                                <Ellipsis>
-                                    {{ slotProps.name }}
-                                </Ellipsis>
-                            </h3>
-                            <j-row>
-                                <j-col :span="12">
-                                    <div class="card-item-content-text">
-                                        类型
-                                    </div>
-                                    <div>
-                                        {{
-                                            table.getTypeLabel(
-                                                slotProps.provider,
-                                            )
-                                        }}
-                                    </div>
-                                </j-col>
-                                <j-col :span="12">
-                                    <div class="card-item-content-text">
-                                        说明
-                                    </div>
-                                    <Ellipsis>
-                                        {{ slotProps.description }}
-                                    </Ellipsis>
-                                </j-col>
-                            </j-row>
-                        </template>
-                        <template #actions="item">
-                            <j-tooltip
-                                v-bind="item.tooltip"
-                                :title="item.disabled && item.tooltip.title"
+            <FullPage>
+                <j-pro-table
+                    ref="tableRef"
+                    :columns="columns"
+                    :request="getApplyList_api"
+                    :defaultParams="{
+                        sorts: [{ name: 'createTime', order: 'desc' }],
+                    }"
+                    :params="queryParams"
+                    :gridColumn="3"
+                >
+                    <template #headerTitle>
+                        <div style="display: flex; align-items: center">
+                            <PermissionButton
+                                :hasPermission="`${permission}:add`"
+                                type="primary"
+                                @click="() => table.toSave()"
                             >
-                                <j-dropdown
-                                    placement="bottomRight"
-                                    v-if="item.key === 'others'"
-                                >
-                                    <j-button>
-                                        <AIcon :type="item.icon" />
-                                        <span>{{ item.text }}</span>
-                                    </j-button>
-                                    <template #overlay>
-                                        <j-menu>
-                                            <j-menu-item
-                                                v-for="(o, i) in item.children"
-                                                :key="i"
-                                            >
-                                                <j-button
-                                                    type="link"
-                                                    @click="o.onClick"
-                                                >
-                                                    <AIcon :type="o.icon" />
-                                                    <span>{{ o.text }}</span>
-                                                </j-button>
-                                            </j-menu-item>
-                                        </j-menu>
-                                    </template>
-                                </j-dropdown>
-                                <PermissionButton
-                                    v-else
-                                    :hasPermission="item.permission"
-                                    :tooltip="item.tooltip"
-                                    :pop-confirm="item.popConfirm"
-                                    @click="item.onClick"
-                                    :disabled="item.disabled"
-                                >
-                                    <AIcon :type="item.icon" />
-                                    <span v-if="item.key !== 'delete'">{{
-                                        item.text
-                                    }}</span>
-                                </PermissionButton>
-                            </j-tooltip>
-                        </template>
-
-                        <template #mark>
-                            <AIcon
-                                type="EyeOutlined"
-                                style="font-size: 24px"
-                                @click="() => table.toSave(slotProps.id, true)"
-                            />
-                        </template>
-                    </CardBox>
-                </template>
-
-                <template #provider="slotProps">
-                    {{ table.getTypeLabel(slotProps.provider) }}
-                </template>
-                <template #status="slotProps">
-                    <BadgeStatus
-                        :status="slotProps.state.value"
-                        :text="slotProps.state.text"
-                        :statusNames="{
-                            enabled: 'success',
-                            disabled: 'error',
-                        }"
-                    ></BadgeStatus>
-                </template>
-                <template #action="slotProps">
-                    <j-space :size="16">
-                        <PermissionButton
-                            v-for="i in table.getActions(slotProps, 'table')"
-                            :hasPermission="i.permission"
-                            type="link"
-                            :tooltip="i.tooltip"
-                            :pop-confirm="i.popConfirm"
-                            @click="i.onClick"
-                            :disabled="i.disabled"
+                                <AIcon type="PlusOutlined" />新增
+                            </PermissionButton>
+                            <p style="margin: 0 0 0 30px; color: #0000008c">
+                                <AIcon
+                                    type="ExclamationCircleOutlined"
+                                    style="margin-right: 12px"
+                                />
+                                应用管理将多个应用系统的登录简化为一次登录，实现多处访问、集中管控的业务场景。
+                            </p>
+                        </div>
+                    </template>
+                    <template #card="slotProps">
+                        <CardBox
+                            :value="slotProps"
+                            :actions="table.getActions(slotProps, 'card')"
+                            v-bind="slotProps"
+                            :status="slotProps.state?.value"
+                            :statusText="slotProps.state?.text"
+                            :statusNames="{
+                                enabled: 'success',
+                                disabled: 'error',
+                            }"
                         >
-                            <AIcon :type="i.icon" />
-                        </PermissionButton>
-                    </j-space>
-                </template>
-            </j-pro-table>
+                            <template #img>
+                                <slot name="img">
+                                    <img :src="getImage('/apply.png')" />
+                                </slot>
+                            </template>
+                            <template #content>
+                                <h3 class="card-item-content-title">
+                                    <Ellipsis>
+                                        {{ slotProps.name }}
+                                    </Ellipsis>
+                                </h3>
+                                <j-row>
+                                    <j-col :span="12">
+                                        <div class="card-item-content-text">
+                                            类型
+                                        </div>
+                                        <div>
+                                            {{
+                                                table.getTypeLabel(
+                                                    slotProps.provider,
+                                                )
+                                            }}
+                                        </div>
+                                    </j-col>
+                                    <j-col :span="12">
+                                        <div class="card-item-content-text">
+                                            说明
+                                        </div>
+                                        <Ellipsis>
+                                            {{ slotProps.description }}
+                                        </Ellipsis>
+                                    </j-col>
+                                </j-row>
+                            </template>
+                            <template #actions="item">
+                                <j-tooltip
+                                    v-bind="item.tooltip"
+                                    :title="item.disabled && item.tooltip.title"
+                                >
+                                    <j-dropdown
+                                        placement="bottomRight"
+                                        v-if="item.key === 'others'"
+                                    >
+                                        <j-button>
+                                            <AIcon :type="item.icon" />
+                                            <span>{{ item.text }}</span>
+                                        </j-button>
+                                        <template #overlay>
+                                            <j-menu>
+                                                <j-menu-item
+                                                    v-for="(
+                                                        o, i
+                                                    ) in item.children"
+                                                    :key="i"
+                                                >
+                                                    <j-button
+                                                        type="link"
+                                                        @click="o.onClick"
+                                                    >
+                                                        <AIcon :type="o.icon" />
+                                                        <span>{{
+                                                            o.text
+                                                        }}</span>
+                                                    </j-button>
+                                                </j-menu-item>
+                                            </j-menu>
+                                        </template>
+                                    </j-dropdown>
+                                    <PermissionButton
+                                        v-else
+                                        :hasPermission="item.permission"
+                                        :tooltip="item.tooltip"
+                                        :pop-confirm="item.popConfirm"
+                                        @click="item.onClick"
+                                        :disabled="item.disabled"
+                                    >
+                                        <AIcon :type="item.icon" />
+                                        <span v-if="item.key !== 'delete'">{{
+                                            item.text
+                                        }}</span>
+                                    </PermissionButton>
+                                </j-tooltip>
+                            </template>
+
+                            <template #mark>
+                                <AIcon
+                                    type="EyeOutlined"
+                                    style="font-size: 24px"
+                                    @click="
+                                        () => table.toSave(slotProps.id, true)
+                                    "
+                                />
+                            </template>
+                        </CardBox>
+                    </template>
+
+                    <template #provider="slotProps">
+                        {{ table.getTypeLabel(slotProps.provider) }}
+                    </template>
+                    <template #status="slotProps">
+                        <BadgeStatus
+                            :status="slotProps.state.value"
+                            :text="slotProps.state.text"
+                            :statusNames="{
+                                enabled: 'success',
+                                disabled: 'error',
+                            }"
+                        ></BadgeStatus>
+                    </template>
+                    <template #action="slotProps">
+                        <j-space :size="16">
+                            <PermissionButton
+                                v-for="i in table.getActions(
+                                    slotProps,
+                                    'table',
+                                )"
+                                :hasPermission="i.permission"
+                                type="link"
+                                :tooltip="i.tooltip"
+                                :pop-confirm="i.popConfirm"
+                                @click="i.onClick"
+                                :disabled="i.disabled"
+                            >
+                                <AIcon :type="i.icon" />
+                            </PermissionButton>
+                        </j-space>
+                    </template>
+                </j-pro-table>
+            </FullPage>
         </div>
         <div class="dialogs">
             <MenuDialog
diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index 2017d631..8561c46b 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -1,285 +1,313 @@
 <template>
     <page-container>
-        <div class="basis-container">
-            <j-form
-                layout="vertical"
-                ref="formRef"
-                :rules="rulesFrom"
-                :model="formValue"
-            >
-                <j-row :span="24" :gutter="24">
-                    <j-col :span="10">
-                        <j-form-item label="系统名称" name="title">
-                            <j-input
-                                v-model:value="formValue.title"
-                                placeholder="请输入系统名称"
-                            />
-                        </j-form-item>
-                        <j-form-item label="主题色" name="headerTheme">
-                            <j-select v-model:value="formValue.headerTheme">
-                                <j-select-option value="light">
-                                    白色
-                                </j-select-option>
-                                <j-select-option value="dark">
-                                    黑色
-                                </j-select-option>
-                            </j-select>
-                        </j-form-item>
-                        <j-form-item>
-                            <template #label>
-                                <span>高德API Key</span>
-                                <j-tooltip
-                                    title="配置后平台可调用高德地图GIS服务"
-                                >
-                                    <img
-                                        class="img-style"
-                                        :src="getImage('/init-home/mark.png')"
-                                    />
-                                </j-tooltip>
-                            </template>
-                            <j-input
-                                v-model:value="formValue.apiKey"
-                                placeholder="请输入高德API Key"
-                            />
-                        </j-form-item>
-                        <j-form-item name="base-path">
-                            <template #label>
-                                <span>base-path</span>
-                                <j-tooltip title="系统后台访问的url">
-                                    <img
-                                        class="img-style"
-                                        :src="getImage('/init-home/mark.png')"
-                                    />
-                                </j-tooltip>
-                            </template>
-                            <j-input
-                                v-model:value="formValue['base-path']"
-                                placeholder="请输入高德API Key"
-                            />
-                        </j-form-item>
-                        <j-row :gutter="24" :span="24">
-                            <j-col>
-                                <j-form-item label="系统logo">
-                                    <div class="upload-image-warp-logo">
-                                        <div class="upload-image-border-logo">
-                                            <j-upload
-                                                name="file"
-                                                :action="action"
-                                                :headers="headers"
-                                                :showUploadList="false"
-                                                :beforeUpload="
-                                                    uploader.beforeLogoUpload
-                                                "
-                                                @change="
-                                                    uploader.handleChangeLogo
-                                                "
-                                                :accept="uploader.imageTypes"
+        <FullPage>
+            <div class="basis-container">
+                <j-form
+                    layout="vertical"
+                    ref="formRef"
+                    :rules="rulesFrom"
+                    :model="formValue"
+                >
+                    <j-row :span="24" :gutter="24">
+                        <j-col :span="10">
+                            <j-form-item label="系统名称" name="title">
+                                <j-input
+                                    v-model:value="formValue.title"
+                                    placeholder="请输入系统名称"
+                                />
+                            </j-form-item>
+                            <j-form-item label="主题色" name="headerTheme">
+                                <j-select v-model:value="formValue.headerTheme">
+                                    <j-select-option value="light">
+                                        白色
+                                    </j-select-option>
+                                    <j-select-option value="dark">
+                                        黑色
+                                    </j-select-option>
+                                </j-select>
+                            </j-form-item>
+                            <j-form-item>
+                                <template #label>
+                                    <span>高德API Key</span>
+                                    <j-tooltip
+                                        title="配置后平台可调用高德地图GIS服务"
+                                    >
+                                        <img
+                                            class="img-style"
+                                            :src="
+                                                getImage('/init-home/mark.png')
+                                            "
+                                        />
+                                    </j-tooltip>
+                                </template>
+                                <j-input
+                                    v-model:value="formValue.apiKey"
+                                    placeholder="请输入高德API Key"
+                                />
+                            </j-form-item>
+                            <j-form-item name="base-path">
+                                <template #label>
+                                    <span>base-path</span>
+                                    <j-tooltip title="系统后台访问的url">
+                                        <img
+                                            class="img-style"
+                                            :src="
+                                                getImage('/init-home/mark.png')
+                                            "
+                                        />
+                                    </j-tooltip>
+                                </template>
+                                <j-input
+                                    v-model:value="formValue['base-path']"
+                                    placeholder="请输入高德API Key"
+                                />
+                            </j-form-item>
+                            <j-row :gutter="24" :span="24">
+                                <j-col>
+                                    <j-form-item label="系统logo">
+                                        <div class="upload-image-warp-logo">
+                                            <div
+                                                class="upload-image-border-logo"
                                             >
-                                                <div
-                                                    class="upload-image-content-logo"
+                                                <j-upload
+                                                    name="file"
+                                                    :action="action"
+                                                    :headers="headers"
+                                                    :showUploadList="false"
+                                                    :beforeUpload="
+                                                        uploader.beforeLogoUpload
+                                                    "
+                                                    @change="
+                                                        uploader.handleChangeLogo
+                                                    "
+                                                    :accept="
+                                                        uploader.imageTypes
+                                                    "
                                                 >
                                                     <div
-                                                        class="loading-logo"
-                                                        v-if="form.logoLoading"
+                                                        class="upload-image-content-logo"
+                                                    >
+                                                        <div
+                                                            class="loading-logo"
+                                                            v-if="
+                                                                form.logoLoading
+                                                            "
+                                                        >
+                                                            <AIcon
+                                                                type="LoadingOutlined"
+                                                            />
+                                                        </div>
+                                                        <div
+                                                            class="upload-image"
+                                                            style="height: 100%"
+                                                            v-if="
+                                                                formValue.logo
+                                                            "
+                                                            :style="
+                                                                formValue.logo
+                                                                    ? `background-image: url(${formValue.logo});`
+                                                                    : ''
+                                                            "
+                                                        ></div>
+                                                        <div
+                                                            v-if="
+                                                                formValue.logo
+                                                            "
+                                                            class="upload-image-mask"
+                                                        >
+                                                            点击修改
+                                                        </div>
+                                                        <div v-else>
+                                                            <AIcon
+                                                                :type="
+                                                                    form.logoLoading
+                                                                        ? 'LoadingOutlined'
+                                                                        : 'PlusOutlined'
+                                                                "
+                                                            />
+                                                        </div>
+                                                    </div>
+                                                </j-upload>
+                                                <div v-if="form.logoLoading">
+                                                    <div
+                                                        class="upload-loading-mask"
                                                     >
                                                         <AIcon
                                                             type="LoadingOutlined"
                                                         />
                                                     </div>
-                                                    <div
-                                                        class="upload-image"
-                                                        style="height: 100%"
-                                                        v-if="formValue.logo"
-                                                        :style="
-                                                            formValue.logo
-                                                                ? `background-image: url(${formValue.logo});`
-                                                                : ''
-                                                        "
-                                                    ></div>
-                                                    <div
-                                                        v-if="formValue.logo"
-                                                        class="upload-image-mask"
-                                                    >
-                                                        点击修改
-                                                    </div>
-                                                    <div v-else>
-                                                        <AIcon
-                                                            :type="
-                                                                form.logoLoading
-                                                                    ? 'LoadingOutlined'
-                                                                    : 'PlusOutlined'
-                                                            "
-                                                        />
-                                                    </div>
                                                 </div>
-                                            </j-upload>
-                                            <div v-if="form.logoLoading">
+                                            </div>
+                                        </div>
+
+                                        <div class="upload-tips">
+                                            推荐尺寸200*200
+                                        </div>
+                                        <div class="upload-tips">
+                                            支持jpg,png,jfif,pjp,pjpeg,jpeg
+                                        </div>
+                                    </j-form-item>
+                                </j-col>
+                                <j-col>
+                                    <j-form-item>
+                                        <template #label>
+                                            <span>浏览器页签</span>
+                                            <j-tooltip
+                                                title="浏览器tab页中显示的图片元素"
+                                            >
+                                                <img
+                                                    class="img-style"
+                                                    :src="
+                                                        getImage(
+                                                            '/init-home/mark.png',
+                                                        )
+                                                    "
+                                                />
+                                            </j-tooltip>
+                                        </template>
+                                        <div class="upload-image-warp-logo">
+                                            <div
+                                                class="upload-image-border-logo"
+                                            >
+                                                <j-upload
+                                                    name="file"
+                                                    :action="action"
+                                                    :headers="headers"
+                                                    :showUploadList="false"
+                                                    :beforeUpload="
+                                                        uploader.beforeIconUpload
+                                                    "
+                                                    @change="
+                                                        uploader.changeIconUpload
+                                                    "
+                                                    :accept="uploader.iconTypes"
+                                                >
+                                                    <div
+                                                        class="upload-image-content-logo"
+                                                    >
+                                                        <div
+                                                            v-if="
+                                                                form.iconLoading
+                                                            "
+                                                            class="loading-icon"
+                                                        >
+                                                            <AIcon
+                                                                type="LoadingOutlined"
+                                                            />
+                                                        </div>
+                                                        <div
+                                                            class="upload-image-icon"
+                                                            v-if="formValue.ico"
+                                                            :style="
+                                                                formValue.ico
+                                                                    ? `background-image: url(${formValue.ico});`
+                                                                    : ''
+                                                            "
+                                                        ></div>
+                                                        <div
+                                                            v-if="formValue.ico"
+                                                            class="upload-image-mask"
+                                                        >
+                                                            点击修改
+                                                        </div>
+                                                        <div v-else>
+                                                            <div>
+                                                                <AIcon
+                                                                    type="PlusOutlined"
+                                                                />
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </j-upload>
+                                            </div>
+                                        </div>
+
+                                        <div class="upload-tips">
+                                            推荐尺寸64*64
+                                        </div>
+                                        <div class="upload-tips">
+                                            支持ico格式
+                                        </div>
+                                    </j-form-item>
+                                </j-col>
+                            </j-row>
+                        </j-col>
+                        <j-col :span="14">
+                            <j-form-item label="登录背景图">
+                                <div class="upload-image-warp-back">
+                                    <div class="upload-image-border-back">
+                                        <j-upload
+                                            name="file"
+                                            :action="action"
+                                            :headers="headers"
+                                            :beforeUpload="
+                                                uploader.beforeLogoUpload
+                                            "
+                                            :showUploadList="false"
+                                            @change="uploader.changeBackUpload"
+                                            :accept="uploader.imageTypes"
+                                        >
+                                            <div
+                                                class="upload-image-content-back"
+                                            >
                                                 <div
-                                                    class="upload-loading-mask"
+                                                    v-if="form.backLoading"
+                                                    class="loading-back"
                                                 >
                                                     <AIcon
                                                         type="LoadingOutlined"
                                                     />
                                                 </div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="upload-tips">
-                                        推荐尺寸200*200
-                                    </div>
-                                    <div class="upload-tips">
-                                        支持jpg,png,jfif,pjp,pjpeg,jpeg
-                                    </div>
-                                </j-form-item>
-                            </j-col>
-                            <j-col>
-                                <j-form-item>
-                                    <template #label>
-                                        <span>浏览器页签</span>
-                                        <j-tooltip
-                                            title="浏览器tab页中显示的图片元素"
-                                        >
-                                            <img
-                                                class="img-style"
-                                                :src="
-                                                    getImage(
-                                                        '/init-home/mark.png',
-                                                    )
-                                                "
-                                            />
-                                        </j-tooltip>
-                                    </template>
-                                    <div class="upload-image-warp-logo">
-                                        <div class="upload-image-border-logo">
-                                            <j-upload
-                                                name="file"
-                                                :action="action"
-                                                :headers="headers"
-                                                :showUploadList="false"
-                                                :beforeUpload="
-                                                    uploader.beforeIconUpload
-                                                "
-                                                @change="
-                                                    uploader.changeIconUpload
-                                                "
-                                                :accept="uploader.iconTypes"
-                                            >
                                                 <div
-                                                    class="upload-image-content-logo"
+                                                    class="upload-image"
+                                                    v-if="formValue.backgroud"
+                                                    :style="
+                                                        formValue.backgroud
+                                                            ? `background-image: url(${formValue.backgroud});`
+                                                            : ''
+                                                    "
+                                                ></div>
+                                                <div
+                                                    v-if="formValue.backgroud"
+                                                    class="upload-image-mask"
                                                 >
-                                                    <div
-                                                        v-if="form.iconLoading"
-                                                        class="loading-icon"
-                                                    >
+                                                    点击修改
+                                                </div>
+                                                <div v-else>
+                                                    <div>
                                                         <AIcon
-                                                            type="LoadingOutlined"
+                                                            type="PlusOutlined"
                                                         />
                                                     </div>
-                                                    <div
-                                                        class="upload-image-icon"
-                                                        v-if="formValue.ico"
-                                                        :style="
-                                                            formValue.ico
-                                                                ? `background-image: url(${formValue.ico});`
-                                                                : ''
-                                                        "
-                                                    ></div>
-                                                    <div
-                                                        v-if="formValue.ico"
-                                                        class="upload-image-mask"
-                                                    >
-                                                        点击修改
-                                                    </div>
-                                                    <div v-else>
-                                                        <div>
-                                                            <AIcon
-                                                                type="PlusOutlined"
-                                                            />
-                                                        </div>
-                                                    </div>
                                                 </div>
-                                            </j-upload>
-                                        </div>
+                                            </div>
+                                        </j-upload>
                                     </div>
-
-                                    <div class="upload-tips">推荐尺寸64*64</div>
-                                    <div class="upload-tips">支持ico格式</div>
-                                </j-form-item>
-                            </j-col>
-                        </j-row>
-                    </j-col>
-                    <j-col :span="14">
-                        <j-form-item label="登录背景图">
-                            <div class="upload-image-warp-back">
-                                <div class="upload-image-border-back">
-                                    <j-upload
-                                        name="file"
-                                        :action="action"
-                                        :headers="headers"
-                                        :beforeUpload="
-                                            uploader.beforeLogoUpload
-                                        "
-                                        :showUploadList="false"
-                                        @change="uploader.changeBackUpload"
-                                        :accept="uploader.imageTypes"
-                                    >
-                                        <div class="upload-image-content-back">
-                                            <div
-                                                v-if="form.backLoading"
-                                                class="loading-back"
-                                            >
-                                                <AIcon type="LoadingOutlined" />
-                                            </div>
-                                            <div
-                                                class="upload-image"
-                                                v-if="formValue.backgroud"
-                                                :style="
-                                                    formValue.backgroud
-                                                        ? `background-image: url(${formValue.backgroud});`
-                                                        : ''
-                                                "
-                                            ></div>
-                                            <div
-                                                v-if="formValue.backgroud"
-                                                class="upload-image-mask"
-                                            >
-                                                点击修改
-                                            </div>
-                                            <div v-else>
-                                                <div>
-                                                    <AIcon
-                                                        type="PlusOutlined"
-                                                    />
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </j-upload>
                                 </div>
-                            </div>
-                            <div class="upload-tips">
-                                支持4M以内的图片:
-                                支持jpg,png,jfif,pjp,pjpeg,jpeg
-                            </div>
-                            <div class="upload-tips">建议尺寸1400x1080</div>
-                        </j-form-item>
-                    </j-col>
-                </j-row>
-            </j-form>
+                                <div class="upload-tips">
+                                    支持4M以内的图片:
+                                    支持jpg,png,jfif,pjp,pjpeg,jpeg
+                                </div>
+                                <div class="upload-tips">建议尺寸1400x1080</div>
+                            </j-form-item>
+                        </j-col>
+                    </j-row>
+                </j-form>
 
-            <j-button
-                type="primary"
-                @click="form.clickSave"
-                :disabled="
-                    form.saveLoading ||
-                    form.logoLoading ||
-                    form.iconLoading ||
-                    form.backLoading
-                "
-            >
-                保存
-            </j-button>
-        </div>
+                <j-button
+                    type="primary"
+                    @click="form.clickSave"
+                    :disabled="
+                        form.saveLoading ||
+                        form.logoLoading ||
+                        form.iconLoading ||
+                        form.backLoading
+                    "
+                >
+                    保存
+                </j-button>
+            </div>
+        </FullPage>
     </page-container>
 </template>
 
diff --git a/src/views/system/DataSource/index.vue b/src/views/system/DataSource/index.vue
index 6329b935..e7068e31 100644
--- a/src/views/system/DataSource/index.vue
+++ b/src/views/system/DataSource/index.vue
@@ -6,133 +6,134 @@
                 target="category"
                 @search="(params:any)=>queryParams = {...params}"
             />
-
-            <j-pro-table
-                ref="tableRef"
-                :columns="columns"
-                :request="getDataSourceList_api"
-                model="TABLE"
-                :params="queryParams"
-                :defaultParams="{
-                    pageSize: 10,
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                }"
-                :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
-            >
-                <template #headerTitle>
-                    <PermissionButton
-                        type="primary"
-                        :hasPermission="`${permission}:add`"
-                        @click="table.openDialog({})"
-                    >
-                        <AIcon type="PlusOutlined" />新增
-                    </PermissionButton>
-                </template>
-                <template #state="slotProps">
-                    <BadgeStatus
-                        :status="slotProps.state?.value"
-                        :text="slotProps.state?.text"
-                        :statusNames="{
-                            enabled: 'processing',
-                            disabled: 'error',
-                        }"
-                    >
-                    </BadgeStatus>
-                </template>
-                <template #typeId="slotProps">
-                    {{
-                        (table.typeOptions.value.length &&
-                            table.getTypeLabel(slotProps.typeId)) ||
-                        ''
-                    }}
-                </template>
-                <template #action="slotProps">
-                    <j-space :size="16">
+            <FullPage>
+                <j-pro-table
+                    ref="tableRef"
+                    :columns="columns"
+                    :request="getDataSourceList_api"
+                    model="TABLE"
+                    :params="queryParams"
+                    :defaultParams="{
+                        pageSize: 10,
+                        sorts: [{ name: 'createTime', order: 'desc' }],
+                    }"
+                    :pagination="{
+                        showSizeChanger: true,
+                        pageSizeOptions: ['10', '20', '50', '100'],
+                    }"
+                >
+                    <template #headerTitle>
                         <PermissionButton
-                            :hasPermission="`${permission}:update`"
-                            type="link"
-                            :tooltip="{
-                                title: '编辑',
-                            }"
-                            @click="table.openDialog(slotProps)"
+                            type="primary"
+                            :hasPermission="`${permission}:add`"
+                            @click="table.openDialog({})"
                         >
-                            <AIcon type="EditOutlined" />
+                            <AIcon type="PlusOutlined" />新增
                         </PermissionButton>
-                        <PermissionButton
-                            :hasPermission="`${permission}:manage`"
-                            type="link"
-                            :tooltip="{
-                                title:
-                                    slotProps?.typeId === 'rabbitmq'
-                                        ? '暂不支持管理功能'
-                                        : table.getRowStatus(slotProps)
-                                        ? '管理'
-                                        : '请先启用数据源',
-                            }"
-                            @click="
-                                () =>
-                                    router.push(
-                                        `/system/DataSource/Management?id=${slotProps.id}`,
-                                    )
-                            "
-                            :disabled="
-                                slotProps?.typeId === 'rabbitmq' ||
-                                !table.getRowStatus(slotProps)
-                            "
-                        >
-                            <AIcon type="icon-ziyuankuguanli" />
-                        </PermissionButton>
-                        <PermissionButton
-                            :hasPermission="`${permission}:action`"
-                            type="link"
-                            :popConfirm="{
-                                title: `确定要${
-                                    table.getRowStatus(slotProps)
-                                        ? '禁用'
-                                        : '启用'
-                                }吗？`,
-                                onConfirm: () =>
-                                    table.clickChangeStatus(slotProps),
-                            }"
-                            :tooltip="{
-                                title: table.getRowStatus(slotProps)
-                                    ? '禁用'
-                                    : '启用',
+                    </template>
+                    <template #state="slotProps">
+                        <BadgeStatus
+                            :status="slotProps.state?.value"
+                            :text="slotProps.state?.text"
+                            :statusNames="{
+                                enabled: 'processing',
+                                disabled: 'error',
                             }"
                         >
-                            <AIcon
-                                :type="
-                                    table.getRowStatus(slotProps)
-                                        ? 'StopOutlined'
-                                        : 'PlayCircleOutlined'
+                        </BadgeStatus>
+                    </template>
+                    <template #typeId="slotProps">
+                        {{
+                            (table.typeOptions.value.length &&
+                                table.getTypeLabel(slotProps.typeId)) ||
+                            ''
+                        }}
+                    </template>
+                    <template #action="slotProps">
+                        <j-space :size="16">
+                            <PermissionButton
+                                :hasPermission="`${permission}:update`"
+                                type="link"
+                                :tooltip="{
+                                    title: '编辑',
+                                }"
+                                @click="table.openDialog(slotProps)"
+                            >
+                                <AIcon type="EditOutlined" />
+                            </PermissionButton>
+                            <PermissionButton
+                                :hasPermission="`${permission}:manage`"
+                                type="link"
+                                :tooltip="{
+                                    title:
+                                        slotProps?.typeId === 'rabbitmq'
+                                            ? '暂不支持管理功能'
+                                            : table.getRowStatus(slotProps)
+                                            ? '管理'
+                                            : '请先启用数据源',
+                                }"
+                                @click="
+                                    () =>
+                                        router.push(
+                                            `/system/DataSource/Management?id=${slotProps.id}`,
+                                        )
                                 "
-                            />
-                            <!-- <AIcon type="PlayCircleOutlined" /> -->
-                        </PermissionButton>
+                                :disabled="
+                                    slotProps?.typeId === 'rabbitmq' ||
+                                    !table.getRowStatus(slotProps)
+                                "
+                            >
+                                <AIcon type="icon-ziyuankuguanli" />
+                            </PermissionButton>
+                            <PermissionButton
+                                :hasPermission="`${permission}:action`"
+                                type="link"
+                                :popConfirm="{
+                                    title: `确定要${
+                                        table.getRowStatus(slotProps)
+                                            ? '禁用'
+                                            : '启用'
+                                    }吗？`,
+                                    onConfirm: () =>
+                                        table.clickChangeStatus(slotProps),
+                                }"
+                                :tooltip="{
+                                    title: table.getRowStatus(slotProps)
+                                        ? '禁用'
+                                        : '启用',
+                                }"
+                            >
+                                <AIcon
+                                    :type="
+                                        table.getRowStatus(slotProps)
+                                            ? 'StopOutlined'
+                                            : 'PlayCircleOutlined'
+                                    "
+                                />
+                                <!-- <AIcon type="PlayCircleOutlined" /> -->
+                            </PermissionButton>
 
-                        <PermissionButton
-                            :hasPermission="`${permission}:delete`"
-                            type="link"
-                            :tooltip="{
-                                title: table.getRowStatus(slotProps)
-                                    ? '请先禁用，再删除'
-                                    : '删除',
-                            }"
-                            :danger="true"
-                            :popConfirm="{
-                                title: `确认删除`,
-                                onConfirm: () => table.clickDel(slotProps),
-                            }"
-                            :disabled="table.getRowStatus(slotProps)"
-                        >
-                            <AIcon type="DeleteOutlined" />
-                        </PermissionButton>
-                    </j-space>
-                </template>
-            </j-pro-table>
+                            <PermissionButton
+                                :hasPermission="`${permission}:delete`"
+                                type="link"
+                                :tooltip="{
+                                    title: table.getRowStatus(slotProps)
+                                        ? '请先禁用，再删除'
+                                        : '删除',
+                                }"
+                                :danger="true"
+                                :popConfirm="{
+                                    title: `确认删除`,
+                                    onConfirm: () => table.clickDel(slotProps),
+                                }"
+                                :disabled="table.getRowStatus(slotProps)"
+                            >
+                                <AIcon type="DeleteOutlined" />
+                            </PermissionButton>
+                        </j-space>
+                    </template>
+                </j-pro-table>
+            </FullPage>
 
             <EditDialog
                 v-if="dialog.visible"
@@ -283,13 +284,13 @@ const table = {
     // 刷新列表
     refresh: () => {
         tableRef.value.reload();
-        dialog.visible = false
-        dialog.selectItem = {}
+        dialog.visible = false;
+        dialog.selectItem = {};
     },
     cancel: () => {
-        dialog.visible = false
-        dialog.selectItem = {}
-    }
+        dialog.visible = false;
+        dialog.selectItem = {};
+    },
 };
 table.getTypeOption();
 
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index 54cd5802..0ab7d4e6 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -5,170 +5,175 @@
             target="category"
             @search="(params:any)=>queryParams = {...params}"
         />
-        <j-pro-table
-            ref="tableRef"
-            :request="table.requestFun"
-            :gridColumn="2"
-            :params="queryParams"
-            :rowSelection="{
-                selectedRowKeys: table._selectedRowKeys.value,
-                onChange:(keys:string[])=>table._selectedRowKeys.value = [...keys],
-                onSelectNone: table.cancelSelect
-            }"
-            :columns="columns"
-        >
-            <template #headerTitle>
-                <j-space>
-                    <PermissionButton
-                        :hasPermission="`${permission}:assert`"
-                        type="primary"
-                        @click="table.clickAdd('handle')"
-                    >
-                        <AIcon type="PlusOutlined" />资产分配
-                    </PermissionButton>
-                    <j-dropdown trigger="hover">
-                        <j-button>批量操作</j-button>
-                        <template #overlay>
-                            <j-menu>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        :hasPermission="`${permission}:bind`"
-                                        :popConfirm="{
-                                            title: `是否批量解除绑定`,
-                                            onConfirm: () =>
-                                                table.clickUnBind(),
-                                        }"
-                                    >
-                                        <AIcon
-                                            type="DisconnectOutlined"
-                                        />批量解绑
-                                    </PermissionButton>
-                                </j-menu-item>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        :hasPermission="`${permission}:assert`"
-                                        @click="table.clickEdit()"
-                                    >
-                                        <AIcon type="EditOutlined" />批量编辑
-                                    </PermissionButton>
-                                </j-menu-item>
-                            </j-menu>
-                        </template>
-                    </j-dropdown>
-                </j-space>
-            </template>
-
-            <template #card="slotProps">
-                <CardBox
-                    :value="slotProps"
-                    :actions="[{ key: 1 }]"
-                    v-bind="slotProps"
-                    :active="
-                        table._selectedRowKeys.value.includes(slotProps.id)
-                    "
-                    @click="table.onSelectChange"
-                    :status="slotProps.state?.value"
-                    :statusText="slotProps.state?.text"
-                    :statusNames="{
-                        online: 'processing',
-                        offline: 'error',
-                        notActive: 'warning',
-                    }"
-                >
-                    <template #img>
-                        <slot name="img">
-                            <img
-                                :src="getImage('/device-product.png')"
-                                style="cursor: pointer"
-                            />
-                        </slot>
-                    </template>
-                    <template #content>
-                        <h3 class="card-item-content-title">
-                            {{ slotProps.name }}
-                        </h3>
-                        <j-row>
-                            <j-col :span="12">
-                                <div class="card-item-content-text">ID</div>
-                                <div
-                                    style="cursor: pointer"
-                                    class="card-item-content-value"
-                                >
-                                    {{ slotProps.id }}
-                                </div>
-                            </j-col>
-                            <j-col :span="12">
-                                <div class="card-item-content-text">
-                                    资产权限
-                                </div>
-                                <div
-                                    style="cursor: pointer"
-                                    class="card-item-content-value"
-                                >
-                                    {{
-                                        table.permissionList.value.length &&
-                                        table.getPermissLabel(
-                                            slotProps.permission,
-                                        )
-                                    }}
-                                </div>
-                            </j-col>
-                        </j-row>
-                    </template>
-                    <template #actions>
+        <FullPage>
+            <j-pro-table
+                ref="tableRef"
+                :request="table.requestFun"
+                :gridColumn="2"
+                :params="queryParams"
+                :rowSelection="{
+                    selectedRowKeys: table._selectedRowKeys.value,
+                    onChange:(keys:string[])=>table._selectedRowKeys.value = [...keys],
+                    onSelectNone: table.cancelSelect
+                }"
+                :columns="columns"
+            >
+                <template #headerTitle>
+                    <j-space>
                         <PermissionButton
                             :hasPermission="`${permission}:assert`"
-                            @click="table.clickEdit(slotProps)"
+                            type="primary"
+                            @click="table.clickAdd('handle')"
                         >
-                            <AIcon type="EditOutlined" />
+                            <AIcon type="PlusOutlined" />资产分配
                         </PermissionButton>
+                        <j-dropdown trigger="hover">
+                            <j-button>批量操作</j-button>
+                            <template #overlay>
+                                <j-menu>
+                                    <j-menu-item>
+                                        <PermissionButton
+                                            :hasPermission="`${permission}:bind`"
+                                            :popConfirm="{
+                                                title: `是否批量解除绑定`,
+                                                onConfirm: () =>
+                                                    table.clickUnBind(),
+                                            }"
+                                        >
+                                            <AIcon
+                                                type="DisconnectOutlined"
+                                            />批量解绑
+                                        </PermissionButton>
+                                    </j-menu-item>
+                                    <j-menu-item>
+                                        <PermissionButton
+                                            :hasPermission="`${permission}:assert`"
+                                            @click="table.clickEdit()"
+                                        >
+                                            <AIcon
+                                                type="EditOutlined"
+                                            />批量编辑
+                                        </PermissionButton>
+                                    </j-menu-item>
+                                </j-menu>
+                            </template>
+                        </j-dropdown>
+                    </j-space>
+                </template>
 
-                        <PermissionButton
-                            :hasPermission="`${permission}:bind`"
-                            :popConfirm="{
-                                title: `是否解除绑定`,
-                                onConfirm: () => table.clickUnBind(slotProps),
-                            }"
-                        >
-                            <AIcon type="DisconnectOutlined" />
-                        </PermissionButton>
-                    </template>
-                </CardBox>
-            </template>
-
-            <template #permission="slotProps">
-                {{
-                    table.permissionList.value.length &&
-                    table.getPermissLabel(slotProps.permission)
-                }}
-            </template>
-            <template #state="slotProps">
-                <BadgeStatus
-                    :status="slotProps.state.value"
-                    :text="slotProps.state.text"
-                    :statusNames="{
-                        online: 'processing',
-                        offline: 'error',
-                        notActive: 'warning',
-                    }"
-                ></BadgeStatus>
-            </template>
-            <template #action="slotProps">
-                <j-space :size="16">
-                    <PermissionButton
-                        v-for="i in table.getActions(slotProps, 'table')"
-                        :hasPermission="i.permission"
-                        type="link"
-                        :tooltip="i?.tooltip"
-                        :pop-confirm="i.popConfirm"
-                        @click="i.onClick"
-                        :disabled="i?.disabled"
+                <template #card="slotProps">
+                    <CardBox
+                        :value="slotProps"
+                        :actions="[{ key: 1 }]"
+                        v-bind="slotProps"
+                        :active="
+                            table._selectedRowKeys.value.includes(slotProps.id)
+                        "
+                        @click="table.onSelectChange"
+                        :status="slotProps.state?.value"
+                        :statusText="slotProps.state?.text"
+                        :statusNames="{
+                            online: 'processing',
+                            offline: 'error',
+                            notActive: 'warning',
+                        }"
                     >
-                        <AIcon :type="i.icon" />
-                    </PermissionButton>
-                </j-space>
-            </template>
-        </j-pro-table>
+                        <template #img>
+                            <slot name="img">
+                                <img
+                                    :src="getImage('/device-product.png')"
+                                    style="cursor: pointer"
+                                />
+                            </slot>
+                        </template>
+                        <template #content>
+                            <h3 class="card-item-content-title">
+                                {{ slotProps.name }}
+                            </h3>
+                            <j-row>
+                                <j-col :span="12">
+                                    <div class="card-item-content-text">ID</div>
+                                    <div
+                                        style="cursor: pointer"
+                                        class="card-item-content-value"
+                                    >
+                                        {{ slotProps.id }}
+                                    </div>
+                                </j-col>
+                                <j-col :span="12">
+                                    <div class="card-item-content-text">
+                                        资产权限
+                                    </div>
+                                    <div
+                                        style="cursor: pointer"
+                                        class="card-item-content-value"
+                                    >
+                                        {{
+                                            table.permissionList.value.length &&
+                                            table.getPermissLabel(
+                                                slotProps.permission,
+                                            )
+                                        }}
+                                    </div>
+                                </j-col>
+                            </j-row>
+                        </template>
+                        <template #actions>
+                            <PermissionButton
+                                :hasPermission="`${permission}:assert`"
+                                @click="table.clickEdit(slotProps)"
+                            >
+                                <AIcon type="EditOutlined" />
+                            </PermissionButton>
+
+                            <PermissionButton
+                                :hasPermission="`${permission}:bind`"
+                                :popConfirm="{
+                                    title: `是否解除绑定`,
+                                    onConfirm: () =>
+                                        table.clickUnBind(slotProps),
+                                }"
+                            >
+                                <AIcon type="DisconnectOutlined" />
+                            </PermissionButton>
+                        </template>
+                    </CardBox>
+                </template>
+
+                <template #permission="slotProps">
+                    {{
+                        table.permissionList.value.length &&
+                        table.getPermissLabel(slotProps.permission)
+                    }}
+                </template>
+                <template #state="slotProps">
+                    <BadgeStatus
+                        :status="slotProps.state.value"
+                        :text="slotProps.state.text"
+                        :statusNames="{
+                            online: 'processing',
+                            offline: 'error',
+                            notActive: 'warning',
+                        }"
+                    ></BadgeStatus>
+                </template>
+                <template #action="slotProps">
+                    <j-space :size="16">
+                        <PermissionButton
+                            v-for="i in table.getActions(slotProps, 'table')"
+                            :hasPermission="i.permission"
+                            type="link"
+                            :tooltip="i?.tooltip"
+                            :pop-confirm="i.popConfirm"
+                            @click="i.onClick"
+                            :disabled="i?.disabled"
+                        >
+                            <AIcon :type="i.icon" />
+                        </PermissionButton>
+                    </j-space>
+                </template>
+            </j-pro-table>
+        </FullPage>
 
         <div class="dialogs">
             <AddDeviceOrProductDialog
@@ -471,7 +476,7 @@ const table = {
     },
     clickAdd: (type?: string) => {
         // 设备资产分配弹窗操作类型: type = 'handle': 手动点击资产分配按钮, !type产品资产分配后, 自动弹出设备资产分配
-        departmentStore.setType(type)
+        departmentStore.setType(type);
         dialogs.addShow = true;
     },
     clickEdit: (row?: any) => {
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 53ab716a..a57f31e9 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -5,193 +5,199 @@
             target="category"
             @search="(params:any)=>queryParams = {...params}"
         />
-        <j-pro-table
-            ref="tableRef"
-            :request="table.requestFun"
-            :gridColumn="2"
-            :params="queryParams"
-            :rowSelection="{
-                selectedRowKeys: tableData._selectedRowKeys,
-                onChange:(keys:string[])=>tableData._selectedRowKeys = [...keys],
-                onSelectNone: table.cancelSelect
-            }"
-            :columns="columns"
-        >
-            <template #headerTitle>
-                <j-space>
-                    <PermissionButton
-                        :hasPermission="`${permission}:assert`"
-                        type="primary"
-                        @click="dialogs.addShow = true"
-                    >
-                        <AIcon type="PlusOutlined" />资产分配
-                    </PermissionButton>
-                    <j-dropdown trigger="hover">
-                        <j-button>批量操作</j-button>
-                        <template #overlay>
-                            <j-menu>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        :hasPermission="`${permission}:bind`"
-                                        :popConfirm="{
-                                            title: `是否批量解除绑定`,
-                                            onConfirm: () =>
-                                                table.clickUnBind(),
-                                        }"
-                                    >
-                                        <AIcon
-                                            type="DisconnectOutlined"
-                                        />批量解绑
-                                    </PermissionButton>
-                                </j-menu-item>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        :hasPermission="`${permission}:assert`"
-                                        @click="() => table.clickEdit()"
-                                    >
-                                        <AIcon type="EditOutlined" />批量编辑
-                                    </PermissionButton>
-                                </j-menu-item>
-                            </j-menu>
-                        </template>
-                    </j-dropdown>
-                </j-space>
-            </template>
-
-            <template #card="slotProps">
-                <CardBox
-                    :value="slotProps"
-                    :actions="table.getActions(slotProps, 'card')"
-                    v-bind="slotProps"
-                    :active="tableData._selectedRowKeys.includes(slotProps.id)"
-                    @click="table.onSelectChange"
-                    :status="slotProps.state?.value"
-                    :statusText="slotProps.state?.text"
-                    :statusNames="{
-                        online: 'processing',
-                        offline: 'error',
-                    }"
-                >
-                    <template #img>
-                        <slot name="img">
-                            <img
-                                :src="getImage('/device-product.png')"
-                                style="cursor: pointer"
-                            />
-                        </slot>
-                    </template>
-                    <template #content>
-                        <h3 class="card-item-content-title">
-                            {{ slotProps.name }}
-                        </h3>
-                        <j-row>
-                            <j-col :span="12">
-                                <div class="card-item-content-text">ID</div>
-                                <div
-                                    style="cursor: pointer"
-                                    class="card-item-content-value"
-                                >
-                                    {{ slotProps.id }}
-                                </div>
-                            </j-col>
-                            <j-col :span="12">
-                                <div class="card-item-content-text">
-                                    资产权限
-                                </div>
-                                <div
-                                    style="cursor: pointer"
-                                    class="card-item-content-value"
-                                >
-                                    {{
-                                        tableData.permissionList.length &&
-                                        table.getPermissLabel(
-                                            slotProps.permission,
-                                        )
-                                    }}
-                                </div>
-                            </j-col>
-                        </j-row>
-                    </template>
-                    <template #actions="item">
-                        <j-tooltip
-                            v-bind="item.tooltip"
-                            :title="item.disabled && item.tooltip.title"
+        <FullPage>
+            <j-pro-table
+                ref="tableRef"
+                :request="table.requestFun"
+                :gridColumn="2"
+                :params="queryParams"
+                :rowSelection="{
+                    selectedRowKeys: tableData._selectedRowKeys,
+                    onChange:(keys:string[])=>tableData._selectedRowKeys = [...keys],
+                    onSelectNone: table.cancelSelect
+                }"
+                :columns="columns"
+            >
+                <template #headerTitle>
+                    <j-space>
+                        <PermissionButton
+                            :hasPermission="`${permission}:assert`"
+                            type="primary"
+                            @click="dialogs.addShow = true"
                         >
-                            <j-dropdown
-                                placement="bottomRight"
-                                v-if="item.key === 'others'"
-                            >
-                                <j-button>
-                                    <AIcon :type="item.icon" />
-                                    <span>{{ item.text }}</span>
-                                </j-button>
-                                <template #overlay>
-                                    <j-menu>
-                                        <j-menu-item
-                                            v-for="(o, i) in item.children"
-                                            :key="i"
+                            <AIcon type="PlusOutlined" />资产分配
+                        </PermissionButton>
+                        <j-dropdown trigger="hover">
+                            <j-button>批量操作</j-button>
+                            <template #overlay>
+                                <j-menu>
+                                    <j-menu-item>
+                                        <PermissionButton
+                                            :hasPermission="`${permission}:bind`"
+                                            :popConfirm="{
+                                                title: `是否批量解除绑定`,
+                                                onConfirm: () =>
+                                                    table.clickUnBind(),
+                                            }"
                                         >
-                                            <j-button
-                                                type="link"
-                                                @click="o.onClick"
-                                            >
-                                                <AIcon :type="o.icon" />
-                                                <span>{{ o.text }}</span>
-                                            </j-button>
-                                        </j-menu-item>
-                                    </j-menu>
-                                </template>
-                            </j-dropdown>
-                            <PermissionButton
-                                v-else
-                                :hasPermission="item.permission"
-                                :tooltip="item.tooltip"
-                                :pop-confirm="item.popConfirm"
-                                @click="item.onClick"
-                                :disabled="item.disabled"
-                            >
-                                <AIcon :type="item.icon" />
-                                <span v-if="item.key !== 'delete'">{{
-                                    item.text
-                                }}</span>
-                            </PermissionButton>
-                        </j-tooltip>
-                    </template>
-                </CardBox>
-            </template>
+                                            <AIcon
+                                                type="DisconnectOutlined"
+                                            />批量解绑
+                                        </PermissionButton>
+                                    </j-menu-item>
+                                    <j-menu-item>
+                                        <PermissionButton
+                                            :hasPermission="`${permission}:assert`"
+                                            @click="() => table.clickEdit()"
+                                        >
+                                            <AIcon
+                                                type="EditOutlined"
+                                            />批量编辑
+                                        </PermissionButton>
+                                    </j-menu-item>
+                                </j-menu>
+                            </template>
+                        </j-dropdown>
+                    </j-space>
+                </template>
 
-            <template #permission="slotProps">
-                {{
-                    tableData.permissionList.length &&
-                    table.getPermissLabel(slotProps.permission)
-                }}
-            </template>
-            <template #state="slotProps">
-                <BadgeStatus
-                    :status="slotProps.state.value"
-                    :text="slotProps.state.text"
-                    :statusNames="{
-                        online: 'processing',
-                        offline: 'error',
-                    }"
-                ></BadgeStatus>
-            </template>
-            <template #action="slotProps">
-                <j-space :size="16">
-                    <PermissionButton
-                        v-for="i in table.getActions(slotProps, 'table')"
-                        :hasPermission="i.permission"
-                        type="link"
-                        :tooltip="i?.tooltip"
-                        :pop-confirm="i.popConfirm"
-                        @click="i.onClick"
-                        :disabled="i?.disabled"
+                <template #card="slotProps">
+                    <CardBox
+                        :value="slotProps"
+                        :actions="table.getActions(slotProps, 'card')"
+                        v-bind="slotProps"
+                        :active="
+                            tableData._selectedRowKeys.includes(slotProps.id)
+                        "
+                        @click="table.onSelectChange"
+                        :status="slotProps.state?.value"
+                        :statusText="slotProps.state?.text"
+                        :statusNames="{
+                            online: 'processing',
+                            offline: 'error',
+                        }"
                     >
-                        <AIcon :type="i.icon" />
-                    </PermissionButton>
-                </j-space>
-            </template>
-        </j-pro-table>
+                        <template #img>
+                            <slot name="img">
+                                <img
+                                    :src="getImage('/device-product.png')"
+                                    style="cursor: pointer"
+                                />
+                            </slot>
+                        </template>
+                        <template #content>
+                            <h3 class="card-item-content-title">
+                                {{ slotProps.name }}
+                            </h3>
+                            <j-row>
+                                <j-col :span="12">
+                                    <div class="card-item-content-text">ID</div>
+                                    <div
+                                        style="cursor: pointer"
+                                        class="card-item-content-value"
+                                    >
+                                        {{ slotProps.id }}
+                                    </div>
+                                </j-col>
+                                <j-col :span="12">
+                                    <div class="card-item-content-text">
+                                        资产权限
+                                    </div>
+                                    <div
+                                        style="cursor: pointer"
+                                        class="card-item-content-value"
+                                    >
+                                        {{
+                                            tableData.permissionList.length &&
+                                            table.getPermissLabel(
+                                                slotProps.permission,
+                                            )
+                                        }}
+                                    </div>
+                                </j-col>
+                            </j-row>
+                        </template>
+                        <template #actions="item">
+                            <j-tooltip
+                                v-bind="item.tooltip"
+                                :title="item.disabled && item.tooltip.title"
+                            >
+                                <j-dropdown
+                                    placement="bottomRight"
+                                    v-if="item.key === 'others'"
+                                >
+                                    <j-button>
+                                        <AIcon :type="item.icon" />
+                                        <span>{{ item.text }}</span>
+                                    </j-button>
+                                    <template #overlay>
+                                        <j-menu>
+                                            <j-menu-item
+                                                v-for="(o, i) in item.children"
+                                                :key="i"
+                                            >
+                                                <j-button
+                                                    type="link"
+                                                    @click="o.onClick"
+                                                >
+                                                    <AIcon :type="o.icon" />
+                                                    <span>{{ o.text }}</span>
+                                                </j-button>
+                                            </j-menu-item>
+                                        </j-menu>
+                                    </template>
+                                </j-dropdown>
+                                <PermissionButton
+                                    v-else
+                                    :hasPermission="item.permission"
+                                    :tooltip="item.tooltip"
+                                    :pop-confirm="item.popConfirm"
+                                    @click="item.onClick"
+                                    :disabled="item.disabled"
+                                >
+                                    <AIcon :type="item.icon" />
+                                    <span v-if="item.key !== 'delete'">{{
+                                        item.text
+                                    }}</span>
+                                </PermissionButton>
+                            </j-tooltip>
+                        </template>
+                    </CardBox>
+                </template>
+
+                <template #permission="slotProps">
+                    {{
+                        tableData.permissionList.length &&
+                        table.getPermissLabel(slotProps.permission)
+                    }}
+                </template>
+                <template #state="slotProps">
+                    <BadgeStatus
+                        :status="slotProps.state.value"
+                        :text="slotProps.state.text"
+                        :statusNames="{
+                            online: 'processing',
+                            offline: 'error',
+                        }"
+                    ></BadgeStatus>
+                </template>
+                <template #action="slotProps">
+                    <j-space :size="16">
+                        <PermissionButton
+                            v-for="i in table.getActions(slotProps, 'table')"
+                            :hasPermission="i.permission"
+                            type="link"
+                            :tooltip="i?.tooltip"
+                            :pop-confirm="i.popConfirm"
+                            @click="i.onClick"
+                            :disabled="i?.disabled"
+                        >
+                            <AIcon :type="i.icon" />
+                        </PermissionButton>
+                    </j-space>
+                </template>
+            </j-pro-table>
+        </FullPage>
 
         <div class="dialogs">
             <AddDeviceOrProductDialog
diff --git a/src/views/system/Department/user/index.vue b/src/views/system/Department/user/index.vue
index cb79dd88..ec3857f7 100644
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@@ -5,72 +5,74 @@
             target="category"
             @search="handleParams"
         />
-        <j-pro-table
-            ref="tableRef"
-            :columns="columns"
-            :request="table.requestFun"
-            :params="queryParams"
-            :rowSelection="{
-                selectedRowKeys: table._selectedRowKeys,
-                onChange: table.onSelectChange,
-            }"
-            @cancelSelect="table.cancelSelect"
-            model="TABLE"
-            :defaultParams="{
-                pageSize: 10,
-            }"
-            :pagination="{
-                showSizeChanger: true,
-                pageSizeOptions: ['10', '20', '50', '100'],
-            }"
-        >
-            <template #headerTitle>
-                <PermissionButton
-                    type="primary"
-                    :hasPermission="`${permission}:bind-user`"
-                    @click="dialogVisible = true"
-                    style="margin-right: 15px"
-                >
-                    <AIcon type="PlusOutlined" />绑定用户
-                </PermissionButton>
-                <div
-                    style="display: inline-block; width: 12px; height: 1px"
-                ></div>
-                <PermissionButton
-                    :hasPermission="`${permission}:bind`"
-                    :popConfirm="{
-                        title: `是否解除绑定`,
-                        onConfirm: () => table.unBind(),
-                    }"
-                >
-                    <AIcon type="DisconnectOutlined" />批量解绑
-                </PermissionButton>
-            </template>
-            <template #status="slotProps">
-                <BadgeStatus
-                    :status="slotProps.status"
-                    :text="slotProps.status ? '正常' : '禁用'"
-                    :statusNames="{
-                        1: 'success',
-                        0: 'error',
-                    }"
-                ></BadgeStatus>
-            </template>
-            <template #action="slotProps">
-                <j-space :size="16">
+        <FullPage>
+            <j-pro-table
+                ref="tableRef"
+                :columns="columns"
+                :request="table.requestFun"
+                :params="queryParams"
+                :rowSelection="{
+                    selectedRowKeys: table._selectedRowKeys,
+                    onChange: table.onSelectChange,
+                }"
+                @cancelSelect="table.cancelSelect"
+                model="TABLE"
+                :defaultParams="{
+                    pageSize: 10,
+                }"
+                :pagination="{
+                    showSizeChanger: true,
+                    pageSizeOptions: ['10', '20', '50', '100'],
+                }"
+            >
+                <template #headerTitle>
+                    <PermissionButton
+                        type="primary"
+                        :hasPermission="`${permission}:bind-user`"
+                        @click="dialogVisible = true"
+                        style="margin-right: 15px"
+                    >
+                        <AIcon type="PlusOutlined" />绑定用户
+                    </PermissionButton>
+                    <div
+                        style="display: inline-block; width: 12px; height: 1px"
+                    ></div>
                     <PermissionButton
-                        type="link"
                         :hasPermission="`${permission}:bind`"
                         :popConfirm="{
                             title: `是否解除绑定`,
-                            onConfirm: () => table.unBind(slotProps),
+                            onConfirm: () => table.unBind(),
                         }"
                     >
-                        <AIcon type="DisconnectOutlined" />
+                        <AIcon type="DisconnectOutlined" />批量解绑
                     </PermissionButton>
-                </j-space>
-            </template>
-        </j-pro-table>
+                </template>
+                <template #status="slotProps">
+                    <BadgeStatus
+                        :status="slotProps.status"
+                        :text="slotProps.status ? '正常' : '禁用'"
+                        :statusNames="{
+                            1: 'success',
+                            0: 'error',
+                        }"
+                    ></BadgeStatus>
+                </template>
+                <template #action="slotProps">
+                    <j-space :size="16">
+                        <PermissionButton
+                            type="link"
+                            :hasPermission="`${permission}:bind`"
+                            :popConfirm="{
+                                title: `是否解除绑定`,
+                                onConfirm: () => table.unBind(slotProps),
+                            }"
+                        >
+                            <AIcon type="DisconnectOutlined" />
+                        </PermissionButton>
+                    </j-space>
+                </template>
+            </j-pro-table>
+        </FullPage>
 
         <div class="dialogs">
             <AddBindUserDialog
@@ -150,8 +152,8 @@ const columns = [
 const queryParams = ref({});
 
 const handleParams = (params: any) => {
-  queryParams.value = params
-}
+    queryParams.value = params;
+};
 
 // 表格
 const tableRef = ref<Record<string, any>>({}); // 表格实例
@@ -174,7 +176,7 @@ const table = reactive({
                                 value: props.parentId,
                             },
                         ],
-                      type: 'and'
+                        type: 'and',
                     },
                 ],
             };
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index c7875e19..021a0f6c 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -6,70 +6,73 @@
                 target="category"
                 @search="handleSearch"
             />
-
-            <j-pro-table
-                ref="tableRef"
-                :columns="columns"
-                :request="table.getList"
-                model="TABLE"
-                :params="queryParams"
-                noPagination
-                v-model:expandedRowKeys="expandedRowKeys"
-            >
-                <template #headerTitle>
-                    <PermissionButton
-                        type="primary"
-                        :hasPermission="`${permission}:add`"
-                        @click="table.toDetails({})"
-                    >
-                        <AIcon type="PlusOutlined" />新增
-                    </PermissionButton>
-                    <j-button
-                        style="margin-left: 12px"
-                        @click="router.push('/system/Menu/Setting')"
-                        >菜单配置</j-button
-                    >
-                </template>
-                <template #createTime="slotProps">
-                    {{
-                        dayjs(slotProps.createTime).format('YYYY-MM-DD HH:mm:ss')
-                    }}
-                </template>
-                <template #action="slotProps">
-                    <j-space :size="16">
-                        <j-tooltip>
-                            <template #title>查看</template>
-                            <j-button
-                                style="padding: 0"
-                                type="link"
-                                @click="table.toDetails(slotProps)"
-                            >
-                                <AIcon type="SearchOutlined" />
-                            </j-button>
-                        </j-tooltip>
-
+            <FullPage>
+                <j-pro-table
+                    ref="tableRef"
+                    :columns="columns"
+                    :request="table.getList"
+                    model="TABLE"
+                    :params="queryParams"
+                    noPagination
+                    v-model:expandedRowKeys="expandedRowKeys"
+                >
+                    <template #headerTitle>
                         <PermissionButton
-                            type="link"
+                            type="primary"
                             :hasPermission="`${permission}:add`"
-                            :tooltip="{ title: '新增子菜单' }"
-                            @click="table.addChildren(slotProps)"
+                            @click="table.toDetails({})"
                         >
-                            <AIcon type="PlusCircleOutlined" />
+                            <AIcon type="PlusOutlined" />新增
                         </PermissionButton>
-                        <PermissionButton
-                            type="link"
-                            :hasPermission="`${permission}:delete`"
-                            :tooltip="{ title: '删除' }"
-                            :popConfirm="{
-                                title: `是否删除该菜单`,
-                                onConfirm: () => table.clickDel(slotProps),
-                            }"
+                        <j-button
+                            style="margin-left: 12px"
+                            @click="router.push('/system/Menu/Setting')"
+                            >菜单配置</j-button
                         >
-                            <AIcon type="DeleteOutlined" />
-                        </PermissionButton>
-                    </j-space>
-                </template>
-            </j-pro-table>
+                    </template>
+                    <template #createTime="slotProps">
+                        {{
+                            dayjs(slotProps.createTime).format(
+                                'YYYY-MM-DD HH:mm:ss',
+                            )
+                        }}
+                    </template>
+                    <template #action="slotProps">
+                        <j-space :size="16">
+                            <j-tooltip>
+                                <template #title>查看</template>
+                                <j-button
+                                    style="padding: 0"
+                                    type="link"
+                                    @click="table.toDetails(slotProps)"
+                                >
+                                    <AIcon type="SearchOutlined" />
+                                </j-button>
+                            </j-tooltip>
+
+                            <PermissionButton
+                                type="link"
+                                :hasPermission="`${permission}:add`"
+                                :tooltip="{ title: '新增子菜单' }"
+                                @click="table.addChildren(slotProps)"
+                            >
+                                <AIcon type="PlusCircleOutlined" />
+                            </PermissionButton>
+                            <PermissionButton
+                                type="link"
+                                :hasPermission="`${permission}:delete`"
+                                :tooltip="{ title: '删除' }"
+                                :popConfirm="{
+                                    title: `是否删除该菜单`,
+                                    onConfirm: () => table.clickDel(slotProps),
+                                }"
+                            >
+                                <AIcon type="DeleteOutlined" />
+                            </PermissionButton>
+                        </j-space>
+                    </template>
+                </j-pro-table>
+            </FullPage>
         </div>
     </page-container>
 </template>
diff --git a/src/views/system/Permission/index.vue b/src/views/system/Permission/index.vue
index 98d72c05..7f6dc35f 100644
--- a/src/views/system/Permission/index.vue
+++ b/src/views/system/Permission/index.vue
@@ -6,134 +6,136 @@
                 target="system-permission"
                 @search="handleSearch"
             />
-
-            <j-pro-table
-                ref="tableRef"
-                :columns="columns"
-                :request="getPermission_api"
-                model="TABLE"
-                :params="queryParams"
-                :defaultParams="{
-                    pageSize: 10,
-                    sorts: [{ name: 'id', order: 'asc' }],
-                }"
-                :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
-            >
-                <template #headerTitle>
-                    <PermissionButton
-                        type="primary"
-                        :hasPermission="`${permission}:add`"
-                        @click="table.openDialog(undefined)"
-                    >
-                        <AIcon type="PlusOutlined" />新增
-                    </PermissionButton>
-                    <j-dropdown trigger="hover">
-                        <j-button>批量操作</j-button>
-                        <template #overlay>
-                            <j-menu>
-                                <j-menu-item>
-                                    <j-upload
-                                        name="file"
-                                        action="#"
-                                        accept=".json"
-                                        :showUploadList="false"
-                                        :before-upload="table.clickImport"
-                                        :disabled="
-                                            !hasPermission(
-                                                `${permission}:import`,
-                                            )
-                                        "
-                                    >
-                                        <PermissionButton
-                                            :hasPermission="`${permission}:import`"
+            <FullPage>
+                <j-pro-table
+                    ref="tableRef"
+                    :columns="columns"
+                    :request="getPermission_api"
+                    model="TABLE"
+                    :params="queryParams"
+                    :defaultParams="{
+                        pageSize: 10,
+                        sorts: [{ name: 'id', order: 'asc' }],
+                    }"
+                    :pagination="{
+                        showSizeChanger: true,
+                        pageSizeOptions: ['10', '20', '50', '100'],
+                    }"
+                >
+                    <template #headerTitle>
+                        <PermissionButton
+                            type="primary"
+                            :hasPermission="`${permission}:add`"
+                            @click="table.openDialog(undefined)"
+                        >
+                            <AIcon type="PlusOutlined" />新增
+                        </PermissionButton>
+                        <j-dropdown trigger="hover">
+                            <j-button>批量操作</j-button>
+                            <template #overlay>
+                                <j-menu>
+                                    <j-menu-item>
+                                        <j-upload
+                                            name="file"
+                                            action="#"
+                                            accept=".json"
+                                            :showUploadList="false"
+                                            :before-upload="table.clickImport"
+                                            :disabled="
+                                                !hasPermission(
+                                                    `${permission}:import`,
+                                                )
+                                            "
                                         >
-                                            导入
+                                            <PermissionButton
+                                                :hasPermission="`${permission}:import`"
+                                            >
+                                                导入
+                                            </PermissionButton>
+                                        </j-upload>
+                                    </j-menu-item>
+                                    <j-menu-item>
+                                        <PermissionButton
+                                            :hasPermission="`${permission}:export`"
+                                            :popConfirm="{
+                                                title: `确认导出？`,
+                                                onConfirm: () =>
+                                                    table.clickExport(),
+                                            }"
+                                        >
+                                            导出
                                         </PermissionButton>
-                                    </j-upload>
-                                </j-menu-item>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        :hasPermission="`${permission}:export`"
-                                        :popConfirm="{
-                                            title: `确认导出？`,
-                                            onConfirm: () =>
-                                                table.clickExport(),
-                                        }"
-                                    >
-                                        导出
-                                    </PermissionButton>
-                                </j-menu-item>
-                            </j-menu>
-                        </template>
-                    </j-dropdown>
-                </template>
-                <template #status="slotProps">
-                    <BadgeStatus
-                        :status="slotProps.status"
-                        :text="slotProps.status ? '启用' : '禁用'"
-                        :statusNames="{
-                            1: 'success',
-                            0: 'error',
-                        }"
-                    ></BadgeStatus>
-                </template>
-                <template #action="slotProps">
-                    <j-space :size="16">
-                        <PermissionButton
-                            :hasPermission="`${permission}:update`"
-                            type="link"
-                            :tooltip="{
-                                title: '编辑',
+                                    </j-menu-item>
+                                </j-menu>
+                            </template>
+                        </j-dropdown>
+                    </template>
+                    <template #status="slotProps">
+                        <BadgeStatus
+                            :status="slotProps.status"
+                            :text="slotProps.status ? '启用' : '禁用'"
+                            :statusNames="{
+                                1: 'success',
+                                0: 'error',
                             }"
-                            @click="table.openDialog(slotProps)"
-                        >
-                            <AIcon type="EditOutlined" />
-                        </PermissionButton>
+                        ></BadgeStatus>
+                    </template>
+                    <template #action="slotProps">
+                        <j-space :size="16">
+                            <PermissionButton
+                                :hasPermission="`${permission}:update`"
+                                type="link"
+                                :tooltip="{
+                                    title: '编辑',
+                                }"
+                                @click="table.openDialog(slotProps)"
+                            >
+                                <AIcon type="EditOutlined" />
+                            </PermissionButton>
 
-                        <PermissionButton
-                            :hasPermission="`${permission}:action`"
-                            type="link"
-                            :popConfirm="{
-                                title: `确定要${
-                                    slotProps.status ? '禁用' : '启用'
-                                }吗？`,
-                                onConfirm: () => table.changeStatus(slotProps),
-                            }"
-                            :tooltip="{
-                                title: slotProps.status ? '禁用' : '启用',
-                            }"
-                        >
-                            <AIcon
-                                :type="
-                                    slotProps.status
-                                        ? 'StopOutlined'
-                                        : 'PlayCircleOutlined'
-                                "
-                            />
-                        </PermissionButton>
+                            <PermissionButton
+                                :hasPermission="`${permission}:action`"
+                                type="link"
+                                :popConfirm="{
+                                    title: `确定要${
+                                        slotProps.status ? '禁用' : '启用'
+                                    }吗？`,
+                                    onConfirm: () =>
+                                        table.changeStatus(slotProps),
+                                }"
+                                :tooltip="{
+                                    title: slotProps.status ? '禁用' : '启用',
+                                }"
+                            >
+                                <AIcon
+                                    :type="
+                                        slotProps.status
+                                            ? 'StopOutlined'
+                                            : 'PlayCircleOutlined'
+                                    "
+                                />
+                            </PermissionButton>
 
-                        <PermissionButton
-                            :hasPermission="`${permission}:delete`"
-                            type="link"
-                            :tooltip="{
-                                title: slotProps.status
-                                    ? '请先禁用，再删除'
-                                    : '删除',
-                            }"
-                            :popConfirm="{
-                                title: `确认删除`,
-                                onConfirm: () => table.clickDel(slotProps),
-                            }"
-                            :disabled="slotProps.status"
-                        >
-                            <AIcon type="DeleteOutlined" />
-                        </PermissionButton>
-                    </j-space>
-                </template>
-            </j-pro-table>
+                            <PermissionButton
+                                :hasPermission="`${permission}:delete`"
+                                type="link"
+                                :tooltip="{
+                                    title: slotProps.status
+                                        ? '请先禁用，再删除'
+                                        : '删除',
+                                }"
+                                :popConfirm="{
+                                    title: `确认删除`,
+                                    onConfirm: () => table.clickDel(slotProps),
+                                }"
+                                :disabled="slotProps.status"
+                            >
+                                <AIcon type="DeleteOutlined" />
+                            </PermissionButton>
+                        </j-space>
+                    </template>
+                </j-pro-table>
+            </FullPage>
 
             <EditDialog
                 v-if="dialog.visible"
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index 2c9f9f24..65e86825 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -6,60 +6,61 @@
                 target="category"
                 @search="(params:any)=>queryParams = {...params}"
             />
-
-            <j-pro-table
-                ref="tableRef"
-                :columns="columns"
-                :request="getRelationshipList_api"
-                model="TABLE"
-                :params="queryParams"
-                :defaultParams="{
-                    pageSize: 10,
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                }"
-                :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
-            >
-                <template #headerTitle>
-                    <PermissionButton
-                        type="primary"
-                        :hasPermission="`${permission}:add`"
-                        @click="table.openDialog(undefined)"
-                    >
-                        <AIcon type="PlusOutlined" />新增
-                    </PermissionButton>
-                </template>
-                <template #action="slotProps">
-                    <j-space :size="16">
+            <FullPage>
+                <j-pro-table
+                    ref="tableRef"
+                    :columns="columns"
+                    :request="getRelationshipList_api"
+                    model="TABLE"
+                    :params="queryParams"
+                    :defaultParams="{
+                        pageSize: 10,
+                        sorts: [{ name: 'createTime', order: 'desc' }],
+                    }"
+                    :pagination="{
+                        showSizeChanger: true,
+                        pageSizeOptions: ['10', '20', '50', '100'],
+                    }"
+                >
+                    <template #headerTitle>
                         <PermissionButton
-                            :hasPermission="`${permission}:update`"
-                            type="link"
-                            :tooltip="{
-                                title: '编辑',
-                            }"
-                            @click="table.openDialog(slotProps)"
+                            type="primary"
+                            :hasPermission="`${permission}:add`"
+                            @click="table.openDialog(undefined)"
                         >
-                            <AIcon type="EditOutlined" />
+                            <AIcon type="PlusOutlined" />新增
                         </PermissionButton>
+                    </template>
+                    <template #action="slotProps">
+                        <j-space :size="16">
+                            <PermissionButton
+                                :hasPermission="`${permission}:update`"
+                                type="link"
+                                :tooltip="{
+                                    title: '编辑',
+                                }"
+                                @click="table.openDialog(slotProps)"
+                            >
+                                <AIcon type="EditOutlined" />
+                            </PermissionButton>
 
-                        <PermissionButton
-                            :danger="true"
-                            :hasPermission="`${permission}:delete`"
-                            type="link"
-                            :tooltip="{ title: '删除' }"
-                            :popConfirm="{
-                                title: `确认删除`,
-                                onConfirm: () => table.clickDel(slotProps),
-                            }"
-                            :disabled="slotProps.status"
-                        >
-                            <AIcon type="DeleteOutlined" />
-                        </PermissionButton>
-                    </j-space>
-                </template>
-            </j-pro-table>
+                            <PermissionButton
+                                :danger="true"
+                                :hasPermission="`${permission}:delete`"
+                                type="link"
+                                :tooltip="{ title: '删除' }"
+                                :popConfirm="{
+                                    title: `确认删除`,
+                                    onConfirm: () => table.clickDel(slotProps),
+                                }"
+                                :disabled="slotProps.status"
+                            >
+                                <AIcon type="DeleteOutlined" />
+                            </PermissionButton>
+                        </j-space>
+                    </template>
+                </j-pro-table>
+            </FullPage>
 
             <EditDialog
                 v-if="dialog.visible"
diff --git a/src/views/system/Role/index.vue b/src/views/system/Role/index.vue
index 2b3eecde..c52a1931 100644
--- a/src/views/system/Role/index.vue
+++ b/src/views/system/Role/index.vue
@@ -6,65 +6,66 @@
                 target="category"
                 @search="(params:any)=>queryParams = {...params}"
             />
-
-            <j-pro-table
-                ref="tableRef"
-                :columns="columns"
-                :request="getRoleList_api"
-                model="TABLE"
-                :params="queryParams"
-                :defaultParams="{
-                    pageSize: 10,
-                    sorts: [
-                        { name: 'createTime', order: 'desc' },
-                        { name: 'id', order: 'desc' },
-                    ],
-                }"
-                :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
-            >
-                <template #headerTitle>
-                    <PermissionButton
-                        type="primary"
-                        :hasPermission="`${permission}:add`"
-                        @click="dialogVisible = true"
-                    >
-                        <AIcon type="PlusOutlined" />新增
-                    </PermissionButton>
-                </template>
-
-                <template #action="slotProps">
-                    <j-space :size="16">
+            <FullPage>
+                <j-pro-table
+                    ref="tableRef"
+                    :columns="columns"
+                    :request="getRoleList_api"
+                    model="TABLE"
+                    :params="queryParams"
+                    :defaultParams="{
+                        pageSize: 10,
+                        sorts: [
+                            { name: 'createTime', order: 'desc' },
+                            { name: 'id', order: 'desc' },
+                        ],
+                    }"
+                    :pagination="{
+                        showSizeChanger: true,
+                        pageSizeOptions: ['10', '20', '50', '100'],
+                    }"
+                >
+                    <template #headerTitle>
                         <PermissionButton
-                            :hasPermission="`${permission}:update`"
-                            type="link"
-                            :tooltip="{
-                                title: '编辑',
-                            }"
-                            @click="
-                                jumpPage(`system/Role/Detail`, {
-                                    id: slotProps.id,
-                                })
-                            "
+                            type="primary"
+                            :hasPermission="`${permission}:add`"
+                            @click="dialogVisible = true"
                         >
-                            <AIcon type="EditOutlined" />
+                            <AIcon type="PlusOutlined" />新增
                         </PermissionButton>
-                        <PermissionButton
-                            type="link"
-                            :hasPermission="`${permission}:delete`"
-                            :tooltip="{ title: '删除' }"
-                            :popConfirm="{
-                                title: `确定要删除吗`,
-                                onConfirm: () => clickDel(slotProps),
-                            }"
-                        >
-                            <AIcon type="DeleteOutlined" />
-                        </PermissionButton>
-                    </j-space>
-                </template>
-            </j-pro-table>
+                    </template>
+
+                    <template #action="slotProps">
+                        <j-space :size="16">
+                            <PermissionButton
+                                :hasPermission="`${permission}:update`"
+                                type="link"
+                                :tooltip="{
+                                    title: '编辑',
+                                }"
+                                @click="
+                                    jumpPage(`system/Role/Detail`, {
+                                        id: slotProps.id,
+                                    })
+                                "
+                            >
+                                <AIcon type="EditOutlined" />
+                            </PermissionButton>
+                            <PermissionButton
+                                type="link"
+                                :hasPermission="`${permission}:delete`"
+                                :tooltip="{ title: '删除' }"
+                                :popConfirm="{
+                                    title: `确定要删除吗`,
+                                    onConfirm: () => clickDel(slotProps),
+                                }"
+                            >
+                                <AIcon type="DeleteOutlined" />
+                            </PermissionButton>
+                        </j-space>
+                    </template>
+                </j-pro-table>
+            </FullPage>
 
             <AddDialog v-if="dialogVisible" v-model:visible="dialogVisible" />
         </div>
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index 2283af2d..fe28b7d1 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -6,106 +6,111 @@
                 target="category"
                 @search="handleParams"
             />
-
-            <j-pro-table
-                ref="tableRef"
-                :columns="columns"
-                :request="getUserList_api"
-                model="TABLE"
-                :params="queryParams"
-                :defaultParams="{
-                    pageSize: 10,
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                }"
-                :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
-            >
-                <template #headerTitle>
-                    <PermissionButton
-                        :hasPermission="`${permission}:add`"
-                        type="primary"
-                        @click="table.openDialog('add')"
-                    >
-                        <AIcon type="PlusOutlined" />新增
-                    </PermissionButton>
-                </template>
-                <template #type="slotProps">
-                    {{ slotProps.type.name }}
-                </template>
-                <template #status="slotProps">
-                    <BadgeStatus
-                        :status="slotProps.status"
-                        :text="slotProps.status ? '正常' : '禁用'"
-                        :statusNames="{
-                            1: 'success',
-                            0: 'error',
-                        }"
-                    ></BadgeStatus>
-                </template>
-                <template #action="slotProps">
-                    <j-space :size="16">
+            <FullPage>
+                <j-pro-table
+                    ref="tableRef"
+                    :columns="columns"
+                    :request="getUserList_api"
+                    model="TABLE"
+                    :params="queryParams"
+                    :defaultParams="{
+                        pageSize: 10,
+                        sorts: [{ name: 'createTime', order: 'desc' }],
+                    }"
+                    :pagination="{
+                        showSizeChanger: true,
+                        pageSizeOptions: ['10', '20', '50', '100'],
+                    }"
+                >
+                    <template #headerTitle>
                         <PermissionButton
-                            :hasPermission="`${permission}:update`"
-                            type="link"
-                            :tooltip="{
-                                title: '编辑',
-                            }"
-                            @click="table.openDialog('edit', slotProps)"
+                            :hasPermission="`${permission}:add`"
+                            type="primary"
+                            @click="table.openDialog('add')"
                         >
-                            <AIcon type="EditOutlined" />
+                            <AIcon type="PlusOutlined" />新增
                         </PermissionButton>
-                        <PermissionButton
-                            :hasPermission="`${permission}:action`"
-                            type="link"
-                            :tooltip="{
-                                title: `${slotProps.status ? '禁用' : '启用'}`,
+                    </template>
+                    <template #type="slotProps">
+                        {{ slotProps.type.name }}
+                    </template>
+                    <template #status="slotProps">
+                        <BadgeStatus
+                            :status="slotProps.status"
+                            :text="slotProps.status ? '正常' : '禁用'"
+                            :statusNames="{
+                                1: 'success',
+                                0: 'error',
                             }"
-                            :popConfirm="{
-                                title: `确定${
-                                    slotProps.status ? '禁用' : '启用'
-                                }吗？`,
-                                onConfirm: () => table.changeStatus(slotProps),
-                            }"
-                        >
-                            <AIcon
-                                :type="
-                                    slotProps.status
-                                        ? 'StopOutlined'
-                                        : 'PlayCircleOutlined'
-                                "
-                            />
-                        </PermissionButton>
-                        <PermissionButton
-                            :hasPermission="`${permission}:update`"
-                            type="link"
-                            :tooltip="{
-                                title: '重置密码',
-                            }"
-                            @click="table.openDialog('reset', slotProps)"
-                        >
-                            <AIcon type="icon-zhongzhimima" />
-                        </PermissionButton>
-                        <PermissionButton
-                            type="link"
-                            :hasPermission="`${permission}:delete`"
-                            :tooltip="{
-                                title: slotProps.status
-                                    ? '请先禁用，再删除'
-                                    : '删除',
-                            }"
-                            :popConfirm="{
-                                title: `确认删除`,
-                                onConfirm: () => table.clickDel(slotProps.id),
-                            }"
-                            :disabled="slotProps.status"
-                        >
-                            <AIcon type="DeleteOutlined" />
-                        </PermissionButton>
-                    </j-space>
-                </template>
-            </j-pro-table>
+                        ></BadgeStatus>
+                    </template>
+                    <template #action="slotProps">
+                        <j-space :size="16">
+                            <PermissionButton
+                                :hasPermission="`${permission}:update`"
+                                type="link"
+                                :tooltip="{
+                                    title: '编辑',
+                                }"
+                                @click="table.openDialog('edit', slotProps)"
+                            >
+                                <AIcon type="EditOutlined" />
+                            </PermissionButton>
+                            <PermissionButton
+                                :hasPermission="`${permission}:action`"
+                                type="link"
+                                :tooltip="{
+                                    title: `${
+                                        slotProps.status ? '禁用' : '启用'
+                                    }`,
+                                }"
+                                :popConfirm="{
+                                    title: `确定${
+                                        slotProps.status ? '禁用' : '启用'
+                                    }吗？`,
+                                    onConfirm: () =>
+                                        table.changeStatus(slotProps),
+                                }"
+                            >
+                                <AIcon
+                                    :type="
+                                        slotProps.status
+                                            ? 'StopOutlined'
+                                            : 'PlayCircleOutlined'
+                                    "
+                                />
+                            </PermissionButton>
+                            <PermissionButton
+                                :hasPermission="`${permission}:update`"
+                                type="link"
+                                :tooltip="{
+                                    title: '重置密码',
+                                }"
+                                @click="table.openDialog('reset', slotProps)"
+                            >
+                                <AIcon type="icon-zhongzhimima" />
+                            </PermissionButton>
+                            <PermissionButton
+                                type="link"
+                                :hasPermission="`${permission}:delete`"
+                                :tooltip="{
+                                    title: slotProps.status
+                                        ? '请先禁用，再删除'
+                                        : '删除',
+                                }"
+                                :popConfirm="{
+                                    title: `确认删除`,
+                                    onConfirm: () =>
+                                        table.clickDel(slotProps.id),
+                                }"
+                                :disabled="slotProps.status"
+                            >
+                                <AIcon type="DeleteOutlined" />
+                            </PermissionButton>
+                        </j-space>
+                    </template>
+                </j-pro-table>
+            </FullPage>
 
             <EditUserDialog
                 v-if="dialog.visible"
@@ -263,22 +268,21 @@ type dictType = {
 };
 type modalType = '' | 'add' | 'edit' | 'reset';
 
-const handleParams = (params: any)=> {
-
-  const newParams = (params?.terms as any[])?.map(item1 => {
-    item1.terms = item1.terms.map((item2: any) => {
-      if (['telephone', 'email'].includes(item2.column)) {
-        return {
-          column: 'id$user-detail',
-          value: [item2]
-        }
-      }
-      return item2
-    })
-    return item1
-  })
-  queryParams.value = { terms: newParams || [] }
-}
+const handleParams = (params: any) => {
+    const newParams = (params?.terms as any[])?.map((item1) => {
+        item1.terms = item1.terms.map((item2: any) => {
+            if (['telephone', 'email'].includes(item2.column)) {
+                return {
+                    column: 'id$user-detail',
+                    value: [item2],
+                };
+            }
+            return item2;
+        });
+        return item1;
+    });
+    queryParams.value = { terms: newParams || [] };
+};
 </script>
 
 <style lang="less" scoped>