Browse Source

添加诺和诺德图标

wind 11 months ago
parent
commit
b8a2964060
6 changed files with 3446 additions and 34 deletions
  1. 1 0
      .npmrc
  2. 3403 0
      pnpm-lock.yaml
  3. BIN
      src/assets/image/horImg/NuoHeLogo.png
  4. 2 0
      src/components/pageHead.vue
  5. 33 31
      src/utils/dapingImage.ts
  6. 7 3
      src/views/horiScreen/index.vue

+ 1 - 0
.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmmirror.com

File diff suppressed because it is too large
+ 3403 - 0
pnpm-lock.yaml


BIN
src/assets/image/horImg/NuoHeLogo.png


+ 2 - 0
src/components/pageHead.vue

@@ -76,6 +76,7 @@ export default defineComponent({
       changeVer,
       playbutton,
       stopbutton,
+      NuoHeLogo
     } = dapingImage;
 
     const route: any = useRoute();
@@ -92,6 +93,7 @@ export default defineComponent({
       //     import.meta.url
       // ).href,
       logo:
+      projectStore.projectId == "Pj1101050057"?NuoHeLogo:
         projectStore.projectId == "Pj3301100002"
           ? zhijiangLogo
           : projectStore.projectId == "Pj1101010007"

+ 33 - 31
src/utils/dapingImage.ts

@@ -1,6 +1,7 @@
 import persagyLogo from "@/assets/image/horImg/persagyLogo.svg";
 import CBILogo from "@/assets/image/horImg/persagyLogo2.svg";
 import zhijiangLogo from "@/assets/image/horImg/zhijianglogo.png";
+import NuoHeLogo from "@/assets/image/horImg/NuoHeLogo.png";
 
 import changeVer from "@/assets/image/horImg/changeVer.svg";
 import changeHor from "@/assets/image/horImg/changeHor.svg";
@@ -37,41 +38,42 @@ import playbutton from "@/assets/image/horImg/playbutton.svg"
 import stopbutton from "@/assets/image/horImg/stopbutton.svg"
 
 export const dapingImage = {
-    persagyLogo: persagyLogo,
-    zhijiangLogo: zhijiangLogo,
-    changeVer: changeVer,
-    changeHor: changeHor,
+  persagyLogo: persagyLogo,
+  zhijiangLogo: zhijiangLogo,
+  changeVer: changeVer,
+  changeHor: changeHor,
+  NuoHeLogo,
 
-    yellowlight: yellowlight,
-    redlight: redlight,
-    greenlight: greenlight,
-    bluegreen: bluegreen,
-    yellowgreen: yellowgreen,
-    redyellow: redyellow,
-    bluelight: bluelight,
+  yellowlight: yellowlight,
+  redlight: redlight,
+  greenlight: greenlight,
+  bluegreen: bluegreen,
+  yellowgreen: yellowgreen,
+  redyellow: redyellow,
+  bluelight: bluelight,
 
-    lastco2: lastco2,
-    lasthumidity: lasthumidity,
-    lastmethanal: lastmethanal,
-    lastpm25: lastpm25,
-    lasttemp: lasttemp,
+  lastco2: lastco2,
+  lasthumidity: lasthumidity,
+  lastmethanal: lastmethanal,
+  lastpm25: lastpm25,
+  lasttemp: lasttemp,
 
-    floor_co2: floor_co2,
-    floor_jiaquan: floor_jiaquan,
-    floor_pm25: floor_pm25,
-    floor_shidu: floor_shidu,
-    floor_wendu: floor_wendu,
+  floor_co2: floor_co2,
+  floor_jiaquan: floor_jiaquan,
+  floor_pm25: floor_pm25,
+  floor_shidu: floor_shidu,
+  floor_wendu: floor_wendu,
 
-    floor_co2_ver: floor_co2_ver,
-    floor_jiaquan_ver: floor_jiaquan_ver,
-    floor_pm25_ver: floor_pm25_ver,
-    floor_shidu_ver: floor_shidu_ver,
-    floor_wendu_ver: floor_wendu_ver,
+  floor_co2_ver: floor_co2_ver,
+  floor_jiaquan_ver: floor_jiaquan_ver,
+  floor_pm25_ver: floor_pm25_ver,
+  floor_shidu_ver: floor_shidu_ver,
+  floor_wendu_ver: floor_wendu_ver,
 
-    lastGold: lastGold,
-    lastGray: lastGray,
+  lastGold: lastGold,
+  lastGray: lastGray,
 
-    playbutton:playbutton,
-    stopbutton:stopbutton,
-    CBILogo:CBILogo
+  playbutton: playbutton,
+  stopbutton: stopbutton,
+  CBILogo: CBILogo,
 };

+ 7 - 3
src/views/horiScreen/index.vue

@@ -21,7 +21,7 @@
                 <div class="content-left">
                     <NowData screenType="hor" />
                     <div class="content-left-cont horizontalClass flexBetween">
-                        <div class="bottom-left">
+                        <div class="bottom-left" v-if="projectStore.projectId !== 'Pj1101050057'">
                             <airSwitchHor></airSwitchHor>
                             <!-- <airSwitchVer></airSwitchVer> -->
                         </div>
@@ -225,7 +225,7 @@ export default {
 
         });
         return {
-            ...toRefs(allData),floorSpace
+            ...toRefs(allData),floorSpace,projectStore
         };
     },
 };
@@ -300,6 +300,10 @@ export default {
         }
         .content-left-cont {
             height: 52%;
+            display: flex;
+            flex-flow: row nowrap;
+            align-items: stretch;
+            justify-content: flex-start;
             .bottom-left {
                 width: 36%;
                 height: 100%;
@@ -309,7 +313,7 @@ export default {
                 border-bottom-left-radius: 20px;
             }
             .bottom-right {
-                width: 64%;
+                flex: 1;
                 height: 100%;
                 background: rgba(100, 108, 130, 0.06);
                 backdrop-filter: blur(20px);