diff --git a/src/assets/img/loading.jpg b/src/assets/img/loading.jpg
new file mode 100644
index 0000000..2573434
Binary files /dev/null and b/src/assets/img/loading.jpg differ
diff --git a/src/assets/img/nopic.jpg b/src/assets/img/nopic.jpg
index bbacbe5..e328166 100644
Binary files a/src/assets/img/nopic.jpg and b/src/assets/img/nopic.jpg differ
diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index ae5a059..da4811c 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -135,7 +135,7 @@ export default {
   },
   watch: {
     activeIndex(newValue) {
-      if (newValur != this.$route.path) {
+      if (newValue != this.$route.path) {
         this.activeIndex = this.$route.path;
       }
     },
diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index dba75be..e4e6a0c 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -19,6 +19,7 @@
         <el-table
           ref="multipleTable"
           :data="tableData"
+          stripe
           border
           tooltip-effect="dark"
           style="width: 100%"
diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue
index 0ec3d12..e4aa868 100644
--- a/src/views/cameraChannel/index.vue
+++ b/src/views/cameraChannel/index.vue
@@ -13,6 +13,7 @@
         <el-table
           ref="multipleTable"
           :data="deviceTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
@@ -21,17 +22,39 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
-          <el-table-column label="通道名称" show-overflow-tooltip prop="channelname"></el-table-column>
-          <el-table-column label="分辨率高" show-overflow-tooltip prop="maxResolutionHeight"></el-table-column>
-          <el-table-column label="分辨率宽" show-overflow-tooltip prop="maxResolutionWidth"></el-table-column>
+          <el-table-column
+            label="通道名称"
+            show-overflow-tooltip
+            prop="channelname"
+          ></el-table-column>
+          <el-table-column
+            label="分辨率高"
+            show-overflow-tooltip
+            prop="maxResolutionHeight"
+          ></el-table-column>
+          <el-table-column
+            label="分辨率宽"
+            show-overflow-tooltip
+            prop="maxResolutionWidth"
+          ></el-table-column>
           <el-table-column label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled></el-switch>
+              <el-switch
+                v-model="scope.row.status"
+                :active-value="1"
+                :inactive-value="0"
+                disabled
+              ></el-switch>
             </template>
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
-              <el-button @click.native.stop="handleResive(scope.row)" type="text" >修改</el-button>
+              <el-button
+                @click.native.stop="handleResive(scope.row)"
+                type="text"
+                >修改</el-button
+              >
+
               <!-- <el-button type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)" >删除</el-button> -->
             </template>
           </el-table-column>
@@ -43,7 +66,8 @@
             :page-size="pageSize"
             layout=" prev, pager, next, jumper,total"
             :total="total"
-            background>
+            background
+          >
           </el-pagination>
         </div>
       </div>
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 4da5412..3026ea5 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -8,11 +8,18 @@
     >
       <swiper-slide
         class="slide-1"
-        v-for="item in terminalPhoto"
+        v-for="(item, index) in terminalPhoto"
         :key="item.id"
       >
         <viewer class="bigimg" v-if="item.path.indexOf('nopic') == -1">
-          <img :src="item.path + '!1330x670'" alt="" />
+          <!-- <img :src="item.path + '!1330x670'" alt="" /> -->
+          <img v-if="index == 0" :src="item.path + '!1330x670'" />
+          <img
+            v-else
+            src="../../assets/img/loading.jpg"
+            :data-src="item.path + '!1330x670'"
+            class="swiper-lazy"
+          />
         </viewer>
         <div class="bigimg" v-else>
           <img :src="item.path" alt="" />
@@ -38,18 +45,50 @@
         v-for="(item, index) in terminalPhoto"
         :key="item.id"
       >
+        <div class="bigimg" v-if="item.path.indexOf('nopic') == -1">
+          <!-- <img :src="item.path + '!1330x670'" alt="" /> -->
+          <img v-if="index == 0" :src="item.path + '!260x160'" />
+          <img
+            v-else
+            src="../../assets/img/loading.jpg"
+            :data-src="item.path + '!260x160'"
+            class="swiper-lazy"
+          />
+        </div>
+        <div class="bigimg" v-else>
+          <img :src="item.path" alt="" />
+        </div>
+        <!-- <img v-if="index == 0" :src="item.path + '!1330x670'" />
+
         <img
-          :src="item.path + '!260x160'"
+          src="item.path + '!260x160'"
           alt=""
-          v-if="item.path.indexOf('nopic') == -1"
+          :data-src="item.path + '!260x160'"
+          class="swiper-lazy"
+          v-else-if="item.path.indexOf('nopic') == -1"
         />
-        <img :src="item.path" alt="" v-else />
-
+        <img :src="item.path" alt="" v-else /> -->
         <p class="timeInfo" v-if="item.path.indexOf('nopic') == -1">
-          {{ $moment(item.photoTime).format("HH:mm:ss") }}({{
-            $moment(item.recvTime).format("HH:mm:ss")
-          }})
-          <span>(通道{{ item.channelId }})</span>
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="拍照时间"
+            placement="top-start"
+          >
+            <span>{{ $moment(item.photoTime).format("HH:mm:ss") }}</span>
+          </el-tooltip>
+
+          (
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="图片上传时间"
+            placement="top-start"
+          >
+            <span> {{ $moment(item.recvTime).format("HH:mm:ss") }}</span>
+          </el-tooltip>
+          )
+          <span>--通道{{ item.channelId }}</span>
         </p>
       </swiper-slide>
     </swiper>
@@ -76,18 +115,42 @@ export default {
         spaceBetween: 10,
         //loop: true,
         freeMode: true,
-        // loopedSlides: 4,
+        // loopedSlides: 1,
+        lazy: {
+          loadPrevNext: true,
+          loadPrevNextAmount: 1,
+          loadOnTransitionStart: true,
+          //loadOnTransitionStart: true,
+        },
+        // lazyLoading: true, //懒加载开启
         navigation: {
           nextEl: ".swiper-button-next",
           prevEl: ".swiper-button-prev",
         },
+        observer: true, //修改swiper自己或子元素时，自动初始化swiper
+        observeParents: true, //修改swiper的父元素时，自动初始化swiper
+        onSlideChangeEnd: function (swiper) {
+          swiper.update();
+        },
       },
       swiperOptionThumbs: {
         spaceBetween: 10,
         centeredSlides: true,
         slidesPerView: "auto",
         touchRatio: 0.2,
+        lazyLoading: true, //懒加载开启
         slideToClickedSlide: true,
+        lazy: {
+          loadPrevNext: true,
+          loadPrevNextAmount: 3,
+          loadOnTransitionStart: true,
+          //loadOnTransitionStart: true,
+        },
+        observer: true, //修改swiper自己或子元素时，自动初始化swiper
+        observeParents: true, //修改swiper的父元素时，自动初始化swiper
+        onSlideChangeEnd: function (swiper) {
+          swiper.update();
+        },
         //loop: true,
         //loopedSlides: 4,
       },
@@ -155,9 +218,17 @@ export default {
       align-items: center;
       justify-content: center;
 
+      .bigimg {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
       img {
-        width: 260px;
-        height: 160px;
+        //width: 100%;
+        height: 100%;
+        object-fit: fill;
       }
     }
 
@@ -167,7 +238,7 @@ export default {
       width: 100%;
       background: #f0f0f0;
       padding: 8px 0px;
-      font-size: 14px;
+      font-size: 12px;
       text-align: center;
       color: #333;
     }
diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index cfee213..7661763 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -10,6 +10,7 @@
       label-position="left"
       ref="formInfo"
       label-width="auto"
+      :rules="rules"
       :model="ruleForm"
     >
       <el-form-item label="名称" prop="name">
@@ -74,6 +75,11 @@ export default {
   data() {
     return {
       isShow: false,
+      rules: {
+        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+        time: [{ required: true, message: "请选择时间", trigger: "blur" }],
+        span: [{ required: true, message: "请输入间隔", trigger: "blur" }],
+      },
       ruleForm: {
         name: "",
         formList: [
@@ -103,6 +109,7 @@ export default {
         }
       });
     },
+    //删除一行
     deleteModule(item, index) {
       console.log(item, index);
       const itemList = this.ruleForm.formList.indexOf(item);
diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index 60768ac..74c1125 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@@ -4,7 +4,7 @@
     title="设置"
     :visible.sync="isShow"
     :close-on-click-modal="false"
-    width="680px"
+    width="720px"
   >
     <!-- <div class="flexnr">
       <div class="w50">通道:</div>
@@ -18,20 +18,43 @@
       ></el-tree>
     </div> -->
     <div class="setTimeTd">
+      <h3>时间表规则</h3>
       <el-descriptions title="" :column="3" border>
-        <el-descriptions-item label="名称">名称</el-descriptions-item>
-        <el-descriptions-item label="时间表类型">按时间段</el-descriptions-item>
         <el-descriptions-item label="开始时间"> 12:00:07</el-descriptions-item>
         <el-descriptions-item label="结束时间"> 16:00:07</el-descriptions-item>
         <el-descriptions-item label="时间间隔（分）">
           <el-tag size="small">60</el-tag>
         </el-descriptions-item>
-        <el-descriptions-item label="备注信息"
-          >这是备注信息</el-descriptions-item
-        >
       </el-descriptions>
       <h3>设置通道</h3>
-      <div class="setCheckbox">
+      <div class="chooseTDBox">
+        <label>选择通道</label>
+        <div class="checkBox">
+          <el-checkbox-group v-model="checkList">
+            <el-checkbox label="通道1" border></el-checkbox>
+            <el-checkbox label="通道2" border></el-checkbox>
+            <el-checkbox label="通道3" border></el-checkbox>
+            <el-checkbox label="通道4" border></el-checkbox>
+          </el-checkbox-group>
+        </div>
+      </div>
+      <div class="treeTable">
+        <el-table
+          :data="tableData"
+          style="width: 100%; margin-bottom: 20px"
+          row-key="id"
+          border
+          stripe
+          default-expand-all
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        >
+          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column prop="date" label="电压"> </el-table-column>
+          <el-table-column prop="name" label="线路11"> </el-table-column>
+          <el-table-column prop="address" label="装置"> </el-table-column>
+        </el-table>
+      </div>
+      <!-- <div class="setCheckbox">
         <el-table
           ref="multipleTable"
           :data="tableData"
@@ -53,7 +76,7 @@
           >
             <template> XY-SIMULATOR-0001 </template>
           </el-table-column>
-          <!-- <el-table-column type="selection" width="100px"></el-table-column> -->
+         
           <el-table-column label="全选">
             <template>
               <el-checkbox v-model="checked">通道1</el-checkbox></template
@@ -65,7 +88,7 @@
             >
           </el-table-column>
         </el-table>
-      </div>
+      </div> -->
     </div>
     <div slot="footer" class="dialog-footer">
       <!-- <el-button @click="getCheckedNodes">获取</el-button> -->
@@ -101,42 +124,49 @@ export default {
 
       tableData: [
         {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
+          id: 2,
+          date: "220kv",
+          name: "线路11",
+          address: "asdadadadad",
+          children: [
+            {
+              id: 31,
+              date: "220kv",
+              name: "线路11",
+              address: "asdadadadad",
+            },
+            {
+              id: 32,
+              date: "220kv",
+              name: "线路11",
+              address: "asdadadadad",
+            },
+          ],
         },
         {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
+          id: 3,
+          date: "220kv",
+          name: "线路11",
+          address: "asdadadadad",
+          children: [
+            {
+              id: 31,
+              date: "220kv",
+              name: "线路11",
+              address: "asdadadadad",
+            },
+            {
+              id: 32,
+              date: "220kv",
+              name: "线路11",
+              address: "asdadadadad",
+            },
+          ],
         },
       ],
       multipleSelection: [],
+
+      checkList: [],
     };
   },
   mounted() {},
@@ -256,5 +286,15 @@ export default {
       }
     }
   }
+  .chooseTDBox {
+    display: flex;
+    align-items: center;
+    label {
+      margin-right: 8px;
+    }
+  }
+  .treeTable {
+    margin-top: 16px;
+  }
 }
 </style>
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 0b0fecc..6a546f3 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -13,6 +13,7 @@
         <el-table
           ref="multipleTable"
           :data="deviceTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
@@ -28,7 +29,19 @@
           <el-table-column label="时间表类型" show-overflow-tooltip>
             <template>时间表类型</template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="时间表规则" width="600">
+            <template slot-scope="scope">
+              <ul class="rulesBox" v-for="item in scope.row.list">
+                <li><span>开始时间：</span>{{ item.startTime }}</li>
+                <li><span>结束时间：</span>{{ item.endTime }}</li>
+                <li>
+                  <span>时间间隔（分）:</span>
+                  <el-tag>{{ item.span }}</el-tag>
+                </li>
+              </ul>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column
             prop="startTime"
             label="开始时间"
             show-overflow-tooltip
@@ -42,7 +55,7 @@
             prop="span"
             label="间隔（分）"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             prop="remark"
             label="备注"
@@ -124,6 +137,7 @@ export default {
         .then((res) => {
           this.deviceTableData = res.data.list;
           this.total = res.data.total;
+          console.log(this.deviceTableData);
           this.loading = false;
         })
         .catch((err) => {});
@@ -208,6 +222,18 @@ export default {
     margin-top: 16px;
     height: calc(100% - 48px);
     //background: #fcc;
+    .rulesBox {
+      display: flex;
+      flex-direction: row;
+      li {
+        list-style: none;
+        margin-right: 24px;
+        line-height: 24px;
+        span {
+          margin-right: 4px;
+        }
+      }
+    }
   }
 }
 </style>
diff --git a/src/views/imageSettings/index.vue b/src/views/imageSettings/index.vue
index b7c60f2..ca11976 100644
--- a/src/views/imageSettings/index.vue
+++ b/src/views/imageSettings/index.vue
@@ -8,6 +8,7 @@
         <el-table
           ref="multipleTable"
           :data="imageTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
diff --git a/src/views/management/monitoringEquipment/SIMCard/index.vue b/src/views/management/monitoringEquipment/SIMCard/index.vue
index d85e39e..2f8202a 100644
--- a/src/views/management/monitoringEquipment/SIMCard/index.vue
+++ b/src/views/management/monitoringEquipment/SIMCard/index.vue
@@ -42,6 +42,7 @@
       <el-table
         ref="multipleTable"
         :data="tableData"
+        stripe
         tooltip-effect="dark"
         style="width: 100%"
         @selection-change="handleSelectionChange"
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index 543869c..4aa88af 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -15,17 +15,48 @@
       <el-form-item label="装置ID：" prop="cmdid" required>
         <el-input v-model="formInfo.cmdid" auto-complete="on"></el-input>
       </el-form-item>
-      <el-form-item label="显示名：" prop="displayName">
-        <el-input v-model="formInfo.displayName"></el-input>
+      <el-form-item label="SIM卡：" prop="simCard">
+        <el-input v-model="formInfo.simCard" auto-complete="on"></el-input>
+      </el-form-item>
+      <el-form-item label="杆塔编号：" prop="towerid" required>
+        <el-select
+          v-model="formInfo.towerid"
+          multiple
+          placeholder="请选择"
+          @change="changetowerid"
+        >
+          <el-option
+            v-for="item in toweridOptions"
+            :key="item.id"
+            :label="item.channelname"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <!-- <el-input v-model="formInfo.towerid" auto-complete="on"></el-input> -->
       </el-form-item>
 
-      <el-form-item label="线路编号：" prop="lineid" required>
+      <!-- <el-form-item label="线路编号：" prop="lineid" required>
         <el-input v-model="formInfo.lineid" auto-complete="on"></el-input>
+      </el-form-item> -->
+
+      <el-form-item label="通道：" prop="channelVal" required>
+        <el-select
+          v-model="formInfo.channelVal"
+          multiple
+          placeholder="请选择"
+          @change="changeChannelId"
+        >
+          <el-option
+            v-for="item in channelOptions"
+            :key="item.id"
+            :label="item.channelname"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="杆塔编号：" prop="towerid" required>
-        <el-input v-model="formInfo.towerid" auto-complete="on"></el-input>
-      </el-form-item>
-      <el-form-item label="是否带云台：" prop="hasPan" required>
+      <el-form-item label="是否带云台：" prop="hasPan">
         <!-- <el-input v-model="formInfo.hasPan"></el-input> -->
         <el-radio-group v-model="formInfo.hasPan">
           <el-radio :label="0">否</el-radio>
@@ -33,6 +64,9 @@
         </el-radio-group>
       </el-form-item>
 
+      <el-form-item label="显示名：" prop="displayName">
+        <el-input v-model="formInfo.displayName"></el-input>
+      </el-form-item>
       <el-form-item label="装置名称：" prop="equipName">
         <el-input v-model="formInfo.equipName"></el-input>
       </el-form-item>
@@ -69,7 +103,11 @@
   </el-dialog>
 </template>
 <script>
-import { addTerminalJoggle, updateTerminalJoggle } from "@/utils/api/index";
+import {
+  addTerminalJoggle,
+  updateTerminalJoggle,
+  getChannelListapi,
+} from "@/utils/api/index";
 export default {
   props: {
     photoDialog: {
@@ -88,23 +126,41 @@ export default {
   },
 
   data() {
+    let validCmid = (rule, value, callback) => {
+      let reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{17}$/;
+      if (!reg.test(value)) {
+        callback(new Error("装置id是由17位字母+数字组合"));
+      } else {
+        callback();
+      }
+    };
     return {
+      page: 1, // 当前页数
+      pageSize: 10, // 每页数量
+      channelOptions: "",
+      channelArr: [],
+      toweridOptions: "",
       formInfo: {},
       rules: {
         // displayName: [
         //   { required: true, message: "请输入显示名", trigger: "blur" },
         // ],
-        cmdid: [{ required: true, message: "请输入装置ID", trigger: "blur" }],
-        lineid: [
-          { required: true, message: "请输入线路编号", trigger: "blur" },
+        cmdid: [
+          { required: true, message: "请输入装置ID", trigger: "blur" },
+          { validator: validCmid, trigger: "blur" },
         ],
+        // lineid: [
+        //   { required: true, message: "请输入线路编号", trigger: "blur" },
+        // ],
         towerid: [
-          { required: true, message: "请输入杆塔编号", trigger: "blur" },
+          { required: true, message: "请输入杆塔编号", trigger: "change" },
         ],
-        hasPan: [
-          { required: true, message: "请输入是否带云台", trigger: "change" },
+        // hasPan: [
+        //   { required: true, message: "请输入是否带云台", trigger: "change" },
+        // ],
+        channelVal: [
+          { required: true, message: "请选择通道", trigger: "change" },
         ],
-
         // equipName: [
         //   { required: true, message: "请输入装置名称", trigger: "blur" },
         // ],
@@ -134,6 +190,7 @@ export default {
     submitForm() {
       this.$refs.formPhotoInfo.validate((valid) => {
         if (valid) {
+          console.log(this.channelArr);
           let formObj = {
             bsIdentifier: this.formInfo.bsIdentifier,
             bsManufacturer: this.formInfo.bsManufacturer,
@@ -144,7 +201,7 @@ export default {
             essentialInfoVersion: this.formInfo.essentialInfoVersion,
             hasPan: this.formInfo.hasPan,
             latitude: this.formInfo.latitude,
-            lineid: this.formInfo.lineid,
+            //lineid: this.formInfo.lineid,
             longitude: this.formInfo.longitude,
             model: this.formInfo.model,
             orgId: this.formInfo.orgId,
@@ -177,7 +234,7 @@ export default {
               essentialInfoVersion: this.formInfo.essentialInfoVersion,
               hasPan: this.formInfo.hasPan,
               latitude: this.formInfo.latitude,
-              lineid: this.formInfo.lineid,
+              // lineid: this.formInfo.lineid,
               longitude: this.formInfo.longitude,
               model: this.formInfo.model,
               orgId: this.formInfo.orgId,
@@ -207,12 +264,36 @@ export default {
       this.formInfo.hasPan = 0;
       this.$emit("photoDialogClose", flag);
     },
+    //获取所有通道
+    getChannel() {
+      getChannelListapi({
+        pageindex: this.page,
+        pagesize: this.pageSize,
+      })
+        .then((res) => {
+          this.channelOptions = res.data.list;
+          console.log(this.channelOptions);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    //通道id 选择
+    changeChannelId(val) {
+      console.log(val);
+      this.channelArr = val;
+    },
+    //杆塔编号选择
+    changetowerid() {},
   },
   mounted() {
     console.log("打印传过来的对象", this.formItem);
     console.log("打印传过来的对象", this.formItem.bsIdentifier);
     this.formInfo = JSON.parse(JSON.stringify(this.formItem));
   },
+  created() {
+    this.getChannel();
+  },
   watch: {
     formItem: {
       handler(newVal, oldVal) {
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 868158d..ac2cb9b 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -10,6 +10,7 @@
         <el-table
           ref="multipleTable"
           :data="terminalTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 1539a66..7c14010 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -10,6 +10,7 @@
         <el-table
           ref="multipleTable"
           :data="lineTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index 6b93e21..ecb6b9f 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -14,6 +14,7 @@
           ref="multipleTable"
           :data="tableDate"
           tooltip-effect="dark"
+          stripe
           style="width: 100%"
           height="calc(100% - 40px)"
           @selection-change="handleSelectionChange"
@@ -22,14 +23,39 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
-          <el-table-column prop="id" label="杆塔编号" show-overflow-tooltip ></el-table-column>
-          <el-table-column prop="name" label="杆塔名称" show-overflow-tooltip ></el-table-column>
-          <el-table-column prop="lineId" label="线路编号" show-overflow-tooltip ></el-table-column>
-          <el-table-column prop="lineName" label="线路名称" show-overflow-tooltip ></el-table-column>
+          <el-table-column
+            prop="id"
+            label="杆塔编号"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="name"
+            label="杆塔名称"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="lineId"
+            label="线路编号"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="lineName"
+            label="线路名称"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
-              <el-button @click.native.stop="handleResive(scope.row)" type="text" >修改</el-button>
-              <el-button type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)" >删除</el-button>
+              <el-button
+                @click.native.stop="handleResive(scope.row)"
+                type="text"
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                class="deleteText"
+                @click.native.stop="handleDelete(scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -51,10 +77,7 @@
   </div>
 </template>
 <script>
-import {
-  getTowerListApi,
-  delTowerApi,
-} from "@/utils/api/index";
+import { getTowerListApi, delTowerApi } from "@/utils/api/index";
 import addDialog from "./components/addDialog.vue";
 
 export default {
diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue
index 802f41e..26510f4 100644
--- a/src/views/pictureRotation/index.vue
+++ b/src/views/pictureRotation/index.vue
@@ -35,7 +35,8 @@
     <div class="imageCenter" v-loading="loading">
       <div class="imgList" v-for="(item, index) in picList" :key="index">
         <viewer class="bigpic" v-if="!item.path.includes('mp4')">
-          <img :src="item.path + '!1280x720'" />
+          <!-- <img :src="item.path + '!1280x720'" /> -->
+          <el-image :src="item.path + '!1280x720'" lazy></el-image>
         </viewer>
         <video width="100%" height="90%" controls autoplay v-else>
           <source :src="item.path" type="video/mp4" />
@@ -306,7 +307,7 @@ export default {
         width: 100%;
         height: 100%;
       }
-      img {
+      .el-image {
         width: 100%;
         height: 100%;
       }
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index c5a43ac..2ad844e 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -39,6 +39,7 @@
             ref="multipleTable"
             :data="deviceTableData"
             tooltip-effect="dark"
+            stripe
             style="width: 100%"
             height="calc(100% - 40px)"
           >
@@ -111,24 +112,7 @@
             </el-form-item>
           </el-form> -->
           <div class="setTimeTd">
-            <el-descriptions title="" :column="3" border>
-              <el-descriptions-item label="时间表类型"
-                >按时间段</el-descriptions-item
-              >
-              <el-descriptions-item label="开始时间">
-                12:00:07</el-descriptions-item
-              >
-              <el-descriptions-item label="结束时间">
-                16:00:07</el-descriptions-item
-              >
-              <el-descriptions-item label="时间间隔（分）">
-                <el-tag size="small">60</el-tag>
-              </el-descriptions-item>
-              <el-descriptions-item label="备注信息"
-                >这是备注信息</el-descriptions-item
-              >
-            </el-descriptions>
-            <h3>设置通道</h3>
+            <h3>装置信息</h3>
             <div class="tdSetBox">
               <el-descriptions title="" :column="3" border>
                 <el-descriptions-item label="电压等级"
@@ -141,6 +125,19 @@
                   XYIGQ10C230300104</el-descriptions-item
                 >
               </el-descriptions>
+              <h3>时间表规则</h3>
+              <el-descriptions title="" :column="3" border>
+                <el-descriptions-item label="开始时间">
+                  12:00:07</el-descriptions-item
+                >
+                <el-descriptions-item label="结束时间">
+                  16:00:07</el-descriptions-item
+                >
+                <el-descriptions-item label="时间间隔（分）">
+                  <el-tag size="small">60</el-tag>
+                </el-descriptions-item>
+              </el-descriptions>
+
               <h3>选择通道</h3>
               <div class="checkBox">
                 <el-checkbox-group v-model="checkList">
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 0da6e18..85837c5 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -30,13 +30,15 @@
         </el-tree>
       </div>
       <!-- 带参数的中心内容右侧参数区 -->
-      <div class="picSetBox" v-loading="loading">
-        <div class="swiperBox">
+      <div class="picSetBox">
+        <div class="swiperBox" v-loading="loading">
           <carouselChart
             :terminalPhoto="terminalPhoto"
             v-if="terminalPhoto"
           ></carouselChart>
-          <div class="totalPic" v-if="totalPic">图片总数：{{ totalPic }}张</div>
+          <div class="totalPic" v-if="totalPic !== 0">
+            图片总数：{{ totalPic }}张
+          </div>
         </div>
         <div class="parameterArea">
           <div class="paramsDate">
@@ -100,7 +102,7 @@
               <el-button type="primary" @click="handleShowErr"
                 >声光报警</el-button
               >
-              <el-button type="primary" @click="handleShowErr"
+              <el-button type="primary" @click="handlehistoryPic"
                 >历史图片</el-button
               >
 
@@ -296,6 +298,7 @@ export default {
                 path: this.nopicPath,
               },
             ];
+            this.totalPic = 0;
           } else {
             this.terminalPhoto = res.data.list;
             this.totalPic = res.data.num;
@@ -404,6 +407,11 @@ export default {
           console.log(err); //代码错误、请求失败捕获
         });
     },
+    //历史图片
+    handlehistoryPic() {
+      this.$router.push({ path: "/realTimeSearch" });
+      // sessionStorage.setItem("keyPath", " realTimeSearch");
+    },
     //图片绘制
     handlePanel() {
       //const nodes = this.$refs.tree.getNode(this.currentNodekey).data; //若节点可被选择，则返回目前被选中的节点所组成的数组
@@ -469,10 +477,9 @@ export default {
       .totalPic {
         width: 100%;
         height: 24px;
-
         margin-bottom: 8px;
         text-align: center;
-        font-size: 14px;
+        font-size: 12px;
         color: #2d8cf0;
         font-weight: bold;
         line-height: 24px;