Browse Source

综合报警调试并部署

SunZehao 4 months ago
parent
commit
9fc97208ff

+ 3 - 3
.env.development

@@ -27,7 +27,7 @@ VUE_APP_ALARM=http://10.220.1.11:6015
 
 # # VUE_APP_API=http://192.168.1.116:6060
 # VUE_APP_API=http://120.46.128.147:6060
-VUE_APP_API=http://10.220.1.11:6015
+VUE_APP_API=http://10.220.1.8:6070
 # VUE_APP_API=http://127.0.0.1:6060
 # # VUE_APP_API=http://192.168.1.109:6060
 
@@ -50,9 +50,9 @@ VUE_APP_API=http://10.220.1.11:6015
 # VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
 
 # # 综合报警
-VUE_APP_ALARM=http://10.220.1.11:6015
+# VUE_APP_ALARM=http://10.220.1.11:6015
 
-VUE_APP_ADP_BASE_URL='http://172.16.12.103'
+# VUE_APP_ADP_BASE_URL='http://172.16.12.103'
 # # 登录
 # VUE_APP_VUE_LOGIN_URL=http://10.81.3.127:48080
 # # VUE_APP_VUE_LOGIN_URL=http://192.168.1.102:48080

+ 3 - 3
.env.production

@@ -27,7 +27,7 @@ VUE_APP_ALARM=http://10.220.1.11:6015
 
 
 # VUE_APP_API=http://123.60.219.66:6060
-VUE_APP_API=http://10.220.1.11:6015
+VUE_APP_API=http://10.220.1.8:6070
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS='ws://10.81.3.155:9002'
 # VUE_APP_ADAPTERURL=http://10.81.3.155:8011
@@ -43,8 +43,8 @@ VUE_APP_API=http://10.220.1.11:6015
 # VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
 
 # # 综合报警
-VUE_APP_ALARM=http://10.220.1.11:6015
+# VUE_APP_ALARM=http://10.220.1.11:6015
 
-VUE_APP_ADP_BASE_URL='http://172.16.12.103'
+# VUE_APP_ADP_BASE_URL='http://172.16.12.103'
 # # 登录
 # VUE_APP_VUE_LOGIN_URL=http://10.81.3.127:48080

+ 17 - 4
src/App.vue

@@ -24,6 +24,9 @@
             &gt;&gt;&nbsp;演示平台</span
           > -->
         <!-- </div> -->
+        <div class="header-menu-nxf">
+          <nxf-header />
+        </div>
         <div class="header-menu-body">
           <!-- <Header /> -->
           <tab-header />
@@ -97,6 +100,7 @@ import {
 import alarmBadge from "@/components/alarm-badge/index.vue";
 import Menu from "@/views/layout/Menu.vue";
 import Header from "@/views/layout/Header.vue";
+import nxfHeader from "@/views/layout/nxfHeader.vue";
 import tabHeader from "@/views/layout/tabHeader.vue";
 import LoginPage from "./views/layout/login-page.vue";
 import { GetBoosterlist } from "@/api/factoryMonitor/index.js";
@@ -112,6 +116,7 @@ export default {
     Menu,
     Header,
     tabHeader,
+    nxfHeader,
     LoginPage,
     alarmBadge,
     SvgIcon,
@@ -678,7 +683,7 @@ body {
   font-family: @defalut-font-family;
 }
 @menuWidth: 51.28px;
-@headerHeight: 39px;
+@headerHeight: 110px;
 .main {
   width: 100%;
   height: 100%;
@@ -692,8 +697,8 @@ body {
     // flex: 0 0 100%;
 
     width: 100%;
-    display: flex;
-    flex-direction: row;
+    // display: flex;
+    // flex-direction: row;
     height: @headerHeight;
     border-bottom: 1px solid #142b29;
     .header-title {
@@ -701,8 +706,16 @@ body {
       margin: auto;
       color: #fff;
     }
+    .header-menu-nxf{
+        height: 72px;
+        flex-grow: 1;
+        background-image: url("./assets/nxfImg/header1.png");
+        background-repeat: no-repeat;
+        background-size: cover;
+    }
     .header-menu-body {
-      flex-grow: 1;
+        height: 39px;
+        flex-grow: 1;
     }
   }
   .menu-body {

BIN
src/assets/nxfImg/header.png


BIN
src/assets/nxfImg/header1.png


BIN
src/assets/nxfImg/menu.png


+ 86 - 78
src/nxfStyle.less

@@ -5,7 +5,7 @@
 
     // /integratedAlarm/safe/realwarning 卡片
     .card {
-        color     : rgb(228, 236, 255);
+        color: rgb(228, 236, 255);
         background: #142446;
 
         .safeCom {
@@ -36,8 +36,8 @@
     .pickerFifter {
         .buttons {
             background-color: rgba(37, 112, 206, 0.2);
-            border          : 1px solid rgb(37, 112, 206);
-            color           : rgb(37, 112, 206);
+            border: 1px solid rgb(37, 112, 206);
+            color: rgb(37, 112, 206);
         }
     }
 
@@ -50,7 +50,7 @@
         }
 
         .el-button:last-of-type {
-            color           : #fff;
+            color: #fff;
             background-color: rgb(37, 112, 206);
         }
     }
@@ -63,12 +63,12 @@
     }
 
     .buttons {
-        color           : #fff;
+        color: #fff;
         background-color: rgb(37, 112, 206);
-        border          : 0;
+        border: 0;
 
         &:hover {
-            color     : rgb(223, 232, 250);
+            color: rgb(223, 232, 250);
             background: rgb(26, 92, 175);
         }
     }
@@ -91,24 +91,24 @@
 
     // /economicsOperation/thematicAnalysis/windEnergy
     .parcel-box .search .searchColor {
-        color           : #fff;
+        color: #fff;
         background-color: rgb(37, 112, 206);
-        border          : 0;
+        border: 0;
 
         &:hover {
-            color     : rgb(223, 232, 250);
+            color: rgb(223, 232, 250);
             background: rgb(26, 92, 175);
         }
     }
 
     // /economicsOperation/stationAnalyse/WindAndPhotovoltaic
     .windAndPhotovoltaic .wp-search .searchColor {
-        color           : #fff;
+        color: #fff;
         background-color: rgb(37, 112, 206);
-        border          : 0;
+        border: 0;
 
         &:hover {
-            color     : rgb(223, 232, 250);
+            color: rgb(223, 232, 250);
             background: rgb(26, 92, 175);
         }
     }
@@ -117,11 +117,11 @@
     .selections {
         .selections_btn {
             background: rgba(37, 112, 206, 0.2);
-            border    : 1px solid rgba(37, 112, 206, 0.2);
+            border: 1px solid rgba(37, 112, 206, 0.2);
 
             &.active {
                 background: rgb(37, 112, 206);
-                border    : 1px solid rgb(37, 112, 206);
+                border: 1px solid rgb(37, 112, 206);
             }
         }
     }
@@ -148,12 +148,12 @@
     }
 
     .searchColor {
-        color           : #fff;
+        color: #fff;
         background-color: rgb(37, 112, 206);
-        border          : 0;
+        border: 0;
 
         &:hover {
-            color     : rgb(223, 232, 250);
+            color: rgb(223, 232, 250);
             background: rgb(26, 92, 175);
         }
     }
@@ -171,7 +171,7 @@
         }
 
         .mouth {
-            border-top   : 1px solid #67b9ff;
+            border-top: 1px solid #67b9ff;
             border-bottom: 1px solid #67b9ff;
 
             &.active {
@@ -187,14 +187,19 @@
     }
 
     // header 菜单激活状态
-    .header-menu {
-        .header-menu-list {
-            .header-menu-item {
+    .header-menu,
+    .header-nxf {
+
+        .header-menu-list,
+        .header-nxf-list {
+
+            .header-menu-item,
+            .header-nxf-item {
                 outline: none;
 
                 &.active {
-                    color       : #67b9ff;
-                    background  : linear-gradient(to top, rgba(#2169c3, 0.5), rgba(#142446, 0)) !important;
+                    color: #67b9ff;
+                    background: linear-gradient(to top, rgba(#2169c3, 0.5), rgba(#142446, 0)) !important;
                     border-color: #2169c3 !important;
 
                     &:after {
@@ -205,8 +210,11 @@
         }
 
         // header 右侧 user
-        .header-menu-user {
-            .header-menu-user-title {
+        .header-menu-user,
+        .header-nxf-user {
+
+            .header-menu-user-title,
+            .header-nxf-user-title {
                 .el-dropdown-link {
                     color: #67b9ff;
                 }
@@ -247,12 +255,12 @@
     .form-wrapper {
         .btns {
             .buttons {
-                color           : #fff;
+                color: #fff;
                 background-color: rgb(37, 112, 206);
-                border          : 0;
+                border: 0;
 
                 &:hover {
-                    color     : rgb(223, 232, 250);
+                    color: rgb(223, 232, 250);
                     background: rgb(26, 92, 175);
                 }
             }
@@ -265,12 +273,12 @@
 
         // 左侧导航菜单二级
         .sub-menu {
-            background  : rgba(3, 7, 19, 0.75);
+            background: rgba(3, 7, 19, 0.75);
             border-color: rgba(#2169c3, 0.5);
 
             .menu-item {
-                border    : 0;
-                color     : #777;
+                border: 0;
+                color: #777;
                 background: rgb(8, 23, 44);
 
                 &.active {
@@ -302,7 +310,7 @@
     // el-dialog 弹窗
     .el-dialog {
         background: fade(rgb(3, 7, 19), 95);
-        border    : 1px solid fade(#2169c3, 50);
+        border: 1px solid fade(#2169c3, 50);
         box-shadow: 0px 8px 17px 1px rgba(#2169c3, 0.3);
 
         &.el-dialog--center .el-dialog__body,
@@ -313,7 +321,7 @@
         &.hide-header {
             .el-dialog__header {
                 background: none; // 去除弹窗 header 背景图片
-                border    : none;
+                border: none;
 
                 .el-dialog__title {
                     display: none;
@@ -349,7 +357,7 @@
 
                 .el-icon-close {
                     background-color: transparent;
-                    border          : 1px solid #fff;
+                    border: 1px solid #fff;
                 }
             }
         }
@@ -358,7 +366,7 @@
     // 组件下拉选框
     .el-popper {
         &.el-cascader__dropdown[role="tooltip"] {
-            background  : @picker-bg-color;
+            background: @picker-bg-color;
             border-color: @picker-bg-color;
 
             .el-cascader-menu {
@@ -368,7 +376,7 @@
             .el-cascader-node:not(.is-disabled):focus,
             .el-cascader-node:not(.is-disabled):hover {
                 background: fade(@green, 20);
-                color     : @green;
+                color: @green;
             }
 
             .el-cascader-node.in-active-path,
@@ -380,7 +388,7 @@
 
         &.el-select__popper[role="tooltip"] {
             border-color: @picker-bg-color;
-            background  : @picker-bg-color;
+            background: @picker-bg-color;
 
             .el-cascader-menu {
                 border-color: @gray;
@@ -389,7 +397,7 @@
             .el-select-dropdown__item.hover,
             .el-select-dropdown__item:hover {
                 background: fade(rgb(26, 92, 175), 20);
-                color     : rgb(223, 232, 250);
+                color: rgb(223, 232, 250);
 
                 // color           : #fff;
                 // background-color: rgb(37, 112, 206);
@@ -397,8 +405,8 @@
             }
 
             .el-select-dropdown__item.selected {
-                background  : transparent;
-                color       : rgb(26, 92, 175);
+                background: transparent;
+                color: rgb(26, 92, 175);
                 border-color: rgb(26, 92, 175);
             }
         }
@@ -406,8 +414,8 @@
 
     // 日期选择组件
     .el-picker__popper.el-popper[role="tooltip"] {
-        border-color: @picker-bg-color  !important;
-        background  : @picker-bg-color  !important;
+        border-color: @picker-bg-color !important;
+        background: @picker-bg-color !important;
     }
 
     .el-picker-panel__footer {
@@ -418,7 +426,7 @@
         }
 
         .el-button.is-plain {
-            color       : #67b9ff;
+            color: #67b9ff;
             border-color: #67b9ff;
         }
     }
@@ -452,9 +460,9 @@
 
     .el-picker-panel {
         .el-time-panel {
-            border-color    : #fff;
+            border-color: #fff;
             background-color: rgb(3, 7, 19);
-            box-shadow      : var(--el-box-shadow-light);
+            box-shadow: var(--el-box-shadow-light);
         }
 
         .el-time-spinner__item {
@@ -512,17 +520,17 @@
     // 确认弹窗
     .el-overlay .el-message-box {
         background: rgba(3, 7, 19, 0.95);
-        border    : 1px solid rgba(33, 105, 195, 0.5);
+        border: 1px solid rgba(33, 105, 195, 0.5);
         box-shadow: 0px 8px 17px 1px rgba(33, 105, 195, 0.3);
 
         .el-message-box__btns {
             .el-button.el-button--primary {
-                color           : #fff;
+                color: #fff;
                 background-color: rgb(37, 112, 206);
-                border          : 0;
+                border: 0;
 
                 &:hover {
-                    color     : rgb(223, 232, 250);
+                    color: rgb(223, 232, 250);
                     background: rgb(26, 92, 175);
                 }
             }
@@ -551,7 +559,7 @@
     .el-checkbox .el-checkbox__input.is-checked .el-checkbox__inner,
     .el-checkbox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
         background-color: #2169c3;
-        border-color    : #2169c3;
+        border-color: #2169c3;
     }
 
     .el-checkbox .el-checkbox__input.is-checked+.el-checkbox__label {
@@ -600,14 +608,14 @@
     // 顶部右上角退出登录
     .el-scrollbar__view.el-dropdown__list {
         background: transparent;
-        margin    : 0;
-        padding   : 0;
+        margin: 0;
+        padding: 0;
     }
 
     // el-radio 选中状态
     .el-radio.is-checked {
         .el-radio__inner {
-            background  : #67b9ff;
+            background: #67b9ff;
             border-color: #67b9ff;
         }
 
@@ -624,12 +632,12 @@
     // 部分页面顶部搜索条件右侧按钮
     .search-wrapper {
         .buttons {
-            color           : #fff;
+            color: #fff;
             background-color: rgb(37, 112, 206);
-            border          : 0;
+            border: 0;
 
             &:hover {
-                color     : rgb(223, 232, 250);
+                color: rgb(223, 232, 250);
                 background: rgb(26, 92, 175);
             }
         }
@@ -643,7 +651,7 @@
         .el-table,
         .custom-table.el-table {
             background: rgb(3, 7, 19);
-            border    : 0px; // 包裹表格父元素边框
+            border: 0px; // 包裹表格父元素边框
 
 
 
@@ -675,17 +683,17 @@
                 }
 
                 &:hover td {
-                    color           : #67b9ff; // 表格基数行 hover 文字颜色
+                    color: #67b9ff; // 表格基数行 hover 文字颜色
                     background-color: rgb(3, 7, 19) !important; // 表格基数行 hover 背景颜色
                 }
             }
 
             td {
-                border     : 0px; // 表格内部除了最后一行底部以外的上下左右边框
-                padding    : 0;
-                height     : 37px;
+                border: 0px; // 表格内部除了最后一行底部以外的上下左右边框
+                padding: 0;
+                height: 37px;
                 line-height: 37px;
-                color      : rgb(194, 225, 255);
+                color: rgb(194, 225, 255);
 
                 &.light,
                 &.always-light {
@@ -694,15 +702,15 @@
             }
 
             th {
-                border        : 0px;
-                padding       : 0px;
-                height        : 37px;
-                line-height   : 37px;
-                font-weight   : normal;
-                text-align    : center;
+                border: 0px;
+                padding: 0px;
+                height: 37px;
+                line-height: 37px;
+                font-weight: normal;
+                text-align: center;
                 // color      : rgb(85, 113, 166);
-                color         : rgb(255, 255, 255);
-                cursor        : pointer;
+                color: rgb(255, 255, 255);
+                cursor: pointer;
 
                 &.is-leaf {
                     border: 0px;
@@ -717,26 +725,26 @@
             th,
             tr {
                 background-color: transparent;
-                border          : 0px;
+                border: 0px;
             }
 
             thead {
-                color      : @gray-l;
+                color: @gray-l;
                 font-weight: 500;
-                font-size  : 14px;
-                border     : 0px;
+                font-size: 14px;
+                border: 0px;
 
                 th,
                 &.is-group th {
                     &.el-table__cell {
-                        background  : rgb(19, 35, 71);
+                        background: rgb(19, 35, 71);
                         border-color: transparent !important;
                     }
                 }
             }
 
             .el-table__body {
-                border   : 0px; // 表格最外侧除右边以外边框
+                border: 0px; // 表格最外侧除右边以外边框
                 font-size: 14px;
             }
 
@@ -746,7 +754,7 @@
                 }
 
                 &:hover td {
-                    color           : #67b9ff;
+                    color: #67b9ff;
                     background-color: rgb(16, 25, 46) !important; // 表格偶数行 hover 背景颜色
                 }
 

+ 13 - 13
src/router/index.js

@@ -467,19 +467,19 @@ export const asyncRoutes = [
                     permissions: ["jn_czfx"],
                 },
                 children: [
-                    {
-                        path: "electricAnalyse",
-                        component: () =>
-                        import(
-                            "@/views/economicsOperation/stationAnalyse/electricAnalyse"
-                        ),
-                        name: "ElectricAnalyse",
-                        meta: {
-                            title: "发电量分析",
-                            icon: "",
-                            permissions: ["jn_czfx_fdlfx"],
-                        },
-                    },
+                    // {
+                    //     path: "electricAnalyse",
+                    //     component: () =>
+                    //     import(
+                    //         "@/views/economicsOperation/stationAnalyse/electricAnalyse"
+                    //     ),
+                    //     name: "ElectricAnalyse",
+                    //     meta: {
+                    //         title: "发电量分析",
+                    //         icon: "",
+                    //         permissions: ["jn_czfx_fdlfx"],
+                    //     },
+                    // },
                     {
                         path: "stationElectricAnalyse",
                         component: () =>

+ 8 - 7
src/views/economicsOperation/nxfHomePage/index.vue

@@ -3,7 +3,8 @@
         <div class="operationHome" v-if="$route.path === '/economicsOperation'">
             <!-- <tab @select="selectionItemClick" /> -->
             <div class="tabs">
-                <div class="tab-item" v-for="(item, index) of tabData" :key="item" @click="selectTab(index, item)"
+                 <!-- @click="selectTab(index, item)" -->
+                <div class="tab-item" v-for="(item, index) of tabData" :key="item"
                     :class="{ active: activeIndex == index }">
                     {{ item.text }}
                 </div>
@@ -65,7 +66,7 @@
                     </Row>
                 </div>
                 <div class="homeRight">
-                    <Row type="flex" class="rightplan" v-for="it in rightTableData" :key="it.name" style="height:32%">
+                    <Row type="flex" class="rightplan" v-for="it in rightTableData" :key="it.name" style="height:48.5%">
                         <Col :span="24">
                         <com-panel :title="it.name" sub-title="(电量单位:万kWh)" style="position: relative;height: 100%">
                             <operationTable :data="it.data" height="100%"></operationTable>
@@ -203,10 +204,10 @@
                                 name: '设备可利用率年排名',
                                 data: res.data.sbklyl
                             },
-                            {
-                                name: '两个细则考核',
-                                data: res.data.lgxzkh
-                            },
+                            // {
+                            //     name: '两个细则考核',
+                            //     data: res.data.lgxzkh
+                            // },
                         ]
                     }
                 })
@@ -238,7 +239,7 @@
 
             .tab-item {
                 padding: 0.37vh 1.852vh;
-                cursor: pointer;
+                cursor: no-drop;
 
                 &.active {
                     color: #fff;

+ 120 - 0
src/views/layout/nxfHeader.vue

@@ -0,0 +1,120 @@
+<template>
+    <div class="header-nxf">
+        <p class="nxfP">智能管控一体化系统(惠安风场)</p>
+        <ul class="header-nxf-list">
+            <li class="header-nxf-it" v-for="(menu, index) of menus" :key="menu" @click="click(index, menu)"
+                :class="{ active: activeIndex == index }">
+                {{ menu.text }}
+            </li>
+        </ul>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                themeName: false,
+                menus: [{
+                        id: "home",
+                        text: "首页",
+                        path: "/home",
+                        isActive: true,
+                    },
+                    {
+                        id: "stateMonitor",
+                        text: "监视中心",
+                        path: "/stateMonitor",
+                        isActive: true,
+                    },
+                    {
+                        id: "integratedAlarm",
+                        text: "综合报警",
+                        path: "/integratedAlarm",
+                        isActive: true,
+                    },
+                    {
+                        id: "economicsOperation",
+                        text: "经济运行",
+                        path: "/economicsOperation",
+                        isActive: false,
+                    },
+                    {
+                        id: "health",
+                        text: "智慧检修",
+                        // path: '/sandtable',
+                        path: "/health",
+                        isActive: false,
+                    },
+                    {
+                        id: "powerGenerating",
+                        text: "发电能力分析",
+                        // path: '/sandtable',
+                        path: "/powerGenerating",
+                        isActive: false,
+                    },
+                    {
+                        id: "report",
+                        text: "智能报表",
+                        path: "/nxreport",
+                        isActive: false,
+                    },
+                ],
+                activeIndex: 0,
+                firsttime: 0,
+            };
+        },
+        methods: {
+            click(index, data) {
+
+            }
+        }
+    };
+</script>
+<style>
+    .admin-set-tooltip {
+        font-size: 14px !important;
+    }
+</style>
+<style lang="less" scoped>
+    .header-nxf {
+        display: flex;
+        width: 100%;
+        height: 100%;
+        font-size: @fontsize;
+
+        .nxfP {
+            font-family: AlibabaPuHuiTi;
+            font-size: 26px;
+            margin-left: 20px;
+            margin-right: 80px;
+            line-height: 23px;
+        }
+
+        .header-nxf-list {
+            margin: 0;
+            padding: 0;
+            list-style: none;
+            display: flex;
+            height: 100%;
+
+            .header-nxf-it {
+                position: relative;
+                top: 7px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                padding: 0 15px;
+                //   width: 9.259vh;
+                height: 100%;
+                color: #a6b8dd;
+                font-size: 18px;
+                cursor: pointer;
+                transition: color 0.2s ease-in-out;
+
+                &.hover {
+                    color: #fff;
+                }
+            }
+        }
+    }
+</style>

+ 1 - 1
src/views/layout/tabHeader.vue

@@ -256,7 +256,7 @@
         height: 100%;
         font-size: @fontsize;
         justify-content: flex-start;
-        padding-left: 20px;
+        padding-left: 35px;
 
         .header-menu-list {
             margin: 0;