mengff
/
jihe-hs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat 情报板优化 增加null判断

wangqin
qingzhengli 9 months ago
parent
cc8382d03c
commit
25df62884d
1 changed files with 47 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 163
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue

163
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
View File

@ -6,49 +6,22 @@
<div class="mainDialog">
<div class="dialog_head">
<div class="tit">{{ selectedDevice.deviceName }}</div>
<img
class="btnCls"
src="@/assets/jihe/images/dialog/ibCls.png"
alt=""
@click="____onClose"
/>
<img
class="deco"
src="@/assets/jihe/images/dialog/ibHeadDeco.png"
alt=""
/>
<img class="btnCls" src="@/assets/jihe/images/dialog/ibCls.png" alt="" @click="____onClose" />
<img class="deco" src="@/assets/jihe/images/dialog/ibHeadDeco.png" alt="" />
</div>
<div class="dialogContent">
<div
v-if="selectedBdMsg.length > 0"
class="dialogContent_box"
style="height: 100%"
>
<div v-if="selectedBdMsg.length > 0" class="dialogContent_box" style="height: 100%">
<vuescroll :ops="scrollOptions" class="listBox">
<div
v-for="(itm, indx) in selectedBdMsg"
:key="indx"
class="tplItem"
>
<div v-for="(itm, indx) in selectedBdMsg" :key="indx" class="tplItem">
<!-- 模板内容 -->
<BoardPreview
class="boardPreview"
:boardWH="selectedSize"
:tpl="itm"
></BoardPreview>
<BoardPreview class="boardPreview" :boardWH="selectedSize" :tpl="itm"></BoardPreview>
<!-- 操作按钮 -->
<div class="infoBtnBox">
<el-tooltip content="编辑" placement="top">
<p
@click="____onEditBoardItem(itm, indx)"
class="btn btnEdit"
></p>
<p @click="____onEditBoardItem(itm, indx)" class="btn btnEdit"></p>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<p
@click="____onDeleteBoardItem(indx)"
class="btn btnDelete"
></p>
<p @click="____onDeleteBoardItem(indx)" class="btn btnDelete"></p>
</el-tooltip>
</div>
</div>
@ -88,58 +61,30 @@
</div> -->
</div>
</el-tab-pane>
<el-tab-pane label="设备参数" name="second"
>设备参数</el-tab-pane
>
<el-tab-pane label="在线率统计" name="third"
>在线率统计</el-tab-pane
>
<el-tab-pane label="设备参数" name="second">设备参数</el-tab-pane>
<el-tab-pane label="在线率统计" name="third">在线率统计</el-tab-pane>
</el-tabs>
</div>
<div class="dialogContent_bottom_btn">
<el-button
class="btnInfoBoard"
type="add"
@click.native="____onAddDeviceItem()"
>添加信息</el-button
>
<el-button
class="btnInfoBoard"
type="publish"
@click="____publishInfo"
:disabled="selectedBdMsg.length <= 0"
>发布信息</el-button
>
<el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()">添加信息</el-button>
<el-button class="btnInfoBoard" type="publish" @click="____publishInfo"
:disabled="selectedBdMsg.length <= 0 || selectedDevice.iotDeviceId === null || selectedDevice.iotDeviceId === undefined">发布信息</el-button>
</div>
<div class="sideSwitch" @click="____onShowTemplate">
<img
class="img"
src="@/assets/screen/xtb/leftd.png"
alt=""
:style="{
transform: isShowTemplate
? 'rotate(0deg)'
: 'rotate(180deg)',
}"
/>
<img class="img" src="@/assets/screen/xtb/leftd.png" alt="" :style="{
transform: isShowTemplate
? 'rotate(0deg)'
: 'rotate(180deg)',
}" />
<div class="txt">信息模板</div>
</div>
<!-- 附近的摄像机 -->
<div
class="sideSwitch"
style="top: 36%"
@click="____onShowCameraShower"
>
<img
class="img"
src="@/assets/screen/xtb/leftd.png"
alt=""
:style="{
transform: dialogInfoCamera
? 'rotate(0deg)'
: 'rotate(180deg)',
}"
/>
<div class="sideSwitch" style="top: 36%" @click="____onShowCameraShower">
<img class="img" src="@/assets/screen/xtb/leftd.png" alt="" :style="{
transform: dialogInfoCamera
? 'rotate(0deg)'
: 'rotate(180deg)',
}" />
<div class="txt">附近相机</div>
</div>
</div>
@ -148,23 +93,12 @@
<!-- 信息模板 -->
<div v-if="isShowTemplate" class="sideContent template">
<vuescroll :ops="scrollOptions" class="listBox">
<div
v-for="(item, index) in templateAvailable"
:key="item.dictValue"
>
<div v-for="(item, index) in templateAvailable" :key="item.dictValue">
<!-- 原来是<el-collapse v-model="activeNames"> -->
<h3>{{ item.dictLabel }}</h3>
<div
v-for="(itm, indx) in item.list"
:key="indx"
class="tplItem"
>
<div v-for="(itm, indx) in item.list" :key="indx" class="tplItem">
<!-- 模板内容 -->
<BoardTplPreview
class="boardPreview"
:boardWH="selectedSize"
:tpl="itm"
></BoardTplPreview>
<BoardTplPreview class="boardPreview" :boardWH="selectedSize" :tpl="itm"></BoardTplPreview>
<!-- <div class="infoPreview">
<div class="infoBox" :style="____boardBgStyle">
<span class="infoTxt" :style="____boardTxtStyle(itm)" v-html="itm.content.replace(/\n|\r\n/g, '<br>').replace(/ /g, '&nbsp')"></span>
@ -173,10 +107,7 @@
<!-- 操作按钮 -->
<div class="infoBtnBox infoBtnBoxSm">
<el-tooltip content="加入待下发信息" placement="top">
<p
@click="____onTplToDevice(itm, false)"
class="btn btnApply"
></p>
<p @click="____onTplToDevice(itm, false)" class="btn btnApply"></p>
</el-tooltip>
</div>
</div>
@ -185,22 +116,13 @@
</div>
<!-- 附近相机 -->
<CameraShower
class="sideContent camera"
:visible.sync="dialogInfoCamera"
:list="nearbyCameraList"
></CameraShower>
<CameraShower class="sideContent camera" :visible.sync="dialogInfoCamera" :list="nearbyCameraList">
</CameraShower>
</div>
</transition>
<BoardInfoEditor
@afterSubmit="____onEditSubmit"
:mode="editDialog.mode"
:type="editDialog.type"
:visible.sync="editDialog.visible"
:screenSize="selectedSize"
:tpl="editDialog.tpl"
></BoardInfoEditor>
<BoardInfoEditor @afterSubmit="____onEditSubmit" :mode="editDialog.mode" :type="editDialog.type"
:visible.sync="editDialog.visible" :screenSize="selectedSize" :tpl="editDialog.tpl"></BoardInfoEditor>
</div>
</Teleport>
</template>
@ -310,7 +232,7 @@ export default {
// this.____getAllTemplate();
},
computed: {},
mounted() {},
mounted() { },
methods: {
// 获取信息模板分类
____getTemplateCategory() {
@ -347,11 +269,15 @@ export default {
if (IS_TESTING) {
this.selectedBdMsg = _.cloneDeep(testDeviceInfo.data["3A"].content);
} else {
getBoardDeviceInfo(this.selectedDevice.iotDeviceId)
.then((res) => {
this.selectedBdMsg = res.data["3A"].content;
})
.catch((err) => {});
//改下判断条件 iotDeviceId为null时不要请求后台 加个提示 设备未接入
const iotDeviceId = this.selectedDevice.iotDeviceId;
if (!(iotDeviceId === null || iotDeviceId === undefined))
getBoardDeviceInfo()
.then((res) => {
this.selectedBdMsg = res.data["3A"].content;
})
.catch((err) => { });
else this.$message.error("设备未接入");
}
},
// 设置当前设备可用的模板
@ -412,7 +338,7 @@ export default {
}
},
____refreshPageData(para) {},
____refreshPageData(para) { },
____getNearbyCams() {
if (!this.selectedDevice.stakeMark) {
@ -519,6 +445,7 @@ export default {
&.infoBtnBoxSm {
width: 60px;
}
width: 110px;
height: 80px;
display: flex;
@ -584,6 +511,7 @@ export default {
padding: 0 0.5vw;
}
}
.mask {
width: 100%;
height: 100%;
@ -595,6 +523,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.content {
display: flex;
flex-direction: row;
@ -613,10 +542,12 @@ export default {
background-color: #114c66;
position: relative;
margin-top: 50px;
&.camera {
width: 540px;
height: 556px;
}
&.template {
width: 430px;
height: 556px;

Write Preview
Loading…
Cancel
Save