diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue index 845ca854..412de2c8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue @@ -35,21 +35,21 @@
-
-
设备名称
-
{{ device.deviceName }}
+
+
设备名称
+
{{ device.deviceName }}
-
-
设备桩号
-
{{ device.stakeMarkId }}
+
+
设备桩号
+
{{ device.stakeMarkId }}
-
-
屏幕像素
-
{{ JSON.parse(device.otherConfig).screenSize }}
+
+
屏幕像素
+
-
@@ -312,8 +312,8 @@ export default { }, components: { addBoard, editBoard, BoardPreview, BoardTplPreview, BoardInfoEditor, vuescroll, Teleport }, created() { - this.____getTemplateCategory(); - this.____getAllTemplate(); + // this.____getTemplateCategory(); + // this.____getAllTemplate(); // this.getTemplateSeries(); }, computed: { @@ -347,8 +347,15 @@ export default { }, ____getDeviceInfo() { + console.log(this.device , "this.devicethis.devicethis.devicethis.device") this.selectedSize = JSON.parse(this.device.otherConfig).screenSize; - this.____setAvailableTemplate(); + if(this.tplCategory.length && this.templateAll.length){ + this.____setAvailableTemplate(); + }else{ + Promise.all([this.____getTemplateCategory(), this.____getAllTemplate()]).then(res=>{ + this.____setAvailableTemplate(); + }) + } getBoardDeviceInfo(this.device.iotDeviceId).then(res => { this.selectedBdMsg = res.data["3A"].content; @@ -913,9 +920,9 @@ export default { display: flex; align-items: stretch; padding-bottom: 10px; - + .boardPreview { - border: 2px solid #004c64; + border: 1px solid rgba(61, 232, 255, 0.5); // width: 560px; // height:80px; flex: 1; @@ -927,7 +934,7 @@ export default { display: flex; margin-left: 10px; /* // border: solid 1px #05afe3; */ - border: 2px solid #004c64; + border: 1px solid rgba(61, 232, 255, 0.5); display: flex; justify-content: space-around; align-items: center; @@ -996,7 +1003,7 @@ export default { top: 0; left: 0; background: rgba(0, 0, 0, .36); - z-index: 999999999; + z-index: 1100; } .map_dialog { @@ -1153,12 +1160,12 @@ export default { height: 16.52vh; } -.show_bottom_tab_item { +.deviceInfo { width: 50%; - padding: 0.5vh 0; + padding: 10px 0; display: flex; // flex-wrap: wrap; - // align-items: center; + align-items: stretch; } .show_bottom_tab_box { @@ -1168,12 +1175,18 @@ export default { align-items: center; } -.show_bottom_tab_item_l { +.deviceInfo_l { color: #3de8ff; font-size: 14px; + width: 70px; + display: flex; + flex-direction: row; + align-items: center; } -.show_bottom_tab_item_r { +.deviceInfo_r { + width: 0; + flex: 1; color: #fff; font-size: 14px; margin-left: 0.5vw;