Browse Source

剩余bug修改

master
z_yu 2 years ago
parent
commit
f8c90d4b29
  1. 9
      src/api/home/device/index.js
  2. 18
      src/views/dashboard/PanelGroup.vue
  3. 2
      src/views/storeManage/warehouse3DConfig/index.vue

9
src/api/home/device/index.js

@ -0,0 +1,9 @@
import request from '@/utils/request'
export function getOnlineDevice() {
return request({
url: 'api/device/num',
method: 'get'
})
}
export default { getOnlineDevice }

18
src/views/dashboard/PanelGroup.vue

@ -46,7 +46,7 @@
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
<count-to :start-val="0" :end-val="17" :duration="3200" class="card-panel-num" />
<count-to :start-val="0" :end-val="onlineDeviceNum" :duration="3200" class="card-panel-num" />
</div> </div>
在线设备 在线设备
</div> </div>
@ -59,7 +59,7 @@
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
<count-to :start-val="0" :end-val="0" :duration="3200" class="card-panel-num" />
<count-to :start-val="0" :end-val="offlineDeviceNum" :duration="3200" class="card-panel-num" />
</div> </div>
离线设备 离线设备
</div> </div>
@ -72,6 +72,8 @@
import CountTo from 'vue-count-to' import CountTo from 'vue-count-to'
import { FetchGetArchivesNum, FetchGetCaseNum } from '@/api/archivesManage/statistics' import { FetchGetArchivesNum, FetchGetCaseNum } from '@/api/archivesManage/statistics'
import { getDeviceList } from '@/api/storeManage/deviceManage/device' import { getDeviceList } from '@/api/storeManage/deviceManage/device'
import { getOnlineDevice } from '@/api/home/device'
export default { export default {
components: { components: {
CountTo CountTo
@ -80,7 +82,9 @@ export default {
return { return {
archivesNum: 0, archivesNum: 0,
caseNum: 0, caseNum: 0,
totalDeviceNum: 0
totalDeviceNum: 0,
onlineDeviceNum: 0,
offlineDeviceNum: 0
} }
}, },
mounted() { mounted() {
@ -104,10 +108,12 @@ export default {
this.caseNum = data this.caseNum = data
}) })
}, },
//
// ,线,线
handleTotalDeviceNum() { handleTotalDeviceNum() {
getDeviceList({ page: 0, size: 10 }).then(data => {
this.totalDeviceNum = data.totalElements
Promise.all([getDeviceList({ page: 0, size: 10 }), getOnlineDevice()]).then((result) => {
this.totalDeviceNum = result[0].totalElements
this.onlineDeviceNum = result[1]
this.offlineDeviceNum = this.totalDeviceNum - this.onlineDeviceNum
}) })
} }
} }

2
src/views/storeManage/warehouse3DConfig/index.vue

@ -395,7 +395,7 @@ export default {
.head-container .el-button.unbind-btn{ .head-container .el-button.unbind-btn{
border-color: #f65163; border-color: #f65163;
background-color: #f65163; background-color: #f65163;
.is-disabled{
&.is-disabled{
border-color: #7a2831; border-color: #7a2831;
background-color: #7a2831; background-color: #7a2831;
} }

Loading…
Cancel
Save