浏览代码

更新依赖,以及处理logo变色问题

ZaiZai 2 年之前
父节点
当前提交
c8ff391694
共有 5 个文件被更改,包括 25 次插入24 次删除
  1. 2 2
      package.json
  2. 12 9
      src/layout/index.vue
  3. 2 2
      src/layout/layout.scss
  4. 1 3
      src/views/login/index.vue
  5. 8 8
      yarn.lock

+ 2 - 2
package.json

@@ -14,10 +14,10 @@
         "dayjs": "^1.11.8",
         "echarts": "^5.4.2",
         "element-plus": "^2.3.7",
-        "hc-vue3-ui": "^1.4.4",
+        "hc-vue3-ui": "^1.4.6",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.5",
-        "js-fast-way": "^0.2.0",
+        "js-fast-way": "^0.2.1",
         "js-md5": "^0.7.3",
         "js-web-screen-shot": "^1.9.8",
         "nprogress": "^0.2.0",

+ 12 - 9
src/layout/index.vue

@@ -5,8 +5,8 @@
         </div>
         <el-aside :width="isCollapse?'100px':'250px'" class="hc-aside-box" :class="[isCollapse?'is-collapse':'']" v-show="MenuBarKey !== 'home-index'">
             <div class="hc-aside-logo-box" @click="logoClick">
-                <img :src="appLogoIcon" alt="" id="logo-icon">
-                <img :src="appLogoName" alt="" id="logo-name" v-if="!isCollapse">
+                <img :src="appLogoIcon" alt="" id="hc-logo-icon">
+                <img :src="appLogoName" alt="" id="hc-logo-name" v-show="!isCollapse">
             </div>
             <div class="hc-aside-menu-box">
                 <el-scrollbar>
@@ -69,7 +69,7 @@ import ConfigBar from "./modules/ConfigBar.vue"
 import {initButtons,initProjectContract} from "~sto/app";
 import website from '~src/config/index'
 import appViewBg from "~src/assets/view/bg.png";
-import {setImageColorStyle} from "js-fast-way";
+import {setImageColor, setImageColorStyle} from "js-fast-way";
 import {setAppName} from "~uti/tools";
 
 //初始组合式
@@ -173,18 +173,21 @@ watch(() => [
 
 //设置Logo图片颜色
 const setLogoImageColor = () => {
-    setImageColorStyle('logo-icon', AppColor.value?.color)
+    setImageColorStyle('hc-logo-icon', AppColor.value?.color)
 }
 
 //设置Logo图片颜色
 const setLogoNameColor = (theme) => {
-    if (theme === 'dark') {
-        setImageColorStyle('logo-name', '#ffffff')
-    } else {
-        setImageColorStyle('logo-name', '#000000')
-    }
+    try {
+        let filter = 'invert(85%) sepia(91%) saturate(0%) hue-rotate(233deg) brightness(114%) contrast(101%)'
+        if (theme === 'light') {
+            filter = 'invert(0%) sepia(100%) saturate(0%) hue-rotate(235deg) brightness(107%) contrast(103%)'
+        }
+        document.getElementById('hc-logo-name').style.filter = filter;
+    } catch {}
 }
 
+
 //设置折叠
 const setIsCollapse = (key) => {
     if (key === 'data-fill-wbs') {

+ 2 - 2
src/layout/layout.scss

@@ -33,11 +33,11 @@
             cursor: pointer;
             margin: 32px 0;
             left: -10px;
-            #logo-icon {
+            #hc-logo-icon {
                 height: 35px;
                 width: 35px;
             }
-            #logo-name {
+            #hc-logo-name {
                 height: 40px;
                 margin-left: 5px;
             }

+ 1 - 3
src/views/login/index.vue

@@ -100,6 +100,7 @@ onMounted(() => {
 
 const setAppImageColor = () => {
     setImageColorStyle('logo-icon', '#1ECC95')
+    document.documentElement.setAttribute('class','light color-green')
 }
 
 //表单
@@ -186,9 +187,6 @@ const formValidateClick = async () => {
             loading.value = false;
             window?.$message?.success('登录成功');
             setHomeRouter();
-            //   setTimeout(() => {
-            //       window?.location?.reload()  //刷新页面
-            //   }, 1000);
         }).catch(() => {
             loading.value = false;
         })

+ 8 - 8
yarn.lock

@@ -975,10 +975,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hc-vue3-ui@^1.4.4:
-  version "1.4.4"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.4.4.tgz#120286ca884a531630375c34ac1081e921615d62"
-  integrity sha512-EaxuMeMsTMGN1Dr8Fo8s4y2UHayANRJxYuHB6NF/ms1wn/60ZAtrHWAFQXTupJ1G7c/V1Syu6EOXUK5XBcmPWw==
+hc-vue3-ui@^1.4.6:
+  version "1.4.6"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.4.6.tgz#98e608e3ddc097f52f20777086b68b73db846653"
+  integrity sha512-FATKZUN81Ip132DvIsVERgCzuHQNwTCXXq5ZbXIYcSkIR4+il7K3n9jBXeaNzpbBIQ0PEyLJRbnXQoiC/mVU6A==
   dependencies:
     axios "^1.4.0"
     dayjs "^1.11.8"
@@ -1077,10 +1077,10 @@ js-fast-way@^0.1.7:
   resolved "http://47.110.251.215:9000/js-fast-way/-/js-fast-way-0.1.9.tgz#c2eaca67eb3beb57735b76f533debedf44a313e5"
   integrity sha512-JiExmQdYrPmVymTWNqfpRSvTHElBFuM8PcLuvXju8hsFs0gf1cnNgjy4zdlNLbGtOTkms/MBpalJiFKZhsEXcQ==
 
-js-fast-way@^0.2.0:
-  version "0.2.0"
-  resolved "http://47.110.251.215:9000/js-fast-way/-/js-fast-way-0.2.0.tgz#1b19450d509f7e4953758250ecd7a75ea313a889"
-  integrity sha512-ABABvlpxfot3/41wcs+jDMCCSHj6d2Wk4aeeYKG/2MykcHSYVuszoCMXU8IVBwSegtEigqT6hnQUFggaJBXSAw==
+js-fast-way@^0.2.1:
+  version "0.2.1"
+  resolved "http://47.110.251.215:9000/js-fast-way/-/js-fast-way-0.2.1.tgz#ca099b8fdc304739dd65583d0eb9fa09052eaec0"
+  integrity sha512-QYLYuavyDb/0V5YSSNynAvkm2EcbWPJxxi+frXiL1gKO6y827Z1Z/zJl1WgeRZiVNQCWlsZT7OKZDDWC+Mw2xQ==
 
 js-md5@^0.7.3:
   version "0.7.3"