修改功能问题，样式问题

.env.production

@@ -15,31 +15,31 @@ VUE_APP_DIALOG_NUM = 8
 #趋势对比鼠标点击
 VUE_APP_DIALOG_POINT = contextmenu
 # 综合报警
-VUE_APP_ALARM=http://10.220.1.5:6015
-# VUE_APP_ALARM=http://10.112.33.5:6015
+# VUE_APP_ALARM=http://10.220.1.5:6015
+VUE_APP_ALARM=http://10.112.33.5:6015
 # VUE_APP_ALARM=http://123.60.219.66:48080
 # 登录
 # VUE_APP_VUE_LOGIN_URL=http://10.220.1.8:48080
 # VUE_APP_VUE_LOGIN_URL=http://123.60.219.66:48080
 
 
-VUE_APP_API=http://10.220.1.5:6060
-# VUE_APP_API=http://10.112.33.5:6060
+# VUE_APP_API=http://10.220.1.5:6060
+VUE_APP_API=http://10.112.33.5:6060
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS='ws://10.81.3.155:9002'
 # VUE_APP_ADAPTERURL=http://10.81.3.155:8011
 
-VUE_APP_URL=https://10.220.1.5:5300
-# VUE_APP_URL=https://10.112.33.5:5300
+# VUE_APP_URL=https://10.220.1.5:5300
+VUE_APP_URL=https://10.112.33.5:5300
 
-VUE_APP_REPORT=http://10.220.1.5:8001
-# VUE_APP_REPORT=http://10.112.33.5:8001
+# VUE_APP_REPORT=http://10.220.1.5:8001
+VUE_APP_REPORT=http://10.112.33.5:8001
 
-VUE_APP_WS_URL=ws://10.220.1.5:6014
-# VUE_APP_WS_URL=ws://10.112.33.5:6014
+# VUE_APP_WS_URL=ws://10.220.1.5:6014
+VUE_APP_WS_URL=ws://10.112.33.5:6014
 
-VUE_APP_GENERAT_URL=http://10.220.1.5:6060
-# VUE_APP_GENERAT_URL=http://10.112.33.5:6060
+# VUE_APP_GENERAT_URL=http://10.220.1.5:6060
+VUE_APP_GENERAT_URL=http://10.112.33.5:6060
 
 VUE_APP_HEADER_URL=http://10.112.32.31:10200
 

src/App.vue

@@ -716,7 +716,7 @@ body {
     .header-menu-body {
         height: 38px;
         flex-grow: 1;
-        background: #000;
+        background: #08172c;
     }
   }
   .menu-body {

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -234,8 +234,8 @@
         </div> -->
       </div>
       <!-- 风电场/光电站列表 height="calc(100% - 72px)"-->
-      <el-scrollbar height="100%">
-        <div class="matrix-box"  :style="isFullScreen ? 'height: 97vh' : 'height: 94vh'">
+      <el-scrollbar height="95%">
+        <div class="matrix-box"  :style="isFullScreen ? 'height: 90vh' : 'height: 94vh'">
           <!-- 单个风场/电站 -->
           <div
             class="matrixs"

src/views/IntegratedAlarm/earlyWarning/index.vue

@@ -178,7 +178,7 @@
           layout="total, sizes, prev, pager, next"
           :current-page="query.page"
           :page-size="query.limit"
-          :page-sizes="[21, 100, 500, 1000]"
+          :page-sizes="[20, 100, 500, 1000]"
           :total="query.pageTotal"
           @size-change="
             (value) => {

src/views/IntegratedAlarm/reliability/partsTemperatureAnalyse/index.vue

@@ -148,7 +148,7 @@
           layout="total, sizes, prev, pager, next"
           :current-page="query.page"
           :page-size="query.limit"
-          :page-sizes="[21, 100, 500, 1000]"
+          :page-sizes="[20, 100, 500, 1000]"
           :total="query.pageTotal"
           @size-change="
             (value) => {

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -293,7 +293,7 @@
           layout="total, sizes, prev, pager, next"
           :current-page="query.page"
           :page-size="query.limit"
-          :page-sizes="[21, 100, 500, 1000]"
+          :page-sizes="[20, 100, 500, 1000]"
           :total="query.pageTotal"
           @size-change="
             (value) => {

src/views/IntegratedAlarm/safe/historyWarning/index.vue

@@ -299,7 +299,7 @@
           layout="total, sizes, prev, pager, next"
           :current-page="query.page"
           :page-size="query.limit"
-          :page-sizes="[21, 100, 500, 1000]"
+          :page-sizes="[20, 100, 500, 1000]"
           :total="query.pageTotal"
           @size-change="
             (value) => {

src/views/SandTable/SandTable.vue

@@ -1,6 +1,6 @@
 <template>
 <!-- padding: 0 10px; -->
-    <div style="width: 100%;height:99vh;">
+    <div style="width: 100%;height:100%;">
         <div class="sand-table" id="sandTable" v-if="$route.path === '/integratedAlarm'">
             <!-- <img :src="require('@assets/png/3dcloud.png')" class="i3dcloud" /> -->
             <StBack></StBack>
@@ -122,7 +122,7 @@
                     </template>
                 </PanelSandToolbar>
             </div>
-            <div class="footer" :style="isFullScreen ? 'bottom: 9vh' : 'bottom: 3vh'">
+            <div class="footer" :style="isFullScreen ? 'bottom: 1%' : 'bottom: 2%'">
                 <div class="hover72Power">
                     <div
                     id="problem1"
@@ -1577,8 +1577,7 @@
     .sand-table {
         width: 100%;
         // height: 91.667vh;
-        // height: 100%;
-        height: 102vh;
+        height: 100%;
         position: relative;
         background-image: url("../../assets/png/3dback_1.png");
         background-repeat: no-repeat;

src/views/economicsOperation/comprehensiveControl/maintenanceKPI/index.vue

@@ -133,7 +133,7 @@
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          :page-sizes="[21, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
@@ -259,7 +259,7 @@ export default {
         },
       ],
       page: {
-        pagesize: 21,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/comprehensiveControl/runningKPI/index.vue

@@ -134,7 +134,7 @@
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          :page-sizes="[21, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
@@ -259,7 +259,7 @@ export default {
         },
       ],
       page: {
-        pagesize: 21,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/comprehensiveControl/stationControlKPI/index.vue

@@ -130,7 +130,7 @@
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          :page-sizes="[21, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
@@ -467,7 +467,7 @@ export default {
         },
       ],
       page: {
-        pagesize: 21,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/healthReport/index.vue

@@ -91,7 +91,7 @@
           layout="total, sizes, prev, pager, next"
           :current-page="query.page"
           :page-size="query.limit"
-          :page-sizes="[21, 100, 500, 1000]"
+          :page-sizes="[20, 100, 500, 1000]"
           :total="query.pageTotal"
           @size-change="
             (value) => {

src/views/economicsOperation/nxfHomePage/index.vue

@@ -70,7 +70,7 @@
                     </div>
                     <Row type="flex" class="rightplan" v-for="it in rightTableData" :key="it.name" style="height:50%">
                         <Col :span="24">
-                        <com-panel :title="it.name"  style="position: relative;height: 100%">
+                        <com-panel :title="it.name+tabData[activeIndex].text+'排名'"  style="position: relative;height: 100%">
                             <operationTable :data="it.data" height="100%"></operationTable>
                         </com-panel>
                         </Col>
@@ -127,11 +127,11 @@
                     text: "周",
                 }, ],
                 rightTableData: [{
-                        name: '风能利用率年排名',
+                        name: '风能利用率',
                         data: []
                     },
                     {
-                        name: '设备可利用率年排名',
+                        name: '设备可利用率',
                         data: []
                     }
                 ],
@@ -201,11 +201,11 @@
                 }).then(res =>{
                     if (res.data) {
                         that.rightTableData = [{
-                                name: '风能利用率年排名',
+                                name: '风能利用率',
                                 data: res.data.fnlyl
                             },
                             {
-                                name: '设备可利用率年排名',
+                                name: '设备可利用率',
                                 data: res.data.sbklyl
                             },
                             // {

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/index.vue

@@ -285,9 +285,9 @@ const funSubmit = (params) => {
           const sj = dayjs(ele).format("YYYY-MM-DD HH:mm:ss");
           t_xAxisData.push(sj);
           tableDataItem.sj = sj;
-          tableDataItem.fs = res[key]?.[0]?.windSpeed?.[index] || "-";
-          tableDataItem.sfyg = res[key]?.[0]?.actuatedPower?.[index] || "-";
-          tableDataItem.llgl = res[key]?.[0]?.theoreticalPower?.[index] || "-";
+          tableDataItem.fs = res[key]?.[0]?.windSpeed?.[index] || "0";
+          tableDataItem.sfyg = res[key]?.[0]?.actuatedPower?.[index] || "0";
+          tableDataItem.llgl = res[key]?.[0]?.theoreticalPower?.[index] || "0";
           t_tableData.push(tableDataItem);
         });
         t_seriesData.push(

src/views/economicsOperation/thematicAnalysis/generation/index.vue

@@ -80,6 +80,7 @@
             align="center"
             prop=""
             label="场站"
+            width="100"
             show-overflow-tooltip
             sortable
           >
@@ -90,9 +91,9 @@
           <el-table-column
             align="center"
             :label="val"
-            v-for="(val, index) in tableHead"
+            v-for="(val, index) in selectValue !== '利用小时' ? tableHead : tableHead1"
             :key="index"
-            width="139"
+            width="150"
             sortable
           >
             <template v-slot="scope">
@@ -124,7 +125,7 @@
                         <div>
                           <span style="width: 80%">{{
                             scope.row.targetList &&
-                            scope.row.targetList[index]?.current.toFixed(1)
+                            scope.row.targetList[index]?.current
                           }}</span>
                         </div>
                       </el-tooltip>
@@ -164,7 +165,7 @@
                         <div>
                           <span style="width: 80%">{{
                             scope.row.targetList &&
-                            scope.row.targetList[index]?.sameperiod.toFixed(1)
+                            scope.row.targetList[index]?.sameperiod
                           }}</span>
                         </div>
                       </el-tooltip>
@@ -189,7 +190,7 @@
           :xdate="false"
           :showLegend="true"
           :units="['', '']"
-          units2="(万kWh)"
+          :units2="selectValue !== '利用小时' ? '(万kWh)' : '(h)'"
         ></BarCharts>
       </div>
     </div>
@@ -256,6 +257,20 @@ export default {
         "十一月(万kWh)",
         "十二月(万kWh)",
       ],
+      tableHead1: [
+        "一月(h)",
+        "二月(h)",
+        "三月(h)",
+        "四月(h)",
+        "五月(h)",
+        "六月(h)",
+        "七月(h)",
+        "八月(h)",
+        "九月(h)",
+        "十月(h)",
+        "十一月(h)",
+        "十二月(h)",
+      ],
       company: "",
       companyOptions: [],
       searchYear: this.getmonthValue(),

src/views/economicsOperation/windAnalyse/cutInAndOutAnalysis/index.vue

@@ -127,7 +127,7 @@
           :current-page="page.currentPage"
           :page-size="page.pagesize"
           @size-change="handleSizeChange"
-          :page-sizes="[21, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
@@ -219,7 +219,7 @@ export default {
         { title: "年大风切出合格率", code: "yearOutputBigRatio" },
       ],
       page: {
-        pagesize: 21,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/windAnalyse/monthlyAnalysis/index.vue

@@ -119,7 +119,7 @@
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          :page-sizes="[21, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
@@ -179,7 +179,7 @@ export default {
         { title: "实际发电量(万kWh)", code: "fdl" },
         { title: "理论发电量(万kWh)", code: "llfdl" },
         { title: "设备利用小时数(小时)", code: "lyxs" },
-        { title: "等效可用系数(%)", code: "dxklyxs" },
+        // { title: "等效可用系数(%)", code: "dxklyxs" },
         { title: "平均风速(m/s)", code: "fs" },
         { title: "小风切入风速(m/s)", code: "xfqr" },
         { title: "有效风时数(小时)", code: "yxfss" },
@@ -209,7 +209,7 @@ export default {
         { title: "机组功率一致性(%)", code: "glyzxxs" },
       ],
       page: {
-        pagesize: 21,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/windAnalyse/performanceAssess/index.vue

@@ -190,7 +190,7 @@
             :current-page="page.currentPage"
             :page-size="page.pagesize"
             @size-change="handleSizeChange"
-            :page-sizes="[21, 50, 100, 500]"
+            :page-sizes="[20, 50, 100, 500]"
             layout="total, sizes, prev, pager, next, jumper"
             :total="page.total"
           >
@@ -227,7 +227,7 @@
         </div>
       </template>
       <div class="dialog-body">
-        <img class="dialog-img" src="@assets/imgs/dialog.png" />
+        <!-- <img class="dialog-img" src="@assets/imgs/dialog.png" /> -->
         <day-detail-info
           :chooseList="chooseList"
           :tabEvent="tabEvent"
@@ -308,7 +308,7 @@ export default {
       ],
       page: {
         currentPage: 1,
-        pagesize: 21,
+        pagesize: 20,
         total: 0,
       },
       historyTimer: "",

src/views/economicsOperation/windAnalyse/singleWindAnasyle/historyDetail.vue

@@ -73,7 +73,7 @@
         :current-page="page.currentPage"
         :page-size="page.pagesize"
         @size-change="handleSizeChange"
-        :page-sizes="[21, 50, 100, 500]"
+        :page-sizes="[20, 50, 100, 500]"
         layout="total, sizes, prev, pager, next, jumper"
         :total="page.total"
       >
@@ -112,7 +112,7 @@ export default {
       hisWindOptions: [],
       showBtn: true,
       page: {
-        pagesize: 21,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/windAnalyse/singleWindAnasyle/index.vue

@@ -139,7 +139,7 @@
           :current-page="page.currentPage"
           :page-size="page.pagesize"
           @size-change="handleSizeChange"
-          :page-sizes="[23, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
@@ -251,7 +251,7 @@ export default {
         // { title: "操作" },
       ],
       page: {
-        pagesize: 23,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },