Merge branch 'sqy_dev' into 'main'

'style:集中调整样式，统一table的风格,还原login为官方页面'

See merge request huang/yun-teng-iot-front!108

 <template>
 <template>
-  <ConfigProvider :locale="getAntdLocale">
+  <ConfigProvider :locale="getAntdLocale" :autoInsertSpaceInButton="false">
     <AppProvider>
     <AppProvider>
       <RouterView />
       <RouterView />
     </AppProvider>
     </AppProvider>

@@ -42,6 +42,7 @@
         useSearchForm: true,
         useSearchForm: true,
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
+        showTableSetting: true,
         actionColumn: {
         actionColumn: {
           width: 200,
           width: 200,
           title: '操作',
           title: '操作',

@@ -8,7 +8,7 @@
       />
       />
       <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
       <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
         <template #toolbar>
         <template #toolbar>
-          <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增联系人 </a-button>
+          <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警联系人 </a-button>
           <a-button
           <a-button
             type="primary"
             type="primary"
             color="error"
             color="error"
@@ -91,7 +91,7 @@
         },
         },
         rowKey: 'id',
         rowKey: 'id',
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -13,7 +13,7 @@
   }
   }
   const props = withDefaults(defineProps<Props>(), {
   const props = withDefaults(defineProps<Props>(), {
     width: '100%',
     width: '100%',
-    height: '300px',
+    height: '320px',
     customerTrendList: () => [],
     customerTrendList: () => [],
   });
   });
   watch(
   watch(

@@ -17,32 +17,29 @@
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
           </div>
           <div> 设备数(个) </div>
           <div> 设备数(个) </div>
-          <div class="mt-2" style="font-size: 0.75rem">
-            <div class="flex" style="align-items: center"
-              ><img
-                src="/src/assets/images/online.png"
-                class="mr-1"
-                style="width: 0.625rem; height: 0.625rem"
-              />
-              <span>在线{{ growCardList?.deviceInfo?.onLine }}</span>
-              <img
-                src="/src/assets/images/offline.png"
-                class="mr-1 ml-1"
-                style="width: 0.625rem; height: 0.625rem"
-              />
-              <span> 离线{{ growCardList?.deviceInfo?.offLine }} </span>
-              <img
-                src="/src/assets/images/inactive.png"
-                class="mr-1 ml-1"
-                style="width: 0.625rem; height: 0.625rem"
-              />
-              <span> 未激活{{ growCardList?.deviceInfo?.inActive }} </span>
-            </div>
-          </div>
         </div>
         </div>
       </div>
       </div>
       <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
       <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
-        今日新增 {{ toThousands(growCardList?.deviceInfo?.todayAdd) }}</div
+        <div class="flex" style="align-items: center"
+          ><img
+            src="/src/assets/images/online.png"
+            class="mr-1"
+            style="width: 0.625rem; height: 0.625rem"
+          />
+          <span>在线 {{ growCardList?.deviceInfo?.onLine }}</span>
+          <img
+            src="/src/assets/images/offline.png"
+            class="mr-1 ml-1"
+            style="width: 0.625rem; height: 0.625rem"
+          />
+          <span> 离线 {{ growCardList?.deviceInfo?.offLine }} </span>
+          <img
+            src="/src/assets/images/inactive.png"
+            class="mr-1 ml-1"
+            style="width: 0.625rem; height: 0.625rem"
+          />
+          <span> 未激活 {{ growCardList?.deviceInfo?.inActive }} </span>
+        </div></div
       >
       >
     </Card>
     </Card>
     <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4" style="color: #666">
     <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4" style="color: #666">

@@ -100,9 +100,19 @@
                 >{{ index + 1 }}</span
                 >{{ index + 1 }}</span
               >
               >
               <div class="flex justify-between" style="width: 100%">
               <div class="flex justify-between" style="width: 100%">
-                <span>
-                  {{ item.name }}
-                </span>
+                <div
+                  style="
+                    width: 10rem;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                    word-break: break-all;
+                  "
+                >
+                  <Tooltip :title="item.name">
+                    {{ item.name }}
+                  </Tooltip>
+                </div>
                 <div class="flex w-7/10">
                 <div class="flex w-7/10">
                   <Progress
                   <Progress
                     :showInfo="false"
                     :showInfo="false"
@@ -142,7 +152,16 @@
 
 
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, ref, computed, onMounted } from 'vue';
   import { defineComponent, ref, computed, onMounted } from 'vue';
-  import { Card, Anchor, List, Avatar, Descriptions, Progress, Skeleton } from 'ant-design-vue';
+  import {
+    Card,
+    Anchor,
+    List,
+    Avatar,
+    Descriptions,
+    Progress,
+    Skeleton,
+    Tooltip,
+  } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
   import { getEnterPriseDetail } from '/@/api/oem';
   import { getEnterPriseDetail } from '/@/api/oem';
   import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
   import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
@@ -166,6 +185,7 @@
       BasicTable,
       BasicTable,
       Progress,
       Progress,
       Skeleton,
       Skeleton,
+      Tooltip,
     },
     },
     props: {
     props: {
       role: {
       role: {

@@ -28,7 +28,12 @@
     </div>
     </div>
   </Card>
   </Card>
   <div v-if="isAdmin(role)">
   <div v-if="isAdmin(role)">
-    <Card v-bind="$attrs" title="租户趋势" style="height: 428px">
+    <Card
+      v-bind="$attrs"
+      title="租户趋势"
+      style="height: 26.75rem"
+      :bodyStyle="{ padding: '0 24px' }"
+    >
       <template #extra>
       <template #extra>
         <div class="extra-date">
         <div class="extra-date">
           <template v-for="(item, index) in TenantOrCustomerDateList" :key="item.value">
           <template v-for="(item, index) in TenantOrCustomerDateList" :key="item.value">
@@ -47,7 +52,12 @@
       </template>
       </template>
       <TenantTrend :tenantTrendList="tenantTrendList" />
       <TenantTrend :tenantTrendList="tenantTrendList" />
     </Card>
     </Card>
-    <Card v-bind="$attrs" title="客户趋势" style="height: 428px">
+    <Card
+      v-bind="$attrs"
+      title="客户趋势"
+      style="height: 26.75rem"
+      :bodyStyle="{ padding: '0 24px' }"
+    >
       <template #extra>
       <template #extra>
         <div class="extra-date">
         <div class="extra-date">
           <template v-for="(item, index) in TenantOrCustomerDateList" :key="item.value">
           <template v-for="(item, index) in TenantOrCustomerDateList" :key="item.value">

@@ -13,7 +13,7 @@
   }
   }
   const props = withDefaults(defineProps<Props>(), {
   const props = withDefaults(defineProps<Props>(), {
     width: '100%',
     width: '100%',
-    height: '300px',
+    height: '320px',
     tenantTrendList: () => [],
     tenantTrendList: () => [],
   });
   });
 
 

@@ -45,12 +45,7 @@
           schemas: alarmSearchSchemas,
           schemas: alarmSearchSchemas,
         },
         },
         showTableSetting: true,
         showTableSetting: true,
-        tableSetting: {
-          redo: true,
-          size: false,
-          setting: false,
-          fullScreen: false,
-        },
+
         useSearchForm: true,
         useSearchForm: true,
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,

@@ -48,7 +48,7 @@
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const [registerTable] = useTable({
       const [registerTable] = useTable({
         columns: realTimeDataColumns,
         columns: realTimeDataColumns,
-        showTableSetting: false,
+        showTableSetting: true,
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         dataSource: state.recordList,
         dataSource: state.recordList,

@@ -142,7 +142,7 @@
         pagination: false,
         pagination: false,
         autoCreateKey: true,
         autoCreateKey: true,
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -2,7 +2,7 @@
   <div>
   <div>
     <BasicTable @register="registerTable">
     <BasicTable @register="registerTable">
       <template #toolbar>
       <template #toolbar>
-        <a-button type="primary" @click="handleCreate"> 新增配置 </a-button>
+        <a-button type="primary" @click="handleCreate"> 新增消息配置 </a-button>
       </template>
       </template>
       <template #config="{ record }">
       <template #config="{ record }">
         <a-button type="link" class="ml-2" @click="showData(record)"> 查看配置 </a-button>
         <a-button type="link" class="ml-2" @click="showData(record)"> 查看配置 </a-button>
@@ -62,7 +62,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -69,7 +69,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 140,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -67,7 +67,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 140,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -2,7 +2,7 @@
   <div>
   <div>
     <BasicTable @register="registerTable">
     <BasicTable @register="registerTable">
       <template #toolbar>
       <template #toolbar>
-        <a-button type="primary" @click="handleCreate"> 新增模板 </a-button>
+        <a-button type="primary" @click="handleCreate"> 新增消息模板 </a-button>
       </template>
       </template>
       <template #config="{ record }">
       <template #config="{ record }">
         <a-button type="link" class="ml-2" @click="goConfig">
         <a-button type="link" class="ml-2" @click="goConfig">
@@ -78,7 +78,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -96,7 +96,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -79,7 +79,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -41,7 +41,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -2,7 +2,7 @@
   <div>
   <div>
     <BasicTable @register="registerTable">
     <BasicTable @register="registerTable">
       <template #toolbar>
       <template #toolbar>
-        <a-button type="primary" @click="handleAdd"> 新增 </a-button>
+        <a-button type="primary" @click="handleAdd">新增通知</a-button>
         <a-button color="error" @click="handleToolbarDel" :disabled="hasBatchDelete">
         <a-button color="error" @click="handleToolbarDel" :disabled="hasBatchDelete">
           批量删除
           批量删除
         </a-button>
         </a-button>
@@ -92,7 +92,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -71,7 +71,7 @@
         api: getNotifyDetailPage,
         api: getNotifyDetailPage,
         columns: detailColumns,
         columns: detailColumns,
         bordered: true,
         bordered: true,
-        showTableSetting: false,
+        showTableSetting: true,
         showIndexColumn: false,
         showIndexColumn: false,
         immediate: false,
         immediate: false,
         beforeFetch: getNoticeId,
         beforeFetch: getNoticeId,

@@ -49,7 +49,7 @@
     title: t('sys.errorLog.tableTitle'),
     title: t('sys.errorLog.tableTitle'),
     columns: getColumns(),
     columns: getColumns(),
     actionColumn: {
     actionColumn: {
-      width: 80,
+      width: 200,
       title: 'Action',
       title: 'Action',
       dataIndex: 'action',
       dataIndex: 'action',
       slots: { customRender: 'action' },
       slots: { customRender: 'action' },

 <template>
 <template>
-  <div class="login-page" :class="{ light1: isDark, dark: !isDark }">
-    <div class="login-header" :style="{ backgroundColor: isDark ? '#1d3794' : '#22283a' }">
-      <AppLogo
-        :alwaysShowTitle="true"
-        style="z-index: 99; position: absolute; width: 40px; height: 100px; left: 10%; top: -20px"
-      />
-
-      <AppDarkModeToggle
-        class="absolute top-3 right-10 enter-x"
-        v-if="!sessionTimeout"
-        @click="toggleDark"
-      />
-      <AppLocalePicker
-        class="absolute text-white top-4 right-4 enter-x xl:text-gray-600"
-        :showText="false"
-        color="#ffffff"
-        v-if="!sessionTimeout && showLocale"
-      />
-    </div>
-    <div class="login-container">
-      <div class="flex w-full h-full py-5 xl:h-auto xl:py-0 xl:my-0 xl:w-6/12">
-        <div class="login-description">
-          <h1>物联网平台</h1>
-          <h2>输入您的个人详细信息开始使用！</h2>
+  <div :class="prefixCls" class="relative w-full h-full px-4">
+    <AppLocalePicker
+      class="absolute text-white top-4 right-4 enter-x xl:text-gray-600"
+      :showText="false"
+      v-if="!sessionTimeout && showLocale"
+    />
+    <AppDarkModeToggle class="absolute top-3 right-7 enter-x" v-if="!sessionTimeout" />
+
+    <span class="-enter-x xl:hidden">
+      <AppLogo :alwaysShowTitle="true" />
+    </span>
+
+    <div class="container relative h-full py-2 mx-auto sm:px-10">
+      <div class="flex h-full">
+        <div class="hidden min-h-full pl-4 mr-4 xl:flex xl:flex-col xl:w-6/12">
+          <AppLogo class="-enter-x" />
+          <div class="my-auto">
+            <img
+              :alt="title"
+              src="../../../assets/svg/login-box-bg.svg"
+              class="w-1/2 -mt-16 -enter-x"
+            />
+            <div class="mt-10 font-medium text-white -enter-x">
+              <span class="inline-block mt-4 text-3xl"> {{ t('sys.login.signInTitle') }}</span>
+            </div>
+            <div class="mt-5 font-normal text-white text-md dark:text-gray-500 -enter-x">
+              {{ t('sys.login.signInDesc') }}
+            </div>
+          </div>
         </div>
         </div>
-        <div
-          :class="`${prefixCls}-form`"
-          class="relative w-full px-5 py-8 mx-auto my-auto rounded-md shadow-md xl:ml-16 xl:bg-transparent sm:px-8 xl:p-4 xl:shadow-none sm:w-3/4 lg:w-2/4 xl:w-auto enter-x"
-          :style="{ backgroundColor: isDark ? '#fff' : '#1a2030' }"
-        >
-          <LoginForm />
-          <ForgetPasswordForm />
-          <RegisterForm />
-          <MobileForm />
-          <QrCodeForm />
+        <div class="flex w-full h-full py-5 xl:h-auto xl:py-0 xl:my-0 xl:w-6/12">
+          <div
+            :class="`${prefixCls}-form`"
+            class="relative w-full px-5 py-8 mx-auto my-auto rounded-md shadow-md xl:ml-16 xl:bg-transparent sm:px-8 xl:p-4 xl:shadow-none sm:w-3/4 lg:w-2/4 xl:w-auto enter-x"
+          >
+            <LoginForm />
+            <ForgetPasswordForm />
+            <RegisterForm />
+            <MobileForm />
+            <QrCodeForm />
+          </div>
         </div>
         </div>
       </div>
       </div>
-      <div
-        style="
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          position: absolute;
-          bottom: 1.25rem;
-          color: #fff;
-        "
-        >{{ getCopyRight }}</div
-      >
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -59,76 +54,162 @@
   import RegisterForm from './RegisterForm.vue';
   import RegisterForm from './RegisterForm.vue';
   import MobileForm from './MobileForm.vue';
   import MobileForm from './MobileForm.vue';
   import QrCodeForm from './QrCodeForm.vue';
   import QrCodeForm from './QrCodeForm.vue';
+  import { useGlobSetting } from '/@/hooks/setting';
+  import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLocaleStore } from '/@/store/modules/locale';
   import { useLocaleStore } from '/@/store/modules/locale';
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
-
   defineProps({
   defineProps({
     sessionTimeout: {
     sessionTimeout: {
       type: Boolean,
       type: Boolean,
     },
     },
   });
   });
 
 
+  const globSetting = useGlobSetting();
   const { prefixCls } = useDesign('login');
   const { prefixCls } = useDesign('login');
+  const { t } = useI18n();
   const localeStore = useLocaleStore();
   const localeStore = useLocaleStore();
   const showLocale = localeStore.getShowPicker;
   const showLocale = localeStore.getShowPicker;
-  const isDark = ref(true);
-  const toggleDark = () => {
-    isDark.value = !isDark.value;
-  };
-  const userStore = useUserStore();
-  const getCopyRight = computed(() => {
-    return (
-      (userStore.platInfo?.copyright ?? 'Copyright@ 云腾五洲 蜀ICP') +
-      (userStore.platInfo?.presentedOurselves ?? '')
-    );
-  });
+  const title = computed(() => globSetting?.title ?? '');
 </script>
 </script>
 <style lang="less">
 <style lang="less">
   @prefix-cls: ~'@{namespace}-login';
   @prefix-cls: ~'@{namespace}-login';
   @logo-prefix-cls: ~'@{namespace}-app-logo';
   @logo-prefix-cls: ~'@{namespace}-app-logo';
   @countdown-prefix-cls: ~'@{namespace}-countdown-input';
   @countdown-prefix-cls: ~'@{namespace}-countdown-input';
   @dark-bg: #293146;
   @dark-bg: #293146;
-  .light1 {
-    background-image: url('/src/assets/images/bg.png');
-  }
-  .dark {
-    background-image: url('/src/assets/images/bg-dark.png');
+
+  html[data-theme='dark'] {
+    .@{prefix-cls} {
+      background-color: @dark-bg;
+
+      &::before {
+        background-image: url(/@/assets/svg/login-bg-dark.svg);
+      }
+
+      .ant-input,
+      .ant-input-password {
+        background-color: #232a3b;
+      }
+
+      .ant-btn:not(.ant-btn-link):not(.ant-btn-primary) {
+        border: 1px solid #4a5569;
+      }
+
+      &-form {
+        background: transparent !important;
+      }
+
+      .app-iconify {
+        color: #fff;
+      }
+    }
+
+    input.fix-auto-fill,
+    .fix-auto-fill input {
+      -webkit-text-fill-color: #c9d1d9 !important;
+      box-shadow: inherit !important;
+    }
   }
   }
-  .login-page {
-    width: 100%;
-    height: 100%;
-    position: relative;
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
-    .login-header {
-      height: 60px;
+
+  .@{prefix-cls} {
+    min-height: 100%;
+    overflow: hidden;
+    @media (max-width: @screen-xl) {
+      background-color: #293146;
+
+      .@{prefix-cls}-form {
+        background-color: #fff;
+      }
+    }
+
+    &::before {
+      position: absolute;
+      top: 0;
+      left: 0;
       width: 100%;
       width: 100%;
+      height: 100%;
+      margin-left: -48%;
+      background-image: url(/@/assets/svg/login-bg.svg);
+      background-position: 100%;
+      background-repeat: no-repeat;
+      background-size: auto 100%;
+      content: '';
+      @media (max-width: @screen-xl) {
+        display: none;
+      }
+    }
+
+    .@{logo-prefix-cls} {
       position: absolute;
       position: absolute;
-      background-color: #1d3794;
+      top: 12px;
+      height: 30px;
+
+      &__title {
+        font-size: 16px;
+        color: #fff;
+      }
+
+      img {
+        width: 32px;
+      }
     }
     }
-    .login-container {
-      .login-description {
-        position: absolute;
-        right: 16.25rem;
-        top: 10rem;
-        text-align: center;
-        h1 {
-          color: #5aeeed;
-          font-size: 26px;
+
+    .container {
+      .@{logo-prefix-cls} {
+        display: flex;
+        width: 60%;
+        height: 80px;
+
+        &__title {
+          font-size: 24px;
+          color: #fff;
+        }
+
+        img {
+          width: 48px;
         }
         }
-        h2 {
-          color: #5aeeed;
-          font-size: 20px;
+      }
+    }
+
+    &-sign-in-way {
+      .anticon {
+        font-size: 22px;
+        color: #888;
+        cursor: pointer;
+
+        &:hover {
+          color: @primary-color;
         }
         }
       }
       }
-      .vben-login-form {
-        position: absolute;
-        width: 25.625rem;
-        right: 12.5rem;
-        top: 50%;
-        margin-top: -11.25rem;
+    }
+
+    input:not([type='checkbox']) {
+      min-width: 360px;
+
+      @media (max-width: @screen-xl) {
+        min-width: 320px;
+      }
+
+      @media (max-width: @screen-lg) {
+        min-width: 260px;
+      }
+
+      @media (max-width: @screen-md) {
+        min-width: 240px;
+      }
+
+      @media (max-width: @screen-sm) {
+        min-width: 160px;
       }
       }
     }
     }
+
+    .@{countdown-prefix-cls} input {
+      min-width: unset;
+    }
+
+    .ant-divider-inner-text {
+      font-size: 12px;
+      color: @text-color-secondary;
+    }
   }
   }
 </style>
 </style>

 <template>
 <template>
-  <div>
-    <LoginFormTitle v-show="getShow" class="enter-x" />
-    <Form
-      class="p-4 enter-x"
-      :model="formData"
-      :rules="getFormRules"
-      ref="formRef"
-      v-show="getShow"
-      @keypress.enter="handleLogin"
-    >
-      <FormItem name="account" class="enter-x">
-        <Input
-          size="large"
-          v-model:value="formData.account"
-          :placeholder="t('sys.login.userName')"
-          class="fix-auto-fill"
-        />
-      </FormItem>
-      <FormItem name="password" class="enter-x">
-        <InputPassword
-          size="large"
-          visibilityToggle
-          v-model:value="formData.password"
-          :placeholder="t('sys.login.password')"
-        />
-      </FormItem>
+  <LoginFormTitle v-show="getShow" class="enter-x" />
+  <Form
+    class="p-4 enter-x"
+    :model="formData"
+    :rules="getFormRules"
+    ref="formRef"
+    v-show="getShow"
+    @keypress.enter="handleLogin"
+  >
+    <FormItem name="account" class="enter-x">
+      <Input
+        size="large"
+        v-model:value="formData.account"
+        :placeholder="t('sys.login.userName')"
+        class="fix-auto-fill"
+      />
+    </FormItem>
+    <FormItem name="password" class="enter-x">
+      <InputPassword
+        size="large"
+        visibilityToggle
+        v-model:value="formData.password"
+        :placeholder="t('sys.login.password')"
+      />
+    </FormItem>
 
 
-      <FormItem class="enter-x">
-        <Button
-          size="large"
-          block
-          @click="handleLogin"
-          :loading="loading"
-          style="background-color: #2950f7; color: #fff"
-        >
-          {{ t('sys.login.loginButton') }}
-        </Button>
-      </FormItem>
-      <ARow type="flex" justify="space-between">
-        <ACol :md="11" :xs="24">
-          <Button
-            type="link"
-            color="#2950f7"
-            block
-            @click="setLoginState(LoginStateEnum.MOBILE)"
-            style="color: #2950f7"
-          >
-            {{ t('sys.login.mobileSignInFormTitle') }}
-          </Button>
-        </ACol>
-        <ACol :md="11" :xs="24">
-          <Button
-            type="link"
-            block
-            @click="setLoginState(LoginStateEnum.QR_CODE)"
-            style="color: #2950f7"
-          >
-            {{ t('sys.login.qrSignInFormTitle') }}
+    <ARow class="enter-x">
+      <ACol :span="12">
+        <FormItem>
+          <Checkbox v-model:checked="rememberMe" size="small">
+            {{ t('sys.login.rememberMe') }}
+          </Checkbox>
+        </FormItem>
+      </ACol>
+      <ACol :span="12">
+        <FormItem style="text-align: right">
+          <Button type="link" size="small" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">
+            {{ t('sys.login.forgetPassword') }}
           </Button>
           </Button>
-        </ACol>
-      </ARow>
-      <ARow class="enter-x">
-        <ACol :span="12">
-          <FormItem />
-        </ACol>
-        <ACol :span="12">
-          <FormItem :style="{ 'text-align': 'right' }">
-            <!-- No logic, you need to deal with it yourself -->
-            <Button type="link" size="small" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">
-              {{ t('sys.login.forgetPassword') }}
-            </Button>
-          </FormItem>
-        </ACol>
-      </ARow>
-    </Form>
-  </div>
+        </FormItem>
+      </ACol>
+    </ARow>
+
+    <FormItem class="enter-x">
+      <Button type="primary" size="large" block @click="handleLogin" :loading="loading">
+        {{ t('sys.login.loginButton') }}
+      </Button>
+    </FormItem>
+    <ARow class="enter-x flex justify-between">
+      <ACol :md="11" :xs="24">
+        <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
+          {{ t('sys.login.mobileSignInFormTitle') }}
+        </Button>
+      </ACol>
+      <ACol :md="11" :xs="24">
+        <Button block @click="setLoginState(LoginStateEnum.QR_CODE)">
+          {{ t('sys.login.qrSignInFormTitle') }}
+        </Button>
+      </ACol>
+    </ARow>
+  </Form>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { reactive, ref, toRaw, unref, computed } from 'vue';
-
-  import { Form, Input, Row, Col, Button } from 'ant-design-vue';
+  import { reactive, ref, unref, computed } from 'vue';
+  import { Checkbox, Form, Input, Row, Col, Button } from 'ant-design-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
   import LoginFormTitle from './LoginFormTitle.vue';
 
 
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -98,12 +82,14 @@
   const { t } = useI18n();
   const { t } = useI18n();
   const { notification, createErrorModal } = useMessage();
   const { notification, createErrorModal } = useMessage();
   const { prefixCls } = useDesign('login');
   const { prefixCls } = useDesign('login');
+  const userStore = useUserStore();
 
 
   const { setLoginState, getLoginState } = useLoginState();
   const { setLoginState, getLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
   const { getFormRules } = useFormRules();
-  const userStore = useUserStore();
+
   const formRef = ref();
   const formRef = ref();
   const loading = ref(false);
   const loading = ref(false);
+  const rememberMe = ref(false);
 
 
   const formData = reactive({
   const formData = reactive({
     account: 'sysadmin',
     account: 'sysadmin',
@@ -112,8 +98,6 @@
 
 
   const { validForm } = useFormValid(formRef);
   const { validForm } = useFormValid(formRef);
 
 
-  //onKeyStroke('Enter', handleLogin);
-
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN);
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN);
   const storage = createLocalStorage();
   const storage = createLocalStorage();
   async function handleLogin() {
   async function handleLogin() {
@@ -121,13 +105,11 @@
     if (!data) return;
     if (!data) return;
     try {
     try {
       loading.value = true;
       loading.value = true;
-      const userInfo = await userStore.login(
-        toRaw({
-          password: data.password,
-          username: data.account,
-          mode: 'none', //不要默认的错误提示
-        })
-      );
+      const userInfo = await userStore.login({
+        password: data.password,
+        username: data.account,
+        mode: 'none', //不要默认的错误提示
+      });
       if (userInfo) {
       if (userInfo) {
         notification.success({
         notification.success({
           message: t('sys.login.loginSuccessTitle'),
           message: t('sys.login.loginSuccessTitle'),
@@ -145,15 +127,10 @@
         link.href = res.icon ?? '/favicon.ico';
         link.href = res.icon ?? '/favicon.ico';
         document.getElementsByTagName('head')[0].appendChild(link);
         document.getElementsByTagName('head')[0].appendChild(link);
       }
       }
-    } catch (error: any) {
+    } catch (error) {
       createErrorModal({
       createErrorModal({
-        title: t('sys.api.loginFailed'),
-        content:
-          error.response && error.response.status == 401
-            ? error.response.data.message
-            : error.code == 'ECONNABORTED'
-            ? t('sys.api.timeoutMessage')
-            : t('sys.api.apiRequestFailed'),
+        title: t('sys.api.errorTip'),
+        content: (error as unknown as Error).message || t('sys.api.networkExceptionMsg'),
         getContainer: () => document.body.querySelector(`.${prefixCls}`) || document.body,
         getContainer: () => document.body.querySelector(`.${prefixCls}`) || document.body,
       });
       });
     } finally {
     } finally {

 <template>
 <template>
-  <h2
-    class="mb-3 text-2xl font-bold text-center xl:text-3xl enter-x xl:text-left flex justify-center"
-  >
+  <h2 class="mb-3 text-2xl font-bold text-center xl:text-3xl enter-x xl:text-left">
     {{ getFormTitle }}
     {{ getFormTitle }}
   </h2>
   </h2>
 </template>
 </template>

@@ -21,14 +21,7 @@
       </FormItem>
       </FormItem>
 
 
       <FormItem class="enter-x">
       <FormItem class="enter-x">
-        <Button
-          type="primary"
-          size="large"
-          block
-          @click="handleLogin"
-          :loading="loading"
-          style="background-color: #2950f7; color: #fff"
-        >
+        <Button type="primary" size="large" block @click="handleLogin" :loading="loading">
           {{ t('sys.login.loginButton') }}
           {{ t('sys.login.loginButton') }}
         </Button>
         </Button>
         <Button size="large" block class="mt-4" @click="handleBackLogin">
         <Button size="large" block class="mt-4" @click="handleBackLogin">

@@ -4,7 +4,7 @@
     <div class="enter-x min-w-64 min-h-64">
     <div class="enter-x min-w-64 min-h-64">
       <QrCode
       <QrCode
         :value="qrCodeUrl"
         :value="qrCodeUrl"
-        class="enter-x flex justify-center xl:justify-center"
+        class="enter-x flex justify-center xl:justify-start"
         :width="280"
         :width="280"
       />
       />
       <Divider class="enter-x">{{ t('sys.login.scanSign') }}</Divider>
       <Divider class="enter-x">{{ t('sys.login.scanSign') }}</Divider>

@@ -103,9 +103,8 @@
         useSearchForm: true,
         useSearchForm: true,
         showTableSetting: true,
         showTableSetting: true,
         bordered: true,
         bordered: true,
-
         actionColumn: {
         actionColumn: {
-          width: 220,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -73,7 +73,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 240,
+          width: 300,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -80,7 +80,7 @@
         showIndexColumn: false,
         showIndexColumn: false,
         canResize: false,
         canResize: false,
         actionColumn: {
         actionColumn: {
-          width: 120,
+          width: 200,
           title: t('routes.common.system.pageSystemTitleOperation'), //操作
           title: t('routes.common.system.pageSystemTitleOperation'), //操作
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -65,7 +65,7 @@
         showIndexColumn: false,
         showIndexColumn: false,
         canResize: false,
         canResize: false,
         actionColumn: {
         actionColumn: {
-          width: 80,
+          width: 200,
           title: t('routes.common.common.operation'), //操作
           title: t('routes.common.common.operation'), //操作
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -2,7 +2,7 @@
   <div>
   <div>
     <BasicTable @register="registerTable">
     <BasicTable @register="registerTable">
       <template #toolbar>
       <template #toolbar>
-        <a-button type="primary" @click="handleCreate"> 新增角色 </a-button>
+        <a-button type="primary" @click="handleCreate">新增角色</a-button>
       </template>
       </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
@@ -49,11 +49,6 @@
         title: '角色列表',
         title: '角色列表',
         api: getRoleListByPage,
         api: getRoleListByPage,
         columns,
         columns,
-        tableSetting: {
-          redo: true,
-          size: false,
-          setting: false,
-        },
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
@@ -63,7 +58,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 80,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -188,11 +188,6 @@
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },
           fixed: 'right',
           fixed: 'right',
         },
         },
-        tableSetting: {
-          redo: true,
-          size: false,
-          setting: false,
-        },
       });
       });
       //默认传递页面数据
       //默认传递页面数据
       const [tenantAdminDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
       const [tenantAdminDrawer, { closeDrawer }] = useDrawerInner(async (data) => {

@@ -98,7 +98,6 @@
         {
         {
           field: 'email',
           field: 'email',
           label: '邮件',
           label: '邮件',
-          required: true,
           component: 'Input',
           component: 'Input',
           rules: emailRule,
           rules: emailRule,
         },
         },

@@ -39,7 +39,7 @@
   import { FileItem } from '/@/components/Upload/src/typing';
   import { FileItem } from '/@/components/Upload/src/typing';
   import { upload } from '/@/api/oss/ossFileUploader';
   import { upload } from '/@/api/oss/ossFileUploader';
   import { getTenantRoles, updateOrCreateTenant } from '/@/api/tenant/tenantApi';
   import { getTenantRoles, updateOrCreateTenant } from '/@/api/tenant/tenantApi';
-
+  import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
   export default defineComponent({
     name: 'TenantDrawer',
     name: 'TenantDrawer',
     components: {
     components: {
@@ -133,12 +133,16 @@
               entityType: 'TENANT_PROFILE',
               entityType: 'TENANT_PROFILE',
             },
             },
           };
           };
-          updateOrCreateTenant(req).then(() => {
-            closeDrawer(); //关闭侧框
-            emit('success');
-          });
+          await updateOrCreateTenant(req);
+          closeDrawer(); //关闭侧框
+          emit('success');
+        } catch (e) {
+          const { createMessage } = useMessage();
+          createMessage.error("Can't use isolated tenant profiles in monolith setup!");
         } finally {
         } finally {
-          setDrawerProps({ confirmLoading: false });
+          setDrawerProps({
+            confirmLoading: false,
+          });
         }
         }
       }
       }
 
 

@@ -74,16 +74,54 @@
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import TenantDrawer from './TenantDrawer.vue';
   import TenantDrawer from './TenantDrawer.vue';
   import TenantAdminDrawer from './TenantAdminDrawer.vue';
   import TenantAdminDrawer from './TenantAdminDrawer.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
   export default defineComponent({
     components: { BasicTable, TableImg, Tag, TableAction, TenantDrawer, TenantAdminDrawer },
     components: { BasicTable, TableImg, Tag, TableAction, TenantDrawer, TenantAdminDrawer },
     setup() {
     setup() {
       const [tenantDrawer, { openDrawer }] = useDrawer();
       const [tenantDrawer, { openDrawer }] = useDrawer();
       const [tenantAdminDrawer, { openDrawer: openTenantAdminDrawer }] = useDrawer();
       const [tenantAdminDrawer, { openDrawer: openTenantAdminDrawer }] = useDrawer();
+      const searchFiled: FormSchema[] = [
+        {
+          field: 'tenantName',
+          label: '租户名称',
+          component: 'Input',
+          componentProps: {
+            placeholder: '请输入租户名称',
+          },
+          colProps: { span: 8 },
+        },
+      ];
+      const [tenantTable, { reload, setLoading }] = useTable({
+        title: '租户',
+        api: getTenantPage,
+        columns: getBasicColumns(),
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
 
 
-      function handleDelete(record: Recordable) {
-        deleteTenant([record.id]).then(() => {
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFiled,
+        },
+        actionColumn: {
+          width: 200,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: 'right',
+        },
+      });
+      async function handleDelete(record: Recordable) {
+        try {
+          setLoading(true);
+          await deleteTenant([record.id]);
           reload();
           reload();
-        });
+          const { createMessage } = useMessage();
+          createMessage.success('删除成功');
+        } finally {
+          setLoading(false);
+        }
       }
       }
 
 
       function handleCreate() {
       function handleCreate() {
@@ -105,44 +143,10 @@
         });
         });
       }
       }
 
 
-      const searchFiled: FormSchema[] = [
-        {
-          field: 'tenantName',
-          label: '租户名称',
-          component: 'Input',
-          colProps: { span: 8 },
-        },
-      ];
-
       function handleSuccess() {
       function handleSuccess() {
         reload();
         reload();
       }
       }
 
 
-      const [tenantTable, { reload }] = useTable({
-        title: '租户',
-        api: getTenantPage,
-        columns: getBasicColumns(),
-        useSearchForm: true,
-        showTableSetting: true,
-        bordered: true,
-        showIndexColumn: false,
-        tableSetting: {
-          redo: true,
-          size: false,
-          setting: false,
-        },
-        formConfig: {
-          labelWidth: 120,
-          schemas: searchFiled,
-        },
-        actionColumn: {
-          width: 150,
-          title: '操作',
-          dataIndex: 'action',
-          slots: { customRender: 'action' },
-          fixed: 'right',
-        },
-      });
       return {
       return {
         tenantTable,
         tenantTable,
         handleEdit,
         handleEdit,
@@ -152,6 +156,7 @@
         tenantAdminDrawer,
         tenantAdminDrawer,
         handleSuccess,
         handleSuccess,
         handleTenantAdminDrawer,
         handleTenantAdminDrawer,
+        setLoading,
       };
       };
     },
     },
   });
   });

@@ -38,7 +38,7 @@ export const schemas: FormSchema[] = [
   {
   {
     field: 'icon',
     field: 'icon',
     component: 'Upload',
     component: 'Upload',
-    label: 'Favicon浏览器Icon图标',
+    label: '浏览器Icon图标',
     colProps: {
     colProps: {
       span: 24,
       span: 24,
     },
     },

@@ -14,19 +14,6 @@ export const schemas: FormSchema[] = [
       maxLength: 100,
       maxLength: 100,
       placeholder: '请输入公司名称',
       placeholder: '请输入公司名称',
     },
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 100) {
-              return Promise.reject('字数不超过100个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   },
   {
   {
     field: 'abbreviation',
     field: 'abbreviation',
@@ -39,19 +26,6 @@ export const schemas: FormSchema[] = [
       maxLength: 100,
       maxLength: 100,
       placeholder: '请输入公司简称',
       placeholder: '请输入公司简称',
     },
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 100) {
-              return Promise.reject('字数不超过100个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   },
   {
   {
     field: 'officialWebsite',
     field: 'officialWebsite',
@@ -64,19 +38,6 @@ export const schemas: FormSchema[] = [
       maxLength: 255,
       maxLength: 255,
       placeholder: '请输入公司官网',
       placeholder: '请输入公司官网',
     },
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   },
   {
   {
     field: 'email',
     field: 'email',
@@ -102,20 +63,6 @@ export const schemas: FormSchema[] = [
       maxLength: 500,
       maxLength: 500,
       placeholder: '请输入公司简介',
       placeholder: '请输入公司简介',
       autoSize: { minRows: 8, maxRows: 12 },
       autoSize: { minRows: 8, maxRows: 12 },
-      showCount: true,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 500) {
-              return Promise.reject('字数不超过500个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
     },
     },
   },
   },
   {
   {
@@ -146,7 +93,7 @@ export const schemas: FormSchema[] = [
         api: getAreaList,
         api: getAreaList,
         labelField: 'name',
         labelField: 'name',
         valueField: 'code',
         valueField: 'code',
-        placeholder: '请选择省份',
+        placeholder: '省份',
         params: { parentId: 1 },
         params: { parentId: 1 },
         async onChange(value) {
         async onChange(value) {
           if (value === undefined) {
           if (value === undefined) {
@@ -186,7 +133,7 @@ export const schemas: FormSchema[] = [
               field: 'nameCity',
               field: 'nameCity',
               componentProps: {
               componentProps: {
                 options: nameCity,
                 options: nameCity,
-                placeholder: '请选择城市',
+                placeholder: '城市',
                 async onChange(value) {
                 async onChange(value) {
                   if (value === undefined) {
                   if (value === undefined) {
                     formModel.nameCoun = undefined; //  reset city value
                     formModel.nameCoun = undefined; //  reset city value
@@ -223,7 +170,7 @@ export const schemas: FormSchema[] = [
                             updateSchema({
                             updateSchema({
                               field: 'nameTown',
                               field: 'nameTown',
                               componentProps: {
                               componentProps: {
-                                placeholder: '请选择街道/城镇',
+                                placeholder: '城镇/街道',
                                 options: [],
                                 options: [],
                               },
                               },
                             });
                             });
@@ -236,7 +183,7 @@ export const schemas: FormSchema[] = [
                             updateSchema({
                             updateSchema({
                               field: 'nameTown',
                               field: 'nameTown',
                               componentProps: {
                               componentProps: {
-                                placeholder: '请选择街道/城镇',
+                                placeholder: '城镇/街道',
                                 options: nameTown,
                                 options: nameTown,
                               },
                               },
                             });
                             });
@@ -257,11 +204,11 @@ export const schemas: FormSchema[] = [
     field: 'nameCity',
     field: 'nameCity',
     component: 'Select',
     component: 'Select',
     label: '',
     label: '',
+    componentProps: {
+      placeholder: '城市',
+    },
     colProps: {
     colProps: {
       span: 5,
       span: 5,
-      style: {
-        marginLeft: '-5rem',
-      },
     },
     },
   },
   },
   {
   {
@@ -269,13 +216,10 @@ export const schemas: FormSchema[] = [
     component: 'Select',
     component: 'Select',
     label: '',
     label: '',
     colProps: {
     colProps: {
-      span: 5,
-      style: {
-        marginLeft: '-160px',
-      },
+      span: 3,
     },
     },
     componentProps: {
     componentProps: {
-      placeholder: '请选择区/县',
+      placeholder: '区/县',
     },
     },
   },
   },
   {
   {
@@ -284,12 +228,9 @@ export const schemas: FormSchema[] = [
     label: '',
     label: '',
     colProps: {
     colProps: {
       span: 6,
       span: 6,
-      style: {
-        marginLeft: '-160px',
-      },
     },
     },
     componentProps: {
     componentProps: {
-      placeholder: '请选择街道/城镇',
+      placeholder: '城镇/街道',
     },
     },
   },
   },
   {
   {

@@ -33,13 +33,12 @@
     margin: 20px;
     margin: 20px;
     line-height: 50px;
     line-height: 50px;
     font-size: 18px;
     font-size: 18px;
-    border-radius: 8px;
+
     background-color: #fff;
     background-color: #fff;
     padding-left: 10px;
     padding-left: 10px;
   }
   }
   .tab-card {
   .tab-card {
     margin: 20px 0 20px 20px;
     margin: 20px 0 20px 20px;
-    border-radius: 5px;
   }
   }
   .card {
   .card {
     margin: 20px;
     margin: 20px;

@@ -48,11 +48,7 @@
         title: '租户角色列表',
         title: '租户角色列表',
         api: getRoleListByPage,
         api: getRoleListByPage,
         columns,
         columns,
-        tableSetting: {
-          redo: true,
-          size: false,
-          setting: false,
-        },
+
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
@@ -62,7 +58,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 80,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },

@@ -62,7 +62,7 @@
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
         actionColumn: {
         actionColumn: {
-          width: 180,
+          width: 200,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },