tongshanglei пре 2 година
родитељ
комит
07080ee89e
2 измењених фајлова са 14 додато и 12 уклоњено
  1. 7 5
      src/components/HeaderNotice/index.vue
  2. 7 7
      src/views/dashboard/rladmin/index.vue

+ 7 - 5
src/components/HeaderNotice/index.vue

@@ -15,7 +15,7 @@
         <i class="el-icon-bell" />
       </el-badge>
       <el-tabs v-model="activeName" @tab-click="fetchNotice(activeName)" v-loading="isShowLoading">
-        <el-tab-pane label="告警信息" name="alarm" class="el-tab-pane">
+        <el-tab-pane label="提示信息" name="alarm" class="el-tab-pane">
           <el-container v-if="tabListData.length > 0" direction="vertical">
             <el-main>
               <el-row
@@ -30,11 +30,13 @@
                 <el-col :span="16" style="line-height:22px;font-size: 12px;padding: 0;margin: 0;">
                   <el-row style="margin-bottom: 8px;">
                     <el-col>
-                      <h4 style="margin: 0;">{{item.realname}}</h4>
+                      <!-- <h4 style="margin: 0;">{{item.realname}}</h4> -->
+                      <h4 style="margin: 0;">测试液压泵1</h4>
                     </el-col>
                   </el-row>
                   <el-row style="color:rgba(0,0,0,.45);line-height:1.5">
-                    <el-col>设备{{item.device_number}}发生了{{item.alarm_type_name}}</el-col>
+                    <!-- <el-col>设备{{item.device_number}}发生了{{item.alarm_type_name}}</el-col> -->
+                    <el-col>设备1001校准有效期临近</el-col>
                     <el-col style="margin-top: 4px;margin-bottom: 4px;">{{item.createTimeAgo}}</el-col>
                   </el-row>
                 </el-col>
@@ -81,7 +83,7 @@ export default {
       avatarSize: "medium",
       isShowLoading: false,
       isPopoverShow: false,
-      isHadNotice: false,
+      isHadNotice: true,
       alarmInfo:[],
       deviceEmptyUrl:
         "https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg",
@@ -104,7 +106,7 @@ export default {
     };
   },
   created: function() {
-    this.fetchNotice();
+    // this.fetchNotice();
   },
   methods: {
     fetchNotice(activeName) {

+ 7 - 7
src/views/dashboard/rladmin/index.vue

@@ -11,7 +11,7 @@
               <div class="gutter-box-title">风场统计</div>
               <div class="count-to-box">
                 <span class="text">总数</span>
-                <span class="number" @click="redirectPage('departments')">
+                <span class="number" @click="redirectPage('wind')">
                   <i class="el-icon-loading" v-if="showLoading"></i>
                   <countTo v-else :startVal='startVal' :endVal='countData.department_count' :duration='duration'></countTo>
                 </span>
@@ -24,7 +24,7 @@
               <div class="gutter-box-title">风机统计</div>
               <div class="count-to-box">
                 <span class="text">总数</span>
-                <span class="number" @click="redirectPage('departments')">
+                <span class="number" @click="redirectPage('fan')">
                   <i class="el-icon-loading" v-if="showLoading"></i>
                   <countTo v-else :startVal='startVal' :endVal='countData.department_count' :duration='duration'></countTo>
                 </span>
@@ -52,7 +52,7 @@
               </div>
               <div class="count-to-box">
                 <span class="text">故障数</span>
-                <span class="number" @click="redirectPage('school')">
+                <span class="number">
                   <i class="el-icon-loading" v-if="showLoading"></i>
                   <countTo v-else :startVal='startVal' :endVal='countData.device_online_count' :duration='duration'></countTo>
                 </span>个
@@ -313,11 +313,11 @@ export default {
       let path = '';
 
       switch(type) {
-        case 'departments':
-          path = '/permissions/departments'
+        case 'wind':
+          path = '/wind/wind'
           break;
-        case 'student':
-          path = '/schoolsys/student'
+        case 'fan':
+          path = '/wind/fan'
           break;
         default:
           break;