修改

.env.development

@@ -8,17 +8,17 @@ VUE_APP_TITLE = '页面标题'
 
 # 登录
 # VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
-VUE_APP_LOGIN_URL = 'http://192.168.2.231:48080'
+VUE_APP_LOGIN_URL = 'http://120.46.128.147:48080'
 
 # 发电能力分析
 # VUE_APP_GENERAT_URL = 'http://123.60.219.66:9002'
-VUE_APP_GENERAT_URL = 'http://192.168.2.231:9002'
+VUE_APP_GENERAT_URL = 'http://120.46.128.147:9002'
 # 智能报表
 # VUE_APP_REPORT_URL = 'http://123.60.219.66:9001'
-VUE_APP_REPORT_URL = 'http://192.168.2.231:9001'
+VUE_APP_REPORT_URL = 'http://120.46.128.147:9001'
 # 功率预测
 # VUE_APP_BASE_URL = 'http://123.60.219.66:8086'
-VUE_APP_BASE_URL = 'http://192.168.2.126:8086'
+VUE_APP_BASE_URL = 'http://120.46.128.147:8086'
 
 # 百度地图KEY
 VUE_APP_BAIDU_MAP_KEY = ''

.env.production

@@ -12,30 +12,34 @@ NODE_ENV = 'production'
 VUE_APP_TITLE = '页面标题'
 
 # 登录
-# VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
-# VUE_APP_LOGIN_URL = 'http://172.16.12.103:48080'
-VUE_APP_LOGIN_URL = 'http://192.168.2.231:48080'
-# VUE_APP_LOGIN_URL = 'http://localhost:48080'
+VUE_APP_LOGIN_URL = 'http://120.46.128.147:48080'
+# VUE_APP_LOGIN_URL = 'http://10.127.7.241:48080'
+# VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
+# VUE_APP_LOGIN_URL = 'http://192.168.2.231:48080'
+# VUE_APP_LOGIN_URL = 'http://127.0.0.1:48080'
 
 # 生产环境/重写路径(公共路径)
 
 # 发电能力分析
-# 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.231:9002'
-# VUE_APP_GENERAT_URL = 'http://localhost:9002'
+VUE_APP_GENERAT_URL = 'http://120.46.128.147:9002'
+# VUE_APP_GENERAT_URL = 'http://10.127.7.241:9002'
+# VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
+# VUE_APP_GENERAT_URL = 'http://192.168.2.231:9002'
+# VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
 
 # 智能报表
-# 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.231:9001'
-# VUE_APP_REPORT_URL = 'http://localhost:9001'
+VUE_APP_REPORT_URL = 'http://120.46.128.147:9001'
+# VUE_APP_REPORT_URL = 'http://10.127.7.241:9001'
+# VUE_APP_REPORT_URL = 'http://172.16.12.101:9001'
+# VUE_APP_REPORT_URL = 'http://192.168.2.231:9001'
+# VUE_APP_REPORT_URL = 'http://127.0.0.1:9001'
 
 # 功率预测
-# VUE_APP_BASE_URL = 'http://123.60.219.66:8086'
-# VUE_APP_BASE_URL = 'http://172.16.12.103:8086'
-VUE_APP_BASE_URL = 'http://192.168.2.231:8086'
-# VUE_APP_BASE_URL = 'http://localhost:8086'
+VUE_APP_BASE_URL = 'http://120.46.128.147:8086'
+# VUE_APP_BASE_URL = 'http://10.127.7.241:8086'
+# VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
+# VUE_APP_BASE_URL = 'http://192.168.2.231:8086'
+# VUE_APP_BASE_URL = 'http://127.0.0.1:8086'
 
 # 百度地图KEY
 VUE_APP_BAIDU_MAP_KEY = ''

README.md

@@ -1,3 +1,3 @@
-# windLifecontrol_product
+# windLifecontrolPro
 
 基于风机发电量全寿命周期管控的研究与应用

package.json

@@ -9,8 +9,10 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@element-plus/icons-vue": "^2.0.10",
+    "@panzhiyue/leaflet-canvaslabel": "^1.2.0",
     "axios": "^0.21.1",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.11",
     "echarts": "^5.3.2",
     "element-plus": "^2.3.6",
     "exceljs": "^4.3.0",

public/static/config/modeConfig.js

@@ -18,11 +18,14 @@ const tilesMaxLevel = 18;
 // 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
 const showModuleName = 0;
 
+const reportBaseUrl = "http://10.127.7.241:8083";
+// const reportBaseUrl = "http://172.16.12.101:8083";
+
 // if (localTest) {
 //     baseURL = "http://192.168.10.8:9002/" // 联机调试 
 // } else {
 //     baseURL = "http://10.155.32.14:9002/" // 正式环境
-    
+
 // }
 
 websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket";
@@ -33,5 +36,16 @@ window.__MODE__ = {
     // adapterUrl,
     tilesUrl,
     tilesMaxLevel,
-    showModuleName
-};
+    showModuleName,
+    reportBaseUrl
+};
+
+export default {
+    baseURL,
+    websocketUrl,
+    // adapterUrl,
+    tilesUrl,
+    tilesMaxLevel,
+    showModuleName,
+    reportBaseUrl
+}

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

@@ -1,7 +1,7 @@
 .el-overlay {
     .el-overlay-dialog {
         .windLifeDialog {
-            margin-top: 5vh !important;
+            // margin-top: 5vh !important;
             background: #040c0b;
 
             .el-dialog__header {

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

@@ -3,7 +3,7 @@
 
         .el-dialog,
         .windLifeDialog {
-            margin-top: 5vh !important;
+            // margin-top: 5vh !important;
             background: #fff;
 
             .el-dialog__header {

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

@@ -103,5 +103,24 @@
                 top: -1px;
             }
         }
+
+        .el-input-number {
+
+            .el-input-number__decrease,
+            .el-input-number__increase {
+                line-height: 15px;
+                color: #fff;
+                background: #213c7f;
+
+            }
+
+            .el-input {
+                .el-input__wrapper {
+                    // background-color: #606266;
+                    background-color: transparent;
+                }
+
+            }
+        }
     }
 }

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

@@ -0,0 +1,48 @@
+.el-popper {
+    .el-menu--vertical {
+        .el-menu {
+            border-radius: 0 0 8px 8px;
+            padding: 10px 0 10px 0;
+            background: #001D53;
+
+            .elsubMenu {
+                width: 136px;
+                height: 30px;
+                margin: 10px 0;
+                position: relative;
+                left: 45px;
+
+                .grounpItem {
+                    height: 30px;
+                    position: relative;
+                    top: -13px;
+
+                    .grounpItemSty {
+                        width: 7px;
+                        height: 7px;
+                        background: #B1B8CB;
+                        border-radius: 50%;
+                        position: relative;
+                        left: -40px;
+                    }
+
+                    .grounpItemSpan {
+                        position: relative;
+                        left: -15px;
+                    }
+                }
+
+                .is-active {
+                    background: rgba(0, 70, 199, 0.4);
+                    border: 1px solid #115FC8;
+
+                    .grounpItemSty {
+                        background: #1C99FF;
+                        position: relative;
+                        left: -41px;
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -1,8 +1,14 @@
 .el-tree {
     .el-tree-node {
+        // height: 32px;
+        line-height: 30px;
         background-color: #13171e;
 
         .el-tree-node__content {
+            height: 32px;
+            line-height: 32px;
+
+            background: none !important;
 
             .el-dropdown:hover {
                 color: #fff;
@@ -11,7 +17,9 @@
 
     }
 
-
+    .el-tree-node>.el-tree-node__children {
+        overflow: visible;
+    }
 
     .is-current {}
 
@@ -25,6 +33,139 @@
 
 }
 
-.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
-    background: #0046C7 !important;
+
+.elTreeSty {
+    .el-tree-node {
+        .el-tree-node__content {
+            .el-checkbox {
+                left: 14px;
+                width: 13px;
+                height: 13px;
+                background: #CBCCD1;
+                border: 1px solid #7C808C;
+                border-radius: 3px;
+
+                .el-checkbox__input {
+                    .el-checkbox__inner {
+                        background-color: #CBCCD1;
+                        border: #CBCCD1;
+                    }
+                }
+
+            }
+
+            .is-checked {
+                width: 13px;
+                height: 13px;
+                background: #5473E8;
+                border: 1px solid #5473E8;
+                border-radius: 3px;
+
+                .el-checkbox__input {
+                    .el-checkbox__inner {
+                        background-color: #5473E8;
+                        border: #5473E8;
+                    }
+                }
+            }
+
+            .dashedSty {
+                left: -27px;
+            }
+
+            .changenodeLabel,
+            .nodeLabel {
+                left: -3px;
+            }
+
+        }
+    }
+}
+
+.dashedSty {
+    width: 20px;
+    height: 30px;
+    position: relative;
+
+    .hasMore_shu {
+        position: absolute;
+        top: 0;
+        left: 5px;
+        display: inline-block;
+        width: 1px;
+        height: 30px;
+        border-left: 1px dashed #565D70;
+    }
+
+    .hasMore_heng {
+        width: 10px;
+        height: 1px;
+        position: absolute;
+        top: 17px;
+        left: 7px;
+        border-top: 1px dashed #565D70;
+    }
+}
+
+.radio {
+    position: relative;
+    // top: 10px;
+    width: 14px;
+    height: 14px;
+    background: #555657;
+    border-radius: 3px;
+    border: 1px solid #555657;
+    margin-right: 10px;
+}
+
+.changeradio {
+    position: relative;
+    top: 10px;
+    width: 15px;
+    height: 15px;
+    background: #1C99FF;
+    border-radius: 3px;
+    margin-right: 10px;
+
+    .el-icon {
+        position: absolute;
+        top: 4px;
+        left: 2px;
+        color: #fff;
+        width: 10px;
+        height: 8px;
+    }
+}
+
+.nodeLabel {
+    position: relative;
+    top: 2px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 14px;
+    color: #C3C3C4;
+    line-height: 30px;
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.changenodeLabel {
+    position: relative;
+    top: 2px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 14px;
+    color: #fff;
+    line-height: 30px;
+    padding: 0 10px 0 2px;
+    background: #0046C7;
+    box-shadow: 0px 0px 3px 0px rgba(83, 86, 94, 0.23);
+    border-radius: 5px;
+    border: 1px solid #0046C7;
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
 }

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

@@ -1,9 +1,161 @@
 .el-tree {
     .el-tree-node {
+        // height: 32px;
+        line-height: 32px;
         background: #E6E8F2;
+
+        .el-tree-node__content {
+            height: 32px;
+            line-height: 32px;
+
+            background: none !important;
+        }
+
     }
 
+    .el-tree-node>.el-tree-node__children {
+        overflow: visible;
+    }
+
+
+
     .el-tree__empty-block {
         background: #E6E8F2;
     }
+}
+
+.elTreeSty {
+    .el-tree-node {
+        .el-tree-node__content {
+            .el-checkbox {
+                left: 14px;
+                width: 13px;
+                height: 13px;
+                background: #CBCCD1;
+                border: 1px solid #7C808C;
+                border-radius: 3px;
+
+                .el-checkbox__input {
+                    .el-checkbox__inner {
+                        background-color: #CBCCD1;
+                        border: #CBCCD1;
+                    }
+                }
+
+            }
+
+            .is-checked {
+                width: 13px;
+                height: 13px;
+                background: #5473E8;
+                border: 1px solid #5473E8;
+                border-radius: 3px;
+
+                .el-checkbox__input {
+                    .el-checkbox__inner {
+                        background-color: #5473E8;
+                        border: #5473E8;
+                    }
+                }
+            }
+
+            .dashedSty {
+                left: -27px;
+            }
+
+            .changenodeLabel,
+            .nodeLabel {
+                left: -3px;
+            }
+
+        }
+    }
+}
+
+.dashedSty {
+    width: 20px;
+    height: 30px;
+    position: relative;
+
+    .hasMore_shu {
+        position: absolute;
+        top: 0;
+        left: 5px;
+        display: inline-block;
+        width: 1px;
+        height: 30px;
+        border-left: 1px dashed #565D70;
+    }
+
+    .hasMore_heng {
+        width: 10px;
+        height: 1px;
+        position: absolute;
+        top: 17px;
+        left: 7px;
+        border-top: 1px dashed #565D70;
+    }
+}
+
+.radio {
+    position: relative;
+    // top: 10px;
+    width: 14px;
+    height: 14px;
+    background: #CBCCD1;
+    border-radius: 3px;
+    border: 1px solid #7C808C;
+    margin-right: 10px;
+}
+
+.changeradio {
+    position: relative;
+    top: 10px;
+    width: 15px;
+    height: 15px;
+    background: #5473E8;
+    border-radius: 3px;
+    margin-right: 10px;
+
+    .el-icon {
+        position: absolute;
+        top: 4px;
+        left: 2px;
+        color: #fff;
+        width: 10px;
+        height: 8px;
+    }
+}
+
+.nodeLabel {
+    position: relative;
+    top: 2px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 14px;
+    color: #121212;
+    line-height: 30px;
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.changenodeLabel {
+    position: relative;
+    top: 2px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 14px;
+    color: #5473E8;
+    line-height: 30px;
+    padding: 0 10px 0 2px;
+    background: #FFFFFF;
+    box-shadow: 0px 0px 3px 0px rgba(83, 86, 94, 0.23);
+    border-radius: 5px;
+    border: 1px solid rgba(84, 115, 232, 0.3);
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
 }

src/components/commonHeaders.vue

@@ -3,12 +3,15 @@
         <el-container>
             <el-header :class="getStyle()">
                 <div class="logoSty">
-                    <img src="../assets/logoGuo_DB.png" alt="">
+                    <img src="../assets/common.png" alt="">
                 </div>
                 <div class="proMenu">
                     <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 class="buttonItem" v-for="(item,index) in menuData" :key="index"
+                            :class="getColor(item.showBac)" @click="changeRoute(item)">
+                            <img :src="headerMenuImg" alt="" v-if="item.showBac">
+                            <span>{{item.name}}</span>
+                        </div> -->
                     </div>
                     <div class="proSet">
                         <div class="settingStop">
@@ -26,13 +29,14 @@
                             </el-switch>
 
                             <el-tooltip class="box-item" effect="light" content="自动填报工具">
-                                <a href="http://172.16.12.103:9001/script/download">
+                                <a href="http://10.127.7.196:9001/script/download">
+                                    <!-- <a href="http://172.16.12.101:9001/script/download"> -->
                                     <img :src="header_wendang" class="Settingitem downItem">
                                 </a>
                             </el-tooltip>
-                            <el-tooltip class="box-item" effect="light" content="系统设置">
+                            <!-- <el-tooltip class="box-item" effect="light" content="系统设置">
                                 <img :src="header_shezhi" class="Settingitem">
-                            </el-tooltip>
+                            </el-tooltip> -->
                             <el-tooltip class="box-item" effect="light" content="退出">
                                 <img :src="header_dianyuan" class="Settingitem rightIm" @click="backLogin">
                             </el-tooltip>
@@ -54,6 +58,7 @@
     import moon_B from '@/assets/images/headerCom/moon_B.png'
     import sun_B from '@/assets/images/headerCom/sun_B.png'
     import moon_W from '@/assets/images/headerCom/moon_W.png'
+    import headerMenuImg from '@/assets/images/headerCom/headerMenu.png'
     import {
         Sunny,
         Moon
@@ -74,6 +79,7 @@
                 sun_B: sun_B,
                 moon_B: moon_B,
                 moon_W: moon_W,
+                headerMenuImg: headerMenuImg,
                 header_wendang: header_wendang,
                 header_shezhi: header_shezhi,
                 header_dianyuan: header_dianyuan,
@@ -178,8 +184,15 @@
             },
             changeRoute(item) {
                 window.sessionStorage.setItem('headerRoute', item.index)
+                let params = {}
+                if (item.index.indexOf('intelligentReport') > -1) {
+                    params = {
+                        name: 'xinzhuang'
+                    }
+                }
                 this.$router.push({
-                    path: item.index
+                    path: item.index,
+                    query: params
                 })
                 this.$emit('headerName', item.name)
             },
@@ -320,6 +333,11 @@
                 img {
                     width: 310px;
                 }
+
+                p {
+                    font-size: 16px;
+                    margin-left: 15px;
+                }
             }
 
             .proMenu {
@@ -333,6 +351,12 @@
                         line-height: 52px;
                         font-size: 14px;
                         text-align: center;
+                        position: relative;
+
+                        img {
+                            position: absolute;
+                            left: 0;
+                        }
                     }
                 }
 

src/components/generatingCapacityComponent/tree.vue

@@ -16,16 +16,25 @@
                     :dropdownMenu="dropdownMenu">
                 </tree-node>
             </div> -->
-            <el-tree :data="data" :props="defaultProps" default-expand-all highlight-current
+            <el-tree :data="data" :props="defaultProps" default-expand-all highlight-current icon="none"
                 :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="''">
+                @check="funCheckChange" node-key="id" :expand-on-click-node="false" :current-node-key="''"
+                :class="showCheckbox?'elTreeSty':''">
                 <template #default="{ node, data }">
+                    <div class="dashedSty">
+                        <span class="hasMore_shu"
+                            :style="node.id !== node.parent.childNodes[node.parent.childNodes.length-1].id ? 'height: 30px' : 'height: 18px'"
+                            :styel="shuFn(node, data)"></span>
+                        <span class="hasMore_heng"></span>
+                    </div>
+
                     <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">
+
+                        <span class="el-dropdown-link" :class="node.isCurrent ? 'changenodeLabel' : 'nodeLabel'">
                             {{ node.label }}
                         </span>
+                        <span>{{ node.label }}</span>
                         <template #dropdown>
                             <el-dropdown-menu>
                                 <el-dropdown-item class="text-[#409EFF]" v-if="dropdownMenu.includes('save')"
@@ -55,6 +64,7 @@
     import tree_shuaxing from '@/assets/menuImg/tree_shuaxing.png'
     import nodata from '@/assets/images/noData.png'
     import TreeNode from './treeStyle.vue'
+    import treeJson from './treeJson.json'
     import {
         Search
     } from '@element-plus/icons-vue'
@@ -107,6 +117,8 @@
         },
         data() {
             return {
+                // treeJson: treeJson,
+                treeJsonArr: [],
                 filterText: '',
                 Search: Search,
                 nodata: nodata,
@@ -122,7 +134,31 @@
                 this.$refs.tree.filter(val);
             }
         },
+        mounted() {
+            // this.treeJsonFn()
+        },
         methods: {
+            treeJsonFn() {
+                this.treeJsonArr = this.funRepeatMap(this.treeJson.data)
+            },
+            funRepeatMap(arr, type = 'prepare') {
+                return arr.map(o => {
+                    if (o.children) {
+                        const findIndex = o.children.findIndex(p => !!p.type)
+                        if (findIndex !== -1) {
+                            o.childs = o.children
+                            o.children = []
+                        }
+                    }
+                    return {
+                        ...o,
+                        children: o.children ? this.funRepeatMap(o.children, type) : []
+                    }
+                })
+            },
+            shuFn(node, data) {
+                // debugger
+            },
             filterNode(value, data) {
                 if (!value) return true;
                 return data.label.indexOf(value) !== -1;
@@ -274,7 +310,7 @@
         },
     }
 </script>
-<style lang="less" scoped>
+<style lang="less">
     .treeData {
         overflow-y: auto;
 
@@ -305,6 +341,7 @@
         }
 
         .treeMain {
+
             .treeMainTit {
                 width: calc(100% - 10px);
                 height: 22px;
@@ -324,16 +361,20 @@
                 }
             }
 
+
+
             .el-tree {
-                background: #161f1e;
+                background: transparent;
                 color: #fff;
+                height: 100%;
 
                 .is-current {
                     width: 100%;
-                    height: 20px;
-                    background: #fff !important;
+                    background: none !important;
                 }
 
+
+
                 .el-tree__empty-block {
                     img {
                         margin-top: 20px;
@@ -347,6 +388,8 @@
                 }
 
             }
+
+
         }
 
     }

src/components/powerPredictionComponent/SecondaryPageStyle/globalblackStyle.less

@@ -26,7 +26,7 @@
 
                         span {
                             font-size: 14px;
-                            margin-left: 10px;
+                            // margin-left: 10px;
                         }
 
                         display: flex;

src/components/powerPredictionComponent/SecondaryPageStyle/globalwhiteStyle.less

@@ -1,79 +1,67 @@
-.globalDiaWhite {
-    margin-top: 5vh !important;
+.main_top {
+    display: flex;
+    justify-content: space-between;
 
-    // opacity: 0.9;
-    .el-dialog__body {
-        padding: 10px 20px;
+    .main_top_left {
+        display: flex;
 
-        .globalDiaMain {
-
-            .main_top {
-                display: flex;
-                justify-content: space-between;
-
-                .main_top_left {
-                    display: flex;
-
-                    .exceed {
-                        span {
-                            font-size: 14px;
-                            margin-left: 10px;
-                        }
-
-                        display: flex;
-                        margin-right:20px;
+        .exceed {
+            span {
+                font-size: 14px;
+                margin-left: 10px;
+            }
 
-                        .el-date-editor {
-                            height: 32px;
+            display: flex;
+            margin-right:20px;
 
-                            .el-input__icon,
-                            .el-range-separator {
-                                line-height: 30px;
-                            }
-                        }
+            .el-date-editor {
+                height: 32px;
 
-                        .select-trigger {
-                            .el-input {
-                                .el-input__wrapper {
-                                    height: 30px;
-                                }
-                            }
+                .el-input__icon,
+                .el-range-separator {
+                    line-height: 30px;
+                }
+            }
 
-                            .el-input__suffix {
-                                .el-input__icon {
-                                    line-height: 30px;
-                                }
-                            }
-                        }
+            .select-trigger {
+                .el-input {
+                    .el-input__wrapper {
+                        height: 30px;
                     }
                 }
 
-                .el-button {
-                    height: 30px;
-                    padding: 0 20px;
-                    line-height: 5px;
+                .el-input__suffix {
+                    .el-input__icon {
+                        line-height: 30px;
+                    }
                 }
             }
+        }
+    }
 
-            .main_charts {
-                margin-top: 20px;
+    .el-button {
+        height: 30px;
+        padding: 0 20px;
+        line-height: 5px;
+    }
+}
 
-                .chartsStyle {
-                    height: 300px;
-                    width: 100%;
-                }
-            }
+.main_charts {
+    margin-top: 20px;
 
-            .main_table {
-                margin: 20px 0;
+    .chartsStyle {
+        height: 300px;
+        width: 100%;
+    }
+}
 
-                .el-table {
-                    .el-table__body-wrapper {
-                        height: 335px !important;
-                        overflow-y: auto;
-                    }
-                }
-            }
+.main_table {
+    margin: 20px 0;
+
+    .el-table {
+        .el-table__body-wrapper {
+            height: 335px !important;
+            overflow-y: auto;
         }
     }
 }

src/components/powerPredictionComponent/batteryDivinerDialog/dayBatterDialog.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" :fullscreen="true"
         :close-on-click-modal="false" @close="closeDialog">
-        <div class="globalDiaMain" :class="!theme ? 'themeDark' : 'themeLight'">
+        <div class="globalDiaMain" :class="!theme ? 'themeDa' : 'themeLi'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -34,8 +34,8 @@
                 <div class="main_charts">
                     <div id="centerCharts" class="chartsStyle"></div>
                 </div>
-                <div class="main_table warn-table">
-                    <el-table :data="tableData" ref="report-table_day" border max-height="400px" style="width: 100%">
+                <div class="main_table warn-table" style="margin-top: 20px">
+                    <el-table :data="tableData" ref="report-table_day" border max-height="50vh" style="width: 100%">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论电量" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用电量" align="center"></el-table-column>
@@ -460,7 +460,7 @@
         }
     }
 
-    .themeDark {
+    .themeDa {
 
         .main_top {
             .main_top_left {
@@ -471,7 +471,7 @@
         }
     }
 
-    .themeLight {
+    .themeLi {
         .main_top {
             .main_top_left {
                 .exceed {

src/components/powerPredictionComponent/batteryDivinerDialog/monthAndYearBatterDialog.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" :fullscreen="true"
         :close-on-click-modal="false" @close="closeDialog">
-        <div class="globalDiaMain" v-loading="loading" :class="!theme ? 'themeDark' : 'themeLight'">
+        <div class="globalDiaMain" v-loading="loading" :class="!theme ? 'themeDa' : 'themeLi'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -28,8 +28,8 @@
             <div class="main_charts">
                 <div id="centersCharts" class="chartsStyle"></div>
             </div>
-            <div class="main_table warn-table">
-                <el-table :data="tableData" ref="report-table" border max-height="400px" style="width: 100%">
+            <div class="main_table warn-table" style="margin-top: 20px">
+                <el-table :data="tableData" ref="report-table" border max-height="50vh" style="width: 100%">
                     <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                     <el-table-column label="当期数据" align="center">
                         <el-table-column prop="veryShortTermForecastDq" label="计划发电" align="center"></el-table-column>
@@ -406,7 +406,7 @@
         }
     }
 
-    .themeDark {
+    .themeDa {
 
         .main_top {
             .main_top_left {
@@ -417,7 +417,7 @@
         }
     }
 
-    .themeLight {
+    .themeLi {
         .main_top {
             .main_top_left {
                 .exceed {

src/components/powerPredictionComponent/homePageAssembly/globalDialogPage.vue

@@ -1,8 +1,8 @@
 <template>
-    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" :fullscreen="true"
         :close-on-click-modal="false" @close="closeDialog">
         <!-- :class="from === 'index'? 'globalDia' : 'globalDiaWhite'" -->
-        <div class="globalDiaMain" :class="!theme ? 'themeDark' : 'themeLight'">
+        <div class="globalDiaMain" :class="!theme ? 'themeDa' : 'themeLi'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -38,8 +38,8 @@
                 <div class="main_charts">
                     <div id="centerCharts" class="chartsStyle"></div>
                 </div>
-                <div class="warn-table" v-show="title === '功率预测'">
-                    <el-table :data="tableData" ref="report-table_power" max-height="400px" style="width: 100%">
+                <div class="warn-table" style="margin-top: 20px" v-show="title === '功率预测'">
+                    <el-table :data="tableData" ref="report-table_power" max-height="50vh" style="width: 100%">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>
@@ -693,7 +693,7 @@
                         }
                     }
 
-                    .themeDark {
+                    .themeDa {
 
                         .main_top {
                             .main_top_left {
@@ -704,7 +704,7 @@
                         }
                     }
 
-                    .themeLight {
+                    .themeLi {
                         .main_top {
                             .main_top_left {
                                 .exceed {

src/components/powerPredictionComponent/panoramicPowerDialog/panoramaPowerDialogPage.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" :fullscreen="true"
         :close-on-click-modal="false">
-        <div class="globalDiaMain" :class="!theme ? 'themeDark' : 'themeLight'">
+        <div class="globalDiaMain" :class="!theme ? 'themeDa' : 'themeLi'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -31,8 +31,8 @@
                         <div id="windCharts" class="chartsStyle"></div>
                     </el-col>
                 </el-row>
-                <div class="main_table warn-table">
-                    <el-table :data="tableData" ref="report-table" border max-height="400px" style="width: 100%">
+                <div class="main_table warn-table" style="margin-top: 20px">
+                    <el-table :data="tableData" ref="report-table" border max-height="50vh" style="width: 100%">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>
@@ -427,7 +427,7 @@
 </script>
 
 <style lang="less">
-    .themeDark {
+    .themeDa {
 
         .main_top {
             .main_top_left {
@@ -438,7 +438,7 @@
         }
     }
 
-    .themeLight {
+    .themeLi {
         .main_top {
             .main_top_left {
                 .exceed {

src/components/powerPredictionComponent/powerPredictionDialog/predictionDialogPage.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" :fullscreen="true"
         :close-on-click-modal="false" @close="closeDialog">
-        <div class="globalDiaMain" :class="!theme ? 'themeDark' : 'themeLight'">
+        <div class="globalDiaMain" :class="!theme ? 'themeDa' : 'themeLi'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -29,8 +29,8 @@
                 <div class="main_charts">
                     <div id="centerCharts" class="chartsStyle"></div>
                 </div>
-                <div class="main_table warn-table" v-show="isPower">
-                    <el-table :data="tableData" ref="report-table_power" border max-height="400px" style="width: 100%">
+                <div class="main_table warn-table" style="margin-top: 20px" v-show="isPower">
+                    <el-table :data="tableData" ref="report-table_power" border max-height="50vh" style="width: 100%">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>
@@ -547,6 +547,117 @@
 </script>
 
 <style lang="less">
-    @import '../SecondaryPageStyle/globalblackStyle.less';
-    @import '../SecondaryPageStyle/globalwhiteStyle.less';
+    .el-overlay {
+        .el-overlay-dialog {
+            .windLifeDialog {
+                .el-dialog__header {
+                    .el-dialog__title {
+                        color: #fff !important;
+                    }
+                }
+
+                .el-dialog__body {
+                    padding: 10px 20px;
+
+                    .globalDiaMain {
+
+                        .main_top {
+                            display: flex;
+                            justify-content: space-between;
+
+                            .main_top_left {
+                                display: flex;
+
+                                .exceed {
+
+
+                                    span {
+                                        font-size: 14px;
+                                        margin-left: 10px;
+                                    }
+
+                                    display: flex;
+                                    margin-right:20px;
+
+                                    .el-date-editor {
+                                        height: 32px;
+
+                                        .el-input__icon,
+                                        .el-range-separator {
+                                            line-height: 30px;
+                                        }
+                                    }
+
+                                    .select-trigger {
+                                        .el-input {
+                                            .el-input__wrapper {
+                                                height: 30px;
+                                            }
+                                        }
+
+                                        .el-input__suffix {
+                                            .el-input__icon {
+                                                line-height: 30px;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            .el-button {
+                                height: 30px;
+                                padding: 0 20px;
+                                line-height: 5px;
+                            }
+                        }
+
+                        .main_charts {
+                            margin-top: 20px;
+
+                            .chartsStyle {
+                                height: 300px;
+                                width: 100%;
+                            }
+                        }
+
+                        .main_table {
+                            margin: 20px 0;
+
+                            .el-table {
+                                .el-table__body-wrapper {
+                                    height: 335px !important;
+                                    overflow-y: auto;
+                                }
+                            }
+                        }
+                    }
+
+                    .themeDa {
+                        .main_top {
+                            .exceed {
+                                .el-select {
+                                    .el-input {
+                                        .el-input__wrapper {
+                                            .el-input__suffix {
+                                                .el-input__suffix-inner {
+                                                    position: relative;
+                                                    left: -9px;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        @import '../SecondaryPageStyle/globalblackStyle.less';
+                    }
+
+                    // .themeLi {
+                    //     @import '../SecondaryPageStyle/globalwhiteStyle.less';
+                    // }
+                }
+            }
+        }
+    }
 </style>

src/main.js

@@ -24,36 +24,39 @@ import "leaflet-contextmenu"
 import "leaflet-canvas-marker"
 import icon from "leaflet/dist/images/marker-icon.png" // 引入leaflet默认图标
 
+import modeConfig from "@public/static/config/modeConfig.js"
+
 import './permission' // permission control
 
 const debounce = (fn, delay) => {
-    let timer = null;
-    return function () {
-      let context = this;
-      let args = arguments;
-      clearTimeout(timer);
-      timer = setTimeout(function () {
-        fn.apply(context, args);
-      }, delay);
-    }
+  let timer = null;
+  return function () {
+    let context = this;
+    let args = arguments;
+    clearTimeout(timer);
+    timer = setTimeout(function () {
+      fn.apply(context, args);
+    }, delay);
   }
-   
-  const _ResizeObserver = window.ResizeObserver;
-  window.ResizeObserver = class ResizeObserver extends _ResizeObserver{
-    constructor(callback) {
-      callback = debounce(callback, 16);
-      super(callback);
-    }
+}
+
+const _ResizeObserver = window.ResizeObserver;
+window.ResizeObserver = class ResizeObserver extends _ResizeObserver {
+  constructor(callback) {
+    callback = debounce(callback, 16);
+    super(callback);
   }
+}
 
 
 const app = createApp(App)
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-    app.component(key, component)
+  app.component(key, component)
 }
 app.config.globalProperties.$utils = utils;
 app.config.globalProperties.$echarts = echarts;
 app.config.globalProperties.$axios = axios;
-app.config.globalProperties.icoName = icon
+app.config.globalProperties.icoName = icon;
+app.config.globalProperties.reportBaseUrl =  modeConfig?.reportBaseUrl || "";
 app.use(L);
-app.use(store).use(router).use(ElementPlus, { size: 'small',locale: zhCn }).mount('#app')
+app.use(store).use(router).use(ElementPlus, { size: 'small', locale: zhCn }).mount('#app')

src/router/index.js

@@ -132,6 +132,14 @@ const routes = [
         component: () => import("../views/intelligentReporting/czzyb/index.vue"),
     },
     {
+        path: "/intelligentReport/fgztjqkb",
+        name: "intelligentReportfgztjqkb",
+        meta: {
+            title: "非故障停机情况表",
+        },
+        component: () => import("../views/intelligentReporting/fgztjqkb/index.vue"),
+    },
+    {
         path: "/intelligentReport/zhbb",
         name: "intelligentReportzhbb",
         meta: {

src/views/generatingCapacity/dataAnalysis/agcAnalysis/index.vue

@@ -48,6 +48,8 @@
     import CurrentScatterChart from './components/current-scatter-chart.vue'
     import httpRequest from '@/utils/request.js'
     import dayjs from 'dayjs';
+    import agcJson from './agcJson.json'
+
     /**配置参数 */
     const tableHeight = ref(window.innerHeight - 170 + 'px')
     const treeHeight = ref(window.innerHeight - 170 + 'px') //tree高度
@@ -147,6 +149,7 @@
         const res = await httpRequest.get('/agc/deviate', {
             params: params
         })
+        // const res = agcJson
         tableColumn.value = [{
                 prop: 'ts',
                 label: '时间',
@@ -188,17 +191,29 @@
         res['有功设定限值'].values.map((o, index) => {
             tsArr.push(dayjs(o.ts).format('YYYY-MM-DD HH:mm:ss'))
             ygsdxz.push(Number(o.value).toFixed(2))
-            sfyg.push(Number(res['实发有功'].values[index].value).toFixed(2))
-            llgl.push(Number(res['理论功率'].values[index].value).toFixed(2))
-            pcsx.push(Number(res['偏差上限'].values[index].value).toFixed(2))
-            pcxx.push(Number(res['偏差下限'].values[index].value).toFixed(2))
+            if (res['实发有功'].values.length > 0) {
+                sfyg.push(Number(res['实发有功'].values[index].value).toFixed(2))
+            }
+            if (res['理论功率'].values.length > 0) {
+                llgl.push(Number(res['理论功率'].values[index].value).toFixed(2))
+            }
+            if (res['偏差上限'].values.length > 0) {
+                pcsx.push(Number(res['偏差上限'].values[index].value).toFixed(2))
+            }
+            if (res['偏差下限'].values.length > 0) {
+                pcxx.push(Number(res['偏差下限'].values[index].value).toFixed(2))
+            }
             tableArr.push({
                 ts: dayjs(o.ts).format('YYYY-MM-DD HH:mm:ss'),
                 ygsdxz: Number(o.value).toFixed(2),
-                sfyg: Number(res['实发有功'].values[index].value).toFixed(2),
-                llgl: Number(res['理论功率'].values[index].value).toFixed(2),
-                pcsx: Number(res['偏差上限'].values[index].value).toFixed(2),
-                pcxx: Number(res['偏差下限'].values[index].value).toFixed(2),
+                sfyg: res['实发有功'].values.length > 0 ? Number(res['实发有功'].values[index].value)
+                    .toFixed(2) : '-',
+                llgl: res['理论功率'].values.length > 0 ? Number(res['理论功率'].values[index].value)
+                    .toFixed(2) : '-',
+                pcsx: res['偏差上限'].values.length > 0 ? Number(res['偏差上限'].values[index].value)
+                    .toFixed(2) : '-',
+                pcxx: res['偏差下限'].values.length > 0 ? Number(res['偏差下限'].values[index].value)
+                    .toFixed(2) : '-',
             })
         })
         xAxisData.value = tableArr.map(o => o.ts)

src/views/generatingCapacity/dataAnalysis/angleAnalysis/components/current-scatter-chart.vue

@@ -267,9 +267,9 @@
                         // inactiveColor: that.echartsTheme === "dark" ?
                         //     partten.getColor("gray") : "#000",
                         textStyle: {
-                            // color: that.echartsTheme === "dark" ?
-                            //     partten.getColor("grayl") : "#000",
-                            fontSize: 12,
+                            color: that.echartsTheme === "dark" ?
+                                partten.getColor("grayl") : "#000",
+                            fontSize: 14,
                         },
 
                     },
@@ -302,15 +302,30 @@
                     }, ],
                     //y轴没有显式设置，根据值自动生成y轴
                     yAxis: [{
+                        type: 'value',
                         splitLine: {
                             show: false
                         },
                         position: 'left',
                         min: 0,
+                        max: 100,
                         name: '度',
                         nameTextStyle: {
                             color: '#838383'
                         },
+                    }, {
+                        type: 'value',
+                        splitLine: {
+                            show: false
+                        },
+                        min: 0,
+                        max: 25,
+                        // splitLine: {
+                        //     lineStyle: {
+                        //         color: ['#393F4D']
+                        //     }
+                        // },
+                        name: '单位：m/s'
                     }],
                     animation: true,
                     dataset: that.dataSet.length ? JSON.parse(that.dataSet) : [],
@@ -318,6 +333,13 @@
                     series: that.seriesData,
                 };
 
+                option.legend.selected = {
+                    '叶片1': true,
+                    '叶片2': true,
+                    '叶片3': true,
+                    '风速': false
+                };
+
                 that.resize = function () {
                     myChart.resize();
                 };

src/views/generatingCapacity/dataAnalysis/angleAnalysis/index.vue

@@ -15,13 +15,32 @@
                     </excel-cop>
                 </div>
                 <div class="tableDataMain">
-                    <div class="px-[10px] shadow rounded-[6px] shadow-blue-500 ">
-                        <CurrentScatterChart ref="chartRef" width="100%" :height="`calc( ${tableHeight})`"
-                            :chartTitle="''" :xAxisData="xAxisData" :yAxisData="{ splitLine: { show: false } }"
-                            :seriesData="seriesData" :seriesAllData="seriesAllData" :showLegend="true"
-                            :brushSelected="false" :dataSet="dataSet" :theme="theme" :echartsTheme="echartsTheme"
-                            @getSelected="funChartSelect" />
-                    </div>
+                    <el-tabs v-model="activeTab">
+                        <el-tab-pane label="图表展示" name="1">
+                        </el-tab-pane>
+                        <el-tab-pane label="桨距角风速曲线" name="2">
+                        </el-tab-pane>
+                        <el-tab-pane label="表格数据" name="3">
+                        </el-tab-pane>
+                        <div v-if="activeTab === '3'" :style="{ height: tableHeight }">
+                            <table-cop class="" :data="tableData" :column="tableColumn" :theme="theme"
+                                :height="tableHeight" tableId="1" :tableName="tableName" :rowstyle="true"></table-cop>
+                        </div>
+                        <div v-if="activeTab === '1'" :style="{ height: tableHeight }">
+                            <!-- :height="`calc( ${tableHeight})`" -->
+                            <CurrentScatterChart ref="chartRef" width="100%" height="75vh" :chartTitle="''"
+                                style="margin-top:3vh" :xAxisData="xAxisData"
+                                :yAxisData="{ splitLine: { show: false } }" :seriesData="seriesData"
+                                :seriesAllData="seriesAllData" :showLegend="true" :brushSelected="false"
+                                :dataSet="dataSet" :theme="theme" :echartsTheme="echartsTheme"
+                                @getSelected="funChartSelect" />
+                        </div>
+                        <div v-if="activeTab === '2'" :style="{ height: tableHeight }">
+                            <!-- <div id="speedLine" style="width:100%;height:100%"></div> -->
+                            <bar-chart-cop width="100%" height="100%" :theme="theme" :echartsTheme="echartsTheme"
+                                :xAxis="linexAxis" :yAxis="lineyAxis" :series="lineSeries"></bar-chart-cop>
+                        </div>
+                    </el-tabs>
                 </div>
             </div>
         </div>
@@ -30,12 +49,16 @@
 <script setup name="prepare">
     import excelCop from '@/components/generatingCapacityComponent/excel.vue'
     import treeCop from '@/components/generatingCapacityComponent/tree.vue'
+    import tableCop from '@/components/generatingCapacityComponent/table.vue'
+    import barChartCop from '../spaceAnalysis/components/barChart.vue'
+    import * as echarts from 'echarts'
     import {
         ElMessage
     } from 'element-plus';
     import {
         onMounted,
         ref,
+        reactive,
         onActivated,
         watch
     } from 'vue'
@@ -45,15 +68,23 @@
     import CurrentScatterChart from './components/current-scatter-chart.vue'
     import httpRequest from '@/utils/request.js'
     /**配置参数 */
-    const tableHeight = ref(window.innerHeight - 120 + 'px')
+    const tableHeight = ref(window.innerHeight - 170 + 'px')
     const treeHeight = ref(window.innerHeight - 120 + 'px') //tree高度
     const excelHeight = ref(window.innerHeight - 120 + 'px') //excel高度
     /**excel 开始 */
     const excelList = ref([])
+    const speedParams = ref({})
     const funExcelChange = async (obj) => { //点击excel项时
         funSubmit({
             ids: obj.id
         })
+        tableName.value = obj.name
+        getSpeedLine({
+            ids: obj.id
+        })
+        speedParams.value = {
+            ids: obj.id
+        }
     }
     /**tree 开始 */
     const treeData = ref([])
@@ -129,7 +160,23 @@
     /**table 开始 */
     const tableShowId = ref('')
     const tableName = ref('')
-    const tableColumn = ref([])
+    const tableColumn = ref([{
+            prop: 'time',
+            label: '时间'
+        },
+        {
+            prop: 'yp1',
+            label: '叶片一'
+        },
+        {
+            prop: 'yp2',
+            label: '叶片二'
+        },
+        {
+            prop: 'yp3',
+            label: '叶片三'
+        }
+    ])
     const tableLoading = ref(false)
     const tableData = ref([])
     /**tab  */
@@ -155,13 +202,16 @@
         let exTime = []
         let yp1 = [],
             yp2 = [],
-            yp3 = []
+            yp3 = [],
+            speed = []
         res.data.bw.forEach(it => {
             exTime.push(it.time)
             yp1.push(it.yp1)
             yp2.push(it.yp2)
             yp3.push(it.yp3)
+            speed.push(it.speed)
         })
+        tableData.value = res.data.bw
         seriesAllData.value = res.data.bw
         // res.data.bw.forEach(it => {
         //     yp2.push(it.yp2)
@@ -204,9 +254,61 @@
                 smooth: false, //这个是把线变成曲线
                 data: yp3,
                 xAxisIndex: 0,
+            },
+            {
+                name: "风速",
+                type: "line",
+                yAxisIndex: 1,
+                symbol: "line", //设定为实心点
+                symbolSize: 0, //设定实心点的大小
+                smooth: false, //这个是把线变成曲线
+                data: speed,
+                xAxisIndex: 0,
             }
         ]
     }
+    const linexAxis = reactive({
+        type: 'category',
+        name: '风速',
+        data: []
+    })
+    const lineyAxis = reactive({
+        type: 'value',
+        name: '度',
+        splitLine: {
+            show: false
+        },
+        axisTick: {
+            show: true
+        },
+        axisLine: {
+            onZero: false
+        }
+    })
+    const lineSeries = reactive([{
+        name: "桨距角风速曲线",
+        type: "line",
+        data: [],
+        symbol: "line", //设定为实心点
+        symbolSize: 0, //设定实心点的大小
+    }])
+    const getSpeedLine = async (params) => {
+        const speedRes = await httpRequest.get('/blade/curve', {
+            params: params
+        })
+        if (speedRes.code === 200) {
+            if (speedRes.data) {
+                let xAsis = []
+                let series = []
+                for (const item in speedRes.data) {
+                    xAsis.push(item)
+                    series.push(speedRes.data[item])
+                }
+                linexAxis.data = xAsis
+                lineSeries[0].data = series
+            }
+        }
+    }
     /**created */
     // funGetTree()
     const theme = ref(null)
@@ -224,11 +326,11 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 120 + 'px'
+        tableHeight.value = window.innerHeight - 170 + 'px'
         excelHeight.value = window.innerHeight - 120 + 'px'
         treeHeight.value = window.innerHeight - 120 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 120 + 'px'
+            tableHeight.value = window.innerHeight - 170 + 'px'
             excelHeight.value = window.innerHeight - 120 + 'px'
             treeHeight.value = window.innerHeight - 120 + 'px'
         })

src/views/generatingCapacity/dataAnalysis/combine/components/current-scatter-chart.vue

@@ -1,5 +1,6 @@
 <template>
-    <div class="chart" :id="id"></div>
+    <div class="chart" :id="id">
+    </div>
 </template>
 
 <script>
@@ -117,9 +118,10 @@
                     //标题
                     title: {
                         text: that.chartTitle,
-                        right: 460,
+                        // right: 460,
+                        left: 'center',
                         // left: 110,
-                        top: 4,
+                        // top: 4,
                         textStyle: {
                             fontSize: 16,
                             color: that.echartsTheme === "dark" ? partten.getColor("white") : "#000",
@@ -218,8 +220,8 @@
                     legend: {
                         show: that.showLegend,
                         data: ["拟合功率", "保证功率", "无用点", "有用点", "Cp值"],
-                        right: "120",
-                        top: "5",
+                        right: "center",
+                        top: "25",
                         // icon: "circle",
                         itemWidth: 6,
                         inactiveColor: that.echartsTheme === "dark" ?
@@ -313,6 +315,7 @@
                         },
                     });
                 }
+
                 myChart.off("brushSelected");
                 myChart.on("brushSelected", (params) => {
                     that.$emit("getSelected", params.batch || []);

src/views/generatingCapacity/dataAnalysis/combine/index.vue

@@ -29,16 +29,11 @@
                     </div>
                 </div>
                 <div class="tableDataMain">
-                    <SubmitBtn class="butten_com" desc="区域划分" v-if="activeTab === '2' && excelType === 'fitting'"
+                    <SubmitBtn class="butten_com" desc="区域划分" v-if="activeTab === '1' && excelType === 'fitting'"
                         @click="funChartArea">
                     </SubmitBtn>
                     <el-tabs v-model="activeTab" @tab-click="handleClick">
-                        <el-tab-pane label="表格数据" name="1">
-                            <table-cop :data="tableData" :column="tableColumn" :theme="theme" :loading="tableLoading"
-                                :height="tableHeight" :tableId="tableShowId" :tableName="tableName">
-                            </table-cop>
-                        </el-tab-pane>
-                        <el-tab-pane label="图表展示" name="2">
+                        <el-tab-pane label="图表展示" name="1">
                             <div
                                 :style="{ height: typeof tableHeight === 'string' ? tableHeight : tableHeight + 'px' }">
                                 <CurrentScatterChart ref="chartRef" width="100%"
@@ -50,6 +45,11 @@
                                     @getSelected="funChartSelect" />
                             </div>
                         </el-tab-pane>
+                        <el-tab-pane label="表格数据" name="2">
+                            <table-cop :data="tableData" :column="tableColumn" :theme="theme" :loading="tableLoading"
+                                :height="tableHeight" :tableId="tableShowId" :tableName="tableName">
+                            </table-cop>
+                        </el-tab-pane>
                     </el-tabs>
                 </div>
             </div>
@@ -166,7 +166,7 @@
                 }
             })
         } else if (obj.type === 'fitting') {
-            activeTab.value = '2'
+            activeTab.value = '1'
             res = await httpRequest.get('/power/fitting/show', {
                 params: {
                     id: obj.id

src/views/generatingCapacity/dataAnalysis/hotAnalysis/components/current-scatter-chart.vue

@@ -51,6 +51,12 @@
                     return [];
                 },
             },
+            maxMinData: {
+                type: Array,
+                default: () => {
+                    return [];
+                },
+            },
             // 是否显示图表图例
             showLegend: {
                 type: Boolean,
@@ -230,16 +236,17 @@
                     },
                     visualMap: [{
                         type: 'continuous',
-                        min: -40,
-                        max: 50,
+                        min: that.maxMinData[1],
+                        max: that.maxMinData[0],
                         dimension: 2,
                         orient: 'vertical',
                         right: 4,
                         top: 50,
                         itemHeight: 600,
-                        text: ['50', '-40'],
+                        // text: ['50', '-40'],
+                        text: [that.maxMinData[0], that.maxMinData[1]],
                         calculable: false,
-                        range: [-40, 50],
+                        range: [that.maxMinData[1], that.maxMinData[0]],
                         inRange: {
                             color: ['#000', 'rgb(75,11,106)', 'rgb(133,33,106)', 'rgb(176,49,92)',
                                 'rgb(210,70,69)', 'rgb(235,100,42)', 'rgb(247,126,21)',
@@ -362,9 +369,11 @@
         },
         mounted() {
             // this.$nextTick(() => {
-            this.$el.style.width = this.width;
-            this.$el.style.height = this.height;
-            this.initChart();
+            this.$nextTick(() => {
+                this.$el.style.width = this.width;
+                this.$el.style.height = this.height;
+                this.initChart();
+            })
             // });
         },
         updated() {

src/views/generatingCapacity/dataAnalysis/hotAnalysis/index.vue

@@ -17,11 +17,13 @@
                     <div class="tableDataMain">
                         <div class="">
                             <el-tabs v-model="activeTab">
-                                <el-tab-pane label="温度与功率" name="1">
+                                <el-tab-pane label="温度曲线" name="1">
                                 </el-tab-pane>
-                                <el-tab-pane label="温度曲线" name="2">
+                                <el-tab-pane label="温度与功率" name="2">
                                 </el-tab-pane>
-                                <div v-show="activeTab === '1'" :style="{ height: tableHeight }">
+                                <el-tab-pane label="表格数据" name="3">
+                                </el-tab-pane>
+                                <div v-if="activeTab === '2'" :style="{ height: tableHeight }">
                                     <div style="height:49%">
                                         <el-icon :style="!theme ? 'color: #fff' : ''" class="chartIcon" size="18"
                                             @click="funActCop({xAxis:barxAxis, yAxis:baryAxis, series: barSeries}, 'barChartCop')">
@@ -44,7 +46,7 @@
                                         </line-chart-cop>
                                     </div>
                                 </div>
-                                <div v-if="activeTab === '2'"
+                                <div v-if="activeTab === '1'"
                                     :style="{ height: typeof tableHeight === 'string' ? tableHeight : tableHeight + 'px' }"
                                     class="p-[10px]">
                                     <CurrentScatterChart ref="chartRef" width="100%"
@@ -52,8 +54,12 @@
                                         :chartTitle="avgObj.title+ '&nbsp;&nbsp;' +'平均Cp值：'+avgObj.cpavg+'； 静风频率：'+avgObj.frequency+'%； 曲线偏差率：'+avgObj.pcratio+'%'"
                                         :xAxisData="xAxisData" :yAxisData="{ splitLine: { show: false } }"
                                         :seriesData="seriesData" :showLegend="true" :brushSelected="false"
-                                        :theme="theme" :echartsTheme="echartsTheme" :dataSet="dataSet"
-                                        @getSelected="funhotChartSelect" />
+                                        :maxMinData="maxMinData" :theme="theme" :echartsTheme="echartsTheme"
+                                        :dataSet="dataSet" @getSelected="funhotChartSelect" />
+                                </div>
+                                <div v-if="activeTab === '3'" :style="{ height: tableHeight }">
+                                    <table-cop class="" :data="tableData" :column="tableColumn" :theme="theme"
+                                        :height="tableHeight" tableId="1" tableName="温度与功率分析"></table-cop>
                                 </div>
                             </el-tabs>
                         </div>
@@ -113,6 +119,7 @@
 <script setup name="prepare">
     import excelCop from '@/components/generatingCapacityComponent/excel.vue'
     import treeCop from '@/components/generatingCapacityComponent/tree.vue'
+    import tableCop from '@/components/generatingCapacityComponent/table.vue'
     import barChartCop from './components/barChart.vue'
     import lineChartCop from './components/lineChart.vue'
     import {
@@ -140,6 +147,24 @@
     const tableHeight = ref(window.innerHeight - 171 + 'px')
     /** 额定功率 */
     const powerproduction = ref("")
+    const tableData = ref([])
+    const tableColumn = ref([])
+    const tableDataGet = async () => {
+        const res = await httpRequest.get('/temperature/show', {
+            params: {
+                id: excelCheckIds.value.join()
+            }
+        })
+        tableColumn.value = res.data.title.map(o => {
+            return {
+                prop: o.key,
+                label: o.des,
+                width: o.des === '时间' ? 100 : 80,
+
+            }
+        })
+        tableData.value = res.data.data
+    }
     /**excel 开始 */
     const excelCheckboxShow = ref(false)
     const excelCheckIds = ref([])
@@ -156,6 +181,7 @@
         queryForm.checkIds = excelList.value.map(o => o.id)
         checkAll.value = true
         funSubmit()
+        tableDataGet()
         /**---------------------------- */
         // activeTab.value = '1'
         isChartArea.value = false
@@ -189,6 +215,7 @@
 
         if (chartResponse && chartResponse.code === 200) {
             chartRes = chartResponse.data
+            maxMinData.value = [chartRes.maxhjwd, chartRes.minhjwd]
             markDot.pcl5 = chartRes.obj.pc5ratio
             markDot.pcl10 = chartRes.obj.pc10ratio
             markDot.pcl12 = chartRes.obj.pc12ratio
@@ -198,11 +225,6 @@
             avgObj.cpavg = Number(chartRes.obj.cpavg).toFixed(2)
             avgObj.frequency = Number(chartRes.obj.frequency).toFixed(2)
             avgObj.pcratio = Number(chartRes.obj.pcratio).toFixed(2)
-            // dataSet.value = JSON.stringify([
-            // 	{
-            // 		source: chartRes.scatter
-            // 	},
-            // ])
             const color = ["#1C99FF", "#FF8700", "#3D54BE", "#fa8c16", "#1DA0D7", "#DD5044"]
             seriesData.value = [{
                     name: "拟合功率",
@@ -229,6 +251,7 @@
                         scale: 1
                     },
                     name: '数据散点',
+                    symbolSize: 5,
                     // symbolSize: (data) => {
                     // 	return data.s ? data.s > 10 ? 10 : data.s : 4
                     // },
@@ -555,6 +578,7 @@
     const xAxisData = ref([])
     const chartRef = ref() //chart 的ref
     const seriesData = ref([])
+    const maxMinData = ref([])
     const isChartArea = ref(false) // 用来控制图表是否区域划分
     const dataSet = ref('')
     const funhotChartSelect = async (batch) => {

src/views/generatingCapacity/dataAnalysis/lineAnalysis/index.vue

@@ -64,11 +64,13 @@
         </el-dialog>
         <el-dialog custom-class="windLifeDialog warn-table" draggable v-model="wtDialog" title="曲线偏差率">
             <el-table :data="wtData" row-key="id" :max-height="600">
-                <el-table-column property="windturbineId" align="center" label="风机" />
+                <el-table-column property="code" align="center" label="风机" />
                 <el-table-column property="pc5ratio" sortable align="center" label="3~5m" />
-                <el-table-column property="pc10ratio" sortable align="center" label="5~10m" />
-                <el-table-column property="pc12ratio" sortable align="center" label="10~12m" />
-                <el-table-column property="pc25ratio" sortable align="center" label="12~25m" />
+                <el-table-column property="pc7ratio" sortable align="center" label="5~7m" />
+                <el-table-column property="pc9ratio" sortable align="center" label="7~9m" />
+                <el-table-column property="pc11ratio" sortable align="center" label="9~11m" />
+                <el-table-column property="pc20ratio" sortable align="center" label="11~20m" />
+                <el-table-column property="pc25ratio" sortable align="center" label="20~25m" />
                 <el-table-column property="pcratio" sortable align="center" label="3~25m" />
             </el-table>
         </el-dialog>

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

@@ -5,6 +5,9 @@
 </template>
 <script>
     import httpRequest from '@/utils/request.js'
+    import {
+        CanvasLabel
+    } from "@panzhiyue/leaflet-canvaslabel"
     import './leaflet.canvas-markers.js'
     export default {
         props: {
@@ -35,9 +38,8 @@
         },
         watch: {
             ids(val) {
-
-
-                this.funStationPos(val)
+                // this.funStationPos(val)
+                this.funStationPosLabel(val)
             },
         },
         mounted() {
@@ -45,11 +47,49 @@
         },
         methods: {
             initMap() {
+                //矢量文本标签渲染器
+                let canvasLabel = new L.CanvasLabel({
+                    collisionFlg: true,
+                    scale: 2
+                });
+                var basemapLayer0 = L.tileLayer(
+                    'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=8899fd3e86aa994f71465b1c56a98727', {
+                        maxZoom: 18,
+                        minZoom: 1,
+                        tileSize: 256,
+                        zoomOffset: 1
+                    });
+                var basemapLayer1 = L.tileLayer(
+                    'http://t1.tianditu.com/cva_c/wmts?layer=cva&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=8899fd3e86aa994f71465b1c56a98727', {
+                        maxZoom: 18,
+                        minZoom: 1,
+                        tileSize: 256,
+                        zoomOffset: 1
+                    });
+                var basemapLayer2 = L.tileLayer(
+                    'http://t1.tianditu.com/img_c/wmts?layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=8899fd3e86aa994f71465b1c56a98727', {
+                        maxZoom: 18,
+                        minZoom: 1,
+                        tileSize: 256,
+                        zoomOffset: 1
+                    });
+                var basemapLayer3 = L.tileLayer(
+                    'http://t1.tianditu.com/cia_c/wmts?layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=174705aebfe31b79b3587279e211cb9a', {
+                        maxZoom: 18,
+                        minZoom: 1,
+                        tileSize: 256,
+                        zoomOffset: 1
+                    });
+                var basemap0 = L.layerGroup([basemapLayer0, basemapLayer1]);
+                var basemap1 = L.layerGroup([basemapLayer2, basemapLayer3]);
                 this.map = L.map("map", {
+                    renderer: canvasLabel,
                     // center: [40.02404009136253, 116.50641060224784], // 地图中心--北京
                     // center: [38.44673272215545, 106.27624511718751], // 地图中心--银川
                     // center: [108.953939, 34.266611], // 地图中心--陕西
                     // center: [109.470962, 34.520632], // 地图中心--渭南
+                    layers: [basemap1],
+                    crs: L.CRS.EPSG4326,
                     zoom: 16, //缩放比列
                     zoomControl: false, //禁用 + - 按钮
                     doubleClickZoom: true, // 禁用双击放大
@@ -67,9 +107,15 @@
                         }
                     ]
                 });
-                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(
+                //     "http://t1.tianditu.com/img_c/wmts?layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}",
+                // ).addTo(this.map)
+
+
 
                 // let name = L.tileLayer(this.tilsUrl, {
                 //     minZoom: 1,
@@ -121,10 +167,10 @@
                                 data: item
                             }).bindTooltip(`
                                 <div class="tip-box-top">
-                                    <div class="item">${item.name}</div>
+                                    <div class="item">${item.aname}</div>
                                     <div class="item">经度：${item.latitude}°</div>
                                     <div class="item">纬度：${item.longitude}°</div>
-                                    <div class="item">海拔高度:${item.altitude}km</div>
+                                    <div class="item">海拔高度:${item.altitude}m</div>
                                 </div>`).addTo(this.map);
 
                             this.ciLayer.addLayer(marker)
@@ -147,6 +193,69 @@
                 }
             },
 
+            async funStationPosLabel(ids) {
+                if (this.layers.length > 0) {
+                    for (var i = 0; i < this.layers.length; i++) {
+                        this.map.removeLayer(this.layers[i]);
+                    }
+                    this.layers = []
+                }
+                let res = null
+                if (ids.length > 0) {
+                    res = await httpRequest.get('/base/location', {
+                        params: {
+                            ids: this.ids.join(","),
+                        },
+                    })
+                } else {
+                    res = await httpRequest.get('/base/station', {
+                        params: {},
+                    })
+                }
+                if (res.code === 200) {
+                    if (res.data && res.data.length) {
+                        this.layers = []
+                        for (let i = 0; i < res.data.length; i++) {
+                            let item = res.data[i]
+
+                            let latlng = L.latLng(Number(item.latitude), Number(item.longitude));
+                            let c = L.circleMarker(latlng, {
+                                radius: 5,
+                                color: '#12e799',
+                                labelStyle: {
+                                    text: item.aname,
+                                    scale: 1,
+                                    rotation: 0,
+                                    offsetY: 15,
+                                    fillStyle: '#000',
+                                    zIndex: i
+                                },
+                                data: item
+                            }).bindTooltip(`
+                                <div class="tip-box-top">
+                                    <div class="item">${item.aname}</div>
+                                    <div class="item">经度：${item.latitude}°</div>
+                                    <div class="item">纬度：${item.longitude}°</div>
+                                    <div class="item">海拔高度:${item.altitude}m</div>
+                                </div>`).addTo(this.map);
+                            this.layers.push(c)
+
+                            let that = this
+                            c.on('mouseover', function onmouseover(e) {
+                                console.log('map', item)
+                                that.rightObj = item
+                            })
+
+                        }
+                        let center = this.map.getCenter()
+                        this.map.panTo([center.lat, center.lng], {
+                            animate: true
+                        })
+                        this.map.setView(this.layers[0].getLatLng(), 13);
+                    }
+                }
+            },
+
             setAreaLayer(jsonName, isBounds) {
                 const wfAllGeoJson = require(`@/assets/${jsonName}.json`)
                 this.areaLayer = L.geoJSON(wfAllGeoJson, {

src/views/generatingCapacity/dataAnalysis/posAnalysis/index.vue

@@ -6,7 +6,7 @@
             </div>
             <div class="main">
                 <div class="treeDataMain">
-                    <tree-cop ref="treeCopRef" :data="treeData" @checkChange="funTreeCheckChange" :show-checkbox="false"
+                    <tree-cop ref="treeCopRef" :data="treeData" @checkChange="funTreeCheckChange" :show-checkbox="true"
                         :height="treeHeight" @currentChange="funCurrentChange" @refresh="funGetTree"></tree-cop>
                 </div>
                 <div class="excelDataMain">
@@ -265,8 +265,8 @@
                     ),
                 };
             });
-            excelCheckIds.value = current.childs.map((o) => o.id);
-            treeId.value = current.id || "";
+            // excelCheckIds.value = current.childs.map((o) => o.id);
+            // treeId.value = current.id || "";
 
             funSubmit();
         } else {
@@ -282,6 +282,22 @@
         halfCheckedNodes,
         halfCheckedKeys,
     }) => {
+        funCurrentChange({
+            current,
+            currentNode: ''
+        })
+        const checkIds = []
+        if (checkedNodes.checkedNodes.length) {
+            let checkArr = checkedNodes.checkedNodes
+            checkArr.forEach(it => {
+                if (it.childs && it.childs.length) {
+                    it.childs.forEach(iv => {
+                        checkIds.push(iv.id)
+                    })
+                }
+            })
+        }
+        excelCheckIds.value = checkIds
         //tree change  -> excel change
         // funCurrentChange({ current, currentNode: '' })
         // const checkIds = []
@@ -710,19 +726,26 @@
                                 },
                             },
                             isRadar: false,
-                            series: chart.roses.length ?
-                                chart.roses.map((o, index) => {
-                                    return {
-                                        type: "bar",
-                                        data: o,
-                                        coordinateSystem: "polar",
-                                        name: funText(index),
-                                        stack: "a",
-                                        emphasis: {
-                                            focus: "series",
-                                        },
-                                    };
-                                }) : [],
+                            series:
+                            // chart.roses.length ?
+                            //     chart.roses.map((o, index) => {
+                            //         return {
+                            //             type: "bar",
+                            //             data: o,
+                            //             coordinateSystem: "polar",
+                            //             name: funText(index),
+                            //             stack: "a",
+                            //             emphasis: {
+                            //                 focus: "series",
+                            //             },
+                            //         };
+                            //     }) : [],
+                            {
+                                type: 'bar',
+                                data: chart.roses,
+                                coordinateSystem: 'polar',
+                                name: '方位风速',
+                            }
                         });
                         chartId++;
                         chartData.value.push({
@@ -994,19 +1017,26 @@
                                     },
                                 },
                                 isRadar: false,
-                                series: chart.roses.length ?
-                                    chart.roses.map((o, index) => {
-                                        return {
-                                            type: "bar",
-                                            data: o,
-                                            coordinateSystem: "polar",
-                                            name: funText(index),
-                                            stack: "a",
-                                            emphasis: {
-                                                focus: "series",
-                                            },
-                                        };
-                                    }) : [],
+                                series:
+                                // chart.roses.length ?
+                                //     chart.roses.map((o, index) => {
+                                //         return {
+                                //             type: "bar",
+                                //             data: o,
+                                //             coordinateSystem: "polar",
+                                //             name: funText(index),
+                                //             stack: "a",
+                                //             emphasis: {
+                                //                 focus: "series",
+                                //             },
+                                //         };
+                                //     }) : [],
+                                {
+                                    type: 'bar',
+                                    data: chart.roses,
+                                    coordinateSystem: 'polar',
+                                    name: '方位风速',
+                                }
                             });
                             chartId++;
                         }

src/views/generatingCapacity/dataAnalysis/rateAnalysis/components/chart.vue

@@ -97,14 +97,16 @@
                 radiusAxis: {},
                 polar: {
                     radius: '70%',
-                    center: ['60%', '50%']
+                    center: props.subtext !== '风速风向玫瑰图' ? ['60%', '50%'] : ['50%', '50%']
                 },
                 radar: radar,
                 tooltip: {
                     formatter: (params) => {
                         return params.componentSubType === 'radar' ?
                             `${params.marker}${params.seriesName}` :
-                            `${params.marker}${params.seriesName}m<br/>${params.value>1? '频次：'+ params.value: ''}`
+                            props.subtext !== '风速风向玫瑰图' ?
+                            `${params.marker}${params.seriesName}m<br/>${params.value>1? '频次：'+ params.value: ''}` :
+                            `${params.marker}${params.seriesName}<br/>${'最大风速：'+ params.value}m/s`
                     },
                     confine: true
                 },

src/views/generatingCapacity/dataAnalysis/rateAnalysis/index.vue

@@ -15,37 +15,48 @@
                         @excelChange="funExcelChange" @checkChange="funExcelCheckChange" :theme="theme"></excel-cop>
                 </div>
                 <div class="tableDataMain">
-                    <el-row :style="{ height: tableHeight }">
-                        <el-col :span="12" v-for="(item, index) in chartData" :key="item.id" style="height: 45%">
-                            <el-icon :style="!theme ? 'color: #fff' : ''" size="18"
-                                @click="funActCop(item, 'chartCop' + (index + 1))">
-                                <ZoomIn />
-                            </el-icon>
-                            <chart-cop class="" height="100%" width="100%" :xAxis="item.xAxis" :isRadar="item.isRadar"
-                                :theme="theme" :echartsTheme="echartsTheme" :subtext="item.subtext" :title="item.title"
-                                :series="item.series">
-                            </chart-cop>
-                        </el-col>
-                        <el-col :span="12" v-if="!!lineSeries.length" style="height: 50%">
-                            <el-icon :style="!theme ? 'color: #fff' : ''" size="18"
-                                @click="funActCop({ xAxis: linexAxis, yAxis: lineyAxis, series: lineSeries, dataset: lineDataSet }, 'lineChartCop')">
-                                <ZoomIn />
-                            </el-icon>
-                            <line-chart-cop class="" height="100%" width="100%" :xAxis="linexAxis" :yAxis="lineyAxis"
-                                :theme="theme" :echartsTheme="echartsTheme" :series="lineSeries" subtext="对风偏差分析图"
-                                :dataset="lineDataSet"></line-chart-cop>
-                        </el-col>
-                        <el-col :span="12" v-if="!!lineSeries.length" style="height: 50%">
-                            <el-icon :style="!theme ? 'color: #fff' : ''" size="18"
-                                @click="funActCop({ xAxis: scatterxData, yAxis: scatteryData, series: scatterSeries }, 'scatterSingleChartCop')">
-                                <ZoomIn />
-                            </el-icon>
-                            <scatter-single-chart-cop class="" height="95%" width="100%" :xAxis="scatterxData"
-                                :theme="theme" :echartsTheme="echartsTheme" :yAxis="scatteryData"
-                                :series="scatterSeries" subtext="静态偏航对风分析图">
-                            </scatter-single-chart-cop>
-                        </el-col>
-                    </el-row>
+                    <el-tabs v-model="activeTab">
+                        <el-tab-pane label="图表展示" name="1">
+                        </el-tab-pane>
+                        <el-tab-pane label="表格数据" name="2">
+                        </el-tab-pane>
+                        <div v-if="activeTab === '2'" :style="{ height: tableHeight }">
+                            <table-cop class="" :data="tableData" :column="tableColumn" :theme="theme"
+                                :height="tableHeight" tableId="1" tableName="对风偏差分析"></table-cop>
+                        </div>
+                        <el-row v-if="activeTab === '1'" :style="{ height: tableHeight }">
+                            <el-col :span="12" v-for="(item, index) in chartData" :key="item.id" style="height: 45%">
+                                <el-icon :style="!theme ? 'color: #fff' : ''" size="18"
+                                    @click="funActCop(item, 'chartCop' + (index + 1))">
+                                    <ZoomIn />
+                                </el-icon>
+                                <chart-cop class="" height="100%" width="100%" :xAxis="item.xAxis"
+                                    :isRadar="item.isRadar" :theme="theme" :echartsTheme="echartsTheme"
+                                    :subtext="item.subtext" :title="item.title" :series="item.series">
+                                </chart-cop>
+                            </el-col>
+                            <el-col :span="12" v-if="!!lineSeries.length" style="height: 45%">
+                                <el-icon :style="!theme ? 'color: #fff' : ''" size="18"
+                                    @click="funActCop({ xAxis: linexAxis, yAxis: lineyAxis, series: lineSeries, dataset: lineDataSet }, 'lineChartCop')">
+                                    <ZoomIn />
+                                </el-icon>
+                                <line-chart-cop class="" height="100%" width="100%" :xAxis="linexAxis"
+                                    :yAxis="lineyAxis" :theme="theme" :echartsTheme="echartsTheme" :series="lineSeries"
+                                    subtext="对风偏差分析图" :dataset="lineDataSet"></line-chart-cop>
+                            </el-col>
+                            <el-col :span="12" v-if="!!lineSeries.length" style="height: 45%">
+                                <el-icon :style="!theme ? 'color: #fff' : ''" size="18"
+                                    @click="funActCop({ xAxis: scatterxData, yAxis: scatteryData, series: scatterSeries }, 'scatterSingleChartCop')">
+                                    <ZoomIn />
+                                </el-icon>
+                                <scatter-single-chart-cop class="" height="95%" width="100%" :xAxis="scatterxData"
+                                    :theme="theme" :echartsTheme="echartsTheme" :yAxis="scatteryData"
+                                    :series="scatterSeries" subtext="静态偏航对风分析图">
+                                </scatter-single-chart-cop>
+                            </el-col>
+                        </el-row>
+                    </el-tabs>
+
                 </div>
             </div>
         </div>
@@ -101,6 +112,7 @@
 <script setup name="rateAnalysis">
     import excelCop from '@/components/generatingCapacityComponent/excel.vue'
     import treeCop from '@/components/generatingCapacityComponent/tree.vue'
+    import tableCop from '@/components/generatingCapacityComponent/table.vue'
     import chartCop from './components/chart.vue'
     import lineChartCop from './components/lineChart.vue'
     // import SubmitBtn from '../../../components/SubmitBtn.vue'
@@ -125,8 +137,9 @@
     /**配置参数 */
     const treeHeight = ref(window.innerHeight - 116 + 'px') //tree高度
     const excelHeight = ref(window.innerHeight - 116 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 116 + 'px')
+    const tableHeight = ref(window.innerHeight - 170 + 'px')
     /**excel 开始 */
+    const activeTab = ref('1')
     const excelCheckIds = ref([])
     const excelList = ref([])
     //点击excel项时
@@ -141,6 +154,7 @@
         queryForm.checkIds = excelList.value.map(o => o.id)
         checkAll.value = true
         funSubmit()
+        tableDataGet()
     }
     const funExcelCheckChange = ({
         checkArr,
@@ -148,6 +162,25 @@
     }) => {
         excelCheckIds.value = checkArr
     }
+    /**表格数据 */
+    const tableData = ref([])
+    const tableColumn = ref([])
+    const tableDataGet = async () => {
+        const res = await httpRequest.get('/wind/show', {
+            params: {
+                id: excelCheckIds.value.join()
+            }
+        })
+        tableColumn.value = res.data.title.map(o => {
+            return {
+                prop: o.key,
+                label: o.des,
+                width: o.des === '时间' ? 100 : 80,
+
+            }
+        })
+        tableData.value = res.data.data
+    }
     /**tree 开始 */
     const treeData = ref([])
     const actTreeNode = ref(null)
@@ -320,26 +353,31 @@
                         xAxis: {
                             type: 'category',
                             boundaryGap: false,
-                            data: ['N', '', 'N-E', '', 'E', '', 'S-E', '', 'S', '', 'S-W', '', 'W', '',
-                                'W-N', ''
-                            ],
+                            data: ['N', 'N-E', 'E', 'S-E', 'S', 'S-W', 'W', 'W-N'],
                             splitLine: {
                                 show: true
                             },
                         },
                         isRadar: false,
-                        series: chart.roses.length ? chart.roses.map((o, index) => {
-                            return {
-                                type: 'bar',
-                                data: o,
-                                coordinateSystem: 'polar',
-                                name: funText(index),
-                                stack: 'a',
-                                emphasis: {
-                                    focus: 'series'
-                                }
-                            }
-                        }) : []
+                        series:
+                        // chart.roses.length ? chart.roses.map((o, index) => {
+                        //     return {
+                        //         type: 'bar',
+                        //         data: o,
+                        //         coordinateSystem: 'polar',
+                        //         name: funText(index),
+                        //         stack: 'a',
+                        //         emphasis: {
+                        //             focus: 'series'
+                        //         }
+                        //     }
+                        // }) : 
+                        {
+                            type: 'bar',
+                            data: chart.roses,
+                            coordinateSystem: 'polar',
+                            name: '方位风速',
+                        }
                     })
                     chartId++
                     chartData.value.push({
@@ -693,18 +731,25 @@
                                     },
                                 },
                                 isRadar: false,
-                                series: chart.roses.length ? chart.roses.map((o, index) => {
-                                    return {
-                                        type: 'bar',
-                                        data: o,
-                                        coordinateSystem: 'polar',
-                                        name: funText(index),
-                                        stack: 'a',
-                                        emphasis: {
-                                            focus: 'series'
-                                        }
-                                    }
-                                }) : []
+                                series:
+                                // chart.roses.length ? chart.roses.map((o, index) => {
+                                //     return {
+                                //         type: 'bar',
+                                //         data: o,
+                                //         coordinateSystem: 'polar',
+                                //         name: funText(index),
+                                //         stack: 'a',
+                                //         emphasis: {
+                                //             focus: 'series'
+                                //         }
+                                //     }
+                                // }) : []
+                                {
+                                    type: 'bar',
+                                    data: chart.roses,
+                                    coordinateSystem: 'polar',
+                                    name: '方位风速',
+                                }
                             })
                             chartId++
                         }
@@ -882,11 +927,11 @@
         //
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 116 + 'px'
+        tableHeight.value = window.innerHeight - 170 + 'px'
         excelHeight.value = (window.innerHeight - 116) + 'px'
         treeHeight.value = (window.innerHeight - 116) + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 116 + 'px'
+            tableHeight.value = window.innerHeight - 170 + 'px'
             excelHeight.value = (window.innerHeight - 116) + 'px'
             treeHeight.value = (window.innerHeight - 116) + 'px'
         })

src/views/generatingCapacity/dataAnalysis/windAnalysis/components/barLineChart.vue

@@ -42,6 +42,7 @@
                             "限电损失",
                             "受累损失",
                             "性能损失",
+                            "理论发电量"
                         ],
                         data: [
                             [1320, 1302, 901, 634, 1390, 1330, 1320, 1000, 500],
@@ -110,27 +111,23 @@
                         show: this.showLegend,
                         data: this.bardata.legend,
                         right: 56,
-                        icon: "ract",
+                        // icon: "ract",
                         itemWidth: 8,
                         itemHeight: 8,
                         inactiveColor: this.themeName === "dark" ?
-                            partten.getColor("gray") :
-                            "#838383",
+                            partten.getColor("gray") : "#838383",
                         textStyle: {
                             color: this.themeName === "dark" ?
-                                partten.getColor("grayl") :
-                                "#838383",
+                                partten.getColor("grayl") : "#838383",
                             fontSize: 12,
                         },
                     },
                     tooltip: {
                         trigger: "axis",
                         backgroundColor: true ?
-                            "rgba(255,255,255,0.9)" :
-                            "rgba(255,255,255,0.9)",
+                            "rgba(255,255,255,0.9)" : "rgba(255,255,255,0.9)",
                         borderColor: this.themeName === "dark" ?
-                            partten.getColor("gray") :
-                            "#838383",
+                            partten.getColor("gray") : "#838383",
                         textStyle: {
                             color: this.themeName === "dark" ? "#fff" : "#838383",
                             fontSize: util.vh(16),
@@ -152,8 +149,7 @@
                             // handleIcon: "path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z",
                             handleStyle: {
                                 color: this.themeName === "dark" ?
-                                    partten.getColor("green") :
-                                    partten.getColor("blue"),
+                                    partten.getColor("green") : partten.getColor("blue"),
                             },
                             moveHandleSize: 0,
                             // dataBackground: {
@@ -175,12 +171,10 @@
                             fillerColor: "transparent",
                             textStyle: {
                                 color: this.themeName === "dark" ?
-                                    partten.getColor("grayl") :
-                                    "#838383",
+                                    partten.getColor("grayl") : "#838383",
                             },
                             borderColor: this.themeName === "dark" ?
-                                partten.getColor("gray") :
-                                "#838383",
+                                partten.getColor("gray") : "#838383",
                             brushSelect: false,
                         },
                     ],
@@ -188,8 +182,7 @@
                         type: "category",
                         axisLabel: {
                             color: this.themeName === "dark" ?
-                                partten.getColor("gray") :
-                                "#838383",
+                                partten.getColor("gray") : "#838383",
                         },
                         inverse: true,
                         // minInterval: 10,
@@ -207,16 +200,14 @@
                             name: '万kWh',
                             axisLabel: {
                                 color: this.themeName === "dark" ?
-                                    partten.getColor("gray") :
-                                    "#838383",
+                                    partten.getColor("gray") : "#838383",
                                 // formatter: "{value}万kWh",
                             },
                             axisLine: {
                                 type: "dashed",
                                 lineStyle: {
                                     color: this.themeName === "dark" ?
-                                        partten.getColor("gray") :
-                                        "#838383",
+                                        partten.getColor("gray") : "#838383",
                                 },
                                 width: 5,
                             },
@@ -257,7 +248,7 @@
                     // bar data
                     for (var i = 0; i < this.bardata.legend.length; i++) {
                         option.series.push({
-                            name: this.bardata.legend[i],
+                            name: this.bardata.legend[i].name,
                             type: "bar",
                             stack: "总量",
                             barWidth: 16,
@@ -272,20 +263,18 @@
                 // line data
                 if (this.lineData.length > 0) {
                     option.series.push({
-                        name: this.lineName,
+                        name: "理论发电量",
                         type: "line",
                         data: this.lineData,
                         smooth: false, //平滑展示
                         xAxisIndex: 1,
                         lineStyle: {
                             color: this.themeName === "dark" ?
-                                partten.getColor("green") :
-                                partten.getColor("blue"),
+                                partten.getColor("green") : partten.getColor("blue"),
                         },
                         itemStyle: {
                             color: this.themeName === "dark" ?
-                                partten.getColor("green") :
-                                partten.getColor("blue"),
+                                partten.getColor("green") : partten.getColor("blue"),
                         },
                     });
                 }

src/views/generatingCapacity/dataAnalysis/windAnalysis/index.vue

@@ -18,14 +18,14 @@
                 <div class="tableDataMain">
                     <div class="px-[10px] shadow rounded-[6px] shadow-blue-500 ">
                         <el-tabs v-model="activeTab">
-                            <el-tab-pane label="表格数据" name="1">
+                            <el-tab-pane label="图表展示" name="1">
                             </el-tab-pane>
-                            <el-tab-pane label="图表展示" name="2">
+                            <el-tab-pane label="表格数据" name="2">
                             </el-tab-pane>
-                            <table-cop class="" v-show="activeTab === '1'" :data="tableData" :showSummary="true"
+                            <table-cop class="" v-show="activeTab === '2'" :data="tableData" :showSummary="true"
                                 :summaryMethod="funSummary" :column="tableColumn" :loading="tableLoading" :theme="theme"
                                 :height="tableHeight" :tableId="tableShowId" :tableName="tableName"></table-cop>
-                            <div v-show="activeTab === '2'"
+                            <div v-show="activeTab === '1'"
                                 :style="{ height: typeof tableHeight === 'string' ? tableHeight : tableHeight + 'px' }"
                                 class="p-[10px]">
                                 <bar-line-chart-cop v-show="lineData.length" :height="tableHeight" :bardata="barData"
@@ -136,15 +136,47 @@
         const name = [],
             data = [],
             llfdl = [],
-            legend = [
-                "实际电量",
-                "计划检修损失",
-                "非计划检修损失",
-                "限电损失",
-                "受累损失",
-                "性能损失",
+            legend = [{
+                    name: "实际电量",
+                    icon: "rect"
+                },
+                {
+                    name: "计划检修损失",
+                    icon: "rect"
+                },
+                {
+                    name: "非计划检修损失",
+                    icon: "rect"
+                },
+                {
+                    name: "限电损失",
+                    icon: "rect"
+                },
+                {
+                    name: "受累损失",
+                    icon: "rect"
+                },
+                {
+                    name: "性能损失",
+                    icon: "rect"
+                },
+                {
+                    name: "理论发电量",
+                    icon: "circle"
+                }
             ],
+
+            // legend = [
+            //     "实际电量",
+            //     "计划检修损失",
+            //     "非计划检修损失",
+            //     "限电损失",
+            //     "受累损失",
+            //     "性能损失",
+            //     "理论发电量"
+            // ],
             data2 = []; //项目列表
+
         // if (params.station) {
         // 	let arr = [];
         // 	let hj = res.data.data.pop();
@@ -202,7 +234,7 @@
 
         tableLoading.value = false
         tableShowId.value = '1'
-        activeTab.value = '2'
+        activeTab.value = '1'
     }
     /**barlineChart 开始 */
     const barData = ref({
@@ -314,7 +346,6 @@
         const checkIds = []
         if (checkedNodes.checkedNodes.length) {
             let checkArr = checkedNodes.checkedNodes
-            debugger
             checkArr.forEach(it => {
                 if (it.childs && it.childs.length) {
                     it.childs.forEach(iv => {

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

@@ -156,10 +156,9 @@
             current,
             currentNode: ''
         })
-        debugger
         const checkIds = []
-        if (checkedNodes.length) {
-            let checkArr = checkedNodes
+        if (checkedNodes.checkedNodes.length) {
+            let checkArr = checkedNodes.checkedNodes
             checkArr.forEach(it => {
                 if (it.childs && it.childs.length) {
                     it.childs.forEach(iv => {

src/views/generatingCapacity/report/fixGetPDF.js

@@ -10,10 +10,19 @@
 import html2Canvas from 'html2canvas';
 import jsPDF from 'jspdf';
 const htmlToPdf = {
-    getPdf( loading,title,) {
-        let dom = document.querySelector('#pdfDom')
+    getPdf(loading, title,) {
+        let dom = null
+        let domStr = ''
+        if (title === '经济运行分析会报告') {
+            dom = document.querySelector('#pdfDomop')
+            domStr = '#pdfDomop'
+        } else { 
+            dom = document.querySelector('#pdfDom')
+            domStr = '#pdfDom'
+        }
         let theme = dom.className ==='block' ? false : true
-        html2Canvas(document.querySelector('#pdfDom'), {
+
+        html2Canvas(document.querySelector(domStr), {
         allowTaint: false,
         taintTest: false,
         logging: false,
@@ -70,7 +79,7 @@ const htmlToPdf = {
             // delete page;
         }
         //保存文件
-        pdf.save('发电能力分析' + '.pdf');
+        pdf.save(title + '.pdf');
         // loading = false;
         console.log(loading);
         });

src/views/home/index.vue

@@ -246,8 +246,8 @@
                         <div class="analysRadio">
                             <el-radio-group v-model="powerPlanRadio">
                                 <el-radio-button label="风" value="风" />
-                                <el-radio-button label="光" value="光" disabled />
-                                <el-radio-button label="总" value="总" disabled />
+                                <!-- <el-radio-button label="光" value="光" disabled />
+                                <el-radio-button label="总" value="总" disabled /> -->
                             </el-radio-group>
                         </div>
                         <div class="planMain">
@@ -526,7 +526,7 @@
                                     unit: "MW",
                                 },
                                 {
-                                    title: "保证功率",
+                                    title: "理论功率",
                                     value: it.bzgl,
                                     max: it.bzgl * 1.08,
                                     unit: "MW",
@@ -556,11 +556,10 @@
                             let seriesSW = []
                             let seriesGW = []
                             res.data.dllist.forEach(it => {
-                                let date = it.recordDate.substring(0, it.recordDate.indexOf(' '))
-                                xAxis.push(date)
-                                seriesRF.push(it.rfdldb / 10000)
-                                seriesSW.push(it.rswdldb / 10000)
-                                seriesGW.push(it.rgwgwdldb / 10000)
+                                xAxis.push(it.rq)
+                                seriesRF.push(it.yfdl)
+                                seriesSW.push(it.yswdl)
+                                seriesGW.push(it.ygwdl)
                             })
                             let series = [{
                                     name: '日发电量',
@@ -586,11 +585,13 @@
                             let xAxis = []
                             let seriesSpeed = []
                             let seriesGl = []
+                            let seriesSJ = []
                             res.data['72time'].forEach(it => {
                                 let date = it.time.substring(0, it.time.indexOf('T') + 3)
                                 xAxis.push(date)
                                 seriesSpeed.push(it.speed)
                                 seriesGl.push(it.gl)
+                                seriesSJ.push(it.sjgl)
                             })
                             let series = [{
                                     name: '平均风速',
@@ -605,11 +606,12 @@
                                     type: 'line',
                                     symbol: 'none'
                                 },
-                                // {
-                                //     name: '实际功率',
-                                //     data: seriesGl,
-                                //     type: 'bar'
-                                // }
+                                {
+                                    name: '实际功率',
+                                    data: seriesSJ,
+                                    type: 'line',
+                                    symbol: 'none'
+                                }
                             ]
                             that.getPowerLine(xAxis, series)
                         }
@@ -695,15 +697,13 @@
                     tooltip: {
                         trigger: 'axis'
                     },
-                    // color: ['#7981AF', '#1C99FF', '#E57F25'],
-                    color: ['#1C99FF', '#E57F25'],
+                    color: ['#7981AF', '#1C99FF', '#E57F25'],
                     legend: {
                         right: '20',
                         top: '20',
                         itemWidth: 5,
                         itemHeight: 5,
-                        // data: ['平均风速', '应发功率', '实际功率']
-                        data: ['平均风速', '应发功率']
+                        data: ['平均风速', '应发功率', '实际功率']
                     },
                     grid: {
                         left: '2%',

src/views/intelligentReporting/czzyb/index.vue

@@ -1,47 +1,56 @@
 <template>
-    <div :style="pageHeight">
-        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
-    </div>
+  <div :style="pageHeight">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
 </template>
 <script>
-    export default {
-        data() {
-            return {
-                url: ""
-            };
-        },
-        watch: {
-            $route: {
-                handler: function (route) {
-                    this.url = null
-                    if (route.query.name) {
-                        if (window.location.origin.indexOf('172.16.12.101') != -1) {
-                            this.url =
-                                "http://172.16.12.101:8083/rbi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
-                        } else {
-                            this.url =
-                                "http://123.60.219.66:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$041302f30436412d9ba78f161a6575f0$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
-                        }
-                    }
-                },
-                immediate: true
-            }
-        },
-        // mounted() {
-        //     if (window.location.origin.indexOf('172.16.12.101') != -1) {
-        //         this.url =
-        //             "http://172.16.12.101:8083/rbi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
-        //     } else {
-        //         this.url =
-        //             "http://123.60.219.66:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$041302f30436412d9ba78f161a6575f0$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
-        //     }
-        // },
-        computed: {
-            pageHeight() {
-                return {
-                    'height': document.documentElement.clientHeight - 80 + 'px'
-                }
-            },
-        }
+export default {
+  data() {
+    return {
+      url: "",
     };
+  },
+  watch: {
+    $route: {
+      handler: function (route) {
+        this.url = null;
+        if (route.query.name) {
+          this.url = `${
+            this.reportBaseUrl || "http://172.16.12.101:8083"
+          }/rbi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin`;
+          // if (window.location.origin.indexOf('172.16.12.101') != -1) {
+          //     this.url =
+          //         "http://172.16.12.101:8083/rbi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
+          // } else {
+          //     this.url =
+          //         "http://10.127.7.196:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$041302f30436412d9ba78f161a6575f0$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
+          // }
+        }
+      },
+      immediate: true,
+    },
+  },
+  // mounted() {
+  //     if (window.location.origin.indexOf('172.16.12.101') != -1) {
+  //         this.url =
+  //             "http://172.16.12.101:8083/rbi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
+  //     } else {
+  //         this.url =
+  //             "http://123.60.219.66:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$041302f30436412d9ba78f161a6575f0$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin"
+  //     }
+  // },
+  computed: {
+    pageHeight() {
+      return {
+        height: document.documentElement.clientHeight - 80 + "px",
+      };
+    },
+  },
+};
 </script>

src/views/intelligentReporting/erp/index.vue

@@ -1,66 +1,93 @@
 <template>
-    <div :style="pageHeight">
-        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
-    </div>
+  <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 (window.location.origin.indexOf('172.16.12.101') != -1) {
-                            if (route.query.name === 'xinzuo') {
-                                this.url =
-                                    '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: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: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: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:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin'
-                            }
-                        } else {
-                            if (route.query.name === 'xinzuo') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$be0f8f75df7543978e9ddff5f7576a2b&id=admin&pw=admin'
-                            } else if (route.query.name === 'jiliangshan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$d24a18e0985a46e5895573738a5cc384&id=admin&pw=admin'
-                            } else if (route.query.name === 'fanshigou') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$ff22bb1d24bc416e9185a1e40be6976b&id=admin&pw=admin'
-                            } else if (route.query.name === 'caoshanliang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$a946d1d7e6f242d7a1fdbaa32fd1601c&id=admin&pw=admin'
-                            } else if (route.query.name === 'leijiashan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin'
-                            }
-                        }
-                    }
-                },
-                immediate: true
-            }
-        }
+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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin`;
+          }
+          // if (window.location.origin.indexOf('172.16.12.101') != -1) {
+          //     if (route.query.name === 'xinzuo') {
+          //         this.url =
+          //             '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: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: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: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:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin'
+          //     }
+          // } else {
+          //     if (route.query.name === 'xinzuo') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$be0f8f75df7543978e9ddff5f7576a2b&id=admin&pw=admin'
+          //     } else if (route.query.name === 'jiliangshan') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$d24a18e0985a46e5895573738a5cc384&id=admin&pw=admin'
+          //     } else if (route.query.name === 'fanshigou') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$ff22bb1d24bc416e9185a1e40be6976b&id=admin&pw=admin'
+          //     } else if (route.query.name === 'caoshanliang') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$a946d1d7e6f242d7a1fdbaa32fd1601c&id=admin&pw=admin'
+          //     } else if (route.query.name === 'leijiashan') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin'
+          //     }
+          // }
+        }
+      },
+      immediate: true,
+    },
+  },
+};
 </script>

src/views/intelligentReporting/fdscqk/index.vue

@@ -1,66 +1,93 @@
 <template>
-    <div :style="pageHeight">
-        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
-    </div>
+  <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 (window.location.origin.indexOf('172.16.12.101') != -1) {
-                            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 {
-                            if (route.query.name === 'xinzuo') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$d169ca9e0c974a6299b49dc752446ee2&id=admin&pw=admin'
-                            } else if (route.query.name === 'jiliangshan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$839ccb29a1e84da48b21c659423c0175&id=admin&pw=admin'
-                            } else if (route.query.name === 'fanshigou') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$03e83149008940daa72311823bd381daid=admin&pw=admin'
-                            } else if (route.query.name === 'caoshanliang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$33ab21248a7e49b683e5891b4ff6dad6&id=admin&pw=admin'
-                            } else if (route.query.name === 'leijiashan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$28c6ac8488f841f6b8270cb902aad1ce&id=admin&pw=admin'
-                            }
-                        }
-                    }
-                },
-                immediate: true
-            }
-        }
+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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$28c6ac8488f841f6b8270cb902aad1ce&id=admin&pw=admin`;
+          }
+          // if (window.location.origin.indexOf('172.16.12.101') != -1) {
+          //     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 {
+          //     if (route.query.name === 'xinzuo') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$d169ca9e0c974a6299b49dc752446ee2&id=admin&pw=admin'
+          //     } else if (route.query.name === 'jiliangshan') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$839ccb29a1e84da48b21c659423c0175&id=admin&pw=admin'
+          //     } else if (route.query.name === 'fanshigou') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$03e83149008940daa72311823bd381daid=admin&pw=admin'
+          //     } else if (route.query.name === 'caoshanliang') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$33ab21248a7e49b683e5891b4ff6dad6&id=admin&pw=admin'
+          //     } else if (route.query.name === 'leijiashan') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$28c6ac8488f841f6b8270cb902aad1ce&id=admin&pw=admin'
+          //     }
+          // }
+        }
+      },
+      immediate: true,
+    },
+  },
+};
 </script>

src/views/intelligentReporting/fgztjqkb/index.vue

@@ -0,0 +1,43 @@
+<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$43d2f50595c04a39b59c33657b8985b0&id=admin&pw=admin",
+                // url: "http://10.127.7.196:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin",
+            };
+        },
+        watch: {
+            $route: {
+                handler: function (route) {
+                    this.url = null;
+                    if (route.query.name) {
+                        this.url =
+                            `${
+            this.reportBaseUrl || "http://172.16.12.101:8083"
+          }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$43d2f50595c04a39b59c33657b8985b0&id=admin&pw=admin`;
+                        // if (window.location.origin.indexOf('172.16.12.101') != -1) {
+                        //     this.url =
+                        //         "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$03a38ba7339d4e2b9812e08e924f997e&id=admin&pw=admin"
+                        // } else {
+                        //     this.url =
+                        //         "http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$03a38ba7339d4e2b9812e08e924f997e&id=admin&pw=admin"
+                        // }
+                    }
+                },
+                immediate: true,
+            },
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    height: document.documentElement.clientHeight - 80 + "px",
+                };
+            },
+        },
+    };
+</script>

src/views/intelligentReporting/fyfsdl/index.vue

@@ -1,72 +1,103 @@
 <template>
-    <div :style="pageHeight">
-        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
-    </div>
+  <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 (window.location.origin.indexOf('172.16.12.101') != -1) {
-                            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 {
-                            if (route.query.name === 'xinzhuang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$53bbf921f227409f9b6554d94f85cb2b&id=admin&pw=admin'
-                            } else if (route.query.name === 'jiliangshan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$d71943fd4d0746638cc32a82f8370cdc&id=admin&pw=admin'
-                            } else if (route.query.name === 'zuozhuang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$0f0aac32858d463b818a4a4279e6aeea&id=admin&pw=admin'
-                            } else if (route.query.name === 'fanshigou') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$446bd6a7efee40b49a6dba26cb21757b&id=admin&pw=admin'
-                            } else if (route.query.name === 'caoshanliang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$16557a9ade704425b842e5d6725f3eef&id=admin&pw=admin'
-                            } else if (route.query.name === 'leijiashan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$30558a58dd3a48b7b755ee65d2a94690&id=admin&pw=admin'
-                            }
-                        }
-                    }
-                },
-                immediate: true
-            }
-        }
+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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$30558a58dd3a48b7b755ee65d2a94690&id=admin&pw=admin`;
+          }
+          // if (window.location.origin.indexOf('172.16.12.101') != -1) {
+          //     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 {
+          //     if (route.query.name === 'xinzhuang') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$53bbf921f227409f9b6554d94f85cb2b&id=admin&pw=admin'
+          //     } else if (route.query.name === 'jiliangshan') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$d71943fd4d0746638cc32a82f8370cdc&id=admin&pw=admin'
+          //     } else if (route.query.name === 'zuozhuang') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$0f0aac32858d463b818a4a4279e6aeea&id=admin&pw=admin'
+          //     } else if (route.query.name === 'fanshigou') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$446bd6a7efee40b49a6dba26cb21757b&id=admin&pw=admin'
+          //     } else if (route.query.name === 'caoshanliang') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$16557a9ade704425b842e5d6725f3eef&id=admin&pw=admin'
+          //     } else if (route.query.name === 'leijiashan') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$30558a58dd3a48b7b755ee65d2a94690&id=admin&pw=admin'
+          //     }
+          // }
+        }
+      },
+      immediate: true,
+    },
+  },
+};
 </script>

src/views/intelligentReporting/gkjlb/index.vue

@@ -7,66 +7,57 @@
     export default {
         data() {
             return {
-                url: null
+                url: null,
             };
         },
         computed: {
             pageHeight() {
                 return {
-                    'height': document.documentElement.clientHeight - 80 + 'px'
-                }
+                    height: document.documentElement.clientHeight - 80 + "px",
+                };
             },
         },
         watch: {
             $route: {
                 handler: function (route) {
-                    this.url = null
+                    this.url = null;
                     if (route.query.name) {
-                        if (window.location.origin.indexOf('172.16.12.101') != -1) {
-                            if (route.query.name === 'xinzhuang') {
-                                this.url =
-                                    '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: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: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: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: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:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$5ebbf0905b22448cbd9834ec6560fd26&id=admin&pw=admin'
-                            }
-                        } else {
-                            if (route.query.name === 'xinzhuang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$4a71c6bc1fd34da7843c6eb2a7b3aee3&id=admin&pw=admin'
-                            } else if (route.query.name === 'jiliangshan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$621b7c14e4aa4a0483a8e577d8dc4cff&id=admin&pw=admin'
-                            } else if (route.query.name === 'zuozhuang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$36292212f28b4702af2c4aa01a62bdc1&id=admin&pw=admin'
-                            } else if (route.query.name === 'fanshigou') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$2320f3ed77e740d6bb1b66b1f7062ad1&id=admin&pw=admin'
-                            } else if (route.query.name === 'caoshanliang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$3dc29db548d54d289e58bf4a30dfb026&id=admin&pw=admin'
-                            } else if (route.query.name === 'leijiashan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$5ebbf0905b22448cbd9834ec6560fd26&id=admin&pw=admin'
-                            }
+                        // window.location.origin.indexOf('172.16.12.101') != -1
+                        if (route.query.name === "xinzhuang") {
+                            this.url =
+                                `${
+              this.reportBaseUrl || "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 =
+                                `${
+              this.reportBaseUrl || "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 =
+                                `${
+              this.reportBaseUrl || "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 =
+                                `${
+              this.reportBaseUrl || "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 =
+                                `${
+              this.reportBaseUrl || "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 =
+                                `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$5ebbf0905b22448cbd9834ec6560fd26&id=admin&pw=admin`;
                         }
                     }
                 },
-                immediate: true
-            }
-        }
+                immediate: true,
+            },
+        },
     };
 </script>

src/views/intelligentReporting/pjfs/index.vue

@@ -1,72 +1,103 @@
 <template>
-    <div :style="pageHeight">
-        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
-    </div>
+  <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 (window.location.origin.indexOf('172.16.12.101') != -1) {
-                            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 {
-                            if (route.query.name === 'xinzhuang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$3341eda2eca447c380bb06e6e481d844&id=admin&pw=admin'
-                            } else if (route.query.name === 'jiliangshan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$760bad3725d94777a74528c8ac9b26b9&id=admin&pw=admin'
-                            } else if (route.query.name === 'zuozhuang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$1879c56390294d648d20717f0810bdd8&id=admin&pw=admin'
-                            } else if (route.query.name === 'fanshigou') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$d0cec38cba1f43128d9aa5d348198c6e&id=admin&pw=admin'
-                            } else if (route.query.name === 'caoshanliang') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$0fea3b9cf19e49708fed7916a6efffc2&id=admin&pw=admin'
-                            } else if (route.query.name === 'leijiashan') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$17d1c65d3389444bb804864268aa032b&id=admin&pw=admin'
-                            }
-                        }
-                    }
-                },
-                immediate: true
-            }
-        }
+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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$17d1c65d3389444bb804864268aa032b&id=admin&pw=admin`;
+          }
+          // if (window.location.origin.indexOf('172.16.12.101') != -1) {
+          //     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 {
+          //     if (route.query.name === 'xinzhuang') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$3341eda2eca447c380bb06e6e481d844&id=admin&pw=admin'
+          //     } else if (route.query.name === 'jiliangshan') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$760bad3725d94777a74528c8ac9b26b9&id=admin&pw=admin'
+          //     } else if (route.query.name === 'zuozhuang') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$1879c56390294d648d20717f0810bdd8&id=admin&pw=admin'
+          //     } else if (route.query.name === 'fanshigou') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$d0cec38cba1f43128d9aa5d348198c6e&id=admin&pw=admin'
+          //     } else if (route.query.name === 'caoshanliang') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$0fea3b9cf19e49708fed7916a6efffc2&id=admin&pw=admin'
+          //     } else if (route.query.name === 'leijiashan') {
+          //         this.url =
+          //             'http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$17d1c65d3389444bb804864268aa032b&id=admin&pw=admin'
+          //     }
+          // }
+        }
+      },
+      immediate: true,
+    },
+  },
+};
 </script>

src/views/intelligentReporting/yxqk/index.vue

@@ -1,60 +1,83 @@
 <template>
-    <div :style="pageHeight">
-        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
-    </div>
+  <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 (window.location.origin.indexOf('172.16.12.101') != -1) {
-                            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 {
-                            if (route.query.name === 'zuozhuangyiqi') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$6cfd3bcb6b85450dbcf396a816439c9f&id=admin&pw=admin'
-                            } else if (route.query.name === 'zuozhuangerqi') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$cc08c68dc9e34d15951f73dad8fbdbd7&id=admin&pw=admin'
-                            } else if (route.query.name === 'xinzhuangyiqi') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$05d0dbf32f7645179e12ffe21f064fd9&id=admin&pw=admin'
-                            } else if (route.query.name === 'xinzhuangerqi') {
-                                this.url =
-                                    'http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$19d79cef51114028a3f1dd1c06b08ea8&id=admin&pw=admin'
-                            }
-                        }
-                    }
-                },
-                immediate: true
-            }
-        }
+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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "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 = `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$19d79cef51114028a3f1dd1c06b08ea8&id=admin&pw=admin`;
+          }
+          //   if (window.location.origin.indexOf("172.16.12.101") != -1) {
+          //     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 {
+          //     if (route.query.name === "zuozhuangyiqi") {
+          //       this.url =
+          //         "http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$6cfd3bcb6b85450dbcf396a816439c9f&id=admin&pw=admin";
+          //     } else if (route.query.name === "zuozhuangerqi") {
+          //       this.url =
+          //         "http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$cc08c68dc9e34d15951f73dad8fbdbd7&id=admin&pw=admin";
+          //     } else if (route.query.name === "xinzhuangyiqi") {
+          //       this.url =
+          //         "http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$05d0dbf32f7645179e12ffe21f064fd9&id=admin&pw=admin";
+          //     } else if (route.query.name === "xinzhuangerqi") {
+          //       this.url =
+          //         "http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$19d79cef51114028a3f1dd1c06b08ea8&id=admin&pw=admin";
+          //     }
+          //   }
+        }
+      },
+      immediate: true,
+    },
+  },
+};
 </script>

src/views/intelligentReporting/zhbb/index.vue

@@ -1,39 +1,48 @@
 <template>
-    <div :style="pageHeight">
-        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
-    </div>
+  <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",
-            };
-        },
-        watch: {
-            $route: {
-                handler: function (route) {
-                    this.url = null
-                    if (route.query.name) {
-                        if (window.location.origin.indexOf('172.16.12.101') != -1) {
-                            this.url =
-                                "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$03a38ba7339d4e2b9812e08e924f997e&id=admin&pw=admin"
-                        } else {
-                            this.url =
-                                "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$03a38ba7339d4e2b9812e08e924f997e&id=admin&pw=admin"
-                        }
-                    }
-                },
-                immediate: true
-            }
-        },
-        computed: {
-            pageHeight() {
-                return {
-                    'height': document.documentElement.clientHeight - 80 + 'px'
-                }
-            },
-        }
+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://10.127.7.196:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$bd71f31ba69443b5b3f3997965927c41$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin",
     };
+  },
+  watch: {
+    $route: {
+      handler: function (route) {
+        this.url = null;
+        if (route.query.name) {
+          this.url = `${
+            this.reportBaseUrl || "http://172.16.12.101:8083"
+          }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$03a38ba7339d4e2b9812e08e924f997e&id=admin&pw=admin`;
+          // if (window.location.origin.indexOf('172.16.12.101') != -1) {
+          //     this.url =
+          //         "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$03a38ba7339d4e2b9812e08e924f997e&id=admin&pw=admin"
+          // } else {
+          //     this.url =
+          //         "http://10.127.7.196:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$03a38ba7339d4e2b9812e08e924f997e&id=admin&pw=admin"
+          // }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    pageHeight() {
+      return {
+        height: document.documentElement.clientHeight - 80 + "px",
+      };
+    },
+  },
+};
 </script>

src/views/login/index.vue

@@ -2,8 +2,8 @@
     <div class="loginPic">
         <div class="login_left">
             <p class="titleW">Welcome!</p>
-            <p class="title">基于风机发电量全寿命周期管控的研究与应用</p>
-            <p class="titleEn">Research and application of full lifecycle control based on wind turbine power generation
+            <p class="title">发电能力分析平台</p>
+            <p class="titleEn">Power generation capacity analysis platform
             </p>
         </div>
         <div class="login_right">
@@ -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);

src/views/powerPrediction/batteryDivinerPage.vue

@@ -227,33 +227,33 @@
         computed: {
             pageHeight() {
                 return {
-                    'height': document.documentElement.clientHeight - 140 + 'px'
+                    'height': document.documentElement.clientHeight - 110 + 'px'
                 }
             },
             chartStyle() {
-                let height = (document.documentElement.clientHeight - 150) / 3 + 'px'
+                let height = (document.documentElement.clientHeight - 120) / 3 + 'px'
                 return {
                     'width': '100%',
                     'height': height
                 }
             },
             chartStyle2() {
-                let heighttop = (document.documentElement.clientHeight - 150) / 3
-                let height = (document.documentElement.clientHeight - 180 - heighttop) + 'px'
+                let heighttop = (document.documentElement.clientHeight - 120) / 3
+                let height = (document.documentElement.clientHeight - 150 - heighttop) + 'px'
                 return {
                     'width': '100%',
                     'height': height
                 }
             },
             chartStyle3() {
-                let height = (document.documentElement.clientHeight - 240) / 3 + 'px'
+                let height = (document.documentElement.clientHeight - 210) / 3 + 'px'
                 return {
                     'width': '100%',
                     'height': height
                 }
             },
             chartStyle4() {
-                let height = (document.documentElement.clientHeight - 180) / 3 + 'px'
+                let height = (document.documentElement.clientHeight - 150) / 3 + 'px'
                 return {
                     'width': '100%',
                     'height': height
@@ -703,7 +703,7 @@
     .themeLight {
         .batterDiviner_wind {
             .windStstus {
-                background: linear-gradient(0deg, transparent, #373590);
+                // background: linear-gradient(0deg, transparent, #373590);
             }
         }
 

src/views/powerPrediction/homePageNoMap.vue

@@ -12,7 +12,8 @@
         </div>
         <div class="homePage_main">
             <div class="mainLeft">
-                <div class="lineStyle" v-on:dblclick="doubleclick('全域功率预测')" style="position: relative">
+                <div class="lineStyle" :style="leftDivStyle" v-on:dblclick="doubleclick('全域功率预测')"
+                    style="position: relative">
                     <div style="display: flex;float: right;justify-content: end;margin-right: 53px;">
                         <div v-for="item in showpowerLegend" :key="item.name">
                             <span class="lineColor" :style="{'background': item.color}"></span>
@@ -27,15 +28,16 @@
                     </div>
                     <div id="lineChart" :style="lineChartStyle"></div>
                 </div>
-                <div class="lineStyle" v-on:dblclick="doubleclick('全域风速预测')" style="position: relative">
+                <div class="lineStyle" :style="leftDivStyle" v-on:dblclick="doubleclick('全域风速预测')"
+                    style="position: relative">
                     <div class="chart-name">
                         <div class="point point-left bottom"></div>
                         <div class="point point-right bottom"></div>
                     </div>
                     <div class="styleData">
                         <span :class="windShow ? 'changeStyle' : 'defaultSty'" @click="getWindorSunDate('风速')">风速</span>
-                        <span :class="sunShow ? 'changeStyle' : 'defaultSty'"
-                            @click="getWindorSunDate('辐照度')">辐照度</span>
+                        <!-- <span :class="sunShow ? 'changeStyle' : 'defaultSty'"
+                            @click="getWindorSunDate('辐照度')">辐照度</span> -->
                     </div>
                     <div id="lineChart1" :style="lineChartStyle"></div>
                 </div>
@@ -179,6 +181,7 @@
             return {
                 statusTimer: '',
                 statusData: [],
+                statusDataW: [],
                 planFiveMin: '',
                 currentTime: '',
                 warningData: [],
@@ -643,6 +646,13 @@
                     'height': document.documentElement.clientHeight - 115 + 'px'
                 }
             },
+            leftDivStyle() {
+                let pageHeight = document.documentElement.clientHeight - 210
+                let heightChart = pageHeight / 2 + 'px'
+                return {
+                    'height': heightChart
+                }
+            },
             lineChartStyle() {
                 let pageHeight = document.documentElement.clientHeight - 210
                 let heightChart = pageHeight / 2 + 'px'
@@ -795,6 +805,13 @@
                                     }
                                 }
                             })
+                            that.statusDataW.forEach(item => {
+                                for (let it in datas.data) {
+                                    if (item.nameEn === it) {
+                                        item.number = datas.data[it]
+                                    }
+                                }
+                            })
                             that.allStatus = datas.data
                         }
                     }
@@ -1342,7 +1359,7 @@
                     //     }
                     // },
                     legend: {
-                        right: '20',
+                        right: name !== 'lineChart1' ? '20' : '20%',
                         data: legend,
                         // show: name === 'lineChart' ? false : true
                         show: false

src/views/powerPrediction/panoramicPower.vue

@@ -315,13 +315,13 @@
             pageHeight() {
                 return {
                     // 'width': '100%',
-                    'height': document.documentElement.clientHeight - 140 + 'px'
+                    'height': document.documentElement.clientHeight - 110 + 'px'
                 }
             },
             lineChartStyle() {
                 let heightChart = ''
                 // let pageHeight = document.documentElement.clientHeight-120-(Math.ceil(this.chartsData.length/3)*40)
-                let pageHeight = document.documentElement.clientHeight - 115 - (Math.ceil(this.chartsData.length / 3) *
+                let pageHeight = document.documentElement.clientHeight - 100 - (Math.ceil(this.chartsData.length / 3) *
                     40)
                 if (this.chartsData.length <= 3) {
                     heightChart = '350px'
@@ -374,6 +374,13 @@
                                     }
                                 }
                             })
+                            that.statusDataW.forEach(item => {
+                                for (let it in datas.data) {
+                                    if (item.nameEn === it) {
+                                        item.number = datas.data[it]
+                                    }
+                                }
+                            })
                             that.allStatus = datas.data
                         }
                     }

src/views/powerPrediction/powerPredictionPage.vue

@@ -392,25 +392,25 @@
         computed: {
             pageHeight() {
                 return {
-                    'height': document.documentElement.clientHeight - 140 + 'px'
+                    'height': document.documentElement.clientHeight - 110 + 'px'
                 }
             },
             chartStyle() {
-                let height = (document.documentElement.clientHeight - 120 - 100) / 3 + 'px'
+                let height = (document.documentElement.clientHeight - 100 - 100) / 3 + 'px'
                 return {
                     'width': '100%',
                     'height': height
                 }
             },
             messageStyle() {
-                let height = (document.documentElement.clientHeight - 120 - 100) / 3 + 'px'
+                let height = (document.documentElement.clientHeight - 100 - 100) / 3 + 'px'
                 return {
                     'width': '96%',
                     'height': height
                 }
             },
             messageStylexc() {
-                let height = (document.documentElement.clientHeight - 120 - 60) / 3 * 2 + 'px'
+                let height = (document.documentElement.clientHeight - 100 - 60) / 3 * 2 + 'px'
                 return {
                     'width': '96%',
                     'height': height
@@ -505,6 +505,13 @@
                                     }
                                 }
                             })
+                            that.statusDataW.forEach(item => {
+                                for (let it in datas.data) {
+                                    if (item.nameEn === it) {
+                                        item.number = datas.data[it]
+                                    }
+                                }
+                            })
                         }
                         console.log(datas)
                     }

src/views/powerPrediction/statisticalSummaryPage.vue

@@ -204,7 +204,7 @@
         computed: {
             pageHeight() {
                 return {
-                    'height': document.documentElement.clientHeight - 130 + 'px'
+                    'height': document.documentElement.clientHeight - 100 + 'px'
                 }
             },
             chartsHeight() {
@@ -215,7 +215,7 @@
                 }
             },
             pieHeight() {
-                let height = (document.documentElement.clientHeight - 310) / 2 + 'px'
+                let height = (document.documentElement.clientHeight - 270) / 2 + 'px'
                 return {
                     'width': '100%',
                     'height': height
@@ -706,7 +706,7 @@
     .themeLight {
         .statistical_wind {
             .windStstus {
-                background: linear-gradient(0deg, transparent, #373590);
+                // background: linear-gradient(0deg, transparent, #373590);
             }
 
 

src/views/powerPrediction/weatherPage.vue

@@ -397,25 +397,25 @@
             },
             weatherMainHeight() {
                 return {
-                    'height': document.documentElement.clientHeight - 140 + 'px'
+                    'height': document.documentElement.clientHeight - 110 + 'px'
                 }
             },
             lineChartStyle() {
                 return {
                     'width': '93%',
-                    'height': (document.documentElement.clientHeight - 430) + 'px'
+                    'height': (document.documentElement.clientHeight - 400) + 'px'
                 }
             },
             lineLeftChartStyle() {
                 return {
                     'width': '93%',
-                    'height': (document.documentElement.clientHeight - 490) / 2 + 'px'
+                    'height': (document.documentElement.clientHeight - 460) / 2 + 'px'
                 }
             },
             linerightChartStyle() {
                 return {
                     'width': '95%',
-                    'height': (document.documentElement.clientHeight - 680) + 'px'
+                    'height': (document.documentElement.clientHeight - 650) + 'px'
                 }
             }
         },
@@ -1331,10 +1331,10 @@
                 display: flex;
                 justify-content: space-around;
                 align-items: center;
-                background: #3a35ae;
+                // background: #3a35ae;
                 // background: rgb(13, 104, 188);
                 margin: 0 10px;
-                border: 1px solid #7674d8;
+                // border: 1px solid #7674d8;
                 border-radius: 10px 10px 0 0;
                 border-bottom: none;
                 height: 40px;
@@ -1418,7 +1418,7 @@
             width: calc(100% - 20px);
             padding: 10px 0 10px 20px;
             // background: rgb(13, 104, 188);
-            border-radius: 10px;
+            // border-radius: 10px;
 
             .weatherOverview {
                 width: 50%;

src/viewsCss/batteryDivinerPageLess.less

@@ -5,7 +5,7 @@
             justify-content: space-around;
             align-items: center;
             margin: 0 10px;
-            border: 1px solid #7674d8;
+            // border: 1px solid #7674d8;
             border-radius: 10px 10px 0 0;
             border-bottom: none;
             height: 40px;
@@ -70,7 +70,7 @@
     .lineMain {
         width: calc(100% - 20px);
         padding: 10px 0 10px 20px;
-        border-radius: 10px;
+        // border-radius: 10px;
 
         .lineStyle {
             width: 96%;

src/viewsCss/panoramicPowerLess.less

@@ -74,7 +74,7 @@
     .lineMain {
         width: calc(100% - 20px);
         padding: 10px 0 10px 20px;
-        border-radius: 10px;
+        // border-radius: 10px;
 
         .lineStyle {
             width: 94%;

src/viewsCss/powerPredictionPageLess.less

@@ -130,7 +130,7 @@
     .lineMain {
         width: calc(100% - 20px);
         padding: 10px 0 10px 20px;
-        border-radius: 10px;
+        // border-radius: 10px;
 
         .lineStyle {
             width: 98%;

src/viewsCss/statisticalSummaryPageLess.less

@@ -5,7 +5,7 @@
             justify-content: space-around;
             align-items: center;
             margin: 0 10px;
-            border: 1px solid #7674d8;
+            // border: 1px solid #7674d8;
             border-radius: 10px 10px 0 0;
             border-bottom: none;
             height: 40px;
@@ -75,7 +75,7 @@
     .lineMain {
         width: calc(100% - 20px);
         padding: 10px;
-        border-radius: 10px;
+        // border-radius: 10px;
 
         .lineStyle1 {
             border-radius: 10px;

vue.config.js

@@ -75,6 +75,7 @@ module.exports = defineConfig({
             '@tools': resolve('./src/tools'),
             '@api': resolve('./src/api'),
             '@com': resolve('./src/components'),
+            '@public': resolve('public'),
         },
         fallback: {
             "https": false,