Browse Source

语音广播,智能设备箱

develop
王兴琳 2 weeks ago
parent
commit
8eefad51b8
  1. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/SmartDevice.vue
  2. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue

4
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/SmartDevice.vue

@ -2,7 +2,6 @@
<Dialog v-model="visibleModel" <Dialog v-model="visibleModel"
title="智能设备箱" width="470px" > title="智能设备箱" width="470px" >
<Video class="video-stream" :camId="camId" img="设备箱" /> <Video class="video-stream" :camId="camId" img="设备箱" />
<div class="SmartDevice"> <div class="SmartDevice">
<ElTabs v-model="activeName" class="tabs"> <ElTabs v-model="activeName" class="tabs">
<ElTabPane label="基本信息" name="first" style="height: 195px"> <ElTabPane label="基本信息" name="first" style="height: 195px">
@ -16,7 +15,7 @@
<LineChart <LineChart
v-if="activeName === 'third'" v-if="activeName === 'third'"
:productId="dialogData.id" :productId="dialogData.id"
style="height: 180px" style="height: 150px"
/> />
</ElTabPane> </ElTabPane>
</ElTabs> </ElTabs>
@ -253,4 +252,3 @@
} }
} }
</style> </style>

6
ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue

@ -108,7 +108,7 @@
<el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()" <el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()"
:disabled="selectedBdMsg.length>=1">添加信息</el-button> :disabled="selectedBdMsg.length>=1">添加信息</el-button>
<el-button v-hasPermi="['service:broadcast:publish']" class="btnInfoBoard" type="publish" @click="____onPublish" <el-button v-hasPermi="['service:broadcast:publish']" class="btnInfoBoard" type="publish" @click="____onPublish"
:disabled="selectedBdMsg.length <= 0 || deviceList.length <= 0">发布信息</el-button> :disabled="selectedBdMsg.length <= 0 || checkedDeviceIds.length <= 0">发布信息</el-button>
</div> </div>
</WgtTitle> </WgtTitle>
<!-- <div class="partTitle partDeviceTempateTitle"> <!-- <div class="partTitle partDeviceTempateTitle">
@ -536,7 +536,7 @@ export default {
// //
____onPublish() { ____onPublish() {
if (!this.deviceList.length) { if (!this.checkedDeviceIds.length) {
this.$message.warning("请选择设备"); this.$message.warning("请选择设备");
return; return;
} }
@ -662,9 +662,9 @@ export default {
this.allVmsTemplate("no"); this.allVmsTemplate("no");
}, },
// //
____onSelectDevices(arr) { ____onSelectDevices(arr) {
this.updateCheckAllStatus();
this.selectedDevices = []; this.selectedDevices = [];
if (this.checkedDeviceIds.length == 0) { if (this.checkedDeviceIds.length == 0) {

Loading…
Cancel
Save