基于风机发电量全寿命周期管控的研究与应用项目中发电能力分析系统整体UI样式整改（项目公共头部分整改，黑色版本与白色版本；风电数据准备页面白色版本修改）

基于风机发电量全寿命周期管控的研究与应用项目中发电能力分析系统整体UI样式整改（项目左侧菜单部分整改；风电数据准备，风电数据处理页面修改黑色版本与白色版本；）
基于风机发电量全寿命周期管控的研究与应用项目中发电能力分析系统整体UI样式整改（功率曲线拟合分析，对风偏差分析页面修改黑色版本与白色版本；）
基于风机发电量全寿命周期管控的研究与应用项目中发电能力分析系统整体UI样式整改（曲线偏差率分析，温度与功率分析页面修改黑色版本与白色版本；）
基于风机发电量全寿命周期管控的研究与应用项目中发电能力分析系统整体UI样式整改（损失电量分析，微观选址分析，毛容量分析页面修改黑色版本与白色版本；）

src/App.vue

@@ -146,7 +146,7 @@
             return {
                 showHeader: false,
                 isShowMenu: false,
-                isCollapse: true,
+                isCollapse: false,
                 showMenuData: [],
                 proSuo: pro_suo,
                 proJie: pro_jie,

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

@@ -21,6 +21,17 @@
                 }
             }
 
+            .el-date-editor--monthrange {
+                background: #1D47B0;
+
+                .el-range-input,
+                .el-range-separator,
+                .el-range__icon {
+                    color: #fff;
+                }
+
+            }
+
             .el-select {
 
                 .select-trigger {

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

@@ -134,4 +134,14 @@ input::-ms-input-placeholder {
             width: 150px;
         }
     }
+
+    .el-date-editor--monthrange {
+
+        .el-range-input,
+        .el-range-separator,
+        .el-range__icon {
+            color: #fff;
+        }
+
+    }
 }

src/components/commonHeaders.vue

@@ -3,7 +3,7 @@
         <el-container>
             <el-header :class="getStyle()">
                 <div class="logoSty">
-                    <img src="../assets/logoGuo_DB.png" alt="">
+                    <!-- <img src="../assets/logoGuo_DB.png" alt=""> -->
                 </div>
                 <div class="proMenu">
                     <!-- <el-button-group>

src/components/generatingCapacityComponent/excel.vue

@@ -1,22 +1,21 @@
 <template>
     <div class="excelData" :style="{ height: height, overflow: 'auto' }">
-        <el-empty v-if="!data.length" description="暂无数据" />
+        <el-empty v-if="!data.length" :image="nodata" image-size="100" description="暂无数据，敬请期待" />
         <el-checkbox-group size="small" v-model="excelCheckIds" v-if="showCheckbox" @change="funCheckChange">
-            <el-checkbox :class="{'!bg-[rgb(236,245,255)]': currentId === item.id}" size="small"
-                class="hover:bg-[rgb(245,247,250)] !mr-0 py-[3px]" :label="item.id" v-for="item in data"
-                :key="item.name">
-                <span
-                    class="whitespace-nowrap cursor-pointer font-bold text-[12px] align-middle inline-flex items-center"
-                    @click.stop="funExcelChange(item)">
-                    <img :src="CSV_C" alt="" v-if="currentId === item.id">
+            <el-checkbox size="small" class="excelDatahaveCheck" :class="theme ? 'excelW' : 'excelB'" :label="item.id"
+                v-for="item in data" :key="item.name"
+                :style="!theme && showCC ? 'background: rgba(0,70,199,0.35)' : ''">
+                <span @click.stop="funExcelChange(item)">
+                    <img :src="CSV_C" alt="" v-if="isshowC(item)">
                     <img :src="CSV" alt="" v-else>
-                    <span class="excelName" :style="excelSpanSty(item)">{{ item.name }}</span>
+                    <span class="excelName">{{ item.name }}</span>
                 </span>
             </el-checkbox>
         </el-checkbox-group>
         <div v-else>
             <div class="excelDataNoCheck" :class="theme ? 'excelW' : 'excelB'" v-for="item in data" :key="item.name"
-                @click="funExcelChange(item)">
+                @click="funExcelChange(item)"
+                :style="!theme && currentId === item.id ? 'background: rgba(0,70,199,0.35)' : ''">
                 <!-- <el-icon>
                     <Document />
                 </el-icon> -->
@@ -31,6 +30,7 @@
 <script>
     import CSV from '@/assets/menuImg/CSV.png'
     import CSV_C from '@/assets/menuImg/CSV_C.png'
+    import nodata from '@/assets/images/noData.png'
     export default {
         props: {
             data: {
@@ -68,6 +68,8 @@
             return {
                 CSV: CSV,
                 CSV_C: CSV_C,
+                nodata: nodata,
+                showCC: null,
                 excelCheckIds: [],
                 currentId: ''
             }
@@ -75,9 +77,25 @@
         watch: {
             checkIds(newVal, oldVal) {
                 this.excelCheckIds = newVal
+            },
+            data(newVal, oldVal) {
+                if (newVal.length > 0) {
+                    this.currentId = newVal[0].id
+                } else {
+                    this.currentId = ''
+                }
             }
         },
         methods: {
+            isshowC(item) {
+                this.showCC = false
+                this.excelCheckIds.forEach(it => {
+                    if (it === item.id) {
+                        this.showCC = true
+                    }
+                })
+                return this.showCC
+            },
             excelSpanSty(item) {
                 if (this.theme) {
                     if (this.currentId === item.id) {
@@ -97,7 +115,7 @@
                 this.currentId = obj.id
                 this.$emit('excelChange', obj)
             },
-            funCheckChange(checkArr) {
+            funCheckChange(checkArr, b) {
                 this.$emit('checkChange', {
                     checkArr,
                     data: this.data
@@ -108,6 +126,42 @@
 </script>
 <style lang="less">
     .excelData {
+        .excelDatahaveCheck {
+            line-height: 25px;
+            height: 25px;
+            width: calc(100% - 10px);
+            font-size: 14px;
+            color: #b7b7b7;
+
+            margin-bottom: 5px;
+            border: 1px solid rgba(203, 204, 209, 0.5);
+            cursor: pointer;
+
+            img {
+                width: 20px;
+                height: 20px;
+                position: relative;
+                top: 3px;
+            }
+
+            .excelName {
+                position: relative;
+                top: -2px;
+                margin-left: 3px;
+            }
+
+            .el-checkbox__input {
+                right: -90%;
+            }
+
+            .is-checked {}
+
+            .el-checkbox__label {
+                position: relative;
+                left: -15px;
+                top: -2px;
+            }
+        }
 
         .excelDataNoCheck {
             line-height: 25px;
@@ -135,12 +189,16 @@
             .excelName {
                 position: relative;
                 top: -2px;
-                margin-left: 10px;
+                margin-left: 3px;
             }
         }
 
         .excelW {
             background: #fff;
         }
+
+        .excelB {
+            background: #181A1E;
+        }
     }
 </style>

src/components/generatingCapacityComponent/table.vue

@@ -8,12 +8,19 @@
         </div>
         <el-table :data="data" size="small" v-loading="loading" :max-height="tableHeight" :style="{ width: '100%'}">
             <el-table-column align="center" show-overflow-tooltip v-for="(item,index) in column" :key="index"
-                :prop="item.prop" :label="item.label" sortable resizable :min-width="item.width? item.width : 80" />
+                :prop="item.prop" :label="item.label" sortable resizable :min-width="item.width? item.width : 70" />
+            <template #empty>
+                <div class="nodata">
+                    <img :src="nodata" alt="">
+                    <p class="nodataText">暂无数据，敬请期待</p>
+                </div>
+            </template>
         </el-table>
     </div>
 </template>
 <script>
     import CSV_C from '@/assets/menuImg/CSV_C.png'
+    import nodata from '@/assets/images/noData.png'
     export default {
         props: {
             data: {
@@ -62,6 +69,7 @@
         data() {
             return {
                 CSV_C: CSV_C,
+                nodata: nodata,
                 tableHeight: window.innerHeight - 250 + 'px'
             }
         },
@@ -74,6 +82,7 @@
             display: flex;
 
             p {
+                width: 15%;
                 font-size: 16px;
                 font-weight: bold;
                 margin: 10px;
@@ -91,5 +100,22 @@
                 top: 5px;
             }
         }
+
+
+        .el-table__empty-block {
+            .el-table__empty-text {
+
+                img {
+                    margin-top: 20px;
+                }
+
+                .nodataText {
+                    line-height: 30px;
+                    position: relative;
+                    top: -10px;
+                    font-size: 14px;
+                }
+            }
+        }
     }
 </style>

src/components/generatingCapacityComponent/tree.vue

@@ -39,6 +39,12 @@
                         </template>
                     </el-dropdown>
                 </template>
+                <template #empty>
+                    <div class="nodata">
+                        <img :src="nodata" alt="">
+                        <p class="nodataText">暂无数据，敬请期待</p>
+                    </div>
+                </template>
             </el-tree>
         </div>
     </div>
@@ -46,6 +52,7 @@
 <script>
     import httpRequest from '@/utils/request.js'
     import tree_shuaxing from '@/assets/menuImg/tree_shuaxing.png'
+    import nodata from '@/assets/images/noData.png'
     import {
         Search
     } from '@element-plus/icons-vue'
@@ -97,6 +104,7 @@
             return {
                 filterText: '',
                 Search: Search,
+                nodata: nodata,
                 tree_shuaxing: tree_shuaxing,
                 defaultProps: {
                     children: 'children',
@@ -263,6 +271,8 @@
 </script>
 <style lang="less" scoped>
     .treeData {
+        overflow-y: auto;
+
         .treeSeach {
             width: 100%;
             display: flex;
@@ -309,6 +319,18 @@
                     background: #fff !important;
                 }
 
+                .el-tree__empty-block {
+                    img {
+                        margin-top: 20px;
+                    }
+
+                    .nodataText {
+                        line-height: 50px;
+                        font-size: 14px;
+                        color: #8C8E91;
+                    }
+                }
+
             }
         }
 

src/components/powerPredictionComponent/configPage/generationPlan.vue

@@ -223,7 +223,6 @@ export default {
             this.getProjectplanList('seach')
         },
         handleCurrentChange(val){
-            debugger
             this.page.currentPage =val
             this.getProjectplanList('seach')
         },
@@ -232,7 +231,6 @@ export default {
             this.$refs['ruleForm'].clearValidate()
         },
         submitForm(formName) {
-            debugger
             console.log('ruleForm====>>>>',this.ruleForm)
             this.$refs[formName].validate((valid) => {
                 if (valid) {

src/components/powerPredictionComponent/configPage/roleManagement.vue

@@ -187,7 +187,6 @@ export default {
         // 新增/修改风电场配置
         addOrUpdatewindframDate() {
             let that = this
-            debugger
             let params = {
                 roleName: that.ruleForm.roles,
                 mIds: that.ruleForm.menus.join(',')

src/utils/index.js

@@ -106,7 +106,6 @@ const until = {
         return allTime
     },
     oninput(str, limit, type, zero) {
-        debugger
         if (zero) {
             if (str.substr(0, 1) === '.' || str.substr(0, 1) === '-') {
                 str = ''

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

@@ -1,9 +1,11 @@
 <template>
     <div class="dataAnalysisAgcAna" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataAnalysisAgcAnaMain">
-            <p>AGC曲线偏差分析</p>
-            <search-cop @submit="funSubmit">
-            </search-cop>
+            <div class="main_top">
+                <p class="topPsty">AGC曲线偏差分析</p>
+                <search-cop @submit="funSubmit">
+                </search-cop>
+            </div>
             <div class="main">
                 <div class="tableDataMain">
                     <el-tabs v-model="activeTab">
@@ -47,9 +49,9 @@
     import httpRequest from '@/utils/request.js'
     import dayjs from 'dayjs';
     /**配置参数 */
-    const tableHeight = ref(window.innerHeight - 270 + 'px')
-    const treeHeight = ref(window.innerHeight - 260 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 260 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 180 + 'px')
+    const treeHeight = ref(window.innerHeight - 180 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 180 + 'px') //excel高度
     /**excel 开始 */
     const excelList = ref([])
     const funExcelChange = async (obj) => { //点击excel项时
@@ -301,13 +303,13 @@
     onMounted(() => {
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 270 + 'px'
-        excelHeight.value = window.innerHeight - 260 + 'px'
-        treeHeight.value = window.innerHeight - 260 + 'px'
+        tableHeight.value = window.innerHeight - 180 + 'px'
+        excelHeight.value = window.innerHeight - 180 + 'px'
+        treeHeight.value = window.innerHeight - 180 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 270 + 'px'
-            excelHeight.value = window.innerHeight - 260 + 'px'
-            treeHeight.value = window.innerHeight - 260 + 'px'
+            tableHeight.value = window.innerHeight - 180 + 'px'
+            excelHeight.value = window.innerHeight - 180 + 'px'
+            treeHeight.value = window.innerHeight - 180 + 'px'
         })
     })
     /**activated */
@@ -318,46 +320,80 @@
 </script>
 <style lang="less" scoped>
     .dataAnalysisAgcAna {
-        padding: 20px;
-
-        p {
-            font-size: 16px;
-            margin-left: 20px;
-            margin-bottom: 10px;
-        }
+        height: 100%;
 
-        .main {
-            display: flex;
-            justify-content: space-between;
-            // width: calc(100% - 40px);
-            width: 100%;
+        .dataAnalysisAgcAnaMain {
+            height: 100%;
 
-            .tableDataMain {
-                padding: 10px;
-                border-radius: 10px;
-                width: calc(100% - 20px);
-                position: relative;
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
 
-                .butten_com {
-                    position: absolute;
-                    right: 20px;
-                    z-index: 111111;
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
                 }
             }
 
+            .main {
+                display: flex;
+                justify-content: space-between;
+                // width: calc(100% - 40px);
+                width: 100%;
+
+                .tableDataMain {
+                    padding: 10px;
+                    border-radius: 10px;
+                    width: calc(100% - 20px);
+                    position: relative;
+
+                    .butten_com {
+                        position: absolute;
+                        right: 20px;
+                        z-index: 111111;
+                    }
+                }
+
+            }
         }
+
+
     }
 
     .themeDark {
 
-        p {
-            color: #fff;
-        }
+        .dataAnalysisAgcAnaMain {
+            .main_top {
+
+                .topPsty {
+                    color: #1C99FF;
+                    background: #1E2126;
+                }
+            }
+
+            .main {
+                background: #13171e;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #313233;
+                }
+
+                .tableDataMain {
+                    margin-top: 5px;
+                    background: #212223;
+                }
+            }
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #161f1e;
         }
 
     }
@@ -365,20 +401,31 @@
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .dataAnalysisAgcAnaMain {
+            .main_top {
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .dataAnalysisAgcAnaMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #E6E8F2;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #F4F6FB;
+                }
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
         }
 
     }

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

@@ -1,7 +1,9 @@
 <template>
     <div class="dataAnalysisAngleAna" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataAnalysisAngleAnaMain">
-            <p>浆距角分析</p>
+            <div class="main_top">
+                <p class="topPsty">浆距角分析</p>
+            </div>
             <div class="main">
                 <div class="treeDataMain">
                     <tree-cop :data="treeData" :height="treeHeight" @currentChange="funCurrentChange"
@@ -42,9 +44,9 @@
     import CurrentScatterChart from './components/current-scatter-chart.vue'
     import httpRequest from '@/utils/request.js'
     /**配置参数 */
-    const tableHeight = ref(window.innerHeight - 160 + 'px')
-    const treeHeight = ref(window.innerHeight - 160 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 160 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 130 + 'px')
+    const treeHeight = ref(window.innerHeight - 130 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 130 + 'px') //excel高度
     /**excel 开始 */
     const excelList = ref([])
     const funExcelChange = async (obj) => { //点击excel项时
@@ -116,6 +118,9 @@
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
+            if (excelList.value.length > 0) {
+                funExcelChange(excelList.value[0])
+            }
         } else {
             excelList.value = []
         }
@@ -194,13 +199,13 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 160 + 'px'
-        excelHeight.value = window.innerHeight - 160 + 'px'
-        treeHeight.value = window.innerHeight - 160 + 'px'
+        tableHeight.value = window.innerHeight - 130 + 'px'
+        excelHeight.value = window.innerHeight - 130 + 'px'
+        treeHeight.value = window.innerHeight - 130 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 160 + 'px'
-            excelHeight.value = window.innerHeight - 160 + 'px'
-            treeHeight.value = window.innerHeight - 160 + 'px'
+            tableHeight.value = window.innerHeight - 130 + 'px'
+            excelHeight.value = window.innerHeight - 130 + 'px'
+            treeHeight.value = window.innerHeight - 130 + 'px'
         })
     })
     /**activated */
@@ -211,60 +216,94 @@
 </script>
 <style lang="less" scoped>
     .dataAnalysisAngleAna {
-        padding: 20px;
+        height: 100%;
 
-        p {
-            font-size: 16px;
-            margin-left: 20px;
-            margin-bottom: 10px;
-        }
+        .dataAnalysisAngleAnaMain {
+            height: 100%;
+
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
 
-        .main {
-            display: flex;
-            justify-content: space-between;
-            // width: calc(100% - 40px);
-            width: 100%;
-
-            .treeDataMain,
-            .excelDataMain,
-            .tableDataMain {
-                padding: 10px;
-                border-radius: 10px;
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
+                }
             }
 
-            .treeDataMain {
-                width: calc(20% - 20px);
+            .main {
+                display: flex;
+                justify-content: space-between;
+                // width: calc(100% - 40px);
+                width: 100%;
 
-            }
+                .treeDataMain,
+                .excelDataMain,
+                .tableDataMain {
+                    padding: 10px;
+                    border-radius: 10px;
+                }
 
-            .excelDataMain {
-                width: calc(13% - 20px);
-            }
+                .treeDataMain {
+                    width: calc(20% - 20px);
 
-            .tableDataMain {
-                width: calc(66% - 20px);
-                position: relative;
+                }
 
-                .butten_com {
-                    position: absolute;
-                    right: 20px;
-                    z-index: 111111;
+                .excelDataMain {
+                    width: calc(13% - 20px);
                 }
-            }
 
+                .tableDataMain {
+                    width: calc(66% - 20px);
+                    position: relative;
+
+                    .butten_com {
+                        position: absolute;
+                        right: 20px;
+                        z-index: 111111;
+                    }
+                }
+
+            }
         }
+
+
     }
 
     .themeDark {
 
-        p {
-            color: #fff;
-        }
+        .dataAnalysisAngleAnaMain {
+            .main_top {
+
+                .topPsty {
+                    color: #1C99FF;
+                    background: #1E2126;
+                }
+            }
+
+            .main {
+                background: #13171e;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #313233;
+                }
+
+                .tableDataMain {
+                    margin-top: 5px;
+                    background: #212223;
+                }
+            }
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #161f1e;
         }
 
     }
@@ -272,20 +311,31 @@
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .dataAnalysisAngleAnaMain {
+            .main_top {
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .dataAnalysisAngleAnaMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #E6E8F2;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #F4F6FB;
+                }
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
         }
 
     }

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

@@ -411,6 +411,10 @@
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
+
+            if (excelFitList.value.length > 0) {
+                funExcelChange(excelFitList.value[0])
+            }
         } else {
             excelFitList.value = []
         }

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

@@ -1,7 +1,9 @@
 <template>
     <div class="dataAnalysisHotAns" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataAnalysisHotAnsMain">
-            <p>温度与功率分析</p>
+            <div class="main_top">
+                <p class="topPsty">温度与功率分析</p>
+            </div>
             <div class="main">
                 <div class="main">
                     <div class="treeDataMain">
@@ -130,9 +132,9 @@
     import util from "@tools/util";
     import CurrentScatterChart from './components/current-scatter-chart.vue'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 160 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 160 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 214 + 'px')
+    const treeHeight = ref(window.innerHeight - 120 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 120 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 180 + 'px')
     /** 额定功率 */
     const powerproduction = ref("")
     /**excel 开始 */
@@ -336,6 +338,9 @@
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
+            if (excelList.value.length > 0) {
+                funExcelChange(excelList.value[0])
+            }
         } else {
             excelList.value = []
         }
@@ -915,13 +920,13 @@
         funGetProcessTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 214 + 'px'
-        excelHeight.value = (window.innerHeight - 160) + 'px'
-        treeHeight.value = (window.innerHeight - 160) + 'px'
+        tableHeight.value = window.innerHeight - 180 + 'px'
+        excelHeight.value = (window.innerHeight - 120) + 'px'
+        treeHeight.value = (window.innerHeight - 120) + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 214 + 'px'
-            excelHeight.value = (window.innerHeight - 160) + 'px'
-            treeHeight.value = (window.innerHeight - 160) + 'px'
+            tableHeight.value = window.innerHeight - 180 + 'px'
+            excelHeight.value = (window.innerHeight - 120) + 'px'
+            treeHeight.value = (window.innerHeight - 120) + 'px'
         })
         /**test */
         // funExcelChange({
@@ -938,64 +943,98 @@
 
 <style lang="less" scoped>
     .dataAnalysisHotAns {
-        padding: 20px;
+        height: 100%;
 
-        p {
-            font-size: 16px;
-            margin-left: 20px;
-            margin-bottom: 10px;
-        }
+        .dataAnalysisHotAnsMain {
+            height: 100%;
+
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
 
-        .main {
-            display: flex;
-            justify-content: space-between;
-            // width: calc(100% - 40px);
-            width: 100%;
-
-            .treeDataMain,
-            .excelDataMain,
-            .tableDataMain {
-                padding: 10px;
-                border-radius: 10px;
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
+                }
             }
 
-            .treeDataMain {
-                width: calc(20% - 20px);
+            .main {
+                display: flex;
+                justify-content: space-between;
+                // width: calc(100% - 40px);
+                width: 100%;
 
-            }
+                .treeDataMain,
+                .excelDataMain,
+                .tableDataMain {
+                    padding: 10px;
+                    border-radius: 10px;
+                }
 
-            .excelDataMain {
-                width: calc(13% - 20px);
-            }
+                .treeDataMain {
+                    width: calc(20% - 20px);
 
-            .tableDataMain {
-                width: calc(66% - 20px);
-                position: relative;
+                }
 
-                .chartIcon {
-                    cursor: pointer;
+                .excelDataMain {
+                    width: calc(13% - 20px);
                 }
 
-                .butten_com {
-                    position: absolute;
-                    right: 20px;
-                    z-index: 111111;
+                .tableDataMain {
+                    width: calc(66% - 20px);
+                    position: relative;
+
+                    .chartIcon {
+                        cursor: pointer;
+                    }
+
+                    .butten_com {
+                        position: absolute;
+                        right: 20px;
+                        z-index: 111111;
+                    }
                 }
-            }
 
+            }
         }
+
+
     }
 
     .themeDark {
 
-        p {
-            color: #fff;
-        }
+        .dataAnalysisHotAnsMain {
+            .main_top {
+
+                .topPsty {
+                    color: #1C99FF;
+                    background: #1E2126;
+                }
+            }
+
+            .main {
+                background: #13171e;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #313233;
+                }
+
+                .tableDataMain {
+                    margin-top: 5px;
+                    background: #212223;
+                }
+            }
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #161f1e;
         }
 
     }
@@ -1003,20 +1042,31 @@
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .dataAnalysisHotAnsMain {
+            .main_top {
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .dataAnalysisHotAnsMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #E6E8F2;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #F4F6FB;
+                }
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
         }
 
     }

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

@@ -1,7 +1,9 @@
 <template>
     <div class="dataAnalysisLineAna" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataAnalysisLineAnaMain">
-            <p>曲线偏差率分析</p>
+            <div class="main_top">
+                <p class="topPsty">曲线偏差率分析</p>
+            </div>
             <div class="main">
                 <div class="treeDataMain">
                     <tree-cop ref="treeCopRef" :data="treeData" @checkChange="funTreeCheckChange" :show-checkbox="true"
@@ -9,7 +11,8 @@
                 </div>
                 <div class="excelDataMain">
                     <excel-cop :checkIds="excelCheckIds" :showCheckbox="excelCheckboxShow" :data="excelList"
-                        :height="excelHeight" @excelChange="funExcelChange" @checkChange="funExcelCheckChange">
+                        :theme="theme" :height="excelHeight" @excelChange="funExcelChange"
+                        @checkChange="funExcelCheckChange">
                     </excel-cop>
                 </div>
                 <div class="tableDataMain">
@@ -97,9 +100,9 @@
     // import tableRes from '@/data/table.json'
     // import areaDataRes from '@/data/areaData.json'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 190 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 190 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 190 + 'px')
+    const treeHeight = ref(window.innerHeight - 150 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 150 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 150 + 'px')
     /**excel 开始 */
     const excelCheckboxShow = ref(false)
     const excelCheckIds = ref([])
@@ -233,7 +236,8 @@
             if (res.data.sjgl.length) {
                 for (const wtObj of res.data.sjgl) {
                     seriesData.value.push({
-                        name: wtObj.obj.windturbineId + "\n实际功率",
+                        // name: wtObj.obj.windturbineId + "\n实际功率",
+                        name: wtObj.obj.code + "\n实际功率",
                         type: "line",
                         symbol: "line", //设定为实心点
                         symbolSize: 0, //设定实心点的大小
@@ -647,13 +651,13 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 190 + 'px'
-        excelHeight.value = window.innerHeight - 190 + 'px'
-        treeHeight.value = window.innerHeight - 190 + 'px'
+        tableHeight.value = window.innerHeight - 150 + 'px'
+        excelHeight.value = window.innerHeight - 150 + 'px'
+        treeHeight.value = window.innerHeight - 150 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 190 + 'px'
-            excelHeight.value = window.innerHeight - 190 + 'px'
-            treeHeight.value = window.innerHeight - 190 + 'px'
+            tableHeight.value = window.innerHeight - 150 + 'px'
+            excelHeight.value = window.innerHeight - 150 + 'px'
+            treeHeight.value = window.innerHeight - 150 + 'px'
         })
         /**test */
         // funExcelChange({
@@ -670,60 +674,94 @@
 
 <style lang="less" scoped>
     .dataAnalysisLineAna {
-        padding: 20px;
+        height: 100%;
 
-        p {
-            font-size: 16px;
-            margin-bottom: 10px;
-            margin-left: 20px;
-        }
+        .dataAnalysisLineAnaMain {
+            height: 100%;
 
-        .main {
-            display: flex;
-            justify-content: space-between;
-            // width: calc(100% - 40px);
-            width: 100%;
-
-            .treeDataMain,
-            .excelDataMain,
-            .tableDataMain {
-                padding: 10px;
-                border-radius: 10px;
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
+
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
+                }
             }
 
-            .treeDataMain {
-                width: calc(20% - 20px);
+            .main {
+                display: flex;
+                justify-content: space-between;
+                // width: calc(100% - 40px);
+                width: 100%;
 
-            }
+                .treeDataMain,
+                .excelDataMain,
+                .tableDataMain {
+                    padding: 10px;
+                    border-radius: 10px;
+                }
 
-            .excelDataMain {
-                width: calc(13% - 20px);
-            }
+                .treeDataMain {
+                    width: calc(20% - 20px);
 
-            .tableDataMain {
-                width: calc(66% - 20px);
-                position: relative;
+                }
 
-                .butten_com {
-                    position: absolute;
-                    right: 20px;
-                    z-index: 111111;
+                .excelDataMain {
+                    width: calc(13% - 20px);
                 }
-            }
 
+                .tableDataMain {
+                    width: calc(66% - 20px);
+                    position: relative;
+
+                    .butten_com {
+                        position: absolute;
+                        right: 20px;
+                        z-index: 111111;
+                    }
+                }
+
+            }
         }
+
+
     }
 
     .themeDark {
 
-        p {
-            color: #fff;
-        }
+        .dataAnalysisLineAnaMain {
+            .main_top {
+
+                .topPsty {
+                    color: #1C99FF;
+                    background: #1E2126;
+                }
+            }
+
+            .main {
+                background: #13171e;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #313233;
+                }
+
+                .tableDataMain {
+                    margin-top: 5px;
+                    background: #212223;
+                }
+            }
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #161f1e;
         }
 
     }
@@ -731,20 +769,31 @@
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .dataAnalysisLineAnaMain {
+            .main_top {
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .dataAnalysisLineAnaMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #E6E8F2;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #F4F6FB;
+                }
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
         }
 
     }

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

@@ -82,7 +82,7 @@
                             })
 
                             let iconLabel = L.divIcon({
-                                html: item.name,
+                                html: item.aname,
                                 className: 'iconLabel',
                                 // iconSize: 50
                             })

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

@@ -1,7 +1,9 @@
 <template>
     <div class="dataAnalysisPosAnal" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataAnalysisPosAnalMain">
-            <p>微观选址分析</p>
+            <div class="main_top">
+                <p class="topPsty">微观选址分析</p>
+            </div>
             <div class="main">
                 <div class="treeDataMain">
                     <tree-cop ref="treeCopRef" :data="treeData" @checkChange="funTreeCheckChange" :show-checkbox="false"
@@ -9,7 +11,8 @@
                 </div>
                 <div class="excelDataMain">
                     <excel-cop :checkIds="excelCheckIds" :showCheckbox="excelCheckboxShow" :data="excelList"
-                        :height="excelHeight" @excelChange="funExcelChange" @checkChange="funExcelCheckChange">
+                        :theme="theme" :height="excelHeight" @excelChange="funExcelChange"
+                        @checkChange="funExcelCheckChange">
                     </excel-cop>
                 </div>
                 <div class="tableDataMain">
@@ -162,9 +165,9 @@
     import httpRequest from '@/utils/request.js'
     const router = useRouter();
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 170 + "px"); //tree高度
-    const excelHeight = ref(window.innerHeight - 170 + "px"); //excel高度
-    const tableHeight = ref(window.innerHeight - 170 + "px");
+    const treeHeight = ref(window.innerHeight - 125 + "px"); //tree高度
+    const excelHeight = ref(window.innerHeight - 125 + "px"); //excel高度
+    const tableHeight = ref(window.innerHeight - 125 + "px");
     /**excel 开始 */
     const excelCheckboxShow = ref(false);
     const excelCheckIds = ref([]);
@@ -1212,13 +1215,13 @@
 
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 170 + "px";
-        excelHeight.value = window.innerHeight - 170 + "px";
-        treeHeight.value = window.innerHeight - 170 + "px";
+        tableHeight.value = window.innerHeight - 125 + "px";
+        excelHeight.value = window.innerHeight - 125 + "px";
+        treeHeight.value = window.innerHeight - 125 + "px";
         window.addEventListener("resize", () => {
-            tableHeight.value = window.innerHeight - 170 + "px";
-            excelHeight.value = window.innerHeight - 170 + "px";
-            treeHeight.value = window.innerHeight - 170 + "px";
+            tableHeight.value = window.innerHeight - 125 + "px";
+            excelHeight.value = window.innerHeight - 125 + "px";
+            treeHeight.value = window.innerHeight - 125 + "px";
         });
         /**test */
         // funExcelChange({
@@ -1241,57 +1244,75 @@
 
 <style lang="less" scoped>
     .dataAnalysisPosAnal {
-        padding: 20px;
+        height: 100%;
 
-        p {
-            font-size: 16px;
-            margin-left: 20px;
-            margin-bottom: 10px;
-        }
+        .dataAnalysisPosAnalMain {
+            height: 100%;
 
-        .main {
-            display: flex;
-            justify-content: space-between;
-            // width: calc(100% - 40px);
-            width: 100%;
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
 
-            .treeDataMain,
-            .excelDataMain,
-            .tableDataMain {
-                padding: 10px;
-                border-radius: 10px;
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
+                }
             }
 
-            .treeDataMain {
-                width: calc(20% - 20px);
+            .main {
+                display: flex;
+                justify-content: space-between;
+                // width: calc(100% - 40px);
+                width: 100%;
 
-            }
+                .treeDataMain,
+                .excelDataMain,
+                .tableDataMain {
+                    padding: 10px;
+                    border-radius: 10px;
+                }
 
-            .excelDataMain {
-                width: calc(13% - 20px);
+                .treeDataMain {
+                    width: calc(20% - 20px);
 
-                .excelDataMain_top {
-                    height: 49%;
-                    padding: 5px 0;
                 }
 
-                .excelDataMain_bot {
-                    padding: 5px 0;
+                .excelDataMain {
+                    width: calc(13% - 20px);
+
+                    .excelDataMain_top {
+                        height: 49%;
+                        padding: 5px 0;
+                    }
+
+                    .excelDataMain_bot {
+                        padding: 5px 0;
+                    }
                 }
-            }
 
-            .tableDataMain {
-                width: calc(66% - 20px);
-                position: relative;
+                .tableDataMain {
+                    width: calc(66% - 20px);
+                    position: relative;
 
-                .butten_com {
-                    position: absolute;
-                    right: 20px;
-                    z-index: 111111;
+                    .butten_com {
+                        position: absolute;
+                        right: 20px;
+                        z-index: 111111;
+                    }
                 }
+
             }
 
+
         }
+
+
     }
 
     .rightMenuDialog {
@@ -1302,14 +1323,32 @@
 
     .themeDark {
 
-        p {
-            color: #fff;
-        }
+        .dataAnalysisPosAnalMain {
+            .main_top {
+
+                .topPsty {
+                    color: #1C99FF;
+                    background: #1E2126;
+                }
+            }
+
+            .main {
+                background: #13171e;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #313233;
+                }
+
+                .tableDataMain {
+                    margin-top: 5px;
+                    background: #212223;
+                }
+            }
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #161f1e;
         }
 
     }
@@ -1317,20 +1356,31 @@
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .dataAnalysisPosAnalMain {
+            .main_top {
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .dataAnalysisPosAnalMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #E6E8F2;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #F4F6FB;
+                }
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
         }
 
     }

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

@@ -223,6 +223,9 @@
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
+            if (excelList.value.length > 0) {
+                funExcelChange(excelList.value[0])
+            }
         } else {
             excelList.value = []
         }

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

@@ -1,7 +1,9 @@
 <template>
     <div class="dataAnalysisSpaceAna" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataAnalysisSpaceAnaMain">
-            <p>毛容量分析</p>
+            <div class="main_top">
+                <p class="topPsty">毛容量分析</p>
+            </div>
             <div class="main">
                 <div class="treeDataMain">
                     <tree-cop :data="treeData" @checkChange="funTreeCheckChange" :show-checkbox="false"
@@ -81,9 +83,9 @@
     import httpRequest from '@/utils/request.js'
     import tools from '@tools/htmlToPdf.js'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 160 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 160 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 160 + 'px')
+    const treeHeight = ref(window.innerHeight - 125 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 125 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 125 + 'px')
     /**excel 开始 */
     const excelCheckIds = ref([])
     const excelList = ref([])
@@ -185,6 +187,9 @@
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
+            if (excelList.value.length > 0) {
+                funExcelChange(excelList.value[0])
+            }
         } else {
             excelList.value = []
         }
@@ -232,7 +237,8 @@
                     });
                     avgSpeed.value = (avgSpeedSum / barData1.length).toFixed(2) + ' m/s'
                     avgMrxs.value = (avgMrxsSum / lineData1.length * 100).toFixed(2) + ' %'
-                    windName.value = chart.wtId
+                    // windName.value = chart.wtId
+                    windName.value = chart.code
                     barxAxis.data = xAxisData
                     linexAxis.data = xAxisData
                     barSeries[0].data = barData1
@@ -635,13 +641,13 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 160 + 'px'
-        excelHeight.value = (window.innerHeight - 160) + 'px'
-        treeHeight.value = (window.innerHeight - 160) + 'px'
+        tableHeight.value = window.innerHeight - 125 + 'px'
+        excelHeight.value = (window.innerHeight - 125) + 'px'
+        treeHeight.value = (window.innerHeight - 125) + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 160 + 'px'
-            excelHeight.value = (window.innerHeight - 160) + 'px'
-            treeHeight.value = (window.innerHeight - 160) + 'px'
+            tableHeight.value = window.innerHeight - 125 + 'px'
+            excelHeight.value = (window.innerHeight - 125) + 'px'
+            treeHeight.value = (window.innerHeight - 125) + 'px'
         })
     })
     onActivated(() => {
@@ -651,64 +657,98 @@
 
 <style lang="less" scoped>
     .dataAnalysisSpaceAna {
-        padding: 20px;
+        height: 100%;
 
-        p {
-            font-size: 16px;
-            margin-left: 20px;
-            margin-bottom: 10px;
-        }
+        .dataAnalysisSpaceAnaMain {
+            height: 100%;
+
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
 
-        .main {
-            display: flex;
-            justify-content: space-between;
-            // width: calc(100% - 40px);
-            width: 100%;
-
-            .treeDataMain,
-            .excelDataMain,
-            .tableDataMain {
-                padding: 10px;
-                border-radius: 10px;
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
+                }
             }
 
-            .treeDataMain {
-                width: calc(20% - 20px);
+            .main {
+                display: flex;
+                justify-content: space-between;
+                // width: calc(100% - 40px);
+                width: 100%;
 
-            }
+                .treeDataMain,
+                .excelDataMain,
+                .tableDataMain {
+                    padding: 10px;
+                    border-radius: 10px;
+                }
 
-            .excelDataMain {
-                width: calc(13% - 20px);
-            }
+                .treeDataMain {
+                    width: calc(20% - 20px);
 
-            .tableDataMain {
-                width: calc(66% - 20px);
-                position: relative;
+                }
 
-                .chartIcon {
-                    cursor: pointer;
+                .excelDataMain {
+                    width: calc(13% - 20px);
                 }
 
-                .butten_com {
-                    position: absolute;
-                    right: 20px;
-                    z-index: 111111;
+                .tableDataMain {
+                    width: calc(66% - 20px);
+                    position: relative;
+
+                    .chartIcon {
+                        cursor: pointer;
+                    }
+
+                    .butten_com {
+                        position: absolute;
+                        right: 20px;
+                        z-index: 111111;
+                    }
                 }
-            }
 
+            }
         }
+
+
     }
 
     .themeDark {
 
-        p {
-            color: #fff;
-        }
+        .dataAnalysisSpaceAnaMain {
+            .main_top {
+
+                .topPsty {
+                    color: #1C99FF;
+                    background: #1E2126;
+                }
+            }
+
+            .main {
+                background: #13171e;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #313233;
+                }
+
+                .tableDataMain {
+                    margin-top: 5px;
+                    background: #212223;
+                }
+            }
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #161f1e;
         }
 
     }
@@ -716,20 +756,31 @@
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .dataAnalysisSpaceAnaMain {
+            .main_top {
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .dataAnalysisSpaceAnaMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #E6E8F2;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #F4F6FB;
+                }
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
         }
 
     }

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

@@ -1,7 +1,9 @@
 <template>
     <div class="dataAnalysisWindAna" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataAnalysisWindAnaMain">
-            <p>损失电量分析</p>
+            <div class="main_top">
+                <p class="topPsty">损失电量分析</p>
+            </div>
             <div class="main">
                 <div class="treeDataMain">
                     <tree-cop ref="treeCopRef" :data="treeData" @checkChange="funTreeCheckChange" :show-checkbox="true"
@@ -9,7 +11,8 @@
                 </div>
                 <div class="excelDataMain">
                     <excel-cop :checkIds="excelCheckIds" :showCheckbox="excelCheckboxShow" :data="excelList"
-                        :height="excelHeight" @excelChange="funExcelChange" @checkChange="funExcelCheckChange">
+                        :theme="theme" :height="excelHeight" @excelChange="funExcelChange"
+                        @checkChange="funExcelCheckChange">
                     </excel-cop>
                 </div>
                 <div class="tableDataMain">
@@ -55,9 +58,9 @@
     } from 'vuex';
     import httpRequest from '@/utils/request.js'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 160 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 160 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 214 + 'px')
+    const treeHeight = ref(window.innerHeight - 120 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 120 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 184 + 'px')
     /**table 开始 */
     const tableShowId = ref('')
     const tableName = ref('损失电量分析')
@@ -260,7 +263,6 @@
     const funGetTree = async () => {
         actTreeNode.value = null
         const res = await httpRequest.get("/power/prepare/tree")
-        debugger
         treeData.value = funRepeatMap(res.data)
         excelList.value = []
         if (actTreeNode.value) {
@@ -339,13 +341,13 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 214 + 'px'
-        excelHeight.value = window.innerHeight - 160 + 'px'
-        treeHeight.value = window.innerHeight - 160 + 'px'
+        tableHeight.value = window.innerHeight - 184 + 'px'
+        excelHeight.value = window.innerHeight - 120 + 'px'
+        treeHeight.value = window.innerHeight - 120 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 214 + 'px'
-            excelHeight.value = window.innerHeight - 160 + 'px'
-            treeHeight.value = window.innerHeight - 160 + 'px'
+            tableHeight.value = window.innerHeight - 184 + 'px'
+            excelHeight.value = window.innerHeight - 120 + 'px'
+            treeHeight.value = window.innerHeight - 120 + 'px'
         })
     })
     /**activated */
@@ -355,60 +357,96 @@
 </script>
 <style lang="less" scoped>
     .dataAnalysisWindAna {
-        padding: 20px;
+        height: 100%;
 
-        p {
-            font-size: 16px;
-            margin-left: 20px;
-            margin-bottom: 10px;
-        }
+        .dataAnalysisWindAnaMain {
+            height: 100%;
 
-        .main {
-            display: flex;
-            justify-content: space-between;
-            // width: calc(100% - 40px);
-            width: 100%;
-
-            .treeDataMain,
-            .excelDataMain,
-            .tableDataMain {
-                padding: 10px;
-                border-radius: 10px;
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
+
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
+                }
             }
 
-            .treeDataMain {
-                width: calc(20% - 20px);
+            .main {
+                display: flex;
+                justify-content: space-between;
+                // width: calc(100% - 40px);
+                width: 100%;
 
-            }
+                .treeDataMain,
+                .excelDataMain,
+                .tableDataMain {
+                    padding: 10px;
+                    border-radius: 10px;
+                }
 
-            .excelDataMain {
-                width: calc(13% - 20px);
-            }
+                .treeDataMain {
+                    width: calc(20% - 20px);
+
+                }
+
+                .excelDataMain {
+                    width: calc(13% - 20px);
+                }
 
-            .tableDataMain {
-                width: calc(66% - 20px);
-                position: relative;
+                .tableDataMain {
+                    width: calc(66% - 20px);
+                    position: relative;
 
-                .butten_com {
-                    position: absolute;
-                    right: 20px;
-                    z-index: 111111;
+                    .butten_com {
+                        position: absolute;
+                        right: 20px;
+                        z-index: 111111;
+                    }
                 }
+
             }
 
+
         }
+
+
     }
 
     .themeDark {
 
-        p {
-            color: #fff;
-        }
+        .dataAnalysisWindAnaMain {
+            .main_top {
+
+                .topPsty {
+                    color: #1C99FF;
+                    background: #1E2126;
+                }
+            }
+
+            .main {
+                background: #13171e;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #313233;
+                }
+
+                .tableDataMain {
+                    margin-top: 5px;
+                    background: #212223;
+                }
+            }
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #161f1e;
         }
 
     }
@@ -416,20 +454,31 @@
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .dataAnalysisWindAnaMain {
+            .main_top {
 
-        .treeDataMain,
-        .excelDataMain,
-        .tableDataMain {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .dataAnalysisWindAnaMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #E6E8F2;
+
+                .treeDataMain {
+                    background: transparent;
+                }
+
+                .excelDataMain {
+                    background: #F4F6FB;
+                }
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
         }
 
     }

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

@@ -150,6 +150,9 @@
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
+            if (excelList.value.length > 0) {
+                funExcelChange(excelList.value[0])
+            }
         } else {
             excelList.value = []
         }
@@ -275,6 +278,7 @@
 
                 .tableDataMain {
                     width: calc(66% - 20px);
+                    // width: 66%;
                 }
 
             }

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

@@ -21,12 +21,9 @@
                     </excel-cop>
                 </div>
                 <div class="tableDataMain">
-                    <div>
-                        <table-cop class="" :data="tableData" :column="tableColumn" :loading="tableLoading"
-                            :theme="theme" :height="tableHeight" :tableId="tableShowId" :tableName="tableName"
-                            @export="funExport">
-                        </table-cop>
-                    </div>
+                    <table-cop class="" :data="tableData" :column="tableColumn" :loading="tableLoading" :theme="theme"
+                        :height="tableHeight" :tableId="tableShowId" :tableName="tableName" @export="funExport">
+                    </table-cop>
                 </div>
             </div>
         </div>
@@ -84,7 +81,7 @@
                 return {
                     prop: o.key,
                     label: o.des,
-                    width: o.des === '时间' ? 100 : 80,
+                    width: o.des === '时间' ? 100 : 70,
                 }
             })
             tableData.value = res.data.data
@@ -143,6 +140,7 @@
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
+
         } else {
             excelList.value = []
         }
@@ -220,6 +218,9 @@
                     name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
                 }
             })
+            if (excelList.value.length > 0) {
+                funExcelChange(excelList.value[0])
+            }
         } else {
             excelList.value = []
         }
@@ -316,7 +317,7 @@
             .main {
                 display: flex;
                 justify-content: space-between;
-                // width: calc(100% - 40px);
+                // width: calc(100% - 50px);
                 width: 100%;
 
                 .treeDataMain,

src/views/generatingCapacity/report/index.vue

@@ -1,40 +1,49 @@
 <template>
     <div class="analysisReport" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="analysisReportMain">
-            <p>分析报告</p>
-            <div class="seach">
-                <el-form class="" :inline="true">
-                    <el-form-item label="场站" class="!mb-0">
-                        <el-select v-model="station" clearable class="w-[150px]">
-                            <el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="选择时间">
-                        <el-date-picker v-model="pickerVal" type="monthrange" value-format="YYYY-MM" range-separator="至"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
-                    </el-form-item>
-                    <el-form-item class="!mb-0">
-                        <el-button type="primary" @click="addform">查询</el-button>
-                    </el-form-item>
-                </el-form>
+            <div class="main_top">
+                <p class="topPsty">分析报告</p>
+                <div class="seach">
+                    <el-form class="generat-seach" :inline="true">
+                        <el-form-item label="场站" class="!mb-0">
+                            <el-select v-model="station" clearable class="w-[150px]">
+                                <el-option v-for="item in stationList" :key="item.id" :label="item.name"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="选择时间">
+                            <el-date-picker v-model="pickerVal" type="monthrange" value-format="YYYY-MM"
+                                range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+                        </el-form-item>
+                        <el-form-item class="!mb-0">
+                            <el-button type="primary" @click="addform">查询</el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
             </div>
-            <div class="main warn-table" :style="{ height: tableHeight}">
-                <el-table :data="tableData" size="large">
-                    <el-table-column resizable align="center" type="index" label="序号" width="100" />
-                    <el-table-column resizable align="center" prop="station" label="场站名称" />
-                    <el-table-column resizable align="center" prop="time" label="时间" />
-                    <el-table-column resizable align="center" prop="wtidcount" label="风机数量" />
-                    <el-table-column resizable align="center" label="操作">
-                        <template #default="scope">
-                            <!-- <el-button size="small" @click="handleEdit(scope.$index, scope.row)"
-                    >下载</el-button
-                > -->
-                            <el-button size="small" type="danger" @click="handleReport(scope.$index, scope.row)">查看报告
-                            </el-button>
+            <div class="main" :style="{ height: tableHeight}">
+                <div class="tableDataMain warn-table">
+                    <el-table :data="tableData" size="small">
+                        <el-table-column resizable align="center" type="index" label="序号" />
+                        <el-table-column resizable align="center" prop="station" label="场站名称" />
+                        <el-table-column resizable align="center" prop="time" label="时间" />
+                        <el-table-column resizable align="center" prop="wtidcount" label="风机数量" />
+                        <el-table-column resizable align="center" label="操作">
+                            <template #default="scope">
+                                <el-button size="small" type="danger" @click="handleReport(scope.$index, scope.row)">
+                                    查看报告
+                                </el-button>
+                            </template>
+                        </el-table-column>
+                        <template #empty>
+                            <div class="nodata">
+                                <img :src="nodata" alt="">
+                                <p class="nodataText">暂无数据，敬请期待</p>
+                            </div>
                         </template>
-                    </el-table-column>
-                </el-table>
+                    </el-table>
+                </div>
             </div>
         </div>
     </div>
@@ -212,7 +221,7 @@
     const stoptime = ref([]);
     const nbdata = ref({});
     const loading = ref(false)
-    const tableHeight = ref(window.innerHeight - 210 + 'px')
+    const tableHeight = ref(window.innerHeight - 120 + 'px')
 
     const exportPDF = () => {
         loading.value = true;
@@ -293,8 +302,6 @@
         hjcount.value = res.data.hjcount;
 
         nextTick(() => {
-
-            debugger
             document.getElementsByClassName('.toolSty')
         })
 
@@ -331,61 +338,101 @@
     onMounted(() => {
         funGetStation();
         theme.value = store.state.theme
-        tableHeight.value = window.innerHeight - 210 + 'px'
+        tableHeight.value = window.innerHeight - 120 + 'px'
         addform()
     });
 </script>
 <style lang="less" scoped>
     .analysisReport {
-        padding: 20px;
-
-        p {
-            font-size: 16px;
-            margin-left: 20px;
-        }
+        height: 100%;
 
-        .seach {
-            padding: 20px 0 0 20px;
-        }
-
-        .main {
-            width: calc(100% - 20px);
-            padding: 10px;
-            border-radius: 10px;
+        .analysisReportMain {
+            height: 100%;
+
+            .main_top {
+                height: 40px;
+                display: flex;
+                align-items: center;
+
+                .topPsty {
+                    position: relative;
+                    top: 5px;
+                    padding: 7px 20px;
+                    font-size: 12px;
+                    font-weight: 600;
+                    margin-left: 10px;
+                    border-radius: 3px;
+                }
+
+                .seach {
+                    padding: 20px 0 0 20px;
+                }
+            }
+
+            .main {
+                width: 100%;
+                padding: 10px;
+
+                .tableDataMain {
+                    width: calc(100% - 20px);
+                }
+            }
         }
-
-
     }
 
     .themeDark {
 
-        p {
-            color: #fff;
+        .analysisReportMain {
+            .main_top {
+
+                .topPsty {
+                    color: #1C99FF;
+                    background: #1E2126;
+                }
+            }
+
+            .main {
+                background: #161f1e;
+
+                .tableDataMain {
+                    margin-top: 5px;
+                    background: #212223;
+                }
+            }
         }
 
-        .main {
-            background: #161f1e;
-        }
 
     }
 
     .themeLight {
         padding: 0;
 
-        p {
-            color: #000;
-        }
+        .analysisReportMain {
+            .main_top {
 
-        .main {
-            background: #edeffb;
-        }
+                .topPsty {
+                    color: #2778FF;
+                    background: #FFFFFF;
+                }
+            }
 
-        .analysisReportMain {
-            padding: 20px 0;
-            border-radius: 10px;
-            background: #fff;
+            .main {
+                background: #edeffb;
+
+                .tableDataMain {
+                    background: #fff;
+                    margin-top: 5px;
+                }
+            }
 
+            .analysisReportMain {
+                padding: 20px 0;
+                border-radius: 10px;
+                background: #fff;
+
+            }
         }
 
+
     }
 </style>

src/views/powerPrediction/datasExportPage.vue

@@ -278,7 +278,6 @@ export default {
             for(let i =0; i<2; i++) {
                 const worksheet = workbook.addWorksheet('Sheet'+Number(i+1))
                 //根据数据自己调整
-                debugger
                 worksheet.columns = [
                     { header: '月份', key: 'name', width: 24 },
                     { header: '合计', key: 'statistic', width: 24 },

src/viewsCss/homePageNoMapLess.less

@@ -198,7 +198,7 @@
 
     .footer {
         padding: 0 10px;
-        width: 100%;
+        width: calc(100% - 20px);
         height: 40px;
         // background: #2f5eb0;
         // border-top: 1px solid #797979;
@@ -206,6 +206,7 @@
         bottom: 0;
 
         .exitV {
+            width: 95%;
             display: flex;
             justify-content: space-between;
             line-height: 40px;
@@ -216,10 +217,8 @@
             }
 
             .earlywarning {
-                width: 60%;
-                margin-right: 30px;
+                margin-right: 50px;
                 display: flex;
-                justify-content: end;
 
                 .warningdata {
                     margin-left: 20px;