lining 3 years ago
parent
commit
be6ecaa1c4

+ 4 - 1
src/App.vue

@@ -420,7 +420,7 @@ export default {
 
       this.hideHeard = res.query.hideheard || "0";
       this.hideMenus = res.query.hidemenus || "0";
-
+      console.log(11111,res.query.theme);
       if (res.query.theme) {
         const theme = res.query.theme === "dark" ? "dark" : "light";
         this.$store.dispatch("changeTheme", theme);
@@ -614,4 +614,7 @@ body {
   background-color: #040c0b;
   border: 0px;
 }
+.power-benchmarking-page .top .top-left .table.el-table thead tr:last-child th .cell{
+  height: 116px !important;
+}
 </style>

+ 126 - 0
src/assets/styles/theme/light/light-jjyx.css

@@ -0,0 +1,126 @@
+#appBody.light .static-main {
+  background: #fff;
+  border-color: #36348e;
+  border-radius: 12px;
+  flex: 0 0 130px;
+  margin-right: 5px;
+  transition: 0.25s;
+}
+#appBody.light .static-main .icon i {
+  background: #36348e;
+  border-color: #808080;
+  transition: 0.25s;
+}
+#appBody.light .static-main .icon i svg use {
+  fill: #fff;
+  transition: 0.25s;
+}
+#appBody.light .static-main .info .value {
+  color: #36348e;
+  transition: 0.25s;
+}
+#appBody.light .static-items {
+  background: #fff;
+  margin-right: 4px;
+  border-radius: 12px;
+  transition: 0.25s;
+}
+#appBody.light .static-items .static-items-title {
+  color: #36348e;
+  font-weight: 700;
+  transition: 0.25s;
+}
+#appBody.light .static-items .items .item {
+  margin-left: 4px;
+  border-radius: 12px;
+  background: rgba(128, 128, 128, 0.15);
+  transition: 0.25s;
+  font-weight: 700;
+}
+#appBody.light .static-items .items .item .title {
+  color: #36348e;
+  font-weight: 700;
+  transition: 0.25s;
+}
+#appBody.light .power-benchmarking-page .top .top-left .top-left-header .header-right > div.active,
+#appBody.light .power-benchmarking-page .top .top-left .top-left-header .header-right > div:hover {
+  background: rgba(54, 52, 142, 0.2);
+  border-color: #36348e;
+  color: #36348e;
+  transition: 0.25s;
+}
+#appBody.light .power-benchmarking-page .top .top-right .rank-title::before {
+  background: linear-gradient(135deg, rgba(54, 52, 142, 0.4), transparent, transparent, transparent, rgba(54, 52, 142, 0.4));
+}
+#appBody.light .power-benchmarking-page .top .top-right .rank-title {
+  border-color: #36348e;
+  color: #36348e;
+  transition: 0.25s;
+}
+#appBody.light .power-benchmarking-page .top .top-right .rank-title .border {
+  border-color: #36348e;
+  transition: 0.25s;
+}
+#appBody.light .power-benchmarking-page .top .top-right .rank-table.el-table thead tr th {
+  background: #F0F0F0;
+  color: #000;
+  font-weight: 700;
+  transition: 0.25s;
+}
+#appBody.light .power-benchmarking-page .top .top-right .rank-block {
+  border-color: #36348e;
+  background: rgba(54, 52, 142, 0.2);
+  transition: 0.25s;
+}
+#appBody.light .power-benchmarking-page .top .top-right .rank-table {
+  border-color: #36348e;
+  transition: 0.25s;
+}
+#appBody.light .top-right .el-table__body-wrapper {
+  background: #fff;
+  transition: 0.25s;
+}
+#appBody.light .main-body .el-table td,
+#appBody.light .main-body .custom-table.el-table td {
+  color: #000;
+  font-weight: 700;
+  transition: 0.25s;
+}
+#appBody.light .main-body .el-table tr:hover td,
+#appBody.light .main-body .custom-table.el-table tr:hover td {
+  color: #36348e;
+  font-weight: 700;
+  transition: 0.25s;
+}
+#appBody.light .power-benchmarking-page .top .top-right .rank-table.el-table.el-table--striped .el-table__body tr.el-table__row--striped td {
+  background: rgba(54, 52, 142, 0.1);
+  transition: 0.25s;
+}
+#appBody.light .power-benchmarking-page .top .top-right .rank-table.el-table.el-table--striped .el-table__body tr.el-table__row--striped:hover td {
+  background: rgba(54, 52, 142, 0.1) !important;
+  transition: 0.25s;
+}
+#appBody.light .top-left .el-table table {
+  background: #fff;
+  transition: 0.25s;
+}
+#appBody.light .top-left .el-table th,
+#appBody.light .top-left .el-table td {
+  font-weight: bold;
+  font-weight: 700;
+}
+#appBody.light .top-left .el-table thead tr:first-child th {
+  background: #F0F0F0;
+  color: #000;
+  transition: 0.25s;
+}
+#appBody.light .top-left .el-table thead tr:last-child th {
+  background: #F0F0F0;
+  color: #000;
+  transition: 0.25s;
+}
+#appBody.light .top-left .el-table th.light,
+#appBody.light .top-left .el-table td.light {
+  color: #36348e !important;
+  transition: 0.25s;
+}

+ 3 - 4
src/assets/styles/theme/light/light-jjyx.less

@@ -82,7 +82,7 @@
     }
 
     .power-benchmarking-page .top .top-right .rank-table.el-table thead tr th {
-        background : rgba(54, 52, 142, 0.05);
+        background : #F0F0F0;
         color      : @black;
         font-weight: 700;
         transition : @transition;
@@ -144,19 +144,18 @@
         }
 
         thead tr:first-child th {
-            background: rgba(128, 128, 128, 0.3);
+            background: #F0F0F0;
             color     : @black;
             transition: @transition;
         }
 
         thead tr:last-child th {
-            background: rgba(128, 128, 128, 0.1);
+            background: #F0F0F0;
             color     : @black;
             transition: @transition;
         }
 
 
-
         th.light,
         td.light {
             color     : @deepblue  !important;

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

@@ -1022,7 +1022,7 @@ export default {
                 this.wpId === "-2" || this.wpId.indexOf("GDC") !== -1
                   ? "日照强度"
                   : "风速",
-
+              value: res.data.jczbmap.ssfs,
               dialogTitle:
                 this.wpId == 0
                   ? "详情"
@@ -1032,7 +1032,7 @@ export default {
               subUrl: "genreset/findGLDetail",
               targetName: "ssfs",
               dialogType: "powerLineChart",
-              max: that.wpId === '-2' || that.wpId.indexOf('GDC') !== -1 ? 1200 : 40,
+              max: this.wpId === '-2' || this.wpId.indexOf('GDC') !== -1 ? 1200 : 40,
             },
             {
               title: "保证功率",

+ 10 - 2
src/views/Home/components/map.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="map">
-    <div class="back"></div>
+    <div :class="$store.state.themeName === 'light'?'light':'back'"></div>
     <div class="security-days">
       <div class="text">安全天数:</div>
       <div class="num">
@@ -243,7 +243,6 @@ export default {
       this.$emit("mapClicks", wpId, this.tabs[index].text);
     },
     backMap(wpId, planBtnName) {
-		this.activeTab = 0;
       this.currentMode = "NX";
       this.mapName = "nx";
       this.mapIndex = -1;
@@ -297,6 +296,15 @@ export default {
   width: 100%;
   height: 100%;
 
+  .light{
+    position: fixed;
+    z-index: -1;
+    width: 100vw;
+    height: 100vh;
+    top: 0;
+    left: 0;
+  }
+
   .back {
     position: fixed;
     z-index: -1;

+ 22 - 24
src/views/WindSite/pages/GeneralAppearance.vue

@@ -287,35 +287,33 @@ export default {
       //   });
     },
     requestData() {
-
-
-    api.monitorFindGeneralAppearance({
-         wpId: this.wpId,
-      }).then((res) => {
-            if (res.code == 200) {
+      api
+        .monitorFindGeneralAppearance({
+          wpId: this.wpId,
+        })
+        .then((res) => {
+          if (res.code == 200) {
             this.wpnumMap = res.data.fczbmap.jczbmap;
             this.fjmap = res.data.fjmap[0];
             this.zmmap = res.data.zmmap;
           }
-      });
-
-
+        });
 
-    //   let that = this;
-    //   that.API.requestData({
-    //     method: "POST",
-    //     subUrl: "monitor/findGeneralAppearance",
-    //     data: {
-    //       wpId: that.wpId,
-    //     },
-    //     success(res) {
-    //       if (res.code == 200) {
-    //         that.wpnumMap = res.data.fczbmap.jczbmap;
-    //         that.fjmap = res.data.fjmap[0];
-    //         that.zmmap = res.data.zmmap;
-    //       }
-    //     },
-    //   });
+      //   let that = this;
+      //   that.API.requestData({
+      //     method: "POST",
+      //     subUrl: "monitor/findGeneralAppearance",
+      //     data: {
+      //       wpId: that.wpId,
+      //     },
+      //     success(res) {
+      //       if (res.code == 200) {
+      //         that.wpnumMap = res.data.fczbmap.jczbmap;
+      //         that.fjmap = res.data.fjmap[0];
+      //         that.zmmap = res.data.zmmap;
+      //       }
+      //     },
+      //   });
     },
     renderBtnActiveIndex() {
       this.btnGroups.forEach((pEle, pIndex) => {

+ 14 - 12
src/views/layout/Header.vue

@@ -126,19 +126,21 @@ export default {
   mounted() {
     let that = this;
     $(document).keydown((event) => {
-      if (event.keyCode == 67) {
+      console.log(event.keyCode);
+      if (event.keyCode == 192 ) {
         // c
-        let firstDate = new Date();
-        if (that.firsttime == 0) {
-          that.firsttime = firstDate.getTime();
-        } else {
-          var lastDate = new Date();
-          var lastTime = lastDate.getTime();
-          if (lastTime - that.firsttime < 1000) {
-            that.changeTheme();
-            that.firsttime = 0;
-          }
-        }
+        // let firstDate = new Date();
+        // if (that.firsttime == 0) {
+        //   that.firsttime = firstDate.getTime();
+        // } else {
+        //   var lastDate = new Date();
+        //   var lastTime = lastDate.getTime();
+        //   if (lastTime - that.firsttime < 1000) {
+        //     that.changeTheme();
+        //     that.firsttime = 0;
+        //   }
+        // }
+        that.changeTheme();
       }
     });
   },