diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue
index 472753a..e4aa868 100644
--- a/src/views/cameraChannel/index.vue
+++ b/src/views/cameraChannel/index.vue
@@ -54,6 +54,7 @@
                 type="text"
                 >修改</el-button
               >
+
               <!-- <el-button type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)" >删除</el-button> -->
             </template>
           </el-table-column>
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 8bf67e6..3026ea5 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -69,9 +69,25 @@
         />
         <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")
-          }})
+          <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>
@@ -202,6 +218,13 @@ export default {
       align-items: center;
       justify-content: center;
 
+      .bigimg {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
       img {
         //width: 100%;
         height: 100%;
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/index.vue b/src/views/devicePhotoSchedule/index.vue
index 35ffd4d..6a546f3 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -229,6 +229,9 @@ export default {
         list-style: none;
         margin-right: 24px;
         line-height: 24px;
+        span {
+          margin-right: 4px;
+        }
       }
     }
   }
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index 543869c..f5b54b5 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -15,13 +15,10 @@
       <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>
 
-      <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> -->
       <el-form-item label="杆塔编号：" prop="towerid" required>
         <el-input v-model="formInfo.towerid" auto-complete="on"></el-input>
       </el-form-item>
@@ -32,7 +29,26 @@
           <el-radio :label="1">是</el-radio>
         </el-radio-group>
       </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="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 +85,11 @@
   </el-dialog>
 </template>
 <script>
-import { addTerminalJoggle, updateTerminalJoggle } from "@/utils/api/index";
+import {
+  addTerminalJoggle,
+  updateTerminalJoggle,
+  getChannelListapi,
+} from "@/utils/api/index";
 export default {
   props: {
     photoDialog: {
@@ -89,22 +109,28 @@ export default {
 
   data() {
     return {
+      page: 1, // 当前页数
+      pageSize: 10, // 每页数量
+      channelOptions: "",
+      channelArr: [],
       formInfo: {},
       rules: {
         // displayName: [
         //   { required: true, message: "请输入显示名", trigger: "blur" },
         // ],
         cmdid: [{ required: true, message: "请输入装置ID", trigger: "blur" }],
-        lineid: [
-          { required: true, message: "请输入线路编号", trigger: "blur" },
-        ],
+        // lineid: [
+        //   { required: true, message: "请输入线路编号", trigger: "blur" },
+        // ],
         towerid: [
           { required: true, message: "请输入杆塔编号", trigger: "blur" },
         ],
         hasPan: [
           { required: true, message: "请输入是否带云台", trigger: "change" },
         ],
-
+        channelVal: [
+          { required: true, message: "请选择通道", trigger: "change" },
+        ],
         // equipName: [
         //   { required: true, message: "请输入装置名称", trigger: "blur" },
         // ],
@@ -134,6 +160,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 +171,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 +204,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 +234,33 @@ 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);
+        });
+    },
+    changeChannelId(val) {
+      console.log(val);
+      this.channelArr = val;
+    },
   },
   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) {