首页修改

src/views/dashboard/Analysis.vue

@@ -113,8 +113,6 @@
 
 <script>
 import * as echarts from 'echarts'
-// import { listAlarmdata } from "@/api/alarm/alarmdata.js";
-// import { listNotice } from "@/api/system/notice";
 // import { firstload } from "@/api/homepage.js";
 // import { envirinfo } from "@/api/environSafe/hsmsstatistics.js";
   import { httpAction, getAction, postAction } from '@/api/manage'
@@ -129,20 +127,20 @@ export default {
         {
           title: '消息标题',
           align: 'center',
-          dataIndex: 'noticeTitle',
+          dataIndex: 'titile',
           customRender: function (text) {
             return !text ? '' : text.length > 20 ? text.substr(0, 20) + "..." : text
           },
         },
-        {
-          title: '消息类型',
-          align: 'center',
-          dataIndex: 'noticeType',
-        },
+        // {
+        //   title: '消息类型',
+        //   align: 'center',
+        //   dataIndex: 'msgCategory',
+        // },
         {
           title: '生成时间',
           align: 'center',
-          dataIndex: 'createTime',
+          dataIndex: 'msgContent',
         },
       ],
       alarmcolumns: [
@@ -155,12 +153,19 @@ export default {
           title: '报警描述',
           align: 'center',
           dataIndex: 'remark',
+          render: (text) => {
+            const maxLength = 20; // 最大长度
+            return text.length > maxLength ? `${text.substring(0, maxLength)}...` : text;
+          },
+          // customRender: function (text) {
+          //   return !text ? '' : text.length > 20 ? text.substr(0, 20) + "..." : text
+          // },
         },
-        {
-          title: '报警类型',
-          align: 'center',
-          dataIndex: 'alarmtype',
-        },
+        // {
+        //   title: '报警类型',
+        //   align: 'center',
+        //   dataIndex: 'alarmtype',
+        // },
         {
           title: '报警时间',
           align: 'center',
@@ -222,14 +227,16 @@ export default {
       //湿度
       humis:[],
         url: {
-            list: "/homepate/statistics/firstload",
-            equipment: "/equipmentStatistics/equipmentStatistics/machineSum",
-            repair: "/cmmsRepair/cmmsRepair/indexrepairnum",
-            upkeep: "/cmmsUpkeep/cmmsUpkeep/getMyChargeNumDay",
-            upkeepAll: "/cmmsUpkeep/cmmsUpkeep/getMyChargeNum",
-            inspect: "/cmmsInspect/cmmsInspect/indexinspectnum",
-            todayelectricity: "/dataElectricity/dataElectricity/todayelectricity",
-            envirinfo: "/hsms/statistics/envirinfo",
+          list: "/homepate/statistics/firstload",
+          equipment: "/equipmentStatistics/equipmentStatistics/machineSum",
+          repair: "/cmmsRepair/cmmsRepair/indexrepairnum",
+          upkeep: "/cmmsUpkeep/cmmsUpkeep/getMyChargeNumDay",
+          upkeepAll: "/cmmsUpkeep/cmmsUpkeep/getMyChargeNum",
+          inspect: "/cmmsInspect/cmmsInspect/indexinspectnum",
+          todayelectricity: "/dataElectricity/dataElectricity/todayelectricity",
+          envirinfo: "/hsms/statistics/envirinfo",
+          listAlarm: "/tpmMessageAlarm/tpmMessageAlarm/list",
+          listNotice: "/sys/sysAnnouncementSend/getAllAnnouncementSend",
         },
     }
   },
@@ -384,9 +391,10 @@ export default {
         this.initTempAndHumiEcharts();
       })
 
-
-      this.alarmList = emsdata.homedata.alarmData;
-      this.noticeList = emsdata.homedata.noticeData;
+      this.getAlarmList()
+      this.getNoticeList()
+      // this.alarmList = emsdata.homedata.alarmData;
+      // this.noticeList = emsdata.homedata.noticeData;
       // this.EnvironmentTemp = emsdata.homedata.EnvironmentTemp;
 
       // this.initEcharts();
@@ -399,19 +407,24 @@ export default {
         pageSize: 5,
         status: '0',
       }
-      listAlarmdata(queryParams).then((response) => {
-        this.alarmList = response.rows;
-      });
+      
+      getAction(this.url.listAlarm, queryParams).then(res=>{
+        console.log("Alarm", res)
+        this.alarmList = res.result.records;
+      })
     },
     /** 查询消息列表 */
     getNoticeList() {
       var queryParams = {
         pageNum: 1,
         pageSize: 5,
+        readFlag: '0'
       }
-      listNotice(queryParams).then(response => {
-        this.noticeList = response.rows;
-      });
+      
+      getAction(this.url.listNotice, queryParams).then(res=>{
+        console.log("Notice", res)
+        this.noticeList = res.result.records;
+      })
     },
     initEcharts(){
       var _this = this

src/views/module_tpm/healthDashboard/index.vue

@@ -21,7 +21,7 @@
     </div>
     <!-- 消息通知+报警通知 -->
     <a-row :gutter="20" class="mt20 alarmandnotice">
-      <a-col :span="5" style="padding-left: 10px; padding-right: 18px">
+      <!-- <a-col :span="5" style="padding-left: 10px; padding-right: 18px">
         <a-card :body-style="{ padding: '10px 8px 8px', height: '910px' }" :bordered="false">
           <span class="leftHeader common-title"></span>
           <span class="head-title">今日重点关注设备</span>
@@ -33,16 +33,6 @@
             </a-col>
           </a-row>
           <a-divider style="margin: 8px 0" />
-          <!-- <span class="leftHeader common-title"></span>
-          <span class="head-title">今日重点关注产线</span>
-          <a-row>
-            <a-col>
-              <div class="head-info">
-                <span>喷涂产线装置综合健康指数下降明显，需要加强关注。</span>
-              </div>
-            </a-col>
-          </a-row>
-          <a-divider style="margin: 8px 0" /> -->
           <span class="leftHeader common-title"></span>
           <span class="head-title">今日运维提醒</span>
           <a-row>
@@ -53,13 +43,13 @@
             </a-col>
           </a-row>
         </a-card>
-      </a-col>
-      <a-col :span="19">
+      </a-col> -->
+      <a-col :span="24">
         <a-row :gutter="20" class="mt20">
-          <a-col :span="15" style="margin: -10px 4px 0 -17px">
+          <a-col :span="15" style="margin: -10px 0 0 0">
             <div class="trend-charts" ref="elecCharts"></div>
           </a-col>
-          <a-col :span="9" style="margin-left: 2px; padding-left: 0px; padding-right: 0px">
+          <a-col :span="9" style="padding-right: 10px;">
             <a-card class="box-card">
               <div class="u-flex-jab">
                 <div class="common-title u-flex">
@@ -106,10 +96,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="20" class="mt20">
-          <a-col :span="15" style="margin: 0 4px 0 -17px">
+          <a-col :span="15"  style="margin: 0 0 0 0">
             <div class="trend-charts" ref="efficCharts"></div>
           </a-col>
-          <a-col :span="9" style="margin-left: 2px; padding-left: 0px; padding-right: 0px">
+          <a-col :span="9" style="padding-right: 10px;">
             <div class="trend-charts" ref="statusCharts"></div>
           </a-col>
         </a-row>
@@ -143,11 +133,11 @@ export default {
         //   align: 'center',
         //   dataIndex: 'remark',
         // },
-        {
-          title: '报警类型',
-          align: 'center',
-          dataIndex: 'alarmtype',
-        },
+        // {
+        //   title: '报警类型',
+        //   align: 'center',
+        //   dataIndex: 'alarmtype',
+        // },
         {
           title: '报警时间',
           align: 'center',