Merge branch 'main' into ft-dev

@@ -5,4 +5,4 @@ VITE_PORT = 8083
 VITE_GLOB_APP_TITLE = Yunteng IOT
 
 # spa shortname
-VITE_GLOB_APP_SHORT_NAME = Yunteng IOT
+# VITE_GLOB_APP_SHORT_NAME = Yunteng IOT

@@ -45,7 +45,6 @@
     "cropperjs": "^1.5.12",
     "crypto-js": "^4.1.1",
     "echarts": "^5.1.2",
-    "emit": "^0.0.2",
     "intro.js": "^4.1.0",
     "jwt-decode": "^3.1.2",
     "lodash-es": "^4.17.21",

+import { defHttp } from '/@/utils/http/axios';
+
+export const getDeviceProfile = () => {
+  return defHttp.get({
+    url: '/deviceProfile/me',
+  });
+};

@@ -90,3 +90,8 @@ export const updateAppDesign = (data) => {
     data,
   });
 };
+
+// 二维码上传
+export const qrcodeUpload = (file) => {
+  return defHttp.post<FileUploadResponse>({ url: API.BaseUploadUrl, params: file });
+};

@@ -2,12 +2,18 @@
  * @Author: Vben
  * @Description: logo component
 -->
+
 <template>
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
-    <img src="../../../assets/images/logo.png" />
-    <div class="ml-2 md:opacity-100" :class="getTitleClass" v-show="showTitle">
-      {{ title }}
-    </div>
+    <img :src="getLogo" />
+    <span
+      class="ml-2 md:opacity-100"
+      :class="getTitleClass"
+      v-show="showTitle"
+      style="white-space: nowrap"
+    >
+      {{ getTitle }}
+    </span>
   </div>
 </template>
 <script lang="ts" setup>
@@ -18,7 +24,6 @@
   import { useDesign } from '/@/hooks/web/useDesign';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useUserStore } from '/@/store/modules/user';
-
   const props = defineProps({
     /**
      * The theme of the current parent component
@@ -45,7 +50,6 @@
     props.theme,
     { 'collapsed-show-title': unref(getCollapsedShowTitle) },
   ]);
-
   const getTitleClass = computed(() => [
     `${prefixCls}__title`,
     {
@@ -56,10 +60,22 @@
   function goHome() {
     go(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
   }
+  const getLogo = computed(() => {
+    return userStore.platInfo?.logo ?? '/src/assets/images/logo.png';
+  });
+  const getTitle = computed(() => {
+    // 设置icon
+    let link = (document.querySelector("link[rel*='icon']") ||
+      document.createElement('link')) as HTMLLinkElement;
+    link.type = 'image/x-icon';
+    link.rel = 'shortcut icon';
+    link.href = userStore.platInfo?.icon ?? '/public/favicon.ico';
+    document.getElementsByTagName('head')[0].appendChild(link);
+    return userStore.platInfo?.name ?? title;
+  });
 </script>
 <style lang="less" scoped>
   @prefix-cls: ~'@{namespace}-app-logo';
-
   .@{prefix-cls} {
     display: flex;
     align-items: center;

@@ -29,6 +29,7 @@ export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY__';
 // base global session key
 export const APP_SESSION_CACHE_KEY = 'COMMON__SESSION__KEY__';
 
+export const PLATFORM = 'PLATFORM';
 export enum CacheTypeEnum {
   SESSION,
   LOCAL,

 export enum RoleEnum {
-  ROLE_SYS_ADMIN = 'ROLE_SYS_ADMIN',
-  ROLE_TENANT_ADMIN = 'ROLE_TENANT_ADMIN',
-  ROLE_NORMAL_USER = 'ROLE_NORMAL_USER',
-  ROLE_PLATFORM_ADMIN = 'ROLE_PLATFORM_ADMIN',
+  ROLE_SYS_ADMIN = 'SYS_ADMIN',
+  ROLE_TENANT_ADMIN = 'TENANT_ADMIN',
+  ROLE_NORMAL_USER = 'CUSTOMER_USER',
+  ROLE_PLATFORM_ADMIN = 'PLATFORM_ADMIN',
 }

@@ -25,8 +25,10 @@ import { router } from '/@/router';
 import { usePermissionStore } from '/@/store/modules/permission';
 import { RouteRecordRaw } from 'vue-router';
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
-
+import { createLocalStorage } from '/@/utils/cache/index';
 interface UserState {
+  platInfo: any;
+  enterPriseInfo: any;
   userInfo: Nullable<UserInfo>;
   token?: string;
   roleList: RoleEnum[];
@@ -36,9 +38,13 @@ interface UserState {
   refreshToken?: string;
 }
 
+const storage = createLocalStorage();
 export const useUserStore = defineStore({
   id: 'app-user',
   state: (): UserState => ({
+    //平台信息
+    platInfo: storage.get('platInfo') || null,
+    enterPriseInfo: storage.get('enterPriseInfo') || null,
     // user info
     userInfo: null,
     // token
@@ -52,7 +58,11 @@ export const useUserStore = defineStore({
     // Last fetch time
     lastUpdateTime: 0,
   }),
+
   getters: {
+    getPlatInfo(): any {
+      return this.platInfo;
+    },
     getUserInfo(): UserInfo {
       return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {};
     },
@@ -73,6 +83,12 @@ export const useUserStore = defineStore({
     },
   },
   actions: {
+    setPlatInfo(platInfo: any) {
+      this.platInfo = platInfo;
+    },
+    setEnterPriseInfo(enterPriseInfo: any) {
+      this.enterPriseInfo = enterPriseInfo;
+    },
     storeToken(jwtToken: string, refreshToken: string) {
       this.jwtToken = jwtToken;
       this.refreshToken = refreshToken;

@@ -5,6 +5,7 @@ import type { RouteLocationNormalized } from 'vue-router';
 import { createLocalStorage, createSessionStorage } from '/@/utils/cache';
 import { Memory } from './memory';
 import {
+  PLATFORM,
   TOKEN_KEY,
   JWT_TOKEN_KEY,
   REFRESH_TOKEN_KEY,
@@ -21,6 +22,7 @@ import { toRaw } from 'vue';
 import { pick, omit } from 'lodash-es';
 
 interface BasicStore {
+  [PLATFORM]: Object;
   [TOKEN_KEY]: string | number | null | undefined;
   [JWT_TOKEN_KEY]: string | number | null | undefined;
   [REFRESH_TOKEN_KEY]: string | number | null | undefined;

-import { BasicColumn } from '/@/components/Table';
-
-import { FormSchema } from '/@/components/Table';
+import type { BasicColumn } from '/@/components/Table';
+import type { FormSchema } from '/@/components/Table';
+import { getOrganizationList } from '/@/api/system/system';
+import { copyTransFun } from '/@/utils/fnUtils';
+import { getDeviceProfile } from '/@/api/alarm/position';
 export const formSchema: FormSchema[] = [
   {
-    field: 'organization',
+    field: 'organizationId',
     label: '',
-    component: 'TreeSelect',
+    component: 'ApiTreeSelect',
     componentProps: {
-      placeholder: '请选择组织',
+      api: async () => {
+        const data = await getOrganizationList();
+        copyTransFun(data as any as any[]);
+        return data;
+      },
     },
   },
   {
-    field: 'organization',
+    field: 'profileId',
     label: '',
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
+      api: getDeviceProfile,
       placeholder: '请选择设备配置',
+      labelField: 'name',
+      valueField: 'id',
     },
   },
   {
-    field: 'device',
+    field: 'name',
     label: '',
     component: 'Input',
     componentProps: {
@@ -27,19 +36,28 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'status',
+    field: 'deviceState',
     label: '',
     component: 'RadioGroup',
     componentProps: {
       size: 'small',
       options: [
-        { label: '全部', value: 'Apple' },
-        { label: '离线', value: 'Pear' },
-        { label: '在线', value: 'Orange' },
+        { label: '待激活', value: 'INACTIVE' },
+        { label: '在线', value: 'ONLINE' },
+        { label: '离线', value: 'OFFLINE' },
         { label: '报警', value: 'hhh' },
       ],
     },
   },
+  {
+    field: 'alarmStatus',
+    label: '',
+    component: 'RadioGroup',
+    componentProps: {
+      size: 'small',
+      options: [{ label: '是否报警', value: '' }],
+    },
+  },
 ];
 
 export const columns: BasicColumn[] = [
@@ -57,5 +75,6 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'deviceState',
     width: 100,
+    slots: { customRender: 'deviceState' },
   },
 ];

@@ -2,7 +2,28 @@
   <div class="wrapper">
     <div ref="wrapRef" :style="{ height, width }"> </div>
     <div class="right-wrap">
-      <BasicTable @register="registerTable" />
+      <BasicTable @register="registerTable">
+        <template #deviceState="{ record }">
+          <Tag
+            :color="
+              record.deviceState == DeviceState.INACTIVE
+                ? 'warning'
+                : record.deviceState == DeviceState.ONLINE
+                ? 'success'
+                : 'error'
+            "
+            class="ml-2"
+          >
+            {{
+              record.deviceState == DeviceState.INACTIVE
+                ? '待激活'
+                : record.deviceState == DeviceState.ONLINE
+                ? '在线'
+                : '离线'
+            }}
+          </Tag>
+        </template></BasicTable
+      >
     </div>
   </div>
 </template>
@@ -12,11 +33,13 @@
   import { formSchema, columns } from './config.data';
   import { BasicTable, useTable } from '/@/components/Table';
   import { devicePage } from '/@/api/alarm/contact/alarmContact';
-
+  import { Tag } from 'ant-design-vue';
+  import { DeviceState } from '/@/api/device/model/deviceModel';
   export default defineComponent({
     name: 'BaiduMap',
     components: {
       BasicTable,
+      Tag,
     },
     props: {
       width: {
@@ -55,8 +78,6 @@
         formConfig: {
           labelWidth: 120,
           schemas: formSchema,
-          showAdvancedButton: false,
-          showActionButtonGroup: false,
         },
         showIndexColumn: false,
         useSearchForm: true,
@@ -68,6 +89,7 @@
         wrapRef,
         registerTable,
         handleSuccess,
+        DeviceState,
       };
     },
   });
@@ -83,12 +105,10 @@
   .right-wrap {
     padding-top: 10px;
     width: 22%;
-    height: 80%;
+    height: 95%;
     position: absolute;
     right: 5%;
-    top: 10%;
-  }
-  .scroll-wrap {
-    height: 450px;
+    top: 3%;
+    background-color: #fff;
   }
 </style>

@@ -132,10 +132,6 @@ export const formSchema: FormSchema[] = [
     field: 'id',
     label: '',
     component: 'Input',
-    componentProps: {
-      style: {
-        display: 'none',
-      },
-    },
+    show: false,
   },
 ];

 <template>
-  <div class="p-4 md:flex">
-    <div class="md:w-7/10 w-full !mr-4 enter-y">
-      <GrowCard :loading="loading" class="enter-y" />
-      <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
-      <div class="md:flex enter-y">
-        <Card title="核心流程指南" style="width: 100%">
-          <img alt="核心流程指南" src="../../../assets/images/flow.png" />
+  <PageWrapper>
+    <template #headerContent> <WorkbenchHeader /> </template>
+    <div class="lg:flex">
+      <div class="lg:w-7/10 w-full !mr-4 enter-y">
+        <ProjectCard :loading="loading" class="enter-y" />
+        <DynamicInfo :loading="loading" class="!my-4 enter-y" />
+      </div>
+      <div class="lg:w-3/10 w-full enter-y">
+        <QuickNav :loading="loading" class="enter-y" />
+
+        <Card class="!my-4 enter-y" :loading="loading">
+          <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />
         </Card>
+
+        <SaleRadar :loading="loading" class="enter-y" />
       </div>
     </div>
-    <div class="md:w-3/10 w-full enter-y">
-      <HelpDoc />
-    </div>
-  </div>
+    <BasicModal
+      @register="register"
+      v-bind="$attrs"
+      :mask="true"
+      :showCancelBtn="false"
+      :showOkBtn="false"
+      :canFullscreen="false"
+      :closable="false"
+      :maskStyle="maskColor"
+      :height="600"
+      :width="1500"
+      :maskClosable="false"
+      title="请修改密码"
+      :helpMessage="['请您修改密码']"
+    >
+      <PasswordDialog />
+    </BasicModal>
+  </PageWrapper>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
-  import GrowCard from './components/GrowCard.vue';
-  import SiteAnalysis from './components/SiteAnalysis.vue';
+  import PasswordDialog from '/@/views/system/password/index.vue';
+  import { BasicModal, useModal } from '/@/components/Modal';
+  import { getAuthCache } from '/@/utils/auth';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { ref, onMounted } from 'vue';
   import { Card } from 'ant-design-vue';
-  import HelpDoc from './components/HelpDoc.vue';
-  const loading = ref(true);
+  import { PageWrapper } from '/@/components/Page';
+  import WorkbenchHeader from './components/WorkbenchHeader.vue';
+  import ProjectCard from './components/ProjectCard.vue';
+  import QuickNav from './components/QuickNav.vue';
+  import DynamicInfo from './components/DynamicInfo.vue';
+  import SaleRadar from './components/SaleRadar.vue';
+
+  const maskColor = ref({ backgroundColor: 'grey' });
+  const statusModel = ref(false);
+  const [register, { openModal }] = useModal();
+  onMounted(() => {
+    const userInfo: object = getAuthCache(USER_INFO_KEY);
+    if (userInfo.needSetPwd == true) {
+      statusModel.value = true;
+      openModal(statusModel.value);
+    } else if (userInfo.needSetPwd == false) {
+      openModal(statusModel.value);
+    }
+  });
+  //Yunteng123456!!!
+  //Password123456!
+  //System123456!
+  //Testrole123456!
+  const loading = ref(false);
   setTimeout(() => {
     loading.value = false;
   }, 1500);

@@ -34,13 +34,13 @@
     </Card>
     <Card hoverable title="联系我们" :bordered="false">
       <template #cover>
-        <QrCode :value="qrCodeUrl" class="flex justify-center" />
+        <img :src="getQrCode" alt="" style="width: 150px; height: 150px; margin: 50px auto" />
       </template>
       <CardMeta>
         <template #description>
-          <p>联系人: 张三</p>
-          <p>联系电话: 15912341234</p>
-          <p>联系地址: 四川省成都市剑南大道北段中1533号 </p>
+          <p>联系人: {{ getContacts }}</p>
+          <p>联系电话: {{ getTel }}</p>
+          <p>联系地址: {{ getAddress }} </p>
         </template>
       </CardMeta>
     </Card>
@@ -48,9 +48,10 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, ref, computed, onMounted } from 'vue';
   import { Card, AnchorLink, List, ListItem, ListItemMeta, Avatar, CardMeta } from 'ant-design-vue';
-  import { QrCode } from '/@/components/Qrcode/index';
+  import { useUserStore } from '/@/store/modules/user';
+  import { getEnterPriseDetail } from '/@/api/oem';
   export default defineComponent({
     components: {
       Card,
@@ -60,9 +61,12 @@
       ListItemMeta,
       Avatar,
       CardMeta,
-      QrCode,
     },
     setup() {
+      onMounted(async () => {
+        const res = await getEnterPriseDetail();
+        userStore.setEnterPriseInfo(res);
+      });
       const helpDoc = ref([
         {
           title: '如何接入设备?',
@@ -137,7 +141,19 @@
         },
       ];
 
-      const qrCodeUrl = 'https://www.vvbin.cn';
+      const userStore = useUserStore();
+      const getContacts = computed(() => {
+        return userStore.enterPriseInfo?.contacts;
+      });
+      const getAddress = computed(() => {
+        return userStore.enterPriseInfo?.address;
+      });
+      const getTel = computed(() => {
+        return userStore.enterPriseInfo?.tel;
+      });
+      const getQrCode = computed(() => {
+        return userStore.enterPriseInfo?.qrCode;
+      });
 
       return {
         activeKey,
@@ -145,7 +161,10 @@
         onTabChange,
         data,
         helpDoc,
-        qrCodeUrl,
+        getQrCode,
+        getContacts,
+        getAddress,
+        getTel,
       };
     },
   });

 <template>
-  <PageWrapper>
-    <template #headerContent> <WorkbenchHeader /> </template>
-    <div class="lg:flex">
-      <div class="lg:w-7/10 w-full !mr-4 enter-y">
-        <ProjectCard :loading="loading" class="enter-y" />
-        <DynamicInfo :loading="loading" class="!my-4 enter-y" />
-      </div>
-      <div class="lg:w-3/10 w-full enter-y">
-        <QuickNav :loading="loading" class="enter-y" />
-
-        <Card class="!my-4 enter-y" :loading="loading">
-          <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />
+  <div class="p-4 md:flex">
+    <div class="md:w-7/10 w-full !mr-4 enter-y">
+      <GrowCard :loading="loading" class="enter-y" />
+      <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
+      <div class="md:flex enter-y">
+        <Card title="核心流程指南" style="width: 100%">
+          <img alt="核心流程指南" src="../../../assets/images/flow.png" />
         </Card>
-
-        <SaleRadar :loading="loading" class="enter-y" />
       </div>
     </div>
-    <BasicModal
-      @register="register"
-      v-bind="$attrs"
-      :mask="true"
-      :showCancelBtn="false"
-      :showOkBtn="false"
-      :canFullscreen="false"
-      :closable="false"
-      :maskStyle="maskColor"
-      :height="600"
-      :width="1500"
-      :maskClosable="false"
-      title="请修改密码"
-      :helpMessage="['请您修改密码']"
-    >
-      <PasswordDialog />
-    </BasicModal>
-  </PageWrapper>
+    <div class="md:w-3/10 w-full enter-y">
+      <HelpDoc />
+    </div>
+  </div>
 </template>
 <script lang="ts" setup>
-  import PasswordDialog from '/@/views/system/password/index.vue';
-  import { BasicModal, useModal } from '/@/components/Modal';
-  import { getAuthCache } from '/@/utils/auth';
-  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
-  import { ref, onMounted } from 'vue';
+  import { ref } from 'vue';
+  import GrowCard from './components/GrowCard.vue';
+  import SiteAnalysis from './components/SiteAnalysis.vue';
   import { Card } from 'ant-design-vue';
-  import { PageWrapper } from '/@/components/Page';
-  import WorkbenchHeader from './components/WorkbenchHeader.vue';
-  import ProjectCard from './components/ProjectCard.vue';
-  import QuickNav from './components/QuickNav.vue';
-  import DynamicInfo from './components/DynamicInfo.vue';
-  import SaleRadar from './components/SaleRadar.vue';
-
-  const maskColor = ref({ backgroundColor: 'grey' });
-  const statusModel = ref(false);
-  const [register, { openModal }] = useModal();
-  onMounted(() => {
-    const userInfo: object = getAuthCache(USER_INFO_KEY);
-    if (userInfo.needSetPwd == true) {
-      statusModel.value = true;
-      openModal(statusModel.value);
-    } else if (userInfo.needSetPwd == false) {
-      openModal(statusModel.value);
-    }
-  });
-  //Yunteng123456!!!
-  //Password123456!
-  //System123456!
-  //Testrole123456!
-  const loading = ref(false);
+  import HelpDoc from './components/HelpDoc.vue';
+  const loading = ref(true);
   setTimeout(() => {
     loading.value = false;
   }, 1500);

@@ -51,7 +51,7 @@
     props: {
       userData: { type: Object },
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const DeviceStep1Ref = ref<InstanceType<typeof DeviceStep1>>();
       const DeviceStep2Ref = ref<InstanceType<typeof DeviceStep2>>();

@@ -140,7 +140,7 @@
   }
 
   function goLogin() {
-    userStore.logout(true);
+    userStore.logout();
     lockStore.resetLockInfo();
   }
 

 <template>
-  <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/images/iot.png" class="w-4/5 -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 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 class="login-page">
+    <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"
+      />
+      <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"
+        @click="toggleDark"
+      />
+    </div>
+    <div class="login-container" :class="{ light1: isDark, dark: !isDark }">
+      <div class="login-description">
+        <h1>物联网平台</h1>
+        <h2>输入您的个人详细信息开始使用！</h2>
+      </div>
+      <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
+          "
+          :style="{ backgroundColor: isDark ? '#fff' : '#1a2030' }"
+        >
+          <LoginForm />
+          <ForgetPasswordForm />
+          <RegisterForm />
+          <MobileForm />
+          <QrCodeForm />
         </div>
       </div>
+      <div style="position: absolute; bottom: 20px; left: 45%">{{ getCopyRight }}</div>
     </div>
   </div>
 </template>
 <script lang="ts" setup>
-  import { computed } from 'vue';
+  import { computed, ref } from 'vue';
   import { AppLogo } from '/@/components/Application';
   import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
   import LoginForm from './LoginForm.vue';
@@ -70,6 +67,7 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLocaleStore } from '/@/store/modules/locale';
+  import { useUserStore } from '/@/store/modules/user';
 
   defineProps({
     sessionTimeout: {
@@ -83,145 +81,69 @@
   const localeStore = useLocaleStore();
   const showLocale = localeStore.getShowPicker;
   const title = computed(() => globSetting?.title ?? '');
+  const isDark = ref(true);
+  const toggleDark = () => {
+    isDark.value = !isDark.value;
+  };
+  const userStore = useUserStore();
+  const getCopyRight = computed(() => {
+    return (userStore.platInfo?.copyright ?? '') + (userStore.platInfo?.presentedOurselves ?? '');
+  });
 </script>
 <style lang="less">
   @prefix-cls: ~'@{namespace}-login';
   @logo-prefix-cls: ~'@{namespace}-app-logo';
   @countdown-prefix-cls: ~'@{namespace}-countdown-input';
   @dark-bg: #293146;
-
-  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;
-    }
+  .light1 {
+    background-image: url('/src/assets/images/bg.png');
   }
-
-  .@{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;
+  .dark {
+    background-image: url('/src/assets/images/bg-dark.png');
+  }
+  .login-page {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    .login-header {
+      height: 60px;
       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;
+      background-color: #1d3794;
+      .vben-dark-switch {
+        margin-left: 1840px;
       }
     }
 
-    .@{logo-prefix-cls} {
-      position: absolute;
-      top: 12px;
-      height: 30px;
-
-      &__title {
-        font-size: 16px;
-        color: #fff;
-      }
+    .login-container {
+      position: relative;
+      left: -6px;
+      right: 20px;
+      width: 101vw;
+      height: calc(100% - 60px);
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+      .vben-login-form {
+        position: absolute;
 
-      img {
-        width: 32px;
+        width: 410px;
+        right: 200px;
+        top: 50%;
+        margin-top: -180px;
       }
-    }
-
-    .container {
-      .@{logo-prefix-cls} {
-        display: flex;
-        width: 60%;
-        height: 80px;
-
-        &__title {
-          font-size: 24px;
-          color: #fff;
+      .login-description {
+        position: absolute;
+        right: 13%;
+        top: 15%;
+        h1 {
+          font-size: 26px;
+          color: #5aeeed;
+          text-align: center;
         }
-
-        img {
-          width: 48px;
+        h2 {
+          font-size: 20px;
+          color: #5aeeed;
         }
       }
     }
-
-    &-sign-in-way {
-      .anticon {
-        font-size: 22px;
-        color: #888;
-        cursor: pointer;
-
-        &:hover {
-          color: @primary-color;
-        }
-      }
-    }
-
-    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>

@@ -44,7 +44,7 @@
     </ARow>
     <ARow class="enter-x">
       <ACol :span="12">
-        <FormItem> </FormItem>
+        <FormItem />
       </ACol>
       <ACol :span="12">
         <FormItem :style="{ 'text-align': 'right' }">
@@ -60,7 +60,7 @@
 <script lang="ts" setup>
   import { reactive, ref, toRaw, unref, computed } from 'vue';
 
-  import { Checkbox, Form, Input, Row, Col, Button, Divider } from 'ant-design-vue';
+  import { Form, Input, Row, Col, Button } from 'ant-design-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
 
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -69,7 +69,8 @@
   import { useUserStore } from '/@/store/modules/user';
   import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
   import { useDesign } from '/@/hooks/web/useDesign';
-  //import { onKeyStroke } from '@vueuse/core';
+  import { getPlatForm } from '/@/api/oem/index';
+  import { createLocalStorage } from '/@/utils/cache/index';
 
   const ACol = Col;
   const ARow = Row;
@@ -78,14 +79,12 @@
   const { t } = useI18n();
   const { notification, createErrorModal } = useMessage();
   const { prefixCls } = useDesign('login');
-  const userStore = useUserStore();
 
   const { setLoginState, getLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
-
+  const userStore = useUserStore();
   const formRef = ref();
   const loading = ref(false);
-  const rememberMe = ref(false);
 
   const formData = reactive({
     account: 'sysadmin',
@@ -116,8 +115,11 @@
           description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realName}`,
           duration: 3,
         });
+        const res = await getPlatForm();
+        const storage = createLocalStorage();
+        storage.set('platformInfo', res);
       }
-    } catch (error) {
+    } catch (error: any) {
       createErrorModal({
         title: t('sys.api.loginFailed'),
         content:
@@ -131,5 +133,15 @@
     } finally {
       loading.value = false;
     }
+
+    const res = await getPlatForm();
+    userStore.setPlatInfo(res);
+    // 设置icon
+    let link = (document.querySelector("link[rel*='icon']") ||
+      document.createElement('link')) as HTMLLinkElement;
+    link.type = 'image/x-icon';
+    link.rel = 'shortcut icon';
+    link.href = res.icon ?? '/public/favicon.ico';
+    document.getElementsByTagName('head')[0].appendChild(link);
   }
 </script>

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

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

@@ -52,7 +52,7 @@
   import MenuDrawer from './MenuDrawer.vue';
 
   // 导入列 属性，和搜索栏内容
-  import { columns, searchFormSchema } from './menu.data';
+  import { columns } from './menu.data';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { notification } from 'ant-design-vue';
 
@@ -65,7 +65,6 @@
       const { t } = useI18n(); //加载国际化
       // 新增菜单
       const getI18nCreateMenu = computed(() => t('routes.common.system.pageSystemTitleCreateMenu'));
-      console.log(111);
       const [registerTable, { reload, expandAll }] = useTable({
         title: t('routes.common.system.pageSystemTitleMenuList'), //'菜单列表'
         api: getMenuList, //加载数据

@@ -98,10 +98,11 @@
       const { createMessage } = useMessage();
       const [tenantAdminFormDrawer, { openDrawer: openTenantAdminFormDrawer }] = useDrawer();
 
+      const tenantId = ref('');
       function handleCreateTenantAdmin() {
         openTenantAdminFormDrawer(true, {
           isUpdate: false,
-          tenantCode: tenantCode,
+          tenantId: tenantId.value,
         });
       }
 
@@ -109,7 +110,7 @@
         openTenantAdminFormDrawer(true, {
           isUpdate: true,
           record,
-          tenantCode: tenantCode,
+          tenantCode: tenantId.value,
         });
       }
 
@@ -160,7 +161,6 @@
           slots: { customRender: 'status' },
         },
       ];
-      const tenantCode = ref('');
       const [tenantAdminTable, { reload }] = useTable({
         api: getTenantAdminPage,
         columns: tenantAdminColumns as BasicColumn[],
@@ -168,7 +168,7 @@
         bordered: true,
         showIndexColumn: false,
         searchInfo: {
-          tenantCode: tenantCode,
+          tenantId: tenantId,
           roleType: RoleEnum.ROLE_TENANT_ADMIN,
         },
         actionColumn: {
@@ -186,8 +186,8 @@
       });
       //默认传递页面数据
       const [tenantAdminDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
-        tenantCode.value = data.record.tenantCode;
-        await reload();
+        tenantId.value = data.record.tenantId;
+        reload();
       });
 
       //提交按钮
@@ -204,7 +204,7 @@
         handleCreateTenantAdmin,
         handleSubmit,
         tenantAdminTable,
-        tenantCode,
+        tenantId,
         tenantAdminFormDrawer,
         handleSuccess,
         handleEdit,

@@ -7,7 +7,7 @@
     width="60%"
     @ok="handleSubmit"
   >
-    <BasicForm @register="tenantAdminForm"> </BasicForm>
+    <BasicForm @register="tenantAdminForm" />
   </BasicDrawer>
 </template>
 <script lang="ts">
@@ -25,7 +25,7 @@
     },
     setup(_, { emit }) {
       const isUpdate = ref(true);
-      const tenantCode = ref('');
+      const tenantId = ref('');
       const formSchema: FormSchema[] = [
         {
           field: 'id',
@@ -81,7 +81,7 @@
         async (data) => {
           await resetFields();
           isUpdate.value = !!data?.isUpdate;
-          tenantCode.value = data?.tenantCode;
+          tenantId.value = data?.tenantId;
           await updateSchema({ field: 'title', componentProps: { disabled: false } });
           if (unref(isUpdate)) {
             await setFieldsValue({
@@ -106,7 +106,7 @@
               typeof values.tenantExpireTime != 'undefined' && values.tenantExpireTime != null
                 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
                 : null,
-            tenantCode: tenantCode.value,
+            tenantId: tenantId.value,
           };
           setDrawerProps({ confirmLoading: true });
           saveTenantAdmin(requestParams as any as UserDTO).then(() => {

@@ -35,8 +35,8 @@
             :before-upload="beforeUploadIconPic"
           >
             <div v-if="iconPic">
-              <img :src="iconPic" />
-              <div style="background-color: #ccc">重新上传</div>
+              <img :src="iconPic" class="m-auto" />
+              <div style="background-color: #ccc; margin-top: 20px">重新上传</div>
             </div>
             <div v-else>
               <PlusOutlined style="font-size: 30px" />
@@ -95,6 +95,8 @@
   import type { FileItem } from '/@/components/Upload/src/typing';
   import { logoUpload, iconUpload, bgUpload, getPlatForm, updatePlatForm } from '/@/api/oem/index';
   import { PlusOutlined } from '@ant-design/icons-vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import { createLocalStorage } from '/@/utils/cache/index';
   export default defineComponent({
     components: {
       BasicForm,
@@ -111,6 +113,8 @@
         tip: '拼命加载中...',
       });
       const { createMessage } = useMessage();
+      const userStore = useUserStore();
+      const storage = createLocalStorage();
       const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
         schemas,
         showSubmitButton: false,
@@ -146,7 +150,7 @@
         }
         return isJpgOrPng && isLt2M;
       };
-
+      // Icon上传
       async function customUploadIconPic({ file }) {
         if (beforeUploadIconPic(file)) {
           const formData = new FormData();
@@ -158,9 +162,9 @@
         }
       }
       const beforeUploadIconPic = (file: FileItem) => {
-        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+        const isJpgOrPng = file.type === 'image/x-icon';
         if (!isJpgOrPng) {
-          createMessage.error('只能上传图片文件!');
+          createMessage.error('只能上传.icon图片文件!');
         }
         const isLt2M = (file.size as number) / 1024 < 500;
         if (!isLt2M) {
@@ -196,18 +200,28 @@
         try {
           const fieldValue = getFieldsValue();
           compState.value.loading = true;
-          await updatePlatForm({
+          const newFieldValue = {
             ...fieldValue,
-            background: unref(bgPic),
-            icon: unref(bgPic),
             logo: unref(logoPic),
-          });
+            icon: unref(iconPic),
+            background: unref(bgPic),
+          };
+          await updatePlatForm(newFieldValue);
           compState.value.loading = false;
           createMessage.success('保存信息成功');
+
+          setPlatFormInfo(newFieldValue);
         } catch (e) {
           createMessage.error('保存信息失败');
         }
       };
+      // 设置平台信息
+      function setPlatFormInfo(newFieldValue) {
+        // 保存store
+        userStore.setPlatInfo(newFieldValue);
+        // 保存本地缓存
+        storage.set('platInfo', newFieldValue);
+      }
 
       onMounted(async () => {
         const res = await getPlatForm();

 <template>
   <div class="card">
-    <Card :bordered="false" class="card"> <BasicForm @register="registerForm" /></Card>
+    <Card :bordered="false" class="card">
+      <BasicForm @register="registerForm">
+        <template #qrcode>
+          <Upload
+            name="avatar"
+            list-type="picture-card"
+            class="avatar-uploader"
+            :show-upload-list="false"
+            :customRequest="customUploadqrcodePic"
+            :before-upload="beforeUploadqrcodePic"
+          >
+            <img v-if="qrcodePic" :src="qrcodePic" alt="avatar" />
+            <div v-else>
+              <div style="margin-top: 30px">
+                <PlusOutlined style="font-size: 30px" />
+              </div>
+              <div
+                class="ant-upload-text flex"
+                style="width: 280px; height: 130px; align-items: center"
+              >
+                支持.PNG、.JPG、.SVG格式，建议尺寸为300px × 300px（及以上），大小不超过2M。</div
+              >
+            </div>
+          </Upload>
+        </template></BasicForm
+      ></Card
+    >
     <Loading v-bind="compState" />
     <a-button
       @click="handleUpdateInfo"
@@ -14,17 +40,25 @@
 
 <script lang="ts">
   import { defineComponent, onMounted, ref } from 'vue';
-  import { Card } from 'ant-design-vue';
+  import { Card, Upload } from 'ant-design-vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { schemas } from '../config/enterPriseInfo.config';
   import { getEnterPriseDetail, updateEnterPriseDetail } from '/@/api/oem/index';
   import { Loading } from '/@/components/Loading';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { getTownChild } from '/@/api/oem/index';
+  import { useUserStore } from '/@/store/modules/user';
+  import { createLocalStorage } from '/@/utils/cache';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { FileItem } from '/@/components/Upload/src/typing';
+  import { qrcodeUpload } from '/@/api/oem/index';
   export default defineComponent({
     components: {
       Card,
       BasicForm,
       Loading,
+      Upload,
+      PlusOutlined,
     },
     setup() {
       const compState = ref({
@@ -32,7 +66,7 @@
         loading: false,
         tip: '拼命加载中...',
       });
-      const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
+      const [registerForm, { getFieldsValue, setFieldsValue, updateSchema }] = useForm({
         labelWidth: 80,
         schemas,
         showResetButton: false,
@@ -42,32 +76,204 @@
         },
       });
       const { createMessage } = useMessage();
+
+      const qrcodePic = ref();
+      const customUploadqrcodePic = async ({ file }) => {
+        if (beforeUploadqrcodePic(file)) {
+          const formData = new FormData();
+          formData.append('file', file);
+          const response = await qrcodeUpload(formData);
+          if (response.fileStaticUri) {
+            qrcodePic.value = response.fileStaticUri;
+          }
+        }
+      };
+      const beforeUploadqrcodePic = (file: FileItem) => {
+        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+        if (!isJpgOrPng) {
+          createMessage.error('只能上传图片文件!');
+        }
+        const isLt2M = (file.size as number) / 1024 / 1024 < 2;
+        if (!isLt2M) {
+          createMessage.error('图片大小不能超过2MB!');
+        }
+        return isJpgOrPng && isLt2M;
+      };
+      // 更新
       const handleUpdateInfo = async () => {
         try {
           compState.value.loading = true;
           const fieldsValue = getFieldsValue();
-          await updateEnterPriseDetail({
+          const newFieldValue = {
             ...fieldsValue,
             codeProv: fieldsValue.nameProv,
             codeCity: fieldsValue.nameCity,
             codeCoun: fieldsValue.nameCoun,
             codeTown: fieldsValue.nameTown,
-          });
+            qrCode: qrcodePic.value,
+          };
+          console.log(fieldsValue);
+          console.log(newFieldValue);
+          await updateEnterPriseDetail(newFieldValue);
           compState.value.loading = false;
           createMessage.success('更新信息成功');
+          setEnterPriseInfo(newFieldValue);
         } catch (e) {
           createMessage.error('更新信息失败');
         }
       };
+
+      const userStore = useUserStore();
+      const storage = createLocalStorage();
+
+      // 设置企业信息
+      function setEnterPriseInfo(newFieldValue) {
+        // 保存store
+        userStore.setEnterPriseInfo(newFieldValue);
+        // 保存本地缓存
+        storage.set('enterpriseInfo', newFieldValue);
+      }
+
+      // 地区显示回显和数据联动
+      async function updateCityData(
+        codeProv: string,
+        codeCity: string,
+        codeCoun: string,
+        codeTown: string
+      ) {
+        const nameCity = await getTownChild('codeProv', codeProv);
+        const nameCoun = await getTownChild('codeCity', codeCity);
+        const nameTown = await getTownChild('codeCoun', codeCoun);
+        nameCity.forEach((item) => {
+          item.label = item.nameCity;
+          item.value = item.codeCity;
+        });
+        nameCoun.forEach((item) => {
+          item.label = item.nameCoun;
+          item.value = item.codeCoun;
+        });
+        nameTown.forEach((item) => {
+          item.label = item.nameTown;
+          item.value = item.codeTown;
+        });
+        setFieldsValue({
+          nameProv: codeProv,
+          nameCity: codeCity,
+          nameCoun: codeCoun,
+          nameTown: codeTown,
+        });
+        updateSchema({
+          field: 'nameTown',
+          componentProps: {
+            options: nameTown,
+          },
+        });
+        updateSchema({
+          field: 'nameCoun',
+          componentProps: {
+            options: nameCoun,
+            async onChange(value) {
+              if (value === undefined) {
+                setFieldsValue({
+                  nameTown: undefined,
+                });
+                updateSchema({
+                  field: 'nameTown',
+                  componentProps: {
+                    options: [],
+                  },
+                });
+              }
+              let nameTown = await getTownChild('codeCoun', value);
+              nameTown.forEach((item) => {
+                item.label = item.nameTown;
+                item.value = item.codeTown;
+              });
+              setFieldsValue({
+                nameTown: undefined,
+              });
+              updateSchema({
+                field: 'nameTown',
+                componentProps: {
+                  placeholder: '请选择街道/城镇',
+                  options: nameTown,
+                },
+              });
+            },
+          },
+        });
+        updateSchema({
+          field: 'nameCity',
+          componentProps: ({ formModel }) => {
+            return {
+              options: nameCity,
+              onChange: async (value) => {
+                let nameCoun = await getTownChild('codeCity', value);
+                if (value === undefined) {
+                  formModel.nameCoun = undefined; //  reset city value
+                  formModel.nameTown = undefined;
+                  nameCoun = [];
+                  updateSchema({
+                    field: 'nameTown',
+                    componentProps: {
+                      options: [],
+                    },
+                  });
+                }
+                nameCoun.forEach((item) => {
+                  item.label = item.nameCoun;
+                  item.value = item.codeCoun;
+                });
+                formModel.nameCoun = undefined; //  reset city value
+                formModel.nameTown = undefined;
+                updateSchema({
+                  field: 'nameCoun',
+                  componentProps: {
+                    // 请选择区
+                    options: nameCoun,
+                    async onChange(value) {
+                      let nameTown = await getTownChild('codeCoun', value);
+                      if (value === undefined) {
+                        formModel.nameTown = undefined;
+                        nameTown = [];
+                      }
+                      nameTown.forEach((item) => {
+                        item.label = item.nameTown;
+                        item.value = item.codeTown;
+                      });
+
+                      formModel.nameTown = undefined;
+                      updateSchema({
+                        field: 'nameTown',
+                        componentProps: {
+                          placeholder: '请选择街道/城镇',
+                          options: nameTown,
+                        },
+                      });
+                    },
+                  },
+                });
+              },
+            };
+          },
+        });
+      }
+
       onMounted(async () => {
         const res = await getEnterPriseDetail();
+        updateCityData(res.codeProv, res.codeCity, res.codeCoun, res.codeTown);
         setFieldsValue(res);
+        qrcodePic.value = res.qrCode;
+        console.log(res);
       });
 
       return {
         registerForm,
         compState,
+        qrcodePic,
         handleUpdateInfo,
+        customUploadqrcodePic,
+        beforeUploadqrcodePic,
       };
     },
   });

@@ -51,6 +51,7 @@ export const schemas: FormSchema[] = [
     field: 'synopsis',
     component: 'InputTextArea',
     label: '公司简介',
+
     colProps: {
       span: 24,
     },
@@ -116,6 +117,9 @@ export const schemas: FormSchema[] = [
               },
             });
           }
+          formModel.nameCity = undefined; //  reset city value
+          formModel.nameCoun = undefined;
+          formModel.nameTown = undefined;
           updateSchema({
             field: 'nameCity',
             componentProps: () => {
@@ -146,14 +150,20 @@ export const schemas: FormSchema[] = [
                       // 请选择区
                       options: nameCoun,
                       async onChange(value) {
-                        let nameTown = await getTownChild('codeCoun', value);
+                        const nameTown = await getTownChild('codeCoun', value);
                         nameTown.forEach((item) => {
                           item.label = item.nameTown;
                           item.value = item.codeTown;
                         });
                         if (value === undefined) {
                           formModel.nameTown = undefined;
-                          nameTown = [];
+                          updateSchema({
+                            field: 'nameTown',
+                            componentProps: {
+                              placeholder: '请选择街道/城镇',
+                              options: [],
+                            },
+                          });
                         }
                         updateSchema({
                           field: 'nameTown',
@@ -177,11 +187,10 @@ export const schemas: FormSchema[] = [
     field: 'nameCity',
     component: 'Select',
     label: '',
-
     colProps: {
       span: 5,
       style: {
-        marginLeft: '-80px',
+        marginLeft: '-5rem',
       },
     },
   },
@@ -213,13 +222,6 @@ export const schemas: FormSchema[] = [
       placeholder: '请选择街道/城镇',
     },
   },
-
-  // {
-  //   field: 'nameProv',
-  //   label: '所在城市',
-  //   component: 'Cascader',
-  // },
-
   {
     field: 'address',
     component: 'Input',
@@ -254,4 +256,13 @@ export const schemas: FormSchema[] = [
       placeholder: '请输入联系电话',
     },
   },
+  {
+    field: 'qrcode',
+    label: '二维码',
+    component: 'Input',
+    colProps: {
+      span: 24,
+    },
+    slot: 'qrcode',
+  },
 ];

@@ -23,7 +23,7 @@
   import EnterpriseInfo from './components/EnterpriseInfo.vue';
   import CVIDraw from './components/CVIDraw.vue';
   import AppDraw from './components/AppDraw.vue';
-  const activeKey = ref('APP定制');
+  const activeKey = ref('企业信息');
 </script>
 
 <style lang="less" scoped>