1.登录失败增加警告信息；

2.解决地图地名点击，地图消失问题；取消地图下钻功能；图标为设备点击图标取消与右侧折线图的联动；
3.首页更改折线图动态线条颜色；
4.调整后台管理右上方的下拉菜单（首页/退出登录）位置。

ipp-ap/src/page/index/index.vue

@@ -15,7 +15,7 @@
         <!-- 顶部标签卡 -->
         <tags/>
         <!-- 主体视图层 -->
-        <el-scrollbar style="height:100%">
+        <el-scrollbar style="height:100%;margin-top: 1%">
           <keep-alive>
             <router-view class="avue-view"
                          v-if="$route.meta.$keepAlive"/>

ipp-ap/src/page/index/logo.vue

@@ -9,7 +9,7 @@
     </transition>
     <transition-group name="fade">
       <template v-if="!keyCollapse">
-        <span class="avue-logo_title" @click="pushDash" style="cursor: pointer"
+        <span class="avue-logo_title" @click="pushDash" style="cursor: pointer;display: flex;justify-content: center;align-items: center;"
               key="1"><img src="@/assets/images/znzx-logo2.png" style="width: 35px;height: 35px;">{{website.indexTitle}} </span>
       </template>
     </transition-group>

ipp-ap/src/page/index/top/index.vue

@@ -34,7 +34,7 @@
           {{userInfo.username}}
           <i class="el-icon-arrow-down el-icon--right"></i>
         </span>
-        <el-dropdown-menu slot="dropdown">
+        <el-dropdown-menu slot="dropdown" >
           <el-dropdown-item>
             <router-link to="/homePage">首页</router-link>
           </el-dropdown-item>
@@ -85,7 +85,7 @@
         "tag",
         "logsLen",
         "logsFlag"
-      ])
+      ]),
     },
     methods: {
       handleScreen() {

ipp-ap/src/store/modules/user.js

@@ -7,6 +7,7 @@ import {getMenu} from '@/api/admin/menu'
 import {applyId} from "@/util/self";
 import {fetchSelectList} from "@/api/admin/dataAuth";
 import route from "@/router/views/index"
+import {Message} from "element-ui";
 
 function addPath(ele, first) {
   const menu = webiste.menu
@@ -66,13 +67,22 @@ const user = {
       param.append('username', userInfo.username)
       param.append('password', userInfo.password)
       return new Promise((resolve, reject) => {
+
         loginByUsername(param).then(response => {
-          const data = response.data
-          commit('SET_ACCESS_TOKEN', data.data)
-          commit('SET_REFRESH_TOKEN', data.data)
-          // commit('SET_EXPIRES_IN', data.expires_in)
-          commit('CLEAR_LOCK')
-          resolve()
+         if(response !== undefined){
+           const data = response.data
+           commit('SET_ACCESS_TOKEN', data.data)
+           commit('SET_REFRESH_TOKEN', data.data)
+           // commit('SET_EXPIRES_IN', data.expires_in)
+           commit('CLEAR_LOCK')
+           resolve()
+         }else{
+           Message({
+             type:'error',
+             message:'用户名或者密码错误,请重新输入'
+           })
+         }
+
         })
       })
     },

ipp-ap/src/styles/top.scss

@@ -4,7 +4,7 @@
     box-shadow: 0 1px 4px rgba(0,21,41,.08);
     color: rgba(0, 0, 0, .65);
     font-size: 28px;
-    height: 64px;
+    height: 50px;
     box-sizing: border-box;
     white-space: nowrap;
     .el-menu-item{
@@ -57,11 +57,11 @@
 
 .top-bar__left,
 .top-bar__right {
-    height: 64px;
+    height: 34px;
     position: absolute;
-    top: 0;
+    top: 5px;
     i{
-        line-height: 64px;
+        line-height: 34px;
     }
 }
 

ipp-ap/src/views/homePage/curveComparison.vue

@@ -48,7 +48,7 @@
   import {mapGetters} from 'vuex'
   import * as echarts from 'echarts';
   import {getManufactorByStationCode} from '@/api/forecastmanufactor'
-
+  import cc from '../curvecolors'
   export default {
     name: 'forecastpowerultrashortterm',
     props: {
@@ -114,6 +114,7 @@
           }
         });
         let _this = this
+        let tempDqLineColor = 1
         for (let item in shortPower[0]) {
           _this.arrays.push({
             name: item + '短期',
@@ -123,11 +124,12 @@
             symbolSize: 5,
             data: shortPower[0][item],
             itemStyle: {
-              color: 'blue'
+              color: cc["dq"+tempDqLineColor]
             }
           });
+          tempDqLineColor=tempDqLineColor+1
         }
-
+        let tempCdqLineColor = 1
         for (let item in ultraShortPower[0]) {
           _this.arrays.push({
             name: item + '超短期',
@@ -137,9 +139,10 @@
             symbolSize: 5,
             data: ultraShortPower[0][item],
             itemStyle: {
-              color: 'yellow'
+              color: cc["cdq"+tempCdqLineColor]
             }
           });
+          tempCdqLineColor = tempCdqLineColor+1
         }
 
         this.chart = echarts.init(document.getElementById('echarts'))

ipp-ap/src/views/homePage/echartsMap.vue

@@ -198,7 +198,7 @@
                 ]
               }
               // pos.leftCur >= 122.5 ||
-              if (name === '内蒙古自治区') {
+              if (name === '通辽市') {
                 pos.leftCur = 53
               } else {
                 if (name.length >= 4) {
@@ -421,7 +421,7 @@
                     font: style.font
                   },
                   onclick: function () {
-                    handleEvents.resetOption(chart, option, '内蒙古自治区')
+                    handleEvents.resetOption(chart, option, '通辽市')
                   }
                 }, {
                   type: 'text',
@@ -434,7 +434,7 @@
                     font: '12px "Microsoft YaHei", sans-serif'
                   },
                   onclick: function () {
-                    handleEvents.resetOption(chart, option, '内蒙古自治区')
+                    handleEvents.resetOption(chart, option, '通辽市')
                   }
                 }]
               }],
@@ -522,17 +522,19 @@
           chart.setOption(option)
           // 添加事件
           chart.on('click', function (params) {
-            if(params.data != undefined){
+            // 增加与父折线图点击事件的条件，只有是场站类型的才可以联动
+            if(params.data != undefined && params.data.record.type =="ElectricField" ){
               handleEvents.changeStationCode(params.data.record.sign)
             }
-            const _this = this
-            if (opt.goDown && params.name !== name[idx]) {
-              if (cityMap[params.name]) {
-                let url = cityMap[params.name]
-                _self.$echarts.registerMap(params.name, url)
-                handleEvents.resetOption(_this, option, params.name)
-              }
-            }
+            // 此版本系统点击地名的下钻事件已关闭
+            // const _this = this
+            // if (opt.goDown && params.name !== name[idx]) {
+            //   if (cityMap[params.name]) {
+            //     let url = cityMap[params.name]
+            //     _self.$echarts.registerMap(params.name, url)
+            //     handleEvents.resetOption(_this, option, params.name)
+            //   }
+            // }
           })
           return chart
         }