+ :style="'height:'+(Object.keys(i.deviceDataMap).length<4 ? '100%':'50%')" class="infoItem">
{{ val }}:
{{ i.deviceDataMap[val] }}
@@ -95,6 +100,8 @@ import {
getMonitorById,
publishControlCommand
} from '@/api/board/equipment'
+import defaultImg from '@/assets/board/equipment/icon.png'
+import defaultImg1 from '@/assets/board/equipment/icon2.png'
let getDeviceInterval = null
@@ -102,6 +109,8 @@ export default {
components: {},
data() {
return {
+ defaultImg,
+ defaultImg1,
show: false,
monitorUnitId: '',
data1: true,
@@ -128,7 +137,7 @@ export default {
async getData() {
await this.getTree()
},
- switchChange(functionIdentifier, deviceId, deviceCode,modeFunctionId) {
+ switchChange(functionIdentifier, deviceId, deviceCode, modeFunctionId) {
console.log(this.controlList)
console.log(this.controlList)
this.$confirm('确定执行么？', '提示', {
@@ -137,10 +146,10 @@ export default {
type: 'warning'
}).then(() => {
publishControlCommand({
- deviceId:deviceId,
- modeFunctionId:modeFunctionId,
- deviceCode:deviceCode,
- type:functionIdentifier,
+ deviceId: deviceId,
+ modeFunctionId: modeFunctionId,
+ deviceCode: deviceCode,
+ type: functionIdentifier,
}).then(e => {
if (e.code === 200) {
this.$message({
@@ -148,7 +157,7 @@ export default {
message: '成功!'
});
this.controlList.find(e => e.deviceId === deviceId).deviceType === '1' ? this.controlList.find(e => e.deviceId === deviceId).deviceType = '0' : this.controlList.find(e => e.deviceId === deviceId).deviceType = '1'
- }else{
+ } else {
this.$message({
type: 'info',
message: '网络错误'
@@ -163,7 +172,7 @@ export default {
});
},
async getTree() {
- if(this.$store.getters.sceneId){
+ if (this.$store.getters.sceneId) {
const {data} = await treeList(this.$store.getters.sceneId)
this.treeData = data
}
@@ -192,9 +201,9 @@ export default {
const {data} = await getMonitorById(e.id)
this.MonitorInfo = data
},
- toHistory(e,i) {
+ toHistory(e, i) {
console.log(i)
- this.$router.push({path: "/board/senso",query:{id:e,deviceModeId:i}});
+ this.$router.push({path: "/board/senso", query: {id: e, deviceModeId: i}});
}
},
beforeDestroy() {
@@ -276,7 +285,6 @@ export default {
}
.img {
- background-image: url("~@/assets/board/equipment/icon.png");
background-repeat: no-repeat;
background-size: 100% 100%;
position: absolute;
@@ -334,10 +342,11 @@ export default {
background-repeat: no-repeat;
background-size: 100% 100%;
position: absolute;
- top: 13%;
- left: 3.3%;
- width: 19.5%;
- height: 73%;
+
+ top: 21%;
+ left: 5.8%;
+ width: 14.5%;
+ height: 57%;
}
.title {
diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue
index 975e55e..8ca3a5a 100644
--- a/ruoyi-ui/src/views/board/index/index.vue
+++ b/ruoyi-ui/src/views/board/index/index.vue
@@ -4,7 +4,7 @@
监控单元统计
-
{{ i.name }}
+
{{ i.name }}
@@ -178,7 +178,7 @@ export default {
},
},
polar: {
- center: ["40%", "50%"],
+ center: ["30%", "50%"],
radius: "100%", //图形大小
},
},
@@ -526,7 +526,7 @@ export default {
padding: 0 12px;
position: absolute;
top: 17%;
- left: 18%;
+ left: 15%;
}
.chart1Table {
diff --git a/ruoyi-ui/src/views/board/senso/index.vue b/ruoyi-ui/src/views/board/senso/index.vue
index 617075c..17574ce 100644
--- a/ruoyi-ui/src/views/board/senso/index.vue
+++ b/ruoyi-ui/src/views/board/senso/index.vue
@@ -11,17 +11,19 @@
{{ topData.monitorUnitName }}
-
-
设备编号:
-
{{ topData.deviceCode }}
-
-
-
设备名称:
-
{{ topData.deviceName }}
-
-
-
设备位置:
-
{{ topData.deviceLocation }}
+
+
+
设备编号:
+
{{ topData.deviceCode }}
+
+
+
设备名称:
+
{{ topData.deviceName }}
+
+
+
设备位置:
+
{{ topData.deviceLocation }}
+
@@ -58,7 +60,7 @@
-
@@ -161,6 +163,7 @@ export default {
map.setFitView()
},
async currentChange(e) {
+ console.log(e)
this.currentPage = e
await this.setHistoryData()
},
@@ -215,7 +218,7 @@ export default {
} else {
this.tableData = data.historyData?.dataList
this.total = data.historyData?.count
- this.currentPage = 1
+ // this.currentPage = 1
this.deviceDataColumns = data.deviceDataColumns
this.$nextTick(() => {
this.show = true
@@ -344,22 +347,28 @@ export default {
}
.info {
- position: absolute;
- left: 60vh;
+ position: relative;
color: #1fabf3;
font-size: 1.5vh;
height: 100%;
white-space: nowrap;
+ display: inline-block;
+ height: 100%;
+ margin-right: 12px;
+ vertical-align: top;
.info1 {
- position: absolute;
- bottom: 55%;
- color: #fffc
+ position: relative;
+ line-height: 8.5vh;
+ color: #fffc;
+ font-size: 15px;
+ font-weight: 600;
+ letter-spacing: 2px;
}
.info2 {
- position: absolute;
- top: 55%;
+ position: relative;
+ line-height: 8.5vh;
color: #fff
}
}
@@ -369,4 +378,9 @@ export default {
width: 100%;
height: 50vh;
}
+.infoDiv{
+ position: absolute;
+ left: 60vh;
+ height: 100%;
+}
diff --git a/ruoyi-ui/src/views/board/smartScene/index.vue b/ruoyi-ui/src/views/board/smartScene/index.vue
index 3bb9a54..185094f 100644
--- a/ruoyi-ui/src/views/board/smartScene/index.vue
+++ b/ruoyi-ui/src/views/board/smartScene/index.vue
@@ -69,7 +69,7 @@
{{ i.monitorUnitName }}
-
+