配合昌盛联调发电能力分析中的浆距角分析和AGC曲线偏差分析

发电能力分析修改微观选址分析中得地图及其功能
发电能力分析修改微观选址分析中降cesium地球功能修改leftlet离线地图功能；
发电能力分析中的分析报告根据后端要求进行修改
发电能力分析修改微观选址分析中得地图及其功能，发电能力分析中的分析报告根据后端要求进行修改
发电能力分析修改微观选址分析中降cesium地球功能修改leftlet离线地图功能，并部署现场生产环境，且服务联调；
智能报表增加国能陕西新能源公司综合报表，运行情况日报表，分月分时电量统计，发电生产情况快报表，集控中心日平均风速统计表
基于风机发电量全寿命周期管控的研究与应用项目中发电能力分析系统整体UI样式整改（项目公共头部分整改，黑色版本与白色版本；风电数据准备页面白色版本修改）

components.d.ts

@@ -33,14 +33,16 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
-    ElPopover: typeof import('element-plus/es')['ElPopover']
     ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
@@ -56,7 +58,7 @@ declare module 'vue' {
     ImportDailog: typeof import('./src/components/powerPredictionComponent/configPage/importPage/importDailog.vue')['default']
     KMap: typeof import('./src/components/generatingCapacityComponent/kMap/index.vue')['default']
     MenuManagement: typeof import('./src/components/powerPredictionComponent/configPage/menuManagement.vue')['default']
-    MenuTreeconfig: typeof import('./src/components/powerPredictionComponent/configPage/menuTreeconfig.vue')['default']
+    MenuTreeconfig: typeof import('./src/components/menuTreeconfig.vue')['default']
     MHS: typeof import('./src/components/powerPredictionComponent/configPage/configDesignVue/MHS.vue')['default']
     MLiu: typeof import('./src/components/powerPredictionComponent/configPage/configDesignVue/MLiu.vue')['default']
     MonthAndYearBatterDialog: typeof import('./src/components/powerPredictionComponent/batteryDivinerDialog/monthAndYearBatterDialog.vue')['default']

src/App.vue

@@ -9,21 +9,19 @@
     <div class="windLife" :class="!swichTheme ? 'themeDark' : 'themeLight'">
         <common-header v-if="showHeader" @headerName="headerName" @swichFn="swichFn"></common-header>
         <!-- :class="!fixed ? 'menuBs' : ''" v-if="isShowMenu" -->
-        <div class="menu-body" @mouseenter="showMenu" v-if="isShowMenu" @mouseleave="hideMenu">
-            <ul class="menu-list">
+        <!-- <div class="menu-body" @mouseenter="showMenu" v-if="isShowMenu" @mouseleave="hideMenu"> -->
+        <!-- <ul class="menu-list">
                 <li class="menu-item" v-for="(menu, index) in showMenuData" :key="index"
                     @click="handleNodeClick(menu.index)">
                     <router-link :to="menu.index" v-if="menu.children">
-                        <!-- <el-tooltip class="item" effect="dark" :content="menu.name" placement="right"
-                            :enterable="false">
-                            <img :src="menu.img" alt="">
-                        </el-tooltip> -->
                         <el-popover placement="right-end" :width="200" trigger="hover" effect="dark">
                             <template #reference>
                                 <img :src="menu.img" alt="">
                             </template>
                             <div class="menuChildren">
-                                <p v-for="(it, index) in menu.children" :key="index"
+                                <p style="color: #e3a043">{{menu.name}}:</p>
+                                <p style="color: #cacaca;cursor: pointer;line-height: 50px;"
+                                    v-for="(it, index) in menu.children" :key="index"
                                     @click="openReportDetail(it.index, it.nameEn)">{{it.name}}</p>
                             </div>
                         </el-popover>
@@ -31,34 +29,68 @@
                     <router-link :to="menu.index" v-else>
                         <el-tooltip class="item" effect="dark" :content="menu.name" placement="right"
                             :enterable="false">
-                            <!-- <component :is="menu.icon">
-                            </component> -->
-                            <!-- <img :src="menu.chImg ? menu.imgEn : menu.img" @mouseenter="imgEnter(menu)" @mouseleave="imgLeave(menu)" alt="" > -->
                             <img :src="menu.img" alt="">
                         </el-tooltip>
                     </router-link>
                 </li>
-                <!-- <el-icon v-if="fixed" style="width:25px;height:25px">
+                <el-icon v-if="fixed" style="width:25px;height:25px">
                         <Lock />
                     </el-icon>
                     <el-icon v-else style="width:25px;height:25px">
                         <Unlock />
-                    </el-icon> -->
-                <!-- <li class="lockpage" @click="handleClickFixed">
+                    </el-icon>
+                <li class="lockpage" @click="handleClickFixed">
                     <img :src="proJie" v-if="fixed" alt="">
                     <img :src="proSuo" v-else alt="">
-                </li> -->
-            </ul>
-        </div>
-        <!-- :style="{ paddingLeft: fixed ? '65px' : 0 }" -->
-        <div :style="{ paddingLeft: isShowMenu ? '65px' : 0 }">
-            <router-view />
+                </li>
+            </ul> -->
+
+        <!-- </div> -->
+        <div class="mainSty">
+            <div class="elmenuSty" :style="!swichTheme ? 'background: #000;' : 'background: #504bb5;'"
+                v-if="isShowMenu">
+                <ul class="menu-list">
+                    <li class="menu-item" @click="isCollapseFn"><img :src="proSuo" alt=""></li>
+                </ul>
+                <el-menu :default-active="$route.path" router :unique-opened="true" :collapse="isCollapse"
+                    text-color="#fff" :background-color="!swichTheme ? '#000' : '#504bb5'" active-text-color="#fff">
+                    <!-- 引入组件 -->
+                    <template v-for="menu in showMenuData">
+                        <el-sub-menu :key="menu.index" :index="menu.index" v-if="menu.children"
+                            :disabled="menu.index === '' ? true : false">
+                            <!-- <img :src="menu.img"> -->
+                            <template #title>
+                                <!-- <i :class="menu.icon"></i> -->
+                                <img :src="menu.img">
+                                <span style="margin-left: 10px">{{menu.name}}</span>
+
+                                <!-- <span slot="title">{{menu.name}}</span> -->
+                            </template>
+                            <menu-tree :menuData="menu.children"></menu-tree>
+                        </el-sub-menu>
+                        <el-menu-item :key="menu.index" :index="menu.index" :route="menu.index" v-else>
+                            <!-- <i :class="menu.icon"></i> -->
+                            <img :src="menu.img" alt="">
+                            <template #title>
+                                <span style="margin-left: 10px">{{menu.name}}</span>
+                            </template>
+                            <!-- <span slot="title">{{menu.name}}</span> -->
+                        </el-menu-item>
+                    </template>
+                </el-menu>
+            </div>
+            <!-- :style="{ paddingLeft: fixed ? '65px' : 0 }"  :style="{ paddingLeft: isShowMenu ? '65px' : 0 }"-->
+            <!-- :style="pagestyFn()" -->
+            <div class="pageSty">
+                <router-view />
+            </div>
         </div>
 
     </div>
 </template>
 
 <script>
+    import MenuTree from '@/components/menuTreeconfig.vue'
     import commonHeader from '@/components/commonHeaders.vue'
     // 发电能力分析
     import gener_agcfx from '@/assets/menuImg/gener_agcfx.png'
@@ -86,6 +118,11 @@
     import report_czzybb from '@/assets/menuImg/report_czzybb.png'
     import report_erp from '@/assets/menuImg/report_erp.png'
     import report_gkjlb from '@/assets/menuImg/report_gkjlb.png'
+    import report_zhbb from '@/assets/menuImg/report_zhbb.png'
+    import report_yxqk from '@/assets/menuImg/report_yxqk.png'
+    import report_fyfsdl from '@/assets/menuImg/report_fyfsdl.png'
+    import report_fdscqk from '@/assets/menuImg/report_fdscqk.png'
+    import report_pjfs from '@/assets/menuImg/report_pjfs.png'
     // 锁
     import pro_suo from '@/assets/menuImg/pro_suo.png'
     import pro_jie from '@/assets/menuImg/pro_jie.png'
@@ -93,11 +130,13 @@
     export default {
         components: {
             commonHeader,
+            MenuTree
         },
         data() {
             return {
                 showHeader: false,
                 isShowMenu: false,
+                isCollapse: true,
                 showMenuData: [],
                 proSuo: pro_suo,
                 proJie: pro_jie,
@@ -175,18 +214,14 @@
                         img: report_erp,
                         name: 'ERP',
                         children: [{
-                            name: '新庄风电场',
-                            nameEn: 'xinzhuang',
+                            name: '新左风电场',
+                            nameEn: 'xinzuo',
                             index: '/intelligentReport/erp',
                         }, {
                             name: '吉山梁风电场',
                             nameEn: 'jiliangshan',
                             index: '/intelligentReport/erp',
                         }, {
-                            name: '左庄风电场',
-                            nameEn: 'zuozhuang',
-                            index: '/intelligentReport/erp',
-                        }, {
                             name: '繁食沟风电场',
                             nameEn: 'fanshigou',
                             index: '/intelligentReport/erp',
@@ -207,6 +242,124 @@
                         name: '场站自由报表'
                     },
                     {
+                        icon: 'Memo',
+                        index: '/intelligentReport/zhbb',
+                        img: report_zhbb,
+                        name: '国能陕西新能源公司综合报表'
+                    },
+                    {
+                        icon: 'Eleme',
+                        index: '/intelligentReport/yxqk',
+                        img: report_yxqk,
+                        name: '运行情况日报表',
+                        children: [{
+                            name: '左庄一期',
+                            nameEn: 'zuozhuangyiqi',
+                            index: '/intelligentReport/yxqk',
+                        }, {
+                            name: '左庄二期',
+                            nameEn: 'zuozhuangerqi',
+                            index: '/intelligentReport/yxqk',
+                        }, {
+                            name: '新庄一期',
+                            nameEn: 'xinzhuangyiqi',
+                            index: '/intelligentReport/yxqk',
+                        }, {
+                            name: '新庄二期',
+                            nameEn: 'xinzhuangerqi',
+                            index: '/intelligentReport/yxqk',
+                        }]
+                    },
+                    {
+                        icon: 'Eleme',
+                        index: '/intelligentReport/fyfsdl',
+                        img: report_fyfsdl,
+                        name: '分月分时电量统计',
+                        children: [{
+                            name: '新庄风电场',
+                            nameEn: 'xinzhuang',
+                            index: '/intelligentReport/fyfsdl',
+                        }, {
+                            name: '吉山梁风电场',
+                            nameEn: 'jiliangshan',
+                            index: '/intelligentReport/fyfsdl',
+                        }, {
+                            name: '左庄风电场',
+                            nameEn: 'zuozhuang',
+                            index: '/intelligentReport/fyfsdl',
+                        }, {
+                            name: '繁食沟风电场',
+                            nameEn: 'fanshigou',
+                            index: '/intelligentReport/fyfsdl',
+                        }, {
+                            name: '草山梁风电场',
+                            nameEn: 'caoshanliang',
+                            index: '/intelligentReport/fyfsdl',
+                        }, {
+                            name: '雷家山风电场',
+                            nameEn: 'leijiashan',
+                            index: '/intelligentReport/fyfsdl',
+                        }]
+                    },
+                    {
+                        icon: 'Eleme',
+                        index: '/intelligentReport/fdscqk',
+                        img: report_fdscqk,
+                        name: '发电生产情况快报表',
+                        children: [{
+                            name: '新左风电场',
+                            nameEn: 'xinzuo',
+                            index: '/intelligentReport/fdscqk',
+                        }, {
+                            name: '吉山梁风电场',
+                            nameEn: 'jiliangshan',
+                            index: '/intelligentReport/fdscqk',
+                        }, {
+                            name: '繁食沟风电场',
+                            nameEn: 'fanshigou',
+                            index: '/intelligentReport/fdscqk',
+                        }, {
+                            name: '草山梁风电场',
+                            nameEn: 'caoshanliang',
+                            index: '/intelligentReport/fdscqk',
+                        }, {
+                            name: '雷家山风电场',
+                            nameEn: 'leijiashan',
+                            index: '/intelligentReport/fdscqk',
+                        }]
+                    },
+                    {
+                        icon: 'Eleme',
+                        index: '/intelligentReport/pjfs',
+                        img: report_pjfs,
+                        name: '集控中心日平均风速统计表',
+                        children: [{
+                            name: '新庄风电场',
+                            nameEn: 'xinzhuang',
+                            index: '/intelligentReport/pjfs',
+                        }, {
+                            name: '吉山梁风电场',
+                            nameEn: 'jiliangshan',
+                            index: '/intelligentReport/pjfs',
+                        }, {
+                            name: '左庄风电场',
+                            nameEn: 'zuozhuang',
+                            index: '/intelligentReport/pjfs',
+                        }, {
+                            name: '繁食沟风电场',
+                            nameEn: 'fanshigou',
+                            index: '/intelligentReport/pjfs',
+                        }, {
+                            name: '草山梁风电场',
+                            nameEn: 'caoshanliang',
+                            index: '/intelligentReport/pjfs',
+                        }, {
+                            name: '雷家山风电场',
+                            nameEn: 'leijiashan',
+                            index: '/intelligentReport/pjfs',
+                        }]
+                    },
+                    {
                         icon: 'Finished',
                         index: '/intelligentReport/reporting',
                         img: report_bbsb,
@@ -305,10 +458,9 @@
             } else {
                 this.swichTheme = JSON.parse(window.sessionStorage.getItem('theme'))
                 if (!this.swichTheme) {
-                    document.getElementById('app').style.background = '#040c0b'
+                    document.getElementById('app').style.background = '#0F0F0F'
                 } else {
-                    document.getElementById('app').style.background =
-                        '-webkit-gradient(linear, 0% 0%, 0% 100%, from(#373590), to(#373590), color-stop(0.2, #645fef), color-stop(0.8, #645fef))'
+                    document.getElementById('app').style.background = '#5473E8'
                 }
                 this.$emit('swichFn', this.switchTheme)
             }
@@ -330,6 +482,18 @@
             // }
         },
         methods: {
+            isCollapseFn() {
+                this.isCollapse = !this.isCollapse
+            },
+            pagestyFn() {
+                let str = ''
+                if (this.isCollapse) {
+                    str = 'width: 96.5%;padding-left: 3.5%'
+                } else {
+                    str = 'width: 90%;padding-left: 10%'
+                }
+                return str
+            },
             headerName(name) {
                 this.showMenuData = []
                 if (name === '功率预测') {
@@ -343,10 +507,9 @@
             swichFn(val) {
                 this.swichTheme = val
                 if (!this.swichTheme) {
-                    document.getElementById('app').style.background = '#040c0b'
+                    document.getElementById('app').style.background = '#0F0F0F'
                 } else {
-                    document.getElementById('app').style.background =
-                        '-webkit-gradient(linear, 0% 0%, 0% 100%, from(#373590), to(#373590), color-stop(0.2, #645fef), color-stop(0.8, #645fef))'
+                    document.getElementById('app').style.background = '#5473E8'
                 }
                 // this.$router.go(0);
             },
@@ -405,9 +568,6 @@
     .el-popover {
         .menuChildren {
             p {
-                line-height: 40px;
-                cursor: pointer;
-
                 // :hover {
                 //     color: #4b55ae;
                 // }
@@ -419,105 +579,152 @@
     .windLife {
         height: 100%;
 
-        .menu-body {
-            position: absolute;
+        .mainSty {
             display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: space-between;
-
-            flex: 0 0 63px;
-            width: 63px;
-            height: calc(100% - 60px);
-            top: 60px;
-            background-color: fade(#21192a, 75%);
-            z-index: 2002;
 
+            .menu-body {
+                position: absolute;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: space-between;
 
-            &:hover {
-                opacity: 1;
-                transition: opacity 0.2s;
-                transition-timing-function: ease-out;
-                transform: translate(0);
-            }
+                flex: 0 0 63px;
+                width: 63px;
+                height: calc(100% - 60px);
+                top: 60px;
+                background-color: fade(#21192a, 75%);
+                z-index: 2002;
 
-            .menu-list {
-                margin: 0;
-                padding: 0;
-                list-style: none;
 
-                img {
-                    width: 25px;
-                    height: 25px;
+                &:hover {
+                    opacity: 1;
+                    transition: opacity 0.2s;
+                    transition-timing-function: ease-out;
+                    transform: translate(0);
                 }
 
-                .menu-item {
-                    display: flex;
-                    text-align: center;
-                    line-height: 2;
-                    padding: 12px 0;
-                    width: 25px;
-                    height: 25px;
+                .menu-list {
+                    margin: 0;
+                    padding: 0;
+                    list-style: none;
 
-                    .el-tooltip__trigger {
-                        color: #fff;
+                    img {
+                        width: 25px;
+                        height: 25px;
                     }
 
-                    a {
+                    .menu-item {
                         display: flex;
-                        width: 100%;
-                        height: 100%;
-                        font-size: 14px;
-                        text-decoration: unset;
-                        white-space: nowrap;
-                    }
+                        text-align: center;
+                        line-height: 2;
+                        padding: 12px 0;
+                        width: 25px;
+                        height: 25px;
+
+                        .el-tooltip__trigger {
+                            color: #fff;
+                        }
+
+                        a {
+                            display: flex;
+                            width: 100%;
+                            height: 100%;
+                            font-size: 14px;
+                            text-decoration: unset;
+                            white-space: nowrap;
+                        }
+
+                        &.active {
+                            background: #323e70;
+                        }
 
-                    &.active {
-                        background: #323e70;
+                        &+.menu-item {
+                            border-top: 1px solid fade(#606769, 40);
+                        }
                     }
+                }
+
+                .lockpage {
+                    position: absolute;
+                    bottom: 20px;
+
+                    .el-icon {
+                        color: #fff;
 
-                    &+.menu-item {
-                        border-top: 1px solid fade(#606769, 40);
+                        svg {
+                            width: 25px;
+                            height: 25px;
+                        }
                     }
                 }
             }
 
-            .lockpage {
-                position: absolute;
-                bottom: 20px;
+            .elmenuSty {
+                height: 100vh;
 
-                .el-icon {
-                    color: #fff;
+                img {
+                    width: 25px;
+                    height: 25px;
+                }
 
-                    svg {
-                        width: 25px;
-                        height: 25px;
+                .menu-list {
+                    width: 100%;
+                    height: 40px;
+                    line-height: 40px;
+
+                    .menu-item {
+                        height: 40px;
+                        line-height: 40px;
+                        display: flex;
+                        justify-content: center;
+                        align-items: center;
+
+
+                        img {
+                            width: 25px;
+                            height: 25px;
+                        }
                     }
                 }
+
+                .el-menu {
+                    min-width: 65px;
+                    border-right: transparent;
+                }
+            }
+
+            .pageSty {
+                width: 100%;
+                height: 100vh;
             }
-        }
 
-        .menuBs {
-            opacity: 0;
-            transition: opacity 0.2s;
-            transition-timing-function: ease-in;
+            .menuBs {
+                opacity: 0;
+                transition: opacity 0.2s;
+                transition-timing-function: ease-in;
+            }
         }
+
     }
 
 
     @import "./assets/css/main.css";
     @import "./assets/css/eleCss/index.less";
-    @import "./assets/css/eleCss/el-popper.less";
 
     .themeDark {
         @import "./assets/css/eleCss/el-dialogB.less";
         @import "./assets/css/eleCss/el-tableB.less";
         @import "./assets/css/eleCss/el-inputB.less";
         @import "./assets/css/eleCss/el-treeB.less";
+        @import "./assets/css/eleCss/el-popper.less";
+
     }
 
     .themeLight {
+        @import "./assets/css/eleCss/el-input.less";
         @import "./assets/css/eleCss/el-dialogW.less";
+        @import "./assets/css/eleCss/el-tableW.less";
         @import "./assets/css/eleCss/el-treeW.less";
 
         .toolSty {

src/assets/css/eleCss/el-input.less

@@ -1,467 +1,60 @@
-body {
-    .generat-seach {
-        .el-form-item {
-            .el-form-item__label {
-                color: #fff;
-            }
+.generat-seach {
+    .el-form-item {
+        .el-form-item__label {
+            color: #fff;
         }
-    }
-
-    .el-input__inner {
-        background: #606769;
-        color: #B3BDC0;
-    }
-
-    .el-input__wrapper {
-        background: #606769;
-    }
 
-    .el-select-dropdown {
-        background: #606769;
+        .el-form-item__content {
+            .el-input {
+                .el-input__wrapper {
+                    background: #1D47B0;
 
-        .el-scrollbar {
-            .el-select-dropdown__wrap {
-                .el-select-dropdown__list {
-                    .el-select-dropdown__item {
-                        background: #606769;
+                    .el-input__inner {
                         color: #fff;
                     }
 
-                    .selected {
-                        background: #606769;
-                    }
-
-                    .hover {
-                        background: #504bb5;
+                    .el-input__prefix {
+                        .el-icon {
+                            color: #fff;
+                        }
                     }
                 }
             }
-        }
-    }
-
-    .el-select-tags-wrapper .el-tag {
-        background: #4a4d4e;
-    }
-
-    .el-input {
-        &.is-disabled .el-input__inner {
-            background: #606769;
-            border-color: @gray;
-            color: @gray;
-            cursor: not-allowed;
-        }
-
-        &.is-in-pagination .el-input__inner[type="number"] {
-            width: 48px;
-        }
-
-        .el-input__inner[type="number"] {
-
-            &::-webkit-textfield-decoration-container {
-                appearance: none;
-            }
-
-            &::-webkit-inner-spin-button,
-            &::-webkit-outer-spin-button {
-                appearance: none;
-            }
-        }
-    }
-
-    // 数字组件
-    .el-input-number {
-        &.is-controls-right {
-            .el-input-number__increase {
-                border-bottom: 1px solid @gray;
-            }
-
-            .el-input-number__decrease,
-            .el-input-number__increase {
-                line-height: 15px;
-                color: @gray-l;
-                background: fade(@gray, 40);
-                border-left: 1px solid @gray;
-            }
-        }
-    }
-
-    // 日期组件
-    .el-date-editor {
-        --el-date-editor-daterange-width: 480px;
-
-        &.is-active,
-        &.is-active:hover,
-        &.is-focus .el-input__inner {
-            border-color: @green;
-        }
-
-        &.el-date-editor--datetimerange {
-            border: 1px solid fade(@gray, 20);
-            height: 33px;
-            padding: 0 8px;
-            width: 369px;
-
-            .el-range-separator {
-                color: @gray-l;
-                line-height: 33px;
-            }
-
-            .el-range-input {
-                flex-basis: 145px;
-                line-height: 33px;
-                background: transparent;
-                color: @gray-l;
-
-                &::placeholder {
-                    text-align: center;
-                    color: @gray-l;
-                }
-            }
-        }
-    }
-
-    // 单选框
-    .el-radio {
-        color: @gray-l;
-
-        &.is-checked {
-            .el-radio__inner {
-                background: @green;
-                border-color: @green;
-            }
-
-            .el-radio__label {
-                color: @green;
-            }
-        }
-
-        &.is-bordered.is-checked {
-            border-color: @green;
-        }
-
-        &:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
-            box-shadow: 0 0 2px 2px @green;
-        }
-    }
-
-    // 单选框组
-    .el-radio-group {
-        height: 33px;
-
-        &>.el-radio {
-            line-height: 33px;
-        }
-    }
-
-    .el-checkbox {
-        height: 33px;
-        line-height: 33px;
-        color: @gray-l;
-
-        &.is-bordered {
-            height: 33px;
-            line-height: 33px;
-            padding: 0px 20px;
-            border-color: @gray;
-
-            &.is-checked {
-                border-color: @green;
-            }
-        }
-
-        .el-checkbox__inner {
-            background: fade(@gray, 20);
-            border-color: fade(@gray, 40);
-        }
-
-        .el-checkbox__input.is-checked+.el-checkbox__label {
-            color: @green;
-        }
-
-        .el-checkbox__input.is-checked .el-checkbox__inner,
-        .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-            background-color: @green;
-            border-color: @green;
-        }
-
-        .el-checkbox__input.is-focus .el-checkbox__inner {
-            border-color: @green;
-        }
-    }
-
-    .warn-table {
-        .el-checkbox__input.is-checked+.el-checkbox__label {
-            color: #d35400;
-        }
-
-        .el-checkbox__input.is-checked .el-checkbox__inner,
-        .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-            background-color: #d35400;
-            border-color: #d35400;
-        }
-
-        .el-checkbox__input.is-focus .el-checkbox__inner {
-            border-color: #d35400;
-        }
-    }
-
-    // 树组件
-    .el-tree {
-        color: @gray-l;
-        background: fade(@gray, 20);
-
-        .el-tree-node {
-            .el-tree-node__content:hover {
-                background: transparent;
-            }
-        }
 
-        .el-checkbox__inner {
-            background: transparent;
-            border-color: @gray;
-        }
+            .el-select {
 
-        .el-tree-node:focus>.el-tree-node__content {
-            background: transparent;
-        }
-
-        .el-checkbox__input.is-disabled .el-checkbox__inner {
-            background: @gray;
-            border-color: @gray;
-        }
-
-        &.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
-            background: transparent;
-            color: @green;
-        }
-
-        .el-tree-node__content:hover,
-        .el-upload-list__item:hover {
-            background: transparent;
-            color: @green;
-        }
-
-        .el-checkbox__inner:hover {
-            border-color: @green;
-        }
-
-        .el-checkbox__input.is-focus .el-checkbox__inner {
-            border-color: @green;
-        }
-
-        .el-checkbox__input.is-checked .el-checkbox__inner,
-        .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-            background: @green;
-            border-color: @green;
-        }
-    }
-
-    // Cascader 级联选择器
-    .el-cascader {
-        line-height: 30px;
-
-        .el-cascader__tags {
-            .el-tag {
-                color: white;
-                background-color: fade(@green, 50);
-
-                .el-icon-close {
-                    background-color: fade(@green, 50);
+                .select-trigger {
+                    .el-select__tags .el-tag--info {
+                        background-color: transparent;
+                        color: #fff;
+                        border: 1px solid #fff;
+                    }
                 }
             }
-        }
-
-        .el-input__suffix {
-            right: 0px;
-        }
-    }
-
-    .el-select {
-        .el-input.is-focus .el-input__inner {
-            border-color: @green;
-        }
-
-        .el-input__inner:focus {
-            border-color: @green;
-        }
-    }
-
-    .el-select .el-select__tags .el-tag {
-        background: #000;
-    }
-
-    .el-select .el-select__tags .el-tag .el-icon-close {
-        background-color: transparent;
-        border: 1px solid #fff;
-    }
-
-    .el-popper {
-        &.el-cascader__dropdown[role="tooltip"] {
-            background: @picker-bg-color;
-            border-color: @picker-bg-color;
-
-            .el-cascader-menu {
-                border-color: @gray;
-            }
-
-            .el-cascader-node:not(.is-disabled):focus,
-            .el-cascader-node:not(.is-disabled):hover {
-                background: fade(@green, 20);
-                color: @green;
-            }
-
-            .el-cascader-node.in-active-path,
-            .el-cascader-node.is-active,
-            .el-cascader-node.is-selectable.in-checked-path {
-                color: @green;
-            }
-        }
-
-        &.el-select__popper[role="tooltip"] {
-            border-color: @picker-bg-color;
-            background: @picker-bg-color;
-
-            .el-cascader-menu {
-                border-color: @gray;
-            }
 
-            .el-select-dropdown__item.hover,
-            .el-select-dropdown__item:hover {
-                background: fade(@green, 20);
-                color: @green;
+            .el-date-editor--date {
+                width: 150px;
             }
 
-            .el-select-dropdown__item.selected {
-                background: transparent;
-                color: @green;
-            }
-        }
-    }
-}
-
-.el-picker__popper.el-popper[role="tooltip"] {
-    border-color: @picker-bg-color !important;
-    background: @picker-bg-color !important;
-}
-
-.el-picker-panel {
-
-    // el datetimerange  picker Start
-    &.el-date-range-picker {
-        color: @gray-l;
-        background: transparent;
-
-        .el-date-range-picker__time-header {
-            border-color: @gray;
-
-            .el-icon-arrow-right {
-                color: @gray-l;
-            }
-
-            .el-input__inner {
-                background: fade(@gray, 20);
-                color: @gray-l;
-                border-color: @gray;
-            }
-
-            .el-date-range-picker__time-picker-wrap {
-                .el-time-panel {
-                    background-color: @picker-bg-color;
-
-                    .el-time-spinner__item.active:not(.disabled) {
-                        color: @green;
+            .el-radio-group {
+                .el-radio {
+                    .el-radio__label {
+                        color: #fff;
                     }
 
-                    .el-time-spinner__item:hover:not(.disabled):not(.active) {
-                        background: transparent;
-                        color: @green;
+                    .el-radio__input.is-checked .el-radio__inner {
+                        background: #1D47B0;
                     }
                 }
-
-                .el-time-panel__btn.confirm {
-                    color: @green;
-                }
-
-                .el-time-panel__btn.cancel {
-                    color: @gray;
-                }
             }
-        }
-
-        .el-date-range-picker__content {
-            border-color: @gray;
-
-            .el-date-table {
-                th {
-                    color: @gray-l;
-                }
-
-                td {
-                    &.available:hover {
-                        color: @green;
-                    }
-
-                    &.in-range div,
-                    &.in-range div:hover {
-                        background: fade(@gray, 40);
-                    }
-
-                    &.end-date span,
-                    &.start-date span {
-                        background: @green;
-                    }
 
-                    &.today {
-                        span {
-                            color: @green;
-                        }
-
-                        &.end-date span,
-                        &.start-date span {
-                            color: @white;
-                        }
-                    }
-
-                    &.next-month,
-                    &.prev-month {
-                        color: @gray;
-                    }
-                }
+            .el-button {
+                background: #36C2CF;
+                width: 60px;
+                height: 25px;
+                position: relative;
+                top: -1px;
             }
         }
     }
-
-    // el datetimerange  picker End
-
-    .el-picker-panel__body {
-        border-color: @gray;
-    }
-
-    .el-picker-panel__footer {
-        background: transparent;
-        border-color: @gray;
-
-        .el-button--text {
-            color: @gray;
-        }
-
-        .el-button.is-plain {
-            background: transparent;
-            border-color: @green;
-            color: @green;
-        }
-    }
-
-    .el-time-panel__btn.confirm {
-        color: @green;
-    }
-
-    .el-time-panel__btn.cancel {
-        color: @gray;
-    }
-}
-
-.el-popper__arrow::before {
-    background: fade(#121d1c, 95) !important;
-    border: 1px solid fade(#121d1c, 95) !important;
 }

src/assets/css/eleCss/el-tableW.less

@@ -0,0 +1,25 @@
+.warn-table {
+    .el-table {
+        .el-table__header {
+            thead {
+                tr {
+                    th {
+                        background: #8F93A7 !important;
+                        color: #fff;
+                    }
+                }
+            }
+        }
+
+        .el-table__empty-block {
+            background: transparent;
+        }
+
+    }
+
+    .toolSty {
+        .el-popper {
+            width: 50% !important;
+        }
+    }
+}

src/assets/css/eleCss/el-treeW.less

@@ -1,5 +1,9 @@
 .el-tree {
     .el-tree-node {
-        background: #edeffb;
+        background: #E6E8F2;
+    }
+
+    .el-tree__empty-block {
+        background: #E6E8F2;
     }
 }

src/components/commonHeaders.vue

@@ -6,40 +6,34 @@
                     <img src="../assets/logoGuo_DB.png" alt="">
                 </div>
                 <div class="proMenu">
-                    <el-button-group>
-                        <el-button type="primary" v-for="(item,index) in menuData" :key="index" :icon="item.icon"
+                    <!-- <el-button-group>
+                        <el-button type="primary" v-for="(item,index) in menuData" :key="index"
                             :class="getColor(item.showBac)" @click="changeRoute(item)">
                             {{item.name}}
                         </el-button>
-                    </el-button-group>
-                    <div class="userMsg">
-                        <!-- <span style="margin-right: 10px">{{userName}}</span> -->
-                        <el-tooltip class="box-item" effect="light" content="自动填报工具">
-                            <!-- <el-icon :size="size" :color="color">
-                                <Avatar />
-                            </el-icon> -->
-                            <a href="http://172.16.12.103:9001/script/download">
-                                <el-icon class="Settingitem" size="small" :color="color">
-                                    <ChromeFilled />
-                                </el-icon>
-                            </a>
-                        </el-tooltip>
+                    </el-button-group> -->
+                    <div class="proButton">
+                        <div class="buttonItem" v-for="(item,index) in menuData" :key="index"
+                            :class="getColor(item.showBac)" @click="changeRoute(item)">{{item.name}}</div>
                     </div>
-                    <div class="divider" style="margin: 0 20px">|</div>
-                    <div class="settingStop">
-                        <el-tooltip class="box-item" effect="light" content="系统设置">
-                            <el-icon class="Settingitem" size="small" :color="color">
-                                <Setting />
-                            </el-icon>
-                        </el-tooltip>
-                        <el-switch v-model="switchTheme" :active-action-icon="SunnyIcon"
-                            :inactive-action-icon="MoonIcon" @change="changSwith" />
-                        <el-tooltip class="box-item" effect="light" content="退出">
-                            <el-icon class="outitem" :size="size" :color="color" @click="backLogin"
-                                style="margin: 0 15px">
-                                <SwitchButton />
-                            </el-icon>
-                        </el-tooltip>
+                    <div class="proSet">
+                        <div class="settingStop">
+                            <el-switch v-model="switchTheme" :active-action-icon="SunnyIcon"
+                                :inactive-action-icon="MoonIcon" @change="changSwith" />
+
+                            <el-tooltip class="box-item" effect="light" content="自动填报工具">
+                                <a href="http://172.16.12.103:9001/script/download">
+                                    <img :src="header_wendang" class="Settingitem downItem">
+                                </a>
+                            </el-tooltip>
+                            <el-tooltip class="box-item" effect="light" content="系统设置">
+                                <img :src="header_shezhi" class="Settingitem">
+                            </el-tooltip>
+                            <el-tooltip class="box-item" effect="light" content="退出">
+                                <img :src="header_dianyuan" class="Settingitem" @click="backLogin">
+                            </el-tooltip>
+                        </div>
+
                     </div>
                 </div>
             </el-header>
@@ -49,6 +43,9 @@
 
 <script>
     import httpRequest from '@/utils/request.js'
+    import header_wendang from '@/assets/menuImg/header_wendang.png'
+    import header_shezhi from '@/assets/menuImg/header_shezhi.png'
+    import header_dianyuan from '@/assets/menuImg/header_dianyuan.png'
     import {
         Sunny,
         Moon
@@ -65,6 +62,9 @@
             return {
                 SunnyIcon: Sunny,
                 MoonIcon: Moon,
+                header_wendang: header_wendang,
+                header_shezhi: header_shezhi,
+                header_dianyuan: header_dianyuan,
                 leftIndex: '1',
                 currentTime: '',
                 showRole: true,
@@ -282,12 +282,12 @@
 
 <style lang="less">
     .proheader {
-        // background: #040c0b;
+
         // position: fixed;
         // top: 0;
         width: 100%;
         z-index: 1999;
-        height: 60px;
+        height: 55px;
 
         .weatherSty {
             background: rgb(74, 87, 100);
@@ -300,8 +300,8 @@
             // background: rgb(13, 104, 188);
             // background: rgba(96,103,105,.75);
             color: #fff;
-            line-height: 60px;
-            height: 60px !important;
+            line-height: 55px;
+            height: 55px !important;
 
             .logoSty {
                 padding: 10px 0 0 0;
@@ -312,54 +312,93 @@
             }
 
             .proMenu {
-                .settingStop {
-                    .Settingitem {
-                        margin-right: 10px;
-                    }
-
-                    .outitem {
-                        position: relative;
-                        top: 2px;
-                    }
+                .proButton {
+                    display: flex;
 
-                    .el-icon {
+                    .buttonItem {
                         cursor: pointer;
+                        width: 130px;
+                        height: 52px;
+                        line-height: 52px;
+                        font-size: 14px;
+                        text-align: center;
                     }
                 }
 
+                .proSet {
+                    display: flex;
+                    justify-content: center;
+                    width: 260px;
+
+                    .settingStop {
+                        display: flex;
+                        width: 260px;
+                        align-items: center;
+                        justify-content: center;
+
+                        .el-switch {
+                            margin-left: 10px;
+
+                            .el-switch__core {
+                                min-width: 50px;
+                                height: 20px;
+
+                                .el-switch__action {
+                                    width: 25px;
+                                    height: 16px;
+                                    border-radius: 10px;
+                                }
+                            }
+                        }
 
-                .userMsg {
-                    margin-left: 150px;
+                        .el-switch--small.is-checked .el-switch__core .el-switch__action {
+                            width: 25px;
+                            height: 16px;
+                            border-radius: 10px;
+                            left: calc(100% - 25px) !important;
+                        }
 
-                    a {
-                        color: #fff;
-                    }
+                        .Settingitem {
+                            color: #fff;
+                            margin-left: 20px;
+                            width: 25px;
+                            height: 25px;
+                            cursor: pointer;
+                        }
 
-                    .el-icon {
-                        cursor: pointer;
+                        .downItem {
+                            position: relative;
+                            top: 5px;
+                        }
                     }
                 }
 
-                .divider {
-                    position: relative;
-                    top: -3px;
-                }
+
             }
         }
     }
 
     .themeDarks {
+        border-bottom: 1px solid #3a3a3a;
+
         .proMenu {
             display: flex;
             align-items: center;
 
-            .el-button-group {
+            .proButton {
+                border-right: 1px solid #3a3a3a !important;
+
+                .buttonItem {
+                    border-left: 1px solid #3a3a3a !important;
+                }
+
                 .changeBacksty {
-                    background: linear-gradient(0deg, transparent, #000);
+                    border-bottom: 3px solid #1C99FF !important;
+                    color: #1C99FF !important;
                 }
 
                 .defaultBacksty {
-                    background-color: #000 !important;
+                    color: #A2A3A4 !important;
                 }
 
                 .defaultweathersty {
@@ -369,30 +408,18 @@
                 .defaultweatherRainsty {
                     background-color: #4a5764 !important;
                 }
-
-                .el-button {
-                    background-color: #373590;
-                    border-color: #8679df;
-                    padding: 0 20px;
-
-                    &:hover {
-                        background-color: #504bb5;
-                    }
-                }
             }
 
             .el-switch {
-                position: relative;
-                top: -2px;
 
                 .el-switch__core {
                     background: #000;
 
                     .el-switch__action {
                         .el-icon {
-                            background: #000;
-                            border-radius: 5px;
-                            color: #fff;
+                            // background: #1C99FF;
+                            // border-radius: 5px;
+                            color: #000;
                         }
                     }
                 }
@@ -403,17 +430,26 @@
     }
 
     .themeLights {
+        border-bottom: 1px solid #7899ff;
+
         .proMenu {
             display: flex;
             align-items: center;
 
-            .el-button-group {
+            .proButton {
+                border-right: 1px solid #7899ff !important;
+
+                .buttonItem {
+                    border-left: 1px solid #7899ff !important;
+                }
+
                 .changeBacksty {
-                    background-color: #504bb5 !important;
+                    border-bottom: 3px solid #3dc2d3 !important;
+                    color: #fff !important;
                 }
 
                 .defaultBacksty {
-                    background-color: #373590 !important;
+                    color: #B7C6FF !important;
                 }
 
                 .defaultweathersty {
@@ -423,30 +459,16 @@
                 .defaultweatherRainsty {
                     background-color: #4a5764 !important;
                 }
-
-                .el-button {
-                    background-color: #373590;
-                    border-color: #8679df;
-                    padding: 0 20px;
-
-                    &:hover {
-                        background-color: #504bb5;
-                    }
-                }
             }
 
             .el-switch {
-                position: relative;
-                top: -2px;
-
                 .el-switch__core {
                     background: #373590;
 
                     .el-switch__action {
                         .el-icon {
-                            background: #373590;
-                            border-radius: 5px;
-                            color: #fff;
+                            // background: #373590;
+                            color: #373590;
                         }
                     }
                 }

src/components/generatingCapacityComponent/excel.vue

@@ -8,25 +8,29 @@
                 <span
                     class="whitespace-nowrap cursor-pointer font-bold text-[12px] align-middle inline-flex items-center"
                     @click.stop="funExcelChange(item)">
-                    <el-icon>
-                        <Document />
-                    </el-icon>
-                    <span :style="theme ? 'color:#606266': ''">{{ item.name }}</span>
+                    <img :src="CSV_C" alt="" v-if="currentId === item.id">
+                    <img :src="CSV" alt="" v-else>
+                    <span class="excelName" :style="excelSpanSty(item)">{{ item.name }}</span>
                 </span>
             </el-checkbox>
         </el-checkbox-group>
         <div v-else>
-            <div class="excelDataNoCheck" v-for="item in data" :key="item.name"
-                :class="{'!bg-[rgb(236,245,255)]': currentId === item.id}" @click="funExcelChange(item)">
-                <el-icon>
+            <div class="excelDataNoCheck" :class="theme ? 'excelW' : 'excelB'" v-for="item in data" :key="item.name"
+                @click="funExcelChange(item)">
+                <!-- <el-icon>
                     <Document />
-                </el-icon><span class="excelName" :style="theme ? 'color:#606266': ''">{{ item.name }}</span>
+                </el-icon> -->
+                <img :src="CSV_C" alt="" v-if="currentId === item.id">
+                <img :src="CSV" alt="" v-else>
+                <span class="excelName" :style="excelSpanSty(item)">{{ item.name }}</span>
             </div>
         </div>
     </div>
 </template>
 
 <script>
+    import CSV from '@/assets/menuImg/CSV.png'
+    import CSV_C from '@/assets/menuImg/CSV_C.png'
     export default {
         props: {
             data: {
@@ -62,6 +66,8 @@
         },
         data() {
             return {
+                CSV: CSV,
+                CSV_C: CSV_C,
                 excelCheckIds: [],
                 currentId: ''
             }
@@ -72,6 +78,16 @@
             }
         },
         methods: {
+            excelSpanSty(item) {
+                if (this.theme) {
+                    if (this.currentId === item.id) {
+                        return 'color: #5473E8'
+                    } else {
+                        return 'color:#000'
+                    }
+                }
+                return ''
+            },
             funExcelChange(obj) {
                 this.currentId = obj.id
                 this.$emit('excelChange', obj)
@@ -89,30 +105,37 @@
     .excelData {
 
         .excelDataNoCheck {
-            font-size: 14px;
-            color: #b7b7b7;
             line-height: 25px;
             height: 25px;
+            width: calc(100% - 10px);
+            font-size: 14px;
+            color: #b7b7b7;
+
+            margin-bottom: 5px;
+            border: 1px solid rgba(203, 204, 209, 0.5);
             cursor: pointer;
 
             .el-icon {
                 margin-right: 5px;
                 color: #504bb5;
             }
-        }
-
-        .excelDataNoCheck:hover {
-            background-color: #504bb5;
-            color: #fff;
 
-            .el-icon {
-                margin-right: 5px;
-                color: #fff;
+            img {
+                width: 20px;
+                height: 20px;
+                position: relative;
+                top: 3px;
             }
 
             .excelName {
-                color: #fff !important;
+                position: relative;
+                top: -2px;
+                margin-left: 10px;
             }
         }
+
+        .excelW {
+            background: #fff;
+        }
     }
 </style>

src/components/generatingCapacityComponent/table.vue

@@ -1,7 +1,9 @@
 <template>
     <div class="warn-table" ref="tableRef" :style="{ height: typeof height === 'string' ? height : height + 'px' }">
         <div class="tableData_tit">
-            <p :style="theme? 'color:#606266':'color:#fff'">{{tableName}}</p>
+            <p :style="theme? 'color:#5473E8':'color:#fff'">{{tableName}}</p>
+            <el-divider />
+            <img :src="CSV_C" alt="">
             <!-- <el-button size="small" type="primary" @click="funExport" :disabled="!tableId">数据导出</el-button> -->
         </div>
         <el-table :data="data" size="small" v-loading="loading" :max-height="tableHeight" :style="{ width: '100%'}">
@@ -11,6 +13,7 @@
     </div>
 </template>
 <script>
+    import CSV_C from '@/assets/menuImg/CSV_C.png'
     export default {
         props: {
             data: {
@@ -58,6 +61,7 @@
         },
         data() {
             return {
+                CSV_C: CSV_C,
                 tableHeight: window.innerHeight - 250 + 'px'
             }
         },
@@ -67,11 +71,25 @@
     .warn-table {
 
         .tableData_tit {
+            display: flex;
+
             p {
                 font-size: 16px;
                 font-weight: bold;
                 margin: 10px;
             }
+
+            .el-divider {
+                position: relative;
+                top: -3px;
+            }
+
+            img {
+                width: 30px;
+                height: 30px;
+                position: relative;
+                top: 5px;
+            }
         }
     }
 </style>

src/components/generatingCapacityComponent/tree.vue

@@ -1,44 +1,53 @@
 <template>
     <div class="treeData" :style="{'height': height}">
-        <el-input class="pb-[10px]" v-model="filterText" placeholder="输入关键字过滤" />
-        <el-tree :data="data" :props="defaultProps" default-expand-all highlight-current
-            :filter-node-method="filterNode" ref="tree" @node-click="funCurrentChange" :show-checkbox="showCheckbox"
-            @check="funCheckChange" node-key="id" :expand-on-click-node="false" :current-node-key="''">
-            <template #default="{ node, data }">
-                <p v-if="node.level === 1" style="width: 100%;display: flex;justify-content: space-between;">
-                    <span>{{ node.label }}</span>
-                    <el-icon size="14" title="刷新" @click.stop="refreshFn">
-                        <RefreshRight />
-                    </el-icon>
-                </p>
-                <el-dropdown ref="dropdown1" v-else size="small" trigger="contextmenu" @command="funCommand"
-                    style="margin-right: 30px">
-                    <span class="el-dropdown-link text-[12px] flex items-center">
-                        <el-icon class="mr-[4px] !text-[#E6A23C]">
-                            <Folder v-if="!node.expanded || (node.isLeaf && !node.isCurrent)" />
-                            <FolderOpened v-else />
-                        </el-icon>
-                        {{ node.label }}
-                    </span>
-                    <template #dropdown>
-                        <el-dropdown-menu>
-                            <el-dropdown-item class="text-[#409EFF]" v-if="dropdownMenu.includes('save')"
-                                :command="{ type: 'save', data, node }">保存</el-dropdown-item>
-                            <el-dropdown-item class="text-[#409EFF]"
-                                v-if="data.childs && data.childs.length && dropdownMenu.includes('export')"
-                                :command="{ type: 'export', data, node }">导出
-                            </el-dropdown-item>
-                            <el-dropdown-item class="text-[#F56C6C]" v-if="dropdownMenu.includes('delete')"
-                                :command="{ type: 'delete', data, node }">删除</el-dropdown-item>
-                        </el-dropdown-menu>
-                    </template>
-                </el-dropdown>
-            </template>
-        </el-tree>
+        <div class="treeSeach">
+            <el-input v-model="filterText" style="height: 30px" placeholder="输入关键字过滤" :suffix-icon="Search" />
+            <div class="treeShuax" @click="refreshFn">
+                <img :src="tree_shuaxing">
+            </div>
+        </div>
+        <div class="treeMain">
+            <div class="treeMainTit">
+                <span>数据准备</span>
+            </div>
+            <el-tree :data="data" :props="defaultProps" default-expand-all highlight-current
+                :filter-node-method="filterNode" ref="tree" @node-click="funCurrentChange" :show-checkbox="showCheckbox"
+                @check="funCheckChange" node-key="id" :expand-on-click-node="false" :current-node-key="''">
+                <template #default="{ node, data }">
+                    <el-dropdown ref="dropdown1" size="small" trigger="contextmenu" @command="funCommand"
+                        style="margin-right: 30px"
+                        :class="!node.expanded || (node.isLeaf && !node.isCurrent) ? '' : 'eldropdownCla'">
+                        <span class="el-dropdown-link">
+                            <!-- <el-icon class="mr-[4px] !text-[#E6A23C]">
+                                <Folder v-if="!node.expanded || (node.isLeaf && !node.isCurrent)" />
+                                <FolderOpened v-else />
+                            </el-icon> -->
+                            {{ node.label }}
+                        </span>
+                        <template #dropdown>
+                            <el-dropdown-menu>
+                                <el-dropdown-item class="text-[#409EFF]" v-if="dropdownMenu.includes('save')"
+                                    :command="{ type: 'save', data, node }">保存</el-dropdown-item>
+                                <el-dropdown-item class="text-[#409EFF]"
+                                    v-if="data.childs && data.childs.length && dropdownMenu.includes('export')"
+                                    :command="{ type: 'export', data, node }">导出
+                                </el-dropdown-item>
+                                <el-dropdown-item class="text-[#F56C6C]" v-if="dropdownMenu.includes('delete')"
+                                    :command="{ type: 'delete', data, node }">删除</el-dropdown-item>
+                            </el-dropdown-menu>
+                        </template>
+                    </el-dropdown>
+                </template>
+            </el-tree>
+        </div>
     </div>
 </template>
 <script>
     import httpRequest from '@/utils/request.js'
+    import tree_shuaxing from '@/assets/menuImg/tree_shuaxing.png'
+    import {
+        Search
+    } from '@element-plus/icons-vue'
     import {
         saveAs
     } from 'file-saver'
@@ -86,6 +95,8 @@
         data() {
             return {
                 filterText: '',
+                Search: Search,
+                tree_shuaxing: tree_shuaxing,
                 defaultProps: {
                     children: 'children',
                     label: 'label'
@@ -251,14 +262,54 @@
 </script>
 <style lang="less" scoped>
     .treeData {
-        .el-input {
+        .treeSeach {
+            width: 100%;
+            display: flex;
             margin-bottom: 5px;
+
+            .treeShuax {
+                cursor: pointer;
+                margin-left: 5px;
+                height: 30px;
+                width: 30px;
+                background: #5473E8;
+                border-radius: 2px;
+                text-align: center;
+
+                img {
+                    width: 25px;
+                    height: 25px;
+
+                    position: relative;
+                    top: 2px;
+                    left: -1px;
+                }
+            }
+
         }
 
-        .el-tree {
-            background: #161f1e;
-            color: #fff;
+        .treeMain {
+            .treeMainTit {
+                width: calc(100% - 10px);
+                height: 22px;
+                background: #1E3F9A;
+                color: #fff;
+                font-size: 12px;
+                padding: 8px 0 0 10px;
+            }
+
+            .el-tree {
+                background: #161f1e;
+                color: #fff;
+
+                .is-current {
+                    width: 100%;
+                    height: 20px;
+                    background: #fff !important;
+                }
 
+            }
         }
+
     }
 </style>

src/components/menuTreeconfig.vue

@@ -0,0 +1,45 @@
+<template>
+    <div class="menuItem">
+        <template v-for="menu in this.menuData">
+            <el-sub-menu :key="menu.index" :index="menu.index" v-if="menu.children"
+                :disabled="menu.index === '' ? true : false">
+                <img :src="menu.img">
+                <template #title>
+                    <!-- <i :class="menu.icon"></i> -->
+                    <img :src="menu.img">
+                    <span style="margin-left: 10px">{{menu.name}}</span>
+
+                    <!-- <span slot="title">{{menu.name}}</span> -->
+                </template>
+                <menu-tree :menuData="menu.children"></menu-tree>
+            </el-sub-menu>
+            <el-menu-item :key="menu.index" :index="menu.index" :route="menu.index" v-else>
+                <!-- <i :class="menu.icon"></i> -->
+                <img :src="menu.img" alt="">
+                <template #title>
+                    <span style="margin-left: 10px">{{menu.name}}</span>
+                </template>
+                <!-- <span slot="title">{{menu.name}}</span> -->
+            </el-menu-item>
+        </template>
+    </div>
+</template>
+
+<script>
+    import MenuTree from '@/components/menuTreeconfig.vue'
+    export default {
+        components: [MenuTree],
+        props: ['menuData'],
+        name: 'MenuTree',
+        methods: {}
+    }
+</script>
+
+<style lang="less">
+    .menuItem {
+        img {
+            width: 25px;
+            height: 25px;
+        }
+    }
+</style>

src/router/index.js

@@ -132,6 +132,46 @@ const routes = [
         component: () => import("../views/intelligentReporting/czzyb/index.vue"),
     },
     {
+        path: "/intelligentReport/zhbb",
+        name: "intelligentReportzhbb",
+        meta: {
+            title: "国能陕西新能源公司综合报表",
+        },
+        component: () => import("../views/intelligentReporting/zhbb/index.vue"),
+    },
+    {
+        path: "/intelligentReport/yxqk",
+        name: "intelligentReportyxqk",
+        meta: {
+            title: "运行情况日报表",
+        },
+        component: () => import("../views/intelligentReporting/yxqk/index.vue"),
+    },
+    {
+        path: "/intelligentReport/fyfsdl",
+        name: "intelligentReportfyfsdl",
+        meta: {
+            title: "分月分时电量统计",
+        },
+        component: () => import("../views/intelligentReporting/fyfsdl/index.vue"),
+    },
+    {
+        path: "/intelligentReport/fdscqk",
+        name: "intelligentReportfdscqk",
+        meta: {
+            title: "发电生产情况快报表",
+        },
+        component: () => import("../views/intelligentReporting/fdscqk/index.vue"),
+    },
+    {
+        path: "/intelligentReport/pjfs",
+        name: "intelligentReportpjfs",
+        meta: {
+            title: "集控中心日平均风速统计表",
+        },
+        component: () => import("../views/intelligentReporting/pjfs/index.vue"),
+    },
+    {
         path: "/intelligentReport/reporting",
         name: "intelligentReportreporting",
         meta: {

src/views/generatingCapacity/dataAnalysis/posAnalysis/components/leafletMap.vue

@@ -27,6 +27,7 @@
                 layerGroup: [],
                 layers: [],
                 rightObj: {},
+                areaLayer: null,
                 tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.jpg",
             }
         },
@@ -162,6 +163,8 @@
                 this.map = L.map("map", {
                     // center: [40.02404009136253, 116.50641060224784], // 地图中心--北京
                     // center: [38.44673272215545, 106.27624511718751], // 地图中心--银川
+                    // center: [108.953939, 34.266611], // 地图中心--陕西
+                    // center: [109.470962, 34.520632], // 地图中心--渭南
                     zoom: 16, //缩放比列
                     zoomControl: false, //禁用 + - 按钮
                     doubleClickZoom: true, // 禁用双击放大
@@ -178,15 +181,39 @@
                         }
                     ]
                 });
-                // let name = L.tileLayer(
-                //     "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}",
-                // ).addTo(this.map)
+                let name = L.tileLayer(
+                    "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}",
+                ).addTo(this.map)
 
-                let name = L.tileLayer(this.tilsUrl, {
-                    minZoom: 1,
-                    maxZoom: 16
-                }).addTo(this.map)
+                // let name = L.tileLayer(this.tilsUrl, {
+                //     minZoom: 1,
+                //     maxZoom: 16
+                // }).addTo(this.map)
 
+                this.setAreaLayer('db', true)
+                this.setAreaLayer('jb', true)
+
+            },
+            setAreaLayer(jsonName, isBounds) {
+                // if (this.areaLayer) {
+                //     this.map.removeLayer(this.areaLayer)
+                // }
+                // const wfAllGeoJson = require(`./static/geoJson/${jsonName}.json`)
+                const wfAllGeoJson = require(`@/assets/${jsonName}.json`)
+                this.areaLayer = L.geoJSON(wfAllGeoJson, {
+                    style: feature => {
+                        return {
+                            fillOpacity: 0.1,
+                            fillColor: 'rgb(27, 242, 245)',
+                            weight: 2,
+                            color: 'rgb(27, 242, 245)'
+                        }
+                    }
+                })
+                this.map.addLayer(this.areaLayer)
+                if (isBounds) {
+                    this.map.fitBounds(this.areaLayer.getBounds())
+                }
             },
             powerLine(e) {
                 console.log('2221111', this.layers)

src/views/generatingCapacity/dataFilter/prepare/index.vue

@@ -1,9 +1,11 @@
 <template>
     <div class="dataFilePrepare" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataFilePrepareMain">
-            <p>风电数据准备</p>
-            <search-cop @submit="funSubmit">
-            </search-cop>
+            <div class="main_top">
+                <p class="topPsty">风电数据准备</p>
+                <search-cop @submit="funSubmit">
+                </search-cop>
+            </div>
             <div class="main">
                 <div class="treeDataMain">
                     <tree-cop :data="treeData" :height="treeHeight" @currentChange="funCurrentChange"
@@ -15,12 +17,9 @@
                     </excel-cop>
                 </div>
                 <div class="tableDataMain">
-                    <div>
-                        <table-cop class="" :data="tableData" :column="tableColumn" :loading="tableLoading"
-                            :theme="theme" :height="tableHeight" :tableId="tableShowId" :tableName="tableName"
-                            @export="funExport">
-                        </table-cop>
-                    </div>
+                    <table-cop class="" :data="tableData" :column="tableColumn" :loading="tableLoading" :theme="theme"
+                        :height="tableHeight" :tableId="tableShowId" :tableName="tableName" @export="funExport">
+                    </table-cop>
                 </div>
             </div>
         </div>
@@ -56,9 +55,9 @@
     // } from '@/api/axios.js'
 
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 220 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 220 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 220 + 'px')
+    const treeHeight = ref(window.innerHeight - 130 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 130 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 130 + 'px')
     /**excel 开始 */
     const excelList = ref([])
     const funExcelChange = async (obj) => { //点击excel项时
@@ -109,7 +108,7 @@
         actTreeNode.value = null
         // const res = await httpRequest.get("/power/prepare/tree")
         const res = await apiGetpowerpreparetree()
-        treeData.value = funRepeatMap(res.data)
+        treeData.value = funRepeatMap(res.data[0].children)
         excelList.value = []
         if (actTreeNode.value) {
             funCurrentChange({
@@ -147,6 +146,7 @@
                     time: o.time,
                     type: o.type,
                     windturbine: o.windturbine,
+                    isCheck: false,
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
@@ -213,13 +213,13 @@
         // funWebSocket()
         funGetTree()
         theme.value = store.state.theme
-        tableHeight.value = window.innerHeight - 220 + 'px'
-        excelHeight.value = window.innerHeight - 220 + 'px'
-        treeHeight.value = window.innerHeight - 220 + 'px'
+        tableHeight.value = window.innerHeight - 130 + 'px'
+        excelHeight.value = window.innerHeight - 130 + 'px'
+        treeHeight.value = window.innerHeight - 130 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 220 + 'px'
-            excelHeight.value = window.innerHeight - 220 + 'px'
-            treeHeight.value = window.innerHeight - 220 + 'px'
+            tableHeight.value = window.innerHeight - 130 + 'px'
+            excelHeight.value = window.innerHeight - 130 + 'px'
+            treeHeight.value = window.innerHeight - 130 + 'px'
         })
     })
     /**activated */
@@ -230,45 +230,66 @@
 
 <style lang="less">
     .dataFilePrepare {
-        padding: 20px;
+        height: 100%;
 
-        p {
-            font-size: 16px;
-            margin-left: 20px;
-        }
+        .dataFilePrepareMain {
+            height: 100%;
 
-        .main {
-            display: flex;
-            justify-content: space-between;
-            // width: calc(100% - 40px);
-            width: 100%;
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
 
-            .treeDataMain,
-            .excelDataMain,
-            .tableDataMain {
-                padding: 10px;
-                border-radius: 10px;
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
+                }
             }
 
-            .treeDataMain {
-                width: calc(20% - 20px);
-            }
+            .main {
+                display: flex;
+                justify-content: space-between;
+                // width: calc(100% - 40px);
+                width: 100%;
+                height: calc(100% - 100px);
 
-            .excelDataMain {
-                width: calc(13% - 20px);
-            }
+                .treeDataMain,
+                .excelDataMain,
+                .tableDataMain {
+                    padding: 10px;
+                    border-radius: 10px;
+                }
 
-            .tableDataMain {
-                width: calc(66% - 20px);
-            }
+                .treeDataMain {
+                    width: calc(20% - 20px);
+                }
 
+                .excelDataMain {
+                    width: calc(13% - 20px);
+                }
+
+                .tableDataMain {
+                    width: calc(66% - 20px);
+                }
+
+            }
         }
+
     }
 
     .themeDark {
 
-        p {
-            color: #fff;
+        .main_top {
+
+            .topPsty {
+                color: #1C99FF;
+                background: #1E2126;
+            }
         }
 
         .treeDataMain,
@@ -282,20 +303,31 @@
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .dataFilePrepareMain {
+            .main_top {
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .dataFilePrepareMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #E6E8F2;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #F4F6FB;
+                }
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
         }
 
     }

src/views/intelligentReporting/czzyb/index.vue

@@ -7,7 +7,7 @@
     export default {
         data() {
             return {
-                url: "http://172.16.12.101:8080/rbi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
+                url: "http://172.16.12.101:8083/rbi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
                 // url: "http://123.60.219.66:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin",
             };
         },

src/views/intelligentReporting/erp/index.vue

@@ -22,30 +22,27 @@
                 handler: function (route) {
                     this.url = null
                     if (route.query.name) {
-                        if (route.query.name === 'xinzhuang') {
+                        if (route.query.name === 'xinzuo') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$be0f8f75df7543978e9ddff5f7576a2b&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$be0f8f75df7543978e9ddff5f7576a2b&id=admin&pw=admin'
                         } else if (route.query.name === 'jiliangshan') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$d24a18e0985a46e5895573738a5cc384&id=admin&pw=admin'
-                        } else if (route.query.name === 'zuozhuang') {
-                            this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$be0f8f75df7543978e9ddff5f7576a2b&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$d24a18e0985a46e5895573738a5cc384&id=admin&pw=admin'
                         } else if (route.query.name === 'fanshigou') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$ff22bb1d24bc416e9185a1e40be6976b&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$ff22bb1d24bc416e9185a1e40be6976b&id=admin&pw=admin'
                         } else if (route.query.name === 'caoshanliang') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$a946d1d7e6f242d7a1fdbaa32fd1601c&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$a946d1d7e6f242d7a1fdbaa32fd1601c&id=admin&pw=admin'
                         } else if (route.query.name === 'leijiashan') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin'
                         }
                     } else {
                         let str = ''
                         if (window.location.origin.indexOf('172.16.12.101') != -1) {
                             str =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$938d90db87424df2ac6e21b990b889e3&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$938d90db87424df2ac6e21b990b889e3&id=admin&pw=admin'
                         } else {
                             str =
                                 'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$90580a90c10b4ee59dfa129528be1442&id=admin&pw=admin'

src/views/intelligentReporting/fdscqk/index.vue

@@ -0,0 +1,54 @@
+<template>
+    <div :style="pageHeight">
+        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                url: null,
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    'height': document.documentElement.clientHeight - 80 + 'px'
+                }
+            },
+        },
+        watch: {
+            $route: {
+                handler: function (route) {
+                    this.url = null
+                    if (route.query.name) {
+                        if (route.query.name === 'xinzuo') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$d169ca9e0c974a6299b49dc752446ee2&id=admin&pw=admin'
+                        } else if (route.query.name === 'jiliangshan') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$839ccb29a1e84da48b21c659423c0175&id=admin&pw=admin'
+                        } else if (route.query.name === 'fanshigou') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$03e83149008940daa72311823bd381da&id=admin&pw=admin'
+                        } else if (route.query.name === 'caoshanliang') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$33ab21248a7e49b683e5891b4ff6dad6&id=admin&pw=admin'
+                        } else if (route.query.name === 'leijiashan') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$28c6ac8488f841f6b8270cb902aad1ce&id=admin&pw=admin'
+                        }
+                    } else {
+                        let str = ''
+                        if (window.location.origin.indexOf('172.16.12.101') != -1) {
+                            str =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$d169ca9e0c974a6299b49dc752446ee2&id=admin&pw=admin'
+                        }
+                        this.url = str
+                    }
+                },
+                immediate: true
+            }
+        }
+    };
+</script>

src/views/intelligentReporting/fyfsdl/index.vue

@@ -0,0 +1,57 @@
+<template>
+    <div :style="pageHeight">
+        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                url: null,
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    'height': document.documentElement.clientHeight - 80 + 'px'
+                }
+            },
+        },
+        watch: {
+            $route: {
+                handler: function (route) {
+                    this.url = null
+                    if (route.query.name) {
+                        if (route.query.name === 'xinzhuang') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$53bbf921f227409f9b6554d94f85cb2b&id=admin&pw=admin'
+                        } else if (route.query.name === 'jiliangshan') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$d71943fd4d0746638cc32a82f8370cdc&id=admin&pw=admin'
+                        } else if (route.query.name === 'zuozhuang') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$0f0aac32858d463b818a4a4279e6aeea&id=admin&pw=admin'
+                        } else if (route.query.name === 'fanshigou') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$446bd6a7efee40b49a6dba26cb21757b&id=admin&pw=admin'
+                        } else if (route.query.name === 'caoshanliang') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$16557a9ade704425b842e5d6725f3eef&id=admin&pw=admin'
+                        } else if (route.query.name === 'leijiashan') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$30558a58dd3a48b7b755ee65d2a94690&id=admin&pw=admin'
+                        }
+                    } else {
+                        let str = ''
+                        if (window.location.origin.indexOf('172.16.12.101') != -1) {
+                            str =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$53bbf921f227409f9b6554d94f85cb2b&id=admin&pw=admin'
+                        }
+                        this.url = str
+                    }
+                },
+                immediate: true
+            }
+        }
+    };
+</script>

src/views/intelligentReporting/gkjlb/index.vue

@@ -24,28 +24,28 @@
                     if (route.query.name) {
                         if (route.query.name === 'xinzhuang') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$4a71c6bc1fd34da7843c6eb2a7b3aee3&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$4a71c6bc1fd34da7843c6eb2a7b3aee3&id=admin&pw=admin'
                         } else if (route.query.name === 'jiliangshan') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$621b7c14e4aa4a0483a8e577d8dc4cff&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$621b7c14e4aa4a0483a8e577d8dc4cff&id=admin&pw=admin'
                         } else if (route.query.name === 'zuozhuang') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$36292212f28b4702af2c4aa01a62bdc1&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$36292212f28b4702af2c4aa01a62bdc1&id=admin&pw=admin'
                         } else if (route.query.name === 'fanshigou') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$2320f3ed77e740d6bb1b66b1f7062ad1&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$2320f3ed77e740d6bb1b66b1f7062ad1&id=admin&pw=admin'
                         } else if (route.query.name === 'caoshanliang') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$3dc29db548d54d289e58bf4a30dfb026&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$3dc29db548d54d289e58bf4a30dfb026&id=admin&pw=admin'
                         } else if (route.query.name === 'leijiashan') {
                             this.url =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$5ebbf0905b22448cbd9834ec6560fd26&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$5ebbf0905b22448cbd9834ec6560fd26&id=admin&pw=admin'
                         }
                     } else {
                         let str = ''
                         if (window.location.origin.indexOf('172.16.12.101') != -1) {
                             str =
-                                'http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$c61354961de740f1acec8fc664034f81&id=admin&pw=admin'
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$c61354961de740f1acec8fc664034f81&id=admin&pw=admin'
                         } else {
                             str =
                                 'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$e97782eaa9444e11aa1b33c78d9dca1f&id=admin&pw=admin'

src/views/intelligentReporting/pjfs/index.vue

@@ -0,0 +1,57 @@
+<template>
+    <div :style="pageHeight">
+        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                url: null,
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    'height': document.documentElement.clientHeight - 80 + 'px'
+                }
+            },
+        },
+        watch: {
+            $route: {
+                handler: function (route) {
+                    this.url = null
+                    if (route.query.name) {
+                        if (route.query.name === 'xinzhuang') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$3341eda2eca447c380bb06e6e481d844&id=admin&pw=admin'
+                        } else if (route.query.name === 'jiliangshan') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$760bad3725d94777a74528c8ac9b26b9&id=admin&pw=admin'
+                        } else if (route.query.name === 'zuozhuang') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$1879c56390294d648d20717f0810bdd8&id=admin&pw=admin'
+                        } else if (route.query.name === 'fanshigou') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$d0cec38cba1f43128d9aa5d348198c6e&id=admin&pw=admin'
+                        } else if (route.query.name === 'caoshanliang') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$0fea3b9cf19e49708fed7916a6efffc2&id=admin&pw=admin'
+                        } else if (route.query.name === 'leijiashan') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$17d1c65d3389444bb804864268aa032b&id=admin&pw=admin'
+                        }
+                    } else {
+                        let str = ''
+                        if (window.location.origin.indexOf('172.16.12.101') != -1) {
+                            str =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$3341eda2eca447c380bb06e6e481d844&id=admin&pw=admin'
+                        }
+                        this.url = str
+                    }
+                },
+                immediate: true
+            }
+        }
+    };
+</script>

src/views/intelligentReporting/yxqk/index.vue

@@ -0,0 +1,51 @@
+<template>
+    <div :style="pageHeight">
+        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                url: null,
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    'height': document.documentElement.clientHeight - 80 + 'px'
+                }
+            },
+        },
+        watch: {
+            $route: {
+                handler: function (route) {
+                    this.url = null
+                    if (route.query.name) {
+                        if (route.query.name === 'zuozhuangyiqi') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$6cfd3bcb6b85450dbcf396a816439c9f&id=admin&pw=admin'
+                        } else if (route.query.name === 'zuozhuangerqi') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$cc08c68dc9e34d15951f73dad8fbdbd7&id=admin&pw=admin'
+                        } else if (route.query.name === 'xinzhuangyiqi') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$05d0dbf32f7645179e12ffe21f064fd9&id=admin&pw=admin'
+                        } else if (route.query.name === 'xinzhuangerqi') {
+                            this.url =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$19d79cef51114028a3f1dd1c06b08ea8&id=admin&pw=admin'
+                        }
+                    } else {
+                        let str = ''
+                        if (window.location.origin.indexOf('172.16.12.101') != -1) {
+                            str =
+                                'http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$6cfd3bcb6b85450dbcf396a816439c9f&id=admin&pw=admin'
+                        }
+                        this.url = str
+                    }
+                },
+                immediate: true
+            }
+        }
+    };
+</script>

src/views/intelligentReporting/zhbb/index.vue

@@ -0,0 +1,22 @@
+<template>
+    <div :style="pageHeight">
+        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                url: "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$03a38ba7339d4e2b9812e08e924f997e&id=admin&pw=admin"
+                // url: "http://123.60.219.66:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin",
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    'height': document.documentElement.clientHeight - 80 + 'px'
+                }
+            },
+        }
+    };
+</script>