diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index f1e65cb..41e1d60 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -85,7 +85,7 @@
         </el-form>
       </div>
 
-      <div class="alarmContain" v-loading="loading" v-if="tableShow">
+      <div class="alarmContain" v-loading="loading" v-if="!tableShow">
         <div class="alarmTable">
           <el-table
             ref="multipleTable"
@@ -99,6 +99,9 @@
             @row-click="handleRowClick"
             highlight-current-row
           >
+            <template slot="empty">
+              <el-empty :image-size="160" description="暂无数据"></el-empty>
+            </template>
             <el-table-column min-width="45" label="序号">
               <template slot-scope="scope">
                 <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
@@ -247,15 +250,12 @@
             class="box-card imgList"
             v-for="(item, index) in tableData"
             :key="index"
+            :class="current === index ? 'bgColor' : ''"
           >
             <div class="bigpic">
-              <div class="picshow" @click="handlePicAlarm(item)">
-                <img :src="item.path + '!1366x768'" :ref="'picJpg' + index" />
-                <canvas
-                  :id="'myCanvas' + index"
-                  class="myCanvas"
-                  :ref="'myCanvas' + index"
-                ></canvas>
+              <div class="picshow" @click="handlePicAlarm(item, index)">
+                <img :src="item.path + '!1366x768'" ref="picJpg" />
+                <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
               </div>
 
               <div class="caption">
@@ -281,10 +281,10 @@
                   <el-button
                     type="primary"
                     :loading="btnpicloading"
-                    @click="handlePicList(item)"
+                    @click.stop="handlePicList(item)"
                     >主动拍照</el-button
                   >
-                  <el-button type="primary" @click="handlePicHistory(item)"
+                  <el-button type="primary" @click.stop="handlePicHistory(item)"
                     >历史图片</el-button
                   >
                 </p>
@@ -319,8 +319,8 @@
         <img @load="imgOnload" class="maskPic img" :src="bigPhotoPic" />
         <canvas id="myCanvas" class="myCanvas" ref="myCanvasbig"></canvas>
       </div>
-      <div class="viewClose">
-        <i @click="closePic" class="el-icon-close"></i>
+      <div class="viewClose" @click="closePic">
+        <i class="el-icon-close"></i>
       </div>
     </div>
     <historyimg ref="historyimg_ref"></historyimg>
@@ -385,6 +385,7 @@ export default {
       tableShow: true, //表格展示
       zoomD: 1,
       canvansdata: "",
+      current: 0,
     };
   },
   mounted() {
@@ -450,8 +451,6 @@ export default {
         document.querySelector(
           ".picboxI"
         ).style.transform = `matrix(${this.zoomD}, 0, 0,${this.zoomD}, 0, 0)`;
-
-        this.drawline2(this.canvansdata);
       });
     },
     // 小
@@ -463,7 +462,6 @@ export default {
         document.querySelector(
           ".picboxI"
         ).style.transform = `matrix(${this.zoomD}, 0, 0, ${this.zoomD}, 0, 0)`;
-        this.drawline2(this.canvansdata);
       });
     },
     handleBigPicbox(val) {
@@ -615,8 +613,10 @@ export default {
       this.ctx.closePath();
       this.ctx.stroke();
     },
-    //绘制告警区域
+    //绘制大图告警区域
     drawline2(data) {
+      console.log(data);
+      console.log(this.canvas);
       this.canvas = this.$refs.myCanvasbig;
       this.imgpic = this.$refs.picJpg;
       this.textInfo = data.enname;
@@ -654,6 +654,49 @@ export default {
       this.ctx.closePath();
       this.ctx.stroke();
     },
+    //绘制列表大图
+    drawlineList(data, index) {
+      console.log(data);
+      console.log(this.$refs.myCanvasbig);
+      console.log(this.$refs.picJpg);
+      console.log("picJpg" + index);
+      this.canvas = this.$refs.myCanvasbig;
+      this.imgpic = this.$refs.picJpg;
+      this.textInfo = data.enname;
+      this.canvas.width = this.imgpic[index].offsetWidth; //设置画布大小
+      this.canvas.height = this.imgpic[index].offsetHeight; //设置画布大小
+      console.log(this.canvas.width, this.canvas.height);
+      this.ctx = this.canvas.getContext("2d");
+      this.ctx.beginPath();
+      //设置线条颜色，必须放在绘制之前
+      this.ctx.strokeStyle = "#ff0000";
+      // 线宽设置，必须放在绘制之前
+      this.ctx.lineWidth = 1;
+
+      // 绘制矩形
+      var scaleX = this.canvas.width / data.photoWidth, //this.iw图片的宽
+        scaleY = this.canvas.height / data.photoHeight; //this.ih图片的高
+      console.log(scaleX, scaleY);
+      var top = data.x * scaleX,
+        left = data.y * scaleY,
+        width = data.width * scaleX,
+        height = data.height * scaleY;
+      console.log(top, left, width, height);
+      // this.ctx.strokeStyle = "red"; //线的颜色
+      this.ctx.strokeRect(top, left, width, height); //绘制路径矩形
+      //this.ctx.strokeRect(data.x, data.y, data.width, data.height);
+      this.ctx.font = "16px normal";
+      this.ctx.fillStyle = "#ff0000";
+      //this.ctx.fillText(this.textInfo, top, left + 24);
+      //距离上面有空间
+      if (left > 32) {
+        this.ctx.fillText(this.textInfo, top, left - 4);
+      } else if (this.canvas.height - left + height > 32) {
+        this.ctx.fillText(this.textInfo, top, height - 4);
+      }
+      this.ctx.closePath();
+      this.ctx.stroke();
+    },
     //点击当前行
     handleRowClick(row) {
       //this.$refs.multipleTable.toggleRowSelection(row);
@@ -757,16 +800,20 @@ export default {
       this.selectRow = val;
       this.handleHistory();
     },
-    handlePicAlarm(val) {
-      console.log(val);
+    handlePicAlarm(val, index) {
+      console.log(val, index);
+      this.current = index;
+      this.canvansdata = val;
       this.canvasloading = true;
       if (val.path !== "" && this.tableData.length !== 0) {
         console.log(val);
         this.bigPhotoPic = val.path;
         this.showBigpic = true;
-        // this.$nextTick(() => {
-        //   this.drawline2(val);
-        // });
+
+        this.$nextTick(() => {
+          console.log("huatu");
+          this.drawlineList(val, index);
+        });
       }
     },
     dateFormat(row, column) {
@@ -987,7 +1034,8 @@ export default {
       border-radius: 3px;
       background: #fff;
       height: fit-content;
-      height: auto;
+      //height: auto;
+      border: 2px solid transparent;
       .el-card__body {
         padding: 0px;
       }
@@ -1004,6 +1052,7 @@ export default {
             z-index: 2;
             left: 0;
             top: 0;
+            pointer-events: none;
           }
         }
       }
@@ -1046,6 +1095,9 @@ export default {
         }
       }
     }
+    .bgColor {
+      border: 2px solid #e49e61;
+    }
   }
 }
 </style>
diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue
index 3165ff5..b5cc2a9 100644
--- a/src/views/cameraChannel/index.vue
+++ b/src/views/cameraChannel/index.vue
@@ -23,6 +23,9 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
+          <template slot="empty">
+            <el-empty :image-size="160" description="暂无数据"></el-empty>
+          </template>
           <el-table-column
             label="通道名称"
             show-overflow-tooltip
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 5d22e37..40c3a2c 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -24,6 +24,9 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
+          <template slot="empty">
+            <el-empty :image-size="160" description="暂无数据"></el-empty>
+          </template>
           <el-table-column label="名称" show-overflow-tooltip>
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
index ea6218d..90eda7a 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog class="setimgDialog" title="基本信息" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog
+    class="setimgDialog"
+    title="基本信息"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="70%"
+  >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -34,20 +40,68 @@
       style="width: 100%"
       v-loading="loading"
     >
+      <template slot="empty">
+        <el-empty :image-size="160" description="暂无数据"></el-empty>
+      </template>
       <el-table-column min-width="45" label="序号">
         <template slot-scope="scope">
           <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置型号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置版本号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产厂家" min-width="100" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产日期" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="出厂编号" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column
+        prop="name"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="装置名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="装置型号"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="装置版本号"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="生产厂家"
+        min-width="100"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="生产日期"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="出厂编号"
+        min-width="100"
+        show-overflow-tooltip
+      ></el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
@@ -64,9 +118,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  getLineListJoggle
-} from "@/utils/api/index";
+import { getLineListJoggle } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -105,12 +157,11 @@ export default {
       getLineListJoggle({
         pageindex: this.page,
         pagesize: this.pageSize,
-      })
-        .then((res) => {
-          this.listData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
-        })
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
     },
     //点击分页
     handleCurrentChange(val) {
@@ -127,10 +178,8 @@ export default {
     },
     hide() {
       this.isShow = false;
-    }
+    },
   },
 };
 </script>
-<style lang="less" scoped>
-
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
index a05680e..be38964 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog class="setimgDialog" title="GPS位置数据" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog
+    class="setimgDialog"
+    title="GPS位置数据"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="70%"
+  >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -34,17 +40,50 @@
       style="width: 100%"
       v-loading="loading"
     >
+      <template slot="empty">
+        <el-empty :image-size="160" description="暂无数据"></el-empty>
+      </template>
       <el-table-column min-width="45" label="序号">
         <template slot-scope="scope">
           <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="半径" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="维度" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="经度" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column
+        prop="name"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="半径"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="维度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="经度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
@@ -61,9 +100,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  getLineListJoggle
-} from "@/utils/api/index";
+import { getLineListJoggle } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -102,12 +139,11 @@ export default {
       getLineListJoggle({
         pageindex: this.page,
         pagesize: this.pageSize,
-      })
-        .then((res) => {
-          this.listData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
-        })
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
     },
     //点击分页
     handleCurrentChange(val) {
@@ -124,10 +160,8 @@ export default {
     },
     hide() {
       this.isShow = false;
-    }
+    },
   },
 };
 </script>
-<style lang="less" scoped>
-
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
index c28f3af..e2ecc06 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog class="setimgDialog" title="装置运行状态" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog
+    class="setimgDialog"
+    title="装置运行状态"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="70%"
+  >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -34,18 +40,56 @@
       style="width: 100%"
       v-loading="loading"
     >
+      <template slot="empty">
+        <el-empty :image-size="160" description="暂无数据"></el-empty>
+      </template>
       <el-table-column min-width="45" label="序号">
         <template slot-scope="scope">
           <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="4G信号强度" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="2G信号强度" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="剩余运行内存" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="剩余存储内存" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column
+        prop="name"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="4G信号强度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="2G信号强度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="剩余运行内存"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="剩余存储内存"
+        min-width="100"
+        show-overflow-tooltip
+      ></el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
@@ -62,9 +106,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  getLineListJoggle
-} from "@/utils/api/index";
+import { getLineListJoggle } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -103,12 +145,11 @@ export default {
       getLineListJoggle({
         pageindex: this.page,
         pagesize: this.pageSize,
-      })
-        .then((res) => {
-          this.listData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
-        })
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
     },
     //点击分页
     handleCurrentChange(val) {
@@ -125,10 +166,8 @@ export default {
     },
     hide() {
       this.isShow = false;
-    }
+    },
   },
 };
 </script>
-<style lang="less" scoped>
-
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
index ff408c6..af4ec57 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog class="setimgDialog" title="工作状态" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog
+    class="setimgDialog"
+    title="工作状态"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="70%"
+  >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -34,24 +40,81 @@
       style="width: 100%"
       v-loading="loading"
     >
+      <template slot="empty">
+        <el-empty :image-size="160" description="暂无数据"></el-empty>
+      </template>
       <el-table-column min-width="45" label="序号">
         <template slot-scope="scope">
           <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="电源电压" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="工作温度" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="电池电量" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="浮充状态" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.name == 0 ? '充电' : '放电'  }}</template>
+      <el-table-column
+        prop="name"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="电源电压"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="工作温度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="电池电量"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="浮充状态"
+        min-width="100"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">{{
+          scope.row.name == 0 ? "充电" : "放电"
+        }}</template>
       </el-table-column>
-      <el-table-column prop="name" label="工作总时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="连续工作时间" min-width="100" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="网络连接状态" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.name == 0 ? '已连接' : '未连接'  }}</template>
+      <el-table-column
+        prop="name"
+        label="工作总时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="连续工作时间"
+        min-width="100"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="网络连接状态"
+        min-width="100"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">{{
+          scope.row.name == 0 ? "已连接" : "未连接"
+        }}</template>
       </el-table-column>
     </el-table>
     <div class="pageNation">
@@ -69,9 +132,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  getLineListJoggle
-} from "@/utils/api/index";
+import { getLineListJoggle } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -110,12 +171,11 @@ export default {
       getLineListJoggle({
         pageindex: this.page,
         pagesize: this.pageSize,
-      })
-        .then((res) => {
-          this.listData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
-        })
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
     },
     //点击分页
     handleCurrentChange(val) {
@@ -132,10 +192,8 @@ export default {
     },
     hide() {
       this.isShow = false;
-    }
+    },
   },
 };
 </script>
-<style lang="less" scoped>
-
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index c1a608b..5f05186 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -74,6 +74,9 @@
             
           >
           </el-table-column> -->
+          <template slot="empty">
+            <el-empty :image-size="160" description="暂无数据"></el-empty>
+          </template>
           <el-table-column
             prop="lineName"
             label="线路名称"
@@ -455,7 +458,15 @@ export default {
     this.terminalList();
     this.roleUser = localStorage.getItem("role");
     console.log(this.roleUser);
+    var that = this;
+    document.onkeydown = function (e) {
+      var key = window.event.keyCode;
+      if (key === 13) {
+        that.onSubmit(); // 触发事件
+      }
+    };
   },
+
   methods: {
     //获取电压信息
     getSearchdy() {
diff --git a/src/views/management/monitoringEquipment/photographicDevice/indexhn1.vue b/src/views/management/monitoringEquipment/photographicDevice/indexhn1.vue
index 05030e4..e74b27f 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/indexhn1.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/indexhn1.vue
@@ -74,6 +74,9 @@
             
           >
           </el-table-column> -->
+          <template slot="empty">
+            <el-empty :image-size="160" description="暂无数据"></el-empty>
+          </template>
           <el-table-column
             prop="lineName"
             label="线路名称"
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 7e0e168..63da84b 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -7,6 +7,20 @@
           >新增</el-button
         >
       </div>
+      <div class="searchBox">
+        <el-form :inline="true" :model="formdata" class="demo-form-inline">
+          <el-form-item>
+            <el-input
+              v-model="formdata.search"
+              placeholder="请输入线路名称或公司名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">查询</el-button>
+            <el-button type="primary" @click="onReset">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="lineTable">
         <el-table
           ref="multipleTable"
@@ -21,6 +35,9 @@
         >
           <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
           <!-- <el-table-column type="index" width="55"> </el-table-column> -->
+          <template slot="empty">
+            <el-empty :image-size="160" description="暂无数据"></el-empty>
+          </template>
           <el-table-column label="公司名称" show-overflow-tooltip>
             <template slot-scope="scope">{{
               scope.row.bsManufacturer
@@ -109,19 +126,30 @@ export default {
       pageSize: 20, // 每页数量
       total: 0, //总条数
       loading: true,
+      formdata: {
+        search: "",
+      },
     };
   },
   created() {
+    var that = this;
+    document.onkeydown = function (e) {
+      var key = window.event.keyCode;
+      if (key === 13) {
+        that.onSubmit(); // 触发事件
+      }
+    };
+  },
+  mounted() {
     this.lineList();
   },
   methods: {
     //获取线路列表数据
     lineList() {
       this.loading = true;
-      getLineListJoggle({
-        pageindex: this.page,
-        pagesize: this.pageSize,
-      })
+      this.$set(this.formdata, "pageindex", this.page);
+      this.$set(this.formdata, "pagesize", this.pageSize);
+      getLineListJoggle(this.formdata)
         .then((res) => {
           this.lineTableData = res.data.list;
           this.total = res.data.total;
@@ -137,7 +165,18 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-
+    //查询
+    onSubmit() {
+      this.page = 1;
+      this.lineList();
+    },
+    //重置
+    onReset() {
+      this.formdata = {};
+      this.page = 1;
+      this.pageSize = 20;
+      this.lineList();
+    },
     // 新建弹窗
     handleAddLine() {
       this.lineDialogTitle = "新增";
@@ -213,7 +252,26 @@ export default {
     height: calc(100% - 24px);
     padding: 12px;
     border-radius: 4px;
+    .searchBox {
+      margin-top: 8px;
+      .ml10 {
+        margin-left: 10px;
+      }
+      .el-form {
+        .dybox {
+          .el-form-item__content {
+            width: 120px;
+          }
+        }
+        .xlbox {
+          .el-form-item__content {
+            width: 160px;
+          }
+        }
+      }
+    }
   }
+
   .lineBtnGroup {
     display: flex;
     justify-content: space-between;
@@ -221,8 +279,8 @@ export default {
   }
 
   .lineTable {
-    margin-top: 16px;
-    height: calc(100% - 48px);
+    //margin-top: 16px;
+    height: calc(100% - 94px);
   }
 }
 </style>
diff --git a/src/views/management/userEquipment/towerInformation/components/addDialog.vue b/src/views/management/userEquipment/towerInformation/components/addDialog.vue
index e714b73..70acec2 100644
--- a/src/views/management/userEquipment/towerInformation/components/addDialog.vue
+++ b/src/views/management/userEquipment/towerInformation/components/addDialog.vue
@@ -27,6 +27,9 @@
       <el-form-item label="杆塔名称：" prop="name">
         <el-input v-model="formdata.name" autocomplete="off"></el-input>
       </el-form-item>
+      <el-form-item label="杆塔地址：" prop="address">
+        <el-input v-model="formdata.address" autocomplete="off"></el-input>
+      </el-form-item>
       <el-form-item label="排序号：" prop="order">
         <el-input-number
           controls-position="right"
@@ -80,7 +83,8 @@ export default {
           order: 0,
         });
       }
-      this.formdata = val;
+      //this.formdata = val;
+      this.formdata = JSON.parse(JSON.stringify(val));
     },
     // 保存确定操作
     submitForm() {
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index 454f275..1fffbd9 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -10,6 +10,20 @@
           >新增</el-button
         >
       </div>
+      <div class="searchBox">
+        <el-form :inline="true" :model="formdata" class="demo-form-inline">
+          <el-form-item>
+            <el-input
+              v-model="formdata.search"
+              placeholder="请输入线路/杆塔/地址"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">查询</el-button>
+            <el-button type="primary" @click="onReset">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="deviceTable">
         <el-table
           ref="multipleTable"
@@ -24,7 +38,9 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
-
+          <template slot="empty">
+            <el-empty :image-size="160" description="暂无数据"></el-empty>
+          </template>
           <el-table-column
             prop="lineName"
             label="线路名称"
@@ -40,8 +56,13 @@
             label="杆塔名称"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            prop="address"
+            label="杆塔地址"
+            show-overflow-tooltip
+          ></el-table-column>
 
-          <el-table-column prop="order" label="排序号">
+          <el-table-column prop="order" label="排序号" width="100">
             <template slot-scope="scope">
               {{ scope.row.order == null ? 0 : scope.row.order }}
             </template>
@@ -98,23 +119,44 @@ export default {
       pageSize: 20, // 每页数量
       total: 0, //总条数
       loading: true,
+
+      formdata: {
+        search: "",
+      },
     };
   },
-  mounted() {
-    console.log("ssss");
-    this.deviceList();
+  created() {
+    var that = this;
+    document.onkeydown = function (e) {
+      var key = window.event.keyCode;
+      if (key === 13) {
+        that.onSubmit(); // 触发事件
+      }
+    };
   },
-  activated() {
+  mounted() {
     this.deviceList();
   },
+
   methods: {
+    //查询
+    onSubmit() {
+      this.page = 1;
+      this.deviceList();
+    },
+    //重置
+    onReset() {
+      this.formdata = {};
+      this.page = 1;
+      this.pageSize = 20;
+      this.deviceList();
+    },
     //获取数据列表
     deviceList() {
       this.loading = true;
-      getTowerListApi({
-        pageindex: this.page,
-        pagesize: this.pageSize,
-      })
+      this.$set(this.formdata, "pageindex", this.page);
+      this.$set(this.formdata, "pagesize", this.pageSize);
+      getTowerListApi(this.formdata)
         .then((res) => {
           this.tableDate = res.data.list;
           this.total = res.data.total;
@@ -201,6 +243,24 @@ export default {
     height: calc(100% - 24px);
     padding: 12px;
     border-radius: 4px;
+    .searchBox {
+      margin-top: 8px;
+      .ml10 {
+        margin-left: 10px;
+      }
+      .el-form {
+        .dybox {
+          .el-form-item__content {
+            width: 120px;
+          }
+        }
+        .xlbox {
+          .el-form-item__content {
+            width: 160px;
+          }
+        }
+      }
+    }
   }
   .deviceBtnGroup {
     display: flex;
@@ -208,8 +268,7 @@ export default {
     align-items: center;
   }
   .deviceTable {
-    margin-top: 16px;
-    height: calc(100% - 48px);
+    height: calc(100% - 94px);
     //background: #fcc;
   }
 }
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index f1f4f6f..dd07deb 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -67,6 +67,7 @@
           <div class="zzbox">
             <!-- <h3>装置名称</h3> -->
             <p class="zzidname">{{ cmdid }}</p>
+            <p class="addressname">这里是杆塔的地址{{ cmdid }}</p>
           </div>
           <div class="paramsDate">
             <h3>日历快速查询</h3>
@@ -977,6 +978,13 @@ export default {
         }
         .zzidname {
           font-weight: normal;
+          color: #169e8c;
+        }
+        .addressname {
+          margin-top: 16px;
+          font-size: 14px;
+          line-height: 22px;
+          color: #333;
         }
       }
       .setTimebtn {
diff --git a/src/views/system/userManagement.vue b/src/views/system/userManagement.vue
index 0fde1cd..93bdbb4 100644
--- a/src/views/system/userManagement.vue
+++ b/src/views/system/userManagement.vue
@@ -20,6 +20,9 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
+          <template slot="empty">
+            <el-empty :image-size="160" description="暂无数据"></el-empty>
+          </template>
           <el-table-column
             label="用户名"
             show-overflow-tooltip