Merge branch 'fly' into xy-ly

src/views/components/carouselChart.vue

@@ -93,7 +93,13 @@
                 <span> {{ $moment(item.recvTime).format("HH:mm:ss") }}</span>
               </el-tooltip>
               )
-              <span>--通道{{ item.channelId }}</span>
+              <span
+                >--{{
+                  item.alias !== null && item.alias !== ""
+                    ? item.alias
+                    : item.channnelname
+                }}</span
+              >
             </p>
           </div>
           <div
@@ -127,7 +133,7 @@
                 <span> {{ $moment(item.recvTime).format("HH:mm:ss") }}</span>
               </el-tooltip>
               )
-              <span>--通道{{ item.channelId }}</span>
+              <span>--{{ item.channelName }}</span>
             </p>
           </div>
           <div class="smallnoPic" v-else>

src/views/pictureRotation/index.vue

@@ -48,7 +48,11 @@
           <img src="../../assets/img/nopic.jpg" />
         </div>
         <p class="infoTop">
-          {{ item.linename }}-{{ item.displayname }}-{{ item.channnelname }}
+          {{ item.linename }}-{{ item.displayname }}-{{
+            item.alias !== null && item.alias !== ""
+              ? item.alias
+              : item.channnelname
+          }}
         </p>
         <p class="infoBottom" v-if="item.photoTime !== null">
           {{ $moment(item.photoTime).format("yy-MM-DD HH:mm:ss") }} 

src/views/realTimeMonitor/index.vue

@@ -121,7 +121,11 @@
                     :command="item.value"
                     v-for="(item, index) in channelOption"
                     :key="index"
-                    >{{ item.label }}</el-dropdown-item
+                    >{{
+                      item.alias !== null && item.alias !== ""
+                        ? item.alias
+                        : item.label
+                    }}</el-dropdown-item
                   >
                 </el-dropdown-menu>
               </el-dropdown>
@@ -138,7 +142,11 @@
                     :command="item.value"
                     v-for="(item, index) in channelOption"
                     :key="index"
-                    >{{ item.label }}</el-dropdown-item
+                    >{{
+                      item.alias !== null && item.alias !== ""
+                        ? item.alias
+                        : item.label
+                    }}</el-dropdown-item
                   >
                 </el-dropdown-menu>
               </el-dropdown>
@@ -392,6 +400,7 @@ export default {
               label: item.channelname,
               value: item.channelid,
               termid: item.termId,
+              alias: item.alias,
             });
             this.channelValue.push(item.channelid); //默认选中所有通道
           }); // 选择通道一通道二select框

src/views/realTimeSearch/index.vue

@@ -49,19 +49,9 @@
               <el-option
                 v-for="item in tdOptions"
                 :key="item.id"
-                :label="
+                :label="item.name"
-                  item.alias !== null && item.alias !== ''
-                    ? item.alias
-                    : item.name
-                "
                 :value="item.id"
-              >
+              ></el-option>
-                {{
-                  item.alias !== null && item.alias !== ""
-                    ? item.alias
-                    : item.name
-                }}
-              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="日期">
@@ -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 @@
                   }}
                 </p>
                 <p class="infoBottom">
-                  拍照时间：{{ $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) {