Merge branch 'master' of http://124.70.43.205:3000/sunzehao/windLifecontrolPro

components.d.ts

@@ -166,7 +166,7 @@ declare module 'vue' {
     StrightLineChart: typeof import('./src/components/chart/line/stright-line-chart.vue')['default']
     SubmitBtn: typeof import('./src/components/generatingCapacityComponent/SubmitBtn.vue')['default']
     SvgDraw: typeof import('./src/components/coms/icon/svg-draw.vue')['default']
-    SvgIcon: typeof import('./src/components/powerPredictionComponent/svgIcon/index.vue')['default']
+    SvgIcon: typeof import('./src/components/coms/icon/svg-icon.vue')['default']
     SvgPageShow: typeof import('./src/components/powerPredictionComponent/powerControlSvg/svgPageShow.vue')['default']
     Tab: typeof import('./src/components/coms/tabs/tab.vue')['default']
     Table: typeof import('./src/components/generatingCapacityComponent/table.vue')['default']

src/views/generatingCapacity/yhjyReport/index.vue

@@ -112,10 +112,11 @@
                     根据以上标准，对每台风机的运行数据及隐患问题信息进行分析，结果如下：
                 </p>
                 <div class="warn-table">
-                    <el-table class="toolSty" :data="fjsxList1" border style="width: 100%; margin: 10px 0"
+                    <el-table class="toolSty" :data="fjsxList1" border style="width: 100%; margin: 10px 0;"
                         max-height="500" stripe :header-cell-style="{
                 padding: '4px',
-                fontSize: '14px',
+                fontSize: '12px',
+                fontWeight: bold,
                 border: '0.5px solid rgba(0,0,0,.5) !important',
             }" :cell-style="{
                 height: '40px',
@@ -125,13 +126,14 @@
                 'border-bottom': '1px solid rgba(0,0,0,.5)',
                 'border-right': '1px solid  rgba(0,0,0,.5)',
                 }">
-                        <el-table-column prop="turbineId" align="center" label="风机编号" width="150" />
-                        <el-table-column prop="ratedPowerKw" align="center" label="额定功率(KW)" width="90" />
-                        <el-table-column prop="actualRatedPowerKw" align="center" label="实际额定功率(KW)" width="90" />
+                        <el-table-column prop="turbineId" align="center" label="风机编号" width="60" />
+                        <el-table-column prop="speed" align="center" label="平均风速(m/s)" width="60" />
+                        <el-table-column prop="ratedPowerKw" align="center" label="额定功率(KW)" width="60" />
+                        <el-table-column prop="actualRatedPowerKw" align="center" label="实际额定功率(KW)" width="60" />
                         <el-table-column v-for="(item, index) in orderTableColumn" :key="index" :label="item.name"
                             :width="item.width" align="center">
                             <el-table-column v-for="(res, index) in item.children" :key="index" :label="res.name"
-                                align="center">
+                                align="center" :width="res.width ? res.width : 80">
                                 <template #default="scope">
                                     <span>
                                         {{ scope.row[res.code] }}
@@ -139,14 +141,15 @@
                                 </template>
                             </el-table-column>
                         </el-table-column>
-                        <el-table-column align="center" prop="performanceIssues" label="性能问题" width="90"
+                        <el-table-column align="center" prop="performanceIssues" label="性能问题" width="60"
                             fixed="right" />
                     </el-table>
                     <!-- 温度类隐患 -->
                     <el-table class="toolSty" :data="fjsxList2" border style="width: 100%; margin: 10px 0"
                         max-height="500" stripe :header-cell-style="{
                 padding: '4px',
-                fontSize: '14px',
+                fontSize: '12px',
+                fontWeight: bold,
                 border: '0.5px solid rgba(0,0,0,.5) !important',
             }" :cell-style="{
                 height: '40px',
@@ -156,12 +159,12 @@
                 'border-bottom': '1px solid rgba(0,0,0,.5)',
                 'border-right': '1px solid rgba(0,0,0,.5)',
                 }">
-                        <el-table-column prop="turbineId" align="center" label="风机编号" width="150" fixed />
-                        <el-table-column prop="downtimeCount" align="center" label="故障停机次数" width="80" />
+                        <el-table-column prop="turbineId" align="center" label="风机编号" width="60" fixed />
+                        <el-table-column prop="downtimeCount" align="center" label="故障停机次数" width="60" />
                         <el-table-column v-for="(item, index) in orderTableColumn2" :key="index" :label="item.name"
                             :width="item.width" align="center">
                             <el-table-column v-for="(res, index) in item.children" :key="index" :label="res.name"
-                                align="center">
+                                align="center" width="68">
                                 <template #default="scope">
                                     <span>
                                         {{ scope.row[res.code] ? scope.row[res.code] : '-' }}
@@ -169,7 +172,7 @@
                                 </template>
                             </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="reliabilityIssue" align="center" label="可靠性问题" width="100"
+                        <el-table-column prop="reliabilityIssue" align="center" label="可靠性问题" width="60"
                             fixed="right" />
                     </el-table>
                 </div>
@@ -376,7 +379,7 @@
             funGetStation() {
                 let that = this;
                 // this.renderReportPage({
-                //     data: jsonData.data
+                //     data: jsonData.reldata
                 // });
                 that.stationList = []
                 that.reportStation = ""
@@ -544,7 +547,7 @@
                         })
                         .catch(() => {
                             this.renderReportPage({
-                                data: jsonData.data
+                                data: jsonData.reldata
                             });
                         });
                 }
@@ -645,7 +648,10 @@
 
             #pdfDomop {
                 margin: 20px;
+
             }
+
+
         }
 
         &.themeLight {

src/views/powerPrediction/homePageNoMap.vue

@@ -532,6 +532,15 @@
                     number: 0,
                 },
                 {
+                    img: fiveimg,
+                    name: "限电",
+                    nameEn: "xdsum",
+                    borderSty: "#C530C8",
+                    backSty: "#7A277F",
+                    numBack: "#212223",
+                    number: 0,
+                },
+                {
                     img: sevenimg,
                     name: "故障",
                     nameEn: "jxsum",
@@ -550,15 +559,6 @@
                     number: 0,
                 },
                 {
-                    img: fiveimg,
-                    name: "限电",
-                    nameEn: "xdsum",
-                    borderSty: "#C530C8",
-                    backSty: "#7A277F",
-                    numBack: "#212223",
-                    number: 0,
-                },
-                {
                     img: siximg,
                     name: "受累",
                     nameEn: "tjsum",
@@ -596,6 +596,15 @@
                     number: 0,
                 },
                 {
+                    img: fiveimg1,
+                    name: "限电",
+                    nameEn: "xdsum",
+                    borderSty: "#E757EA",
+                    backSty: "#C530C8",
+                    numBack: "#901193",
+                    number: 0,
+                },
+                {
                     img: sevenimg1,
                     name: "故障",
                     nameEn: "jxsum",
@@ -614,15 +623,6 @@
                     number: 0,
                 },
                 {
-                    img: fiveimg1,
-                    name: "限电",
-                    nameEn: "xdsum",
-                    borderSty: "#E757EA",
-                    backSty: "#C530C8",
-                    numBack: "#901193",
-                    number: 0,
-                },
-                {
                     img: fourimg1,
                     name: "受累",
                     nameEn: "tjsum",

src/views/powerPrediction/panoramicPower.vue

@@ -136,6 +136,15 @@
                     number: 0,
                 },
                 {
+                    img: fiveimg,
+                    name: "限电",
+                    nameEn: "xdsum",
+                    borderSty: "#C530C8",
+                    backSty: "#7A277F",
+                    numBack: "#212223",
+                    number: 0,
+                },
+                {
                     img: sevenimg,
                     name: "故障",
                     nameEn: "jxsum",
@@ -154,15 +163,6 @@
                     number: 0,
                 },
                 {
-                    img: fiveimg,
-                    name: "限电",
-                    nameEn: "xdsum",
-                    borderSty: "#C530C8",
-                    backSty: "#7A277F",
-                    numBack: "#212223",
-                    number: 0,
-                },
-                {
                     img: siximg,
                     name: "受累",
                     nameEn: "tjsum",
@@ -200,6 +200,15 @@
                     number: 0,
                 },
                 {
+                    img: fiveimg1,
+                    name: "限电",
+                    nameEn: "xdsum",
+                    borderSty: "#E757EA",
+                    backSty: "#C530C8",
+                    numBack: "#901193",
+                    number: 0,
+                },
+                {
                     img: sevenimg1,
                     name: "故障",
                     nameEn: "jxsum",
@@ -218,15 +227,6 @@
                     number: 0,
                 },
                 {
-                    img: fiveimg1,
-                    name: "限电",
-                    nameEn: "xdsum",
-                    borderSty: "#E757EA",
-                    backSty: "#C530C8",
-                    numBack: "#901193",
-                    number: 0,
-                },
-                {
                     img: fourimg1,
                     name: "受累",
                     nameEn: "tjsum",

src/views/powerPrediction/powerPredictionPage.vue

@@ -217,6 +217,15 @@
                     number: 0,
                 },
                 {
+                    img: fiveimg,
+                    name: "限电",
+                    nameEn: "xdsum",
+                    borderSty: "#C530C8",
+                    backSty: "#7A277F",
+                    numBack: "#212223",
+                    number: 0,
+                },
+                {
                     img: sevenimg,
                     name: "故障",
                     nameEn: "jxsum",
@@ -235,15 +244,6 @@
                     number: 0,
                 },
                 {
-                    img: fiveimg,
-                    name: "限电",
-                    nameEn: "xdsum",
-                    borderSty: "#C530C8",
-                    backSty: "#7A277F",
-                    numBack: "#212223",
-                    number: 0,
-                },
-                {
                     img: siximg,
                     name: "受累",
                     nameEn: "tjsum",
@@ -281,6 +281,15 @@
                     number: 0,
                 },
                 {
+                    img: fiveimg1,
+                    name: "限电",
+                    nameEn: "xdsum",
+                    borderSty: "#E757EA",
+                    backSty: "#C530C8",
+                    numBack: "#901193",
+                    number: 0,
+                },
+                {
                     img: sevenimg1,
                     name: "故障",
                     nameEn: "jxsum",
@@ -299,15 +308,6 @@
                     number: 0,
                 },
                 {
-                    img: fiveimg1,
-                    name: "限电",
-                    nameEn: "xdsum",
-                    borderSty: "#E757EA",
-                    backSty: "#C530C8",
-                    numBack: "#901193",
-                    number: 0,
-                },
-                {
                     img: fourimg1,
                     name: "受累",
                     nameEn: "tjsum",