diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index a66d3f6..0e7f7d9 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -93,7 +93,13 @@ {{ $moment(item.recvTime).format("HH:mm:ss") }} ) - --通道{{ item.channelId }} + --{{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channnelname + }}
- {{ item.linename }}-{{ item.displayname }}-{{ item.channnelname }} + {{ item.linename }}-{{ item.displayname }}-{{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channnelname + }}
{{ $moment(item.photoTime).format("yy-MM-DD HH:mm:ss") }}
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 98e2e9b..525757c 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -121,7 +121,11 @@
:command="item.value"
v-for="(item, index) in channelOption"
:key="index"
- >{{ item.label }}{{
+ item.alias !== null && item.alias !== ""
+ ? item.alias
+ : item.label
+ }}
@@ -138,7 +142,11 @@
:command="item.value"
v-for="(item, index) in channelOption"
:key="index"
- >{{ item.label }}{{
+ item.alias !== null && item.alias !== ""
+ ? item.alias
+ : item.label
+ }}
@@ -392,6 +400,7 @@ export default {
label: item.channelname,
value: item.channelid,
termid: item.termId,
+ alias: item.alias,
});
this.channelValue.push(item.channelid); //默认选中所有通道
}); // 选择通道一通道二select框
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 7418f6b..222f900 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -49,19 +49,9 @@
- 拍照时间:{{ $moment(item.photoTime).format("MM-DD HH:mm") }} + 拍照时间:{{ + $moment(item.photoTime).format("MM-DD HH:mm") + }} / {{ item.alias !== null && item.alias !== "" @@ -192,7 +184,7 @@ export default { xlOptions: [{ id: 0, name: "全部" }], //线路数据 gtOptions: [{ id: 0, name: "全部" }], //杆塔数据 zzOptions: [{ id: 0, name: "全部" }], //装置数据 - tdOptions: [{ id: 0, name: "全部", alias: "" }], //通道数据 + tdOptions: [{ id: 0, name: "全部" }], //通道数据 formdata: { dyid: "", lineid: "", @@ -272,7 +264,7 @@ export default { getSearchtd() { getSearchInfo({ type: 5, id: this.formdata.termid }) .then((res) => { - this.tdOptions = [{ id: 0, name: "全部", alias: "" }]; + this.tdOptions = [{ id: 0, name: "全部" }]; this.tdOptions = this.tdOptions.concat(res.data.list); this.formdata.channelid = this.tdOptions[0].id; // if (this.signtype == 0) {