Browse Source

提交 设备箱

wangqin
Joe 10 months ago
parent
commit
db1ea5327e
  1. 17
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
  2. 9
      ruoyi-ui/src/views/JiHeExpressway/scss/reset.scss

17
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue

@ -8,6 +8,7 @@
<Descriptions :list="list" :data="data" style="gap: 18px" /> <Descriptions :list="list" :data="data" style="gap: 18px" />
</ElTabPane> </ElTabPane>
<ElTabPane label="设备参数" name="second"> <ElTabPane label="设备参数" name="second">
<div class="no-data" v-if="!devicesList.length" v-loading="secondLoading">暂无设备参数</div>
<Descriptions :list="devicesList" style="gap: 18px;" column="5"> <Descriptions :list="devicesList" style="gap: 18px;" column="5">
<template v-for="item in devicesList.slice(0, -1)" #[`content-${getSlotKey(item.key)}`]="{ data }"> <template v-for="item in devicesList.slice(0, -1)" #[`content-${getSlotKey(item.key)}`]="{ data }">
<span>{{ data.text }}</span> <span>{{ data.text }}</span>
@ -32,7 +33,7 @@ import Video from "@screen/components/Video"
import LineChart from './components/LineChart/index.vue'; import LineChart from './components/LineChart/index.vue';
import Switcher from '@screen/pages/service/PublishingChannelManagement/components/Switcher.vue'; import Switcher from '@screen/pages/service/PublishingChannelManagement/components/Switcher.vue';
import { getRoadInfoByStakeMark, getOrganizationName, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js" import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
import { dialogDelayVisible } from "./../mixin" import { dialogDelayVisible } from "./../mixin"
import request from "@/utils/request"; import request from "@/utils/request";
import { Message } from 'element-ui'; import { Message } from 'element-ui';
@ -53,6 +54,7 @@ export default {
return { return {
activeName: 'first', activeName: 'first',
releaseVisible: false, releaseVisible: false,
secondLoading: true,
data: { data: {
deviceName: "LH24", deviceName: "LH24",
roadName: "G35济泽高速", roadName: "G35济泽高速",
@ -113,11 +115,6 @@ export default {
this.dialogData.brand = data.brand; this.dialogData.brand = data.brand;
}) })
getOrganizationName(this.dialogData.iotDeviceId)
.then(data => {
this.dialogData.organizationName = data?.organizationName;
})
const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark); const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
if (roadInfo) this.data.roadName = roadInfo.roadName; if (roadInfo) this.data.roadName = roadInfo.roadName;
@ -128,7 +125,8 @@ export default {
url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`, url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`,
method: "get", method: "get",
params: {} params: {}
}).then(result => { })
.then(result => {
if (result.code != 200) return; if (result.code != 200) return;
const [deviceInfo] = result.data; const [deviceInfo] = result.data;
@ -169,8 +167,9 @@ export default {
}) })
// this.data = result.rows; // this.data = result.rows;
// this.total = result.total; // this.total = result.total;
}).finally(() => { })
// closeLoading(); .finally(() => {
this.secondLoading = false
}) })
}, },
methods: { methods: {

9
ruoyi-ui/src/views/JiHeExpressway/scss/reset.scss

@ -42,4 +42,13 @@ body {
background-color: rgba(13, 95, 121, 0.6); background-color: rgba(13, 95, 121, 0.6);
} }
} }
.no-data {
display: flex;
align-items: center;
justify-content: center;
color: #fff;
width: 100%;
height: 100%;
}
} }

Loading…
Cancel
Save