Merge branch 'dev-ft' into 'main'

fix：修改Teambition上的问题、修改平台定制

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

@@ -20,7 +20,7 @@
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">
-  import { ref, nextTick } from 'vue';
+  import { ref, nextTick, onMounted } from 'vue';
   import { BasicTable, useTable, BasicColumn } from '/@/components/Table';
   import { BasicTable, useTable, BasicColumn } from '/@/components/Table';
   import { Switch } from 'ant-design-vue';
   import { Switch } from 'ant-design-vue';
   import { h } from 'vue';
   import { h } from 'vue';
@@ -76,6 +76,13 @@
   const remotePort = ref(0);
   const remotePort = ref(0);
   const address = ref('');
   const address = ref('');
   const enableRemoteDisabled = ref(false);
   const enableRemoteDisabled = ref(false);
+  onMounted(() => {
+    tableData.value.push({
+      enableRemote: '',
+      proxyName: props.deviceDetail.sn,
+      status: '',
+    });
+  });
   const getTableData = async () => {
   const getTableData = async () => {
     const res = await frpGetInfoApi(props.deviceDetail.sn);
     const res = await frpGetInfoApi(props.deviceDetail.sn);
     enableRemote.value = res.enableRemote;
     enableRemote.value = res.enableRemote;

@@ -176,12 +176,12 @@ const scheduleData = ref({
 });
 });
 const handleBlur = (eS, eE) => {
 const handleBlur = (eS, eE) => {
   if (eS > eE) {
   if (eS > eE) {
-    return createMessage.error('开始时间不能大于结束时间')
+    return createMessage.warn('开始时间不能大于结束时间')
   }
   }
 }
 }
 const handleTimeBlur = (eS, eE) => {
 const handleTimeBlur = (eS, eE) => {
   if (eS > eE) {
   if (eS > eE) {
-    return createMessage.error('开始时间不能大于结束时间')
+    return createMessage.warn('开始时间不能大于结束时间')
   }
   }
 }
 }
 const handleOk = () => {
 const handleOk = () => {

@@ -20,7 +20,11 @@
         <div class="hidden min-h-full pl-4 mr-4 xl:flex xl:flex-col xl:w-6/12">
         <div class="hidden min-h-full pl-4 mr-4 xl:flex xl:flex-col xl:w-6/12">
           <!-- <AppLogo class="-enter-x" /> -->
           <!-- <AppLogo class="-enter-x" /> -->
           <div style="display: flex; margin-top: 10px">
           <div style="display: flex; margin-top: 10px">
-            <img v-if="getLogo" :src="getLogo" style="width: 48px; height: 48px" />
+            <img
+              v-if="defaultLogo || getLogo"
+              :src="defaultLogo || getLogo"
+              style="width: 48px; height: 48px"
+            />
             <img style="width: 48px; height: 48px" v-else src="/src/assets/images/logo.png" />
             <img style="width: 48px; height: 48px" v-else src="/src/assets/images/logo.png" />
             <div
             <div
               class="ml-2 truncate md:opacity-100"
               class="ml-2 truncate md:opacity-100"
@@ -32,7 +36,7 @@
                 font-weight: 700;
                 font-weight: 700;
               "
               "
             >
             >
-              {{ getTitle }}
+              {{ defaultTitle || getTitle }}
             </div>
             </div>
           </div>
           </div>
           <div v-if="ifCustom" class="my-auto">
           <div v-if="ifCustom" class="my-auto">
@@ -65,7 +69,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { computed, ref } from 'vue';
+  import { computed, ref, onMounted } from 'vue';
   // import { AppLogo } from '/@/components/Application';
   // import { AppLogo } from '/@/components/Application';
   import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
   import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
   import LoginForm from './LoginForm.vue';
   import LoginForm from './LoginForm.vue';
@@ -77,16 +81,31 @@
   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';
+  import { getPlatForm } from '/@/api/oem/index';
 
 
   defineProps({
   defineProps({
     sessionTimeout: {
     sessionTimeout: {
       type: Boolean,
       type: Boolean,
     },
     },
   });
   });
+  const defaultTitle = ref('');
+  const defaultLogo = ref('');
+  const logoUrl = ref('');
+  onMounted(async () => {
+    const res = await getPlatForm();
+    logoUrl.value = res?.background;
+    defaultTitle.value = res?.name;
+    defaultLogo.value = res?.logo;
+    if (logoUrl.value !== undefined) {
+      ifCustom.value = false;
+    } else {
+      const defaultLogo = 'src/assets/svg/login-bg.svg';
+      logoUrl.value = 'url(' + defaultLogo + ')';
+    }
+  });
 
 
   const userStore = useUserStore();
   const userStore = useUserStore();
 
 
-  const logoUrl = ref('');
   const ifCustom = ref(true);
   const ifCustom = ref(true);
   const getLogo = computed(() => {
   const getLogo = computed(() => {
     return userStore.platInfo?.logo;
     return userStore.platInfo?.logo;