Browse Source

文字图标更改;个别内容修改

SunZehao 7 months ago
parent
commit
a34847c82f

+ 1 - 1
.env

@@ -1,5 +1,5 @@
 # 标题
-VITE_APP_TITLE=管理系统
+VITE_APP_TITLE=光耀管理系统
 
 # 项目本地运行端口号
 VITE_PORT=80

+ 1 - 1
.env.dev

@@ -5,7 +5,7 @@ VITE_DEV=true
 
 # 请求路径
 # VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
-VITE_BASE_URL='http://192.168.2.232:48080'
+VITE_BASE_URL='http://192.168.2.150:48080'
 
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务

BIN
src/assets/imgs/logo1.png


+ 2 - 2
src/layout/components/Logo/src/Logo.vue

@@ -67,8 +67,8 @@ watch(
       to="/"
     >
       <img
-        class="h-[calc(var(--logo-height)-10px)] w-[calc(var(--logo-height)-10px)]"
-        src="@/assets/imgs/logo.png"
+        style="margin-left:10px;height:30px;width:30px"
+        src="@/assets/imgs/logo1.png"
       />
       <div
         v-if="show"

+ 2 - 1
src/layout/components/UserInfo/src/UserInfo.vue

@@ -57,7 +57,8 @@ const toDocument = () => {
 <template>
   <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
     <div class="flex items-center">
-      <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
+      <!-- <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" /> -->
+      <img style="width:30px;height:30px" src="@/assets/imgs/logo1.png" alt="" />
       <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden">
         {{ userName }}
       </span>

+ 3 - 2
src/views/Home/Index.vue

@@ -5,9 +5,10 @@
         <el-row :gutter="16" justify="space-between">
           <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
             <div class="flex items-center">
-              <el-avatar :src="avatar" :size="70" class="mr-16px">
+              <!-- <el-avatar :src="avatar" :size="70" class="mr-16px ces">
                 <img src="@/assets/imgs/avatar.gif" alt="" />
-              </el-avatar>
+              </el-avatar> -->
+              <img style="width:60px;height:60px" src="@/assets/imgs/logo1.png" alt="" />
               <div>
                 <div class="text-20px">
                   {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}

+ 6 - 4
src/views/Login/Login.vue

@@ -9,8 +9,9 @@
       >
         <!-- 左上角的 logo + 系统标题 -->
         <div class="relative flex items-center text-white">
-          <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
-          <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
+          <img alt=""  style="height:38px;width:38px" src="@/assets/imgs/logo1.png" />
+          <!-- <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span> -->
+          <span class="text-20px font-bold">光耀管理系统</span>
         </div>
         <!-- 左边的背景图 + 欢迎语 -->
         <div class="h-[calc(100%-60px)] flex items-center justify-center">
@@ -22,7 +23,8 @@
             <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
             <div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div>
             <div key="3" class="mt-5 text-14px font-normal text-white">
-              {{ t('login.message') }}
+              <!-- {{ t('login.message') }} -->
+              光耀后台管理系统
             </div>
           </TransitionGroup>
         </div>
@@ -33,7 +35,7 @@
           class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
         >
           <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
+            <img alt="" style="height:38px;width:38px" src="@/assets/imgs/logo1.png" />
             <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
           </div>
           <div class="flex items-center justify-end space-x-10px">

+ 3 - 3
src/views/Login/SocialLogin.vue

@@ -9,7 +9,7 @@
       >
         <!-- 左上角的 logo + 系统标题 -->
         <div class="relative flex items-center text-white">
-          <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
+          <img alt="" style="height:38px;width:38px" src="@/assets/imgs/logo.png" />
           <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
         </div>
         <!-- 左边的背景图 + 欢迎语 -->
@@ -33,7 +33,7 @@
           class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
         >
           <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
+            <img alt="" style="height:38px;width:38px" src="@/assets/imgs/logo1.png" />
             <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
           </div>
           <div class="flex items-center justify-end space-x-10px">
@@ -196,7 +196,7 @@ const loginData = reactive({
   captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
   tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
   loginForm: {
-    tenantName: '芋道源码',
+    tenantName: '光耀',
     username: 'admin',
     password: 'admin123',
     captchaVerification: '',

+ 1 - 1
src/views/Login/components/LoginForm.vue

@@ -184,7 +184,7 @@ const loginData = reactive({
   captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
   tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
   loginForm: {
-    tenantName: '芋道源码',
+    tenantName: '光耀',
     username: 'admin',
     password: 'admin123',
     captchaVerification: '',

+ 1 - 1
src/views/Login/components/MobileForm.vue

@@ -133,7 +133,7 @@ const loginData = reactive({
   },
   loginForm: {
     uuid: '',
-    tenantName: '芋道源码',
+    tenantName: '光耀',
     mobileNumber: '',
     code: ''
   }

+ 1 - 1
src/views/Login/components/QrCodeForm.vue

@@ -17,7 +17,7 @@
   </el-row>
 </template>
 <script lang="ts" setup>
-import logoImg from '@/assets/imgs/logo.png'
+import logoImg from '@/assets/imgs/logo1.png'
 
 import LoginFormTitle from './LoginFormTitle.vue'
 import { LoginStateEnum, useLoginState } from './useLogin'

+ 4 - 1
src/views/report/jmreport/index.vue

@@ -2,7 +2,10 @@
   <ContentWrap>
     <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" />
 
-    <IFrame :src="src" />
+    <!-- <IFrame :src="src" /> -->
+    <div style="height:80vh;width:85vw;overflow:hidden">
+      <iframe style="width:100%;height:100%;position:relative;top:-49px;left:-2px" :src="src" ></iframe>
+    </div>
   </ContentWrap>
 </template>
 <script lang="ts" setup>