Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx

src/components/other/healthReport/index.vue

@@ -461,7 +461,7 @@
           <el-form-item class="imp fw text-indent-2"
             ><b>部件劣化状态</b></el-form-item
           >
-          <el-form-item class="imp fw">总览：</el-form-item>
+          <el-form-item class="imp fw text-indent-2">总览：</el-form-item>
           <el-form-item class="text-indent-2"
             >统计周期内，发电机劣化频次为1次，齿轮箱劣化频次为0次；变桨劣化频次为0次；主轴劣化频次为1次。
           </el-form-item>
@@ -518,9 +518,9 @@
 
       <div class="textBox">
         <el-form>
-          <el-form-item class="imp fw text-indent-2"
-            >振动监测：时域分析分析法</el-form-item
-          >
+          <el-form-item class="imp fw text-indent-2">
+            <b>振动监测：时域分析法</b>
+          </el-form-item>
           <el-form-item class="text-indent-2"
             >有量纲参数：均值为100，方差为49，均方幅值67，峰值，260，平均幅值44，均方值120</el-form-item
           >
@@ -561,7 +561,7 @@
             >关键参数：主轴采用“主轴承温度”、“主轴承油脂启动时间间隔”
             、“主轴承油脂泵运行周期”为关键参数，该参数在统计周期内拟故障应进行检查
           </el-form-item>
-          <div class="logHead">发电机关键参数值</div>
+          <div class="logHead">主轴关键参数值</div>
           <el-table
             empty-text="暂无数据"
             :data="fdjgjcsz2"
@@ -581,21 +581,12 @@
             <el-table-column prop="df" label="得分"></el-table-column>
           </el-table>
         </el-form>
-      </div>
-      <div class="textBox">
-        <el-form>
-          <el-form-item class="imp fw text-indent-2">变桨</el-form-item>
-          <el-form-item class="text-indent-2"> 1）关键参数：变桨采用“变桨电机温度1”、“变桨电机温度2”
+          <el-form>
+          <el-form-item class="imp fw text-indent-2">变桨:</el-form-item>
+          <el-form-item class="text-indent-2">关键参数：变桨采用“变桨电机温度1”、“变桨电机温度2”
               、“变桨电机温度3”、“变频器温度1”、“变频器温度2”
               、“变频器温度3”为关键参数，该参数在统计周期内数据显示样本在安全运行区内，没有超过进入劣化区</el-form-item>
-          <!-- <div class="infoBox">
-            <p class="text-indent-2">
-              1）关键参数：变桨采用“变桨电机温度1”、“变桨电机温度2”
-              、“变桨电机温度3”、“变频器温度1”、“变频器温度2”
-              、“变频器温度3”为关键参数，该参数在统计周期内数据显示样本在安全运行区内，没有超过进入劣化区
-            </p>
-          </div> -->
-          <div class="logHead">发电机关键参数值</div>
+          <div class="logHead">变桨关键参数值</div>
           <el-table
             empty-text="暂无数据"
             :data="bjgjcs"
@@ -614,30 +605,6 @@
             <el-table-column prop="scz" label="实测值"></el-table-column>
             <el-table-column prop="df" label="得分"></el-table-column>
           </el-table>
-
-          <el-form-item class="imp fw text-indent-2">振动监测：</el-form-item>
-          <el-form-item class="text-indent-2">时域分析分析法</el-form-item>
-          <el-form-item class="text-indent-2"
-            >有量纲参数：均值为100，方差为49，均方幅值67，峰值，260，平均幅值44，均方值120</el-form-item
-          >
-          <el-form-item class="text-indent-2"
-            >无量纲参数：峭度指标20，峰值指标50，波形指标90，脉冲指标77</el-form-item
-          >
-          <el-form-item class="text-indent-2"
-            >结合两种指标都位发现明显劣化值</el-form-item
-          >
-          <el-form-item class="text-indent-2"
-            >频域分析法：根据振动检测提供频域分析结果，现有设备运行正常</el-form-item
-          >
-          <multiple-line-chart
-            :showLegend="true"
-            :hoverType="'axis'"
-            :list="wttragetreportcharts.bj"
-          />
-          <el-form-item class="imp fw text-indent-2">统计分析：</el-form-item>
-          <el-form-item class="text-indent-2"
-            >发电机类故障，平均故障周期在12个月，上次故障距此次评价时间为5个月，发电机处于平稳运行周期。</el-form-item
-          >
         </el-form>
       </div>
 
@@ -700,7 +667,7 @@
           <el-form-item class="imp fw text-indent-2"
             ><b>指标</b>：</el-form-item
           >
-          <el-form-item class="imp fw">1、风能利用率</el-form-item>
+          <el-form-item class="imp fw text-indent-2">1、风能利用率</el-form-item>
           <div class="infoBox" style="margin: 20px 0">
             <p>
               近三月，受宁夏电网限电，及自然天气情况等因素影响，{{

src/views/HealthControl/HealthTab3.vue

@@ -162,7 +162,8 @@ export default {
     };
   },
   created() {
-    this.starts = new Date(new Date().setMonth(new Date().getMonth()-2)).formatDate("yyyy-MM-dd");
+    // this.starts = new Date(new Date().setMonth(new Date().getMonth()-2)).formatDate("yyyy-MM-dd");
+    this.starts = '2021-06-01'
     this.requestStations();
   },
   methods: {

src/views/HealthControl/HealthTab4.vue

@@ -189,8 +189,8 @@ export default {
     };
   },
   created() {
-    this.starts = new Date().formatDate("yyyy-MM") + "-01";
-    // this.starts = "2021-01-01";
+    // this.starts = new Date().formatDate("yyyy-MM") + "-01";
+    this.starts = "2021-01-01";
     this.requestStations();
   },
   methods: {

src/views/NewPages/alarm-center-1.vue

@@ -564,7 +564,7 @@ export default {
 
     async searchData() {
       let enddate = new Date(
-        Date.parse(new Date(this.enddate)) + 24 * 3600 * 1000
+        Date.parse(new Date(this.enddate))
       ).formatDate("yyyy-MM-dd");
       const { data } = await this.API.requestData({
         showLoading: true,

src/views/alarmCenter/customStatistics.vue

@@ -96,28 +96,18 @@
       </div>
       <div class="dChart" height="100%" id="dChart">
         <div class="title">报警统计柱状图</div>
-        <div id="chartDom" style="style: 100%; height: 90%"></div>
-        <!-- <multiple-hover-bar-chart
-          height="90%"
-          widht="100%"
-          :list="dChartData"
-          :units="['次数']"
-          :showLegend="false"
-        /> -->
-        <!-- <Te /> -->
+        <div id="chartDom" style="width: 95%; height: 90%"></div>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
 // import ComTable from "@/components/coms/table/table.vue";
-import MultipleHoverBarChart from "./chart.vue";
 import * as echarts from "echarts";
 import util from "@/helper/util.js";
 import partten from "@/helper/partten.js";
 export default {
   name: "customStatistics",
-  components: { MultipleHoverBarChart },
   data() {
     let that = this;
     return {
@@ -250,14 +240,17 @@ export default {
       });
 
       option = {
+        legend: {},
         xAxis: {
+          name: '线路',
           type: "category",
           data: xAxisData,
           axisLine: {
-            show: true, //隐藏y轴
+            show: true, //隐藏X轴
           },
         },
         yAxis: {
+          name: '数量(次)',
           type: "value",
           splitLine: {
             show: false,
@@ -275,15 +268,14 @@ export default {
           {
             data: seriesData,
             type: "bar",
-            barMaxWidth: 80,
+            barMaxWidth: 50,
             barGap: 3,
           },
         ],
         grid: {
-          top: 32,
-          left: 8,
-          right: 8,
-          bottom: 0,
+          left: '4%',
+          right: '4%',
+          bottom: '3%',
           containLabel: true,
         },
         tooltip: {

src/views/layout/Menu.vue

@@ -871,21 +871,21 @@ export default {
                   icon: "svg-matrix",
                   path: "/others/fdczzdy",
                 },
-                {
-                  text: "风电项目自定义",
-                  icon: "svg-matrix",
-                  path: "/others/fdxmzdy",
-                },
+                // {
+                //   text: "风电项目自定义",
+                //   icon: "svg-matrix",
+                //   path: "/others/fdxmzdy",
+                // },
                 {
                   text: "光伏场站自定义",
                   icon: "svg-matrix",
                   path: "/others/gfczzdy",
                 },
-                {
-                  text: "光伏项目自定义",
-                  icon: "svg-matrix",
-                  path: "/others/gfxmzdy",
-                },
+                // {
+                //   text: "光伏项目自定义",
+                //   icon: "svg-matrix",
+                //   path: "/others/gfxmzdy",
+                // },
               ],
             },
             {

src/views/malfunctionDiagnose/index2.vue

@@ -47,15 +47,15 @@
           <div class="lable">时间：</div>
           <div class="search-input">
             <el-date-picker
-          style="margin-right: 10px"
-          v-model="dateArray"
-          type="datetimerange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        >
-        </el-date-picker>
+              style="margin-right: 10px"
+              v-model="dateArray"
+              type="datetimerange"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
           </div>
         </div>
       </div>
@@ -114,18 +114,13 @@
             size="small"
             :disabled="scope.row.confirm"
             @click="diagnoseConfirm(scope.row)"
+            v-if="false"
             >故障确认</el-button
           >
-          <el-button
-            type="text"
-            size="small"
-            @click="diagnoseReport(scope.row)"
+          <el-button type="text" size="small" @click="diagnoseReport(scope.row)"
             >诊断报告</el-button
           >
-          <el-button
-            type="text"
-            size="small"
-            @click="warningInfo(scope.row)"
+          <el-button type="text" size="small" @click="warningInfo(scope.row)"
             >报警详情</el-button
           >
         </template>
@@ -136,6 +131,7 @@
     <!-- 报警详情 -->
     <el-dialog
       v-model="showDialogWarning"
+      custom-class="modal"
       title="报警信息"
       width="50%"
       @closed="
@@ -168,14 +164,11 @@
       </el-table>
       <template #footer>
         <span class="dialog-footer">
-          <el-button
-            @click="
+          <button class="btn green" @click="
               () => {
                 showDialogWarning = false;
               }
-            "
-            >取消</el-button
-          >
+            ">取消</button>
         </span>
       </template>
     </el-dialog>

src/views/malfunctionDiagnose/reportDialog.vue

@@ -646,7 +646,7 @@ export default {
 <style lang="less">
 .modal {
   .el-dialog__body {
-    max-height: 600px;
+    max-height: 800px;
     overflow-y: scroll;
   }
 }

src/views/report/fdczzdy.vue

@@ -11,7 +11,8 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap&id=admin&pw=admin"
+      // url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap&id=admin&pw=admin"
+      url: "http://10.155.32.4:8000/bi47/editrpt.do?action=edit&resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$KUOIX7IQO6X6I4CUDE5J0JUCDDUVZPCP.rptolap&id=admin&pw=admin"
     }
   }
 }

src/views/report/fdxmzdy.vue

@@ -11,7 +11,8 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap&id=admin&pw=admin"
+      // url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap&id=admin&pw=admin"
+      url: "http://10.155.32.4:8000/bi47/editrpt.do?action=edit&resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$KUOIX7IQO6X6I4CUDE5J0JUCDDUVZPCP.rptolap&id=admin&pw=admin"
     }
   }
 }

src/views/totalPowerRank/index.vue

@@ -70,21 +70,21 @@
 				dialogShow: false,
 				tableData: {
 					column: [{
-							name: "风场",
+							name: "场站",
 							field: "windfarm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "风机",
+							name: "设备",
 							field: "windturbine",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "起始日期",
+							name: "开始日期",
 							field: "beginDate",
 							is_num: false,
 							is_light: false,
@@ -98,7 +98,7 @@
 							sortable: true,
 						},
 						{
-							name: "平均风速",
+							name: "平均风速/日照强度",
 							field: "speed",
 							is_num: false,
 							is_light: false,