diff --git a/src/views/management/userEquipment/towerInformation/components/addDialog.vue b/src/views/management/userEquipment/towerInformation/components/addDialog.vue index cc85d8f..cc1ef04 100644 --- a/src/views/management/userEquipment/towerInformation/components/addDialog.vue +++ b/src/views/management/userEquipment/towerInformation/components/addDialog.vue @@ -97,6 +97,8 @@ export default { let formArr = []; formArr.push(this.formdata); console.log(this.formdata); + console.log(this.formdata.name.replace(/——/g, "-")); + this.formdata.name = this.formdata.name.replace(/——/g, "-"); addTowerApi({ list: formArr }) .then((res) => { this.isShow = false; diff --git a/src/views/realTimeMonitor/components/morePicPreveiw.vue b/src/views/realTimeMonitor/components/morePicPreveiw.vue index 1187742..066e047 100644 --- a/src/views/realTimeMonitor/components/morePicPreveiw.vue +++ b/src/views/realTimeMonitor/components/morePicPreveiw.vue @@ -52,6 +52,9 @@ export default { this.isShow = true; console.log(data); this.deviceData = data; + if (data.photoTime == null) { + data.photoTime = new Date().getTime(); + } this.getTerminalPhotoList(data.channelid, data.photoTime, data.termid); }, //获取图片 diff --git a/src/views/stritl/index.vue b/src/views/stritl/index.vue index a1fdfdc..07d3071 100644 --- a/src/views/stritl/index.vue +++ b/src/views/stritl/index.vue @@ -8,21 +8,35 @@ > -->
+
装置总数 - {{ termDataNum.totalNum }} + {{ termDataNum.totalNum ? termDataNum.totalNum : 0 }}
-+
在线数量 - {{ termDataNum.onlineNum }} + {{ + termDataNum.onlineNum ? termDataNum.onlineNum : 0 + }}
-+
离线率 - {{ (termDataNum.offlinePercent * 100).toFixed(2) }}% + {{ + termDataNum.offlinePercent + ? (termDataNum.offlinePercent * 100).toFixed(2) + : 0 + }}%
- 在线率 - {{ (termDataNum.onlinePercent * 100).toFixed(2) }}% + 在线率 + {{ + termDataNum.onlinePercent + ? (termDataNum.onlinePercent * 100).toFixed(2) + : 0 + }}%