Merge branch 'master' of http://git.jiayuepowertech.com:9022/xiuwei/vpp

src/views/Login/Login.vue

@@ -16,7 +16,7 @@
                     </div>
                     <div class="input-div">
                         <img alt="" class="password-img" src="./img/password.png">
-                        <el-input v-model="password" class="password" placeholder="请输入登陆密码"
+                        <el-input v-model="password" class="password" placeholder="请输入登录密码"
                                   show-password></el-input>
                     </div>
                     <div style="text-align: left">
@@ -30,7 +30,7 @@
                 </div>
             </div>
             <div v-if="activeName === 'first'" class="button-div">
-                <el-button type="primary" @click="loginSubmit">登陆</el-button>
+                <el-button type="primary" @click="loginSubmit">登录</el-button>
                 <el-button @click="cancel">取消</el-button>
             </div>
             <a class="left" href="">下载浏览器</a>
@@ -118,7 +118,7 @@ export default {
   right: 0;
   bottom: 0;
   background: url("./img/login.png") no-repeat;
-  background-size: cover;
+  background-size: 100% 100%;
 }
 
 
@@ -136,7 +136,8 @@ export default {
 }
 
 .tab-wrapper {
-  width: 500px;
+  width: 100%;
+  height: 100%;
   text-align: center;
 
   .tab2 {
@@ -149,10 +150,10 @@ export default {
   }
 
   .tab1, .tab2 {
-    width: 104px;
+    width: 100%;
     font-size: 24px !important;
     font-weight: 1000;
-    height: 50px;
+    height: 100%;
     color: #c4c4c4;
     display: inline;
 
@@ -167,11 +168,11 @@ export default {
   }
 
   .active1 {
-    left: 147px;
+    left: 28%;
   }
 
   .active2 {
-    left: 310px;
+    left: 62%;
   }
 
   .line {
@@ -183,29 +184,25 @@ export default {
 
 
 .tab {
-  width: 500px;
-  height: 603px;
+  width: 27%;
+  height: 60%;
   position: absolute;
-  top: 284px;
+  top: 26%;
   left: 12%;
 
-  .phone {
-    display: inline;
-    margin-bottom: 30px;
-  }
 
   .phone-img {
     position: absolute;
     width: 22px;
     height: 28px;
-    top: 100px;
+    top: 18%;
   }
 
   .password-img {
     width: 21px;
     height: 21px;
     position: absolute;
-    top: 223px;
+    top: 40%;
   }
 
 
@@ -218,8 +215,6 @@ export default {
   left: 3%;
 }
 
-.input-div {
-}
 
 .code {
   width: 100px;
@@ -230,7 +225,7 @@ export default {
 .left, .right {
   position: absolute;
   color: #fff;
-  bottom: 15px;
+  bottom: 10%;
   font-size: 20px;
   color: rgb(0, 255, 231);
 }
@@ -247,16 +242,15 @@ export default {
 /deep/ .el-input__inner {
   background-color: rgba(0, 0, 0, 0);
   border: none;
-  border-bottom: 3px solid #fff;
+  border-bottom: 2px solid #fff;
   border-radius: 0;
-  height: 48px;
-  padding-bottom: 28px;
-  margin-top: 72px;
-  padding-left: 70px !important;
+  height: 100%;
+  padding-bottom: 4%;
+  margin-top: 15%;
+  padding-left: 11% !important;
   font-size: 19px;
   font-weight: 1000;
   color: #fff;
-  padding-left: 22px;
 }
 
 /deep/ .el-tabs__content {
@@ -264,7 +258,7 @@ export default {
 }
 
 /deep/ .el-checkbox {
-  margin-top: 33px;
+  margin-top: 5%;
   font-size: 20px;
 }
 
@@ -283,7 +277,7 @@ export default {
 }
 
 /deep/ .el-input__clear {
-  height: 163px;
+  height: 160%;
   font-size: 20px;
 }
 
@@ -293,23 +287,25 @@ export default {
 }
 
 /deep/ .el-button {
-  height: 50px;
-  width: 188px;
+  height: 32%;
+  width: 32%;
   font-weight: bold;
   font-size: 23px;
-  margin-top: 71px;
-
+  margin-top: 8%;
 }
 
 /deep/ .el-button--default {
-  margin-left: 46px !important;
-  border: 3px solid rgb(23, 73, 146);
-  background-color: rgb(8, 38, 88);
+  margin-left: 15% !important;
+  border: 0px solid rgb(23, 73, 146);
+  background: url("./img/img_1.png") no-repeat;
+  background-size: 100% 100%;
 }
 
 /deep/ .el-button--primary {
-  margin-left: 18px;
-  background-image: url("./img/img.png")
+  margin-left: 10%;
+  border: 0;
+  background: url("./img/img.png") no-repeat;
+  background-size: 100% 100%;
 }
 
 /deep/ .el-checkbox__inner::after {

src/views/fdjh/LeftNav.vue

@@ -9,7 +9,7 @@
         background-color="transparent"
         class="sidebar-el-menu"
         text-color="#fff"
-        :default-openeds="['/1','/1/1','/1/2','/1/3','/1/4']"
+        :default-openeds=this.testaa
         @select="selectMenu">
       <!-- 一级菜单 -->
       <template v-for="item in list">
@@ -45,8 +45,27 @@
 
 <script>
 export default {
+  mounted: function () {
+    var urlStr = window.location.href
+    var values= urlStr.split("?")[1];
+    var valstr = values.split("=")[1];
+
+    if (valstr=='fd'){
+      this.testaa.push('/1/1')
+    }
+    if (valstr=='sd'){
+      this.testaa.push('/1/2')
+    }
+    if (valstr=='ys'){
+      this.testaa.push('/1/3')
+    }
+    if (valstr=='sj'){
+      this.testaa.push('/1/4')
+    }
+  },
   data() {
     return {
+      testaa:['/1'],
       list: [
         {
           path: "/1",

src/views/fdjh/fdjh.vue

@@ -4,7 +4,7 @@
             <img alt="" onclick="window.open('/path#/rqdd','_self')" src="../ssddjk/img/返回首页.png">
         </div>
         <div id="iframe0" class="pos_2" style="">
-            <iframe src="/#/fdjhnav" style="width: 100%;height: 100%">
+            <iframe id="leftnavframe" src="" style="width: 100%;height: 100%">
             </iframe>
         </div>
         <div id="iframe1" class="pos_3" style="">
@@ -16,7 +16,18 @@
 
 <script>
 export default {
-    name: 'fdjh-name'
+    name: 'fdjh-name',
+    mounted: function () {
+      var urlStr = window.location.href
+      var values= urlStr.split("?")[1];
+      var varstr = values.split("=")[1];
+      let url = "/#/fdjhnav?id="+varstr; //拼接上需要传递的参数
+      document.getElementById("leftnavframe").src = url;
+    },
+  data() {
+    return {
+    }
+  },
 }
 </script>
 

src/views/rqdd/rqdd.vue

@@ -13,25 +13,25 @@
       </div>
 
       <div class="crumb left33">
-        <div class="textCrumb1" onclick="window.open('/path#/fdjh','_self')">
+        <div class="textCrumb1" onclick="window.open('/path#/fdjh?id=fd','_self')">
           发电端计划监控
         </div>
       </div>
       <div class="partition" style="left: 43.2%"/>
       <div class="crumb left44">
-        <div class="textCrumb1" onclick="window.open('/path#/fdjh','_self')">
+        <div class="textCrumb1" onclick="window.open('/path#/fdjh?id=sd','_self')">
           用电端计划监控
         </div>
       </div>
       <div class="partition" style="left: 54.2%"/>
       <div class="crumb left55">
-        <div class="textCrumb" onclick="window.open('/path#/fdjh','_self')">
+        <div class="textCrumb" onclick="window.open('/path#/fdjh?id=ys','_self')">
           约束条件监控
         </div>
       </div>
       <div class="partition" style="left: 65.2%"/>
       <div class="crumb left66">
-        <div class="textCrumb" onclick="window.open('/path#/fdjh','_self')">
+        <div class="textCrumb" onclick="window.open('/path#/fdjh?id=sj','_self')">
           数据采集监控
         </div>
       </div>

src/views/ssdd/LeftNav.vue

@@ -5,7 +5,7 @@
         </div>
         <div style="height: 40px"></div>
         <el-menu
-                :default-openeds="['/1','/1/1','/1/2','/1/3']"
+                :default-openeds=this.testaa
                 active-text-color="#ffd04b"
                 background-color="transparent"
                 class="sidebar-el-menu"
@@ -54,6 +54,7 @@
 export default {
     data() {
         return {
+            testaa: ['/1'],
             list: [
                 {
                     path: "/1",
@@ -122,6 +123,21 @@ export default {
             ]
         }
     },
+    mounted: function () {
+        var urlStr = window.location.href
+        var values = urlStr.split("?")[1];
+        var valstr = values.split("=")[1];
+
+        if (valstr == 'fd') {
+            this.testaa.push('/1/1')
+        }
+        if (valstr == 'ys') {
+            this.testaa.push('/1/2')
+        }
+        if (valstr == 'sj') {
+            this.testaa.push('/1/3')
+        }
+    },
     methods: {
         selectMenu(key, keyPath, node) {
             // 右侧区域显示页面

src/views/ssdd/ssdd.vue

@@ -4,7 +4,7 @@
             <img alt="" onclick="window.open('/path#/ssddjk','_self')" src="../ssddjk/img/返回首页.png">
         </div>
         <div id="iframe0" class="pos_2" style="">
-            <iframe src="/#/ssddnav" style="width: 100%;height: 100%">
+            <iframe id="leftnavframe" style="width: 100%;height: 100%">
             </iframe>
         </div>
         <div id="iframe1" class="pos_3" style="">
@@ -16,7 +16,14 @@
 
 <script>
 export default {
-    name: 'fdjh-name'
+    name: 'fdjh-name',
+    mounted: function () {
+        var urlStr = window.location.href
+        var values = urlStr.split("?")[1];
+        var varstr = values.split("=")[1];
+        let url = "/#/ssddnav?id=" + varstr; //拼接上需要传递的参数
+        document.getElementById("leftnavframe").src = url;
+    },
 }
 </script>
 

src/views/ssddjk/ssdd.vue

@@ -13,18 +13,18 @@
             </div>
             <div class="partition" style="left: 43.2%"/>
             <div class="crumb left33">
-                <div class="textCrumb1" onclick="window.open('/path#/ssdd','_self')">
+                <div class="textCrumb1" onclick="window.open('/path#/ssdd?id=fd','_self')">
                     发电端计划监控
                 </div>
             </div>
             <div class="partition" style="left: 54.2%"/>
             <div class="crumb left55">
-                <div class="textCrumb" onclick="window.open('/path#/ssdd','_self')">
+                <div class="textCrumb" onclick="window.open('/path#/ssdd?id=ys','_self')">
                     约束条件监控
                 </div>
             </div>
             <div class="crumb left66">
-                <div class="textCrumb" onclick="window.open('/path#/ssdd','_self')">
+                <div class="textCrumb" onclick="window.open('/path#/ssdd?id=sj','_self')">
                     数据采集监控
                 </div>
             </div>

src/views/tabledata.json

@@ -261,13 +261,6 @@
       "plan": "50",
       "time": "00:00:00",
       "status": "是"
-    },
-    {
-      "stationName": "国电龙源官村风电场",
-      "type": "风机",
-      "plan": "50",
-      "time": "00:00:00",
-      "status": "是"
     }
   ],
   "rqdddmList": [

src/views/xndc/modules/center-top.vue

@@ -42,14 +42,14 @@
         <img :height="25" :width="195"
              alt="" src="../../../assets/images/shape6.png" style="position:absolute;margin-top: 3%;margin-left: -12%">
         <div style="position:absolute;margin-top: 2%;margin-left: 5.8%;font-weight: bold">总发电量：<span
-                style="color: #40ffff">6000KW</span></div>
+                style="color: #40ffff">6000MWh</span></div>
         <img :height="50" :width="50"
              alt="" src="../../../assets/images/shape5.png"
              style="position:absolute;margin-top: 1.5%;margin-left: 3%">
         <img :height="25" :width="195"
              alt="" src="../../../assets/images/shape6.png" style="position:absolute;margin-top: 3%;margin-left: 3%">
         <div style="position:absolute;margin-top: 2%;margin-left: 20.8%;font-weight: bold">总用电量：<span
-                style="color: gold">6000KW</span></div>
+                style="color: gold">6000MWh</span></div>
         <!-- 告警弹框 -->
         <div v-if="dialogShow" class="dialogInfoBg">
             <!-- 弹框头 -->

src/views/xtpzyrz/LeftNav.vue

@@ -5,7 +5,7 @@
         </div>
         <div style="height: 40px"></div>
         <el-menu
-                :default-openeds="['/1','/1/1','/1/2']"
+                :default-openeds="['/1']"
                 active-text-color="#ffd04b"
                 background-color="transparent"
                 class="sidebar-el-menu"