Merge branch 'main' of http://121.37.111.42:3000/ThbTech/gis-bi

core/core-frontend/config/common.ts

@@ -1,9 +1,9 @@
 import path from 'path'
 import { resolve } from 'path'
 import Vue from '@vitejs/plugin-vue'
-import eslintPlugin from 'vite-plugin-eslint'
+// import eslintPlugin from 'vite-plugin-eslint'
 import VueJsx from '@vitejs/plugin-vue-jsx'
-import viteStylelint from 'vite-plugin-stylelint'
+// import viteStylelint from 'vite-plugin-stylelint'
 import {
   createStyleImportPlugin,
   ElementPlusSecondaryResolve
@@ -49,20 +49,20 @@ export default {
       runtimeOnly: false,
       compositionOnly: true,
       include: [resolve(__dirname, 'src/locales/**')]
-    }),
-    eslintPlugin({
-      cache: true,
-      include: [
-        'src/**/*.ts',
-        'src/**/*.tsx',
-        'src/**/*.js',
-        'src/**/*.vue',
-        'src/*.ts',
-        'src/*.js',
-        'src/*.vue'
-      ]
-    }),
-    viteStylelint()
+    })
+//     eslintPlugin({
+//       cache: true,
+//       include: [
+//         'src/**/*.ts',
+//         'src/**/*.tsx',
+//         'src/**/*.js',
+//         'src/**/*.vue',
+//         'src/*.ts',
+//         'src/*.js',
+//         'src/*.vue'
+//       ]
+//     }),
+//     viteStylelint()
   ],
   css: {
     preprocessorOptions: {

core/core-frontend/src/layout/components/Header.vue

@@ -131,10 +131,10 @@ onMounted(() => {
 
 <template>
   <el-header class="header-flex" :class="{ 'header-light': navigateBg && navigateBg === 'light' }">
-    <!-- <img class="logo" v-if="navigate" :src="navigate" alt="" />
+    <img class="logo" v-if="navigate" :src="navigate" alt="" />
     <Icon v-else
       ><logo @click="handleIconClick" class="svg-icon logo" style="cursor: pointer"
-    /></Icon> -->
+    /></Icon>
     <el-menu
       :default-active="activeIndex"
       class="el-menu-demo"

core/core-frontend/src/views/login/index.vue

@@ -295,18 +295,18 @@ onMounted(async () => {
             :disabled="preheat"
           >
             <div class="login-logo">
-              <!-- <Icon
+              <Icon
                 v-if="!loginLogoUrl && axiosFinished"
                 className="login-logo-icon"
                 name="DataEase"
               >
                 <DataEase class="login-logo-icon" />
-              </Icon> -->
-              <!-- <img v-if="loginLogoUrl && axiosFinished" :src="loginLogoUrl" alt="" /> -->
+              </Icon>
+               <img v-if="loginLogoUrl && axiosFinished" :src="loginLogoUrl" alt="" />
             </div>
-            <!-- <div class="login-welcome">
+             <div class="login-welcome">
               {{ slogan || t('system.available_to_everyone') }}
-            </div> -->
+            </div>
             <div class="login-form">
               <div
                 class="default-login-tabs"