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 + }}

{{ $moment(item.recvTime).format("HH:mm:ss") }} ) - --通道{{ item.channelId }} + --{{ item.channelName }}

diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue index c28ff56..082790a 100644 --- a/src/views/pictureRotation/index.vue +++ b/src/views/pictureRotation/index.vue @@ -48,7 +48,11 @@

- {{ 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/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 @@ - {{ - item.alias !== null && item.alias !== "" - ? item.alias - : item.name - }} - + > @@ -107,7 +97,7 @@ 拍照时间:{{ $moment(item.photoTime).format("MM-DD HH:mm") }} - / {{ item.channnelname }} + / {{ item.alias !== null && item.alias !== "" ? item.alias @@ -137,7 +127,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) {