diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index a955b768..8a6777af 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -1,9 +1,14 @@
+.fl-col{ display: flex; flex-direction: column;}
+.fl-1{ flex: 1;}
.theme-jihe {
$lightBlue: #3de8ff;
$textColor: #f4f4f4;
$inputHeight: 26px;
color: $textColor;
+ .is-light{
+ color: #666;
+ }
.text-center{ text-align: center;}
.tc-lb{ color: $lightBlue;}
.el-tabs__item {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue
index 07ace08c..fa1d26e4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue
@@ -53,6 +53,7 @@ export default {
},
watch: {
headerHeight() {
+ this.initScale();
}
},
methods: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
index f168c54d..b72344fa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
@@ -48,6 +48,12 @@ export default{
},
// 发布信息
____publishInfo() {
+ let deviceIdList = [];
+ if (this.selectedDevice){
+ deviceIdList = [this.selectedDevice.iotDeviceId];
+ }else{
+ deviceIdList = this.checkedDeviceIds;
+ }
this.$confirm('是否确定发布情报板?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -78,7 +84,7 @@ export default{
})
})
- let data = { content: content, deviceIdList: this.checkedDeviceIds }
+ let data = { content: content, deviceIdList }
if (IS_TESTING) {
// this.saveLog(content);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index a00f4674..206d1ee3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -29,16 +29,15 @@
-