问题修改 样式修改 报表修改

.env.production

@@ -12,20 +12,24 @@ NODE_ENV = 'production'
 VUE_APP_TITLE = '页面标题'
 
 # 登录
-VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
+# VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
+VUE_APP_LOGIN_URL = 'http://172.16.12.103:48080'
 
 # 生产环境/重写路径(公共路径)
 
 # 发电能力分析
-VUE_APP_GENERAT_URL = 'http://123.60.219.66:9002'
+# VUE_APP_GENERAT_URL = 'http://123.60.219.66:9002'
+VUE_APP_GENERAT_URL = 'http://172.16.12.103:9002'
 # VUE_APP_GENERAT_URL = 'http://192.168.2.12:9002'
 
 # 智能报表
-VUE_APP_REPORT_URL = 'http://123.60.219.66:9001'
+# VUE_APP_REPORT_URL = 'http://123.60.219.66:9001'
+VUE_APP_REPORT_URL = 'http://172.16.12.103:9001'
 # VUE_APP_REPORT_URL = 'http://192.168.2.3:9001'
 
 # 功率预测
-VUE_APP_BASE_URL = 'http://123.60.219.66:8086'
+# VUE_APP_BASE_URL = 'http://123.60.219.66:8086'
+VUE_APP_BASE_URL = 'http://172.16.12.103:8086'
 
 # 百度地图KEY
 VUE_APP_BAIDU_MAP_KEY = ''

src/App.vue

@@ -8,7 +8,8 @@
 <template>
     <div class="windLife" :class="!swichTheme ? 'themeDark' : 'themeLight'">
         <common-header v-if="showHeader" @headerName="headerName" @swichFn="swichFn"></common-header>
-        <div class="menu-body" v-if="isShowMenuDiv" @mouseenter="showMenu" @mouseleave="hideMenu">
+        <div class="menu-body" :class="!fixed ? 'menuBs' : ''" v-if="isShowMenu" @mouseenter="showMenu"
+            @mouseleave="hideMenu">
             <ul class="menu-list">
                 <li class="menu-item" v-for="(menu, index) in showMenuData" :key="index"
                     @click="handleNodeClick(menu.index)">
@@ -20,9 +21,17 @@
                         </el-tooltip>
                     </router-link>
                 </li>
+                <li class="lockpage" @click="handleClickFixed">
+                    <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>
             </ul>
         </div>
-        <div :style="{ paddingLeft: fixed ? '63px' : 0 }">
+        <div :style="{ paddingLeft: fixed ? '65px' : 0 }">
             <router-view />
         </div>
 
@@ -86,6 +95,11 @@
                         name: 'ERP'
                     },
                     {
+                        icon: 'Memo',
+                        index: '/intelligentReport/czzyb',
+                        name: '场站自由报表'
+                    },
+                    {
                         icon: 'Finished',
                         index: '/intelligentReport/reporting',
                         name: '报表上报'
@@ -154,11 +168,14 @@
             $route: {
                 handler: function (route) {
                     this.showHeader = route.path === '/login' ? false : true
-                    this.isShowMenuDiv = route.path === '/login' || route.path === '/home' ? false : true
+                    this.isShowMenu = route.path === '/login' || route.path === '/home' ? false : true
                 },
                 immediate: true
             }
         },
+        created() {
+            debugger
+        },
         mounted() {
             if (!JSON.parse(window.sessionStorage.getItem('theme'))) {
                 document.getElementById('app').style.background = '#040c0b'
@@ -172,18 +189,20 @@
                 }
                 this.$emit('swichFn', this.switchTheme)
             }
+            this.fixed = window.sessionStorage.getItem('menufixed')
+            this.isShowMenu = window.sessionStorage.getItem('isShowMenu')
 
-            if (window.sessionStorage.getItem('headerRoute')) {
-                let str = window.sessionStorage.getItem('headerRoute')
-                // let str = window.location.href
-                if (str.indexOf('powerPrediction') > -1) {
-                    this.showMenuData = this.powerPreDatas
-                } else if (str.indexOf('intelligentReport') > -1) {
-                    this.showMenuData = this.intelligentReportDatas
-                } else if (str.indexOf('generatingCap') > -1) {
-                    this.showMenuData = this.generatingCapDatas
-                }
+            // if (window.sessionStorage.getItem('headerRoute')) {
+            //     let str = window.sessionStorage.getItem('headerRoute')
+            let str = window.location.href
+            if (str.indexOf('powerPrediction') > -1) {
+                this.showMenuData = this.powerPreDatas
+            } else if (str.indexOf('intelligentReport') > -1) {
+                this.showMenuData = this.intelligentReportDatas
+            } else if (str.indexOf('generatingCap') > -1) {
+                this.showMenuData = this.generatingCapDatas
             }
+            // }
         },
         methods: {
             headerName(name) {
@@ -217,7 +236,7 @@
             hideMenu() {
                 if (!this.fixed) {
                     this.memuCloseTimeout = setTimeout(() => {
-                        this.isShowMenu = false;
+                        this.isShowMenu = true;
                         window.sessionStorage.setItem('isShowMenu', this.isShowMenu)
                     }, 500);
                 }
@@ -229,7 +248,7 @@
             },
             handleClickFixed() {
                 this.fixed = !this.fixed
-                console.log('fixed===>>>>', this.fixed)
+                window.sessionStorage.setItem('menufixed', JSON.stringify(this.fixed))
                 if (this.fixed) {
                     this.isShowMenu = true
                     window.sessionStorage.setItem('isShowMenu', this.isShowMenu)
@@ -256,9 +275,7 @@
             top: 60px;
             background-color: fade(#21192a, 75%);
             z-index: 2002;
-            opacity: 0;
-            transition: opacity 0.2s;
-            transition-timing-function: ease-in;
+
 
             &:hover {
                 opacity: 1;
@@ -291,37 +308,10 @@
                         font-size: 14px;
                         text-decoration: unset;
                         white-space: nowrap;
-
-                        .menu-icon {
-                            display: flex;
-                            align-items: center;
-
-                            svg {
-                                width: 14px;
-                                height: 14px;
-
-                                use {
-                                    fill: fade(#05bb4c, 75);
-                                }
-                            }
-                        }
                     }
 
                     &.active {
                         background: #323e70;
-
-                        .menu-icon {
-                            display: flex;
-
-                            svg use {
-                                fill: fade(#fff, 75);
-                            }
-                        }
-                    }
-
-                    .sub-menu-text {
-                        margin-left: 10px;
-                        color: #B3BDC0;
                     }
 
                     &+.menu-item {
@@ -344,6 +334,12 @@
                 }
             }
         }
+
+        .menuBs {
+            opacity: 0;
+            transition: opacity 0.2s;
+            transition-timing-function: ease-in;
+        }
     }
 
     @import "./assets/css/main.css";

src/components/commonHeaders.vue

@@ -70,12 +70,13 @@
             }
         },
         created() {
-            this.menuData = [{
-                    index: '/home',
-                    icon: 'Menu',
-                    name: '首页',
-                    showBac: true
-                },
+            this.menuData = [
+                // {
+                //     index: '/home',
+                //     icon: 'Menu',
+                //     name: '首页',
+                //     showBac: true
+                // },
                 {
                     index: '/generatingCap/dataFilter/prepare',
                     icon: 'Histogram',

src/components/generatingCapacityComponent/tree.vue

@@ -7,7 +7,7 @@
             <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="刷新">
+                    <el-icon size="14" title="刷新" @click.stop="refreshFn">
                         <RefreshRight />
                     </el-icon>
                 </p>
@@ -102,6 +102,9 @@
                 if (!value) return true;
                 return data.label.indexOf(value) !== -1;
             },
+            refreshFn() {
+                this.$emit("refresh")
+            },
             funCurrentChange(current, currentNode) {
                 this.$emit("currentChange", {
                     current,
@@ -142,7 +145,7 @@
                             let res = {
                                 code: 500
                             }
-                            res = await httpRequest.get("/generat/power/fitting/curve/save", {
+                            res = await httpRequest.get("/power/fitting/curve/save", {
                                 params: {
                                     ids: saveArr.join(",")
                                 },
@@ -216,13 +219,13 @@
                                 code: 500
                             }
                             if (this.type === 'wind') {
-                                res = await httpRequest.get("/generat/data/option/delete", {
+                                res = await httpRequest.get("/data/option/delete", {
                                     params: {
                                         ids: deleteArr.join(",")
                                     },
                                 }); //删除当前节点
                             } else {
-                                res = await httpRequest.delete("/generat/delete/files", {
+                                res = await httpRequest.delete("/delete/files", {
                                     data: {
                                         filename: deleteArr.join(",")
                                     },

src/router/index.js

@@ -124,6 +124,14 @@ const routes = [
         component: () => import("../views/intelligentReporting/erp/index.vue"),
     },
     {
+        path: "/intelligentReport/czzyb",
+        name: "intelligentReportczzyb",
+        meta: {
+            title: "场站自由报表",
+        },
+        component: () => import("../views/intelligentReporting/czzyb/index.vue"),
+    },
+    {
         path: "/intelligentReport/reporting",
         name: "intelligentReportreporting",
         meta: {

src/views/intelligentReporting/czzyb/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:8080/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",
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    'height': document.documentElement.clientHeight - 80 + 'px'
+                }
+            },
+        }
+    };
+</script>

src/views/intelligentReporting/erp/index.vue

@@ -7,7 +7,8 @@
     export default {
         data() {
             return {
-                url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$90580a90c10b4ee59dfa129528be1442&id=admin&pw=admin",
+                url: "http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$938d90db87424df2ac6e21b990b889e3&id=admin&pw=admin"
+                // url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$90580a90c10b4ee59dfa129528be1442&id=admin&pw=admin",
             };
         },
         computed: {

src/views/intelligentReporting/existing.vue

@@ -1,18 +1,21 @@
 <template>
-    <el-table :data="tableData2" highlight-current-row :height="height" @current-change="handleCurrentChange"
-        ref="singleTableRef">
-        <el-table-column label="已有脚本">
-            <template #default="scope">
-                <el-button type="warning" round>{{ scope.row.scriptName}}</el-button>
-            </template>
-        </el-table-column>
-        <el-table-column align="right">
-            <template #default="scope">
-                <el-button type="primary" @click="openDetil(scope.row)">编辑</el-button>
-                <el-button style="margin-right:10px" type="danger" @click="deleteRow(scope.row)">删除</el-button>
-            </template>
-        </el-table-column>
-    </el-table>
+    <div class="existingPage" :class="!theme ? 'themeDark' : 'themeLight'">
+        <p class="tableTit">已有脚本</p>
+        <el-table :data="tableData2" highlight-current-row :height="height" @current-change="handleCurrentChange"
+            ref="singleTableRef">
+            <el-table-column label="脚本名称">
+                <template #default="scope">
+                    <el-button type="warning" round>{{ scope.row.scriptName}}</el-button>
+                </template>
+            </el-table-column>
+            <el-table-column align="right">
+                <template #default="scope">
+                    <el-button type="primary" @click="openDetil(scope.row)">编辑</el-button>
+                    <el-button style="margin-right:10px" type="danger" @click="deleteRow(scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
     <el-dialog title="详情" custom-class="windLifeDialog" v-model="dialogVisible" width="1000px"
         :close-on-click-modal="false">
         <div class="periodFrom">
@@ -64,6 +67,12 @@
                     return '';
                 },
             },
+            theme: {
+                type: String,
+                default: () => {
+                    return '';
+                },
+            },
         },
         data() {
             return {
@@ -154,11 +163,37 @@
 
 
 <style scoped lang="less">
+    .existingPage {
+
+        .tableTit {
+            line-height: 40px;
+            margin-left: 10px;
+        }
+    }
+
+    .themeDark {
+        .tableTit {
+            font-size: 16px;
+            color: #f8f9ff;
+        }
+    }
+
+    .themeLight {
+        background: #f8f9ff;
+
+        .tableTit {
+            font-size: 16px;
+            color: #9093a6;
+        }
+    }
+
     .el-overlay {
         .startToDia {
             .el-dialog__body {
                 padding: 30px 60px 30px 20px !important;
 
+
+
                 .periodFrom {
 
                     .el-select,

src/views/intelligentReporting/gkjlb/index.vue

@@ -7,7 +7,8 @@
     export default {
         data() {
             return {
-                url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$e97782eaa9444e11aa1b33c78d9dca1f&id=admin&pw=admin",
+                url: "http://172.16.12.101:8080/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$c61354961de740f1acec8fc664034f81&id=admin&pw=admin"
+                // url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$e97782eaa9444e11aa1b33c78d9dca1f&id=admin&pw=admin",
             };
         },
         computed: {

src/views/intelligentReporting/reporting/index.vue

@@ -1,30 +1,38 @@
 <template>
     <div class="intellReport" :class="!theme ? 'themeDark' : 'themeLight'">
         <el-row :gutter="50" justify="space-evenly" :style="pageHeight">
-            <el-col :span="8" class="warn-table">
-                <existing @getExistingData="getData" :height="tableHeight" />
+            <el-col :span="9" class="warn-table">
+                <existing @getExistingData="getData" :height="tableHeight" :theme="theme" />
             </el-col>
-            <el-col :span="2" style="text-align: center;">
+            <el-col :span="1" style="text-align: center;">
                 <div :style="btnHeight">
-                    <el-button type="primary" @click="onAddItem1">
+                    <!-- <el-button type="primary" @click="onAddItem1">
                         <el-icon class="el-icon--right">
                             <ArrowRight />
                         </el-icon>
-                    </el-button>
+                    </el-button> -->
+                    <img src="../../../assets/images/left.png" @click="onAddItem1" alt="">
                 </div>
                 <div :style="btnHeight">
-                    <el-button type="primary" @click="onAddItem2">
+                    <!-- <el-button type="primary" @click="onAddItem2">
                         <el-icon class="el-icon--right">
                             <ArrowRight />
                         </el-icon>
-                    </el-button>
+                    </el-button> -->
+                    <img src="../../../assets/images/left.png" @click="onAddItem2" alt="">
                 </div>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="13">
                 <div class="listTop warn-table">
+                    <div style="display: flex;justify-content: space-between;">
+                        <p class="tableTit">脚本列表</p>
+                        <el-button class="run-all-script" type="primary" :disabled="btnloading" @click="runAllScript">
+                            全部运行
+                        </el-button>
+                    </div>
                     <el-table :data="tableData" :height="listHeight">
                         <el-table-column type="index" width="30" />
-                        <el-table-column label="脚本列表">
+                        <el-table-column label="脚本名称">
                             <template #default="scope">
                                 <el-button v-if="scope.row.scriptName !==''" type="warning" round>
                                     {{ scope.row.scriptName}}
@@ -40,11 +48,9 @@
                             </template>
                         </el-table-column>
                     </el-table>
-                    <el-button class="run-all-script" type="primary" :disabled="btnloading" @click="runAllScript">运行所有脚本
-                    </el-button>
                 </div>
 
-                <div class="listBot warn-table">
+                <div class="listTop listBot warn-table">
                     <p class="tableTit">每天运行一次</p>
                     <el-table :data="tableData4" :height="listHeight">
                         <el-table-column label="时间" width="300">
@@ -96,8 +102,8 @@
                 tableData4: [],
                 timeValue: '',
                 theme: null,
-                tableHeight: document.documentElement.clientHeight - 115,
-                listHeight: (document.documentElement.clientHeight - 160) / 2,
+                tableHeight: document.documentElement.clientHeight - 145,
+                listHeight: (document.documentElement.clientHeight - 210) / 2,
                 btnloading: false
             }
         },
@@ -201,11 +207,17 @@
     .intellReport {
         .listTop {
             margin-bottom: 20px;
+
+            .tableTit {
+                line-height: 40px;
+                margin-left: 10px;
+            }
         }
 
         .run-all-script {
-            position: absolute;
-            right: 120px;
+            position: relative;
+            right: 10px;
+            top: 10px;
         }
     }
 
@@ -215,7 +227,8 @@
         border-radius: 10px;
 
         .tableTit {
-            color: #fff;
+            font-size: 16px;
+            color: #f8f9ff;
         }
     }
 
@@ -224,8 +237,14 @@
         background: #edeffb;
         border-radius: 10px;
 
-        .tableTit {
-            color: #161f1e;
+        .listTop {
+            background: #f8f9ff;
+
+            .tableTit {
+                font-size: 16px;
+                color: #9093a6;
+            }
         }
+
     }
 </style>

src/views/intelligentReporting/scriptgeneration/index.vue

@@ -1,36 +1,40 @@
 <template>
     <div class="intellscriptgeneration" :class="!theme ? 'themeDark' : 'themeLight'">
         <el-row :gutter="50" justify="space-evenly" :style="pageHeight">
-            <el-col :span="8" class="warn-table">
-                <el-table :data="tableData" :height="tableHeight" highlight-current-row ref="singleTableRef"
-                    @current-change="handleCurrentChange">
-                    <el-table-column label="基本脚本">
-                        <template #default="scope">
-                            <el-input style="width: 150px" disabled>
-                                <template #prepend>{{ scope.row.before }}</template>
-                            </el-input>
-                            <el-input v-if="scope.row.behind !==''" style="width: 150px" disabled>
-                                <template #prepend>{{ scope.row.behind }}</template>
-                            </el-input>
-                        </template>
-                    </el-table-column>
-                </el-table>
+            <el-col :span="9" class=" warn-table">
+                <div class="listTop">
+                    <p class="tableTit">基本脚本</p>
+                    <el-table :data="tableData" :height="tableHeight" highlight-current-row ref="singleTableRef"
+                        @current-change="handleCurrentChange">
+                        <el-table-column label="脚本选项">
+                            <template #default="scope">
+                                <el-input style="width: 150px" disabled>
+                                    <template #prepend>{{ scope.row.before }}</template>
+                                </el-input>
+                                <el-input v-if="scope.row.behind !==''" style="width: 150px" disabled>
+                                    <template #prepend>{{ scope.row.behind }}</template>
+                                </el-input>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
 
-                <existing ref="childRowSet" @getExistingData="getData" :height="tableHeight" />
+                <existing ref="childRowSet" @getExistingData="getData" :height="tableHeight" :theme="theme" />
 
             </el-col>
 
-            <el-col :span="2">
+            <el-col :span="1">
                 <div style="text-align: center;" :style="btnHeight">
-                    <el-button type="primary" @click="onAddItem">
+                    <!-- <el-button type="primary" @click="onAddItem">
                         填加
                         <el-icon class="el-icon--right">
                             <ArrowRight />
                         </el-icon>
-                    </el-button>
+                    </el-button> -->
+                    <img src="../../../assets/images/left.png" @click="onAddItem1" alt="">
                 </div>
             </el-col>
-            <el-col :span="12" class="warn-table">
+            <el-col :span="13" class="warn-table">
                 <div style="margin-bottom: 12px">
                     <el-input v-model="scriptname" style="width: 500px">
                         <template #prepend>输入脚本名称：</template>
@@ -77,7 +81,7 @@
         },
         data() {
             return {
-                tableHeight: (document.documentElement.clientHeight - 120) / 2,
+                tableHeight: (document.documentElement.clientHeight - 220) / 2,
                 listHeight: document.documentElement.clientHeight - 160,
                 scriptname: '',
                 tableData: [{
@@ -184,12 +188,26 @@
 </script>
 
 <style scoped lang="less">
-    .intellscriptgeneration {}
+    .intellscriptgeneration {
+        .listTop {
+            margin-bottom: 20px;
+
+            .tableTit {
+                line-height: 40px;
+                margin-left: 10px;
+            }
+        }
+    }
 
     .themeDark {
         padding: 20px 0;
         background: #161f1e;
         border-radius: 10px;
+
+        .tableTit {
+            font-size: 16px;
+            color: #f8f9ff;
+        }
     }
 
     .themeLight {
@@ -197,5 +215,14 @@
         background: #edeffb;
         border-radius: 10px;
 
+        .listTop {
+            background: #f8f9ff;
+
+            .tableTit {
+                font-size: 16px;
+                color: #9093a6;
+            }
+        }
+
     }
 </style>

src/views/login/index.vue

@@ -140,8 +140,8 @@
                     if (datas && datas.code === 0) {
                         setToken(datas.data.accessToken)
                         that.$router.push({
-                            path: "/home"
-                            // path: "/generatingCap/dataFilter/prepare"
+                            // path: "/home"
+                            path: "/generatingCap/dataFilter/prepare"
                         })
                     } else {
                         ElMessage.error(datas.msg);