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

.env.production

@@ -14,8 +14,8 @@ VUE_APP_TITLE = '页面标题'
 # 登录
 # VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
 # VUE_APP_LOGIN_URL = 'http://192.168.0.105:48080'
-# VUE_APP_LOGIN_URL = 'http://10.127.7.241:48080'
-VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
+VUE_APP_LOGIN_URL = 'http://10.127.7.241:48080'
+# VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
 # VUE_APP_LOGIN_URL = 'http://192.168.2.231:48080'
 # VUE_APP_LOGIN_URL = 'http://127.0.0.1:48080'
 
@@ -23,30 +23,30 @@ VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
 
 # 发电能力分析
 # VUE_APP_GENERAT_URL = 'http://123.60.219.66:9002'
-# VUE_APP_GENERAT_URL = 'http://10.127.7.241:9002'
-VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
+VUE_APP_GENERAT_URL = 'http://10.127.7.241:9002'
+# VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
 # VUE_APP_GENERAT_URL = 'http://192.168.2.231:9002'
 # VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
 
 # 智能报表
 # VUE_APP_REPORT_URL = 'http://123.60.219.66:9001'
 # VUE_APP_REPORT_URL = 'http://192.168.0.105:9001'
-# VUE_APP_REPORT_URL = 'http://10.127.7.241:9001'
-VUE_APP_REPORT_URL = 'http://172.16.12.101:9001'
+VUE_APP_REPORT_URL = 'http://10.127.7.241:9001'
+# VUE_APP_REPORT_URL = 'http://172.16.12.101:9001'
 # VUE_APP_REPORT_URL = 'http://192.168.2.231:9001'
 # VUE_APP_REPORT_URL = 'http://127.0.0.1:9001'
 
 # 功率预测
 # VUE_APP_BASE_URL = 'http://123.60.219.66:8086'
 # VUE_APP_BASE_URL = 'http://192.168.0.105:8086'
-# VUE_APP_BASE_URL = 'http://10.127.7.241:8086'
-VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
+VUE_APP_BASE_URL = 'http://10.127.7.241:8086'
+# VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
 # VUE_APP_BASE_URL = 'http://192.168.2.231:8086'
 # VUE_APP_BASE_URL = 'http://127.0.0.1:8086'
 
 # 综合报警
-# VUE_APP_ALARM = 'http://10.127.7.241:6015'
-VUE_APP_ALARM = 'http://172.16.12.101:6015'
+VUE_APP_ALARM = 'http://10.127.7.241:6015'
+# VUE_APP_ALARM = 'http://172.16.12.101:6015'
 
 # VUE_APP_ADP_BASE_URL = 'http://10.127.7.241:6015'
 VUE_APP_ADP_BASE_URL = 'http://172.16.12.101'

public/static/config/modeConfig.js

@@ -18,11 +18,11 @@ const tilesMaxLevel = 18;
 // 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
 const showModuleName = 0;
 
-// const reportBaseUrl = "http://10.127.7.241:8083";
-const reportBaseUrl = "http://172.16.12.101:8083";
+const reportBaseUrl = "http://10.127.7.241:8083";
+// const reportBaseUrl = "http://172.16.12.101:8083";
 
-// const baseReportUrl = "http://10.127.7.196";
-const baseReportUrl = "http://172.16.12.101";
+const baseReportUrl = "http://10.127.7.196";
+// const baseReportUrl = "http://172.16.12.101";
 
 // 是否隐藏控制台打印的 log info warn 信息
 const hideLog = false;

src/App.vue

@@ -1450,7 +1450,7 @@ export default {
         } else if (path.indexOf("powerPrediction") > -1) {
           str = "width: calc(100% - 150px);height:100vh";
         } else if (path.indexOf("integratedAlarm") > -1) {
-          str = "width: calc(100% - 200px);height:100vh";
+          str = "width: calc(100% - 300px);height:100vh";
         }
       } else {
         str = "width: calc(100% - 66px);height:100vh";

src/api/gengra.js

@@ -73,4 +73,13 @@ export function apiGethomeData(params) {
     })
 }
 
+export function apiGetbulletindlData(params) {
+    return httpRequest({
+        baseURL: process.env.VUE_APP_GENERAT_URL,
+        url: 'cockpit/bulletindl',
+        method: 'get',
+        params: params
+    })
+}
+
 //******************************end*******************************************//

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

@@ -165,44 +165,50 @@
           v-for="(item, index) in state.tHeard"
           :key="index"
           :prop="item"
+          min-width="170"
           header-align="center"
           show-overflow-tooltip
           sortable="custom"
         >
-          <template #default="{ row }">
+          <template #default="scope">
             <div class="bar">
-              <div
-                class="bar-percent"
-                :data-type="$store.state.moreSty"
-                :style="{
+                <!-- :style="{
                   width:
                     row[`${item.code}_count`] && row[`${item.code}_time`]
-                      ? (row[`${item.code}_count`] /
-                          (row[`${item.code}_count`] +
-                            row[`${item.code}_time`])) *
+                      ? (Math.ceil(row[`${item.code}_count`]) /
+                          (Math.ceil(row[`${item.code}_count`]) +
+                            Math.ceil(row[`${item.code}_time`]))) *
                           100 +
                         'px'
                       : '0px',
-                }"
+                }" -->
+              <div
+                class="bar-percent"
+                :style="{width: (Math.ceil(scope.row[`${item.code}_count`]) / 
+                Math.ceil(scope.column.realWidth))*100 + 'px'}"
               ></div>
-              <span class="value">{{ row[`${item.code}_count`] }} 次数</span>
+              <!-- <span class="value">{{ row[`${item.code}_count`] }} 次数</span> -->
+              <span class="value">{{ Math.ceil(scope.row[`${item.code}_count`]) }} 次数</span>
+              <!-- <span class="value">{{ showRow(scope) }} 次数</span> -->
             </div>
             <div class="bar">
-              <div
-                class="bar-percent"
-                :data-type="$store.state.moreSty"
-                :style="{
+                <!-- :style="{
                   width:
                     row[`${item.code}_count`] && row[`${item.code}_time`]
-                      ? (row[`${item.code}_time`] /
-                          (row[`${item.code}_count`] +
-                            row[`${item.code}_time`])) *
+                      ? (Math.ceil(row[`${item.code}_time`]) /
+                          (Math.ceil(row[`${item.code}_count`]) +
+                            Math.ceil(row[`${item.code}_time`]))) *
                           100 +
                         'px'
                       : '0px',
-                }"
+                }" -->
+              <div
+                class="bar-percent"
+                :style="{width: (Math.ceil(scope.row[`${item.code}_time`]) / 
+                Math.ceil(scope.column.realWidth))*100 + 'px'}"
               ></div>
-              <span class="value">{{ row[`${item.code}_time`] }} 分钟</span>
+              <!-- <span class="value">{{ row[`${item.code}_time`] }} 分钟</span> -->
+              <span class="value">{{ Math.ceil(scope.row[`${item.code}_time`]) }} 分钟</span>
             </div>
           </template>
         </el-table-column>
@@ -271,8 +277,9 @@ onMounted(() => {
   getWpArray();
   getequipmentmodel_list();
   getfetchRelatePart();
-  state.tHeard = dataJson.data.data.title;
-  state.tableData = dataJson.data.data.data;
+//   state.tHeard = dataJson.data.data.title;
+//   state.tableData = dataJson.data.data.data;
+    changeTableData(dataJson.data.data.dataList)
   // getTableList();
 });
 const pageTitle = "预警分析";
@@ -293,10 +300,10 @@ const state = reactive({
       label: "风机",
       value: "windturbine",
     },
-    {
-      label: "光伏",
-      value: "inverter",
-    },
+    // {
+    //   label: "光伏",
+    //   value: "inverter",
+    // },
   ],
   tableData: [],
   tHeard: [],
@@ -327,6 +334,10 @@ const changeType = async (value) => {
   getWpArray();
 };
 
+const showRow = (row) => {
+    debugger
+}
+
 const getWpArray = async () => {
   const { data } = await getWpList(state.typeVal);
   changZhanArray.value = data;
@@ -615,7 +626,17 @@ function getTableList() {
       alarmIds: state.alarmIds,
       deviceType: state.typeVal,
     }).then((res) => {
-      if (res.length) {
+      changeTableData(res)
+    });
+  } else {
+    BASE.showMsg({
+      msg: "部件至少选择一项才可查询",
+    });
+  }
+}
+
+const changeTableData = (res) => {
+    if (res.length) {
         let tableData = [];
         let tHeard = [];
         let data = res;
@@ -649,12 +670,6 @@ function getTableList() {
         state.tHeard = [];
         state.tableData = [];
       }
-    });
-  } else {
-    BASE.showMsg({
-      msg: "部件至少选择一项才可查询",
-    });
-  }
 }
 
 const handleSort = function (val) {
@@ -763,7 +778,7 @@ const compare = function (property) {
     }
   }
   .table_all {
-    width: calc(100% - 40px);
+    width: calc(100% - 20px);
     height: calc(100% - 130px);
     padding: 20px;
     .leftContent[data-type~="greenSty"] {
@@ -803,15 +818,9 @@ const compare = function (property) {
     align-items: center;
     height: 16px;
     margin: 8px 0;
-
-    .bar-percent[data-type~="greenSty"] {
-      background: @green;
-    }
-    .bar-percent[data-type~="blueSty"] {
-      background: @darkBlue;
-    }
     .bar-percent {
       height: 100%;
+      background: #2169c3;
       margin-right: 8px;
     }
   }

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

@@ -168,16 +168,14 @@
           v-for="(item, index) in state.tHeard"
           :key="index"
           :prop="item"
+          min-width="170"
           header-align="center"
           show-overflow-tooltip
           sortable="custom"
         >
-          <template #default="{ row }">
+          <template #default="scope">
             <div class="bar">
-              <div
-                class="bar-percent"
-                :data-type="$store.state.moreSty"
-                :style="{
+                <!-- :style="{
                   width:
                     row[`${item.code}_count`] || row[`${item.code}_time`]
                       ? (row[`${item.code}_count`] /
@@ -186,15 +184,17 @@
                           100 +
                         'px'
                       : '0px',
-                }"
+                }" -->
+              <div
+                class="bar-percent"
+                :style="{width: (Math.ceil(scope.row[`${item.code}_count`]) / 
+                Math.ceil(scope.column.realWidth))*100 + 'px'}"
               ></div>
-              <span class="value">{{ row[`${item.code}_count`] }} 次数</span>
+              <!-- <span class="value">{{ row[`${item.code}_count`] }} 次数</span> -->
+              <span class="value">{{ Math.ceil(scope.row[`${item.code}_count`]) }} 次数</span>
             </div>
             <div class="bar">
-              <div
-                class="bar-percent"
-                :data-type="$store.state.moreSty"
-                :style="{
+                <!-- :style="{
                   width:
                     row[`${item.code}_count`] || row[`${item.code}_time`]
                       ? (row[`${item.code}_time`] /
@@ -203,9 +203,14 @@
                           100 +
                         'px'
                       : '0px',
-                }"
+                }" -->
+              <div
+                class="bar-percent"
+                :style="{width: (Math.ceil(scope.row[`${item.code}_time`]) / 
+                Math.ceil(scope.column.realWidth))*100 + 'px'}"
               ></div>
-              <span class="value">{{ row[`${item.code}_time`] }} 分钟</span>
+              <!-- <span class="value">{{ row[`${item.code}_time`] }} 分钟</span> -->
+              <span class="value">{{ Math.ceil(scope.row[`${item.code}_time`]) }} 分钟</span>
             </div>
           </template>
         </el-table-column>
@@ -274,8 +279,9 @@ onMounted(() => {
   getWpArray();
   getequipmentmodel_list();
   getfetchRelatePart();
-  state.tHeard = dataJson.data.data.title;
-  state.tableData = dataJson.data.data.data;
+//   state.tHeard = dataJson.data.data.title;
+//   state.tableData = dataJson.data.data.dataList;
+    changeTableData(dataJson.data.data.dataList)
   // getTableList();
 });
 const pageTitle = "报警分析";
@@ -284,10 +290,10 @@ const changZhanArray = ref([]);
 const state = reactive({
   typeVal: "windturbine",
   typeList: [
-    {
-      label: "升压站",
-      value: "booststation",
-    },
+    // {
+    //   label: "升压站",
+    //   value: "booststation",
+    // },
     // {
     //   label: "自定义",
     //   value: "custom",
@@ -296,10 +302,10 @@ const state = reactive({
       label: "风机",
       value: "windturbine",
     },
-    {
-      label: "光伏",
-      value: "inverter",
-    },
+    // {
+    //   label: "光伏",
+    //   value: "inverter",
+    // },
   ],
   tableData: [],
   tHeard: [],
@@ -616,7 +622,17 @@ function getTableList() {
       alarmIds: state.alarmIds,
       alarmType: state.typeVal,
     }).then((res) => {
-      if (res.length) {
+      changeTableData(res)
+    });
+  } else {
+    BASE.showMsg({
+      msg: "部件至少选择一项才可查询",
+    });
+  }
+}
+
+const changeTableData = (res) => {
+    if (res.length) {
         let tableData = [];
         let tHeard = [];
         let data = res;
@@ -650,12 +666,6 @@ function getTableList() {
         state.tHeard = [];
         state.tableData = [];
       }
-    });
-  } else {
-    BASE.showMsg({
-      msg: "部件至少选择一项才可查询",
-    });
-  }
 }
 
 const handleSort = function (val) {
@@ -764,7 +774,7 @@ const compare = function (property) {
     }
   }
   .table_all {
-    width: calc(100% - 40px);
+    width: calc(100% - 20px);
     height: calc(100% - 130px);
     padding: 20px;
     .leftContent[data-type~="greenSty"] {
@@ -804,15 +814,9 @@ const compare = function (property) {
     align-items: center;
     height: 16px;
     margin: 8px 0;
-
-    .bar-percent[data-type~="greenSty"] {
-      background: @green;
-    }
-    .bar-percent[data-type~="blueSty"] {
-      background: @darkBlue;
-    }
     .bar-percent {
       height: 100%;
+      background: #2169c3;
       margin-right: 8px;
     }
   }

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

@@ -161,14 +161,14 @@
         >
           导出</el-button
         >
-        <el-button
+        <!-- <el-button
           round
           class="buttons"
           size="mini"
           :disabled="!state.tableData?.length"
           @click="confirmItem(state.tableData)"
           >确认本页</el-button
-        >
+        > -->
       </div>
     </div>
 
@@ -482,7 +482,8 @@ const state = reactive({
     { title: "场站", code: "stationname", width: "150" },
     { title: "机组", code: "devicename", width: "150" },
     { title: "报警信息", code: "description", width: "250" },
-    { title: "故障原因", code: "faultCause" },
+    // { title: "故障原因", code: "faultCause" },
+    { title: "部件", code: "components" },
     // { title: "故障编码", code: "nemCode", width: "100" },
     // { title: "故障解决方法", code: "resolvent" },
     // { title: "级别", code: "rank", width: "80" },
@@ -599,7 +600,7 @@ const getWindturbineList = async () => {
 };
 const query = reactive({
   page: 1,
-  limit: 21,
+  limit: 1000,
   pageTotal: null,
 });
 const tableLoading = ref(false);
@@ -642,7 +643,7 @@ const typechange = () => {
 const export2Excel = async () => {
   let params = {
     pageNum: query.page,
-    pageSize: query.pageTotal,
+    pageSize: query.limit,
     alarmId: state.alarmId,
     alarmType: "custom",
     deviceType: state.typeVal,
@@ -674,7 +675,7 @@ const export2Excel = async () => {
     }
     const stationName = stationList.value.find((ele) => {
       return ele.id === state.stationId;
-    }).name;
+    })?.name || "";
     const fileName = `${stationName} ${state.dateTime[0]} ~ ${state.dateTime[1]} 数据表`;
     outExportExcel(
       tableHeader,
@@ -735,7 +736,7 @@ p {
 }
 .custom-warning {
   height: calc(100% - 40px);
-  padding: 0 20px;
+  padding-left: 20px;
   padding-bottom: 10px;
   .form-wrapper ::v-deep {
     display: flex;
@@ -772,9 +773,9 @@ p {
       justify-content: flex-end;
       margin-right: 10px;
       position: absolute;
-      right: 0;
+      right: -22px;
       // top: 53px;
-      top: 10px;
+      top: 55px;
     }
 
     .buttons {

src/views/home/component/data.json

@@ -3523,5 +3523,566 @@
       "czsum": 6.0,
       "yxsum": 343.0
     }
-  }
+  },
+  "dldata": {
+		"dydl": [
+			{
+				"rfdl": 124.27,
+				"rswdl": 122.9,
+				"rgwdl": 122.9,
+				"rycdl": 1274.84,
+				"rq": "2024-11-01"
+			},
+			{
+				"rfdl": 710.98,
+				"rswdl": 707.53,
+				"rgwdl": 707.53,
+				"rycdl": 7216.97,
+				"rq": "2024-11-02"
+			},
+			{
+				"rfdl": 248.63,
+				"rswdl": 249.55,
+				"rgwdl": 249.55,
+				"rycdl": 2698.11,
+				"rq": "2024-11-03"
+			},
+			{
+				"rfdl": 123.92,
+				"rswdl": 121.05,
+				"rgwdl": 121.05,
+				"rycdl": 1366.51,
+				"rq": "2024-11-04"
+			},
+			{
+				"rfdl": 98.72,
+				"rswdl": 91.98,
+				"rgwdl": 91.98,
+				"rycdl": 1479.91,
+				"rq": "2024-11-05"
+			},
+			{
+				"rfdl": 559.1,
+				"rswdl": 553.08,
+				"rgwdl": 553.08,
+				"rycdl": 7427.16,
+				"rq": "2024-11-06"
+			},
+			{
+				"rfdl": 689.51,
+				"rswdl": 684.7,
+				"rgwdl": 684.7,
+				"rycdl": 6503.17,
+				"rq": "2024-11-07"
+			},
+			{
+				"rfdl": 956.19,
+				"rswdl": 948.84,
+				"rgwdl": 948.84,
+				"rycdl": 4223.3,
+				"rq": "2024-11-08"
+			},
+			{
+				"rfdl": 324.63,
+				"rswdl": 324.24,
+				"rgwdl": 0,
+				"rycdl": 3658.53,
+				"rq": "2024-11-09"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 4504.85,
+				"rq": "2024-11-10"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 5889.05,
+				"rq": "2024-11-11"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2744.99,
+				"rq": "2024-11-12"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 4159.27,
+				"rq": "2024-11-13"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3326.71,
+				"rq": "2024-11-14"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3533.55,
+				"rq": "2024-11-15"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 4109.5,
+				"rq": "2024-11-16"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3849.34,
+				"rq": "2024-11-17"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 6185.06,
+				"rq": "2024-11-18"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2572.47,
+				"rq": "2024-11-19"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3331.09,
+				"rq": "2024-11-20"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3668.93,
+				"rq": "2024-11-21"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2060.89,
+				"rq": "2024-11-22"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3766.74,
+				"rq": "2024-11-23"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3500.63,
+				"rq": "2024-11-24"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 1984.46,
+				"rq": "2024-11-25"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2820.22,
+				"rq": "2024-11-26"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 4785.42,
+				"rq": "2024-11-27"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3445.79,
+				"rq": "2024-11-28"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3400.8,
+				"rq": "2024-11-29"
+			}
+		],
+		"sqdl": [
+			{
+				"rfdl": 154.98,
+				"rswdl": 161.13,
+				"rgwdl": 161.13,
+				"rycdl": 1710.2,
+				"rq": "2024-10-01"
+			},
+			{
+				"rfdl": 124.47,
+				"rswdl": 121.02,
+				"rgwdl": 121.02,
+				"rycdl": 1297.77,
+				"rq": "2024-10-02"
+			},
+			{
+				"rfdl": 1050.43,
+				"rswdl": 1041.6,
+				"rgwdl": 1041.6,
+				"rycdl": 10477.79,
+				"rq": "2024-10-03"
+			},
+			{
+				"rfdl": 643.84,
+				"rswdl": 640.15,
+				"rgwdl": 640.15,
+				"rycdl": 6532.31,
+				"rq": "2024-10-04"
+			},
+			{
+				"rfdl": 260.9,
+				"rswdl": 266.4,
+				"rgwdl": 266.4,
+				"rycdl": 2755.19,
+				"rq": "2024-10-05"
+			},
+			{
+				"rfdl": 97.83,
+				"rswdl": 94.79,
+				"rgwdl": 94.79,
+				"rycdl": 1168.91,
+				"rq": "2024-10-06"
+			},
+			{
+				"rfdl": 33.95,
+				"rswdl": 31,
+				"rgwdl": 31,
+				"rycdl": 398.82,
+				"rq": "2024-10-07"
+			},
+			{
+				"rfdl": 390.01,
+				"rswdl": 443.18,
+				"rgwdl": 443.18,
+				"rycdl": 4506.16,
+				"rq": "2024-10-08"
+			},
+			{
+				"rfdl": 258.69,
+				"rswdl": 258.85,
+				"rgwdl": 258.85,
+				"rycdl": 2687.27,
+				"rq": "2024-10-09"
+			},
+			{
+				"rfdl": 121.67,
+				"rswdl": 118.43,
+				"rgwdl": 118.43,
+				"rycdl": 1344.17,
+				"rq": "2024-10-10"
+			},
+			{
+				"rfdl": 261.83,
+				"rswdl": 260.27,
+				"rgwdl": 260.27,
+				"rycdl": 2799.43,
+				"rq": "2024-10-11"
+			},
+			{
+				"rfdl": 474.8,
+				"rswdl": 470.62,
+				"rgwdl": 470.62,
+				"rycdl": 5052.9,
+				"rq": "2024-10-12"
+			},
+			{
+				"rfdl": 321.47,
+				"rswdl": 324.26,
+				"rgwdl": 324.26,
+				"rycdl": 3693.24,
+				"rq": "2024-10-13"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3411.91,
+				"rq": "2024-10-14"
+			},
+			{
+				"rfdl": 355.96,
+				"rswdl": 348.41,
+				"rgwdl": 348.41,
+				"rycdl": 3574.38,
+				"rq": "2024-10-15"
+			},
+			{
+				"rfdl": 787.42,
+				"rswdl": 781.81,
+				"rgwdl": 781.81,
+				"rycdl": 7909.85,
+				"rq": "2024-10-16"
+			},
+			{
+				"rfdl": 574.54,
+				"rswdl": 590.43,
+				"rgwdl": 590.43,
+				"rycdl": 5922.87,
+				"rq": "2024-10-17"
+			},
+			{
+				"rfdl": 283.78,
+				"rswdl": 280.44,
+				"rgwdl": 280.44,
+				"rycdl": 2891.03,
+				"rq": "2024-10-18"
+			},
+			{
+				"rfdl": 638.32,
+				"rswdl": 630.89,
+				"rgwdl": 630.89,
+				"rycdl": 6319.15,
+				"rq": "2024-10-19"
+			},
+			{
+				"rfdl": 833.18,
+				"rswdl": 827.17,
+				"rgwdl": 827.17,
+				"rycdl": 8414.46,
+				"rq": "2024-10-20"
+			},
+			{
+				"rfdl": 661.37,
+				"rswdl": 656.34,
+				"rgwdl": 656.34,
+				"rycdl": 6684.97,
+				"rq": "2024-10-21"
+			},
+			{
+				"rfdl": 406.78,
+				"rswdl": 401.43,
+				"rgwdl": 401.43,
+				"rycdl": 4212.51,
+				"rq": "2024-10-22"
+			},
+			{
+				"rfdl": 473.87,
+				"rswdl": 486.09,
+				"rgwdl": 486.09,
+				"rycdl": 4909.96,
+				"rq": "2024-10-23"
+			},
+			{
+				"rfdl": 786.25,
+				"rswdl": 782.1,
+				"rgwdl": 782.1,
+				"rycdl": 7917.73,
+				"rq": "2024-10-24"
+			},
+			{
+				"rfdl": 698.68,
+				"rswdl": 693.51,
+				"rgwdl": 693.51,
+				"rycdl": 7105.66,
+				"rq": "2024-10-25"
+			},
+			{
+				"rfdl": 180.76,
+				"rswdl": 183.27,
+				"rgwdl": 183.27,
+				"rycdl": 2030.84,
+				"rq": "2024-10-26"
+			},
+			{
+				"rfdl": 23.62,
+				"rswdl": 24.28,
+				"rgwdl": 24.28,
+				"rycdl": 303.48,
+				"rq": "2024-10-27"
+			},
+			{
+				"rfdl": 319.54,
+				"rswdl": 316.06,
+				"rgwdl": 316.06,
+				"rycdl": 3285.17,
+				"rq": "2024-10-28"
+			},
+			{
+				"rfdl": 469.55,
+				"rswdl": 464.1,
+				"rgwdl": 464.1,
+				"rycdl": 4765.6,
+				"rq": "2024-10-29"
+			},
+			{
+				"rfdl": 205.58,
+				"rswdl": 206.89,
+				"rgwdl": 206.89,
+				"rycdl": 2366.64,
+				"rq": "2024-10-30"
+			},
+			{
+				"rfdl": 48.53,
+				"rswdl": 45.62,
+				"rgwdl": 45.62,
+				"rycdl": 566.22,
+				"rq": "2024-10-31"
+			}
+		],
+		"xqlist": [
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2406.56,
+				"rq": "2024-12-01"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3439.64,
+				"rq": "2024-12-02"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3554,
+				"rq": "2024-12-03"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2918.37,
+				"rq": "2024-12-04"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 4626.87,
+				"rq": "2024-12-05"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 5240.95,
+				"rq": "2024-12-06"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2409.69,
+				"rq": "2024-12-07"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2913.01,
+				"rq": "2024-12-08"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2156.63,
+				"rq": "2024-12-09"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3408.67,
+				"rq": "2024-12-10"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 5960.78,
+				"rq": "2024-12-11"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 5663.94,
+				"rq": "2024-12-12"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 4847.21,
+				"rq": "2024-12-13"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 4004.55,
+				"rq": "2024-12-14"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3722.39,
+				"rq": "2024-12-15"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 1343.08,
+				"rq": "2024-12-16"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 5460.72,
+				"rq": "2024-12-17"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 3126.54,
+				"rq": "2024-12-18"
+			},
+			{
+				"rfdl": null,
+				"rswdl": null,
+				"rgwdl": null,
+				"rycdl": 2207.04,
+				"rq": "2024-12-19"
+			}
+		]
+	}
 }

src/views/home/index.vue

@@ -806,7 +806,7 @@ import echartsGaugeComponent from "@/components/homeComponent/echartsGaugeCompon
 import echartsPie from "@/components/homeComponent/echartsPie.vue";
 import echartsPie2 from "@/components/homeComponent/echartsPie2.vue";
 
-import { apiGethomeData } from "@/api/gengra";
+import { apiGethomeData, apiGetbulletindlData } from "@/api/gengra";
 
 import DAYJS from "dayjs";
 
@@ -1236,7 +1236,7 @@ export default {
       const theme = sessionStorage.getItem("theme") === "true" ? true : false;
       this.$nextTick(() => {
         const domList = ["fdlSy", "fdlBy", "fdlXy"];
-        ["sqdl", "bqdl", "xqdl"].forEach((chartDataKey, domKey) => {
+        ["sqdl", "dydl", "xqlist"].forEach((chartDataKey, domKey) => {
           let xAxis = [];
           let seriesRF = [];
           let seriesSW = [];
@@ -1379,6 +1379,7 @@ export default {
       };
       if (this.isFirstLoad) {
         this.initPageData(jsonData);
+        this.initbulletindlData(jsonData, "json");
       }
       apiGethomeData(params)
         .then((res) => {
@@ -1391,6 +1392,9 @@ export default {
           }
           // that.BASE.closeLoading();
         });
+        apiGetbulletindlData(params).then(rs =>{
+            that.initbulletindlData(rs, "rel");
+        })
     },
 
     sumJhdlMethod() {
@@ -1537,39 +1541,6 @@ export default {
         if (res.data.jhdltc) {
           this.jhdlTableData = res.data.jhdltc.voList;
         }
-        // 月发电量
-        if (res?.data?.dllist?.bqdl) {
-          let xAxis = [];
-          let seriesRF = [];
-          let seriesSW = [];
-          let seriesGW = [];
-          this.dllist = res.data.dllist;
-          res.data.dllist?.bqdl.forEach((it) => {
-            xAxis.push(DAYJS(it.rq).format("MM-DD"));
-            seriesRF.push(it.rfdl);
-            seriesSW.push(it.rswdl);
-            seriesGW.push(it.rycdl);
-          });
-          let series = [
-            {
-              name: "日发电量",
-              data: seriesRF,
-              barGap: "0",
-              type: "bar",
-            },
-            {
-              name: "上网电量",
-              data: seriesSW,
-              type: "bar",
-            },
-            {
-              name: "预测电量",
-              data: seriesGW,
-              type: "bar",
-            },
-          ];
-          that.getPowerBar(xAxis, series);
-        }
         // 72小时功率曲线
         if (res.data["72time"] && res.data["72time"].length > 0) {
           let xAxis = [];
@@ -1909,6 +1880,44 @@ export default {
       }
       this.isFirstLoad = false;
     },
+    initbulletindlData(res, type) {
+        let datas = type === 'json' ? res.dldata : res.data
+        if (res && datas) {
+            // 月发电量
+            if (datas.dydl) {
+            let xAxis = [];
+            let seriesRF = [];
+            let seriesSW = [];
+            let seriesGW = [];
+            this.dllist = datas;
+            datas?.dydl.forEach((it) => {
+                xAxis.push(DAYJS(it.rq).format("MM-DD"));
+                seriesRF.push(it.rfdl);
+                seriesSW.push(it.rswdl);
+                seriesGW.push(it.rycdl);
+            });
+            let series = [
+                {
+                name: "日发电量",
+                data: seriesRF,
+                barGap: "0",
+                type: "bar",
+                },
+                {
+                name: "上网电量",
+                data: seriesSW,
+                type: "bar",
+                },
+                {
+                name: "预测电量",
+                data: seriesGW,
+                type: "bar",
+                },
+            ];
+            this.getPowerBar(xAxis, series);
+            }
+        }
+    },
     getPowerBar(xAxis, series) {
       const theme = sessionStorage.getItem("theme") === "true" ? true : false;
       let myChart;