Browse Source

BUG修复

Koishi 4 days atrás
parent
commit
439828cddd
3 changed files with 36 additions and 8 deletions
  1. 1 2
      .env.development
  2. 24 3
      src/nxfStyle.less
  3. 11 3
      src/views/economicsOperation/nxfHomePage/index.vue

+ 1 - 2
.env.development

@@ -19,8 +19,7 @@ VUE_APP_API=http://10.220.1.5:6060
 # VUE_APP_API=http://10.220.1.244:6060
 
 
-# VUE_APP_URL=https://10.220.1.5:5300
-VUE_APP_URL=http://127.0.0.1:8080
+VUE_APP_URL=https://10.220.1.5:5300
 # VUE_APP_URL=https://10.112.33.5:5300
 
 VUE_APP_URL2=http://127.0.0.1:8080

+ 24 - 3
src/nxfStyle.less

@@ -603,11 +603,11 @@
     // el-tabs
     .el-tabs .el-tabs__item.is-active,
     .el-tabs .el-tabs__item:hover {
-        color: #67b9ff;
+        color: #f8f8ff;
     }
 
     .el-tabs .el-tabs__active-bar {
-        background-color: #67b9ff;
+        background-color: #40a7ee;
     }
 
     .el-tabs.el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
@@ -622,8 +622,29 @@
         border-color: #67b9ff;
     }
 
+    // el-tabs 下划线错位修复
+    .el-tabs .el-tabs__header {
+        .el-tabs__active-bar {
+            display: none !important;
+        }
+
+        .el-tabs__item {
+            padding: 0;
+            margin: 0 16px;
+            border: 0;
+            transition: 0.2s;
+
+            &.is-active {
+                border-bottom: 2px solid #40a7ee;
+                transition: 0.2s;
+            }
+        }
+    }
+
+
+
     .el-tabs .el-tabs__item {
-        color: #aaa;
+        color: #97a8ca;
     }
 
     // 下拉菜单

+ 11 - 3
src/views/economicsOperation/nxfHomePage/index.vue

@@ -147,8 +147,11 @@
       </el-tab-pane>
       <el-tab-pane label="运行指标" name="yxzb">
         <iframe
-          :src="process.env.VUE_APP_URL+'/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/862c8272-8cf8-435c-b3fc-b28936b4bfe0?instanceId=c5bf624f-051d-4252-5d08-bd69a82f1f1a'"
-          class="yxzb"
+          :src="
+            iframeUrl +
+            '/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/862c8272-8cf8-435c-b3fc-b28936b4bfe0?instanceId=c5bf624f-051d-4252-5d08-bd69a82f1f1a'
+          "
+          class="yxzbBox"
         ></iframe>
       </el-tab-pane>
     </el-tabs>
@@ -187,6 +190,7 @@ export default {
     return {
       tabActiveName: "jjfx",
       activeIndex: 0,
+      iframeUrl: "",
       tabData: [
         {
           id: "year",
@@ -256,6 +260,10 @@ export default {
       timmer: null, // 定时器开关
     };
   },
+
+  created() {
+    this.iframeUrl = process.env.VUE_APP_URL;
+  },
   mounted() {
     this.getGeneratingcapacity();
     this.timmer = setInterval(() => {
@@ -384,7 +392,7 @@ export default {
     height: 100%;
   }
 
-  .yxzb {
+  .yxzbBox {
     width: 100%;
     height: 100%;
     border: 0;