看板设备列表调整

src/views/common/home1.vue

@@ -45,14 +45,16 @@
             <div :class="{'items':true, 'i-l':true, 'c-b':item[0].online == 0, 'c-g':item[0].online != 0}" >
               <div class="icon"/>
               <div class="numbers">
-                <div class="number">300W转</div>
-                <div class="des"><span>{{item[0].name}}</span>使用人:{{item[0].userOfName}}</div>
+                <div class="number">转速：{{item[0].spindleActualSpeed ? item[0].spindleActualSpeed : '0'}}</div>
+                <div class="des"><span>{{item[0].name}}</span> {{item[0].codeNumber}}</div>
+                <div class="des">使用人:{{item[0].userOfName}}</div>
               </div>
             </div>
-            <div :v-if="item.length = 2" :class="{'items':true, 'i-r':true, 'c-b':item[1].online == 0, 'c-g':item[1].online != 0}">
+            <div v-if="item.length == 2" :class="{'items':true, 'i-r':true, 'c-b':item[1].online == 0, 'c-g':item[1].online != 0}">
               <div class="numbers">
-                <div class="number">300W转</div>
-                <div class="des">使用人:{{item[1].userOfName}}<span>{{item[1].name}}</span></div>
+                <div class="number">转速：{{item[1].spindleActualSpeed ? item[1].spindleActualSpeed : '0'}}</div>
+                <div class="des">{{item[1].codeNumber}}<span>{{item[1].name}}</span></div>
+                <div class="des">使用人:{{item[1].userOfName}}</div>
               </div>
               <div class="icon"/>
             </div>
@@ -251,7 +253,8 @@ export default {
       submittedRecordList: [], // 实时报工列表
       equipmentAlarmCount: 0, // 设备报警记录总数量
       equipmentAlarmList: [], // 设备报警记录
-      equipmentList: [] // 设备列表
+      equipmentList: [], // 设备列表
+      equipmentListPageIndex: 0
     }
   },
   created () {
@@ -292,6 +295,9 @@ export default {
       // 设备报警记录
       this.getEquipmentAlarm()
       // 设备列表
+      setInterval(() => {
+        this.getEquipmentList()
+      }, 10000)
       this.getEquipmentList()
     },
     getFullscreenElement () {
@@ -406,14 +412,19 @@ export default {
     },
     // 设备列表
     getEquipmentList () {
-      let param = {current: 1, size: 10}
+      this.equipmentListPageIndex++
+      let param = {current: this.equipmentListPageIndex, size: 10}
       getEquipmentList(param).then(({data}) => {
         if (data && data.code === '200') {
           if (data.data != null && data.data.records != null) {
             let list = data.data.records
+            this.equipmentList = []
             for (let i = 0; i < list.length; i += 2) {
               this.equipmentList.push(list.slice(i, i + 2))
             }
+            if (parseInt(data.data.pages) <= this.equipmentListPageIndex) {
+              this.equipmentListPageIndex = 0
+            }
           }
         }
       })
@@ -698,10 +709,10 @@ export default {
           justify-content: space-between;
           align-items: center;
           margin-bottom: 5px;
-          margin-top: 20px;
+          margin-top: 0px;
           .items{
             width: 274px;
-            height: 60px;
+            height: 80px;
             display: flex;
             align-items: center;
             .icon{
@@ -761,9 +772,9 @@ export default {
               background-size: 100% 100%;
             }
             .number{
-              background: linear-gradient(0deg, #60FFE0 0%, #FFFFFF 100%);
+              // background: linear-gradient(0deg, #60FFE0 0%, #FFFFFF 100%);
               background-clip: text;
-              color: transparent; 
+              color: #60FFE0; 
             }
           }
           .c-r{
@@ -775,9 +786,9 @@ export default {
               background-size: 100% 100%;
             }
             .number{
-              background: linear-gradient(0deg, #FF4141 0%, #FFFFFF 100%);
+              // background: linear-gradient(0deg, #FF4141 0%, #FFFFFF 100%);
               background-clip: text;
-              color: transparent; 
+              color: #FFFFFF; 
             }
           }
           .c-b{
@@ -789,9 +800,9 @@ export default {
               background-size: 100% 100%;
             }
             .number{
-              background: linear-gradient(0deg, #5A5A5A 0%, #FFFFFF 100%);
+              // background: linear-gradient(0deg, #5A5A5A 0%, #FFFFFF 100%);
               background-clip: text;
-              color: transparent; 
+              color: #FFFFFF; 
             }
           }
           .c-y{
@@ -803,9 +814,9 @@ export default {
               background-size: 100% 100%;
             }
             .number{
-              background: linear-gradient(0deg, #FDC73D 0%, #FFFFFF 100%);
+              // background: linear-gradient(0deg, #FDC73D 0%, #FFFFFF 100%);
               background-clip: text;
-              color: transparent; 
+              color: #FFFFFF; 
             }
           }
         }