caichengyu 1 month ago
parent
commit
af32ab595b

BIN
src/assets/images/favicon.ico


BIN
src/assets/images/favicon1.ico


BIN
src/assets/logo/logo@1.png


BIN
src/assets/logo/logo@129978618875038.png


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

@@ -25,13 +25,13 @@
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
         </el-tooltip> -->
-        <el-tooltip content="版本说明" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="版本说明" effect="dark" placement="bottom">
           <version
             id="version"
             class="right-menu-item hover-effect"
             @openMsg="openMsg"
           />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <el-dialog
           append-to-body

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

@@ -75,6 +75,7 @@
 <script>
 import logoImg from "@/assets/images/logo@2xS.png";
 import logoYTImg from "@/assets/images/logo@2xSYT.png";
+import logoYTImg_xh from "@/assets/logo/logo@129978618875038.png";
 import variables from "@/assets/styles/variables.scss";
 
 export default {
@@ -97,7 +98,7 @@ export default {
     return {
       title: "",
       logo: logoImg,
-      logoYT: logoYTImg,
+      logoYT:sessionStorage.getItem("TenantId")==1? logoYTImg:logoYTImg_xh,
     };
   },
 };

+ 4 - 4
src/utils/request.js

@@ -8,11 +8,11 @@ import { paramMate } from "@/utils/common";
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
-// export const baseURL = process.env.VUE_APP_BASE_API
-export const baseURL = 'https://admin.gdzckj.net/'
+export const baseURL = process.env.VUE_APP_BASE_API
+// export const baseURL = 'https://admin.gdzckj.net/'
 // export const baseURL = 'http://192.168.1.123:5030'
-// export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
-export const BASE_IMG_URL = 'https://file.gdzckj.net'
+export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
+// export const BASE_IMG_URL = 'https://file.gdzckj.net'
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
   baseURL: baseURL, 

+ 4 - 4
src/views/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div id="index">
     <p class="TopSystem">
-      {{ user.userName }},欢迎使用本系统<span style="margin-left: 20px"
-        >本次登录时间:{{ changeDateTime(user.loginDate) }}</span
+      {{ user.userName }},欢迎使用本系统<span style="margin-left: 20px"
+        >本次登录时间:{{ changeDateTime(user.loginDate) }}</span
       >
       <span style="margin-left: 14px"
-        >上次登录时间:{{ changeDateTime(user.preLoginDate) }}</span
+        >上次登录时间:{{ changeDateTime(user.preLoginDate) }}</span
       >
     </p>
     <template v-if="ShowStatus">
@@ -719,7 +719,7 @@ export default {
         pendingTrialNum: 0,
       }, //需要动画滚动的数值
       user: {},
-      ShowStatus: true,
+      ShowStatus: false,
     };
   },
   watch: {

+ 5 - 3
src/views/login.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="login">
     <div class="login_Left">
-      <h2 class="topName">
-        <img src="@/assets/images/logo@2xSYT.png" alt="" />
+      <h2 class="topName" :style="TenantId==1?'':'color:#088247;'">
+        <img :src='"@/assets/logo/logo@"+ TenantId+".png"' alt="" />
         {{ $store.state.user.companyName }}
       </h2>
       <div class="anima1"></div>
@@ -11,7 +11,7 @@
       <div class="anima4"></div>
       <div class="anima5"></div>
     </div>
-    <div class="login_divs">
+    <div class="login_divs" :style="TenantId==1?'':'background-color:#65b57d;'">
       <el-form
         class="login_Right"
         ref="loginForm"
@@ -118,6 +118,7 @@ export default {
   name: "Login",
   data() {
     return {
+      TenantId:sessionStorage.getItem("TenantId"),
       registerCountDown: 0,
       codeUrl: "",
       cookiePassword: "",
@@ -173,6 +174,7 @@ export default {
     });
     this.getCode();
     this.getCookie();
+    // console.log("12", sessionStorage.getItem("TenantId")) 
   },
   methods: {
     /**

+ 1 - 1
src/views/secondBuild/courseList/index.vue

@@ -712,7 +712,7 @@ export default {
           this.player.destroy();
         }
         if (this.player_tencent) {
-          this.player.dispose();
+          this.player_tencent.dispose();
         }
         if (this.playerzb) {
           this.playerzb.destroy();

+ 1 - 1
src/views/secondSeven/courseList/index.vue

@@ -697,7 +697,7 @@ export default {
           this.player.destroy();
         }
         if (this.player_tencent) {
-          this.player.dispose();
+          this.player_tencent.dispose();
         }
         if (this.playerzb) {
           this.playerzb.destroy();

+ 1 - 1
src/views/secondZao/courseList/index.vue

@@ -697,7 +697,7 @@ export default {
           this.player.destroy();
         }
         if (this.player_tencent) {
-          this.player.dispose();
+          this.player_tencent.dispose();
         }
         if (this.playerzb) {
           this.playerzb.destroy();