diff --git a/src/assets/img/nopic.jpg b/src/assets/img/nopic.jpg
new file mode 100644
index 0000000..084e9fb
Binary files /dev/null and b/src/assets/img/nopic.jpg differ
diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue
index 138aa37..e7dfde0 100644
--- a/src/components/common/Header.vue
+++ b/src/components/common/Header.vue
@@ -63,14 +63,14 @@ export default {
           value: "#20a0ff",
           label: "蓝色",
         },
-        {
-          value: "#EE320C",
-          label: "红色",
-        },
-        {
-          value: "#00a096",
-          label: "绿色",
-        },
+        // {
+        //   value: "#EE320C",
+        //   label: "红色",
+        // },
+        // {
+        //   value: "#00a096",
+        //   label: "绿色",
+        // },
         {
           value: "#f08200",
           label: "橙色",
@@ -150,8 +150,8 @@ export default {
     },
   },
   created() {
-    this.colorValue = this.colorList[3].label;
-    this.changeTheme(this.colorList[3].value);
+    this.colorValue = this.colorList[0].label;
+    this.changeTheme(this.colorList[0].value);
   },
   mounted() {},
 };
diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue
index 2215288..3c9ea41 100644
--- a/src/components/common/Home.vue
+++ b/src/components/common/Home.vue
@@ -1,71 +1,71 @@
 <template>
-    <div class="wrapper">
-        <v-head></v-head>
-        <!-- <v-sidebar></v-sidebar> -->
-        <div class="content-box">
-            <v-tags></v-tags>
-            <div class="content">
-                <transition name="move" mode="out-in">
-                    <keep-alive :include="tagsList">
-                        <router-view></router-view>
-                    </keep-alive>
-                </transition>
-                <el-backtop target=".content"></el-backtop>
-            </div>
-        </div>
+  <div class="wrapper">
+    <v-head></v-head>
+    <!-- <v-sidebar></v-sidebar> -->
+    <div class="content-box">
+      <!-- <v-tags></v-tags> -->
+      <div class="content">
+        <transition name="move" mode="out-in">
+          <keep-alive :include="tagsList">
+            <router-view></router-view>
+          </keep-alive>
+        </transition>
+        <el-backtop target=".content"></el-backtop>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-import vHead from './Header.vue';
+import vHead from "./Header.vue";
 //import vSidebar from './Sidebar.vue';
-import vTags from './Tags.vue';
-import bus from './bus';
+// import vTags from './Tags.vue';
+import bus from "./bus";
 export default {
-    data() {
-        return {
-            tagsList: [],
-            collapse: false
-        };
-    },
-    components: {
-        vHead,
-        //vSidebar,
-        vTags
-    },
-    created() {
-        bus.$on('collapse-content', (msg) => {
-            this.collapse = msg;
-        });
+  data() {
+    return {
+      tagsList: [],
+      collapse: false,
+    };
+  },
+  components: {
+    vHead,
+    //vSidebar,
+    // vTags
+  },
+  created() {
+    bus.$on("collapse-content", (msg) => {
+      this.collapse = msg;
+    });
 
-        // 只有在标签页列表里的页面才使用keep-alive，即关闭标签之后就不保存到内存中了。
-        bus.$on('tags', (msg) => {
-            let arr = [];
-            for (let i = 0, len = msg.length; i < len; i++) {
-                msg[i].name && arr.push(msg[i].name);
-            }
-            this.tagsList = arr;
-        });
-    }
+    // 只有在标签页列表里的页面才使用keep-alive，即关闭标签之后就不保存到内存中了。
+    bus.$on("tags", (msg) => {
+      let arr = [];
+      for (let i = 0, len = msg.length; i < len; i++) {
+        msg[i].name && arr.push(msg[i].name);
+      }
+      this.tagsList = arr;
+    });
+  },
 };
 </script>
 <style lang="less">
 .content-box {
-    position: absolute;
-    left: 0px;
-    right: 0;
-    top: 70px;
-    bottom: 0;
-    //padding-bottom: 30px;
-    -webkit-transition: left 0.3s ease-in-out;
-    transition: left 0.3s ease-in-out;
-    background: @background-color-base;
-    .content {
-        width: 100%;
-        height: calc(100% - 48px);
-        padding: 10px;
-        overflow-y: auto;
-        box-sizing: border-box;
-    }
+  position: absolute;
+  left: 0px;
+  right: 0;
+  top: 70px;
+  bottom: 0;
+  //padding-bottom: 30px;
+  -webkit-transition: left 0.3s ease-in-out;
+  transition: left 0.3s ease-in-out;
+  background: @background-color-base;
+  .content {
+    width: 100%;
+    height: 100%;
+    //padding: 10px;
+    overflow-y: auto;
+    box-sizing: border-box;
+  }
 }
 </style>
diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index b50017f..4bc351d 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -71,6 +71,11 @@ export default {
           title: "拍照时间表设置",
         },
         // {
+        //   icon: "el-icon-coin",
+        //   index: "cameraChannel",
+        //   title: "通道管理",
+        // },
+        // {
         //   icon: "el-icon-film",
         //   index: "pictureRotation",
         //   title: "图片轮巡",
diff --git a/src/router/index.js b/src/router/index.js
index 493c4a3..e461a7a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -73,6 +73,18 @@ const routes = [
           ),
         meta: { title: "拍照时间表设置", icon: "el-icon-setting" },
       },
+      {
+        path: "/cameraChannel",
+        component: () =>
+          import(
+            /* webpackChunkName: "icon" */ "../views/cameraChannel/index.vue"
+          ),
+        meta: {
+          title: "通道设置",
+
+          icon: "el-icon-coin",
+        },
+      },
       {
         path: "/photoAlarm",
         component: () =>
diff --git a/src/utils/request.js b/src/utils/request.js
index ba8b8cd..3266ef7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,36 +1,4 @@
 import axios from "axios";
-import { Loading } from "element-ui"; //项目已经全局引入element的话可以不单独引入
-let loading; //定义loading变量
-function startLoading() {
-  //使用Element loading-start 方法
-  loading = Loading.service({
-    lock: true,
-    text: "加载中……",
-    background: "rgba(255, 255, 255, 0.7)",
-  });
-}
-function endLoading() {
-  //使用Element loading-close 方法
-  loading.close();
-}
-// 那么 showFullScreenLoading() tryHideFullScreenLoading() 要干的事儿就是将同一时刻的请求合并。
-// 声明一个变量 needLoadingRequestCount，每次调用showFullScreenLoading方法 needLoadingRequestCount + 1。
-// 调用tryHideFullScreenLoading()方法，needLoadingRequestCount - 1。needLoadingRequestCount为 0 时，结束 loading。
-let needLoadingRequestCount = 0;
-export function showFullScreenLoading() {
-  if (needLoadingRequestCount === 0) {
-    startLoading();
-  }
-  needLoadingRequestCount++;
-}
-
-export function tryHideFullScreenLoading() {
-  if (needLoadingRequestCount <= 0) return;
-  needLoadingRequestCount--;
-  if (needLoadingRequestCount === 0) {
-    endLoading();
-  }
-}
 
 const service = axios.create({
   // process.env.NODE_ENV === 'development' 来判断是否开发环境
@@ -43,7 +11,6 @@ const service = axios.create({
 
 service.interceptors.request.use(
   (config) => {
-    showFullScreenLoading();
     return config;
   },
   (error) => {
@@ -55,7 +22,6 @@ service.interceptors.request.use(
 service.interceptors.response.use(
   (response) => {
     if (response.status === 200) {
-      tryHideFullScreenLoading();
       return response.data;
     } else {
       Promise.reject();
diff --git a/src/views/cameraChannel/components/adddeviceDialog.vue b/src/views/cameraChannel/components/adddeviceDialog.vue
new file mode 100644
index 0000000..765b46b
--- /dev/null
+++ b/src/views/cameraChannel/components/adddeviceDialog.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog
+    class="addLineDialog"
+    :title="title"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="470px"
+  >
+    <el-form
+      label-position="left"
+      ref="formInfo"
+      label-width="80px"
+      :rules="rules"
+      :model="formdata"
+    >
+      <el-form-item label="名称：" prop="name">
+        <el-input v-model="formdata.name" autocomplete="off"></el-input>
+      </el-form-item>
+      <el-form-item label="时间：" prop="time">
+        <el-time-picker
+          is-range
+          v-model="formdata.time"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          value-format="HH:mm:ss"
+        >
+        </el-time-picker>
+      </el-form-item>
+      <el-form-item label="间隔：" prop="span">
+        <!-- <el-input v-model="formdata.span" autocomplete="off" type="number"></el-input> -->
+        <el-input-number v-model="formdata.span" :min="1"></el-input-number>
+      </el-form-item>
+      <el-form-item label="备注：" prop="remark">
+        <el-input v-model="formdata.remark" autocomplete="off"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="isShow = false">取 消</el-button>
+      <el-button type="primary" @click="submitForm()">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { addScheduleRulel, updateScheduleRulel } from "@/utils/api/index";
+export default {
+  props: {
+    title: String,
+  },
+  data() {
+    return {
+      isShow: false,
+      formdata: {},
+      rules: {
+        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+        time: [{ required: true, message: "请选择时间", trigger: "blur" }],
+        span: [{ required: true, message: "请输入间隔", trigger: "blur" }],
+        remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      },
+    };
+  },
+  methods: {
+    //判断
+    getdataform(val) {
+      console.log(val);
+      if (val == null) {
+        return (this.formdata = {});
+      }
+      this.formdata = val;
+      this.$set(this.formdata, "time", [val.startTime, val.endTime]);
+    },
+    // 保存确定操作
+    submitForm() {
+      this.$refs.formInfo.validate((valid) => {
+        if (valid) {
+          this.formdata.startTime = this.formdata.time[0];
+          this.formdata.endTime = this.formdata.time[1];
+          delete this.formdata.time;
+          if (this.title == "新增") {
+            let formArr = [];
+            formArr.push(this.formdata);
+            addScheduleRulel({ list: formArr })
+              .then((res) => {
+                this.isShow = false;
+                this.$message.success("添加成功");
+                this.$parent.deviceList();
+              })
+              .catch((err) => {
+                this.$message.error("添加失败");
+              });
+          } else {
+            updateScheduleRulel(this.formdata)
+              .then((res) => {
+                this.isShow = false;
+                this.$message.success("修改成功");
+                this.$parent.deviceList();
+              })
+              .catch((err) => {
+                this.$message.error("修改失败");
+              });
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    display() {
+      this.isShow = true;
+    },
+    hide() {
+      this.isShow = false;
+    },
+  },
+  mounted() {},
+};
+</script>
diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue
new file mode 100644
index 0000000..ae7231e
--- /dev/null
+++ b/src/views/cameraChannel/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="camerChannel">
+    <div class="deviceBox">
+      <div class="deviceBtnGroup">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click.native.stop="handleAdddevice()"
+          >新增</el-button
+        >
+      </div>
+      <div class="deviceTable">
+        <el-table
+          ref="multipleTable"
+          :data="deviceTableData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          height="calc(100% - 40px)"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
+          <!-- <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>
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+          <el-table-column label="时间表类型" show-overflow-tooltip>
+            <template>时间表类型</template>
+          </el-table-column>
+          <el-table-column
+            prop="startTime"
+            label="开始时间"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="结束时间"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="span"
+            label="间隔（分）"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="remark"
+            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 type="text" @click.native.stop="handleSet(scope.row)"
+                >设置</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pageNation">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="page"
+            :page-size="pageSize"
+            layout=" prev, pager, next, jumper,total"
+            :total="total"
+            background
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <!-- 新增时间表 -->
+    <adddeviceDialog :title="title" ref="adddeviceDialogref"></adddeviceDialog>
+  </div>
+</template>
+<script>
+import adddeviceDialog from "./components/adddeviceDialog.vue";
+
+export default {
+  components: {
+    adddeviceDialog,
+  },
+  data() {
+    return {
+      title: "", //弹窗标题
+      deviceTableData: [],
+      //multipleSelection: [], //获取当前选中
+      page: 1, // 当前页数
+      pageSize: 10, // 每页数量
+      total: 0, //总条数
+    };
+  },
+  created() {
+    this.deviceList();
+  },
+  methods: {
+    //获取线路列表数据
+    deviceList() {
+      getScheduleRulelListJoggle({
+        pageindex: this.page,
+        pagesize: this.pageSize,
+      })
+        .then((res) => {
+          this.deviceTableData = res.data.list;
+          this.total = res.data.total;
+        })
+        .catch((err) => {});
+    },
+    //点击行选中
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    //获取选中的行
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    // 新建
+    handleAdddevice() {
+      this.title = "新增";
+      this.$refs.adddeviceDialogref.display();
+      this.$refs.adddeviceDialogref.getdataform(null);
+    },
+
+    //修改
+    handleResive(data) {
+      this.title = "修改";
+      this.$refs.adddeviceDialogref.display();
+      this.$refs.adddeviceDialogref.getdataform(data);
+    },
+
+    //设置
+    handleSet(data) {
+      this.$refs.setdeviceDialogref.display();
+      this.$refs.setdeviceDialogref.getdataform(data);
+    },
+
+    //删除数据
+    handleDelete(data) {
+      let deleteArr = [];
+      deleteArr.push({
+        id: data.id,
+      });
+      this.$confirm("确定要删除记录吗,同时删除关联关系?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteScheduleRulel({ list: deleteArr }).then((res) => {
+            this.deviceList(); //刷新
+          });
+          this.$message({ type: "success", message: "删除成功!" });
+        })
+        .catch(() => {
+          this.$message({ type: "info", message: "已取消删除" });
+        });
+    },
+    //点击分页
+    handleCurrentChange(val) {
+      this.page = val;
+      this.deviceList();
+    },
+  },
+};
+</script>
+<style lang="less">
+.camerChannel {
+  width: calc(100% - 32px);
+  height: calc(100% - 32px);
+  padding: 16px 16px;
+  background: @color-white;
+
+  .deviceBox {
+    border: 1px solid #dddddd;
+    height: calc(100% - 32px);
+    padding: 16px;
+    border-radius: 4px;
+  }
+  .deviceBtnGroup {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .deviceTable {
+    margin-top: 16px;
+    height: calc(100% - 48px);
+    //background: #fcc;
+  }
+}
+</style>
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 3af6987..e198e0d 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -71,7 +71,7 @@ export default {
   data() {
     return {
       swiperOptionTop: {
-        loop: true,
+        // loop: true,
         loopedSlides: 5, // looped slides should be the same
         spaceBetween: 10,
         navigation: {
@@ -80,7 +80,7 @@ export default {
         },
       },
       swiperOptionThumbs: {
-        loop: true,
+        //loop: true,
         loopedSlides: 5, // looped slides should be the same
         spaceBetween: 10,
         centeredSlides: true,
@@ -121,10 +121,12 @@ export default {
       .bigimg {
         width: 100%;
         height: 100%;
+        display: flex;
+        align-items: center;
       }
       img {
         width: 100%;
-        height: 100%;
+        //height: 100%;
         // object-fit: cover;
       }
     }
@@ -142,7 +144,7 @@ export default {
 
       img {
         width: 100%;
-        height: 100%;
+        //height: 100%;
 
         //object-fit: cover;
       }
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 73f6d6b..c70a436 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -184,10 +184,9 @@ export default {
 </script>
 <style lang="less">
 .deviceInformation {
-  width: 100%;
-  width: calc(100% - 16px);
+  width: calc(100% - 32px);
   height: calc(100% - 32px);
-  padding: 16px 8px;
+  padding: 16px 16px;
   background: @color-white;
 
   .deviceBox {
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index ff0c265..c10376b 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -3,61 +3,58 @@
     class="addPhotoDialog"
     :title="photoDialogTitle"
     :visible.sync="photoDialog"
-    width="654px"
+    width="830px"
   >
     <el-form
       label-position="left"
-      label-width="92px"
+      label-width="98px"
       ref="formPhotoInfo"
       :rules="rules"
       :model="formInfo"
     >
-      <el-form-item label="出厂编号" prop="bsIdentifier" required>
-        <el-input v-model="formInfo.bsIdentifier"></el-input>
+      <el-form-item label="显示名：" prop="displayName" required>
+        <el-input v-model="formInfo.displayName"></el-input>
       </el-form-item>
-      <el-form-item label="生产厂家" prop="bsManufacturer" required>
-        <el-input v-model="formInfo.bsManufacturer"></el-input>
+      <el-form-item label="装置ID：" prop="cmdid" required>
+        <el-input v-model="formInfo.cmdid"></el-input>
       </el-form-item>
-      <el-form-item label="生产日期" prop="bsProductionDate" required>
-        <el-input v-model="formInfo.bsProductionDate"></el-input>
+      <el-form-item label="线路编号：" prop="lineid" required>
+        <el-input v-model="formInfo.lineid"></el-input>
       </el-form-item>
-      <el-form-item label="	图像监测装置 ID" prop="cmdid" required>
-        <el-input v-model="formInfo.cmdid"></el-input>
+      <el-form-item label="杆塔编号：" prop="towerid" required>
+        <el-input v-model="formInfo.towerid"></el-input>
       </el-form-item>
-      <el-form-item label="显示名" prop="displayName" required>
-        <el-input v-model="formInfo.displayName"></el-input>
+      <el-form-item label="是否带云台：" prop="hasPan" required>
+        <el-input v-model="formInfo.hasPan"></el-input>
       </el-form-item>
 
-      <el-form-item label="装置名称" prop="equipName" required>
+      <el-form-item label="装置名称：" prop="equipName" required>
         <el-input v-model="formInfo.equipName"></el-input>
       </el-form-item>
-      <el-form-item
-        label="装置基本信息版本号"
-        prop="essentialInfoVersion"
-        required
-      >
-        <el-input v-model="formInfo.essentialInfoVersion"></el-input>
-      </el-form-item>
-      <el-form-item label="是否带云台" prop="hasPan" required>
-        <el-input v-model="formInfo.hasPan"></el-input>
+      <el-form-item label="装置型号：" prop="model" required>
+        <el-input v-model="formInfo.model"></el-input>
       </el-form-item>
-      <el-form-item label="纬度" prop="latitude" required>
+      <el-form-item label="纬度：" prop="latitude" required>
         <el-input v-model.number="formInfo.latitude"></el-input>
       </el-form-item>
-      <el-form-item label="线路编号" prop="lineid" required>
-        <el-input v-model="formInfo.lineid"></el-input>
-      </el-form-item>
-      <el-form-item label="经度" prop="longitude" required>
+
+      <el-form-item label="经度：" prop="longitude" required>
         <el-input v-model.number="formInfo.longitude"></el-input>
       </el-form-item>
-      <el-form-item label="装置型号" prop="model" required>
-        <el-input v-model="formInfo.model"></el-input>
-      </el-form-item>
-      <el-form-item label="原始 ID" prop="orgId" required>
+      <el-form-item label="原始 ID：" prop="orgId" required>
         <el-input v-model="formInfo.orgId"></el-input>
       </el-form-item>
-      <el-form-item label="杆塔编号" prop="towerid" required>
-        <el-input v-model="formInfo.towerid"></el-input>
+      <el-form-item label="版本号：" prop="essentialInfoVersion" required>
+        <el-input v-model="formInfo.essentialInfoVersion"></el-input>
+      </el-form-item>
+      <el-form-item label="出厂编号：" prop="bsIdentifier" required>
+        <el-input v-model="formInfo.bsIdentifier"></el-input>
+      </el-form-item>
+      <el-form-item label="生产厂家：" prop="bsManufacturer" required>
+        <el-input v-model="formInfo.bsManufacturer"></el-input>
+      </el-form-item>
+      <el-form-item label="生产日期：" prop="bsProductionDate" required>
+        <el-input v-model="formInfo.bsProductionDate"></el-input>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -89,41 +86,38 @@ export default {
     return {
       formInfo: {},
       rules: {
-        bsIdentifier: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+        displayName: [
+          { required: true, message: "请输入显示名", trigger: "blur" },
         ],
-        bsManufacturer: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+        cmdid: [{ required: true, message: "请输入装置ID", trigger: "blur" }],
+        lineid: [
+          { required: true, message: "请输入线路编号", trigger: "blur" },
         ],
-        bsProductionDate: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+        towerid: [
+          { required: true, message: "请输入杆塔编号", trigger: "blur" },
         ],
-        cmdid: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
-        displayName: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+        hasPan: [
+          { required: true, message: "请输入是否带云台", trigger: "blur" },
         ],
+
         equipName: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+          { required: true, message: "请输入装置名称", trigger: "blur" },
         ],
+        model: [{ required: true, message: "请输入装置型号", trigger: "blur" }],
+        latitude: [{ required: true, message: "请输入纬度", trigger: "blur" }],
+        longitude: [{ required: true, message: "请输入经度", trigger: "blur" }],
+        orgId: [{ required: true, message: "请输入原始 ID", trigger: "blur" }],
         essentialInfoVersion: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
-        ],
-        hasPan: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
-        ],
-        latitude: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+          { required: true, message: "请输入版本号", trigger: "blur" },
         ],
-        lineid: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+        bsIdentifier: [
+          { required: true, message: "请输入出厂编号", trigger: "blur" },
         ],
-        longitude: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+        bsManufacturer: [
+          { required: true, message: "请输入生产厂家", trigger: "blur" },
         ],
-        model: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
-        orgId: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
-        towerid: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+        bsProductionDate: [
+          { required: true, message: "请输入生产日期", trigger: "blur" },
         ],
       },
       //表单数组，对象
@@ -232,7 +226,13 @@ export default {
     .el-form {
       display: flex;
       flex-wrap: wrap;
-      justify-content: space-between;
+      .el-form-item {
+        width: 246px;
+        margin-right: 16px;
+        .el-form-item__label {
+          padding-right: 0px;
+        }
+      }
     }
   }
 }
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index c2554be..674d076 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -16,8 +16,6 @@
           @selection-change="handleSelectionChange"
           @row-click="handleRowClick"
         >
-          <!-- <el-table-column type="index" width="55"> </el-table-column>
-          <el-table-column type="selection" width="55"> </el-table-column> -->
           <el-table-column
             prop="displayName"
             label="显示名"
@@ -25,25 +23,45 @@
             width="160px"
           >
           </el-table-column>
-          <el-table-column prop="equipName" label="装置名称" width="140px">
-          </el-table-column>
           <el-table-column
             prop="cmdid"
             label="图像监测装置ID"
             show-overflow-tooltip
-            width="120px"
+            width="160px"
+          >
+          </el-table-column>
+          <el-table-column prop="lineid" label="线路编号"> </el-table-column>
+          <el-table-column prop="towerid" label="杆塔编号"> </el-table-column>
+          <el-table-column prop="hasPan" label="是否带云台">
+            <template slot-scope="scope">
+              <span v-if="scope.row.hasPan == 0">否</span>
+              <span v-if="scope.row.hasPan == 1">是</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="updateTime"
+            label="修改时间"
+            :show-overflow-tooltip="true"
+            :formatter="dateFormat"
+            width="160px"
           >
           </el-table-column>
+          <el-table-column prop="equipName" label="装置名称"> </el-table-column>
+          <el-table-column prop="model" label="装置型号"> </el-table-column>
+          <el-table-column label="经维度">
+            <template slot-scope="scope" v-if="scope.row.longitude">
+              <span>({{ scope.row.longitude }},</span>
+              <span>{{ scope.row.latitude }})</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="orgId" label="原始ID"> </el-table-column>
           <el-table-column
             prop="essentialInfoVersion"
             label="装置基本信息版本号"
             width="140px"
           >
           </el-table-column>
-          <el-table-column prop="lineid" label="线路编号"> </el-table-column>
-          <el-table-column prop="model" label="装置型号"> </el-table-column>
-          <el-table-column prop="orgId" label="原始ID"> </el-table-column>
-          <el-table-column prop="towerid" label="杆塔编号"> </el-table-column>
           <el-table-column label="出厂编号">
             <template slot-scope="scope">{{ scope.row.bsIdentifier }}</template>
           </el-table-column>
@@ -54,7 +72,6 @@
             label="生产日期"
             :show-overflow-tooltip="true"
             :formatter="dateFormat"
-            width="140px"
           >
           </el-table-column>
 
@@ -63,27 +80,9 @@
             label="创建时间"
             :show-overflow-tooltip="true"
             :formatter="dateFormat"
-            width="140px"
           >
           </el-table-column>
 
-          <el-table-column prop="hasPan" label="是否带云台">
-            <template slot-scope="scope">
-              <span v-if="scope.row.hasPan == 0">否</span>
-              <span v-if="scope.row.hasPan == 1">是</span>
-            </template>
-          </el-table-column>
-          <!-- <el-table-column prop="latitude" label="维度"> </el-table-column>
-          <el-table-column prop="longitude" label="经度"> </el-table-column> -->
-
-          <el-table-column
-            prop="updateTime"
-            label="修改时间"
-            :show-overflow-tooltip="true"
-            :formatter="dateFormat"
-            width="100px"
-          >
-          </el-table-column>
           <el-table-column fixed="right" label="操作" width="160">
             <template slot-scope="scope">
               <el-button
@@ -240,12 +239,9 @@ export default {
 </script>
 <style lang="less">
 .photoGraphicDevice {
-  width: 100%;
-  height: 100%;
-  background: @color-white;
-  width: calc(100% - 16px);
+  width: calc(100% - 32px);
   height: calc(100% - 32px);
-  padding: 16px 8px;
+  padding: 16px 16px;
   background: @color-white;
   .photoBox {
     border: 1px solid #dddddd;
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 317c616..2ef363d 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -175,9 +175,9 @@ export default {
 </script>
 <style lang="less">
 .lineInformation {
-  width: calc(100% - 16px);
+  width: calc(100% - 32px);
   height: calc(100% - 32px);
-  padding: 16px 8px;
+  padding: 16px 16px;
   background: @color-white;
   .lineBox {
     border: 1px solid #dddddd;
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 48c044d..43c761a 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -3,8 +3,6 @@
     <div class="monitor-container">
       <!-- 左侧数据列表树 -->
       <div class="sideBar">
-        <!-- <treeSide></treeSide> -->
-        <!-- <el-tree ref="tree" :data="barData" @node-click="handleNodeClick" :props="defaultProps"></el-tree> -->
         <el-tree
           :data="lineTreeData"
           :props="defaultProps"
@@ -26,9 +24,7 @@
           </span>
         </el-tree>
       </div>
-      <!-- <router-view></router-view> -->
-      <!-- 中心内容 -->
-      <!-- <picturemain :photoData="photoData" v-if="showBigPic"></picturemain> -->
+
       <!-- 带参数的中心内容右侧参数区 -->
       <div class="picSetBox">
         <div class="swiperBox">
@@ -39,7 +35,7 @@
         </div>
         <div class="parameterArea">
           <div class="paramsDate">
-            <h3>日期选择</h3>
+            <h3>日历快速查询</h3>
             <el-date-picker
               v-model="dateValue"
               type="date"
@@ -50,7 +46,7 @@
             </el-date-picker>
           </div>
           <div class="monitorItemBox" v-if="channelOption.length !== 0">
-            <h3>通道</h3>
+            <h3>选择通道监拍点</h3>
             <el-select
               v-model="channelValue"
               placeholder="请选择"
@@ -66,17 +62,43 @@
             </el-select>
           </div>
           <div class="setTimebtn">
-            <h3>设置</h3>
+            <h3>操作项</h3>
             <div class="buttonGroup">
               <el-button type="primary" @click.native.stop="handleSetSchedule()"
                 >时间表设置</el-button
               >
-              <el-button type="primary">手动拍照</el-button>
+              <el-button type="primary" @click="handleShowErr"
+                >主动拍照</el-button
+              >
+              <el-button type="primary" @click="handleShowErr"
+                >主动录像</el-button
+              >
+              <el-button type="primary" @click="handleShowErr"
+                >历史图片</el-button
+              >
+              <el-button type="primary" @click="handleShowErr"
+                >历史图片对比</el-button
+              >
+              <el-button type="primary" @click="handleShowErr"
+                >图片标记</el-button
+              >
+              <el-button type="primary" @click="handleShowErr"
+                >主动巡航</el-button
+              >
+              <el-button type="primary" @click="handleShowErr"
+                >隐患类型</el-button
+              >
+              <el-button type="primary" @click="handleShowErr"
+                >监拍点信息</el-button
+              >
+              <el-button type="primary" @click="handleShowErr">
+                设备信息</el-button
+              >
             </div>
           </div>
         </div>
       </div>
-      <!-- <paramArea></paramArea> -->
+
       <setschedule ref="setschedule_ref"></setschedule>
     </div>
   </div>
@@ -90,14 +112,10 @@ import {
 } from "@/utils/api/index";
 import carouselChart from "../components/carouselChart.vue";
 
-import picturemain from "./picturemain.vue"; //照片展示
-import paramArea from "./paramArea.vue"; //右侧参数区
 import setschedule from "./components/setschedule.vue";
 
 export default {
   components: {
-    picturemain,
-    paramArea,
     carouselChart,
     setschedule,
   },
@@ -118,7 +136,7 @@ export default {
       channelValue: "",
       terminalPhoto: [], //获取拍照装置当前数据
       dateValue: "", //日期
-      nopicPath: require("@/assets/img/noPhoto.png"),
+      nopicPath: require("@/assets/img/nopic.jpg"),
     };
   },
   watch: {},
@@ -139,7 +157,7 @@ export default {
       console.log(this.dateValue);
       console.log(this.channelList);
       this.getTerminalPhotoList(
-        this.channelList[0].id,
+        this.channelList[0].channelid,
         this.dateValue,
         this.channelList[0].termId
       );
@@ -248,15 +266,21 @@ export default {
       this.$refs.setschedule_ref.getSingleAccess(this.channelId);
       this.$refs.setschedule_ref.deviceList();
     },
+    handleShowErr() {
+      this.$message({
+        message: "该功能暂未开发,敬请期待",
+        type: "warning",
+      });
+    },
   },
 };
 </script>
 
 <style lang="less">
 .monitorBox {
-  width: calc(100% - 16px);
+  width: calc(100% - 32px);
   height: calc(100% - 32px);
-  padding: 16px 8px;
+  padding: 16px 16px;
   background: #ffffff;
   .monitor-container {
     display: flex;
@@ -316,6 +340,20 @@ export default {
           width: 215px;
         }
       }
+      .setTimebtn {
+        .buttonGroup {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: space-between;
+          .el-button {
+            margin-bottom: 8px;
+            width: 104px;
+          }
+          .el-button + .el-button {
+            margin-left: 0px;
+          }
+        }
+      }
     }
   }
 }
diff --git a/src/views/realTimeMonitor/paramArea.vue b/src/views/realTimeMonitor/paramArea.vue
deleted file mode 100644
index 0eee0f5..0000000
--- a/src/views/realTimeMonitor/paramArea.vue
+++ /dev/null
@@ -1,216 +0,0 @@
-<template>
-  <div class="parameterArea">
-    <div class="timeBox"></div>
-    <div class="monitorItemBox">
-      <h3>检测项</h3>
-      <div class="btnBox">
-        <el-button
-          type="primary"
-          v-for="(item, index) in MonitorItem"
-          :key="index"
-          icon="el-icon-thumb"
-          >{{ item.name }}</el-button
-        >
-      </div>
-    </div>
-    <div class="monitorPointBox">
-      <h3>监拍点</h3>
-      <div class="btnBox">
-        <el-button
-          type="primary"
-          v-for="(item, index) in MonitorPoint"
-          :key="index"
-          icon="el-icon-thumb"
-          >{{ item.name }}</el-button
-        >
-      </div>
-    </div>
-    <div class="actionItem">
-      <h3>操作项</h3>
-      <div class="btnBox">
-        <el-button
-          type="primary"
-          v-for="(item, index) in actionItem"
-          :key="index"
-          icon="el-icon-thumb"
-          >{{ item.name }}</el-button
-        >
-      </div>
-    </div>
-    <div class="configItem">
-      <h3>配置项</h3>
-      <div class="btnBox">
-        <el-button
-          type="primary"
-          v-for="(item, index) in configItem"
-          :key="index"
-          icon="el-icon-thumb"
-          >{{ item.name }}</el-button
-        >
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      //检测项
-      MonitorItem: [
-        {
-          name: "图片视频",
-        },
-        {
-          name: "测温",
-        },
-        {
-          name: "微气象",
-        },
-        {
-          name: "倾斜监测",
-        },
-        {
-          name: "风偏监测",
-        },
-        {
-          name: "覆冰检测",
-        },
-        {
-          name: "实时视频",
-        },
-        {
-          name: "弧垂",
-        },
-        {
-          name: "电压检测",
-        },
-      ],
-      //监拍点
-      MonitorPoint: [
-        {
-          name: "小号侧",
-        },
-        {
-          name: "大号侧",
-        },
-      ],
-      //操作项
-      actionItem: [
-        {
-          name: "主动拍照",
-        },
-        {
-          name: "主动录像",
-        },
-        {
-          name: "声光报警",
-        },
-        {
-          name: "图片调阅",
-        },
-        {
-          name: "微信推送",
-        },
-        {
-          name: "历史图片",
-        },
-        {
-          name: "线缆绘制",
-        },
-        {
-          name: "清除绘制",
-        },
-        {
-          name: "主动巡检",
-        },
-        {
-          name: "指令集",
-        },
-        {
-          name: "开启雨刮",
-        },
-        {
-          name: "喊话",
-        },
-        {
-          name: "上一设备",
-        },
-        {
-          name: "下一设备",
-        },
-        {
-          name: "返回",
-        },
-        {
-          name: "历史对比",
-        },
-        {
-          name: "图片标记",
-        },
-        {
-          name: "主动巡航",
-        },
-      ],
-      //配置项
-      configItem: [
-        {
-          name: "设置分组",
-        },
-        {
-          name: "隐患类型",
-        },
-        {
-          name: "地图查看",
-        },
-        {
-          name: "监拍点信息",
-        },
-        {
-          name: "告警级别",
-        },
-        {
-          name: "设备信息",
-        },
-        {
-          name: "设置漏告",
-        },
-      ],
-    };
-  },
-};
-</script>
-<style lang="less">
-// .parameterArea {
-//   width: 300px;
-//   padding: 16px 8px;
-//   .monitorItemBox,
-//   .monitorPointBox,
-//   .actionItem,
-//   .configItem {
-//     border: 1px solid @border-color-base;
-//     padding: 8px 16px 8px 16px;
-//     margin-bottom: 32px;
-//     h3 {
-//       font-size: 16px;
-//       margin-bottom: 8px;
-//       background: transparent;
-//       color: @color-text-regular;
-//     }
-//     .btnBox {
-//       display: flex;
-//       flex-wrap: wrap;
-//       justify-content: space-between;
-//       .el-button {
-//         width: 84px;
-//         padding: 6px 0px;
-//         font-size: 12px;
-//         margin-bottom: 8px;
-//       }
-//       .el-button + .el-button {
-//         margin-left: 0px;
-//       }
-//     }
-//   }
-// }
-</style>
diff --git a/src/views/realTimeMonitor/picturemain.vue b/src/views/realTimeMonitor/picturemain.vue
deleted file mode 100644
index 7121db9..0000000
--- a/src/views/realTimeMonitor/picturemain.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
-  <div class="picture" v-if="photoData">
-    <div class="picTop">
-      <h3>{{ photoData.text }}</h3>
-      <div class="total">
-        <span>监拍设备:14套 监拍点:14个 视频:0套 测温:0 套 微气象:0 套</span>
-      </div>
-    </div>
-    <div class="picmain">
-      <div class="photosPic">
-        <div class="topTitle">
-          <h4>{{ photoData.children[0].text }};大号侧</h4>
-          <div class="iconList">
-            <i class="el-icon-video-camera" title="主副机"></i>
-            <i class="el-icon-video-camera" title="夜视"></i>
-            <i class="el-icon-video-camera" title="云台"></i>
-            <i class="el-icon-video-camera" title="T基+通道"></i>
-            <i class="el-icon-video-camera" title="声光告警"></i>
-            <i class="el-icon-video-camera" title="测温"></i>
-            <i class="el-icon-video-camera" title="微气象"></i>
-          </div>
-        </div>
-        <ul class="picShow">
-          <li
-            v-for="(item, index) in lagrePic.slice(0, 4)"
-            :key="index"
-            @click="picShow(index)"
-          >
-            <img :src="'http://180.166.218.222:8104/media/' + item.filePath" />
-            <span class="timeShow">{{ item.captureTime }}</span>
-          </li>
-        </ul>
-      </div>
-      <div class="photosPic">
-        <div class="topTitle">
-          <h4>{{ photoData.children[0].text }};小号测</h4>
-          <div class="iconList">
-            <i class="el-icon-video-camera" title="主副机"></i>
-            <i class="el-icon-video-camera" title="夜视"></i>
-            <i class="el-icon-video-camera" title="云台"></i>
-            <i class="el-icon-video-camera" title="T基+通道"></i>
-            <i class="el-icon-video-camera" title="声光告警"></i>
-            <i class="el-icon-video-camera" title="测温"></i>
-            <i class="el-icon-video-camera" title="微气象"></i>
-          </div>
-        </div>
-        <ul class="picShow">
-          <li
-            v-for="(item, index) in smallPic.slice(0, 4)"
-            :key="index"
-            @click="picShow(index)"
-          >
-            <img :src="'http://180.166.218.222:8104/media/' + item.filePath" />
-            <span class="timeShow">{{ item.captureTime }}</span>
-          </li>
-        </ul>
-      </div>
-    </div>
-    <div class="page">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage4"
-        :page-size="100"
-        layout="prev, pager, next, jumper,total"
-        :total="400"
-      >
-      </el-pagination>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: ["photoData"],
-  data() {
-    return {
-      dataPhoto: "",
-      lagrePic: [],
-      smallPic: [],
-      currentPage4: 4,
-    };
-  },
-  mounted: function () {
-    this.getPhoto();
-  },
-  methods: {
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    },
-    getPhoto() {
-      console.log(photo);
-      //this.dataPhoto = photo;
-      photo.forEach((item) => {
-        console.log(item);
-        if (item.orientation === "1") {
-          this.lagrePic.push(item);
-        } else {
-          this.smallPic.push(item);
-        }
-      });
-    },
-    picShow(index) {
-      console.log(index);
-    },
-  },
-};
-</script>
-
-<style lang="less">
-.picture {
-  flex: 1;
-  padding: 16px;
-  width: 100%;
-  .picTop {
-    display: flex;
-    justify-content: space-between;
-    align-items: baseline;
-    h3 {
-      font-size: 24px;
-      line-height: 30px;
-      color: @color-text-regular;
-    }
-    .total span {
-      color: @color-text-secondary;
-      font-size: 14px;
-      line-height: 30px;
-    }
-  }
-  .picmain {
-    border: 1px solid @border-color-base;
-    .photosPic {
-      padding-bottom: 12px;
-      border-bottom: 1px solid @border-color-base;
-      &:last-child {
-        border-bottom: 0px solid @border-color-base;
-      }
-      .topTitle {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        h4 {
-          padding: 0 10px;
-          display: inline-block;
-          line-height: 45px;
-          color: @color-text-regular;
-          font-size: 16px;
-          font-weight: bold;
-        }
-        .iconList {
-          i {
-            color: @color-text-secondary;
-            margin-right: 12px;
-            font-size: 28px;
-          }
-        }
-      }
-      .picShow {
-        display: flex;
-        padding-left: 6px;
-        justify-content: space-between;
-
-        li {
-          display: inline-block;
-          position: relative;
-          width: 24.5%;
-          img {
-            width: 100%;
-            height: 100%;
-          }
-          .timeShow {
-            position: absolute;
-            top: 0;
-            left: 0;
-            background: @color-primary;
-            display: inline-block;
-            color: @color-white;
-            font-size: 14px;
-            padding: 4px;
-          }
-        }
-      }
-    }
-  }
-  .page {
-    margin-top: 16px;
-  }
-}
-</style>