diff --git a/src/router/index.js b/src/router/index.js
index 5d00f4e..f2adf33 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,10 +4,10 @@ import VueRouter from "vue-router";
 Vue.use(VueRouter);
 
 const routes = [
-  {
-    path: "/",
-    redirect: "/realTimeMonitor",
-  },
+  // {
+  //   path: "/",
+  //   redirect: "/realTimeMonitor",
+  // },
   {
     path: "/",
     component: () =>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 6134f1c..0079294 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -99,7 +99,7 @@ export default {
           this.token = this.$md5(this.userInfo.password); //获取token
           this.$store.commit("SET_TOKEN", this.token); //将token保存在vuex中
           this.$store.commit("SET_USERINFO", this.userInfo.username); //将用户信息保存在vuex中
-          this.$router.push("/");
+          this.$router.push("/realTimeMonitor");
           this.$message.success("登录成功");
         } else {
           this.$message.error("请输入账号和密码");
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index b8cfbaa..4b938b8 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -12,7 +12,8 @@
           bigPicPath ? 'backgroundImage:url(' + bigPicPath + '!128x72)' : ''
         "
       >
-        <img class="animImg" :src="bigPicPath + '!1280x720'" />
+        <img ref="picJpg" class="animImg" :src="bigPicPath + '!1280x720'" />
+        <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
         <!-- <p class="mark">
           {{ bigPicPath }}
           <span>{{ this.activeSmall }}</span>
@@ -168,6 +169,13 @@ export default {
       page: 1, //当前第几页
       pagesize: 5, //每页显示五条
       total: 0, //总共又几页
+
+      localPoints: [], //画图对象
+      canvas: null,
+      ctx: null,
+      imgpic: null,
+      color: "#FF0000",
+      num: 5,
     };
   },
   mounted() {
@@ -176,6 +184,16 @@ export default {
     this.fiveList = this.terminalPhoto.slice(this.page - 1, this.pagesize);
     this.total = this.terminalPhoto.length / this.pagesize;
     console.log("this.bigPicPath");
+    this.$nextTick(function () {
+      // codeing
+
+      console.log(localStorage.getItem("piclinePoints"));
+    });
+    this.localPoints = JSON.parse(localStorage.getItem("piclinePoints"));
+    console.log(this.localPoints);
+    if (this.localPoints !== "") {
+      this.drawline();
+    }
   },
   watch: {
     terminalPhoto: function (newVal, oldVal) {
@@ -184,8 +202,31 @@ export default {
       this.total = this.terminalPhoto.length / this.pagesize;
     },
   },
-
+  created() {},
   methods: {
+    drawline() {
+      this.canvas = this.$refs.myCanvas;
+      this.imgpic = this.$refs.picJpg;
+      console.log(this.canvas);
+      console.log(this.imgpic);
+      this.canvas.width = this.imgpic.offsetWidth; //设置画布大小
+      this.canvas.height = this.imgpic.offsetHeight; //设置画布大小
+      this.ctx = this.canvas.getContext("2d");
+      console.log(this.localPoints);
+      console.log(this.ctx);
+      this.ctx.beginPath();
+      //设置线条颜色，必须放在绘制之前
+      this.ctx.strokeStyle = this.color;
+      // 线宽设置，必须放在绘制之前
+      this.ctx.lineWidth = this.num;
+      for (var i = 0; i < this.localPoints.length; i++) {
+        this.ctx.moveTo(this.localPoints[i].x1, this.localPoints[i].y1);
+        this.ctx.lineTo(this.localPoints[i].x2, this.localPoints[i].y2);
+      }
+
+      this.ctx.closePath();
+      this.ctx.stroke();
+    },
     getphotoList() {
       this.fiveList = this.terminalPhoto.slice(
         (this.page - 1) * this.pagesize,
@@ -289,6 +330,14 @@ export default {
         //opacity: 0;
         transition: bottom 2s ease 0s;
       }
+      .myCanvas {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        cursor: pointer;
+      }
     }
     img {
       width: 100%;
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index ef2f6a4..352fa39 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -98,7 +98,7 @@ export default {
     let validCmid = (rule, value, callback) => {
       let reg = /^[0-9A-Za-z]{17}$/;
       if (!reg.test(value)) {
-        callback(new Error("装置id位17位编码"));
+        callback(new Error("装置id为17位编码"));
       } else {
         callback();
       }
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
new file mode 100644
index 0000000..5b46372
--- /dev/null
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
@@ -0,0 +1,301 @@
+<template>
+  <el-dialog
+    class="pictureTagsDialog"
+    title="图片绘制"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="1262px"
+  >
+    <div class="picPannel">
+      <div class="imgbox">
+        <img
+          ref="picJpg"
+          src="http://47.96.238.157/photos/2023/05/22/06/XYIGQ10C221000006_1_FF_20230522094507.jpg"
+        />
+        <canvas
+          id="myCanvas"
+          class="myCanvas"
+          ref="myCanvas"
+          @mousedown="mousedown"
+          @mouseup="mouseup"
+          @mousemove="mousemove"
+        ></canvas>
+      </div>
+
+      <div class="setBox">
+        <div class="infoCompany">
+          <!-- <p><label>电压等级：</label><span>220kv</span></p> -->
+          <p>
+            <label>线路名称：</label><span>{{ pictureData.linename }}</span>
+          </p>
+          <p>
+            <label>杆塔名称：</label><span>{{ pictureData.towername }}</span>
+          </p>
+          <p>
+            <label>装置名称：</label><span>{{ pictureData.cmdid }}</span>
+          </p>
+          <p>
+            <label>选择通道：</label>
+            <el-select v-model="picvalue" placeholder="请选择">
+              <el-option
+                v-for="item in picoptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+              >
+              </el-option>
+            </el-select>
+          </p>
+        </div>
+        <div class="setColor">
+          <p>
+            <label>颜色：</label
+            ><el-color-picker v-model="color"></el-color-picker>
+          </p>
+          <p>
+            <label>线宽：</label>
+            <el-input-number
+              v-model="num"
+              controls-position="right"
+              @change="handleChange"
+              :min="1"
+              :max="10"
+            ></el-input-number>
+          </p>
+          <p>
+            <el-button type="primary" @click="restCanvas">重新绘制</el-button>
+            <el-button type="primary" @click="saveCanvas">保存绘制</el-button>
+          </p>
+        </div>
+      </div>
+    </div>
+    <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>
+export default {
+  props: {
+    title: String,
+  },
+  data() {
+    return {
+      canvas: null,
+      ctx: null,
+      imgpic: null,
+      drawingSurfaceImageData: "",
+      color: "#FF0000",
+      num: 5,
+      flag: false,
+      x: 0,
+      y: 0,
+      isShow: false,
+      fileList: [],
+      pictureData: "",
+      picoptions: [],
+      picvalue: "",
+      linePoints: [],
+      localPoints: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    //获取线宽
+    handleChange(value) {
+      console.log(value);
+    },
+    // 保存确定操作
+    submitForm() {
+      this.isShow = false;
+    },
+    display(val) {
+      this.isShow = true;
+      console.log(val);
+      this.pictureData = val; //获取当前列表数据
+      this.picoptions = val.list; //获取所有通道
+      this.picvalue = val.list[0].name; //获取第一个通道
+      console.log("this.canvas");
+      this.$nextTick(function () {
+        // codeing
+        this.canvas = this.$refs.myCanvas;
+        this.imgpic = this.$refs.picJpg;
+
+        console.log(this.canvas);
+        console.log(this.imgpic);
+        this.canvas.width = this.imgpic.offsetWidth; //设置画布大小
+        this.canvas.height = this.imgpic.offsetHeight; //设置画布大小
+        this.ctx = this.canvas.getContext("2d");
+        console.log(localStorage.getItem("piclinePoints"));
+        this.localPoints = JSON.parse(localStorage.getItem("piclinePoints"));
+        if (this.localPoints !== "") {
+          this.drawline();
+        }
+      });
+    },
+    hide() {
+      this.isShow = false;
+      this.pictureData = "";
+      this.picoptions = [];
+      this.picvalue = "";
+    },
+
+    mousedown(e) {
+      console.log("鼠标落下");
+      this.saveDrawingSurface();
+      this.flag = true;
+      this.x = e.offsetX; // 鼠标落下时的X
+      this.y = e.offsetY; // 鼠标落下时的Y
+      console.log(this.x, this.y);
+      console.log(this.flag);
+    },
+    mouseup(e) {
+      console.log("鼠标抬起");
+      console.log(this.x, this.y, e.offsetX, e.offsetY);
+      this.drawRect(e);
+      this.flag = false;
+      this.linePoints.push({
+        x1: this.x,
+        y1: this.y,
+        x2: e.offsetX,
+        y2: e.offsetY,
+      });
+      console.log(this.linePoints);
+    },
+    //保存和恢复绘图面板
+
+    saveDrawingSurface() {
+      this.drawingSurfaceImageData = this.ctx.getImageData(
+        0,
+        0,
+        this.canvas.width,
+        this.canvas.height
+      );
+    },
+
+    restoreDrawingSurface() {
+      this.ctx.putImageData(this.drawingSurfaceImageData, 0, 0);
+    },
+
+    mousemove(e) {
+      console.log("鼠标移动");
+      if (this.flag) {
+        this.restoreDrawingSurface();
+        this.drawRect(e);
+      }
+    },
+    drawRect(e) {
+      if (this.flag) {
+        console.log("绘制图形");
+        let x = this.x;
+        let y = this.y;
+        // ctx.save();
+        this.ctx.beginPath();
+        //设置线条颜色，必须放在绘制之前
+        this.ctx.strokeStyle = this.color;
+        // 线宽设置，必须放在绘制之前
+        this.ctx.lineWidth = this.num;
+        // console.log(x, y, e.offsetX, e.offsetY);
+        // this.ctx.strokeRect(x, y, e.offsetX - x, e.offsetY - y);
+
+        this.ctx.moveTo(x, y);
+        this.ctx.lineTo(e.offsetX, e.offsetY);
+        // this.ctx.moveTo(this.defult[0].x1, this.defult[0].y1);
+        // this.ctx.lineTo(this.defult[0].x2, this.defult[0].y2);
+        this.ctx.closePath();
+
+        this.ctx.stroke();
+      } else {
+        console.log("aaaaaaaa");
+      }
+    },
+    drawline() {
+      console.log(this.localPoints);
+      this.ctx.beginPath();
+      //设置线条颜色，必须放在绘制之前
+      this.ctx.strokeStyle = this.color;
+      // 线宽设置，必须放在绘制之前
+      this.ctx.lineWidth = this.num;
+      for (var i = 0; i < this.localPoints.length; i++) {
+        this.ctx.moveTo(this.localPoints[i].x1, this.localPoints[i].y1);
+        this.ctx.lineTo(this.localPoints[i].x2, this.localPoints[i].y2);
+      }
+      // this.ctx.moveTo(x, y);
+      // this.ctx.lineTo(e.offsetX, e.offsetY);
+
+      this.ctx.closePath();
+
+      this.ctx.stroke();
+    },
+    //点击保存
+    saveCanvas() {
+      console.log(this.linePoints);
+      localStorage.setItem("piclinePoints", JSON.stringify(this.linePoints));
+    },
+    restCanvas() {
+      this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+      this.linePoints = [];
+      console.log(this.linePoints);
+    },
+  },
+};
+</script>
+<style lang="less">
+.pictureTagsDialog {
+  .el-dialog {
+    height: 672px;
+    .el-dialog__body {
+      height: 540px;
+    }
+  }
+
+  .picPannel {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    position: relative;
+    height: 100%;
+    .imgbox {
+      //flex: 1;
+      width: 960px;
+      height: 540px;
+      position: relative;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+      .myCanvas {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        cursor: pointer;
+      }
+    }
+
+    .setBox {
+      width: 230px;
+      padding: 12px;
+      border: 3px solid #2d8cf0;
+      .infoCompany {
+        display: flex;
+        flex-direction: column;
+        line-height: 32px;
+        margin-bottom: 16px;
+      }
+    }
+    .setColor {
+      display: flex;
+      flex-direction: column;
+      line-height: 32px;
+      p {
+        display: flex;
+        align-items: center;
+        margin-bottom: 16px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 9ae2447..b3543f3 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -40,8 +40,8 @@
             </template>
           </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="linename" label="线路编号"> </el-table-column>
+          <el-table-column prop="towername" label="杆塔编号"> </el-table-column>
           <el-table-column prop="hasPan" label="是否带云台">
             <template slot-scope="scope">
               <span v-if="scope.row.hasPan == 0">否</span>
@@ -93,21 +93,25 @@
           >
           </el-table-column>
 
-          <el-table-column fixed="right" label="操作" width="520">
+          <el-table-column fixed="right" label="操作" width="400">
             <template slot-scope="scope">
               <el-button
                 @click.native.stop="handleRevisePhoto(scope.row)"
                 type="text"
                 >修改</el-button
               >
-
+              <el-button
+                type="text"
+                @click.native.stop="handlepicture(scope.row)"
+                >线缆绘制</el-button
+              >
               <el-button
                 type="text"
                 @click.native.stop="handleDeviceReset(scope.row)"
                 >装置复位</el-button
               >
               <!-- <el-button type="text">远程升级</el-button> -->
-              <el-button
+              <!-- <el-button
                 type="text"
                 @click.native.stop="handleShowGPS(scope.row)"
                 >获取GPS位置</el-button
@@ -124,8 +128,8 @@
                   <el-dropdown-item command="open">开启GPS</el-dropdown-item>
                   <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
                 </el-dropdown-menu>
-              </el-dropdown>
-              <!--<el-button type="text">GPS开关</el-button> -->
+              </el-dropdown> -->
+
               <el-button
                 type="text"
                 @click.native.stop="handleImageCapture(scope.row)"
@@ -158,6 +162,7 @@
       ref="addPhotoDialogref"
     ></addPhotoDialog>
     <imageCapture ref="imageCaptureref"></imageCapture>
+    <pictureTags ref="picturetagsref"></pictureTags>
   </div>
 </template>
 <script>
@@ -171,10 +176,12 @@ import {
 import moment from "moment";
 import addPhotoDialog from "./components/addPhotoDialog.vue";
 import imageCapture from "./components/imageCapture.vue";
+import pictureTags from "./components/pictureTags.vue";
 export default {
   components: {
     addPhotoDialog,
     imageCapture,
+    pictureTags,
   },
   data() {
     return {
@@ -185,7 +192,7 @@ export default {
       multipleSelection: [], //当前选中数组
       formphotoInfo: {}, //弹窗传值
       page: 1, // 当前页数
-      pageSize: 20, // 每页数量
+      pageSize: 30, // 每页数量
       total: 0, //总条数
       loading: true,
     };
@@ -238,15 +245,28 @@ export default {
     },
     //装置复位
     handleDeviceReset(data) {
-      resetTerminalApi({ cmId: data.cmdid })
-        .then((res) => {
-          if (res.code == 200) {
-            this.$message({ message: "装置已复位", type: "success" });
-          } else {
-            this.$message({ message: res.msg, type: "error" });
-          }
+      this.$confirm("此操作将复位装置, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          resetTerminalApi({ cmId: data.cmdid })
+            .then((res) => {
+              if (res.code == 200) {
+                this.$message({ message: "装置已复位", type: "success" });
+              } else {
+                this.$message({ message: res.msg, type: "error" });
+              }
+            })
+            .catch((err) => {});
         })
-        .catch((err) => {});
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
     },
     //获取GPS位置
     handleShowGPS(data) {
@@ -308,6 +328,10 @@ export default {
       this.$refs.imageCaptureref.getSingleAccess(data);
       this.$refs.imageCaptureref.getRatio();
     },
+    //线缆绘制
+    handlepicture(data) {
+      this.$refs.picturetagsref.display(data);
+    },
 
     // //新建弹窗handleAddPhoto
     // handleAddPhoto() {
diff --git a/src/views/realTimeMonitor/components/pictureTags.vue b/src/views/realTimeMonitor/components/pictureTags.vue
deleted file mode 100644
index eea293a..0000000
--- a/src/views/realTimeMonitor/components/pictureTags.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <el-dialog
-    class="pictureTagsDialog"
-    title="图片绘制"
-    :visible.sync="isShow"
-    :close-on-click-modal="false"
-    width="1000px"
-  >
-    <div class="picPannel">
-      <div class="imgbox">
-        <img
-          src="http://47.96.238.157/image/2023/04/24/01/DSH10H00000000001_1_FF_20230424192442.jpg"
-        />
-        <!-- <canvas
-          id="myCanvas"
-          class="myCanvas"
-          ref="myCanvas"
-          @mousedown="mousedown"
-          @mouseup="mouseup"
-          @mousemove="mousemove"
-        ></canvas> -->
-      </div>
-
-      <div class="setBox">
-        <div class="infoCompany">
-          <p><label>电压等级：</label><span>220kv</span></p>
-          <p><label>线路名称：</label><span>i1测试线路-SH</span></p>
-          <p><label>装置名称：</label><span>XY-SIMULATOR-0001</span></p>
-        </div>
-        <div class="setColor">
-          <p>
-            <label>颜色：</label
-            ><el-color-picker v-model="color"></el-color-picker>
-          </p>
-          <p>
-            <label>线宽：</label>
-            <el-input-number
-              v-model="num"
-              controls-position="right"
-              @change="handleChange"
-              :min="1"
-              :max="10"
-            ></el-input-number>
-          </p>
-          <p>
-            <el-button type="primary">重新绘制</el-button>
-            <el-button type="primary">保存绘制</el-button>
-          </p>
-        </div>
-      </div>
-    </div>
-    <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>
-export default {
-  props: {
-    title: String,
-  },
-  data() {
-    return {
-      color: "#409EFF",
-      num: 1,
-      flag: false,
-      x: 0,
-      y: 0,
-      isShow: false,
-      fileList: [],
-    };
-  },
-  mounted() {},
-  methods: {
-    //获取线宽
-    handleChange(value) {
-      console.log(value);
-    },
-    // 保存确定操作
-    submitForm() {
-      this.isShow = false;
-    },
-    display() {
-      this.isShow = true;
-    },
-    hide() {
-      this.isShow = false;
-    },
-
-    mousedown(e) {
-      console.log("鼠标落下");
-      this.flag = true;
-      this.x = e.offsetX; // 鼠标落下时的X
-      this.y = e.offsetY; // 鼠标落下时的Y
-      console.log(this.x, this.y);
-    },
-    mouseup(e) {
-      console.log("鼠标抬起");
-      this.flag = false;
-    },
-    mousemove(e) {
-      console.log("鼠标移动");
-      this.drawRect(e);
-    },
-    drawRect(e) {
-      if (this.flag) {
-        console.log("绘制图形");
-        const canvas = this.$refs.myCanvas;
-        var ctx = canvas.getContext("2d");
-        let x = this.x;
-        let y = this.y;
-        ctx.clearRect(0, 0, canvas.width, canvas.height);
-        ctx.beginPath();
-        //设置线条颜色，必须放在绘制之前
-        ctx.strokeStyle = this.color;
-        // 线宽设置，必须放在绘制之前
-        ctx.lineWidth = this.num;
-        console.log(x, y, e.offsetX - x, e.offsetY - y);
-        ctx.strokeRect(x, y, e.offsetX - x, e.offsetY - y);
-      }
-    },
-  },
-};
-</script>
-<style lang="less">
-.pictureTagsDialog {
-  .picPannel {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    position: relative;
-    .imgbox {
-      width: 698px;
-      position: relative;
-      img {
-        width: 100%;
-        height: 100%;
-      }
-      .myCanvas {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-      }
-    }
-
-    .setBox {
-      width: 230px;
-      padding: 12px;
-      border: 3px solid #2d8cf0;
-      .infoCompany {
-        display: flex;
-        flex-direction: column;
-        line-height: 32px;
-        margin-bottom: 16px;
-      }
-    }
-    .setColor {
-      display: flex;
-      flex-direction: column;
-      line-height: 32px;
-      p {
-        display: flex;
-        align-items: center;
-        margin-bottom: 16px;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 3649588..03c0a76 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -181,14 +181,12 @@ import { mapState } from "vuex";
 import carouselChart from "../components/carouselChart.vue";
 import setschedule from "./components/setschedule.vue";
 import deviceUpgrade from "./components/deviceUpgrade.vue";
-import pictureTags from "./components/pictureTags.vue";
 import infoDialog from "./components/infoDialog.vue";
 export default {
   components: {
     carouselChart,
     setschedule,
     deviceUpgrade,
-    pictureTags,
     infoDialog,
   },
   data() {
@@ -196,7 +194,7 @@ export default {
       btnpicloading: false,
       btnvideoloading: false,
       flag: true,
-      onlinestatus: "", //设备状态
+      onlinestatus: "", //设备状态啊
       showBigPic: true,
       defaultKey: "",
       lineTreeData: [],