问题修改

.env.production

@@ -45,6 +45,6 @@ VUE_APP_WS_URL=ws://10.112.33.5:6014
 VUE_APP_GENERAT_URL=https://10.112.33.5:6060
 
 VUE_APP_HEADER_URL=http://10.112.32.31:10200
-VUE_APP_HEADER2_URL=http://10.112.32.31:10201
-VUE_APP_HEADER3_URL=http://10.112.32.31:10202
+VUE_APP_HEADER2_URL=https://10.112.32.31:10201
+VUE_APP_HEADER3_URL=https://10.112.32.31:10202
 

src/components/coms/table/table.vue

@@ -1,5 +1,5 @@
 <template>
-  <table class="com-table">
+  <table class="com-table" :style="ispage ? {'max-height':maxHeight} : ''">
     <thead>
       <tr class="back">
         <th
@@ -14,7 +14,7 @@
       </tr>
     </thead>
     <el-scrollbar>
-      <tbody :style="{ height: height }">
+      <tbody :style="ispage ? {'max-height':maxHeight,'overflow':'auto','height': height } : {height:height}" style="">
         <tr class="dnb" v-for="(row, index) of tableData" :key="index">
           <td
             style="color: rgb(211, 214, 218)"
@@ -116,6 +116,14 @@ export default {
       type: String,
       default: "",
     },
+    maxHeight: {
+      type: String,
+      default: "",
+    },
+    ispage: {
+      type: Boolean,
+      default: false
+    },
     // 新增 支持 pagging 组件
     elPaggingProps: {
       type: Object,
@@ -282,7 +290,7 @@ export default {
 //     border-bottom: 1px solid rgba(0, 0, 0, 0.8) ;
 // }
 .dnb {
-  height: 45px;
+  height: 38px;
 }
 // .back{
 // background: rgba(83,89,104,0.4);

src/views/economicsOperation/benchmarkingManagement/intervalBenchmarking/index.vue

@@ -347,8 +347,9 @@ export default {
   },
   created() {
     this.dateTime = [
+      dayjs().date() !== 1 ?
+      `${dayjs().format("YYYY-MM")}-01` : 
       dayjs().startOf("month").subtract(1, "day").format("YYYY-MM-DD"),
-      //   `${dayjs().format("YYYY-MM")}-01`,
       dayjs().format("YYYY-MM-DD"),
     ];
     this.initialization();

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -321,8 +321,9 @@ export default {
   created() {
     let routeParams = this.$route.params;
     this.dateTime = [
+      dayjs().date() !== 1 ?
+      `${dayjs().format("YYYY-MM")}-01` : 
       dayjs().startOf("month").subtract(1, "day").format("YYYY-MM-DD"),
-      //   dayjs().format("YYYY-MM")}-01`,
       dayjs().format("YYYY-MM-DD"),
     ];
     if (Object.keys(routeParams).length) {

src/views/economicsOperation/benchmarkingManagement/projectBenchmarking/index.vue

@@ -368,8 +368,9 @@ export default {
   },
   created() {
     this.dateTime = [
+      dayjs().date() !== 1 ?
+      `${dayjs().format("YYYY-MM")}-01` : 
       dayjs().startOf("month").subtract(1, "day").format("YYYY-MM-DD"),
-      //   `${dayjs().format("YYYY-MM")}-01`,
       dayjs().format("YYYY-MM-DD"),
     ];
     this.initialization();

src/views/economicsOperation/benchmarkingManagement/wiringBenchmarking/index.vue

@@ -404,8 +404,9 @@ export default {
   },
   created() {
     this.dateTime = [
+      dayjs().date() !== 1 ?
+      `${dayjs().format("YYYY-MM")}-01` : 
       dayjs().startOf("month").subtract(1, "day").format("YYYY-MM-DD"),
-      //   `${dayjs().format("YYYY-MM")}-01`,
       dayjs().format("YYYY-MM-DD"),
     ];
     this.initialization();

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

@@ -85,7 +85,7 @@ const option = computed({
                     name: o,
                   };
                 }) || [],
-              center: ["60%", "50%"],
+              center: ["65%", "50%"],
               radius: "70%",
               splitLine: {
                 show: false,
@@ -98,7 +98,7 @@ const option = computed({
         : {},
       polar: {
         radius: "70%",
-        center: ["60%", "50%"],
+        center: ["65%", "50%"],
       },
       tooltip: {
         formatter: (params) => {

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

@@ -148,7 +148,7 @@
       </panel>
       <div class="table-info">
         <panel class="table-panel" :title="'当日报警记录'" :showLine="false">
-          <el-table
+          <!-- <el-table
             :data="warnTableData.data"
             height="calc(100% - 33px)"
             stripe
@@ -161,7 +161,8 @@
               :label="item.name"
               :prop="item.field"
             />
-          </el-table>
+          </el-table> -->
+          <Table :data="warnTableData" :canScroll="true" :height="'90%'"  :maxHeight="'150px'" :ispage="true" />
           <el-pagination
             v-if="warnPage.total > 0"
             hide-on-single-page
@@ -449,7 +450,7 @@
             :title="'当日报警记录'"
             :showLine="false"
           >
-            <el-table
+            <!-- <el-table
               :data="warnTableData.data"
               height="calc(100% - 33px)"
               stripe
@@ -462,7 +463,8 @@
                 :label="item.name"
                 :prop="item.field"
               />
-            </el-table>
+            </el-table> -->
+            <Table :data="warnTableData" :canScroll="true" :height="'23vh'" :maxHeight="'190px'" :ispage="true" />
             <el-pagination
               v-if="warnPage.total > 0"
               hide-on-single-page
@@ -513,7 +515,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ rzdfsStr }}</span>
+                <span class="titSty">{{ rzdfsStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -524,6 +526,8 @@
               <rander-new-chart
                 width="100%"
                 height="100%"
+                title="日最大风速"
+                subtext="(m/s)"
                 :lenged="rzdfsLen"
                 :xAxis="rzdfsxaisx"
                 :series="rzdfsData"
@@ -541,7 +545,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ yzdfsStr }}</span>
+                <span class="titSty">{{ yzdfsStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -552,6 +556,8 @@
               <rander-new-chart
                 width="100%"
                 height="100%"
+                title="月最大风速"
+                subtext="(m/s)"
                 :lenged="yzdfsLen"
                 :xAxis="yzdfsxaisx"
                 :series="yzdfsData"
@@ -569,7 +575,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ nzdfsStr }}</span>
+                <span class="titSty">{{ nzdfsStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -580,6 +586,8 @@
               <rander-new-chart
                 width="100%"
                 height="100%"
+                title="年最大风速"
+                subtext="(m/s)"
                 :lenged="nzdfsLen"
                 :xAxis="nzdfsxaisx"
                 :series="nzdfsData"
@@ -599,7 +607,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ rfxplStr }}</span>
+                <span class="titSty">{{ rfxplStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -610,6 +618,8 @@
               <rander-new-chart
                 width="100%"
                 height="100%"
+                title="日风向频率"
+                subtext="(%)"
                 :lenged="rfxplLen"
                 :xAxis="rfxplxaisx"
                 :series="rfxplData"
@@ -627,7 +637,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ yfxplStr }}</span>
+                <span class="titSty">{{ yfxplStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -638,6 +648,8 @@
               <rander-new-chart
                 width="100%"
                 height="100%"
+                title="月风向频率"
+                subtext="(%)"
                 :lenged="yfxplLen"
                 :xAxis="yfxplxaisx"
                 :series="yfxplData"
@@ -655,7 +667,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ nfxplStr }}</span>
+                <span class="titSty">{{ nfxplStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -666,6 +678,8 @@
               <rander-new-chart
                 width="100%"
                 height="100%"
+                title="年风向频率"
+                subtext="(%)"
                 :lenged="nfxplLen"
                 :xAxis="nfxplxaisx"
                 :series="nfxplData"
@@ -689,7 +703,7 @@
             <div class="wind-info">
               <div class="legend mg-r-16">
                 <span class="dot"></span>
-                <span class="titSty">{{ rzdfsStr }}</span>
+                <span class="titSty">{{ rzdfsStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -719,7 +733,7 @@
             <div class="wind-info">
               <div class="legend mg-r-16">
                 <span class="dot"></span>
-                <span class="titSty">{{ yzdfsStr }}</span>
+                <span class="titSty">{{ yzdfsStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -749,7 +763,7 @@
             <div class="wind-info">
               <div class="legend mg-r-16">
                 <span class="dot"></span>
-                <span class="titSty">{{ nzdfsStr }}</span>
+                <span class="titSty">{{ nzdfsStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -781,7 +795,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ rfxplStr }}</span>
+                <span class="titSty">{{ rfxplStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -811,7 +825,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ yfxplStr }}</span>
+                <span class="titSty">{{ yfxplStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"
@@ -841,7 +855,7 @@
             <div class="wind-info">
               <div class="legend">
                 <span class="dot"></span>
-                <span class="titSty">{{ nfxplStr }}</span>
+                <span class="titSty">{{ nfxplStr }}%</span>
               </div>
               <!-- <radar-chart
                 :width="'100%'"