소스 검색

基于风机发电量全寿命周期管控的研究与应用项目中,首页接口服务联调(天气预测部分,预测电量部分,实际功率部分,计划电量完成情况部分);

SunZehao 1 년 전
부모
커밋
ab267de444

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 14 - 14
src/App.vue


BIN
src/assets/windStatusPic/buttonImgB1.png


BIN
src/assets/windStatusPic/buttonImgB2.png


+ 9 - 9
src/views/generatingCapacity/dataAnalysis/agcAnalysis/index.vue

@@ -49,9 +49,9 @@
     import httpRequest from '@/utils/request.js'
     import dayjs from 'dayjs';
     /**配置参数 */
-    const tableHeight = ref(window.innerHeight - 180 + 'px')
-    const treeHeight = ref(window.innerHeight - 180 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 180 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 170 + 'px')
+    const treeHeight = ref(window.innerHeight - 170 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 170 + 'px') //excel高度
     /**excel 开始 */
     const excelList = ref([])
     const funExcelChange = async (obj) => { //点击excel项时
@@ -303,13 +303,13 @@
     onMounted(() => {
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 180 + 'px'
-        excelHeight.value = window.innerHeight - 180 + 'px'
-        treeHeight.value = window.innerHeight - 180 + 'px'
+        tableHeight.value = window.innerHeight - 170 + 'px'
+        excelHeight.value = window.innerHeight - 170 + 'px'
+        treeHeight.value = window.innerHeight - 170 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 180 + 'px'
-            excelHeight.value = window.innerHeight - 180 + 'px'
-            treeHeight.value = window.innerHeight - 180 + 'px'
+            tableHeight.value = window.innerHeight - 170 + 'px'
+            excelHeight.value = window.innerHeight - 170 + 'px'
+            treeHeight.value = window.innerHeight - 170 + 'px'
         })
     })
     /**activated */

+ 16 - 14
src/views/generatingCapacity/dataAnalysis/angleAnalysis/index.vue

@@ -45,9 +45,9 @@
     import CurrentScatterChart from './components/current-scatter-chart.vue'
     import httpRequest from '@/utils/request.js'
     /**配置参数 */
-    const tableHeight = ref(window.innerHeight - 130 + 'px')
-    const treeHeight = ref(window.innerHeight - 130 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 130 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 120 + 'px')
+    const treeHeight = ref(window.innerHeight - 120 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 120 + 'px') //excel高度
     /**excel 开始 */
     const excelList = ref([])
     const funExcelChange = async (obj) => { //点击excel项时
@@ -224,13 +224,13 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 130 + 'px'
-        excelHeight.value = window.innerHeight - 130 + 'px'
-        treeHeight.value = window.innerHeight - 130 + 'px'
+        tableHeight.value = window.innerHeight - 120 + 'px'
+        excelHeight.value = window.innerHeight - 120 + 'px'
+        treeHeight.value = window.innerHeight - 120 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 130 + 'px'
-            excelHeight.value = window.innerHeight - 130 + 'px'
-            treeHeight.value = window.innerHeight - 130 + 'px'
+            tableHeight.value = window.innerHeight - 120 + 'px'
+            excelHeight.value = window.innerHeight - 120 + 'px'
+            treeHeight.value = window.innerHeight - 120 + 'px'
         })
     })
     /**activated */
@@ -264,27 +264,29 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
                     position: relative;
 

+ 16 - 14
src/views/generatingCapacity/dataAnalysis/combine/index.vue

@@ -124,9 +124,9 @@
     // import tableRes from '@/data/table.json'
     // import areaDataRes from '@/data/areaData.json'
     /**配置参数 */
-    const tableHeight = ref(window.innerHeight - 180 + 'px')
-    const excelHeight = ref((window.innerHeight - 150) / 2 + 'px')
-    const treeHeight = ref((window.innerHeight - 150) / 2 + 'px')
+    const tableHeight = ref(window.innerHeight - 170 + 'px')
+    const excelHeight = ref((window.innerHeight - 131) / 2 + 'px')
+    const treeHeight = ref((window.innerHeight - 131) / 2 + 'px')
     /**excel 开始 */
     const excelCheckboxShow = ref(false)
     const excelType = ref('')
@@ -704,13 +704,13 @@
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
         dataRadom.value = (new Date().getTime()).toString()
-        tableHeight.value = window.innerHeight - 180 + 'px'
-        excelHeight.value = (window.innerHeight - 150) / 2 + 'px'
-        treeHeight.value = (window.innerHeight - 150) / 2 + 'px'
+        tableHeight.value = window.innerHeight - 170 + 'px'
+        excelHeight.value = (window.innerHeight - 131) / 2 + 'px'
+        treeHeight.value = (window.innerHeight - 131) / 2 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 180 + 'px'
-            excelHeight.value = (window.innerHeight - 150) / 2 + 'px'
-            treeHeight.value = (window.innerHeight - 150) / 2 + 'px'
+            tableHeight.value = window.innerHeight - 170 + 'px'
+            excelHeight.value = (window.innerHeight - 131) / 2 + 'px'
+            treeHeight.value = (window.innerHeight - 131) / 2 + 'px'
         })
         /**test */
         // funExcelChange({
@@ -747,24 +747,25 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
 
                     .excelDataMain_top {
                         padding: 5px 0;
@@ -776,6 +777,7 @@
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
                     position: relative;
 

+ 16 - 14
src/views/generatingCapacity/dataAnalysis/hotAnalysis/index.vue

@@ -135,9 +135,9 @@
     import util from "@tools/util";
     import CurrentScatterChart from './components/current-scatter-chart.vue'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 120 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 120 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 180 + 'px')
+    const treeHeight = ref(window.innerHeight - 111 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 111 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 171 + 'px')
     /** 额定功率 */
     const powerproduction = ref("")
     /**excel 开始 */
@@ -923,13 +923,13 @@
         funGetProcessTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 180 + 'px'
-        excelHeight.value = (window.innerHeight - 120) + 'px'
-        treeHeight.value = (window.innerHeight - 120) + 'px'
+        tableHeight.value = window.innerHeight - 171 + 'px'
+        excelHeight.value = (window.innerHeight - 111) + 'px'
+        treeHeight.value = (window.innerHeight - 111) + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 180 + 'px'
-            excelHeight.value = (window.innerHeight - 120) + 'px'
-            treeHeight.value = (window.innerHeight - 120) + 'px'
+            tableHeight.value = window.innerHeight - 171 + 'px'
+            excelHeight.value = (window.innerHeight - 111) + 'px'
+            treeHeight.value = (window.innerHeight - 111) + 'px'
         })
         /**test */
         // funExcelChange({
@@ -969,27 +969,29 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
                     position: relative;
 

+ 16 - 14
src/views/generatingCapacity/dataAnalysis/lineAnalysis/index.vue

@@ -100,9 +100,9 @@
     // import tableRes from '@/data/table.json'
     // import areaDataRes from '@/data/areaData.json'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 150 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 150 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 150 + 'px')
+    const treeHeight = ref(window.innerHeight - 140 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 140 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 140 + 'px')
     /**excel 开始 */
     const excelCheckboxShow = ref(false)
     const excelCheckIds = ref([])
@@ -652,13 +652,13 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 150 + 'px'
-        excelHeight.value = window.innerHeight - 150 + 'px'
-        treeHeight.value = window.innerHeight - 150 + 'px'
+        tableHeight.value = window.innerHeight - 140 + 'px'
+        excelHeight.value = window.innerHeight - 140 + 'px'
+        treeHeight.value = window.innerHeight - 140 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 150 + 'px'
-            excelHeight.value = window.innerHeight - 150 + 'px'
-            treeHeight.value = window.innerHeight - 150 + 'px'
+            tableHeight.value = window.innerHeight - 140 + 'px'
+            excelHeight.value = window.innerHeight - 140 + 'px'
+            treeHeight.value = window.innerHeight - 140 + 'px'
         })
         /**test */
         // funExcelChange({
@@ -698,27 +698,29 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
                     position: relative;
 

+ 16 - 14
src/views/generatingCapacity/dataAnalysis/posAnalysis/index.vue

@@ -165,9 +165,9 @@
     import httpRequest from '@/utils/request.js'
     const router = useRouter();
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 125 + "px"); //tree高度
-    const excelHeight = ref(window.innerHeight - 125 + "px"); //excel高度
-    const tableHeight = ref(window.innerHeight - 125 + "px");
+    const treeHeight = ref(window.innerHeight - 115 + "px"); //tree高度
+    const excelHeight = ref(window.innerHeight - 115 + "px"); //excel高度
+    const tableHeight = ref(window.innerHeight - 115 + "px");
     /**excel 开始 */
     const excelCheckboxShow = ref(false);
     const excelCheckIds = ref([]);
@@ -1215,13 +1215,13 @@
 
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 125 + "px";
-        excelHeight.value = window.innerHeight - 125 + "px";
-        treeHeight.value = window.innerHeight - 125 + "px";
+        tableHeight.value = window.innerHeight - 115 + "px";
+        excelHeight.value = window.innerHeight - 115 + "px";
+        treeHeight.value = window.innerHeight - 115 + "px";
         window.addEventListener("resize", () => {
-            tableHeight.value = window.innerHeight - 125 + "px";
-            excelHeight.value = window.innerHeight - 125 + "px";
-            treeHeight.value = window.innerHeight - 125 + "px";
+            tableHeight.value = window.innerHeight - 115 + "px";
+            excelHeight.value = window.innerHeight - 115 + "px";
+            treeHeight.value = window.innerHeight - 115 + "px";
         });
         /**test */
         // funExcelChange({
@@ -1267,24 +1267,25 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
 
                     .excelDataMain_top {
                         height: 49%;
@@ -1297,6 +1298,7 @@
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
                     position: relative;
 

+ 16 - 14
src/views/generatingCapacity/dataAnalysis/rateAnalysis/index.vue

@@ -123,9 +123,9 @@
     // import flowerRes from '@/data/flower.json'
     // import lineChartRes from '@/data/lineNew.json'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 125 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 125 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 125 + 'px')
+    const treeHeight = ref(window.innerHeight - 116 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 116 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 116 + 'px')
     /**excel 开始 */
     const excelCheckIds = ref([])
     const excelList = ref([])
@@ -882,13 +882,13 @@
         //
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 125 + 'px'
-        excelHeight.value = (window.innerHeight - 125) + 'px'
-        treeHeight.value = (window.innerHeight - 125) + 'px'
+        tableHeight.value = window.innerHeight - 116 + 'px'
+        excelHeight.value = (window.innerHeight - 116) + 'px'
+        treeHeight.value = (window.innerHeight - 116) + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 125 + 'px'
-            excelHeight.value = (window.innerHeight - 125) + 'px'
-            treeHeight.value = (window.innerHeight - 125) + 'px'
+            tableHeight.value = window.innerHeight - 116 + 'px'
+            excelHeight.value = (window.innerHeight - 116) + 'px'
+            treeHeight.value = (window.innerHeight - 116) + 'px'
         })
     })
 </script>
@@ -918,24 +918,25 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
 
                     .excelDataMain_top {
                         padding: 5px 0;
@@ -947,6 +948,7 @@
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
 
                     .chartRowTop {

+ 16 - 14
src/views/generatingCapacity/dataAnalysis/spaceAnalysis/index.vue

@@ -86,9 +86,9 @@
     import httpRequest from '@/utils/request.js'
     import tools from '@tools/htmlToPdf.js'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 125 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 125 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 125 + 'px')
+    const treeHeight = ref(window.innerHeight - 116 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 116 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 116 + 'px')
     /**excel 开始 */
     const excelCheckIds = ref([])
     const excelList = ref([])
@@ -644,13 +644,13 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 125 + 'px'
-        excelHeight.value = (window.innerHeight - 125) + 'px'
-        treeHeight.value = (window.innerHeight - 125) + 'px'
+        tableHeight.value = window.innerHeight - 116 + 'px'
+        excelHeight.value = (window.innerHeight - 116) + 'px'
+        treeHeight.value = (window.innerHeight - 116) + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 125 + 'px'
-            excelHeight.value = (window.innerHeight - 125) + 'px'
-            treeHeight.value = (window.innerHeight - 125) + 'px'
+            tableHeight.value = window.innerHeight - 116 + 'px'
+            excelHeight.value = (window.innerHeight - 116) + 'px'
+            treeHeight.value = (window.innerHeight - 116) + 'px'
         })
     })
     onActivated(() => {
@@ -683,27 +683,29 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
                     position: relative;
 

+ 16 - 14
src/views/generatingCapacity/dataAnalysis/windAnalysis/index.vue

@@ -58,9 +58,9 @@
     } from 'vuex';
     import httpRequest from '@/utils/request.js'
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 120 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 120 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 184 + 'px')
+    const treeHeight = ref(window.innerHeight - 111 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 111 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 175 + 'px')
     /**table 开始 */
     const tableShowId = ref('')
     const tableName = ref('损失电量分析')
@@ -341,13 +341,13 @@
         funGetTree()
         theme.value = store.state.theme
         echartsTheme.value = !theme.value ? 'dark' : ''
-        tableHeight.value = window.innerHeight - 184 + 'px'
-        excelHeight.value = window.innerHeight - 120 + 'px'
-        treeHeight.value = window.innerHeight - 120 + 'px'
+        tableHeight.value = window.innerHeight - 175 + 'px'
+        excelHeight.value = window.innerHeight - 111 + 'px'
+        treeHeight.value = window.innerHeight - 111 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 184 + 'px'
-            excelHeight.value = window.innerHeight - 120 + 'px'
-            treeHeight.value = window.innerHeight - 120 + 'px'
+            tableHeight.value = window.innerHeight - 175 + 'px'
+            excelHeight.value = window.innerHeight - 111 + 'px'
+            treeHeight.value = window.innerHeight - 111 + 'px'
         })
     })
     /**activated */
@@ -380,27 +380,29 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
                     position: relative;
 

+ 19 - 16
src/views/generatingCapacity/dataFilter/prepare/index.vue

@@ -55,9 +55,9 @@
     // } from '@/api/axios.js'
 
     /**配置参数 */
-    const treeHeight = ref(window.innerHeight - 130 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 130 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 130 + 'px')
+    const treeHeight = ref(window.innerHeight - 115 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 115 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 115 + 'px')
     /**excel 开始 */
     const excelList = ref([])
     const funExcelChange = async (obj) => { //点击excel项时
@@ -216,13 +216,13 @@
         // funWebSocket()
         funGetTree()
         theme.value = store.state.theme
-        tableHeight.value = window.innerHeight - 130 + 'px'
-        excelHeight.value = window.innerHeight - 130 + 'px'
-        treeHeight.value = window.innerHeight - 130 + 'px'
+        tableHeight.value = window.innerHeight - 115 + 'px'
+        excelHeight.value = window.innerHeight - 115 + 'px'
+        treeHeight.value = window.innerHeight - 115 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 130 + 'px'
-            excelHeight.value = window.innerHeight - 130 + 'px'
-            treeHeight.value = window.innerHeight - 130 + 'px'
+            tableHeight.value = window.innerHeight - 115 + 'px'
+            excelHeight.value = window.innerHeight - 115 + 'px'
+            treeHeight.value = window.innerHeight - 115 + 'px'
         })
     })
     /**activated */
@@ -256,29 +256,32 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
-                // width: calc(100% - 40px);
+                // justify-content: space-between;
+                // width: calc(100% - 50px);
                 width: 100%;
-                height: calc(100% - 100px);
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
+
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
-                    // width: 66%;
                 }
 
             }

+ 17 - 13
src/views/generatingCapacity/dataFilter/process/index.vue

@@ -51,9 +51,9 @@
         ElMessage
     } from 'element-plus'
     /**配置参数 */
-    const treeHeight = ref((window.innerHeight - 135) / 2 + 'px') //tree高度
-    const excelHeight = ref(window.innerHeight - 125 + 'px') //excel高度
-    const tableHeight = ref(window.innerHeight - 125 + 'px')
+    const treeHeight = ref((window.innerHeight - 120) / 2 + 'px') //tree高度
+    const excelHeight = ref(window.innerHeight - 116 + 'px') //excel高度
+    const tableHeight = ref(window.innerHeight - 116 + 'px')
     /**excel 开始 */
     const excelCheckboxShow = ref(false)
     const excelCheckIds = ref([])
@@ -286,13 +286,13 @@
         await funGetTree()
         funGetProcessTree()
         theme.value = store.state.theme
-        tableHeight.value = window.innerHeight - 125 + 'px'
-        excelHeight.value = window.innerHeight - 125 + 'px'
-        treeHeight.value = (window.innerHeight - 135) / 2 + 'px'
+        tableHeight.value = window.innerHeight - 116 + 'px'
+        excelHeight.value = window.innerHeight - 116 + 'px'
+        treeHeight.value = (window.innerHeight - 120) / 2 + 'px'
         window.addEventListener('resize', () => {
-            tableHeight.value = window.innerHeight - 125 + 'px'
-            excelHeight.value = window.innerHeight - 125 + 'px'
-            treeHeight.value = (window.innerHeight - 135) / 2 + 'px'
+            tableHeight.value = window.innerHeight - 116 + 'px'
+            excelHeight.value = window.innerHeight - 116 + 'px'
+            treeHeight.value = (window.innerHeight - 120) / 2 + 'px'
         })
     })
     /**activated */
@@ -327,27 +327,31 @@
 
             .main {
                 display: flex;
-                justify-content: space-between;
+                // justify-content: space-between;
                 // width: calc(100% - 50px);
                 width: 100%;
 
                 .treeDataMain,
                 .excelDataMain,
                 .tableDataMain {
-                    padding: 10px;
                     border-radius: 10px;
                 }
 
                 .treeDataMain {
-                    width: calc(20% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(19% - 20px);
 
                 }
 
                 .excelDataMain {
-                    width: calc(13% - 20px);
+                    margin-right: 10px;
+                    padding: 10px 0 10px 10px;
+                    width: calc(15% - 20px);
                 }
 
                 .tableDataMain {
+                    padding: 10px;
                     width: calc(66% - 20px);
                 }
 

+ 2 - 2
src/views/generatingCapacity/report/index.vue

@@ -221,7 +221,7 @@
     const stoptime = ref([]);
     const nbdata = ref({});
     const loading = ref(false)
-    const tableHeight = ref(window.innerHeight - 120 + 'px')
+    const tableHeight = ref(window.innerHeight - 110 + 'px')
 
     const exportPDF = () => {
         loading.value = true;
@@ -338,7 +338,7 @@
     onMounted(() => {
         funGetStation();
         theme.value = store.state.theme
-        tableHeight.value = window.innerHeight - 120 + 'px'
+        tableHeight.value = window.innerHeight - 110 + 'px'
         addform()
     });
 </script>

+ 22 - 18
src/views/home/index.vue

@@ -62,12 +62,12 @@
                             <div class="powerCharts">
                                 <div class="powerName">{{ item[0].name }}</div>
                                 <div class="powerItem">
+                                    <forecast-bar-component :list="item" height="40px" width="370px"
+                                        :theme="swichTheme" />
                                     <div class="powerValue">
                                         <span style="background-color:#FF9B23"></span>
-                                        <span>{{ item[0].total }}</span>
+                                        <span>{{ item[0].value }}</span>
                                     </div>
-                                    <forecast-bar-component :list="item" height="40px" width="410px"
-                                        :theme="swichTheme" />
                                 </div>
                             </div>
                         </div>
@@ -76,12 +76,12 @@
                                 <div class="powerCharts">
                                     <div class="powerName">{{ item[0].name }}</div>
                                     <div class="powerItem">
-                                        <div class="powerValue">
-                                            <span style="background-color:#FF9B23"></span>
-                                            <span>{{ item[0].total }}</span>
-                                        </div>
                                         <forecast-bar-component :list="item" height="40px" width="410px"
                                             :theme="swichTheme" />
+                                        <div class="powerValue powerValuesc">
+                                            <span style="background-color:#FF9B23"></span>
+                                            <span>{{ item[0].value }}</span>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -491,32 +491,32 @@
                                 [{
                                     name: "日发电量",
                                     id: "day",
-                                    value: it.rfdl || 200,
+                                    value: it.rfdl,
                                     color: '#FF9B23',
-                                    total: 1000,
+                                    total: 1500,
                                 }, ],
                                 [{
                                     name: "日预测电量",
                                     id: "day2",
-                                    value: it.rycdl || 200,
+                                    value: it.rycdl,
                                     color: '#FF9B23',
-                                    total: 1000,
+                                    total: 1500,
                                 }, ],
                             ]
                             that.monthFa = [
                                 [{
                                     name: "月发电量",
                                     id: "day",
-                                    value: it.yfdl || 200,
+                                    value: it.yfdl,
                                     color: '#1C99FF',
-                                    total: 100000,
+                                    total: 45000,
                                 }, ],
                                 [{
                                     name: "月预测电量",
                                     id: "day2",
-                                    value: it.yycdl || 200,
+                                    value: it.yycdl,
                                     color: '#1C99FF',
-                                    total: 100000,
+                                    total: 45000,
                                 }, ],
                             ]
                             that.powerDataHome = [{
@@ -948,13 +948,13 @@
 
                                 .powerItem {
                                     display: flex;
-                                    position: relative;
+                                    // position: relative;
 
                                     .powerValue {
                                         font-size: 12px;
                                         font-family: Bicubik;
-                                        position: absolute;
-                                        right: -12px;
+                                        position: relative;
+                                        left: 3px;
                                         top: 17px;
 
                                         span:nth-child(1) {
@@ -973,6 +973,10 @@
                                             top: 2px;
                                         }
                                     }
+
+                                    .powerValuesc {
+                                        left: -35px;
+                                    }
                                 }
                             }
                         }

+ 155 - 0
src/views/powerPrediction/homePageNoMap.vue

@@ -1655,10 +1655,72 @@
                             }
                         }
                     }
+
+
+                }
+            }
+
+            .mainLeft {
+                .styleData {
+                    span {
+                        width: 90px;
+                    }
+
+                    span:nth-child(1) {
+                        border-right: none;
+                        border-radius: 4px 0px 0px 4px;
+                    }
+
+                    span:nth-child(2) {
+                        border-radius: 0px 4px 4px 0px;
+                    }
+
+                    .changeStyle {
+                        color: #fff;
+                        background: linear-gradient(90deg, rgba(28, 108, 255, 0.7), rgba(28, 108, 255, 0));
+                        border: 1px solid #404858;
+                    }
+
+                    .defaultSty {
+                        color: #A1A7B9;
+                        background: linear-gradient(90deg, rgba(64, 72, 88, 0.7), rgba(64, 72, 88, 0));
+                        border: 1px solid #404858;
+                    }
                 }
             }
 
             .mainRight {
+                .styleData {
+                    span {
+                        width: 45px;
+                    }
+
+                    span:nth-child(1) {
+                        border-right: none;
+                        border-radius: 4px 0px 0px 4px;
+                    }
+
+                    span:nth-child(2) {
+                        border-right: none;
+                    }
+
+                    span:nth-child(3) {
+                        border-radius: 0px 4px 4px 0px;
+                    }
+
+                    .changeStyle {
+                        color: #fff;
+                        background: linear-gradient(90deg, rgba(28, 108, 255, 0.7), rgba(28, 108, 255, 0));
+                        border: 1px solid #404858;
+                    }
+
+                    .defaultSty {
+                        color: #A1A7B9;
+                        background: linear-gradient(90deg, rgba(64, 72, 88, 0.7), rgba(64, 72, 88, 0));
+                        border: 1px solid #404858;
+                    }
+                }
+
                 .messageData {
                     background: #161f1e;
 
@@ -1723,10 +1785,103 @@
             .mainRight {
                 .lineStyle {
                     background: #fff;
+
+                    .chart-name {
+                        display: flex;
+                        align-items: center;
+                        position: absolute;
+                        top: 0;
+                        height: 39px;
+                        width: 96%;
+                        border-bottom: 1px solid #E1E3EA;
+
+                        .point {
+                            width: 6px;
+                            height: 1px;
+                            background-color: #E1E3EA;
+                            position: absolute;
+
+                            &.point-left {
+                                left: 0;
+                            }
+
+                            &.point-right {
+                                right: 0;
+                            }
+
+                            &.top {
+                                top: -1px;
+                            }
+
+                            &.bottom {
+                                bottom: -1px;
+                            }
+                        }
+                    }
+                }
+            }
+
+            .mainLeft {
+                .styleData {
+                    span {
+                        width: 90px;
+                    }
+
+                    span:nth-child(1) {
+                        border-right: none;
+                        border-radius: 4px 0px 0px 4px;
+                    }
+
+                    span:nth-child(2) {
+                        border-radius: 0px 4px 4px 0px;
+                    }
+
+                    .changeStyle {
+                        color: #fff;
+                        background: #4F70EC;
+                        border: 1px solid #4F70EC;
+                    }
+
+                    .defaultSty {
+                        color: #A1A7B9;
+                        background: #D0D3E1;
+                        border: 1px solid #D0D3E1;
+                    }
                 }
             }
 
             .mainRight {
+                .styleData {
+                    span {
+                        width: 45px;
+                    }
+
+                    span:nth-child(1) {
+                        border-right: none;
+                        border-radius: 4px 0px 0px 4px;
+                    }
+
+                    span:nth-child(2) {
+                        border-right: none;
+                    }
+
+                    span:nth-child(3) {
+                        border-radius: 0px 4px 4px 0px;
+                    }
+
+                    .changeStyle {
+                        color: #fff;
+                        background: #4F70EC;
+                        border: 1px solid #4F70EC;
+                    }
+
+                    .defaultSty {
+                        color: #A1A7B9;
+                        background: #D0D3E1;
+                        border: 1px solid #D0D3E1;
+                    }
+                }
+
                 .messageData {
                     background: #fff;
 

+ 14 - 24
src/viewsCss/homePageNoMapLess.less

@@ -86,29 +86,29 @@
 
                 .styleData {
                     position: absolute;
-                    top: 10px;
-                    left: 135px;
+                    top: 5px;
+                    right: 40px;
                     z-index: 111;
 
                     span {
                         color: #fff;
                         font-weight: 600;
                         font-size: 14px;
-                        margin-right: 5px;
+                        line-height: 28px;
                         border: 1px solid #fff;
-                        padding: 1px 10px;
                         display: inline-block;
                         cursor: pointer;
+                        width: 90px;
+                        text-align: center;
                     }
 
-                    .changeStyle {
-                        color: #f2a91f;
-                        border: 1px solid #f2a91f;
+                    span:nth-child(1) {
+                        border-right: none;
+                        border-radius: 4px 0px 0px 4px;
                     }
 
-                    .defaultSty {
-                        color: #c7c7c7;
-                        border: 1px solid #c7c7c7;
+                    span:nth-child(2) {
+                        border-radius: 0px 4px 4px 0px;
                     }
                 }
             }
@@ -127,29 +127,19 @@
 
                 .styleData {
                     position: absolute;
-                    top: 10px;
-                    right: 20px;
+                    top: 5px;
+                    right: 40px;
                     z-index: 111;
 
                     span {
                         color: #fff;
                         font-weight: 600;
                         font-size: 14px;
-                        margin-right: 5px;
+                        line-height: 28px;
                         border: 1px solid #fff;
-                        padding: 1px 10px;
                         display: inline-block;
                         cursor: pointer;
-                    }
-
-                    .changeStyle {
-                        color: #f2a91f;
-                        border: 1px solid #f2a91f;
-                    }
-
-                    .defaultSty {
-                        color: #c7c7c7;
-                        border: 1px solid #c7c7c7;
+                        text-align: center;
                     }
                 }
             }