1
0

2 Commitit a0bec5c02a ... 4dacb6f61a

Tekijä SHA1 Viesti Päivämäärä
  wangkeyi 4dacb6f61a Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base 2 päivää sitten
  wangkeyi d1f8d787bc [Feat 0000]项目配置增加绿色版本 2 päivää sitten

BIN
src/assets/images/themify/green/vent/border/box-bottom.png


BIN
src/assets/images/themify/green/vent/border/box-top.png


BIN
src/assets/images/themify/green/vent/sheet-bg.png


BIN
src/assets/images/themify/green/vent/sheet-header.png


BIN
src/assets/images/themify/green/vent/vent-header1.png


+ 6 - 0
src/components/vent/customHeader.vue

@@ -85,6 +85,12 @@
   @import '/@/design/theme.less';
   @ventSpace: zxm;
 
+  @{theme-green} {
+    .vent-custom-header {
+      --image-vent-header1: url('/@/assets/images/themify/green/vent/vent-header1.png');
+      --image-select-bg: url('/@/assets/images/themify/deepblue/vent/home/select-bg.png');
+    }
+  }
   @{theme-deepblue} {
     .vent-custom-header {
       --image-vent-header1: url('/@/assets/images/themify/deepblue/vent/vent-header1.png');

+ 12 - 0
src/components/vent/ventBox1.vue

@@ -23,6 +23,18 @@
 
 <style lang="less" scoped>
   @import '/@/design/theme.less';
+  @{theme-green} {
+    .vent-box1-bg {
+      --image-box1-top: url(/@/assets/images/themify/green/vent/border/box-top.png);
+      --image-box1-bottom: url('/@/assets/images/themify/green/vent/border/box-bottom.png');
+      // --container-color: #1e2932;
+      --container-image: linear-gradient(#3df6ff00, #308972, #3df6ff00);
+    }
+    // .box1-center {
+    //   height: calc(100% - 37px);
+    //   clip-path: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%, 10px 100%, 0 calc(100% - 10px));
+    // }
+  }
 
   @{theme-deepblue} {
     .vent-box1-bg {

+ 2 - 0
src/design/theme.less

@@ -2,6 +2,7 @@
 @import './themify/light.less';
 @import './themify/default.less';
 @import './themify/deepblue.less';
+@import './themify/green.less';
 
 @ventSpace: zxm;
 
@@ -138,3 +139,4 @@ html[data-theme='light'] {
 @theme-light: ~"html[data-theme='light']";
 @theme-default: ~'html';
 @theme-deepblue: ~"html[data-theme='deepblue']";
+@theme-green: ~"html[data-theme='green']";

+ 68 - 0
src/design/themify/green.less

@@ -0,0 +1,68 @@
+html[data-theme='green'] {
+  --vent-primary-color: #0a84ff;
+
+  --vent-header-bg-color: linear-gradient(#0a84ff99, #0a84ff22);
+
+  --vent-btn-primary-hover-color: #2986e9;
+  --vent-btn-primary-focus-color: #4cc4b5;
+  --vent-btn-primary-color: #257180;
+  --vent-btn-primary-border-color: #3f506a;
+
+  --vent-table-thead: #172943;
+  --vent-table-thead-border: #4cc4b5;
+  --vent-table-hover: #2c4650;
+  --vent-table-no-hover: #223038;
+  --vent-table-action-link: #86b9a7;
+
+  --vent-modal-title: #0a80fa;
+  --vent-modal-border: #308972;
+  --vent-modal-bg: #181b24;
+  --vent-modal-box-shadow: #316b92;
+  --vent-modal-bg2: linear-gradient(#2986e955, #0963c155);
+
+  --vent-tabs-bg: linear-gradient(#0091aa33, #2081ff11);
+  --vent-tabs-table-thead: #3d9dd433;
+  // --vent-tabs-action-link: #28f3f3;
+  // --vent-tabs-bg: linear-gradient(#28385155, #27334722);
+  // --vent-tabs-table-thead: #172943;
+  --vent-tabs-action-link: #0a80fa;
+
+  --vent-form-item-border: #308972;
+
+  --vent-text-base: #fff;
+  --vent-base-color: #181b24;
+  --vent-base-border: #3f506a;
+  --vent-base-light-bg: #8691a3;
+  --vent-base-light-bg-opcity: #8691a355;
+  --vent-transparent: #1e2932;
+  --vent-font-color: #ffffff;
+  --vent-font-action-link: #0a80fa;
+
+  --vent-configurable-bg: #02132c;
+  --vent-configurable-module-bg: #0d2037;
+  --vent-configurable-original-module-bg: #0d203711;
+  --vent-configurable-module-border-bd: linear-gradient(#3b4c65 0%, #3b4c65 60%, #000723);
+  --vent-configurable-dropdown: linear-gradient(to bottom, #293645, #3b4550);
+  --vent-configurable-home-bg-img: linear-gradient(to top, #39a3ff00, #0091ff99);
+  --vent-configurable-home-timeline: linear-gradient(to top, #39a3ff00, #0091ff99, #39a3ff00);
+  --vent-configurable-home-light-border: #fbfdff;
+
+  --vent-gas-list-item-bg-img: linear-gradient(to right, #213248, #21324800);
+  --vent-gas-tab-bg: #10427a;
+  --vent-gas-tab-bg-actived: #166ab5;
+  --vent-gas-tab-border: #525c68;
+  --vent-gas-primary-text: #ededed;
+  --vent-gas-primary-bg: #244d84;
+  --vent-gas-primary-trasparent-bg: #0091ff12;
+
+  --vent-device-manager-box-border: #fff;
+  --vent-device-manager-box-bg: #aaaaaa11;
+  --vent-device-manager-control-btn: linear-gradient(#1572d5, #0963c1);
+  --vent-device-manager-control-btn-hover: linear-gradient(#1572d555, #0963c155);
+
+  --vent-warn-tab-bg: #0f376c;
+  --vent-warn-tab-border: #107eec;
+  --vent-warn-tab-bg-actived: #0963c1;
+
+
+}

+ 1 - 0
src/enums/appEnum.ts

@@ -24,6 +24,7 @@ export enum ThemeEnum {
   LIGHT = 'light',
   VENT1 = 'vent1',
   DEEPBLUE = 'deepblue',
+  GREEN = 'green',
 }
 
 export enum SettingButtonPositionEnum {

+ 4 - 0
src/layouts/default/header/components/user-dropdown/ThemeSelect.vue

@@ -45,6 +45,10 @@
       value: ThemeEnum.DEEPBLUE,
       label: '深蓝',
     },
+    {
+      value: ThemeEnum.GREEN,
+      label: '绿色',
+    },
   ];
 
   const { getDarkMode, setDarkMode } = useRootSetting();

+ 10 - 0
src/views/vent/home/configurable/components/ModuleCommon.vue

@@ -91,6 +91,16 @@ function redirectTo() {
   padding: 0 !important;
   width: 100% !important;
 }
+@{theme-green} {
+  .module-common-longer {
+    :deep(.box1-top) {
+      --image-box1-top: url('/@/assets/images/themify/green/vent/border/box-top.png');
+    }
+    :deep(.box1-bottom) {
+      --image-box1-bottom:  url('/@/assets/images/themify/green/vent/border/box-bottom.png');
+    }
+  }
+}
 @{theme-deepblue} {
   .module-common-longer {
     :deep(.box1-top) {

+ 20 - 10
src/views/vent/home/configurable/components/ModuleCommonDual.vue

@@ -149,16 +149,26 @@
       background: linear-gradient(to top, #2bafc6 0%, rgba(44, 255, 221, 0.1) 50%, rgba(44, 255, 221, 0) 90%);
     }
   }
-  // @{theme-deepblue} {
-  //   .module-common-dual-longer {
-  //     :deep(.box1-top) {
-  //       --image-box1-top: url('/@/assets/images/themify/deepblue/vent/border/box2-top-long.png');
-  //     }
-  //     :deep(.box1-bottom) {
-  //       --image-box1-bottom: none;
-  //     }
-  //   }
-  // }
+  @{theme-green} {
+    .module-common-dual-longer {
+      :deep(.box1-top) {
+        --image-box1-top: url('/@/assets/images/themify/green/vent/border/box-top.png');
+      }
+      :deep(.box1-bottom) {
+        --image-box1-bottom: url('/@/assets/images/themify/green/vent/border/box-bottom.png');
+      }
+    }
+  }
+  @{theme-deepblue} {
+    .module-common-dual-longer {
+      :deep(.box1-top) {
+        --image-box1-top: url('/@/assets/images/themify/deepblue/vent/border/box2-top-long.png');
+      }
+      :deep(.box1-bottom) {
+        --image-box1-bottom: none;
+      }
+    }
+  }
   .module-common-dual-longer {
     :deep(.box1-top) {
       --image-box1-top: url('/@/assets/images/vent/box-top-bg.png');

+ 5 - 1
src/views/vent/home/configurable/dust.vue

@@ -109,7 +109,11 @@
     font-family: 'douyuFont';
     src: url('../../../../assets/font/douyuFont.otf');
   }
-
+  @{theme-green} {
+    .company-home {
+      --image-modal-top: url('@/assets/images/themify/green/vent/vent-header1.png');
+    }
+  }
   @{theme-deepblue} {
     .company-home {
       --image-modal-top: url('@/assets/images/themify/deepblue/vent/home/modal-top.png');

+ 5 - 0
src/views/vent/home/configurable/fire.vue

@@ -110,6 +110,11 @@
     src: url('../../../../assets/font/douyuFont.otf');
   }
 
+  @{theme-green} {
+    .company-home {
+      --image-modal-top: url('@/assets/images/themify/green/vent/vent-header1.png');
+    }
+  }
   @{theme-deepblue} {
     .company-home {
       --image-modal-top: url('@/assets/images/themify/deepblue/vent/home/modal-top.png');

+ 6 - 1
src/views/vent/monitorManager/deviceMonitor/staticSheets/commonSheet.vue

@@ -295,7 +295,12 @@
 </script>
 <style lang="less" scoped>
   @import url('/@/design/theme.less');
-
+  @{theme-green} {
+    .sheet-bg {
+      --sheet-bg: url(/@/assets/images/themify/green/vent/sheet-bg.png);
+      --sheet-header: url(/@/assets/images/themify/green/vent/sheet-header.png);
+    }
+  }
   @{theme-deepblue} {
     .sheet-bg {
       --sheet-bg: url(/@/assets/images/themify/deepblue/vent/sheet-bg.png);

+ 6 - 1
src/views/vent/monitorManager/deviceMonitor/staticSheets/dustSheet.vue

@@ -103,7 +103,12 @@
 </script>
 <style lang="less" scoped>
   @import url('/@/design/theme.less');
-
+  @{theme-green} {
+    .sheet-bg {
+      --sheet-bg: url(/@/assets/images/themify/green/vent/sheet-bg.png);
+      --sheet-header: url(/@/assets/images/themify/green/vent/sheet-header.png);
+    }
+  }
   @{theme-deepblue} {
     .sheet-bg {
       --sheet-bg: url(/@/assets/images/themify/deepblue/vent/sheet-bg.png);

+ 6 - 1
src/views/vent/monitorManager/deviceMonitor/staticSheets/fireSheet.vue

@@ -146,7 +146,12 @@
 </script>
 <style lang="less" scoped>
   @import url('/@/design/theme.less');
-
+  @{theme-green} {
+    .sheet-bg {
+      --sheet-bg: url(/@/assets/images/themify/green/vent/sheet-bg.png);
+      --sheet-header: url(/@/assets/images/themify/green/vent/sheet-header.png);
+    }
+  }
   @{theme-deepblue} {
     .sheet-bg {
       --sheet-bg: url(/@/assets/images/themify/deepblue/vent/sheet-bg.png);

+ 6 - 1
src/views/vent/monitorManager/deviceMonitor/staticSheets/gasSheet.vue

@@ -151,7 +151,12 @@
 </script>
 <style lang="less" scoped>
   @import url('/@/design/theme.less');
-
+  @{theme-green} {
+    .sheet-bg {
+      --sheet-bg: url(/@/assets/images/themify/green/vent/sheet-bg.png);
+      --sheet-header: url(/@/assets/images/themify/green/vent/sheet-header.png);
+    }
+  }
   @{theme-deepblue} {
     .sheet-bg {
       --sheet-bg: url(/@/assets/images/themify/deepblue/vent/sheet-bg.png);

+ 6 - 1
src/views/vent/monitorManager/deviceMonitor/staticSheets/ventilateSheet.vue

@@ -263,7 +263,12 @@
 </script>
 <style lang="less" scoped>
   @import url('/@/design/theme.less');
-
+  @{theme-green} {
+    .sheet-bg {
+      --sheet-bg: url(/@/assets/images/themify/green/vent/sheet-bg.png);
+      --sheet-header: url(/@/assets/images/themify/green/vent/sheet-header.png);
+    }
+  }
   @{theme-deepblue} {
     .sheet-bg {
       --sheet-bg: url(/@/assets/images/themify/deepblue/vent/sheet-bg.png);

+ 9 - 0
src/views/vent/sys/setting/index.vue

@@ -57,6 +57,15 @@
   });
 </script>
 <style lang="less" scoped>
+  @import '/@/design/theme.less';
+  // 绿色主题特化的变量
+  @{theme-green} {
+    .setting-box {
+      border: 1px solid #3c5c64;
+      box-shadow: 0 0 20px #44b4ff33 inset;
+      background-color: #ffffff11;
+    }
+  }
   .setting-box {
     margin: 10px 8px;
     height: calc(100% - 72px);

+ 4 - 0
src/views/vent/sys/setting/setting.data.ts

@@ -95,6 +95,10 @@ export const formSchema: FormSchema[] = [
           label: '深蓝(开发中)',
           value: ThemeEnum.DEEPBLUE,
         },
+        {
+          label: '绿色(开发中)',
+          value: ThemeEnum.GREEN,
+        },
       ],
     },
   },