Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

2025-08-25 17:29:51 +08:00
parent f794f6a8a9 6cc969e56a
commit 90eceb508a
13 changed files with 136 additions and 117 deletions
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -9,6 +9,8 @@ jobs:
    steps:
      - name: 拉取代码仓库
        uses: http://git.missmoc.top/mocheng/checkout@v4
+        with:
+          fetch-depth: 1  # 只拉取最新的1个提交（浅克隆）

      - name: Set up Node.js
        uses: http://git.missmoc.top/mocheng/setup-node@v3
--- a/apps/web-antd/src/api/property/resident/unit/model.d.ts
+++ b/apps/web-antd/src/api/property/resident/unit/model.d.ts
@@ -35,6 +35,7 @@ export interface Resident_unitVO {
   * 入驻位置
   */
  location: string;
+  locations: string[];

  /**
   * 入驻时间
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -84,13 +84,13 @@ const menus = computed(() => {
    //   icon: CircleHelp,
    //   text: $t('ui.widgets.qa'),
    // },
-    {
-      handler: () => {
-        router.push('/navigation');
-      },
-      // icon: TagOutlined,
-      text: '返回导航',
-    },
+    // {
+    //   handler: () => {
+    //     router.push('/navigation');
+    //   },
+    //   // icon: TagOutlined,
+    //   text: '返回导航',
+    // },
  ];
  /**
   * 租户选中状态 不显示个人中心
--- a/apps/web-antd/src/store/auth.ts
+++ b/apps/web-antd/src/store/auth.ts
@@ -56,9 +56,7 @@ export const useAuthStore = defineStore('auth', () => {
      if (accessStore.loginExpired) {
        accessStore.setLoginExpired(false);
      } else {
-        onSuccess
-          ? await onSuccess?.()
-          : await router.push('/navigation');
+        onSuccess ? await onSuccess?.() : await router.push('/analytics');
      }

      if (userInfo?.realName) {
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue
@@ -26,7 +26,7 @@ onMounted(() => {
          { name: '搜索引擎', value: 1048 },
          { name: '直接访问', value: 735 },
          { name: '邮件营销', value: 580 },
-          { name: '联盟广告', value: 484 },
+          // { name: '联盟广告', value: 484 },
        ],
        emphasis: {
          label: {
--- a/apps/web-antd/src/views/dashboard/analytics/index.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/index.vue
@@ -25,29 +25,29 @@ const overviewItems: AnalysisOverviewItem[] = [
    icon: SvgCardIcon,
    title: '用户量',
    totalTitle: '总用户量',
-    totalValue: 120_000,
-    value: 2000,
+    totalValue: 78,
+    value: 15,
  },
  {
    icon: SvgCakeIcon,
    title: '访问量',
    totalTitle: '总访问量',
-    totalValue: 500_000,
-    value: 20_000,
+    totalValue: 2_278,
+    value: 461,
  },
  {
    icon: SvgDownloadIcon,
    title: '下载量',
    totalTitle: '总下载量',
-    totalValue: 120_000,
-    value: 8000,
+    totalValue: 17,
+    value: 2,
  },
  {
    icon: SvgBellIcon,
    title: '使用量',
    totalTitle: '总使用量',
-    totalValue: 50_000,
-    value: 5000,
+    totalValue: 6_652,
+    value: 3_739,
  },
 ];

--- a/apps/web-antd/src/views/property/resident/unit/data.ts
+++ b/apps/web-antd/src/views/property/resident/unit/data.ts
@@ -157,7 +157,7 @@ export const modalSchema: FormSchemaGetter = () => [
  },
  {
    label: '入驻位置',
-    fieldName: 'location',
+    fieldName: 'locations',
    component: 'TreeSelect',
    rules: 'selectRequired',
    formItemClass: 'col-span-2'
--- a/apps/web-antd/src/views/property/resident/unit/unit-modal.vue
+++ b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue
@@ -64,7 +64,11 @@ const [BasicModal, modalApi] = useVbenModal({
    await initLocationOptions();
    if (isUpdate.value && id) {
      const record = await resident_unitInfo(id);
-      await formApi.setValues({...record,authTime:[record.authBegDate,record.authEndDate]});
+      let roomIds=record.location.split(',')
+      await formApi.setValues({...record,
+        authTime:[record.authBegDate,record.authEndDate],
+        locations:roomIds
+      });
    }
    await markInitialized();

@@ -84,7 +88,7 @@ async function handleConfirm() {

    data.authBegDate = data.authTime[0];
    data.authEndDate = data.authTime[1];
-
+    data.location=data.locations.join(',')
    await (isUpdate.value ? resident_unitUpdate(data) : resident_unitAdd(data));
    resetInitialized();
    emit('reload');
@@ -125,8 +129,9 @@ async function initLocationOptions() {
        treeNodeFilterProp: 'label',
        // 选中后显示在输入框的值
        treeNodeLabelProp: 'fullName',
+        multiple:true
      }),
-      fieldName: 'location',
+      fieldName: 'locations',
    },
  ]);
 }
--- a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts
@@ -43,16 +43,16 @@ export const columns: VxeGridProps['columns'] = [
    field: 'unitName',
    minWidth:'120'
  },
-  {
-    title: '预定人',
-    field: 'personName',
-    minWidth:'120'
-  },
-  {
-    title: '联系方式',
-    field: 'phone',
-    minWidth:'120'
-  },
+  // {
+  //   title: '预定人',
+  //   field: 'personName',
+  //   minWidth:'120'
+  // },
+  // {
+  //   title: '联系方式',
+  //   field: 'phone',
+  //   minWidth:'120'
+  // },
  // {
  //   title: '预定时间',
  //   field: 'scheduledStarttime',
@@ -64,7 +64,7 @@ export const columns: VxeGridProps['columns'] = [
  {
    title: '预定时间',
    field: 'scheduledStarttime',
-    minWidth: '180',
+    minWidth: '200',
    formatter: ({ row }) => {
      const start = row.scheduledStarttime;
      const end = row.scheduledEndtime;
--- a/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue
@@ -10,8 +10,8 @@
        <Select
          v-model:value="formState.meetingRoomType"
          class="room-select"
-          placeholder="请选择会议室类型"
-          style="width: 180px;"
+          placeholder="请选择类型"
+          style="width: 150px;"
        >
          <SelectOption
            v-for="item in getDictOptions('meeting_room_type')"
@@ -23,14 +23,14 @@
        </Select>
      </a-form-item>
      <a-form-item label="会议日期">
-        <DatePicker v-model:value="formState.appointmentTime" style="width: 180px;"/>
+        <DatePicker v-model:value="formState.appointmentTime" style="width: 130px;"/>
      </a-form-item>
      <a-form-item label="会议时段">
-        <TimeRangePicker style="width: 200px;" format="HH:mm"
+        <TimeRangePicker style="width: 190px;" format="HH:mm"
                         v-model:value="formState.openHours"></TimeRangePicker>
      </a-form-item>
      <a-form-item label="参会人数">
-        <InputNumber style="width: 150px;" placeholder="请输入参会人数"
+        <InputNumber style="width: 120px;" placeholder="请输入人数"
                     v-model:value="formState.personNumber"/>
      </a-form-item>
      <a-form-item >
--- a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
@@ -42,7 +42,7 @@ export const columns: VxeGridProps['columns'] = [
    field: 'meetingRoomType',
    slots: {
      default: ({row}) => {
-        return renderDict(row.meetingRoomType, 'meeting_room_type');
+        return row.meetingRoomType!=null?renderDict(row.meetingRoomType, 'meeting_room_type'):'';
      },
    },
    minWidth:100,
--- a/packages/effects/layouts/src/authentication/authentication.vue
+++ b/packages/effects/layouts/src/authentication/authentication.vue
@@ -36,17 +36,17 @@ const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =
  usePreferences();
 </script> -->
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
-import { useAuthStore } from '../../../../../apps/web-antd/src/store'
+import { ref, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useAuthStore } from '../../../../../apps/web-antd/src/store';
 import { Checkbox } from 'ant-design-vue';
-const router = useRouter()
+const router = useRouter();
 const authStore = useAuthStore();

 // 响应式数据
-const username = ref('')
-const password = ref('')
-const rememberMe = ref(false)
+const username = ref('');
+const password = ref('');
+const rememberMe = ref(false);

 // 页面加载时恢复用户名
 onMounted(() => {
@@ -58,55 +58,59 @@ onMounted(() => {
 });
 function getRetUrlParam() {
  const urlParams = new URLSearchParams(window.location.search);
+  console.log('urlParams', urlParams);
  return urlParams.get('returl');
 }
-const retUrl : string | null = getRetUrlParam();
+const retUrl: string | null = getRetUrlParam();

 // 登录逻辑
 const login = () => {
  // 验证输入
  if (!username.value.trim()) {
-    alert('请输入用户名')
-    return
+    alert('请输入用户名');
+    return;
  }

  if (!password.value.trim()) {
-    alert('请输入密码')
-    return
+    alert('请输入密码');
+    return;
  }

  // 模拟登录请求
-  console.log('正在登录...', { username: username.value, password: password.value })
+  console.log('正在登录...', {
+    username: username.value,
+    password: password.value,
+  });

  setTimeout(() => {
-    alert('登录成功！')
+    alert('登录成功！');

    // 存储用户名
    if (rememberMe.value) {
-      localStorage.setItem('rememberedUser', username.value)
+      localStorage.setItem('rememberedUser', username.value);
    } else {
-      localStorage.removeItem('rememberedUser')
+      localStorage.removeItem('rememberedUser');
    }

    // 跳转页面
-    router.push('/navigation')
-  }, 800)
-}
+    router.push('/navigation');
+  }, 800);
+};
 const handleAccountLogin = async () => {
  try {
    // const requestParam: any = omit(values, ['code']);
    // 登录
    await authStore.authLogin({
-      grantType: "password",
+      grantType: 'password',
      password: password.value,
-      tenantId: "000000",
+      tenantId: '000000',
      username: username.value,
      retUrl: retUrl,
    });
  } catch (error) {
    console.error(error);
  }
-}
+};
 </script>

 <template>
@@ -122,22 +126,30 @@ const handleAccountLogin = async () => {
            <h3>用户登录</h3>
            <!-- 用户名输入 -->
            <div class="input-group">
-              <img src="../../../../../apps/web-antd/src/assets/my.png" alt="User Icon" class="input-icon">
+              <img
+                src="../../../../../apps/web-antd/src/assets/my.png"
+                alt="User Icon"
+                class="input-icon"
+              />
              <input
-                  type="text"
-                  placeholder="请输入您的用户名"
-                  v-model="username"
+                type="text"
+                placeholder="请输入您的用户名"
+                v-model="username"
              />
            </div>

            <!-- 密码输入 -->
            <div class="input-group">
-              <img src="../../../../../apps/web-antd/src/assets/mima.png" alt="Password Icon" class="input-icon">
+              <img
+                src="../../../../../apps/web-antd/src/assets/mima.png"
+                alt="Password Icon"
+                class="input-icon"
+              />
              <input
-                  type="password"
-                  placeholder="请输入您的密码"
-                  v-model="password"
-                  @keyup.enter="handleAccountLogin"
+                type="password"
+                placeholder="请输入您的密码"
+                v-model="password"
+                @keyup.enter="handleAccountLogin"
              />
            </div>

@@ -158,13 +170,13 @@ const handleAccountLogin = async () => {
    class="flex min-h-full flex-1 select-none overflow-x-hidden"
    style="display: none;"
  > -->
-    <!--<template v-if="toolbar">
+  <!--<template v-if="toolbar">
      <slot name="toolbar">
        <Toolbar :toolbar-list="toolbarList" />
      </slot>
    </template>-->
-    <!-- 左侧认证面板 -->
-    <!--<AuthenticationFormView
+  <!-- 左侧认证面板 -->
+  <!--<AuthenticationFormView
      v-if="authPanelLeft"
      class="min-h-full w-2/5 flex-1"
      transition-name="slide-left"
@@ -179,8 +191,8 @@ const handleAccountLogin = async () => {
      </template>
    </AuthenticationFormView>-->

-    <!-- 头部 Logo 和应用名称 -->
-    <!--<div
+  <!-- 头部 Logo 和应用名称 -->
+  <!--<div
      v-if="logo || appName"
      class="absolute left-0 top-0 z-10 flex flex-1"
      @click="clickLogo"
@@ -195,8 +207,8 @@ const handleAccountLogin = async () => {
      </div>
    </div>-->

-    <!-- 系统介绍 -->
-    <!--<div v-if="!authPanelCenter" class="relative hidden w-0 flex-1 lg:block">
+  <!-- 系统介绍 -->
+  <!--<div v-if="!authPanelCenter" class="relative hidden w-0 flex-1 lg:block">
      <div
        class="bg-background-deep absolute inset-0 h-full w-full dark:bg-[#070709]"
      >
@@ -220,8 +232,8 @@ const handleAccountLogin = async () => {
      </div>
    </div>-->

-    <!-- 中心认证面板 -->
-    <!--<div v-if="authPanelCenter" class="flex-center relative w-full">
+  <!-- 中心认证面板 -->
+  <!--<div v-if="authPanelCenter" class="flex-center relative w-full">
      <div class="login-background absolute left-0 top-0 size-full"></div>
      <AuthenticationFormView
        class="md:bg-background shadow-primary/5 shadow-float w-full rounded-3xl pb-20 md:w-2/3 lg:w-1/2 xl:w-[36%]"
@@ -237,8 +249,8 @@ const handleAccountLogin = async () => {
      </AuthenticationFormView>
    </div>-->

-    <!-- 右侧认证面板 -->
-    <!--<AuthenticationFormView
+  <!-- 右侧认证面板 -->
+  <!--<AuthenticationFormView
      v-if="authPanelRight"
      class="min-h-full w-[34%] flex-1"
    >
@@ -280,7 +292,8 @@ const handleAccountLogin = async () => {
 <style scoped>
@font-face {
  font-family: 'BaiduVariety';
-  src: url('../../../../../apps/web-antd/src/assets/fonts/百度综艺简体.ttf') format('truetype');
+  src: url('../../../../../apps/web-antd/src/assets/fonts/百度综艺简体.ttf')
+    format('truetype');
  font-weight: normal;
  font-style: normal;
 }
@@ -293,36 +306,38 @@ const handleAccountLogin = async () => {
  justify-content: center;
  align-items: center;
  background:
-  /* url('../../../../../apps/web-antd/src/assets/juxing.png') no-repeat center center fixed, */
-  url('../../../../../apps/web-antd/src/assets/222.png') no-repeat center center fixed;
-  background-size: 100% 100%, 100% 100%;
+  /* url('../../../../../apps/web-antd/src/assets/juxing.png') no-repeat center center fixed, */ url('../../../../../apps/web-antd/src/assets/222.png')
+    no-repeat center center fixed;
+  background-size:
+    100% 100%,
+    100% 100%;
  /* background-repeat: no-repeat, no-repeat;
  background-position: center center, center center; */
  color: #fff;
 }
-.login-wapter{
+.login-wapter {
  position: relative;
  top: -115px; /* 负值越大，越往上 */
  .login-wapter1 {
-  font-size: 44px;
-  margin-bottom: 20px;
-  display: flex;
-  justify-content: center;
-}
-.login-wapter2 {
-  font-size: 60px;
-  /* margin-bottom: 38px; */
-  background: linear-gradient(to bottom, #ffffff, #cbeaff);
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  background-clip: text;
-  color: transparent;
-  font-weight: bold;
-  display: flex;
-  justify-content: center;
-  font-family: 'BaiduVariety',sans-serif;
-  letter-spacing: 6px;
-}
+    font-size: 44px;
+    margin-bottom: 20px;
+    display: flex;
+    justify-content: center;
+  }
+  .login-wapter2 {
+    font-size: 60px;
+    /* margin-bottom: 38px; */
+    background: linear-gradient(to bottom, #ffffff, #cbeaff);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    color: transparent;
+    font-weight: bold;
+    display: flex;
+    justify-content: center;
+    font-family: 'BaiduVariety', sans-serif;
+    letter-spacing: 6px;
+  }
 }
 .login-bg_1 {
  flex-direction: column;
@@ -335,7 +350,8 @@ const handleAccountLogin = async () => {
  width: 100%;
  height: 100%;
  text-align: center;
-  background: url('../../../../../apps/web-antd/src/assets/from.png') no-repeat center center fixed;
+  background: url('../../../../../apps/web-antd/src/assets/from.png') no-repeat
+    center center fixed;
 }
 .login-form {
  border-radius: 10px;
@@ -380,8 +396,8 @@ input:-webkit-autofill {
  margin-top: 20px;
  border: none;
  border-radius: 5px;
-  background-color: #19DCF8;
-  color: #0254A5;
+  background-color: #19dcf8;
+  color: #0254a5;
  cursor: pointer;
  font-size: 22px;
  margin-top: 70px;
@@ -401,8 +417,6 @@ input:-webkit-autofill {
  color: #eee;
 }

-
-
 /* 新增 .input-group 样式 */
 .input-group {
  display: flex;
@@ -433,7 +447,7 @@ input:-webkit-autofill {
 .login-form input::placeholder {
  color: rgba(255, 255, 255, 0.42); /* 例如灰色 */
 }
-.login-footer{
+.login-footer {
  position: fixed;
  bottom: 0;
  left: 0;
--- a/packages/effects/layouts/src/basic/header/header.vue
+++ b/packages/effects/layouts/src/basic/header/header.vue
@@ -11,7 +11,7 @@ import {
  LanguageToggle,
  PreferencesButton,
  ThemeToggle,
-  BackNavigation,
+  // BackNavigation,
 } from '../../widgets';

 interface Props {
@@ -44,8 +44,7 @@ const rightSlots = computed(() => {
    list.push({
      index: REFERENCE_VALUE,
      name: 'global-search',
-    }
-    );
+    });
  }

  if (preferencesButtonPosition.value.header) {
@@ -172,9 +171,9 @@ function clearPreferencesAndLogout() {
        <template v-else-if="slot.name === 'fullscreen'">
          <VbenFullScreen class="mr-1" />
        </template>
-        <template v-else-if="slot.name === 'back-navigation'">
+        <!-- <template v-else-if="slot.name === 'back-navigation'">
          <BackNavigation class="mr-1" />
-        </template>
+        </template> -->
      </slot>
    </template>
  </div>