diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 658573c..1a63904 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,10 +1,47 @@
 <template>
   <div class="sidebarBox">
-    <ul class="menuBoxUl">
-      <li class="menuItem" v-for="(item, index) in routeItem" :key="index">
-        <router-link :to="item.path"> {{ item.name }} </router-link>
-      </li>
-    </ul>
+    <el-menu
+      :default-active="activeIndex"
+      class="sidebar-el-menu"
+      mode="horizontal"
+      router
+    >
+      <template v-for="item in items">
+        <template v-if="item.subs">
+          <el-submenu :index="item.index" :key="item.index">
+            <template slot="title">
+              <span slot="title">{{ item.title }}</span>
+            </template>
+            <template v-for="subItem in item.subs">
+              <el-submenu
+                v-if="subItem.subs"
+                :index="subItem.index"
+                :key="subItem.index"
+              >
+                <template slot="title">{{ subItem.title }}</template>
+                <el-menu-item
+                  v-for="(threeItem, i) in subItem.subs"
+                  :key="i"
+                  :index="threeItem.index"
+                  >{{ threeItem.title }}</el-menu-item
+                >
+              </el-submenu>
+              <el-menu-item
+                v-else
+                :index="subItem.index"
+                :key="subItem.index"
+                >{{ subItem.title }}</el-menu-item
+              >
+            </template>
+          </el-submenu>
+        </template>
+        <template v-else>
+          <el-menu-item :index="item.index" :key="item.index">
+            <span slot="title">{{ item.title }}</span>
+          </el-menu-item>
+        </template>
+      </template>
+    </el-menu>
   </div>
 </template>
 
@@ -12,49 +49,68 @@
 export default {
   data() {
     return {
-      routeItem: [
+      activeIndex: "/home",
+      items: [
         {
-          path: "/home",
-          name: "首页",
+          index: "/home",
+          title: "首页",
         },
         {
-          path: "/report",
-          name: "状态报表",
+          index: "/report",
+          title: "状态报表",
         },
         {
-          path: "/log",
-          name: "日志列表",
+          index: "/log",
+          title: "日志列表",
         },
         {
-          path: "/upgradation",
-          name: "上传APK/OTA",
+          index: "/upgradation",
+          title: "上传APK/OTA",
         },
-        // {
-        //   path: "/upgradationOta",
-        //   name: "上传Ota",
-        // },
         {
-          path: "/activity",
-          name: "活动列表",
+          index: "/activity",
+          title: "活动列表",
         },
         {
-          path: "/msgAuth",
-          name: "短信授权",
+          index: "/msgAuth",
+          title: "短信授权",
         },
+
         {
-          path: "/picReport",
-          name: "装置图片报表",
+          index: "/aaa",
+          title: "运维报表",
+          subs: [
+            {
+              index: "/picReport",
+              title: "在线率报表",
+            },
+            {
+              index: "/historyReport",
+              title: "运维历史数据",
+            },
+          ],
         },
-        // {
-        //   path: "/deviceConfig",
-        //   name: "设备配置",
-        // },
       ],
     };
   },
-  watch: {},
-  methods: {},
-  created() {},
+  watch: {
+    $route() {
+      this.setCurrentRoute();
+    },
+  },
+  created() {
+    this.setCurrentRoute();
+  },
+  methods: {
+    setCurrentRoute() {
+      console.log(this.$route.path);
+      this.$nextTick(() => {
+        this.activeIndex = this.$route.path; // 通过他就可以监听到当前路由状态并激活当前菜单
+        console.log(this.activeIndex);
+        localStorage.setItem("menuActive", this.activeIndex);
+      });
+    },
+  },
 };
 </script>
 
@@ -64,38 +120,137 @@ export default {
   // margin: 0 auto;
   display: flex;
   align-items: center;
-  .menuBoxUl {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-    .menuItem {
-      list-style: none;
-      display: flex;
-      height: 40px;
-      justify-content: center;
-      align-items: center;
-      cursor: pointer;
+  .el-menu--horizontal {
+    background: #169e8c;
+
+    .el-menu-item {
+      height: 56px;
+      line-height: 56px;
+    }
+    .el-submenu .el-submenu__title {
+      height: 56px;
+      line-height: 56px;
+    }
+    .el-submenu__title {
+      padding: 0 10px;
+      .iconfont {
+        margin-right: 5px;
+      }
+    }
+    .el-dropdown-menu__item,
+    .el-menu-item,
+    .el-submenu__title {
       font-size: 14px;
-      margin-right: 32px;
-      a {
-        color: #fff;
-        //background: #e8f5f4;
-        height: 40px;
-        line-height: 40px;
-        padding: 0 12px;
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-        overflow: hidden;
-        border-radius: 8px;
-        &:hover {
-          background: #128071;
-        }
+    }
+    .el-menu-item i {
+      color: #666;
+    }
+    .el-menu-item.is-active {
+      i {
+        color: #169e8c;
       }
-      .router-link-active {
-        background: #128071;
+    }
+    .el-submenu.is-active .el-submenu__title > i {
+      &:first-child {
+        color: #333;
       }
     }
   }
+  .el-menu {
+    background: #169e8c;
+
+    i {
+      color: #fff !important;
+    }
+    .el-menu-item {
+      color: #fff;
+    }
+    .el-submenu .el-submenu__title {
+      color: #fff;
+    }
+    .el-menu-item:not(.is-disabled):focus,
+    .el-menu-item:not(.is-disabled):hover {
+      color: #fff;
+      background-color: #128071;
+      border-bottom: 2px solid #128071;
+      i {
+        color: #fff !important;
+      }
+    }
+    .el-submenu:focus .el-submenu__title,
+    .el-submenu:hover .el-submenu__title {
+      color: #fff !important;
+      background-color: #128071;
+      border-bottom: 2px solid #128071;
+      i {
+        color: #fff !important;
+      }
+    }
+  }
+  .el-menu--horizontal > .el-menu-item.is-active {
+    border-bottom: 2px solid #128071 !important;
+    color: #fff !important;
+    background-color: #128071 !important;
+    i {
+      color: #fff !important;
+    }
+  }
+  .el-submenu.is-active {
+    .el-submenu__title {
+      border-bottom: 2px solid #128071 !important;
+      color: #fff !important;
+      background-color: #128071;
+      i {
+        color: #fff !important;
+      }
+    }
+  }
+  .gallery-thumbs .swiper-slide-active {
+    border: 3px solid #169e8c !important;
+  }
+  .tags-li.active {
+    border: 1px solid #169e8c;
+    background-color: #169e8c;
+  }
+  .el-menu-item [class^="iconfont"] {
+    margin-right: 5px;
+    width: 24px;
+    text-align: center;
+    font-size: 18px;
+    vertical-align: middle;
+  }
+  // .menuBoxUl {
+  //   flex: 1;
+  //   display: flex;
+  //   align-items: center;
+  //   justify-content: space-around;
+  //   .menuItem {
+  //     list-style: none;
+  //     display: flex;
+  //     height: 40px;
+  //     justify-content: center;
+  //     align-items: center;
+  //     cursor: pointer;
+  //     font-size: 14px;
+  //     margin-right: 32px;
+  //     a {
+  //       color: #fff;
+  //       //background: #e8f5f4;
+  //       height: 40px;
+  //       line-height: 40px;
+  //       padding: 0 12px;
+  //       background-size: 100% 100%;
+  //       background-repeat: no-repeat;
+  //       overflow: hidden;
+  //       border-radius: 8px;
+  //       &:hover {
+  //         background: #128071;
+  //       }
+  //     }
+  //     .router-link-active {
+  //       background: #128071;
+  //     }
+  //   }
+  // }
 }
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index d7e7a63..b63e8c4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -93,19 +93,28 @@ const routes = [
         component: () => import("../views/picReport/index.vue"),
         name: "picReport",
         meta: {
-          title: "装置图片报表",
+          title: "在线率报表",
           keepAlive: true,
         },
       },
       {
-        path: "/userlist",
-        component: () => import("../views/userList/index.vue"),
-        name: "userList",
+        path: "/historyReport",
+        component: () => import("../views/historyReport/index.vue"),
+        name: "historyReport",
         meta: {
-          title: "用户列表",
+          title: "运维历史数据",
           keepAlive: true,
         },
       },
+      // {
+      //   path: "/userlist",
+      //   component: () => import("../views/userList/index.vue"),
+      //   name: "userList",
+      //   meta: {
+      //     title: "用户列表",
+      //     keepAlive: true,
+      //   },
+      // },
     ],
   },
 ];
diff --git a/src/views/historyReport/components/rowMsgDialog.vue b/src/views/historyReport/components/rowMsgDialog.vue
new file mode 100644
index 0000000..9211880
--- /dev/null
+++ b/src/views/historyReport/components/rowMsgDialog.vue
@@ -0,0 +1,341 @@
+<template>
+  <el-dialog
+    class="cmdMsgDialog"
+    title="历史信息"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+  >
+    <div class="cmdBoxMain">
+      <el-button
+        type="primary"
+        icon="el-icon-refresh"
+        class="refresh"
+        @click="refresh"
+        >刷新</el-button
+      >
+      <el-table
+        :data="gridData"
+        style="width: 100%"
+        border
+        stripe
+        height="calc(100% - 40px)"
+        v-loading="girdloading"
+      >
+        <el-table-column type="index" width="50" label="序号">
+        </el-table-column>
+        <el-table-column prop="createTime" label="时间">
+          <template slot-scope="scope">
+            {{
+              $moment(scope.row.createTime * 1000).format("YYYY-MM-DD HH:mm:ss")
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="id">
+          <template slot-scope="scope">
+            {{ scope.row.reportMap.id }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="i1服务器">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.cma }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="心跳间隔" width="70">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.heartbeatDuration }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="电池">
+          <template slot-scope="scope">
+            <span
+              v-if="
+                scope.row.reportMap !== null &&
+                scope.row.reportMap.hasOwnProperty('batteryVoltage') &&
+                scope.row.reportMap.hasOwnProperty('batteryChargingVoltage') &&
+                scope.row.reportMap.hasOwnProperty('batteryPower')
+              "
+            >
+              {{ scope.row.reportMap.batteryVoltage }}V/{{
+                scope.row.reportMap.batteryChargingVoltage
+              }}V/{{ scope.row.reportMap.batteryPower }}
+            </span>
+            <span v-else>{{ scope.row.reportMap.battery }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="电池温度" width="70">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.batteryTmp }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="主板温度" width="70">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.mainBoardTmp }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="系统重启" width="70">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.rebootTimes }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="i1重启" width="70">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.i1RebootTimes }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="收" width="70">
+          <template slot-scope="scope">
+            <span
+              v-if="
+                scope.row.reportMap !== null &&
+                scope.row.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              <el-tooltip class="item" effect="dark" placement="top">
+                <div slot="content">
+                  lastHbTime：
+                  {{
+                    $moment(scope.row.reportMap.lastHbTime * 1000).format(
+                      "YYYY-MM-DD HH:mm:ss"
+                    )
+                  }}
+                  <br />
+                  lastHbRespTime：
+                  {{
+                    $moment(scope.row.reportMap.lastHbRespTime * 1000).format(
+                      "YYYY-MM-DD HH:mm:ss"
+                    )
+                  }}
+                </div>
+                <span>
+                  {{
+                    $moment(scope.row.reportMap.lastRecvTime * 1000).format(
+                      "HH:mm"
+                    )
+                  }}</span
+                >
+              </el-tooltip>
+            </span>
+            <span v-else> {{ scope.row.reportMap.recv }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="传图" width="70">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.uploads }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="拍" width="60">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.photoTimes }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="成/败/传" width="70">
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.reportMap.success }}/{{
+                scope.row.reportMap.failure
+              }}/{{ scope.row.reportMap.uploads }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="心跳累计" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.numberOfHb }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="网络异常" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.reportMap.networkError }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="信号1" width="60">
+          <template slot-scope="scope">
+            <span
+              v-if="
+                scope.row.reportMap !== null &&
+                scope.row.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              {{ scope.row.reportMap.signalLevel1 }}</span
+            >
+            <span v-else> {{ scope.row.reportMap.signature1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="信号2" width="60">
+          <template slot-scope="scope">
+            <span
+              v-if="
+                scope.row.reportMap !== null &&
+                scope.row.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              {{ scope.row.reportMap.signalLevel2 }}</span
+            >
+            <span v-else> {{ scope.row.reportMap.signature2 }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="其他">
+          <template slot-scope="scope">
+            {{  scope.row.raw_report.msgs.id }}
+          </template>
+        </el-table-column> -->
+
+        <el-table-column prop="content" label="其他" class-name="msgClass">
+          <template slot-scope="scope">
+            <el-tooltip
+              :open-delay="600"
+              popper-class="msgTootip"
+              placement="top"
+              effect="light"
+            >
+              <div slot="content">
+                <p v-html="cutout(scope.row)"></p>
+              </div>
+              <p>
+                {{ scope.row.content }}
+              </p>
+            </el-tooltip>
+          </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>
+  </el-dialog>
+</template>
+<script>
+import { heartListApi } from "@/utils/api/index";
+export default {
+  props: {},
+  data() {
+    return {
+      gridData: [],
+      girdloading: true,
+      isShow: false,
+      page: 1, // 当前页数
+      pageSize: 50, // 每页数量
+      total: 0, //总条数
+      termid: "",
+    };
+  },
+  methods: {
+    //tootip提示
+    cutout(cellValue) {
+      var aString = cellValue.content
+        .replace(/\,/g, "</br>")
+        .replace(/{|}/g, "")
+        .replace(/"|"/g, "")
+        .replace(/msg:/g, "");
+
+      return aString;
+    },
+    refresh() {
+      this.getQueryList();
+    },
+    getQueryList() {
+      this.girdloading = true;
+      this.gridData = [];
+      heartListApi({
+        termId: this.termid,
+        pageNum: this.page,
+        pageSize: this.pageSize,
+      })
+        .then((res) => {
+          console.log(res);
+          this.gridData = res.data.list;
+          this.total = Number(res.data.total);
+          this.girdloading = false;
+        })
+        .catch((err) => {});
+    },
+    display(val) {
+      this.isShow = true;
+      this.termid = val.id;
+      this.getQueryList();
+    },
+
+    hide() {
+      this.isShow = false;
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getQueryList();
+    },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.getQueryList();
+    },
+  },
+};
+</script>
+<style lang="less">
+.cmdMsgDialog {
+  display: flex;
+  align-items: center;
+  justify-items: center;
+  justify-content: center;
+  .refresh {
+    position: absolute;
+    top: 16px;
+    left: 110px;
+  }
+  .el-dialog {
+    width: 95%;
+    height: 83%;
+    margin-top: 0px !important;
+
+    .el-dialog__body {
+      padding: 12px;
+      width: calc(100% - 24px);
+      height: calc(100% - 78px);
+
+      .cmdBoxMain {
+        width: 100%;
+        height: 100%;
+
+        .el-table {
+          .el-table__cell {
+            text-align: center;
+          }
+          .msgClass {
+            .cell {
+              p {
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                cursor: default;
+              }
+            }
+          }
+        }
+      }
+      .pageNation {
+        margin-top: 10px;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+  }
+}
+.msgTootip {
+  color: #333;
+  overflow: auto;
+  height: 90%;
+  p {
+    font-size: 14px;
+    line-height: 22px;
+  }
+}
+</style>
diff --git a/src/views/historyReport/components/tableMain.vue b/src/views/historyReport/components/tableMain.vue
new file mode 100644
index 0000000..4084896
--- /dev/null
+++ b/src/views/historyReport/components/tableMain.vue
@@ -0,0 +1,2052 @@
+<template>
+  <div class="tableContain">
+    <div class="headTitle">
+      <div class="xfMl"></div>
+      <div class="zzMsg">
+        <p class="total" v-if="showDiv">
+          <span
+            >已选中：<el-tag type="primary">{{
+              multipleSelection.length
+            }}</el-tag></span
+          >
+          <span
+            >运维：<el-tag type="primary">{{ ywNumber }}</el-tag></span
+          >
+          <span
+            >快心跳：<el-tag type="primary">{{ kxtNumber }}</el-tag></span
+          >
+          <span
+            >在线：<el-tag type="success">{{ onlineNum }}</el-tag></span
+          >
+          <span
+            >离线：<el-tag type="danger">{{ offlineNum }}</el-tag></span
+          >
+          <span
+            >未传图：<el-tag type="danger">{{ noPicNum }}</el-tag></span
+          >
+          <span
+            >磁盘异常：<el-tag type="danger">{{ freeNum }}</el-tag></span
+          >
+          <span
+            >装置总数：<el-tag type="info">{{ tableData.length }}</el-tag></span
+          >
+        </p>
+        <p class="total" v-else>
+          <el-popover
+            placement="top"
+            trigger="click"
+            popper-class="totalPopover"
+          >
+            <span
+              >在线：<el-tag type="success">{{ onlineNum }}</el-tag></span
+            >
+            <span
+              >离线：<el-tag type="danger">{{ offlineNum }}</el-tag></span
+            >
+            <span
+              >未传图：<el-tag type="danger">{{ noPicNum }}</el-tag></span
+            >
+            <span
+              >磁盘异常：<el-tag type="danger">{{ freeNum }}</el-tag></span
+            >
+            <span
+              >装置总数：<el-tag type="info">{{
+                tableData.length
+              }}</el-tag></span
+            >
+            <el-button type="primary" slot="reference">数据统计</el-button>
+          </el-popover>
+        </p>
+        <el-dropdown @command="handleCommand">
+          <el-button type="primary" icon="el-icon-more" circle></el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="a">导出</el-dropdown-item>
+            <el-dropdown-item command="b">扩展列</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </div>
+    <u-table
+      :data-changes-scroll-top="false"
+      v-loading="tableLoaidng"
+      id="ywTable"
+      ref="ywMultipleTable"
+      :data="tableData"
+      border
+      :row-style="isRed"
+      :row-key="getRowKey"
+      style="width: 100%"
+      @selection-change="handleSelectionChange"
+      :default-sort="{ order: 'descending' }"
+      :row-class-name="tableRowSetting"
+      use-virtual
+      :height="tableHeight"
+      :row-height="32"
+    >
+      <u-table-column type="index" width="40" label="序号" fixed>
+      </u-table-column>
+      <u-table-column prop="oid" label="出厂ID" width="134" sortable fixed>
+        <template slot-scope="scope">
+          <span
+            class="redMlxf"
+            v-if="
+              scope.row.list &&
+              scope.row.list[0].estimatedPublishTime * 1000 - newupdatatime > 0
+            "
+          >
+            <b
+              v-if="
+                scope.row.list[0].desc == '' || scope.row.list[0].desc == null
+              "
+              >{{ cmdCn[scope.row.list[0].name] }}</b
+            ><b v-else>{{ scope.row.list[0].desc }}</b>
+
+            <b
+              v-if="
+                scope.row.list[0].estimatedPublishTime * 1000 - newupdatatime >
+                0
+              "
+            >
+              {{ remainingTime(scope.row.list[0]) }}
+            </b>
+          </span>
+          <span v-else>
+            {{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("oid")
+                ? scope.row.mntnStatus.reportMap.oid
+                : ""
+            }}
+          </span>
+        </template>
+      </u-table-column>
+      <u-table-column prop="cmdid" label="装置编号" width="136" sortable fixed>
+      </u-table-column>
+      <u-table-column label="状态" width="54" fixed>
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.onlinestatus == 1"
+            >在线</el-tag
+          >
+          <el-tag type="warning" v-if="scope.row.onlinestatus == 0"
+            >离线</el-tag
+          >
+          <el-tag type="danger" v-if="scope.row.onlinestatus == -1"
+            >异常</el-tag
+          >
+        </template>
+      </u-table-column>
+
+      <u-table-column
+        prop="mntnStatus.rawReportTime"
+        label="最后心跳"
+        width="130"
+        :sortable="true"
+        class-name="hbClass"
+      >
+        <template slot-scope="scope">
+          <span
+            @click="handleMsgClick(scope.row)"
+            :title="formatLastHeartbeat(scope.row.mntnStatus.rawReportTime)"
+            >{{ formatLastHeartbeat(scope.row.mntnStatus.rawReportTime) }}</span
+          >
+        </template>
+      </u-table-column>
+      <u-table-column label="传图" key="ct">
+        <u-table-column
+          label="当天"
+          width="50"
+          class-name="picBg"
+          sortable
+          :sort-method="picSort"
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.mntnStatus.reportMap &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("uploads")
+                ? Number(scope.row.mntnStatus.reportMap.uploads)
+                : 0
+            }}
+          </template>
+        </u-table-column>
+        <u-table-column
+          label="历史"
+          width="50"
+          class-name="picBg"
+          sortable
+          :sort-method="pichistorySort"
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.mntnStatus.reportMap &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("delayedUploads")
+                ? Number(scope.row.mntnStatus.reportMap.delayedUploads)
+                : 0
+            }}
+          </template>
+        </u-table-column>
+      </u-table-column>
+      <u-table-column
+        prop="protocol"
+        label="规约"
+        width="120"
+        v-if="gycheck"
+        sortable
+        key="gy"
+      >
+        <template slot-scope="scope">
+          {{ protocolMap[scope.row.protocol] }}
+        </template>
+      </u-table-column>
+      <u-table-column label="电池状态" width="126" key="dc" v-if="dccheck">
+        <template slot-scope="scope">
+          <span
+            v-if="
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty('batteryVoltage') &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty(
+                'batteryChargingVoltage'
+              ) &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty('batteryPower')
+            "
+          >
+            {{ scope.row.mntnStatus.reportMap.batteryVoltage }}V/{{
+              scope.row.mntnStatus.reportMap.batteryChargingVoltage
+            }}V/{{ scope.row.mntnStatus.reportMap.batteryPower }}
+          </span>
+          <span v-else>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("battery")
+              ? scope.row.mntnStatus.reportMap.battery
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column label="心跳信息" v-if="xtcheck" key="xt">
+        <u-table-column
+          label="次数"
+          min-width="48"
+          sortable
+          prop="mntnStatus.reportMap.numberOfHb"
+          :sort-method="sortnumberOfHb"
+        >
+          <template slot-scope="scope">
+            <span>
+              {{
+                scope.row.mntnStatus.reportMap &&
+                scope.row.mntnStatus.reportMap.hasOwnProperty("numberOfHb")
+                  ? Number(scope.row.mntnStatus.reportMap.numberOfHb)
+                  : 0
+              }}
+            </span>
+          </template>
+        </u-table-column>
+        <u-table-column label="周期" min-width="48">
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("heartbeatDuration")
+                ? scope.row.mntnStatus.reportMap.heartbeatDuration
+                : 0
+            }}</span>
+          </template>
+        </u-table-column>
+        <u-table-column label="CMA消息" min-width="48">
+          <template slot-scope="scope">
+            <span
+              v-if="
+                scope.row.mntnStatus.reportMap !== null &&
+                scope.row.mntnStatus.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              <el-tooltip class="item" effect="dark" placement="top">
+                <div slot="content">
+                  lastHbTime：
+                  {{
+                    $moment(
+                      scope.row.mntnStatus.reportMap.lastHbTime * 1000
+                    ).format("YYYY-MM-DD HH:mm:ss")
+                  }}
+                  <br />
+                  lastHbRespTime：
+                  {{
+                    $moment(
+                      scope.row.mntnStatus.reportMap.lastHbRespTime * 1000
+                    ).format("YYYY-MM-DD HH:mm:ss")
+                  }}
+                </div>
+                <span>
+                  {{
+                    $moment(
+                      scope.row.mntnStatus.reportMap.lastRecvTime * 1000
+                    ).format("HH:mm")
+                  }}</span
+                >
+              </el-tooltip>
+            </span>
+            <span v-else> {{ scope.row.mntnStatus.reportMap.recv }}</span>
+            <!-- <span>{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("recv")
+                ? scope.row.mntnStatus.reportMap.recv
+                : 0
+            }}</span> -->
+          </template>
+        </u-table-column>
+      </u-table-column>
+
+      <u-table-column label="拍照" v-if="pzcheck" key="pz">
+        <u-table-column label="计划/实际" min-width="48">
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("photoTimes")
+                ? scope.row.mntnStatus.reportMap.photoTimes
+                : 0
+            }}</span>
+          </template>
+        </u-table-column>
+        <u-table-column
+          label="成功"
+          min-width="48"
+          sortable
+          :sort-method="sortSuccess"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("success")
+                ? Number(scope.row.mntnStatus.reportMap.success)
+                : 0
+            }}</span>
+          </template>
+        </u-table-column>
+        <u-table-column
+          label="失败"
+          min-width="48"
+          sortable
+          :sort-method="sortFailure"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("failure")
+                ? Number(scope.row.mntnStatus.reportMap.failure)
+                : 0
+            }}</span>
+          </template>
+        </u-table-column>
+      </u-table-column>
+
+      <u-table-column label="网络信号" v-if="wlcheck" key="wl">
+        <u-table-column label="卡1" min-width="60" prop="signature1">
+          <template slot-scope="scope">
+            <span
+              v-if="
+                scope.row.mntnStatus.reportMap !== null &&
+                scope.row.mntnStatus.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              {{ scope.row.mntnStatus.reportMap.signalLevel1 }}
+            </span>
+            <span v-else>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="
+                  scope.row.mntnStatus.reportMap !== null &&
+                  scope.row.mntnStatus.reportMap.hasOwnProperty('signature1')
+                    ? scope.row.mntnStatus.reportMap.signature1
+                    : ''
+                "
+                placement="top"
+              >
+                <span>{{
+                  scope.row.mntnStatus.reportMap !== null &&
+                  scope.row.mntnStatus.reportMap.hasOwnProperty("signature1")
+                    ? scope.row.mntnStatus.reportMap.signature1.split("/")[0]
+                    : ""
+                }}</span>
+              </el-tooltip>
+            </span>
+          </template>
+        </u-table-column>
+        <u-table-column label="卡2" min-width="60" prop="signature2">
+          <template slot-scope="scope">
+            <span
+              v-if="
+                scope.row.mntnStatus.reportMap !== null &&
+                scope.row.mntnStatus.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              {{ scope.row.mntnStatus.reportMap.signalLevel2 }}
+            </span>
+            <span v-else>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="
+                  scope.row.mntnStatus.reportMap !== null &&
+                  scope.row.mntnStatus.reportMap.hasOwnProperty('signature2')
+                    ? scope.row.mntnStatus.reportMap.signature2
+                    : ''
+                "
+                placement="top"
+              >
+                <span>{{
+                  scope.row.mntnStatus.reportMap !== null &&
+                  scope.row.mntnStatus.reportMap.hasOwnProperty("signature2")
+                    ? scope.row.mntnStatus.reportMap.signature2.split("/")[0]
+                    : ""
+                }}</span>
+              </el-tooltip>
+            </span>
+          </template>
+        </u-table-column>
+        <u-table-column
+          label="错误"
+          min-width="48"
+          prop="networkError"
+          sortable
+          :sort-method="sortNumbersErr"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("networkError")
+                ? Number(scope.row.mntnStatus.reportMap.networkError)
+                : 0
+            }}</span>
+          </template>
+        </u-table-column>
+      </u-table-column>
+
+      <u-table-column label="重启次数" v-if="cqcheck" key="cq">
+        <u-table-column
+          label="系统"
+          min-width="48"
+          prop="rebootTimes"
+          sortable
+          :sort-method="sortRebootTimes"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("rebootTimes")
+                ? Number(scope.row.mntnStatus.reportMap.rebootTimes)
+                : 0
+            }}</span>
+          </template>
+        </u-table-column>
+        <u-table-column
+          label="I1"
+          min-width="48"
+          prop="i1RebootTimes"
+          sortable
+          :sort-method="sortI1Reb"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("i1RebootTimes")
+                ? Number(scope.row.mntnStatus.reportMap.i1RebootTimes)
+                : 0
+            }}</span>
+          </template>
+        </u-table-column>
+      </u-table-column>
+      <u-table-column label="SIM卡" v-if="simcheck" min-width="160" key="sim">
+        <u-table-column label="卡1（ICCID）" width="158" prop="simcard1">
+          <template slot-scope="scope">
+            <span @dblclick="handleCopyClick1(scope.row.mntnStatus)">{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("simcard1")
+                ? scope.row.mntnStatus.reportMap.simcard1
+                : ""
+            }}</span>
+          </template>
+        </u-table-column>
+        <u-table-column label="卡2（ICCID）" width="158" prop="simcard2">
+          <template slot-scope="scope">
+            <span @dblclick="handleCopyClick2(scope.row.mntnStatus)">{{
+              scope.row.mntnStatus.reportMap !== null &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("simcard2")
+                ? scope.row.mntnStatus.reportMap.simcard2
+                : ""
+            }}</span>
+          </template>
+        </u-table-column>
+      </u-table-column>
+      <u-table-column
+        label="磁盘剩余空间"
+        v-if="freecheck"
+        min-width="66"
+        key="free"
+        sortable
+        :sort-method="sortfreeNumbers"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("freeROM")
+              ? scope.row.mntnStatus.reportMap.freeROM
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column label="CMA服务器" v-if="cmacheck" width="140" key="cma">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("cma")
+              ? scope.row.mntnStatus.reportMap.cma
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column label="I1版本" v-if="i1check" min-width="192" key="I1">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("i1Version")
+              ? scope.row.mntnStatus.reportMap.i1Version
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column
+        label="运维版本"
+        v-if="ywbbcheck"
+        min-width="248 "
+        key="ywbb"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("maintainVersion")
+              ? scope.row.mntnStatus.reportMap.maintainVersion
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column
+        label="Camera版本"
+        v-if="Cameracheck"
+        min-width="80"
+        key="Camera"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("cameraVersion")
+              ? scope.row.mntnStatus.reportMap.cameraVersion
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column label="AI版本" v-if="AIcheck" min-width="80" key="AI">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("aiVersion")
+              ? scope.row.mntnStatus.reportMap.aiVersion
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column label="MCU版本" v-if="MCUcheck" min-width="210" key="MCU">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("mcuVersion")
+              ? scope.row.mntnStatus.reportMap.mcuVersion
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column label="固件版本" v-if="fwcheck" min-width="210" key="fw">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("XyDev")
+              ? scope.row.mntnStatus.reportMap.firmware
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column
+        label="装置IP"
+        v-if="lastIpcheck"
+        width="120"
+        key="lastIp"
+      >
+        <template slot-scope="scope">
+          <span> {{ scope.row.mntnStatus.lastIp }}</span>
+        </template>
+      </u-table-column>
+      <u-table-column
+        label="备注"
+        v-if="notecheck"
+        min-width="210"
+        key="note"
+        sortable
+        :sort-method="sortNote"
+      >
+        <template slot-scope="scope">
+          <div
+            @click="handlecolEditClick(scope)"
+            style="height: 22px; cursor: pointer"
+          >
+            <el-input
+              class="noteclass"
+              v-if="scope.$index == cellIndex"
+              v-model="scope.row.mntnStatus.comment"
+              @blur="handleCommentBlur(scope)"
+              placeholder="请输入备注"
+            ></el-input>
+            <span v-else :title="scope.row.mntnStatus.comment">{{
+              scope.row.mntnStatus.comment
+            }}</span>
+          </div>
+        </template>
+      </u-table-column>
+    </u-table>
+    <el-drawer
+      class="drawerBox"
+      :visible.sync="drawer"
+      direction="rtl"
+      :with-header="false"
+    >
+      <div class="drawerSelect">
+        <h3>表格列配置</h3>
+        <div class="selectBox">
+          <el-checkbox v-model="gycheck" @change="saveLocalStorage"
+            >规约</el-checkbox
+          >
+          <el-checkbox v-model="dccheck" @change="saveLocalStorage"
+            >电池状态</el-checkbox
+          >
+          <el-checkbox v-model="xtcheck" @change="saveLocalStorage"
+            >心跳信息</el-checkbox
+          >
+          <!-- <el-checkbox v-model="xtcs" @change="saveLocalStorage"
+            >心跳次数</el-checkbox
+          >
+          <el-checkbox v-model="xtzq" @change="saveLocalStorage"
+            >心跳周期</el-checkbox
+          > -->
+          <el-checkbox v-model="pzcheck" @change="saveLocalStorage"
+            >拍照</el-checkbox
+          >
+          <el-checkbox v-model="wlcheck" @change="saveLocalStorage"
+            >网络信号</el-checkbox
+          >
+          <el-checkbox v-model="cqcheck" @change="saveLocalStorage"
+            >重启次数</el-checkbox
+          >
+
+          <el-checkbox v-model="simcheck" @change="saveLocalStorage"
+            >SIM卡</el-checkbox
+          >
+          <el-checkbox v-model="freecheck" @change="saveLocalStorage"
+            >磁盘剩余空间</el-checkbox
+          >
+
+          <el-checkbox v-model="cmacheck" @change="saveLocalStorage"
+            >CMA服务器</el-checkbox
+          >
+          <el-checkbox v-model="i1check" @change="saveLocalStorage"
+            >I1版本</el-checkbox
+          >
+          <el-checkbox v-model="ywbbcheck" @change="saveLocalStorage"
+            >运维版本</el-checkbox
+          >
+          <el-checkbox v-model="Cameracheck" @change="saveLocalStorage"
+            >Camera版本</el-checkbox
+          >
+          <el-checkbox v-model="AIcheck" @change="saveLocalStorage"
+            >AI版本</el-checkbox
+          >
+          <el-checkbox v-model="MCUcheck" @change="saveLocalStorage"
+            >MCU版本</el-checkbox
+          >
+          <el-checkbox v-model="fwcheck" @change="saveLocalStorage"
+            >固件版本</el-checkbox
+          >
+          <el-checkbox v-model="lastIpcheck" @change="saveLocalStorage"
+            >装置IP</el-checkbox
+          >
+          <el-checkbox v-model="notecheck" @change="saveLocalStorage"
+            >备注</el-checkbox
+          >
+        </div>
+      </div>
+    </el-drawer>
+    <!-- 装置详细信息 -->
+    <rowMsgDialog ref="rowMsgDialogref"></rowMsgDialog>
+  </div>
+</template>
+
+<script>
+import {
+  cmdSendApi,
+  getCmdActionApi,
+  upgradeListApi,
+  updCommentApi,
+  sendMsgApi,
+  msglistApi,
+} from "@/utils/api/index";
+import rowMsgDialog from "./rowMsgDialog.vue";
+
+export default {
+  props: [
+    "tableData",
+    "onlineNum",
+    "offlineNum",
+    "noPicNum",
+    "freeNum",
+    "tableLoaidng",
+    "showDiv",
+  ],
+  components: {
+    rowMsgDialog,
+  },
+  data() {
+    //判断ip
+    let validateIPAddress = (rule, value, callback) => {
+      let regexp =
+        /^((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}$/;
+      let valdata = value.split(",");
+      let isCorrect = true;
+      if (valdata.length) {
+        for (let i = 0; i < valdata.length; i++) {
+          if (regexp.test(valdata[i]) == false) {
+            isCorrect = false;
+          }
+        }
+      }
+      if (value == "") {
+        return callback(new Error("请输入iP地址"));
+      } else if (!isCorrect) {
+        callback(new Error("请输入正确对ip地址"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      tableHeight: 0,
+      screenHeight: 0,
+      showFlag: true,
+      newupdatatime: null,
+      cmdCn: {
+        yw_cmd_android_reboot: "重启设备",
+        yw_cmd_mcu_reboot: "MCU单片机重启",
+        i1_cmd_set_i1_server_ip_port: "设置I1服务器",
+        i1_cmd_set_xy_yw_ip_port: "设置运维服务器",
+        i1_cmd_set_i1_heart_beat_time: "设置心跳周期",
+        yw_cmd_upload_i1_zip_log: "上传日志",
+        upgrade: "升级",
+        yw_upd_ota: "Ota升级",
+        yw_cmd_start_frpc: "开启frpc",
+        yw_cmd_stop_frpc: "停止frpc",
+        i1_cmd_stop_aging_test: "停止老化测试",
+        del_file: "删除文件",
+        pull_files: "拉取文件",
+        push_file: "推送文件",
+        dl_file: "推送大文件",
+      },
+      taskdrawer: false,
+      drawer: false,
+      protocolMap: {
+        65280: "国网I1",
+        65296: "陕西",
+        65281: "安徽",
+        65282: "江苏",
+        65283: "湖南",
+        65284: "浙江",
+        65285: "河南全景",
+        65286: "河南郑州",
+        65290: "河南统一视频v2020",
+        65298: "宁夏",
+        2: "南网",
+      },
+      multipleSelection: [],
+
+      checkAllYW: false,
+      checkAllKXT: false,
+
+      ywNumber: 0,
+      kxtNumber: 0,
+
+      nowTime: new Date().getTime() / 1000,
+
+      gycheck: true,
+      dccheck: false,
+      xtcheck: false,
+      // xtcs: false,
+      // xtzq: false,
+      pzcheck: false,
+      wlcheck: false,
+      cqcheck: false,
+      simcheck: false,
+      cmacheck: true,
+      // bbcheck: true,
+      i1check: true,
+      ywbbcheck: true,
+      Cameracheck: false,
+      AIcheck: false,
+      MCUcheck: false,
+      fwcheck: false,
+      freecheck: false,
+      notecheck: false,
+      lastIpcheck: false,
+      //运维操作列表
+      operateOptions: [],
+
+      formIssue: {
+        operate: "",
+      }, //运维操作
+      idArray: [], //选中的数组  id
+      //设置ie服务器
+      ieVisible: false,
+      ieform: {
+        ip: "",
+        port: "",
+      },
+      ieRules: {
+        ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }],
+        port: [
+          {
+            required: true,
+            type: "number",
+            message: "请输入端口号(必须为数字)",
+            trigger: "blur",
+          },
+        ],
+      },
+      //设置运维服务器
+      operationVisible: false,
+      operationform: {
+        ip: "",
+        port: "",
+      },
+      operationRules: {
+        ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }],
+        port: [
+          {
+            required: true,
+            type: "number",
+            message: "请输入端口号(必须为数字)",
+            trigger: "blur",
+          },
+        ],
+      },
+      //设置心跳周期
+      heartBeatVisible: false,
+      heartBeatform: {
+        heart: "",
+      },
+      heartBeatRules: {
+        heart: [
+          {
+            required: true,
+            type: "number",
+            message: "请输入心跳周期(必须为数字)",
+            trigger: "blur",
+          },
+        ],
+      },
+
+      //升级
+      upgradationVisible: false,
+      upgradationform: {
+        upVal: "",
+      },
+
+      selectUpObj: {},
+      upgradationRules: {
+        upVal: [
+          { required: true, message: "请选择升级文件", trigger: "change" },
+        ],
+      },
+      upOptions: [],
+
+      upgradationVisibleOta: false,
+      upgradationformOta: {
+        upVal: "",
+      },
+      upgradationRulesOta: {
+        upVal: [
+          { required: true, message: "请选择升级文件", trigger: "change" },
+        ],
+      },
+      selectUpObjOta: {},
+      upOptionsOta: [],
+      //上传大文件
+      //升级
+      configVisible: false,
+      configform: {
+        upVal: "",
+        pathVal: "",
+      },
+
+      bigpathOption: [
+        {
+          name: "/sdcard/com.xypower.mpapp/data/recog/rp.dat",
+          desc: "AI识别文件",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/recog/rb.dat",
+          desc: "AI识别文件",
+        },
+      ],
+      selectconfigObj: {},
+      configRules: {
+        upVal: [
+          { required: true, message: "请选择升级文件", trigger: "change" },
+        ],
+      },
+      configOptions: [],
+      //设置frpc服务器
+      frpcVisible: false,
+      frpcform: {
+        // ip: "",
+        // port: "",
+        server_addr: "",
+        server_port: "",
+        frpc_type: "adb",
+        type: "tcp",
+        local_ip: "",
+        local_port: "",
+        remote_port: "",
+      },
+      frpc_typeOption: [
+        {
+          value: "ssh",
+          label: "SSH",
+        },
+        {
+          value: "adb",
+          label: "ADB",
+        },
+      ],
+      typeOption: [
+        {
+          value: "tcp",
+          label: "TCP",
+        },
+        {
+          value: "udp",
+          label: "UDP",
+        },
+      ],
+      frpcRules: {
+        server_addr: [
+          { required: true, validator: validateIPAddress, trigger: "blur" },
+        ],
+        server_port: [
+          {
+            required: true,
+            type: "number",
+            message: "请输入端口号(必须为数字)",
+            trigger: "blur",
+          },
+        ],
+        local_ip: [
+          { required: true, validator: validateIPAddress, trigger: "blur" },
+        ],
+        local_port: [
+          {
+            required: true,
+            type: "number",
+            message: "请输入端口号(必须为数字)",
+            trigger: "blur",
+          },
+        ],
+        remote_port: [
+          {
+            required: true,
+            type: "number",
+            message: "请输入端口号(必须为数字)",
+            trigger: "blur",
+          },
+        ],
+      },
+      newupdatatime: null,
+      cellIndex: null,
+
+      //设置删除文件
+      deleteFileVisible: false,
+      delFileForm: {
+        delFile: "",
+      },
+      delFileRules: {
+        delFile: [
+          {
+            required: true,
+            message: "请输入文件路径",
+            trigger: "blur",
+          },
+        ],
+      },
+      //下载文件
+      pullFileVisible: false,
+      pullFileForm: {
+        pullFile: "",
+      },
+      pullFileRules: {
+        pullFile: [
+          {
+            required: true,
+            message: "请输入文件路径",
+            trigger: "blur",
+          },
+        ],
+      },
+      pushLoading: false,
+      pathOption: [
+        {
+          name: "/sdcard/com.xypower.mpapp/data/App.json",
+          desc: "MpAPP全局配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/recog.json",
+          desc: "AI全局配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/bc.json",
+          desc: "电压电量配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/channels/1.json",
+          desc: "通道拍照配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/channels/2.json",
+          desc: "通道拍照配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/imgparams/1",
+          desc: "图像参数配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/imgparams/2",
+          desc: "图像参数配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/videoparams/1",
+          desc: "短视频参数配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/videoparams/2",
+          desc: "短视频参数配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/videoparams/78",
+          desc: "采样配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/recog/rp.dat",
+          desc: "AI识别文件",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/recog/rb.dat",
+          desc: "AI识别文件",
+        },
+        {
+          name: "/sdcard/com.xypower.mpmaster/data/Master.json",
+          desc: "运维配置文件",
+        },
+      ],
+      pullpathOption: [
+        {
+          name: "/sdcard/com.xypower.mpapp/data/App.json",
+          desc: "MpAPP全局配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/recog.json",
+          desc: "AI全局配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/bc.json",
+          desc: "电压电量配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/channels/1.json",
+          desc: "通道拍照配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/channels/2.json",
+          desc: "通道拍照配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/imgparams/1",
+          desc: "图像参数配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/imgparams/2",
+          desc: "图像参数配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/videoparams/1",
+          desc: "短视频参数配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/videoparams/2",
+          desc: "短视频参数配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/videoparams/78",
+          desc: "采样配置",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/recog/rp.dat",
+          desc: "AI识别文件",
+        },
+        {
+          name: "/sdcard/com.xypower.mpapp/data/recog/rb.dat",
+          desc: "AI识别文件",
+        },
+        {
+          name: "/sdcard/com.xypower.mpmaster/data/Master.json",
+          desc: "运维配置文件",
+        },
+      ],
+      checkedName: [],
+      //上传文件base64
+      pushFileVisible: false,
+      fileList: [],
+      pushFileForm: {
+        name: "",
+        fileData: "",
+      },
+      pushFileRules: {
+        name: [
+          {
+            required: true,
+            message: "请输入文件路径",
+            trigger: "blur",
+          },
+        ],
+      },
+      senMsgVisible: false,
+      sendForm: {
+        msginfo: "",
+      },
+      sendOption: [
+        {
+          name: "重启系统1：",
+          value: "yw+at+stw21=1",
+        },
+        {
+          name: "重启系统2：",
+          value: "at+stw21=1",
+        },
+        {
+          name: "重启MpApp：",
+          value: "at+restart=mpapp",
+        },
+        {
+          name: "重启MpMaster格式：",
+          value: "at+restart=mpmaster",
+        },
+      ],
+      msgListData: [], //短信记录
+      msgCompany: "", //公司厂家
+      msgtype: "", //类型
+      companyMap: {
+        1: "大汉移动",
+        2: "公田移动rabchase",
+        3: "公田m2m10086",
+        4: "安徽",
+      },
+    };
+  },
+  mounted() {
+    this.loadLocalStorage();
+    this.calculateHeight(this.showFlag);
+    window.addEventListener("resize", this.calculateHeight(this.showFlag));
+  },
+  computed: {},
+  watch: {
+    tableData: {
+      handler(newVal) {
+        // 数据发生变化时的处理逻辑
+        console.log("数据已更新：", newVal);
+        this.getNumber();
+        // this.$refs.ywMultipleTable.clearSelection();
+        this.$nextTick(() => {
+          this.startCountdown(); // 确保在 DOM 更新后执行
+        });
+        // this.startCountdown();
+      },
+      deep: true,
+    },
+  },
+  created() {},
+  methods: {
+    formatLastHeartbeat(timestamp) {
+      return this.$moment(timestamp * 1000).format("YYYY-MM-DD HH:mm:ss");
+    },
+    calculateHeight(val) {
+      console.log(val);
+      this.showFlag = val;
+      this.screenHeight = window.innerHeight; // 获取屏幕高度
+      if (val) {
+        this.tableHeight = this.screenHeight - 230; // 假设你想从屏幕高度中减去270px
+      } else {
+        this.tableHeight = this.screenHeight - 150; // 假设你想从屏幕高度中减去190px
+      }
+
+      // 根据你的需求计算高度，这里只是一个简单的示例
+
+      console.log(this.tableHeight);
+    },
+    //判断磁盘空间
+    tableRowSetting({ row }) {
+      if (
+        !row.mntnStatus ||
+        !row.mntnStatus.reportMap ||
+        !row.mntnStatus.reportMap.hasOwnProperty("freeROM")
+      ) {
+        // 如果freeROM属性不存在，返回默认类名
+        return "no-color";
+      }
+      const freeROMValue = row.mntnStatus.reportMap.freeROM;
+      const parsedValue = parseInt(freeROMValue, 10); // 使用基数10来确保解析为十进制数
+      if (parsedValue < 50) {
+        return "has-color";
+      }
+    },
+    //传图pic排序
+    picSort(a, b) {
+      // 确保 a 和 b 都有 mntnStatus.reportMap 对象
+      const aPic =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.uploads) || 0;
+      const bPic =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.uploads) || 0;
+      // 将 pic 转换为数字进行比较
+      const numA = Number(aPic);
+      const numB = Number(bPic);
+      // 根据需要进行升序或降序排序
+      // 这里假设你想要升序排序（从小到大）
+      return numA - numB;
+      // 如果你想要降序排序（从大到小），则返回 numB - numA
+    },
+    //历史传图
+    pichistorySort(a, b) {
+      // 确保 a 和 b 都有 mntnStatus.reportMap 对象
+      const aPic =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.delayedUploads) || 0;
+      const bPic =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.delayedUploads) || 0;
+      // 将 pic 转换为数字进行比较
+      const numA = Number(aPic);
+      const numB = Number(bPic);
+      // 根据需要进行升序或降序排序
+      // 这里假设你想要升序排序（从小到大）
+      return numA - numB;
+      // 如果你想要降序排序（从大到小），则返回 numB - numA
+    },
+    //心跳次数排序
+    sortnumberOfHb(a, b) {
+      const aNum =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.numberOfHb) || 0;
+      const bNum =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.numberOfHb) || 0;
+      const numA = Number(aNum);
+      const numB = Number(bNum);
+      return numA - numB;
+    },
+
+    //成功和失败
+    sortSuccess(a, b) {
+      const aNum =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.success) || 0;
+      const bNum =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.success) || 0;
+      const numA = Number(aNum);
+      const numB = Number(bNum);
+      return numA - numB;
+    },
+    sortFailure(a, b) {
+      const aNum =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.failure) || 0;
+      const bNum =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.failure) || 0;
+      const numA = Number(aNum);
+      const numB = Number(bNum);
+      return numA - numB;
+    },
+    //网络错误
+    sortNumbersErr(a, b) {
+      const aNum =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.networkError) || 0;
+      const bNum =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.networkError) || 0;
+      const numA = Number(aNum);
+      const numB = Number(bNum);
+      return numA - numB;
+    },
+    //重启次数
+    sortRebootTimes(a, b) {
+      const aNum =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.rebootTimes) || 0;
+      const bNum =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.rebootTimes) || 0;
+      const numA = Number(aNum);
+      const numB = Number(bNum);
+      return numA - numB;
+    },
+    //I1重启次数
+    sortI1Reb(a, b) {
+      const aNum =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.i1RebootTimes) || 0;
+      const bNum =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.i1RebootTimes) || 0;
+      const numA = Number(aNum);
+      const numB = Number(bNum);
+      return numA - numB;
+    },
+
+    sortfreeNumbers(a, b) {
+      // 确保 a 和 b 都有 mntnStatus.reportMap 对象，并且提取 pic 值
+      const aFree = a.mntnStatus.reportMap && a.mntnStatus.reportMap.freeROM;
+      const bFree = b.mntnStatus.reportMap && b.mntnStatus.reportMap.freeROM;
+      // 定义一个函数来将百分比字符串转换为数值，或者如果值为 null 或非百分比字符串，则返回 0
+      function parsePercentage(value) {
+        if (
+          value === null ||
+          typeof value !== "string" ||
+          !value.endsWith("%")
+        ) {
+          return 0;
+        }
+        // 去除百分比符号，并将剩余的字符串转换为数值
+        const numberValue = parseFloat(value.slice(0, -1));
+        if (isNaN(numberValue)) {
+          return 0;
+        }
+        return numberValue;
+      }
+
+      // 转换 pic 值为数值进行比较
+      const numA = parsePercentage(aFree);
+      const numB = parsePercentage(bFree);
+      // 这里假设你想要升序排序（从小到大）
+      return numA - numB;
+    },
+    sortNote(a, b) {
+      // 确保 a和b都是字符串，如果不是，则转换为字符串
+      const aValue =
+        a.mntnStatus.comment === null ? "" : String(a.mntnStatus.comment);
+      const bValue =
+        b.mntnStatus.comment === null ? "" : String(b.mntnStatus.comment);
+      // const aValue = typeof a === "string" ? a : String(a);
+      // const bValue = typeof b === "string" ? b : String(b);
+      // 处理null值，将它们视为最低优先级
+      if (aValue === "" || bValue === "") {
+        return aValue === "" ? 1 : -1; // 空字符串排在非空字符串后面
+      }
+      console.log(aValue, bValue);
+      // 使用localeCompare进行中文排序
+      return aValue.localeCompare(bValue, "zh-Hans-CN", {
+        sensitivity: "base",
+      });
+    },
+
+    //获取运维勾选和快心跳勾选个数
+    getNumber() {
+      console.log(this.tableData);
+      this.ywNumber = this.tableData.filter(
+        (item) => item.mntnStatus.inMaintain == 1
+      ).length;
+      this.kxtNumber = this.tableData.filter(
+        (item) => item.mntnStatus.quickHb == 1
+      ).length;
+      console.log("我这里是运维和快心跳的数据");
+      console.log(this.ywNumber, this.kxtNumber);
+      if (
+        this.ywNumber == this.tableData.length &&
+        this.tableData.length !== 0
+      ) {
+        this.checkAllYW = true;
+      } else {
+        this.checkAllYW = false;
+      }
+      if (
+        this.kxtNumber == this.tableData.length &&
+        this.tableData.length !== 0
+      ) {
+        this.checkAllKXT = true;
+      } else {
+        this.checkAllKXT = false;
+      }
+
+      // this.freeNum =
+      //   this.$refs.ywMultipleTable.$el.getElementsByClassName(
+      //     "has-color"
+      //   ).length;
+    },
+    //导出表格
+    handleExport() {
+      this.$parent.exportTable();
+    },
+    //更多功能
+    handleCommand(command) {
+      if (command == "a") {
+        this.handleExport();
+      }
+      if (command == "b") {
+        this.drawer = true;
+      }
+    },
+    // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据
+    getRowKey(row) {
+      return row.id;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+      console.log(this.multipleSelection);
+      this.idArray = [];
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        this.idArray.push(this.multipleSelection[i].id);
+      }
+      this.idArray = [...new Set(this.idArray)];
+      console.log("1", this.idArray);
+    },
+    isRed({ row }) {
+      const checkIdList = this.multipleSelection.map((item) => item.id);
+      if (checkIdList.includes(row.id)) {
+        return {
+          background: "#d0ece8!important",
+        };
+      }
+    },
+    // 点击装置名称
+    handleMsgClick(val) {
+      console.log(val);
+      this.$refs.rowMsgDialogref.display(val);
+    },
+
+    saveLocalStorage() {
+      localStorage.setItem("gycheck", this.gycheck);
+      localStorage.setItem("dccheck", this.dccheck);
+      localStorage.setItem("xtcheck", this.xtcheck);
+      // localStorage.setItem("xtcs", this.xtcs);
+      // localStorage.setItem("xtzq", this.xtzq);
+      localStorage.setItem("pzcheck", this.pzcheck);
+      localStorage.setItem("wlcheck", this.wlcheck);
+      localStorage.setItem("cqcheck", this.cqcheck);
+      localStorage.setItem("cmacheck", this.cmacheck);
+      localStorage.setItem("simcheck", this.simcheck);
+      localStorage.setItem("i1check", this.i1check);
+      localStorage.setItem("ywbbcheck", this.ywbbcheck);
+      localStorage.setItem("Cameracheck", this.Cameracheck);
+      localStorage.setItem("AIcheck", this.AIcheck);
+      localStorage.setItem("MCUcheck", this.MCUcheck);
+      localStorage.setItem("fwcheck", this.fwcheck);
+      localStorage.setItem("freecheck", this.freecheck);
+      localStorage.setItem("notecheck", this.notecheck);
+      localStorage.setItem("lastIpcheck", this.lastIpcheck);
+
+      this.adjustTableHeight();
+    },
+    loadLocalStorage() {
+      this.checkAllKXT = localStorage.getItem("checkAllKXT", this.checkAllKXT)
+        ? JSON.parse(localStorage.getItem("checkAllKXT"))
+        : false;
+      this.checkAllYW = localStorage.getItem("checkAllYW", this.checkAllYW)
+        ? JSON.parse(localStorage.getItem("checkAllYW"))
+        : false;
+
+      this.gycheck = localStorage.getItem("gycheck")
+        ? JSON.parse(localStorage.getItem("gycheck"))
+        : true;
+      this.dccheck = localStorage.getItem("dccheck")
+        ? JSON.parse(localStorage.getItem("dccheck"))
+        : false;
+      this.xtcheck = localStorage.getItem("xtcheck")
+        ? JSON.parse(localStorage.getItem("xtcheck"))
+        : false;
+      // this.xtcs = localStorage.getItem("xtcs")
+      //   ? JSON.parse(localStorage.getItem("xtcs"))
+      //   : false;
+      // this.xtzq = localStorage.getItem("xtzq")
+      //   ? JSON.parse(localStorage.getItem("xtzq"))
+      //   : false;
+      this.pzcheck = localStorage.getItem("pzcheck")
+        ? JSON.parse(localStorage.getItem("pzcheck"))
+        : false;
+      this.wlcheck = localStorage.getItem("wlcheck")
+        ? JSON.parse(localStorage.getItem("wlcheck"))
+        : false;
+      this.cqcheck = localStorage.getItem("cqcheck")
+        ? JSON.parse(localStorage.getItem("cqcheck"))
+        : false;
+      this.simcheck = localStorage.getItem("simcheck")
+        ? JSON.parse(localStorage.getItem("simcheck"))
+        : false;
+      this.cmacheck = localStorage.getItem("cmacheck")
+        ? JSON.parse(localStorage.getItem("cmacheck"))
+        : true;
+
+      this.i1check = localStorage.getItem("i1check")
+        ? JSON.parse(localStorage.getItem("i1check"))
+        : true;
+      this.ywbbcheck = localStorage.getItem("ywbbcheck")
+        ? JSON.parse(localStorage.getItem("ywbbcheck"))
+        : true;
+      this.Cameracheck = localStorage.getItem("Cameracheck")
+        ? JSON.parse(localStorage.getItem("Cameracheck"))
+        : false;
+      this.AIcheck = localStorage.getItem("AIcheck")
+        ? JSON.parse(localStorage.getItem("AIcheck"))
+        : false;
+      this.MCUcheck = localStorage.getItem("MCUcheck")
+        ? JSON.parse(localStorage.getItem("MCUcheck"))
+        : false;
+      this.fwcheck = localStorage.getItem("fwcheck")
+        ? JSON.parse(localStorage.getItem("fwcheck"))
+        : false;
+      this.freecheck = localStorage.getItem("freecheck")
+        ? JSON.parse(localStorage.getItem("freecheck"))
+        : false;
+      this.notecheck = localStorage.getItem("notecheck")
+        ? JSON.parse(localStorage.getItem("notecheck"))
+        : false;
+      this.lastIpcheck = localStorage.getItem("lastIpcheck")
+        ? JSON.parse(localStorage.getItem("lastIpcheck"))
+        : false;
+
+      console.log(
+        "规约：" + this.gycheck,
+        "电池：" + this.dccheck,
+        "心跳：" + this.xtcheck,
+        "拍照：" + this.pzcheck,
+        "网络信号：" + this.wlcheck,
+        "重启次数：" + this.cqcheck,
+        "sim卡：" + this.simcheck,
+        "cma服务器：" + this.cmacheck,
+        "版本：" + this.ywbbcheck
+      );
+    },
+    adjustTableHeight() {
+      // 通过调用 window.resize 事件重新触发表格布局和渲染
+      const resizeEvent = new Event("resize");
+      window.dispatchEvent(resizeEvent);
+      // 或者使用 Vue 的 nextTick 方法来确保 DOM 更新完成后再执行调整操作
+      this.$nextTick(() => {
+        this.$refs.ywMultipleTable.doLayout(); // 调用 el-table 的 doLayout 方法重新布局
+      });
+    },
+    startCountdown() {
+      this.newupdatatime = new Date().getTime(); // 更新当前时间
+      // 清空之前可能存在的定时器
+      if (this.intervalId) {
+        clearInterval(this.intervalId);
+      }
+      // 开始倒计时，每秒执行一次remainingTime方法
+      this.intervalId = setInterval(() => {
+        this.newupdatatime = new Date().getTime(); // 更新当前时间
+        this.tableData.forEach((item) => {
+          //console.log(item);
+          if (item.list) {
+            this.remainingTime(item.list[0]);
+          }
+          // let params = item.list[0];
+          // this.remainingTime(params); // 重新计算每个项目的剩余时间
+        });
+      }, 1000); // 每秒执行一次
+    },
+    remainingTime(item) {
+      if (!this.newupdatatime) {
+        // 更新时间尚未设置，返回默认的倒计时时间或者不执行任何操作
+        return "计算中...";
+      }
+      const estimatedPublishTime = item.estimatedPublishTime * 1000;
+      const difference = estimatedPublishTime - this.newupdatatime;
+      const minutes = Math.floor(difference / 60000);
+      const seconds = Math.floor((difference % 60000) / 1000);
+      if (minutes == 0 && seconds == 0) {
+        this.$parent.fetchData();
+        return `命令已下发`;
+      } else {
+        if (minutes < 10 && seconds < 10) {
+          return ` 0${minutes} : 0${seconds} `;
+        } else if (minutes < 10) {
+          return ` 0${minutes} : ${seconds} `;
+        } else if (seconds < 10) {
+          return ` ${minutes} : 0${seconds} `;
+        } else {
+          return ` ${minutes} : ${seconds} `;
+        }
+      }
+    },
+    //更新备注
+    handlecolEditClick({ $index, row }) {
+      this.cellIndex = $index;
+    },
+    handleCommentBlur({ row }) {
+      console.log(row);
+      updCommentApi({
+        termId: row.id,
+        comment: row.mntnStatus.comment,
+      })
+        .then((res) => {
+          if (res.data) {
+            this.cellIndex = null;
+          } else {
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: res.errorMsg,
+              type: "error",
+            });
+          }
+        })
+        .catch((err) => {});
+    },
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.calculateHeight);
+  },
+};
+</script>
+<style lang="less">
+.tableContain {
+  width: 100%;
+  height: 100%;
+  .headTitle {
+    display: flex;
+    align-items: center;
+    margin-bottom: 8px;
+
+    .xfMl {
+      .el-form-item--small.el-form-item {
+        margin-bottom: 0px;
+      }
+      .el-select {
+        width: 158px;
+      }
+    }
+    .zzMsg {
+      display: flex;
+      margin-left: auto;
+      margin-right: 44px;
+      .total {
+        margin-left: 8px;
+        //width: 100%;
+        height: 32px;
+        line-height: 32px;
+        font-size: 14px;
+        color: #333;
+        span {
+          margin-right: 4px;
+        }
+        .el-tag--info {
+          color: #333;
+        }
+      }
+      .totalPopover {
+      }
+      .drawBox {
+        //margin-left: auto;
+      }
+    }
+  }
+  #ywTable {
+    .el-input--small .el-input__inner {
+      height: 20px;
+      line-height: 20px;
+    }
+  }
+  .plTableBox {
+    /* 横向滚动条的整体样式 */
+    // ::-webkit-scrollbar {
+    //   height: 12px; /* 尝试设置滚动条的宽度，但这可能不会在所有浏览器上生效 */
+    // }
+    .el-table {
+      thead {
+        color: #333;
+        th {
+          background: #d3d3d3;
+        }
+      }
+      td {
+        text-align: center;
+      }
+      th {
+        padding: 0px;
+      }
+      th > .cell {
+        text-align: center;
+      }
+      .cell {
+        padding-left: 4px !important;
+        padding-right: 4px !important;
+      }
+    }
+    .hbClass {
+      .cell {
+        cursor: pointer;
+        &:hover {
+          color: #169e8c;
+          text-decoration: underline;
+        }
+      }
+    }
+    .has-color {
+      background: #ffb8b8;
+    }
+    .has-color td.el-table__cell {
+      background: #ffb8b8 !important;
+    }
+    .el-table__fixed::before {
+      height: 0px;
+    }
+  }
+  .ywTableBox {
+    color: #333;
+
+    .el-table__cell {
+      text-align: center;
+      .cell {
+        padding: 0px;
+      }
+    }
+    .bbStyle {
+      text-align: left;
+      .cell {
+        display: flex;
+        p {
+          display: inline;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          b {
+            margin-left: 4px;
+          }
+        }
+      }
+    }
+
+    .el-table--scrollable-y .el-table__body-wrapper {
+      height: calc(100% - 40px) !important;
+    }
+    .el-table__row .picBg {
+      background: #169e8c !important;
+      color: #fff;
+    }
+    th.el-table__cell {
+      background: #d3d3d3;
+    }
+    .noClass {
+      color: #333;
+      font-size: 12px;
+      line-height: 12px;
+    }
+    .redClass {
+      color: red;
+      font-weight: 700;
+      line-height: 12px;
+      span {
+        color: #333;
+      }
+    }
+    thead.is-group th.el-table__cell {
+      background: #d3d3d3;
+    }
+    tr {
+      background: #fff;
+    }
+    .el-table--striped
+      .el-table__body
+      tr.el-table__row--striped
+      td.el-table__cell {
+      background: #e9e9e8;
+    }
+    .el-table__body tr:hover > td.el-table__cell {
+      background: #e9e9e9;
+    }
+
+    thead {
+      color: #333;
+    }
+    .el-table--scrollable-y .el-table__body-wrapper {
+      height: 100% !important;
+    }
+  }
+  .el-table--small .el-table__cell {
+    padding: 4px 0px;
+  }
+  .el-table .caret-wrapper {
+    height: 24px;
+    width: 10px;
+    margin-left: 4px;
+  }
+
+  .el-table .sort-caret.ascending {
+    border-bottom-color: #666;
+    top: 0px;
+    left: 0px;
+  }
+  .el-table .ascending .sort-caret.ascending {
+    border-bottom-color: #169e8c;
+  }
+  .el-table .sort-caret.descending {
+    border-top-color: #666;
+    bottom: 2px;
+    left: 0px;
+  }
+  .el-table .descending .sort-caret.descending {
+    border-top-color: #169e8c;
+  }
+  //半选
+  .is-indeterminate .el-checkbox__input .el-checkbox__inner {
+    background-color: #169e8c;
+    border-color: #169e8c;
+  }
+  .is-indeterminate .el-checkbox__input .el-checkbox__inner:before {
+    content: "";
+    position: absolute;
+    display: block;
+    background-color: #fff;
+    height: 2px;
+    transform: scale(0.5);
+    left: 0;
+    right: 0;
+    top: 5px;
+  }
+
+  .drawerBox {
+    .el-drawer {
+      width: 240px !important;
+      .el-drawer__body {
+        padding: 16px;
+        color: #333;
+        .drawerSelect {
+          h3 {
+            font-size: 14px;
+            color: #333;
+            //font-weight: normal;
+            margin-bottom: 12px;
+          }
+          .selectBox {
+            display: flex;
+            flex-direction: column;
+            height: 32px;
+            line-height: 32px;
+          }
+        }
+      }
+    }
+  }
+  .upDialogBox {
+    .el-dialog {
+      .el-select {
+        width: 100%;
+      }
+    }
+  }
+  .frpcDialogBox {
+    .el-dialog__body {
+      .el-button--small {
+        padding: 5px 15px;
+      }
+      .el-form {
+        margin-top: 12px;
+      }
+    }
+    .el-select {
+      width: 100%;
+    }
+  }
+  .taskMask {
+    position: fixed;
+    bottom: 50%;
+    right: 0px;
+    z-index: 2;
+    .el-button {
+      border-radius: 50%;
+      padding: 10px;
+    }
+  }
+  .taskDrawDialog {
+    .commandList {
+      width: 100%;
+      height: calc(100% - 32px);
+      //background: #fcc;
+      overflow: auto;
+      p {
+        background: #fdf6ec;
+        margin-bottom: 8px;
+        line-height: 24px;
+        color: #333;
+        font-size: 14px;
+        padding: 6px;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        &:hover {
+          background: #faecd8;
+        }
+        .indexClass {
+          padding: 4px;
+          font-size: 14px;
+          color: #000;
+          background: #d3d3d3;
+          min-width: 18px;
+          text-align: center;
+          margin-right: 8px;
+        }
+        .normalClass {
+          background: #d3d3d3;
+        }
+        .cancelClass {
+          background: #fde2e2;
+        }
+        .comMsg {
+          display: flex;
+          flex-wrap: wrap;
+          b {
+            font-weight: normal;
+            margin-right: 12px;
+          }
+        }
+      }
+    }
+  }
+  .redMlxf {
+    color: #f00;
+    b {
+      font-size: 12px;
+      font-weight: normal;
+    }
+  }
+  .pushBoxDialog {
+    .el-dialog__body {
+      height: auto;
+      ul {
+        li {
+          list-style: none;
+          font-size: 13px;
+          line-height: 22px;
+          cursor: pointer;
+          &:hover {
+            background-color: #b9e2dd;
+          }
+        }
+      }
+    }
+    .upload-demo {
+      position: absolute;
+      display: flex;
+      flex-direction: row-reverse;
+      margin-right: 65px;
+      top: 36px;
+      .el-upload-list {
+        width: 320px;
+        height: 32px;
+        line-height: 32px;
+        border: 1px solid #ddd;
+        margin-right: 12px;
+        border-radius: 4px;
+        .el-upload-list__item {
+          transition: none;
+          font-size: 14px;
+          color: #606266;
+          position: relative;
+          box-sizing: border-box;
+          border-radius: 4px;
+          width: 100%;
+          height: 32px;
+          line-height: 32px;
+          margin-top: 0px !important;
+          .el-icon-close {
+            top: 10px;
+          }
+        }
+      }
+    }
+  }
+  .pullBoxDialog {
+    .el-dialog__body {
+      padding: 12px 12px;
+    }
+    ul {
+      li {
+        list-style: none;
+        font-size: 13px;
+        line-height: 22px;
+        cursor: pointer;
+        &:hover {
+          background-color: #b9e2dd;
+        }
+      }
+    }
+  }
+  .deleteDialog {
+    .el-dialog__body {
+      height: auto;
+      ul {
+        li {
+          list-style: none;
+          font-size: 13px;
+          line-height: 22px;
+          cursor: pointer;
+          &:hover {
+            background-color: #b9e2dd;
+          }
+        }
+      }
+    }
+  }
+  .configDialogBox {
+    ul {
+      margin-bottom: 12px;
+      li {
+        list-style: none;
+        font-size: 13px;
+        line-height: 22px;
+        cursor: pointer;
+        &:hover {
+          background-color: #b9e2dd;
+        }
+      }
+    }
+  }
+  .senMsgDialog {
+    ul {
+      li {
+        list-style: none;
+        font-size: 13px;
+        line-height: 22px;
+        cursor: pointer;
+        &:hover {
+          background-color: #b9e2dd;
+        }
+      }
+    }
+  }
+}
+.contenBoxMsg {
+  p {
+    color: #333;
+    line-height: 24px;
+    font-size: 14px;
+  }
+}
+.el-select-dropdown__item {
+  i {
+    margin-left: 8px;
+    font-size: 12px;
+    font-style: normal;
+  }
+}
+.totalPopover {
+  display: flex;
+  span {
+    margin-right: 4px;
+  }
+}
+</style>
diff --git a/src/views/historyReport/index.vue b/src/views/historyReport/index.vue
new file mode 100644
index 0000000..861e9c9
--- /dev/null
+++ b/src/views/historyReport/index.vue
@@ -0,0 +1,830 @@
+<template>
+  <div class="homeBox">
+    <div class="filterBox">
+      <el-form
+        v-show="showDiv"
+        :inline="true"
+        :model="formdata"
+        class="demo-form-inline"
+      >
+        <div class="topSearch">
+          <el-form-item label="电压" class="dybox">
+            <el-select
+              v-model="formdata.dyId"
+              @change="getSearchxl"
+              filterable
+              @keyup.enter.native="onSubmit()"
+            >
+              <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
+              @keyup.enter.native="onSubmit()"
+              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="杆塔" class="gtbox">
+            <el-select
+              v-model="formdata.towerId"
+              filterable
+              @keyup.enter.native="onSubmit()"
+            >
+              <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="是否在线" class="isonLineClass">
+            <el-select
+              v-model="formdata.isonline"
+              @keyup.enter.native="onSubmit()"
+            >
+              <el-option
+                v-for="item in onlineOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否运维" class="ismntClass">
+            <el-select v-model="formdata.mntn" @keyup.enter.native="onSubmit()">
+              <el-option
+                v-for="item in mntendOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="规约" class="gybox">
+            <el-select
+              v-model="formdata.protocol"
+              filterable
+              @keyup.enter.native="onSubmit()"
+            >
+              <el-option
+                v-for="item in protocolOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+                {{ item.name }}-{{ item.id }}
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="活动" class="activitybox">
+            <el-select
+              @keyup.enter.native="onSubmit()"
+              v-model="formdata.activityId"
+              filterable
+              @change="changeActive"
+            >
+              <el-option
+                v-for="item in activityOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="选择日期" class="dateclass">
+            <el-date-picker
+              v-model="formdata.endtime"
+              type="datetime"
+              placeholder="结束日期"
+              value-format="timestamp"
+              :picker-options="pickerOptions"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="bottomSearch">
+          <el-form-item label="出厂ID" class="oidbox">
+            <el-input
+              @keyup.enter.native="onSubmit()"
+              v-model="formdata.oid"
+              placeholder="请输入出厂ID"
+              clearable
+            ></el-input>
+
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="反选"
+              placement="top"
+            >
+              <el-checkbox
+                v-model="formdata.oidExclude"
+                :checked="formdata.oidExclude == 1 ? true : false"
+                true-label="1"
+                false-label="0"
+              ></el-checkbox>
+            </el-tooltip>
+          </el-form-item>
+
+          <el-form-item label="装置编号" class="cmdibox">
+            <el-input
+              @keyup.enter.native="onSubmit()"
+              v-model="formdata.cmdid"
+              placeholder="请输入装置编号"
+              clearable
+            ></el-input>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="反选"
+              placement="top"
+            >
+              <el-checkbox
+                v-model="formdata.cmdidExclude"
+                :checked="formdata.cmdidExclude == 1 ? true : false"
+                true-label="1"
+                false-label="0"
+              ></el-checkbox>
+            </el-tooltip>
+          </el-form-item>
+
+          <el-form-item label="CMA服务器" class="cmabox">
+            <el-input
+              @keyup.enter.native="onSubmit()"
+              v-model="formdata.cma"
+              placeholder="请输入CMA服务器"
+              clearable
+            ></el-input>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="反选"
+              placement="top"
+            >
+              <el-checkbox
+                v-model="formdata.cmaExclude"
+                :checked="formdata.cmaExclude == 1 ? true : false"
+                true-label="1"
+                false-label="0"
+              ></el-checkbox>
+            </el-tooltip>
+          </el-form-item>
+
+          <el-form-item label="版本" class="versionbox">
+            <el-input
+              @keyup.enter.native="onSubmit()"
+              v-model="formdata.version"
+              placeholder="请输入版本"
+              clearable
+            ></el-input>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="反选"
+              placement="top"
+            >
+              <el-checkbox
+                v-model="formdata.versionExclude"
+                :checked="formdata.versionExclude == 1 ? true : false"
+                true-label="1"
+                false-label="0"
+              ></el-checkbox>
+            </el-tooltip>
+          </el-form-item>
+
+          <el-form-item class="btngrop">
+            <el-button type="primary" @click="onSubmit">查询</el-button>
+            <el-button type="primary" @click="onReset">重置</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+      <el-tooltip
+        class="item"
+        effect="dark"
+        :content="showDiv ? '收起' : '展开'"
+        placement="top"
+      >
+        <el-button
+          type="primary"
+          :class="showDiv ? 'toggleClass' : 'toggleClass2'"
+          :icon="showDiv ? 'el-icon-d-arrow-right' : 'el-icon-d-arrow-left'"
+          circle
+          @click="toggleDiv"
+        ></el-button>
+      </el-tooltip>
+    </div>
+    <div class="searchSimple" v-if="!showDiv">
+      <el-form :inline="true" :model="formdata" class="demo-form-inline">
+        <el-form-item label="活动" class="activitybox">
+          <el-select
+            @keyup.enter.native="onSubmit()"
+            v-model="formdata.activityId"
+            filterable
+            @change="changeActive"
+          >
+            <el-option
+              v-for="item in activityOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="装置编号" class="cmdibox">
+          <el-input
+            @keyup.enter.native="onSubmit()"
+            v-model="formdata.cmdid"
+            placeholder="请输入装置编号"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item class="btngrop">
+          <el-button type="primary" @click="onSubmit">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div
+      class="tableBox"
+      :style="{ height: showDiv ? 'calc(100% - 82px)' : 'calc(100% - 2px)' }"
+    >
+      <tableMain
+        ref="tableRef"
+        :tableData="dataListNew"
+        :onlineNum="onlineNum"
+        :offlineNum="offlineNum"
+        :noPicNum="noPicNum"
+        :freeNum="freeNum"
+        :tableLoaidng="tableLoaidng"
+        :showDiv="showDiv"
+      ></tableMain>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  cmdActlistApi,
+  getTerminalJoggle,
+  getActivityApi,
+  getProtocolList,
+  getSearchInfo,
+  exportTerminalApi,
+} from "@/utils/api/index";
+import tableMain from "./components/tableMain";
+export default {
+  name: "historyReport",
+  components: {
+    tableMain,
+  },
+  data() {
+    return {
+      showDiv: true, // 控制div的显示与隐藏
+      pickerOptions: {
+        disabledDate(date) {
+          return date.getTime() > Date.now(); // 禁用大于今天的日期
+        },
+      },
+      dyOptions: [{ id: -1, name: "全部" }], //电压数据
+      xlOptions: [{ id: -1, name: "全部" }], //线路数据
+      gtOptions: [{ id: -1, name: "全部" }], //杆塔数据
+      onlineOptions: [
+        { id: -1, name: "全部" },
+        { id: 1, name: "在线" },
+        { id: 0, name: "离线" },
+      ],
+      protocolOptions: [{ id: -1, name: "全部" }], //规约数据
+      activityOptions: [{ id: -1, name: "全部" }], //活动
+      mntendOptions: [
+        { id: -1, name: "全部" },
+        { id: 1, name: "运维" },
+        { id: 2, name: "未运维" },
+      ], //是否运维
+      formdata: {
+        dyId: -1,
+        lineId: -1,
+        towerId: -1,
+        isonline: -1,
+        protocol: -1,
+        mntn: 1,
+        activityId: -1,
+        oid: "",
+        oidExclude: 0,
+        cmdid: "",
+        cmdidExclude: 0,
+        cma: "",
+        cmaExclude: 0,
+        version: "",
+        versionExclude: 0,
+        endtime: new Date(new Date().setHours(23, 59, 59, 0)).getTime(), // 设置结束时间为当天夜晚23:59:59的时间戳
+      },
+
+      dataList: [],
+      dataListNew: [],
+      tableLoaidng: false,
+      onlineNum: 0, //在线数量
+      offlineNum: 0, //离线数量
+      noPicNum: 0, //未上传图片数量
+      freeNum: 0,
+      intervalId: null, // 用于存储定时器的ID
+      activityIdLoc: "",
+      runCommand: [], //获取命令列表
+      scrollTop: 0, // 滚动条位置
+    };
+  },
+  created() {
+    this.formdata = {
+      dyId: -1,
+      lineId: -1,
+      towerId: -1,
+      isonline: -1,
+      protocol: -1,
+      mntn: 1,
+      activityId: -1,
+      oid: "",
+      oidExclude: 0,
+      cmdid: "",
+      cmdidExclude: 0,
+      cma: "",
+      cmaExclude: 0,
+      version: "",
+      versionExclude: 0,
+      endtime: new Date(new Date().setHours(23, 59, 59, 0)).getTime(), // 设置结束时间为当天夜晚23:59:59的时间戳
+    };
+  },
+  mounted() {
+    this.getSearchdy();
+    this.getProtocol();
+    this.getactiveList();
+  },
+  watch: {},
+  methods: {
+    //导出数据
+    exportTable() {
+      let params = {
+        pageindex: 1,
+        pagesize: 10000,
+        end: this.formdata.endtime / 1000,
+      };
+      // 根据条件添加参数
+      if (this.formdata.dyId !== -1) {
+        params.dyId = this.formdata.dyId;
+      }
+      if (this.formdata.lineId !== -1) {
+        params.lineId = this.formdata.lineId;
+      }
+      if (this.formdata.towerId !== -1) {
+        params.towerId = this.formdata.towerId;
+      }
+      if (this.formdata.isonline !== -1) {
+        params.isonline = this.formdata.isonline;
+      }
+      if (this.formdata.protocol !== -1) {
+        params.protocol = this.formdata.protocol;
+      }
+      if (this.formdata.mntn !== -1) {
+        params.mntn = this.formdata.mntn;
+      }
+      if (this.formdata.activityId !== -1) {
+        params.activityId = this.formdata.activityId;
+      }
+
+      if (this.formdata.oid !== "") {
+        params.oid = this.formdata.oid;
+      }
+      console.log(this.formdata.oidExclude);
+      if (this.formdata.oidExclude !== 0) {
+        params.oidExclude = this.formdata.oidExclude;
+      }
+      if (this.formdata.cma !== "") {
+        params.cma = this.formdata.cma;
+      }
+      if (this.formdata.cmaExclude !== 0) {
+        params.cmaExclude = this.formdata.cmaExclude;
+      }
+      if (this.formdata.cmdid !== "") {
+        params.cmdid = this.formdata.cmdid;
+      }
+      if (this.formdata.cmdidExclude !== 0) {
+        params.cmdidExclude = this.formdata.cmdidExclude;
+      }
+      if (this.formdata.version !== "") {
+        params.version = this.formdata.version;
+      }
+      if (this.formdata.versionExclude !== 0) {
+        params.versionExclude = this.formdata.versionExclude;
+      }
+      console.log(params);
+      exportTerminalApi(params)
+        .then((res) => {
+          console.log(res);
+          const now = this.$moment(new Date());
+          const formattedTime = now.format("YYYY年MM月DD日HH时mm分"); // 格式化时间字符串，例如 "2023-04-01_15_30_00"
+          const blob = new Blob([res]);
+          const link = document.createElement("a");
+          link.href = window.URL.createObjectURL(blob);
+          link.download = `运维数据报表_${formattedTime}.xls`;
+          link.click();
+        })
+        .catch((err) => {});
+    },
+    //获取电压信息
+    getSearchdy() {
+      getSearchInfo({ type: 1 })
+        .then((res) => {
+          this.dyOptions = this.dyOptions.concat(res.data.list);
+          console.log(this.dyOptions);
+          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;
+        })
+        .catch((err) => {});
+    },
+    getProtocol() {
+      //获取规约版本
+      getProtocolList()
+        .then((res) => {
+          console.log(res);
+          this.protocolOptions = this.protocolOptions.concat(res.data.list);
+          this.formdata.protocol = this.protocolOptions[0].id;
+        })
+        .catch((err) => {});
+    },
+    //获取活动列表
+    getactiveList() {
+      getActivityApi()
+        .then((res) => {
+          console.log(res);
+          // this.activityOptions = this.activityOptions.concat(res.data.list);
+          let activeArr = res.data.map((item) => ({
+            id: item.id,
+            name: item.title,
+          }));
+          this.activityOptions = this.activityOptions.concat(activeArr);
+          console.log(this.activityOptions);
+          this.formdata.activityId = this.activityOptions[1].id;
+        })
+        .catch((err) => {});
+    },
+    changeActive(val) {
+      console.log(this.activityOptions);
+      console.log(val);
+    },
+    onSubmit() {
+      this.tableLoaidng = true;
+      this.dataList = [];
+      this.fetchData();
+    },
+    fetchData() {
+      console.log(this.$refs.tableRef);
+      let params = {
+        pageindex: 1,
+        pagesize: 10000,
+        end: this.formdata.endtime / 1000,
+      };
+      // 根据条件添加参数
+      if (this.formdata.dyId !== -1) {
+        params.dyId = this.formdata.dyId;
+      }
+      if (this.formdata.lineId !== -1) {
+        params.lineId = this.formdata.lineId;
+      }
+      if (this.formdata.towerId !== -1) {
+        params.towerId = this.formdata.towerId;
+      }
+      if (this.formdata.isonline !== -1) {
+        params.isonline = this.formdata.isonline;
+      }
+      if (this.formdata.protocol !== -1) {
+        params.protocol = this.formdata.protocol;
+      }
+
+      if (this.formdata.mntn !== -1) {
+        params.mntn = this.formdata.mntn;
+      }
+      if (this.formdata.activityId !== -1) {
+        params.activityId = this.formdata.activityId;
+      }
+
+      if (this.formdata.oid !== "") {
+        params.oid = this.formdata.oid;
+      }
+      console.log(this.formdata.oidExclude);
+      if (Number(this.formdata.oidExclude) !== 0) {
+        params.oidExclude = this.formdata.oidExclude;
+      }
+      if (this.formdata.cma !== "") {
+        params.cma = this.formdata.cma;
+      }
+      if (Number(this.formdata.cmaExclude) !== 0) {
+        params.cmaExclude = this.formdata.cmaExclude;
+      }
+      if (this.formdata.cmdid !== "") {
+        params.cmdid = this.formdata.cmdid;
+      }
+      if (Number(this.formdata.cmdidExclude) !== 0) {
+        params.cmdidExclude = this.formdata.cmdidExclude;
+      }
+      if (this.formdata.version !== "") {
+        params.version = this.formdata.version;
+      }
+      if (Number(this.formdata.versionExclude) !== 0) {
+        params.versionExclude = this.formdata.versionExclude;
+      }
+      console.log(params);
+
+      getTerminalJoggle(params)
+        .then((res) => {
+          console.log(res);
+          this.dataList = res.data;
+
+          this.getCmdList();
+          this.onlineNum = this.dataList.filter(
+            (item) => item.onlinestatus == 1
+          ).length;
+          this.offlineNum = this.dataList.length - this.onlineNum;
+          this.tableLoaidng = false;
+          this.noPicNum = this.dataList.filter(
+            (item) =>
+              item.mntnStatus.reportMap == null ||
+              item.mntnStatus.reportMap.pic == undefined ||
+              item.mntnStatus.reportMap.pic == 0 ||
+              item.mntnStatus.reportMap.pic == -1
+          ).length;
+
+          this.freeNum = this.dataList.filter((item) => {
+            // 确保mntnStatus和reportMap存在，并且freeROM不是null或undefined
+            const freeROM = item.mntnStatus?.reportMap?.freeROM;
+            // 如果freeROM存在并且可以被转换为数字
+            if (
+              freeROM !== null &&
+              freeROM !== undefined &&
+              !isNaN(parseInt(freeROM, 10))
+            ) {
+              // 转换为整数并检查是否小于50
+              return parseInt(freeROM, 10) < 50;
+            }
+            // 如果freeROM不存在或不是数字，则忽略此项
+            return false;
+          }).length;
+
+          console.log("我已经加载完数据");
+        })
+        .catch((err) => {});
+    },
+    //获取命令列表
+    getCmdList() {
+      cmdActlistApi({ p: 1, ps: 10000 })
+        .then((res) => {
+          console.log(res);
+          console.log("我是命令列表");
+          console.log(this.dataList);
+          this.runCommand = res.data.list;
+          // let array1 = [{ id: 0, name: "sss" },{ id: 1, name: "111" }];
+          // let array2 = [{ termid: 0, time: "aaaa" },{ termid: 1, time: "s1111ss" }];
+
+          // 过滤出array1中每个对象的id
+          let ids = this.dataList.map((item) => item.id);
+
+          // 过滤出array2中termId与array1中的id相等的项
+          let filteredArray2 = this.runCommand.filter((item) =>
+            ids.includes(item.termId)
+          );
+
+          // 遍历array1，找到匹配的项并添加到list属性中
+          this.dataList.forEach((item) => {
+            let match = filteredArray2.find((i) => i.termId === item.id);
+            if (match) {
+              item.list = item.list || []; // 如果list属性不存在，则初始化一个空数组
+              item.list.push(match);
+            }
+          });
+          this.dataListNew = this.dataList;
+          console.log(this.dataListNew);
+        })
+        .catch((err) => {});
+    },
+    //重置
+    onReset() {
+      this.formdata = {
+        dyId: -1,
+        lineId: -1,
+        towerId: -1,
+        isonline: -1,
+        protocol: -1,
+        mntn: 1,
+        activityId: -1,
+        oid: "",
+        oidExclude: 0,
+        cmdid: "",
+        cmdidExclude: 0,
+        cma: "",
+        cmaExclude: 0,
+        version: "",
+        versionExclude: 0,
+      };
+
+      this.onSubmit();
+    },
+    //展开收起
+    toggleDiv() {
+      this.showDiv = !this.showDiv; // 切换showDiv的值
+      this.$refs.tableRef.calculateHeight(this.showDiv);
+    },
+  },
+};
+</script>
+<style lang="less">
+.homeBox {
+  height: calc(100% - 16px);
+  width: calc(100% - 24px);
+  padding: 12px 12px 4px 12px;
+  .filterBox {
+    position: relative;
+    font-size: 12px;
+    .el-form-item__label {
+      font-size: 12px;
+    }
+    .el-input__inner {
+      font-size: 12px;
+      padding: 0px 24px 0px 4px !important;
+    }
+    .el-form {
+      display: flex;
+      // align-items: center;
+      // flex-wrap: wrap;
+      flex-direction: column;
+      .el-form-item {
+        margin-bottom: 8px;
+      }
+      .topSearch {
+        display: flex;
+      }
+      .bottomSearch {
+        display: flex;
+        align-items: center;
+
+        .el-form-item--small .el-form-item__label {
+          white-space: nowrap;
+        }
+        .btngrop {
+          .el-form-item__content {
+            display: flex;
+            flex-wrap: nowrap;
+          }
+        }
+      }
+      .dybox {
+        .el-select {
+          width: 120px;
+        }
+      }
+      .ismntClass {
+        .el-select {
+          width: 100px;
+        }
+      }
+      .isonLineClass {
+        .el-select {
+          width: 80px;
+        }
+      }
+      .gybox {
+        .el-select {
+          width: 160px;
+        }
+      }
+      .dateclass {
+        .el-input__inner {
+          padding: 0px 32px !important;
+        }
+      }
+      .oidbox,
+      .cmdibox,
+      .cmabox,
+      .versionbox {
+        display: flex;
+        align-items: center;
+        background: #e9e9e9;
+        padding: 0px 12px;
+        border-radius: 3px;
+        .el-form-item__content {
+          display: flex;
+          align-items: center;
+          .el-input {
+            margin-right: 8px;
+            width: 162px;
+          }
+        }
+      }
+
+      .cmdibox {
+        background: #d0ece8;
+      }
+      .el-form-item__label,
+      .el-checkbox {
+        color: #333;
+      }
+    }
+    .toggleClass {
+      position: absolute;
+      right: 2px;
+      top: 82px;
+      .el-icon-d-arrow-left {
+        transform: rotate(-90deg);
+      }
+      .el-icon-d-arrow-right {
+        transform: rotate(-90deg);
+      }
+    }
+    .toggleClass2 {
+      position: absolute;
+      right: 2px;
+      top: 0px;
+      .el-icon-d-arrow-left {
+        transform: rotate(-90deg);
+      }
+      .el-icon-d-arrow-right {
+        transform: rotate(-90deg);
+      }
+    }
+  }
+  .searchSimple {
+    position: absolute;
+    top: 12px;
+    left: 435px;
+    z-index: 2;
+    .el-form-item {
+      margin-bottom: 0px;
+    }
+    .el-select {
+      width: 160px;
+      .el-input {
+        width: 160px;
+      }
+    }
+    .el-input {
+      width: 180px;
+      .el-input__inner {
+        padding-left: 8px;
+        padding-right: 15px;
+      }
+    }
+  }
+  .tableBox {
+    //height: calc(100% - 102px);
+  }
+}
+.el-pagination {
+  color: #606262;
+  font-weight: normal;
+  .el-pager li.active {
+    font-weight: 800;
+  }
+}
+.el-dialog__headerbtn {
+  top: 18px;
+  .el-dialog__close {
+    font-size: 26px;
+    &:hover {
+      background: #e2e2e2;
+    }
+  }
+}
+</style>
diff --git a/src/views/picReport/components/selectLine.vue b/src/views/picReport/components/selectLine.vue
index a0a8b61..5d68547 100644
--- a/src/views/picReport/components/selectLine.vue
+++ b/src/views/picReport/components/selectLine.vue
@@ -1,17 +1,19 @@
 <template>
   <div class="lineBtn">
-    <el-button type="primary" @click="dialogVisible = true">选择线路</el-button>
-    <el-dialog title="提示" :visible.sync="dialogVisible" width="1050px">
+    <el-button type="primary" @click="showDialogFn">选择线路</el-button>
+    <el-dialog title="选择线路" :visible.sync="dialogVisible" width="470px">
       <div class="lineList">
-        <el-checkbox-group v-model="checkList">
-          <el-checkbox
-            v-for="item in lineListData"
-            :label="item.id"
-            :key="item.id"
-            >{{ item.name }}</el-checkbox
-          >
-        </el-checkbox-group>
-        <!-- {{ lineListData }} -->
+        <el-tree
+          :data="lineTreeData"
+          show-checkbox
+          ref="tree"
+          node-key="id"
+          highlight-current
+          :props="defaultProps"
+          :default-checked-keys="defaultCheckedKeys"
+          @check-change="getCheckedNodesData"
+        >
+        </el-tree>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -21,40 +23,71 @@
   </div>
 </template>
 <script>
-import { getLineListJoggle } from "@/utils/api/index";
+import { getPermissionTree } from "@/utils/api/index";
 export default {
   data() {
     return {
       dialogVisible: false,
+      lineTreeData: [],
+      defaultProps: {
+        children: "list",
+        label: "name",
+      },
       checkList: [],
-      lineListData: [],
-      total: 0,
+      defaultCheckedKeys: [], // 用来存储默认选中的节点 ID
     };
   },
   mounted() {
-    this.lineList();
-    const storedArray = localStorage.getItem("checkListLocal");
-    if (storedArray) {
-      // 将JSON字符串转换回数组
-      this.checkList = JSON.parse(storedArray);
-    }
+    // this.lineList();
+    this.getlineTree();
   },
   methods: {
-    lineList() {
-      getLineListJoggle({
-        pageindex: 1,
-        pagesize: 100,
-      })
+    showDialogFn() {
+      this.dialogVisible = true;
+      const storedArray = localStorage.getItem("checkListLocal");
+      console.log(storedArray);
+      if (storedArray) {
+        // 将JSON字符串转换回数组
+        this.checkList = JSON.parse(storedArray);
+      }
+      this.defaultCheckedKeys = this.checkList;
+    },
+    getlineTree() {
+      getPermissionTree()
         .then((res) => {
-          this.lineListData = res.data.list;
-          this.total = res.data.total;
+          this.lineTreeData = this.preprocessTreeData(res.data);
         })
         .catch((err) => {});
     },
+    //预处理，只保留前两集数据
+    preprocessTreeData(data) {
+      return data.map((node) => {
+        // 复制当前节点
+        let newNode = { ...node };
+        // 如果存在子节点，则只保留前两级
+        if (newNode.list && newNode.list.length > 0) {
+          newNode.list = newNode.list.map((child) => {
+            // 复制子节点
+            let newChild = { ...child };
+            // 移除子节点的子节点（即第三级及以后）
+            newChild.list = [];
+            return newChild;
+          });
+        }
+        return newNode;
+      });
+    },
+    getCheckedNodesData() {
+      const checkedNodes = this.$refs.tree.getCheckedNodes(true); // true 表示包括半选中的节点
+      const checkedNodeData = checkedNodes.map((node) => node.id);
+      console.log(checkedNodeData); // 这里是选中节点的完整数据数组
+      this.checkList = checkedNodeData;
+    },
     saveCheck() {
-      console.log(this.checkList);
-      localStorage.setItem("checkListLocal", JSON.stringify(this.checkList));
+      // 关闭对话框等操作
       this.dialogVisible = false;
+      localStorage.setItem("checkListLocal", JSON.stringify(this.checkList));
+      console.log(this.checkList); // 这里是选中节点的完整数据数组
       this.$parent.getTablefun();
     },
   },
@@ -66,6 +99,12 @@ export default {
     padding: 10px;
   }
   .lineList {
+    height: 500px;
+    overflow: auto;
+    .el-dialog__body {
+      overflow: auto;
+    }
+
     .el-checkbox-group {
       .el-checkbox {
         width: 220px;
diff --git a/src/views/picReport/components/selectLine copy.vue b/src/views/picReport/components/selectLine11.vue
similarity index 100%
rename from src/views/picReport/components/selectLine copy.vue
rename to src/views/picReport/components/selectLine11.vue
diff --git a/src/views/picReport/index.vue b/src/views/picReport/index.vue
index 68be7f7..eb3156a 100644
--- a/src/views/picReport/index.vue
+++ b/src/views/picReport/index.vue
@@ -110,7 +110,7 @@
                 (term) =>
                   parseInt(term.uploads, 10) >=
                   (parseInt(scope.row.line.photoCount, 10) *
-                    parseInt(scope.row.line.photoRate.replace("%", ""), 10)) /
+                    parseInt(scope.row.line.photoRate, 10)) /
                     100
               ).length
             }}
@@ -124,7 +124,7 @@
                   (term) =>
                     parseInt(term.uploads, 10) >=
                     (parseInt(scope.row.line.photoCount, 10) *
-                      parseInt(scope.row.line.photoRate.replace("%", ""), 10)) /
+                      parseInt(scope.row.line.photoRate, 10)) /
                       100
                 ).length /
                   scope.row.termList.length) *
@@ -191,7 +191,7 @@
                 (term) =>
                   parseInt(term.uploads, 10) >=
                   (parseInt(scope.row.line.photoCount, 10) *
-                    parseInt(scope.row.line.photoRate.replace("%", ""), 10)) /
+                    parseInt(scope.row.line.photoRate, 10)) /
                     100
               ).length
             }}
@@ -205,7 +205,7 @@
                   (term) =>
                     parseInt(term.uploads, 10) >=
                     (parseInt(scope.row.line.photoCount, 10) *
-                      parseInt(scope.row.line.photoRate.replace("%", ""), 10)) /
+                      parseInt(scope.row.line.photoRate, 10)) /
                       100
                 ).length /
                   scope.row.termList.length) *
@@ -275,7 +275,7 @@
                 (term) =>
                   parseInt(term.uploads, 10) >=
                   (parseInt(scope.row.line.photoCount, 10) *
-                    parseInt(scope.row.line.photoRate.replace("%", ""), 10)) /
+                    parseInt(scope.row.line.photoRate, 10)) /
                     100
               ).length
             }}
@@ -289,7 +289,7 @@
                   (term) =>
                     parseInt(term.uploads, 10) >=
                     (parseInt(scope.row.line.photoCount, 10) *
-                      parseInt(scope.row.line.photoRate.replace("%", ""), 10)) /
+                      parseInt(scope.row.line.photoRate, 10)) /
                       100
                 ).length /
                   scope.row.termList.length) *
@@ -341,8 +341,7 @@ export default {
   computed: {},
   created() {},
   mounted() {
-    this.localSelectLine = JSON.parse(localStorage.getItem("checkListLocal"));
-    console.log(this.localSelectLine);
+    this.onSubmit();
   },
   methods: {
     //导出活动列表表格
@@ -350,6 +349,8 @@ export default {
       htmlToExcel.getExcel("#deciceTable", "运维在线率列表");
     },
     onSubmit() {
+      this.localSelectLine = JSON.parse(localStorage.getItem("checkListLocal"));
+      console.log(this.localSelectLine);
       if (this.formdata.starttime > this.formdata.endtime) {
         return this.$message({
           duration: 1500,
diff --git a/src/views/picReport/indexbak1.vue b/src/views/picReport/indexbak1.vue
deleted file mode 100644
index a5f7416..0000000
--- a/src/views/picReport/indexbak1.vue
+++ /dev/null
@@ -1,323 +0,0 @@
-<template>
-  <div class="picReportClass">
-    <div class="logTitle">
-      <!-- <h3>装置图片报表</h3> -->
-      <el-form :inline="true" :model="formdata" class="demo-form-inline">
-        <el-form-item label="电压" class="dybox">
-          <el-select v-model="formdata.dyId" @change="getSearchxl" filterable>
-            <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" filterable @change="getlineNum">
-            <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="应上图数量" class="pambox">
-          <el-input v-model="formdata.picNum" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="正常上图率" class="pambox">
-          <el-input v-model="formdata.norGraphRate" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="开始日期" class="dateclass">
-          <el-date-picker
-            v-model="formdata.starttime"
-            type="datetime"
-            placeholder="开始日期"
-            value-format="timestamp"
-            :picker-options="pickerOptions"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束日期" class="dateclass">
-          <el-date-picker
-            v-model="formdata.endtime"
-            type="datetime"
-            placeholder="结束日期"
-            value-format="timestamp"
-            :picker-options="pickerOptions"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <el-button type="primary" @click="onSubmit">查询</el-button>
-    </div>
-
-    <div class="boxLogTable">
-      <el-table
-        v-loading="picLoading"
-        :data="tableData"
-        border
-        stripe
-        style="width: 100%"
-        height="100%"
-      >
-        <el-table-column type="index" width="50" label="序号">
-        </el-table-column>
-        <el-table-column label="电压"> {{ dyName }} </el-table-column>
-        <el-table-column label="线路" show-overflow-tooltip>
-          {{ xlName }}
-        </el-table-column>
-        <el-table-column prop="day" label="日期"> </el-table-column>
-        <el-table-column label="装置总数"> {{ termTotalNum }} </el-table-column>
-        <el-table-column label="运维上线数量">
-          <template slot-scope="scope">
-            {{ scope.row.termList.length }}
-          </template>
-        </el-table-column>
-        <el-table-column label="运维上线率">
-          <template slot-scope="scope">
-            {{
-              ((scope.row.termList.length / termTotalNum) * 100).toFixed(2) +
-              "%"
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column label="上图设备数量">
-          <template slot-scope="scope">
-            {{
-              scope.row.termList.filter(
-                (term) => parseInt(term.uploads, 10) > 0
-              ).length
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="cmdid" label="上图率">
-          <template slot-scope="scope">
-            {{
-              (
-                (scope.row.termList.filter(
-                  (term) => parseInt(term.uploads, 10) > 0
-                ).length /
-                  termTotalNum) *
-                100
-              ).toFixed(2) + "%"
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column label="正常上图设备数量">
-          <template slot-scope="scope">
-            {{
-              scope.row.termList.filter(
-                (term) =>
-                  parseInt(term.uploads, 10) >=
-                  (parseInt(formdata.picNum, 10) *
-                    parseInt(formdata.norGraphRate.replace("%", ""), 10)) /
-                    100
-              ).length
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column label="正常上图率">
-          <template slot-scope="scope">
-            {{
-              (
-                (scope.row.termList.filter(
-                  (term) =>
-                    parseInt(term.uploads, 10) >=
-                    (parseInt(formdata.picNum, 10) *
-                      parseInt(formdata.norGraphRate.replace("%", ""), 10)) /
-                      100
-                ).length /
-                  termTotalNum) *
-                100
-              ).toFixed(2) + "%"
-            }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-  </div>
-</template>
-<script>
-import { getSearchInfo, picRportApi } from "@/utils/api/index";
-export default {
-  name: "picReport",
-  components: {},
-  data() {
-    return {
-      pickerOptions: {
-        disabledDate(date) {
-          return date.getTime() > Date.now(); // 禁用大于今天的日期
-        },
-      },
-      dyOptions: [], //电压数据
-      xlOptions: [], //线路数据
-      formdata: {
-        dyId: null,
-        lineId: null,
-        picNum: "",
-        norGraphRate: "",
-        starttime:
-          new Date(new Date().setHours(0, 0, 0, 0)).getTime() -
-          3 * 24 * 60 * 60 * 1000, // 设置开始时间为当天凌晨00:00:00的时间戳
-        endtime: new Date(new Date().setHours(23, 59, 59, 0)).getTime(), // 设置结束时间为当天夜晚23:59:59的时间戳
-      },
-      tableData: [],
-      picLoading: false,
-      termTotalNum: 0,
-      dyName: "",
-      xlName: "",
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {},
-  mounted() {
-    this.getSearchdy();
-  },
-  methods: {
-    //获取电压信息
-    getSearchdy() {
-      getSearchInfo({ type: 1 })
-        .then((res) => {
-          this.dyOptions = this.dyOptions.concat(res.data.list);
-          console.log(this.dyOptions);
-          this.formdata.dyId = this.dyOptions[0].id;
-
-          this.getSearchxl();
-        })
-        .catch((err) => {});
-    },
-    //获取线路数据
-    getSearchxl() {
-      getSearchInfo({ type: 2, id: this.formdata.dyId })
-        .then((res) => {
-          this.xlOptions = res.data.list;
-          this.formdata.lineId = this.xlOptions[0].id;
-          this.getlineNum(this.xlOptions[0].id);
-        })
-        .catch((err) => {});
-    },
-    getlineNum(val) {
-      console.log(val);
-      const lineObj = this.xlOptions.find((item) => item.id == val);
-      console.log(lineObj);
-      this.formdata.picNum =
-        lineObj.photoCount == null ? "0" : lineObj.photoCount;
-      this.formdata.norGraphRate =
-        lineObj.photoRate == null ? "0%" : lineObj.photoRate;
-    },
-    onSubmit() {
-      if (this.formdata.starttime > this.formdata.endtime) {
-        return this.$message({
-          duration: 1500,
-          showClose: true,
-          message: "开始日期不能大于结束日期",
-          type: "warning",
-        });
-      }
-      let params = {
-        start: this.formdata.starttime / 1000,
-        end: this.formdata.endtime / 1000,
-      };
-      // 根据条件添加参数
-      if (this.formdata.dyId !== -1) {
-        params.dyId = this.formdata.dyId;
-      }
-      if (this.formdata.lineId !== -1) {
-        params.lineId = this.formdata.lineId;
-      }
-      // 根据条件添加参数
-
-      this.getpicList(params);
-    },
-
-    getpicList(params) {
-      setTimeout(() => {
-        this.picLoading = true;
-        picRportApi(params)
-          .then((res) => {
-            this.picLoading = false;
-            if (res.data.termList.length !== 0) {
-              console.log(res.data);
-              this.tableData = res.data.dayList;
-              this.termTotalNum = res.data.termList.length;
-              this.dyName = res.data.termList[0].dyName;
-              this.xlName = res.data.termList[0].lineName;
-            } else {
-              this.tableData = [];
-            }
-          })
-          .catch((err) => {});
-      }, 100);
-    },
-  },
-};
-</script>
-<style lang="less">
-.picReportClass {
-  height: calc(100% - 24px);
-  width: calc(100% - 24px);
-  padding: 12px;
-  .logTitle {
-    display: flex;
-    align-items: center;
-    height: 32px;
-    margin-bottom: 12px;
-
-    h3 {
-      margin-right: 24px;
-    }
-    .el-form-item--small.el-form-item {
-      margin-bottom: 0px;
-    }
-    .dybox {
-      .el-select {
-        width: 120px;
-      }
-    }
-    .xlbox {
-      .el-select {
-        width: 180px;
-      }
-    }
-    .pambox {
-      .el-input {
-        width: 70px;
-      }
-      .el-input--suffix .el-input__inner {
-        padding: 8px;
-      }
-    }
-    .dateclass {
-      .el-date-editor.el-input,
-      .el-date-editor.el-input__inner {
-        width: 190px;
-      }
-    }
-  }
-  .boxLogTable {
-    height: calc(100% - 44px);
-
-    .el-table__cell {
-      text-align: center;
-    }
-    .el-table thead {
-      th.el-table__cell {
-        background: #fafafa;
-      }
-    }
-    .buttonText {
-      cursor: pointer;
-      white-space: pre-wrap;
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-}
-</style>