去除多余选项例如视频监控等
This commit is contained in:
parent
2dc83215a7
commit
c19378aa37
@ -20,12 +20,12 @@
|
|||||||
<running-status v-if="deviceForm.deviceId" v-show="baseTabIndex === 0" ref="runningStatus"
|
<running-status v-if="deviceForm.deviceId" v-show="baseTabIndex === 0" ref="runningStatus"
|
||||||
:device="deviceForm"></running-status>
|
:device="deviceForm"></running-status>
|
||||||
<!-- 设备实时监测 -->
|
<!-- 设备实时监测 -->
|
||||||
<device-monitor v-show="baseTabIndex == 1" ref="deviceMonitor" :show="baseTabIndex == 1"
|
<!-- <device-monitor v-show="baseTabIndex == 1" ref="deviceMonitor" :show="baseTabIndex == 1"
|
||||||
:device="deviceForm">
|
:device="deviceForm">
|
||||||
</device-monitor>
|
</device-monitor> -->
|
||||||
<!-- 视频监控 -->
|
<!-- 视频监控 -->
|
||||||
<video-monitor v-show="baseTabIndex == 2" ref="videoMonitor"
|
<!-- <video-monitor v-show="baseTabIndex == 2" ref="videoMonitor"
|
||||||
:device="deviceForm"></video-monitor>
|
:device="deviceForm"></video-monitor> -->
|
||||||
<!-- 告警记录 -->
|
<!-- 告警记录 -->
|
||||||
<device-alertLog v-show="baseTabIndex == 3" ref="deviceAlertLog"
|
<device-alertLog v-show="baseTabIndex == 3" ref="deviceAlertLog"
|
||||||
:device="deviceForm"></device-alertLog>
|
:device="deviceForm"></device-alertLog>
|
||||||
@ -239,7 +239,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 设备定时 -->
|
<!-- 设备定时 -->
|
||||||
<device-timing v-if="tabbarIndex === 1" ref="deviceTiming" :device="deviceForm"></device-timing>
|
<!-- <device-timing v-if="tabbarIndex === 1" ref="deviceTiming" :device="deviceForm"></device-timing> -->
|
||||||
<!-- 设备日志 -->
|
<!-- 设备日志 -->
|
||||||
<device-log v-if="tabbarIndex === 2" ref="deviceLog" :device="deviceForm"></device-log>
|
<device-log v-if="tabbarIndex === 2" ref="deviceLog" :device="deviceForm"></device-log>
|
||||||
<!-- 设备统计 -->
|
<!-- 设备统计 -->
|
||||||
@ -247,8 +247,9 @@
|
|||||||
ref="deviceStatistic"></device-statistic> -->
|
ref="deviceStatistic"></device-statistic> -->
|
||||||
<device-history v-if="tabbarIndex === 3" ref="deviceHistory" :device="deviceForm"></device-history>
|
<device-history v-if="tabbarIndex === 3" ref="deviceHistory" :device="deviceForm"></device-history>
|
||||||
<!-- 设备组态 -->
|
<!-- 设备组态 -->
|
||||||
<device-scada v-show="tabbarIndex === 4" :show="tabbarIndex === 4" :device="deviceForm"
|
<!-- <device-scada v-show="tabbarIndex === 4" :show="tabbarIndex === 4" :device="deviceForm"
|
||||||
ref="deviceScada"></device-scada>
|
ref="deviceScada"></device-scada> -->
|
||||||
|
|
||||||
<u-tabbar :value="tabbarIndex" @change="tabbarChange" :fixed="true" :placeholder="true"
|
<u-tabbar :value="tabbarIndex" @change="tabbarChange" :fixed="true" :placeholder="true"
|
||||||
:safeAreaInsetBottom="true" :border="false" activeColor="#3378FE" v-if="deviceForm.deviceType !==3">
|
:safeAreaInsetBottom="true" :border="false" activeColor="#3378FE" v-if="deviceForm.deviceType !==3">
|
||||||
<u-tabbar-item :text="$tt('deviceDetail.device')" @click="tabbarClick(0)">
|
<u-tabbar-item :text="$tt('deviceDetail.device')" @click="tabbarClick(0)">
|
||||||
@ -257,12 +258,12 @@
|
|||||||
<image style="width:18px;height:18px;" slot="inactive-icon" src="/static/home/tabBar/device_black.png">
|
<image style="width:18px;height:18px;" slot="inactive-icon" src="/static/home/tabBar/device_black.png">
|
||||||
</image>
|
</image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item>
|
||||||
<u-tabbar-item :text="$tt('deviceDetail.timing')" @click="tabbarClick(1)">
|
<!-- <u-tabbar-item :text="$tt('deviceDetail.timing')" @click="tabbarClick(1)">
|
||||||
<image style="width:18px;height:18px;" slot="active-icon" src="/static/home/tabBar/time_blue.png">
|
<image style="width:18px;height:18px;" slot="active-icon" src="/static/home/tabBar/time_blue.png">
|
||||||
</image>
|
</image>
|
||||||
<image style="width:18px;height:18px;" slot="inactive-icon" src="/static/home/tabBar/time_black.png">
|
<image style="width:18px;height:18px;" slot="inactive-icon" src="/static/home/tabBar/time_black.png">
|
||||||
</image>
|
</image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item> -->
|
||||||
<u-tabbar-item :text="$tt('deviceDetail.journal')" @click="tabbarClick(2)">
|
<u-tabbar-item :text="$tt('deviceDetail.journal')" @click="tabbarClick(2)">
|
||||||
<image style="width:18px;height:18px;" slot="active-icon" src="/static/home/tabBar/log_blue.png">
|
<image style="width:18px;height:18px;" slot="active-icon" src="/static/home/tabBar/log_blue.png">
|
||||||
</image>
|
</image>
|
||||||
@ -276,15 +277,15 @@
|
|||||||
src="/static/home/tabBar/statistic_black.png">
|
src="/static/home/tabBar/statistic_black.png">
|
||||||
</image>
|
</image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item>
|
||||||
<u-tabbar-item :text="$tt('deviceDetail.scada')" @click="tabbarClick(4)">
|
<!-- <u-tabbar-item :text="$tt('deviceDetail.scada')" @click="tabbarClick(4)">
|
||||||
<image style="width:18px;height:18px;" slot="active-icon" src="/static/home/tabBar/scada_blue.png">
|
<image style="width:18px;height:18px;" slot="active-icon" src="/static/home/tabBar/scada_blue.png">
|
||||||
</image>
|
</image>
|
||||||
<image style="width:18px;height:18px;" slot="inactive-icon" src="/static/home/tabBar/scada_black.png">
|
<image style="width:18px;height:18px;" slot="inactive-icon" src="/static/home/tabBar/scada_black.png">
|
||||||
</image>
|
</image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item> -->
|
||||||
</u-tabbar>
|
</u-tabbar>
|
||||||
<u-modal :show="showScada" content="暂无组态,请先去网页端配置模板组态" @confirm="() => showScada = false"
|
<!-- <u-modal :show="showScada" content="暂无组态,请先去网页端配置模板组态" @confirm="() => showScada = false"
|
||||||
@cancel="() => showScada = false" showCancelButton></u-modal>
|
@cancel="() => showScada = false" showCancelButton></u-modal> -->
|
||||||
<!-- 选择直播还是回放 -->
|
<!-- 选择直播还是回放 -->
|
||||||
<u-popup :show="isSelect" :round="5" mode="bottom" :closeOnClickOverlay="true" @close="isSelect = false">
|
<u-popup :show="isSelect" :round="5" mode="bottom" :closeOnClickOverlay="true" @close="isSelect = false">
|
||||||
<view class="trigger-popup-wrap">
|
<view class="trigger-popup-wrap">
|
||||||
@ -313,14 +314,14 @@
|
|||||||
<script>
|
<script>
|
||||||
import projectConfig from '@/env.config.js';
|
import projectConfig from '@/env.config.js';
|
||||||
import navbar from '@/components/navBar/index.vue';
|
import navbar from '@/components/navBar/index.vue';
|
||||||
import videoMonitor from './video/index.vue';
|
// import videoMonitor from './video/index.vue';
|
||||||
import deviceAlertLog from './log/alertLog.vue';
|
import deviceAlertLog from './log/alertLog.vue';
|
||||||
import runningStatus from './status/index.vue';
|
import runningStatus from './status/index.vue';
|
||||||
import deviceLog from './log/index.vue';
|
import deviceLog from './log/index.vue';
|
||||||
import deviceHistory from './statistic/history.vue';
|
import deviceHistory from './statistic/history.vue';
|
||||||
import deviceMonitor from './monitor/index.vue';
|
// import deviceMonitor from './monitor/index.vue';
|
||||||
import deviceTiming from './timing/index.vue';
|
// import deviceTiming from './timing/index.vue';
|
||||||
import deviceScada from './scada.vue';
|
// import deviceScada from './scada.vue';
|
||||||
import {
|
import {
|
||||||
listChannel
|
listChannel
|
||||||
} from '@/apis/modules/sip';
|
} from '@/apis/modules/sip';
|
||||||
@ -342,12 +343,12 @@
|
|||||||
navbar,
|
navbar,
|
||||||
runningStatus,
|
runningStatus,
|
||||||
deviceLog,
|
deviceLog,
|
||||||
deviceMonitor,
|
// deviceMonitor,
|
||||||
deviceTiming,
|
// deviceTiming,
|
||||||
videoMonitor,
|
// videoMonitor,
|
||||||
deviceAlertLog,
|
deviceAlertLog,
|
||||||
deviceHistory,
|
deviceHistory,
|
||||||
deviceScada
|
// deviceScada
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -358,10 +359,6 @@
|
|||||||
tabbarIndex: 0,
|
tabbarIndex: 0,
|
||||||
baseTabList: [{
|
baseTabList: [{
|
||||||
name: this.$tt('deviceDetail.overview')
|
name: this.$tt('deviceDetail.overview')
|
||||||
}, {
|
|
||||||
name: this.$tt('deviceDetail.monitor')
|
|
||||||
}, {
|
|
||||||
name: this.$tt('deviceDetail.Surveillance')
|
|
||||||
}, {
|
}, {
|
||||||
name: this.$tt('deviceDetail.alert')
|
name: this.$tt('deviceDetail.alert')
|
||||||
}],
|
}],
|
||||||
@ -401,7 +398,7 @@
|
|||||||
},
|
},
|
||||||
channelTotal: 0,
|
channelTotal: 0,
|
||||||
channelList: [],
|
channelList: [],
|
||||||
showScada: false,
|
// showScada: false,
|
||||||
showcalendar: false, //录像时间选择弹出框
|
showcalendar: false, //录像时间选择弹出框
|
||||||
minDate: "",
|
minDate: "",
|
||||||
maxDate: "",
|
maxDate: "",
|
||||||
@ -420,14 +417,14 @@
|
|||||||
this.mqttUnSubscribe(this.deviceForm); // 取消订阅主题
|
this.mqttUnSubscribe(this.deviceForm); // 取消订阅主题
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
uni.$off('re-device-timing-list');
|
// uni.$off('re-device-timing-list');
|
||||||
uni.$once('re-device-timing-list', (dat) => {
|
// uni.$once('re-device-timing-list', (dat) => {
|
||||||
if (dat) {
|
// if (dat) {
|
||||||
this.$refs.deviceTiming.dataList = [];
|
// this.$refs.deviceTiming.dataList = [];
|
||||||
this.$refs.deviceTiming.queryParams.pageNum = 1;
|
// this.$refs.deviceTiming.queryParams.pageNum = 1;
|
||||||
this.$refs.deviceTiming.getList();
|
// this.$refs.deviceTiming.getList();
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.initCalendar();
|
this.initCalendar();
|
||||||
@ -531,19 +528,20 @@
|
|||||||
// 设备运行状态
|
// 设备运行状态
|
||||||
this.getDevice();
|
this.getDevice();
|
||||||
this.$refs.runningStatus.baseStatusRefresh();
|
this.$refs.runningStatus.baseStatusRefresh();
|
||||||
} else if (this.baseTabIndex == 2) {
|
} else if (this.baseTabIndex == 1) {
|
||||||
// 设备信息
|
// 告警记录
|
||||||
this.getDevice();
|
this.getDevice();
|
||||||
} else {
|
} else {
|
||||||
uni.stopPullDownRefresh();
|
uni.stopPullDownRefresh();
|
||||||
}
|
}
|
||||||
} else if (this.tabbarIndex == 1) {
|
} else if (this.tabbarIndex == 1) {
|
||||||
// 设备定时
|
// 设备定时
|
||||||
this.$refs.deviceTiming.deviceTimerRefresh();
|
// this.$refs.deviceTiming.deviceTimerRefresh();
|
||||||
uni.stopPullDownRefresh();
|
uni.stopPullDownRefresh();
|
||||||
} else if (this.tabbarIndex == 3) {
|
} else if (this.tabbarIndex == 3) {
|
||||||
// 设备统计
|
// 设备统计
|
||||||
this.$refs.deviceStatistic.getCacheThingsModdel();
|
// this.$refs.deviceStatistic.getCacheThingsModdel();
|
||||||
|
uni.stopPullDownRefresh();
|
||||||
} else {
|
} else {
|
||||||
uni.stopPullDownRefresh();
|
uni.stopPullDownRefresh();
|
||||||
}
|
}
|
||||||
@ -640,7 +638,8 @@
|
|||||||
// console.log('存在下划线', data.thingsModels[i].id);
|
// console.log('存在下划线', data.thingsModels[i].id);
|
||||||
//判断存在下划线的个数为1
|
//判断存在下划线的个数为1
|
||||||
const thingsModelId = data.thingsModels[i].id.split('_');
|
const thingsModelId = data.thingsModels[i].id.split('_');
|
||||||
const thingsModelName = data.thingsModels[i].name?.includes('array_') ? data.thingsModels[i].name
|
const thingsModelName = data.thingsModels[i].name?.includes('array_') ? data.thingsModels[i]
|
||||||
|
.name
|
||||||
?.split('_') : [data.thingsModels[i].name];
|
?.split('_') : [data.thingsModels[i].name];
|
||||||
if (thingsModelId.length >= 2 && thingsModelId[0] !== 'array' && thingsModelName.length >= 2) {
|
if (thingsModelId.length >= 2 && thingsModelId[0] !== 'array' && thingsModelName.length >= 2) {
|
||||||
//找到一个对象
|
//找到一个对象
|
||||||
|
Loading…
x
Reference in New Issue
Block a user