From 63957ef12a25f96edb9ddd64cfc80190fb750e06 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 1 Nov 2023 09:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9C=E8=A7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                     |   54 +-
 src/utils/api/index.js                  |  101 --
 src/views/alarmHandling/index.vue       | 1301 -----------------------
 src/views/pictureRotation/index.vue     |  563 ----------
 src/views/system/components/addUser.vue |  163 ---
 src/views/system/globalTools/index.vue  |  280 -----
 src/views/system/userManagement.vue     |  200 ----
 src/views/waterMark/index.vue           |  286 -----
 8 files changed, 1 insertion(+), 2947 deletions(-)
 delete mode 100644 src/views/alarmHandling/index.vue
 delete mode 100644 src/views/pictureRotation/index.vue
 delete mode 100644 src/views/system/components/addUser.vue
 delete mode 100644 src/views/system/globalTools/index.vue
 delete mode 100644 src/views/system/userManagement.vue
 delete mode 100644 src/views/waterMark/index.vue

diff --git a/src/router/index.js b/src/router/index.js
index 848fe86..dfbf061 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -33,18 +33,7 @@ const routes = [
           icon: "el-icon-camera",
         },
       },
-      {
-        path: "/pictureRotation",
-        component: () =>
-          import(
-            /* webpackChunkName: "home" */ "../views/pictureRotation/index.vue"
-          ),
-        meta: {
-          title: "图片轮巡",
-          permission: true,
-          icon: "el-icon-camera",
-        },
-      },
+
       {
         path: "/realTimeSearch",
         component: () =>
@@ -57,35 +46,6 @@ const routes = [
           icon: "el-icon-camera",
         },
       },
-      {
-        path: "/photoAlarm",
-        component: () =>
-          import(
-            /* webpackChunkName: "home" */ "../views/alarmHandling/index.vue"
-          ),
-        meta: {
-          title: "告警处理",
-          permission: true,
-          icon: "el-icon-camera",
-        },
-      },
-
-      {
-        path: "/userManagement",
-        component: () =>
-          import(
-            /* webpackChunkName: "tabs" */ "../views/system/userManagement.vue"
-          ),
-        meta: { title: "用户管理", icon: "el-icon-monitor" },
-      },
-      {
-        path: "/globalTools",
-        component: () =>
-          import(
-            /* webpackChunkName: "tabs" */ "../views/system/globalTools/index.vue"
-          ),
-        meta: { title: "全局设置" },
-      },
       {
         path: "/lineInformation",
         component: () =>
@@ -126,18 +86,6 @@ const routes = [
           ),
         meta: { title: "拍照时间表设置", icon: "" },
       },
-      {
-        path: "/waterMark",
-        component: () =>
-          import(/* webpackChunkName: "tabs" */ "../views/waterMark/index.vue"),
-        meta: { title: "水印下发", icon: "" },
-      },
-      // {
-      //   path: "/echarts",
-      //   component: () =>
-      //     import(/* webpackChunkName: "tabs" */ "../echartsDemo.vue"),
-      //   meta: { title: "echarts图表", icon: "" },
-      // },
     ],
   },
 
diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 2a749c9..0b338c2 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -223,15 +223,6 @@ export function getTermLastGPSPosition(data) {
     },
   });
 }
-//图片轮巡
-//获取图片轮巡接口
-export function getPictureList(data) {
-  return request({
-    url: "/api/getPhotoBanner",
-    method: "post",
-    data,
-  });
-}
 
 //历史图片
 //获取电压-线路-杆塔等信息
@@ -251,32 +242,6 @@ export function getRealtimePhoto(data) {
   });
 }
 
-//告警功能
-//获取告警列表
-export function getAlarmList(data) {
-  return request({
-    url: "/api/getTerminalAlarmList",
-    method: "post",
-    data,
-  });
-}
-//获取告警label
-export function getAlarmTypeList(data) {
-  return request({
-    url: "/api/getAlarmTypeList",
-    method: "post",
-    data,
-  });
-}
-//已读未读
-export function readAlarm(data) {
-  return request({
-    url: "/api/readAlarm",
-    method: "post",
-    data,
-  });
-}
-
 //手动拍照
 export function takePicJoggle(data) {
   return request({
@@ -292,61 +257,7 @@ export function takePicJoggle(data) {
 }
 
 //用户管理
-//用户列表查询
-export function getUserList(data) {
-  return request({
-    url: "/api/userList",
-    method: "post",
-    data,
-  });
-}
-//新增用户
-export function addUserApi(data) {
-  return request({
-    url: "/api/addUser",
-    method: "post",
-    data,
-  });
-}
-
-//删除用户
-export function delUserApi(data) {
-  return request({
-    url: "/api/deleteUser",
-    method: "post",
-    data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
-  });
-}
 
-//设置告警可信度
-export function updateAlarmTypeList(data) {
-  return request({
-    url: "/api/updateAlarmTypeList",
-    method: "post",
-    data,
-  });
-} //全局设置线缆绘制
-export function getMarkEnableStatus(data) {
-  return request({
-    url: "/api/getMarkEnableStatus",
-    method: "post",
-    data,
-  });
-}
-//全局更新设置线缆绘制
-export function updateMarkEnableStatus(data) {
-  return request({
-    url: "/api/updateMarkEnableStatus",
-    method: "post",
-    data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
-  });
-}
 //全局设置通道
 
 export function updateAlarmChannel(data) {
@@ -667,15 +578,3 @@ export function updateTermCamera(data) {
     params: data,
   });
 }
-
-//郑州检测左侧树状结构接口
-export function getzzdyTreeList(data) {
-  return request({
-    url: "/api/getzzdyTreeList",
-    method: "get",
-    params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
-  });
-}
diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
deleted file mode 100644
index a97ba04..0000000
--- a/src/views/alarmHandling/index.vue
+++ /dev/null
@@ -1,1301 +0,0 @@
-<template>
-  <div class="alarmHandBox">
-    <div class="searchMain">
-      <div class="searchBox">
-        <el-form :inline="true" :model="formdata" class="demo-form-inline">
-          <el-form-item label="电压等级" class="dybox">
-            <el-select v-model="formdata.dyId" @change="getSearchxl">
-              <el-option
-                v-for="item in dyOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="线路名称" class="xlbox">
-            <el-select
-              v-model="formdata.lineId"
-              @change="getSearchgt"
-              filterable
-            >
-              <el-option
-                v-for="item in xlOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="杆塔名称">
-            <el-select v-model="formdata.towerId" filterable>
-              <el-option
-                v-for="item in gtOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="开始日期">
-            <!-- <el-date-picker
-              v-model="formdata.timeVal"
-              type="datetimerange"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="timestamp"
-            ></el-date-picker> -->
-            <el-date-picker
-              v-model="formdata.starttime"
-              type="datetime"
-              placeholder="开始日期"
-              value-format="timestamp"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="结束日期">
-            <el-date-picker
-              v-model="formdata.endtime"
-              type="datetime"
-              default-time="23:59:59"
-              placeholder="结束日期"
-              value-format="timestamp"
-              class="ml10"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="告警原因" class="gjbox">
-            <el-select v-model="formdata.label">
-              <el-option
-                v-for="item in gjOptions"
-                :key="item.label"
-                :label="item.name"
-                :value="item.label"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-input
-              v-model="formdata.search"
-              placeholder="请输入线路/杆塔/设备名称"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="onSubmit">查询</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="handleListRow">{{
-              tableShow ? "图片列表" : "表格列表"
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <div class="alarmContain" v-loading="loading" v-if="tableShow">
-        <div class="alarmTable">
-          <el-table
-            ref="multipleTable"
-            :data="tableData"
-            stripe
-            border
-            tooltip-effect="dark"
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-            height="calc(100% - 40px)"
-            @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>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="alarmTime"
-              label="告警时间"
-              min-width="135"
-              :show-overflow-tooltip="true"
-              :formatter="dateFormat"
-            >
-            </el-table-column>
-
-            <!-- <el-table-column
-              prop="dyLevel"
-              label="电压等级"
-              min-width="75"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column> -->
-            <el-table-column
-              prop="lineName"
-              label="线路名称"
-              min-width="105"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="towerName"
-              label="杆塔名称"
-              min-width="145"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="displayName"
-              label="设备名称"
-              min-width="145"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              label="通道"
-              min-width="75"
-              :show-overflow-tooltip="true"
-            >
-              <template slot-scope="scope">{{
-                scope.row.alias !== null && scope.row.alias !== ""
-                  ? scope.row.alias
-                  : scope.row.channnelName
-              }}</template>
-            </el-table-column>
-            <!-- <el-table-column
-              prop="termId"
-              label="设备编号"
-              min-width="75"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column> -->
-
-            <el-table-column
-              prop="enname"
-              label="告警原因"
-              min-width="155"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column label="是否已读" min-width="95" fixed="right">
-              <template slot-scope="scope">
-                <span v-if="scope.row.isread == 1" class="readbox">[已读]</span>
-                <span v-if="scope.row.isread == 0">[未读]</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="pageNation">
-            <el-pagination
-              @current-change="handleCurrentChange"
-              @size-change="handleSizeChange"
-              :current-page="page"
-              :page-size="pageSize"
-              layout="sizes, prev, pager, next, jumper,total"
-              :total="total"
-            >
-            </el-pagination>
-          </div>
-        </div>
-        <div class="alarmPic">
-          <div
-            class="imgshow"
-            v-loading="alarmLoading"
-            @click="handleBigPicbox(selectRow)"
-          >
-            <!-- @click="handleBigPicbox(selectRow)" -->
-            <div
-              class="picshow"
-              v-if="selectRow.path !== '' && tableData.length !== 0"
-            >
-              <!-- v-viewer="OptionssalseImg" -->
-              <img ref="picJpg" class="animImg" :src="photoPic + '!1366x768'" />
-              <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
-            </div>
-            <img
-              ref="picJpg"
-              src="../../assets/img/nopic.jpg"
-              v-if="
-                selectRow.path == '' ||
-                selectRow.path == null ||
-                tableData.length == 0
-              "
-            />
-          </div>
-          <div class="editorBtn">
-            <el-button
-              type="primary"
-              :loading="btnpicloading"
-              @click="handleCommandpic"
-              :disabled="tableData.length == 0"
-              >主动拍照</el-button
-            >
-            <el-button
-              type="primary"
-              @click="handlePicHistory(selectRow)"
-              :disabled="tableData.length == 0"
-              >历史图片</el-button
-            >
-          </div>
-        </div>
-      </div>
-      <div class="pictureBox" v-else v-loading="loading">
-        <div class="piclist" v-if="tableData.length !== 0">
-          <div
-            class="box-card imgList"
-            v-for="(item, index) in tableData"
-            :key="index"
-            :class="current === index ? 'bgColor' : ''"
-          >
-            <div class="bigpic">
-              <div class="toolsBtn">
-                <el-button
-                  title="主动拍照"
-                  type="primary"
-                  icon="el-icon-camera"
-                  @click.stop="handlePicList(item)"
-                ></el-button>
-                <el-button
-                  title="历史图片"
-                  type="primary"
-                  icon="el-icon-picture-outline"
-                  @click.stop="handlePicHistory(item)"
-                ></el-button>
-              </div>
-              <div class="picshow" @click="handlePicAlarm(item)">
-                <img
-                  v-if="item.path == '' || null"
-                  src="../../assets/img/nodatapic2.jpg"
-                />
-                <img
-                  v-else
-                  :id="'img' + index"
-                  :ref="'imgref' + index"
-                  :src="item.path + '!1366x768'"
-                  ref="picJpg"
-                />
-                <canvas
-                  :ref="'canvansref' + index"
-                  :id="'canvas_' + index"
-                  class="canvasAll"
-                ></canvas>
-              </div>
-              <div class="caption">
-                <p class="infoTop">
-                  <span v-if="item.isread == 1" class="readbox">[已读]</span>
-                  <span v-if="item.isread == 0">[未读]</span>
-                  <span>
-                    {{ item.lineName }} /
-                    {{
-                      item.displayName !== null && item.displayName !== ""
-                        ? item.displayName
-                        : item.cmdid
-                    }}
-                    /
-                    {{
-                      item.alias !== null && item.alias !== ""
-                        ? item.alias
-                        : item.channnelName
-                    }}
-                  </span>
-                </p>
-                <p class="infoBottom">
-                  <span>{{
-                    $moment(item.alarmTime).format("YYYY-MM-DD HH:mm:ss")
-                  }}</span>
-                  <span class="alarmInfo">({{ item.enname }})</span>
-                </p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="piclist" v-else>
-          <el-empty description="暂无数据"></el-empty>
-        </div>
-        <div class="pageNation">
-          <el-pagination
-            @current-change="handleCurrentChange"
-            @size-change="handleSizeChange"
-            :current-page="page"
-            :page-size="pageSize"
-            layout="sizes, prev, pager, next, jumper,total"
-            :total="total"
-          >
-          </el-pagination>
-        </div>
-      </div>
-    </div>
-    <!-- 点击出现大图 -->
-    <div v-if="showBigpic" class="showPic" v-loading="canvasloading">
-      <div
-        class="picboxI"
-        @mousewheel.prevent="rollImg"
-        :style="{ transform: 'scale(' + zoomD + ')' }"
-        @mousedown="move"
-      >
-        <img
-          @load="imgOnload"
-          id="bigimg"
-          ref="bigimgref"
-          class="maskPic img"
-          :src="bigPhotoPic"
-        />
-        <canvas id="bigCanvas" class="myCanvas" ref="myCanvasbig"></canvas>
-      </div>
-      <div class="viewClose" @click="closePic">
-        <i class="el-icon-close"></i>
-      </div>
-    </div>
-    <morePicPreveiw ref="morePicPreveiw_ref"></morePicPreveiw>
-  </div>
-</template>
-
-<script>
-import {
-  getSearchInfo,
-  getAlarmList,
-  getAlarmTypeList,
-  getTermStatus,
-  takePicJoggle,
-  getTakePicPhotoStatusJoggle,
-  getTakePicStatusJoggle,
-  readAlarm,
-} from "@/utils/api/index";
-import morePicPreveiw from "../realTimeMonitor/components/morePicPreveiw";
-import moment from "moment";
-export default {
-  components: {
-    morePicPreveiw,
-  },
-  data() {
-    return {
-      OptionssalseImg: {
-        inline: false,
-        button: true,
-        navbar: false,
-        title: false,
-        toolbar: false,
-        tooltip: false,
-        zoomable: true,
-        url: "src",
-      },
-      dyOptions: [{ id: -1, name: "全部" }], //电压数据
-      xlOptions: [{ id: -1, name: "全部" }], //线路数据
-      gtOptions: [{ id: -1, name: "全部" }], //杆塔数据
-
-      gjOptions: [{ id: -1, label: -1, name: "全部" }], //告警数据
-      formdata: {
-        dyId: -1,
-        lineId: -1,
-        towerId: -1,
-        label: -1,
-        search: "",
-        // timeVal: "",
-      },
-      photoPic: "",
-      tableData: [],
-      multipleSelection: [],
-      page: 1, // 当前页数
-      pageSize: 20, // 每页数量
-      total: 0, //总条数
-      loading: false,
-      btnpicloading: false,
-      timer: null,
-      i: 0,
-      isreadshow: false,
-      showBigpic: false,
-      textInfo: "",
-      bigPhotoPic: "", //大图路径
-      selectRow: {},
-      alarmLoading: false,
-      canvasloading: false,
-      tableShow: false, //表格展示
-      zoomD: 1,
-      canvansdata: "",
-      current: 0,
-      requestId: "", //请求拍照返回的requestid
-      picTime: "", //请求拍照返回的时间
-    };
-  },
-  created() {
-    var that = this;
-    document.onkeydown = function (e) {
-      var key = window.event.keyCode;
-      if (key === 13) {
-        that.onSubmit(); // 触发事件
-      }
-    };
-  },
-  mounted() {
-    // this.$set(this.formdata, "timeVal", [
-    //   new Date(new Date().toLocaleDateString()).getTime(),
-    //   new Date().getTime(),
-    // ]);
-    // $("#elementToZoomOn").smartZoom({
-    //   maxScale: 2,
-    // });
-
-    this.$set(
-      this.formdata,
-      "starttime",
-      new Date(new Date().toLocaleDateString()).getTime()
-    );
-    this.$set(this.formdata, "endtime", new Date().getTime());
-    this.getSearchdy();
-    this.getTableList();
-  },
-  methods: {
-    //移动demo
-    move(e) {
-      console.log(e);
-      e.preventDefault();
-      // 获取元素
-      var personBox = document.querySelector(".picboxI");
-      var img = document.querySelector(".img");
-      var x = e.pageX - img.offsetLeft;
-      var y = e.pageY - img.offsetTop;
-      // 添加鼠标移动事件
-      personBox.addEventListener("mousemove", move);
-      console.log(personBox.addEventListener("mousemove", move));
-      console.log(personBox.style);
-      function move(e) {
-        console.log(personBox.style.left);
-        personBox.style.left = e.pageX - x + "px";
-        personBox.style.top = e.pageY - y + "px";
-      }
-      // 添加鼠标抬起事件，鼠标抬起，将事件移除
-      img.addEventListener("mouseup", function () {
-        personBox.removeEventListener("mousemove", move);
-      });
-      // 鼠标离开父级元素，把事件移除
-      personBox.addEventListener("mouseout", function () {
-        personBox.removeEventListener("mousemove", move);
-      });
-    },
-    // 缩放图片
-    rollImg(e) {
-      let direction = e.deltaY > 0 ? "down" : "up";
-      if (direction === "up") {
-        // 滑轮向上滚动
-        this.large();
-      } else {
-        // 滑轮向下滚动
-        this.Small();
-      }
-    },
-    //大
-    large() {
-      this.$nextTick(() => {
-        if (this.zoomD < 6) {
-          this.zoomD += 0.1;
-        }
-        document.querySelector(
-          ".picboxI"
-        ).style.transform = `matrix(${this.zoomD}, 0, 0,${this.zoomD}, 0, 0)`;
-      });
-    },
-    // 小
-    Small() {
-      this.$nextTick(() => {
-        if (this.zoomD > 0.3) {
-          this.zoomD -= 0.1;
-        }
-        document.querySelector(
-          ".picboxI"
-        ).style.transform = `matrix(${this.zoomD}, 0, 0, ${this.zoomD}, 0, 0)`;
-      });
-    },
-    handleBigPicbox(val) {
-      this.canvasloading = true;
-      this.canvansdata = val;
-      if (val.path !== "" && this.tableData.length !== 0) {
-        this.bigPhotoPic = val.path;
-        this.showBigpic = true;
-        setTimeout(() => {
-          this.$nextTick(() => {
-            this.drawline2(val);
-          });
-        }, 100);
-      }
-    },
-    closePic() {
-      this.showBigpic = false;
-      this.zoomD = 1;
-    },
-    //获取电压信息
-    getSearchdy() {
-      getSearchInfo({ type: 1 })
-        .then((res) => {
-          this.dyOptions = this.dyOptions.concat(res.data.list);
-          this.formdata.dyId = this.dyOptions[0].id;
-          this.getSearchxl();
-        })
-        .catch((err) => {});
-    },
-    //获取线路数据
-    getSearchxl() {
-      getSearchInfo({ type: 2, id: this.formdata.dyId })
-        .then((res) => {
-          this.xlOptions = [{ id: -1, name: "全部" }];
-          this.xlOptions = this.xlOptions.concat(res.data.list);
-          this.formdata.lineId = this.xlOptions[0].id;
-          this.getSearchgt();
-        })
-        .catch((err) => {});
-    },
-    //获取杆塔数据
-    getSearchgt() {
-      getSearchInfo({ type: 3, id: this.formdata.lineId })
-        .then((res) => {
-          this.gtOptions = [{ id: -1, name: "全部" }];
-          this.gtOptions = this.gtOptions.concat(res.data.list);
-          this.formdata.towerId = this.gtOptions[0].id;
-          this.getSearchgj();
-        })
-        .catch((err) => {});
-    },
-    //获取告警原因
-    getSearchgj() {
-      getAlarmTypeList()
-        .then((res) => {
-          this.gjOptions = [{ id: -1, label: -1, name: "全部" }];
-          this.gjOptions = this.gjOptions.concat(res.data.list);
-          console.log(this.gjOptions);
-          this.formdata.label = this.gjOptions[0].label;
-          console.log(this.formdata.label);
-        })
-        .catch((err) => {});
-    },
-    //获取数据
-    getTableList() {
-      this.loading = true;
-      this.$set(this.formdata, "pageindex", this.page);
-      this.$set(this.formdata, "pagesize", this.pageSize);
-      // this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
-      // this.$set(this.formdata, "endtime", this.formdata.timeVal[1]);
-      getAlarmList(this.formdata)
-        .then((res) => {
-          this.loading = false;
-          this.tableData = res.data.list;
-          this.total = res.data.total;
-          this.photoPic = res.data.list[0].path;
-          this.selectRow = res.data.list[0];
-          console.log(this.selectRow);
-
-          if (this.tableShow) {
-            this.$nextTick(() => {
-              this.$refs.multipleTable.setCurrentRow(this.selectRow);
-              this.handleRowClick(this.selectRow);
-            });
-          } else {
-            this.$nextTick(() => {
-              this.drawlineListAll(this.tableData);
-            });
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    },
-    //查询
-    onSubmit() {
-      if (this.formdata.starttime > this.formdata.endtime) {
-        return this.$message({
-          duration: 1500,
-          showClose: true,
-          message: "开始日期不能大于结束日期",
-          type: "warning",
-        });
-      }
-      this.getTableList();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //点击分页
-    handleCurrentChange(val) {
-      this.page = val;
-      this.tableData = [];
-      this.getTableList();
-    },
-    //每页条数
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.tableData = [];
-      this.getTableList();
-    },
-    //绘制告警区域
-    drawline(data) {
-      this.canvas = this.$refs.myCanvas;
-      this.imgpic = this.$refs.picJpg;
-      this.textInfo = data.enname;
-      this.canvas.width = this.imgpic.offsetWidth; //设置画布大小
-      this.canvas.height = this.imgpic.offsetHeight; //设置画布大小
-      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;
-
-      // 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";
-      console.log(top, left, width, height);
-      console.log(this.canvas.width, this.canvas.height);
-      //距离上面有空间
-      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();
-    },
-    //绘制大图告警区域
-    drawline2(data) {
-      console.log(data);
-      console.log(document.getElementById("bigCanvas"));
-      console.log(document.getElementById("bigimg"));
-      this.canvas = document.getElementById("bigCanvas");
-      this.imgpic = document.getElementById("bigimg");
-      console.log(this.canvas);
-      console.log(this.imgpic);
-      this.textInfo = data.enname;
-      this.canvas.width = this.imgpic.offsetWidth; //设置画布大小
-      this.canvas.height = this.imgpic.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 = "14px 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();
-    },
-
-    //绘制所有的图片告警区域
-    drawlineListAll(val) {
-      for (let i = 0; i < val.length; i++) {
-        console.log(i);
-        console.log(document.getElementById("canvas_" + i));
-        console.log(document.getElementById("img" + i));
-        this.canvas = document.getElementById("canvas_" + i);
-        this.imgpic = document.getElementById("img" + i);
-        this.textInfo = val[i].enname;
-        console.log(this.textInfo);
-        console.log(this.imgpic.offsetWidth);
-        console.log(this.canvas);
-        this.canvas.width = this.imgpic.offsetWidth; //设置画布大小
-        this.canvas.height = this.imgpic.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 / val[i].photoWidth, //this.iw图片的宽
-          scaleY = this.canvas.height / val[i].photoHeight; //this.ih图片的高
-        console.log(scaleX, scaleY);
-        var top = val[i].x * scaleX,
-          left = val[i].y * scaleY,
-          width = val[i].width * scaleX,
-          height = val[i].height * scaleY;
-        console.log(top, left, width, height);
-        // this.ctx.strokeStyle = "red"; //线的颜色
-        this.ctx.strokeRect(top, left, width, height); //绘制路径矩形
-        //this.ctx.strokeRect(val[i].x, val[i].y, val[i].width, val[i].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);
-      console.log(this.$refs.picJpg.complete);
-      this.alarmLoading = true;
-      if (row.path == "" || row.path == null) {
-        this.alarmLoading = false;
-      }
-      this.photoPic = row.path;
-      this.selectRow = row;
-      //未读变已读
-      if (row.isread == 0) {
-        setTimeout(function () {
-          readAlarm({
-            id: row.id,
-          })
-            .then((res) => {
-              console.log(res);
-              row.isread = 1;
-              console.log(row.isread);
-            })
-            .catch((err) => {
-              console.log(err);
-            });
-        }, 300);
-      }
-      this.$nextTick(() => {
-        this.drawline(row);
-        this.imgOnload();
-      });
-    },
-
-    //主动拍照
-    handleCommandpic() {
-      getTermStatus({ termId: this.selectRow.termId }).then((res) => {
-        console.log(res);
-        if (res.data.isonline) {
-          takePicJoggle({
-            captureType: 0,
-            channel: this.selectRow.channelId,
-            termId: this.selectRow.termId,
-            preset: 255,
-          })
-            .then((res) => {
-              console.log(res);
-              this.requestId = res.data.requestId; //获取requestid 判断装置是否下发
-              this.picTime = res.data.taketime; //获取时间 判断获取最新图片
-              console.log(this.requestId);
-              this.btnpicloading = true;
-              this.statusTimer = window.setInterval(() => {
-                this.getTakePicStatus(res.data);
-                this.statusNum++;
-              }, 3000);
-            })
-            .catch((err) => {
-              console.log(err); //代码错误、请求失败捕获
-            });
-        } else {
-          this.$message({
-            duration: 1500,
-            showClose: true,
-            message: "装置下线，发送指令失败",
-            type: "error",
-          });
-        }
-      });
-    },
-    //获取装置是否下发状态
-    getTakePicStatus(data) {
-      console.log(data);
-      getTakePicStatusJoggle({
-        requestid: data.requestId,
-        termId: this.selectRow.termId,
-        photoTime: new Date(data.taketime).getTime(),
-      })
-        .then((res) => {
-          console.log(res);
-          //res.data  0 状态未知  1 成功 2失败
-          if (
-            res.data.cmaStatus == 0 &&
-            res.data.picStatus == false &&
-            this.statusNum >= 5
-          ) {
-            this.statusNum = 0;
-            clearInterval(this.statusTimer);
-            this.statusTimer = null;
-            this.btnpicloading = false;
-            this.btnvideoloading = false;
-            this.$message({
-              duration: 1500,
-              showClose: true,
-              message: "下发指令超时，请重试！",
-              type: "warning",
-            });
-          } else if (res.data.cmaStatus == 1 || res.data.picStatus == true) {
-            this.$message({
-              duration: 1500,
-              showClose: true,
-              message: "下发指令成功！",
-              type: "success",
-            });
-            this.statusNum = 0;
-            clearInterval(this.statusTimer);
-            this.statusTimer = null;
-            this.timer = window.setInterval(() => {
-              this.newPicApi();
-              this.i++;
-            }, 8000);
-          } else if (res.data == 2) {
-            this.statusNum = 0;
-            clearInterval(this.statusTimer);
-            this.statusTimer = null;
-            this.$message({
-              duration: 1500,
-              showClose: true,
-              message: "下发指令失败！",
-              type: "error",
-            });
-          }
-        })
-        .catch((err) => {
-          console.log(err); //代码错误、请求失败捕获
-        });
-    },
-    //获取最新图片
-    newPicApi() {
-      getTakePicPhotoStatusJoggle({
-        photoTime: new Date(this.picTime).getTime(),
-        termId: this.selectRow.termId,
-        requestid: this.requestId,
-      }).then((res) => {
-        console.log(res.data);
-        if (res.data == true && this.i < 10) {
-          clearInterval(this.timer);
-          this.timer = null;
-          this.i = 0;
-          this.btnpicloading = false;
-          this.$notify({
-            title: "通知信息",
-            message: "已返回最新图片",
-            type: "success",
-            position: "bottom-right",
-          });
-        } else if (res.data == false && this.i > 10) {
-          clearInterval(this.timer);
-          this.timer = null;
-          this.i = 0;
-          this.btnpicloading = false;
-          this.$notify({
-            title: "通知信息",
-            message: "装置暂无响应，请稍后再试！",
-            type: "warning",
-            position: "bottom-right",
-          });
-        }
-      });
-    },
-
-    //历史图片
-    handleHistory(val) {
-      this.$refs.historyimg_ref.display(val);
-      this.$refs.historyimg_ref.getdataform(this.selectRow);
-    },
-    //切换图片
-    handleListRow() {
-      this.tableShow = !this.tableShow;
-      this.zoomD = 1;
-      if (!this.tableShow) {
-        this.$nextTick(() => {
-          this.drawlineListAll(this.tableData);
-        });
-      } else {
-        this.$nextTick(() => {
-          this.$refs.multipleTable.setCurrentRow(this.selectRow);
-          this.handleRowClick(this.selectRow);
-        });
-      }
-    },
-
-    //在图片列表也执行  自动拍照和 查看历史图片
-    handlePicList(val) {
-      console.log(val);
-      this.selectRow = val;
-      this.handleCommandpic();
-    },
-    handlePicHistory(val) {
-      console.log(val);
-      this.selectRow = val;
-      let currentPrams = {
-        linename: val.lineName,
-        towername: val.towerName,
-        alias: val.alias,
-        channnelname: val.channnelName,
-        photoTime: val.alarmTime,
-        termid: val.termId,
-        channelid: val.channelId,
-      };
-      this.$refs.morePicPreveiw_ref.display(currentPrams);
-    },
-    handlePicAlarm(val, index) {
-      console.log(val, index);
-      this.current = index;
-      this.canvasloading = true;
-      this.canvansdata = val;
-      if (val.path !== "" && this.tableData.length !== 0) {
-        console.log(val);
-        this.bigPhotoPic = val.path;
-        this.showBigpic = true;
-        setTimeout(() => {
-          this.$nextTick(() => {
-            this.drawline2(val);
-          });
-        }, 100);
-
-        //未读变已读
-        if (val.isread == 0) {
-          setTimeout(function () {
-            readAlarm({
-              id: val.id,
-            })
-              .then((res) => {
-                console.log(res);
-                val.isread = 1;
-                console.log(val.isread);
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-          }, 300);
-        }
-      }
-    },
-    dateFormat(row, column) {
-      var date = row[column.property];
-      if (date == undefined) {
-        return "";
-      }
-      return moment(date).format("YYYY-MM-DD HH:mm:ss");
-    },
-    imgOnload() {
-      console.log("加载完成");
-      this.alarmLoading = false;
-      this.canvasloading = false;
-    },
-  },
-};
-</script>
-<style lang="less">
-.alarmHandBox {
-  width: calc(100% - 24px);
-  height: calc(100% - 24px);
-  padding: 12px 12px;
-  background: #ffffff;
-  .showPic {
-    position: fixed;
-    background-color: rgba(0, 0, 0, 50%);
-    bottom: 0;
-    left: 0;
-    overflow: hidden;
-    right: 0;
-    top: 0;
-    z-index: 9999;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    cursor: pointer;
-    .picboxI {
-      position: relative;
-      width: 85%;
-      height: 85%;
-      margin: auto;
-      animation-name: scaleDraw;
-      /*关键帧名称*/
-      animation-timing-function: ease;
-      /*动画的速度曲线*/
-      animation-iteration-count: 1;
-      /*动画播放的次数*/
-      animation-duration: 0.65s;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      img {
-        max-width: 100%;
-        max-height: 100%;
-
-        margin: auto;
-        position: absolute;
-        cursor: grab;
-      }
-      .myCanvas {
-        position: absolute;
-        // top: 0;
-        // left: 0;
-        max-width: 100%;
-        max-height: 100%;
-        margin: 0 auto;
-        cursor: pointer;
-        pointer-events: none;
-      }
-    }
-    .viewClose {
-      -webkit-app-region: no-drag;
-      background-color: rgba(0, 0, 0, 0.5);
-      border-radius: 50%;
-      cursor: pointer;
-      height: 80px;
-      overflow: hidden;
-      position: absolute;
-      right: -40px;
-      top: -40px;
-      transition: background-color 0.15s;
-      width: 80px;
-      .el-icon-close {
-        bottom: 16px;
-        left: 16px;
-        position: absolute;
-        color: #fff;
-        font-size: 18px;
-      }
-    }
-  }
-  .searchMain {
-    border: 1px solid #dddddd;
-    height: calc(100% - 22px);
-    max-height: calc(100% - 22px);
-    padding: 12px;
-    border-radius: 4px;
-    .searchBox {
-      .ml10 {
-        margin-left: 10px;
-      }
-      .el-form {
-        .dybox {
-          .el-form-item__content {
-            width: 120px;
-          }
-        }
-        .xlbox {
-          .el-form-item__content {
-            width: 160px;
-          }
-        }
-        .gjbox {
-          .el-form-item__content {
-            width: 140px;
-          }
-        }
-      }
-    }
-  }
-  .alarmTop {
-    padding: 0px 8px 16px 8px;
-  }
-  .alarmContain {
-    display: flex;
-    height: calc(100% - 98px);
-    padding: 0px 8px;
-    .alarmTable {
-      width: 50%;
-      height: 100%;
-      .el-table__body tr {
-        cursor: pointer;
-      }
-      .el-table__body tr.current-row > td {
-        background-color: rgba(18, 128, 113, 0.2);
-      }
-      .readbox {
-        color: #169e8c;
-      }
-    }
-    .pageNation {
-      margin-top: 8px;
-      justify-content: flex-start;
-    }
-    .alarmPic {
-      width: 50%;
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      .imgshow {
-        width: 100%;
-        height: 100%;
-        position: relative;
-        .picshow {
-          width: 100%;
-          height: 100%;
-          position: relative;
-        }
-        .nosee {
-          position: absolute;
-          width: 100%;
-          height: 100%;
-          background-size: 100% 100%;
-          z-index: 2;
-        }
-        .bigimgView {
-          position: absolute;
-          width: 100%;
-          height: 100%;
-          z-index: 3;
-          opacity: 0;
-        }
-        img {
-          width: 100%;
-          height: 100%;
-        }
-        .myCanvas {
-          position: absolute;
-          top: 0;
-          left: 0;
-          width: 100%;
-          height: 100%;
-          cursor: pointer;
-          z-index: 2;
-          pointer-events: none;
-        }
-      }
-      .editorBtn {
-        margin-top: 8px;
-        // border: 1px solid @border-color-base;
-        padding-top: 5px;
-        // border-radius: 4px;
-      }
-      .editorBtn {
-        display: flex;
-        justify-content: flex-start;
-      }
-    }
-  }
-  .pictureBox {
-    height: calc(100% - 136px);
-    max-height: calc(100% - 136px);
-    .el-empty {
-      margin: auto;
-    }
-    .piclist {
-      // display: flex;
-      // // justify-content: space-around;
-      // flex-wrap: wrap;
-      overflow: auto;
-      border: 1px solid #eee;
-      height: calc(100% - 2px);
-    }
-    .imgList {
-      width: calc((100% - 40px) / 4);
-      position: relative;
-      display: inline-block;
-      margin: 2px;
-      position: relative;
-      border-radius: 3px;
-      background: #fff;
-      height: 30%;
-      border: 2px solid transparent;
-      .bigpic {
-        width: 100%;
-        height: 100%;
-        background-size: 100% 100%;
-        position: relative;
-        .picshow {
-          position: relative;
-          height: 100%;
-          img {
-            cursor: pointer;
-            width: 100%;
-            height: 100%;
-          }
-          .canvasAll {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-            z-index: 2;
-            left: 0;
-            top: 0;
-            pointer-events: none;
-          }
-        }
-        .caption {
-          padding: 6px;
-          color: #fff;
-          position: absolute;
-          left: 0;
-          bottom: 0px;
-          background: rgba(0, 0, 0, 0.5);
-          width: calc(100% - 12px);
-          .alarmInfo {
-            color: #fff;
-          }
-          .infoTop {
-            font-size: 14px;
-            color: #fff;
-            font-weight: normal;
-            margin-top: 2px;
-            padding-left: 5px;
-            padding-right: 5px;
-            .readbox {
-              color: #169e8c;
-            }
-          }
-          .infoBottom {
-            color: #fff;
-            font-size: 12px;
-            font-weight: normal;
-            margin-top: 6px;
-            padding-left: 5px;
-            padding-right: 5px;
-            display: flex;
-            justify-content: space-between;
-            .el-button--small {
-              margin-left: 24px;
-              padding: 4px;
-              width: 78px;
-            }
-            .el-button + .el-button {
-              margin-left: 10px;
-            }
-          }
-        }
-        .toolsBtn {
-          position: absolute;
-          right: 4px;
-          top: 4px;
-          z-index: 2;
-          .el-button {
-            width: auto;
-            background: rgba(0, 0, 0, 0.5);
-            border: 1px solid transparent;
-            color: #fff;
-            font-size: 20px;
-            padding: 2px;
-          }
-        }
-      }
-    }
-    .bgColor {
-      border: 2px solid #169e8c;
-    }
-  }
-  .morePicBox {
-    z-index: 9;
-  }
-}
-</style>
diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue
deleted file mode 100644
index 8ef38c0..0000000
--- a/src/views/pictureRotation/index.vue
+++ /dev/null
@@ -1,563 +0,0 @@
-<template>
-  <div class="picRotation">
-    <div class="rotationBox">
-      <div class="picHead">
-        <div class="pageNation">
-          <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="page"
-            :page-size="pageSize"
-            layout=" prev, pager, next, jumper,total"
-            :total="total"
-          >
-          </el-pagination>
-        </div>
-        <div class="buttonGroup">
-          <span class="info">
-            <b> {{ isRuning ? remainingTime : "已暂停" }} </b>
-          </span>
-          <el-button type="primary" @click="toggleCountdown">{{
-            isRuning ? "暂停轮巡" : "开始轮巡"
-          }}</el-button>
-          <el-button type="primary" @click="setbtn">设置</el-button>
-        </div>
-      </div>
-      <div class="imageCenter" v-loading="loading" v-cloak>
-        <el-row
-          v-for="i in rowNum"
-          :key="'row-' + i"
-          :style="{ height: 100 / rowNum + '%' }"
-        >
-          <el-col
-            :span="24 / colNum"
-            v-for="(item, index) in picList"
-            v-if="index < colNum * i && index >= colNum * (i - 1)"
-            :key="'col-' + index"
-          >
-            <div class="imgList" @click="handleShowHistory(item)">
-              <div
-                v-if="item.path !== null && item.path.indexOf('videos') == -1"
-                class="bigpic"
-              >
-                <img :src="item.path + '!1366x768'" @error="setDefaultImage" />
-              </div>
-              <div
-                class="bigpic"
-                v-else-if="
-                  item.path !== null && item.path.indexOf('videos') !== -1
-                "
-              >
-                <video
-                  width="100%"
-                  height="100%"
-                  :src="item.path"
-                  controls="controls"
-                ></video>
-              </div>
-              <div class="bigpic" v-else>
-                <img src="../../assets/img/nopic.jpg" />
-              </div>
-              <div class="picInfo">
-                <p>
-                  {{ item.linename }}-{{ item.towername }}-（{{
-                    item.alias !== null && item.alias !== ""
-                      ? item.alias
-                      : item.channnelname
-                  }}）
-                </p>
-                <p class="timeinfo" v-if="item.photoTime !== null">
-                  {{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }}
-                </p>
-                <p class="timeinfo" v-else>无抓拍</p>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <el-dialog
-      title="设置"
-      :visible.sync="setdialog"
-      width="480px"
-      :close-on-click-modal="false"
-      class="setPicShow"
-    >
-      <el-form label-position="left">
-        <el-form-item label="轮巡速度">
-          <el-select v-model="selSpeed" placeholder="请选择">
-            <el-option
-              v-for="item in speedOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="画面布局" class="layoutBox">
-          <!-- <el-select v-model="selLayout" placeholder="s请选择">
-            <el-option
-              v-for="item in layoutOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select> -->
-          <div class="selectGroup">
-            <div class="rowbox">
-              <el-radio-group v-model="rowradio" class="radio1">
-                <el-radio-button label="1"></el-radio-button>
-                <el-radio-button label="2"></el-radio-button>
-                <el-radio-button label="3"></el-radio-button>
-                <el-radio-button label="4"></el-radio-button>
-                <!-- <el-radio-button label="5"></el-radio-button>
-                <el-radio-button label="6"></el-radio-button> -->
-              </el-radio-group>
-              <span class="labelinfo">行</span>
-            </div>
-            <div class="colbox">
-              <el-radio-group v-model="colradio" class="radio2">
-                <el-radio-button label="1"></el-radio-button>
-                <el-radio-button label="2"></el-radio-button>
-                <el-radio-button label="3"></el-radio-button>
-                <el-radio-button label="4"></el-radio-button>
-                <!-- <el-radio-button label="5"></el-radio-button>
-                <el-radio-button label="6"></el-radio-button> -->
-              </el-radio-group>
-              <span class="labelinfo">列</span>
-            </div>
-          </div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="setdialog = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm()">确 定</el-button>
-      </div>
-    </el-dialog>
-    <morePicPreveiw ref="morePicPreveiw_ref"></morePicPreveiw>
-    <!-- <el-dialog
-      title="历史图片"
-      :visible.sync="historyPicdialog"
-      width="1366px"
-      :close-on-click-modal="false"
-      class="showDialogHistoryPic"
-    >
-      <div class="title">
-        {{ picInfoData.linename }}-{{ picInfoData.towername }}-（{{
-          picInfoData.alias !== null && picInfoData.alias !== ""
-            ? picInfoData.alias
-            : picInfoData.channnelname
-        }}） {{ $moment(picInfoData.photoTime).format("YYYY-MM-DD ") }}
-      </div>
-      <carouselChart
-        ref="carouselpic"
-        :terminalPhoto="terminalPhoto"
-        v-if="terminalPhoto.length > 0"
-        v-loading="historyPicLoading"
-      ></carouselChart>
-    </el-dialog> -->
-  </div>
-</template>
-<script>
-import { getPictureList, getTerminalPhotoListJoggle } from "@/utils/api/index";
-// import carouselChart from "../realTimeMonitor/components/carouselChart";
-import morePicPreveiw from "../realTimeMonitor/components/morePicPreveiw";
-import defaultImage from "../../assets/img/nodatapic2.jpg";
-export default {
-  components: {
-    morePicPreveiw,
-  },
-  data() {
-    return {
-      OptionssalseImg: {
-        inline: false,
-        button: true,
-        navbar: false,
-        title: false,
-        toolbar: false,
-        tooltip: false,
-        zoomable: true,
-        url: "src",
-      },
-      value: "选项1",
-      page: 1, // 当前页数
-      pageSize: 4, // 每页数量
-      totalPage: 0, //总页数
-      total: 0, //总条数
-      picList: [], //图片列表数据
-      remainingTime: 0, //剩余时间
-      isRuning: false,
-      timer: null,
-      loading: false,
-      setdialog: false, //设置弹框
-      speedOptions: [
-        {
-          value: 5,
-          label: "5秒",
-        },
-        {
-          value: 11,
-          label: "11秒",
-        },
-        {
-          value: 12,
-          label: "12秒",
-        },
-        {
-          value: 13,
-          label: "13秒",
-        },
-        {
-          value: 14,
-          label: "14秒",
-        },
-        {
-          value: 15,
-          label: "15秒",
-        },
-      ], //轮巡速度
-      selSpeed: 5,
-      //画面布局
-      rowNum: "",
-      colNum: "",
-      rowradio: "4",
-      colradio: "4",
-      selLayout: 1,
-      options: [
-        {
-          value: "选项1",
-          label: "顺序",
-        },
-        {
-          value: "选项2",
-          label: "倒序",
-        },
-      ],
-
-      //点击查看历史图片
-      picInfoData: {}, //获取当前图片的信息
-      historyPicdialog: false,
-      historyPicLoading: false,
-      terminalPhoto: [], //获取装置当前图片数据
-      nopicPath: require("@/assets/img/nopic.jpg"),
-    };
-  },
-  methods: {
-    setDefaultImage(e) {
-      e.target.src = defaultImage;
-    },
-    //点击图片弹出历史图
-    handleShowHistory(item) {
-      console.log(item);
-      this.$refs.morePicPreveiw_ref.display(item);
-      // this.picInfoData = item;
-      // console.log(this.picInfoData);
-      // this.historyPicdialog = true;
-
-      // //this.getTerminalPhotoList(item.cmdid);
-      // this.getTerminalPhotoList(item.channelid, item.photoTime, item.termid);
-    },
-    //获取图片
-    getTerminalPhotoList(channelid, date, termId) {
-      this.terminalPhoto = [];
-
-      this.historyPicLoading = true;
-      getTerminalPhotoListJoggle({
-        channelid: channelid,
-        time: date,
-        terminalid: termId,
-      })
-        .then((res) => {
-          console.log(res);
-          this.historyPicLoading = false;
-          if (res.data.list.length == 0) {
-            this.terminalPhoto = [
-              {
-                path: this.nopicPath,
-                termId: termId,
-                mediatype: 0,
-              },
-            ];
-          } else {
-            this.terminalPhoto = res.data.list;
-          }
-        })
-        .catch((err) => {
-          console.log(err); //代码错误、请求失败捕获
-        });
-    },
-    setbtn() {
-      this.isRuning = false;
-      this.pauseCountdown();
-      this.setdialog = true;
-      this.selSpeed = parseInt(localStorage.getItem("totalTime"))
-        ? parseInt(localStorage.getItem("totalTime"))
-        : 15;
-      this.rowNum = parseInt(localStorage.getItem("row"))
-        ? parseInt(localStorage.getItem("row"))
-        : 4;
-      this.colNum = parseInt(localStorage.getItem("col"))
-        ? parseInt(localStorage.getItem("col"))
-        : 4;
-      this.rowradio = parseInt(localStorage.getItem("row"))
-        ? parseInt(localStorage.getItem("row"))
-        : 4;
-      this.colradio = parseInt(localStorage.getItem("col"))
-        ? parseInt(localStorage.getItem("col"))
-        : 4;
-    },
-    submitForm() {
-      localStorage.setItem("totalTime", this.selSpeed);
-      localStorage.setItem("row", this.rowradio);
-      localStorage.setItem("col", this.colradio);
-      this.rowNum = parseInt(localStorage.getItem("row"))
-        ? parseInt(localStorage.getItem("row"))
-        : 4;
-      this.colNum = parseInt(localStorage.getItem("col"))
-        ? parseInt(localStorage.getItem("col"))
-        : 4;
-      this.pageSize = this.rowradio * this.colradio;
-      this.setdialog = false;
-      this.$message.success("设置成功");
-      this.getPicData();
-    },
-    //点击分页
-    handleCurrentChange(val) {
-      this.isRuning = false;
-      this.pauseCountdown();
-      this.page = val;
-      this.getPicData();
-    },
-    //请求数据接口方法
-    getPicData() {
-      this.loading = true;
-      this.picList = [];
-      getPictureList({
-        pageindex: this.page,
-        pagesize: this.rowNum * this.colNum,
-      })
-        .then((res) => {
-          this.picList = res.data.list;
-          this.totalPage = res.data.totalpage;
-          this.total = res.data.total;
-          this.loading = false;
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    },
-    //开始轮询
-    startCountdown() {
-      this.timer = setInterval(() => {
-        if (this.remainingTime <= 0) {
-          this.clearTimer();
-
-          this.page++;
-
-          if (this.page > this.totalPage) {
-            this.page = 0;
-            this.startCountdown();
-          } else {
-            this.remainingTime = parseInt(localStorage.getItem("totalTime"))
-              ? parseInt(localStorage.getItem("totalTime"))
-              : 15;
-            this.getPicData();
-            this.startCountdown();
-          }
-        } else {
-          this.remainingTime--;
-        }
-      }, 1000);
-    },
-    clearTimer() {
-      //清除定时器
-      clearInterval(this.timer);
-      this.timer = null;
-    },
-    pauseCountdown() {
-      //清除定时器
-      clearInterval(this.timer);
-      this.timer = null;
-    },
-    //根据isRuning执行开始暂停操作
-    toggleCountdown() {
-      if (this.isRuning) {
-        this.pauseCountdown();
-      } else {
-        this.startCountdown();
-        this.getPicData();
-      }
-      this.isRuning = !this.isRuning;
-    },
-  },
-  computed: {},
-  mounted() {
-    this.remainingTime = parseInt(localStorage.getItem("totalTime"))
-      ? parseInt(localStorage.getItem("totalTime"))
-      : 15;
-    this.rowradio = this.rowNum = parseInt(localStorage.getItem("row"))
-      ? parseInt(localStorage.getItem("row"))
-      : 4;
-    this.colradio = this.colNum = parseInt(localStorage.getItem("col"))
-      ? parseInt(localStorage.getItem("col"))
-      : 4;
-    this.pageSize = this.rowradio * this.colradio;
-    //this.toggleCountdown();
-    this.getPicData();
-  },
-  created() {},
-
-  beforeDestroy() {
-    // console.log("销毁定时器");
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-};
-</script>
-<style lang="less">
-.picRotation {
-  width: calc(100% - 24px);
-  height: calc(100% - 24px);
-  padding: 12px 12px;
-  background: #ffffff;
-  .rotationBox {
-    border: 1px solid #dddddd;
-    height: calc(100% - 22px);
-    max-height: calc(100% - 22px);
-    padding: 12px;
-    border-radius: 4px;
-  }
-  .picHead {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0px 0px 8px 0px;
-    .buttonGroup {
-      display: flex;
-      .el-select {
-        margin-left: 10px;
-        width: 100px;
-      }
-      .info {
-        width: 80px;
-        text-align: center;
-        margin-right: 16px;
-        line-height: 32px;
-        b {
-          font-size: 24px;
-          font-weight: normal;
-          color: #67c23a;
-          vertical-align: middle;
-        }
-      }
-    }
-  }
-
-  .imageCenter {
-    // display: flex;
-    // flex-wrap: wrap;
-    height: calc(100% - 52px);
-    .el-col {
-      height: 100%;
-      padding-right: 0.1%;
-      padding-left: 0.1%;
-      padding-top: 0.1%;
-      padding-bottom: 0.1%;
-    }
-    // justify-content: space-between;
-    .imgList {
-      border: 1px solid #eee;
-      width: 100%;
-      position: relative;
-      //background-color: #00eaff;
-      height: 100%;
-      .bigpic {
-        width: 100%;
-        height: 100%;
-        background-size: 100% 100%;
-      }
-      img {
-        width: 100%;
-        height: 100%;
-        cursor: pointer;
-      }
-      .picInfo {
-        position: absolute;
-        background: #169e8ca1;
-        color: #fff;
-        height: auto;
-        font-size: 12px;
-        left: 0;
-        bottom: 0;
-        width: 100%;
-        text-align: center;
-        p {
-          margin-top: 4px;
-        }
-        .timeinfo {
-          margin-bottom: 4px;
-        }
-      }
-    }
-  }
-  .setPicShow {
-    .el-select {
-      width: 222px;
-    }
-    .layoutBox {
-      display: flex;
-      align-items: center;
-    }
-    .selectGroup {
-      display: flex;
-      flex-direction: column;
-      .el-radio-button--small .el-radio-button__inner {
-        padding: 9px 24px;
-      }
-      .rowbox {
-        margin-bottom: 8px;
-        .labelinfo {
-          margin-left: 8px;
-        }
-      }
-      .colbox {
-        .labelinfo {
-          margin-left: 8px;
-        }
-      }
-    }
-  }
-  .showDialogHistoryPic {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .el-dialog {
-      width: 70% !important;
-      height: 90%;
-      transform: none;
-      margin: auto;
-      left: auto;
-      top: auto;
-    }
-
-    .el-dialog__body {
-      height: calc(100% - 70px);
-      .title {
-        height: 32px;
-        padding-left: 12px;
-        line-height: 32px;
-        color: #fff;
-        font-size: 14px;
-        background: linear-gradient(180deg, #4cdbc8 10%, #128071 100%);
-        text-align: center;
-      }
-      .thumb-example {
-        //height: 100%;
-      }
-    }
-  }
-}
-[v-cloak] {
-  display: none;
-}
-</style>
diff --git a/src/views/system/components/addUser.vue b/src/views/system/components/addUser.vue
deleted file mode 100644
index dd6e0d7..0000000
--- a/src/views/system/components/addUser.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-  <el-dialog
-    class="addUserDialog"
-    :title="title"
-    :visible.sync="isShow"
-    :close-on-click-modal="false"
-    width="470px"
-    @close="handleclose"
-  >
-    <el-form
-      label-position="left"
-      ref="formInfo"
-      label-width="100px"
-      :rules="title == '新增' ? rules : xgrules"
-      :model="formdata"
-    >
-      <el-form-item label="用户名：" prop="userName">
-        <el-input
-          placeholder="请输入用户名"
-          v-model="formdata.userName"
-          autocomplete="off"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="角色：" prop="role">
-        <el-select v-model="formdata.role" placeholder="请选择">
-          <el-option
-            v-for="item in roleoptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="密码：" prop="password">
-        <el-input
-          placeholder="请输入密码"
-          v-model="formdata.password"
-          show-password
-        ></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 { addUserApi, updateUserApi } from "@/utils/api/index";
-export default {
-  props: {
-    title: String,
-  },
-  data() {
-    return {
-      roleUser: "",
-      isShow: false,
-      roleoptions: [
-        {
-          value: 1,
-          label: "管理员",
-        },
-        {
-          value: 2,
-          label: "用户",
-        },
-      ],
-
-      formdata: {},
-      rules: {
-        userName: [
-          { required: true, message: "请输入用户名", trigger: "blur" },
-        ],
-        role: [{ required: true, message: "请选择角色", trigger: "blur" }],
-        password: [
-          { required: true, message: "请输入密码", trigger: "blur" },
-          // { min: 6, max: 8, message: "请输入6-8位字符", trigger: "blur" },
-        ],
-      },
-      xgrules: {
-        userName: [
-          { required: true, message: "请输入用户名", trigger: "blur" },
-        ],
-        role: [{ required: true, message: "请选择角色", trigger: "blur" }],
-      },
-    };
-  },
-  methods: {
-    //判断
-    getdataform(val) {
-      console.log(val);
-      if (val == null) {
-        return (this.formdata = {
-          role: 2,
-        });
-      }
-      //this.formdata = val;
-      this.formdata = JSON.parse(JSON.stringify(val));
-    },
-    // 保存确定操作
-    submitForm() {
-      this.$refs.formInfo.validate((valid) => {
-        if (valid) {
-          if (this.title == "新增") {
-            addUserApi(this.formdata)
-              .then((res) => {
-                if (res.code == 200) {
-                  this.$message({
-                    duration: 1500,
-                    showClose: true,
-                    message: "添加成功",
-                    type: "success",
-                  });
-                  this.isShow = false;
-                } else {
-                  this.$message.error(res.msg);
-                }
-              })
-              .catch((err) => {});
-          } else {
-            updateUserApi(this.formdata)
-              .then((res) => {
-                if (res.code == 200) {
-                  this.$message.success("修改成功");
-                  this.isShow = false;
-                } else {
-                  this.$message.error(res.msg);
-                }
-              })
-              .catch((err) => {});
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    display() {
-      this.isShow = true;
-      this.roleUser = localStorage.getItem("role");
-    },
-    hide() {
-      this.isShow = false;
-    },
-    handleclose() {
-      this.$parent.deviceList();
-    },
-  },
-  mounted() {},
-};
-</script>
-<style lang="less">
-.addUserDialog {
-  .el-form-item {
-    .el-input,
-    .el-select,
-    .el-input-number {
-      width: 100%;
-    }
-  }
-}
-</style>
diff --git a/src/views/system/globalTools/index.vue b/src/views/system/globalTools/index.vue
deleted file mode 100644
index d8af5b8..0000000
--- a/src/views/system/globalTools/index.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<template>
-  <div class="globalBox">
-    <div class="setBox">
-      <el-card class="box-card globalDrawLine">
-        <div slot="header" class="clearfix">
-          <span>线缆开启关闭</span>
-        </div>
-        <div>
-          <el-switch
-            style="display: block"
-            v-model="lineValue"
-            active-text="开启"
-            inactive-text="关闭"
-            @change="showLine"
-          >
-          </el-switch>
-        </div>
-      </el-card>
-      <el-card class="box-card globalDrawLine">
-        <div slot="header" class="clearfix">
-          <span>设置告警通道</span>
-        </div>
-        <div>
-          <el-select v-model="channel" @change="handleChange">
-            <el-option
-              v-for="item in tdOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </div>
-      </el-card>
-      <el-card class="box-card globalprob">
-        <div slot="header" class="clearfix">
-          <span>设置告警可信度</span>
-        </div>
-        <div v-for="(item, index) in probList" :key="index" class="probBox">
-          <label>{{ item.name }}</label>
-          <el-input-number
-            :min="0"
-            :max="110"
-            controls-position="right"
-            v-model="item.prob"
-            placeholder="请输入可信度值"
-          ></el-input-number>
-        </div>
-        <el-button class="setbtn" type="primary" @click="setProb"
-          >设置</el-button
-        >
-      </el-card>
-    </div>
-    <div class="" v-for="item in infoMl">
-      {{ item }}
-    </div>
-  </div>
-</template>
-<script>
-import {
-  getAlarmTypeList,
-  updateAlarmTypeList,
-  getMarkEnableStatus,
-  updateMarkEnableStatus,
-  updateAlarmChannel,
-} from "@/utils/api/index";
-
-export default {
-  components: {},
-  data() {
-    return {
-      lineValue: false,
-      lineNum: 0,
-      probList: [],
-      tdOptions: [{ id: -1, name: "全部", alias: null }], //通道数据
-      channel: "",
-      infoMl: [],
-      tongdao: ["1", "2", "3", "4"],
-      cmdidArr: [
-        "12M10010107139801",
-        "12M10010107139802",
-        "12M10010107139803",
-        "12M10010107139804",
-        "12M10010107139805",
-        "12M10010107139806",
-        "12M10010107139807",
-        "12M10010107139808",
-        "12M10010107139809",
-      ],
-      leftWater: [
-        "欣影-2023-10-08",
-        "欣影-2023-10-08",
-        "欣影-2023-10-08",
-        "欣影-2023-10-08",
-        "欣影-2023-10-08",
-        "欣影-2023-10-08",
-        "欣影-2023-10-08",
-        "欣影-2023-10-08",
-        "欣影-2023-10-08",
-      ],
-      rightWater: [
-        "安庆- 输电运检一班-220kV文邓4C70线#052大号侧",
-        "安庆- 输电运检一班-220kV文邓4C70线#053大号侧",
-        "安庆- 输电运检一班-220kV文邓4C70线#053大号侧",
-        "安庆- 输电运检一班-220kV文邓4C70线#053大号侧",
-        "安庆- 输电运检一班-220kV文邓4C70线#053大号侧",
-        "安庆- 输电运检一班-220kV文邓4C70线#053大号侧",
-        "安庆- 输电运检一班-220kV文邓4C70线#053大号侧",
-        "安庆- 输电运检一班-220kV文邓4C70线#053大号侧",
-        "安庆- 输电运检一班-220kV文邓4C70线#053大号侧",
-      ],
-    };
-  },
-  created() {
-    this.getalarmList();
-    this.getmark();
-    this.getWater();
-  },
-  methods: {
-    //获取图片绘制状态
-    getmark() {
-      getMarkEnableStatus()
-        .then((res) => {
-          console.log(res);
-          if (res.data.imgMark === 1) {
-            this.lineValue = true;
-            console.log("绘制开启");
-          } else {
-            this.lineValue = false;
-            console.log("绘制关闭");
-          }
-          this.channel = res.data.alarmChannel;
-          console.log(this.channel);
-        })
-        .catch((err) => {});
-    },
-    //控制线缆绘制开关
-    showLine(val) {
-      if (val) {
-        this.lineNum = 1;
-      } else {
-        this.lineNum = 0;
-      }
-      updateMarkEnableStatus({
-        status: this.lineNum,
-      })
-        .then((res) => {
-          console.log(res);
-        })
-        .catch((err) => {});
-      console.log(val, this.lineNum, "开关");
-    },
-    //获取装置可信度值
-    getalarmList() {
-      getAlarmTypeList().then((res) => {
-        console.log(res);
-        this.probList = res.data.list;
-        this.tdOptions = [{ id: -1, name: "全部", alias: null }];
-        this.tdOptions = this.tdOptions.concat(res.data.channellist);
-      });
-    },
-    setProb() {
-      console.log(this.probList);
-      updateAlarmTypeList({ list: this.probList })
-        .then((res) => {
-          console.log(res);
-          if (res.code === 200) {
-            this.$message({
-              duration: 1500,
-              showClose: true,
-              message: "告警可信度设置成功",
-              type: "success",
-            });
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    },
-    //获取告警通道
-    handleChange(val) {
-      console.log(val);
-      updateAlarmChannel({ channel: this.channel })
-        .then((res) => {
-          console.log(res);
-          if (res.code === 200) {
-            this.$message({
-              duration: 1500,
-              showClose: true,
-              message: "告警通道设置成功",
-              type: "success",
-            });
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    },
-    getWater() {
-      for (let j = 0; j < this.tongdao.length; j++) {
-        for (let i = 0; i < this.cmdidArr.length; i++) {
-          // console.log(this.cmdidArr[i]);
-          // console.log(this.leftWater[i]);
-          // console.log(this.rightWater[i]);
-          var a =
-            "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=osd --cmdid=" +
-            this.cmdidArr[i] +
-            " --flag=1 --channel=" +
-            this.tongdao[j] +
-            ' --leftBottom="' +
-            this.leftWater[i] +
-            '" --rightBottom="' +
-            this.rightWater[i] +
-            '" --clientid=5 --reqid=TS; sleep 0.5';
-          this.infoMl.push(a);
-          console.log(
-            "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=osd --cmdid=" +
-              this.cmdidArr[i] +
-              " --flag=1 --channel=" +
-              this.tongdao[j] +
-              '" --leftBottom="' +
-              this.leftWater[i] +
-              '" --rightBottom="' +
-              this.rightWater[i] +
-              '" --clientid=5 --reqid=TS; sleep 0.5'
-          );
-        }
-      }
-    },
-  },
-};
-</script>
-<style lang="less">
-.globalBox {
-  width: calc(100% - 24px);
-  height: calc(100% - 24px);
-  padding: 12px 12px;
-  background: #fff;
-  .setBox {
-    border: 1px solid #dddddd;
-    height: calc(100% - 24px);
-    padding: 12px;
-    border-radius: 4px;
-    display: flex;
-    .globalDrawLine {
-      width: 200px;
-      height: max-content;
-      margin-right: 24px;
-    }
-    .globalprob {
-      width: 378px;
-      height: max-content;
-      display: flex;
-      flex-direction: column;
-      .el-card__body {
-        display: flex;
-        flex-direction: column;
-        .probBox {
-          display: flex;
-          height: 40px;
-          line-height: 40px;
-          align-items: center;
-          label {
-            width: 138px;
-          }
-          .el-input-number--small {
-            width: 200px;
-          }
-          .el-input {
-            width: 200px;
-          }
-        }
-        .setbtn {
-          margin-top: 24px;
-          margin-left: auto;
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/system/userManagement.vue b/src/views/system/userManagement.vue
deleted file mode 100644
index 2f48de0..0000000
--- a/src/views/system/userManagement.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <div class="usermanagement">
-    <div class="deviceBox">
-      <div class="deviceBtnGroup">
-        <h4>用户管理</h4>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdddevice()"
-          >新增</el-button
-        >
-      </div>
-      <div class="deviceTable">
-        <el-table
-          ref="multipleTable"
-          :data="deviceTableData"
-          stripe
-          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> -->
-          <template slot="empty">
-            <el-empty :image-size="160" description="暂无数据"></el-empty>
-          </template>
-          <el-table-column
-            label="用户名"
-            show-overflow-tooltip
-            prop="userName"
-          ></el-table-column>
-          <el-table-column label="角色" show-overflow-tooltip prop="role">
-            <template slot-scope="scope">{{
-              scope.row.role == 1 ? "管理员" : "用户"
-            }}</template>
-          </el-table-column>
-          <el-table-column
-            label="创建时间"
-            show-overflow-tooltip
-            prop="createTime"
-          >
-            <template slot-scope="scope">{{
-              $moment(scope.row.createTime).format("yy-MM-DD HH:mm:ss")
-            }}</template>
-          </el-table-column>
-          <el-table-column fixed="right" label="操作" width="200">
-            <template slot-scope="scope">
-              <el-button
-                @click.native.stop="handleResive(scope.row)"
-                type="text"
-                >修改</el-button
-              >
-              <el-button
-                type="text"
-                class="deleteText"
-                @click.native.stop="handleDelete(scope.row)"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="pageNation">
-          <el-pagination
-            @current-change="handleCurrentChange"
-            @size-change="handleSizeChange"
-            :current-page="page"
-            :page-size="pageSize"
-            layout="sizes, prev, pager, next, jumper,total"
-            :total="total"
-            background
-          >
-          </el-pagination>
-        </div>
-      </div>
-    </div>
-    <!-- 新增 -->
-    <addUser :title="title" ref="adduserref"></addUser>
-  </div>
-</template>
-<script>
-import addUser from "./components/addUser.vue";
-import { getUserList, delUserApi } from "@/utils/api/index";
-
-export default {
-  components: {
-    addUser,
-  },
-  data() {
-    return {
-      title: "", //弹窗标题
-      deviceTableData: [],
-      //multipleSelection: [], //获取当前选中
-      page: 1, // 当前页数
-      pageSize: 20, // 每页数量
-      total: 0, //总条数
-    };
-  },
-  created() {
-    this.deviceList();
-  },
-  methods: {
-    //获取线路列表数据
-    deviceList() {
-      getUserList({
-        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.adduserref.display();
-      this.$refs.adduserref.getdataform(null);
-    },
-
-    //修改
-    handleResive(data) {
-      this.title = "修改";
-      this.$refs.adduserref.display();
-      this.$refs.adduserref.getdataform(data);
-    },
-
-    //删除数据
-    handleDelete(data) {
-      this.$confirm("确定要删除记录吗,同时删除关联关系?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          delUserApi({ uid: data.userId }).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("删除成功");
-              this.deviceList(); //刷新
-            } else {
-              this.$message.error(res.msg);
-            }
-          });
-        })
-        .catch(() => {
-          this.$message({
-            duration: 1500,
-            showClose: true,
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    //点击分页
-    handleCurrentChange(val) {
-      this.page = val;
-      this.deviceList();
-    },
-    //每页条数
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.deviceList();
-    },
-  },
-};
-</script>
-<style lang="less">
-.usermanagement {
-  width: calc(100% - 24px);
-  height: calc(100% - 24px);
-  padding: 12px 12px;
-  background: #fff;
-
-  .deviceBox {
-    border: 1px solid #dddddd;
-    height: calc(100% - 24px);
-    padding: 12px;
-    border-radius: 4px;
-  }
-  .deviceBtnGroup {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .deviceTable {
-    margin-top: 16px;
-    height: calc(100% - 48px);
-    //background: #fcc;
-  }
-}
-</style>
diff --git a/src/views/waterMark/index.vue b/src/views/waterMark/index.vue
deleted file mode 100644
index 0f8d731..0000000
--- a/src/views/waterMark/index.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<template>
-  <div class="waterMarkBox">
-    <div class="setWater">
-      <h4>批量水印下发命令生成</h4>
-      <div class="waterForm">
-        <div class="channelBox">
-          <h5>选择通道</h5>
-          <el-checkbox-group
-            v-model="checkList"
-            class="groupCheck"
-            @change="handleCheck"
-          >
-            <el-checkbox
-              v-for="item in channelList"
-              :label="item.id"
-              :key="item.id"
-              >{{ item.name }}</el-checkbox
-            >
-          </el-checkbox-group>
-        </div>
-        <div class="cmdidBox">
-          <h5>装置编号</h5>
-          <el-input
-            type="textarea"
-            :rows="18"
-            placeholder="请输入装置编号"
-            v-model="cmdidtextarea"
-          >
-          </el-input>
-        </div>
-        <div class="leftWaterBox">
-          <h5>左侧水印</h5>
-          <el-input
-            type="textarea"
-            :rows="18"
-            placeholder="请输入左侧水印"
-            v-model="leftWatertextarea"
-          >
-          </el-input>
-        </div>
-        <div class="rghtWaterBox">
-          <h5>右侧水印</h5>
-          <el-input
-            type="textarea"
-            :rows="18"
-            placeholder="请输入右侧水印"
-            v-model="rightWatertextarea"
-          >
-          </el-input>
-        </div>
-      </div>
-      <el-button type="primary" @click="handleSure">确 定</el-button>
-      <el-button type="primary" @click="copyShare">复 制</el-button>
-      <el-button class="mlspan" type="text"
-        ><i>{{ issueCommands.length }}</i
-        >条命令</el-button
-      >
-      <div class="commandsBox" id="copy-content">
-        <div class="aaa" v-for="item in issueCommands" v-html="item"></div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  components: {},
-  data() {
-    return {
-      channelList: [
-        {
-          id: 1,
-          name: "通道1",
-        },
-        {
-          id: 2,
-          name: "通道2",
-        },
-        {
-          id: 3,
-          name: "通道3",
-        },
-        {
-          id: 4,
-          name: "通道4",
-        },
-      ],
-      checkList: [], //选中的通道
-      cmdidtextarea: "", //输入的值
-      cmdidArr: [],
-      leftWatertextarea: "", //输入的值
-      leftWaterArr: [],
-      rightWatertextarea: "", //输入的值
-      rightWaterArr: [],
-      issueCommands: [], //打印出来下发命令
-    };
-  },
-  created() {
-    //this.getWater();
-  },
-  methods: {
-    handleCheck(val) {
-      console.log(this.checkList);
-    },
-    handleSure() {
-      console.log(this.checkList);
-      if (this.checkList.length == 0) {
-        this.$message({
-          showClose: true,
-          message: "请选择通道号",
-          type: "warning",
-        });
-        return;
-      }
-      if (this.cmdidtextarea !== "") {
-        this.cmdidArr = [...this.cmdidtextarea.trim().split("\n")]; //装置编号
-      } else {
-        this.$message({
-          showClose: true,
-          message: "请输入装置编号",
-          type: "warning",
-        });
-        return;
-      }
-      if (this.leftWatertextarea !== "") {
-        this.leftWaterArr = [...this.leftWatertextarea.trim().split("\n")]; //左侧水印
-      } else {
-        this.$message({
-          showClose: true,
-          message: "请输入左侧水印",
-          type: "warning",
-        });
-        return;
-      }
-      if (this.rightWatertextarea !== "") {
-        this.rightWaterArr = [...this.rightWatertextarea.trim().split("\n")]; //右侧水印
-      } else {
-        this.$message({
-          showClose: true,
-          message: "请输入右侧水印",
-          type: "warning",
-        });
-        return;
-      }
-
-      console.log(this.cmdidArr);
-      console.log(this.leftWaterArr);
-      console.log(this.rightWaterArr);
-      this.issueCommands = [];
-      this.getWater();
-    },
-    getWater() {
-      for (let j = 0; j < this.checkList.length; j++) {
-        for (let i = 0; i < this.cmdidArr.length; i++) {
-          var command =
-            "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=osd --cmdid=" +
-            this.cmdidArr[i] +
-            " --flag=1 --channel=" +
-            this.checkList[j] +
-            ' --leftBottom="' +
-            this.leftWaterArr[i] +
-            '" --rightBottom="' +
-            this.rightWaterArr[i] +
-            '" --clientid=5 --reqid=TS;' +
-            "<br/>" +
-            "sleep 1;" +
-            "<br/>" +
-            "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=capture --cmdid=" +
-            this.cmdidArr[i] +
-            " --channel=" +
-            this.checkList[j] +
-            " --preset=255 --type=0;" +
-            "<br/>" +
-            "sleep 1;";
-          this.issueCommands.push(command); //把命令push
-        }
-      }
-    },
-    copyShare() {
-      let div = document.getElementById("copy-content");
-      let range = "";
-      if (document.body.createTextRange) {
-        //兼容ie
-        range = document.body.createTextRange();
-        range.moveToElementText(div);
-        range.select();
-      } else if (window.getSelection) {
-        // 兼容非IE，比如Firefox/chrome
-        let selection = window.getSelection();
-        range = document.createRange();
-        range.selectNodeContents(div);
-        selection.removeAllRanges();
-        selection.addRange(range);
-      }
-      document.execCommand("Copy"); // 执行浏览器复制命令
-      console.log("已复制好，可贴粘");
-    },
-  },
-};
-</script>
-<style lang="less">
-.waterMarkBox {
-  width: calc(100% - 24px);
-  height: calc(100% - 24px);
-  padding: 12px 12px;
-  background: #fff;
-  .setWater {
-    border: 1px solid #dddddd;
-    height: calc(100% - 24px);
-    padding: 12px;
-    border-radius: 4px;
-    .waterForm {
-      width: 100%;
-      height: 50%;
-      margin-top: 16px;
-      // background: #fcc;
-      display: flex;
-      .channelBox {
-        width: 150px;
-        border: 1px solid #dddddd;
-        padding: 12px;
-        border-radius: 4px;
-        margin-right: 8px;
-        .groupCheck {
-          display: flex;
-          flex-direction: column;
-          margin-top: 12px;
-          .el-checkbox {
-            height: 32px;
-            line-height: 32px;
-          }
-        }
-      }
-      .cmdidBox {
-        width: 250px;
-        border: 1px solid #dddddd;
-        padding: 12px;
-        border-radius: 4px;
-        margin-right: 8px;
-        .el-textarea {
-          margin-top: 12px;
-        }
-      }
-      .leftWaterBox {
-        margin-right: 8px;
-      }
-      .leftWaterBox,
-      .rghtWaterBox {
-        flex: 1;
-        border: 1px solid #dddddd;
-        padding: 12px;
-        border-radius: 4px;
-        .el-textarea {
-          margin-top: 12px;
-        }
-      }
-    }
-    .el-button {
-      margin-top: 4px;
-    }
-    .commandsBox {
-      width: auto;
-      height: calc(50% - 106px);
-      margin-top: 8px;
-      border: 1px solid #fcc;
-      overflow: auto;
-      padding: 8px;
-      border-radius: 4px;
-    }
-    .mlspan {
-      //   margin-left: 24px;
-      //   height: 32px;
-      //   line-height: 32px;
-      //   margin-top: 4px;
-      //   display: inline-block;
-      font-size: 14px;
-      color: #000;
-      cursor: default;
-      i {
-        color: #169e8c;
-        font-weight: bold;
-        font-style: normal;
-      }
-    }
-  }
-}
-</style>