diff --git a/package-lock.json b/package-lock.json
index 32a26e1..8ad227e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3172,20 +3172,9 @@
       }
     },
     "codepage": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.14.0.tgz",
-      "integrity": "sha512-iz3zJLhlrg37/gYRWgEPkaFTtzmnEv1h+r7NgZum2lFElYQPi0/5bnmuDfODHxfp0INEfnRqyfyeIJDbb7ahRw==",
-      "requires": {
-        "commander": "~2.14.1",
-        "exit-on-epipe": "~1.0.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.14.1",
-          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.14.1.tgz",
-          "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
-        }
-      }
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
     },
     "color-convert": {
       "version": "1.9.3",
@@ -4698,11 +4687,6 @@
         "websocket-driver": ">=0.5.1"
       }
     },
-    "fflate": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.3.11.tgz",
-      "integrity": "sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="
-    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/figures/-/figures-2.0.0.tgz",
@@ -9132,27 +9116,17 @@
       "dev": true
     },
     "xlsx": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.17.0.tgz",
-      "integrity": "sha512-bZ36FSACiAyjoldey1+7it50PMlDp1pcAJrZKcVZHzKd8BC/z6TQ/QAN8onuqcepifqSznR6uKnjPhaGt6ig9A==",
+      "version": "0.17.5",
+      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.17.5.tgz",
+      "integrity": "sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==",
       "requires": {
         "adler-32": "~1.2.0",
         "cfb": "^1.1.4",
-        "codepage": "~1.14.0",
-        "commander": "~2.17.1",
+        "codepage": "~1.15.0",
         "crc-32": "~1.2.0",
-        "exit-on-epipe": "~1.0.1",
-        "fflate": "^0.3.8",
         "ssf": "~0.11.2",
         "wmf": "~1.0.1",
         "word": "~0.3.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-        }
       }
     },
     "y18n": {
diff --git a/package.json b/package.json
index b34c9f1..22e457b 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "vue": "^2.6.14",
     "vue-router": "^3.5.1",
     "vuex": "^3.6.2",
-    "xlsx": "^0.17.0"
+    "xlsx": "^0.17.5"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 4ccc36e..990d9b3 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -155,6 +155,7 @@
           {{ scope.row.raw_report.pic }}
         </template>
       </el-table-column>
+
       <el-table-column
         prop="protocol"
         label="规约"
@@ -177,7 +178,7 @@
       </el-table-column>
 
       <el-table-column label="心跳信息" v-if="xtcheck">
-        <el-table-column label="次数" min-width="48" v-if="xtcs">
+        <el-table-column label="次数" min-width="48">
           <template slot-scope="scope">
             {{
               scope.row.raw_report.hasOwnProperty("msgs")
@@ -186,7 +187,7 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column label="周期" min-width="48" v-if="xtzq">
+        <el-table-column label="周期" min-width="48">
           <template slot-scope="scope">
             {{
               scope.row.raw_report.hasOwnProperty("msgs")
@@ -237,22 +238,41 @@
       </el-table-column>
 
       <el-table-column label="网络信号" v-if="wlcheck">
-        <el-table-column label="卡1" min-width="60">
+        <el-table-column label="卡1" min-width="60" prop="signature1">
           <template slot-scope="scope">
-            {{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.signature1
-                : ""
-            }}
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="scope.row.raw_report.msgs.signature1"
+              placement="top"
+            >
+              <span>{{
+                scope.row.raw_report.msgs.hasOwnProperty("signature1")
+                  ? scope.row.raw_report.msgs.signature1.split("/")[0]
+                  : ""
+              }}</span>
+            </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column label="卡2" min-width="60">
+        <el-table-column label="卡2" min-width="60" prop="signature2">
           <template slot-scope="scope">
-            {{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.signature2
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="scope.row.raw_report.msgs.signature2"
+              placement="top"
+            >
+              <span>{{
+                scope.row.raw_report.msgs.hasOwnProperty("signature2")
+                  ? scope.row.raw_report.msgs.signature2.split("/")[0]
+                  : ""
+              }}</span>
+            </el-tooltip>
+            <!-- {{
+              scope.row.raw_report.msgs.hasOwnProperty("signature2")
+                ? scope.row.raw_report.msgs.signature2.split("/")[0]
                 : ""
-            }}
+            }} -->
           </template>
         </el-table-column>
         <el-table-column label="错误" min-width="48">
@@ -267,16 +287,22 @@
       </el-table-column>
 
       <el-table-column label="重启次数" v-if="cqcheck">
-        <el-table-column label="系统" min-width="48">
+        <el-table-column
+          label="系统"
+          min-width="48"
+          prop="rebootTimes"
+          sortable
+          :sort-method="sortNumbers"
+        >
           <template slot-scope="scope">
             {{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.rebootTimes
+              scope.row.raw_report.msgs.hasOwnProperty("rebootTimes")
+                ? Number(scope.row.raw_report.msgs.rebootTimes)
                 : ""
             }}
           </template>
         </el-table-column>
-        <el-table-column label="I1" min-width="48">
+        <el-table-column label="I1" min-width="48" prop="i1RebootTimes">
           <template slot-scope="scope">
             {{
               scope.row.raw_report.hasOwnProperty("msgs")
@@ -296,22 +322,24 @@
         </template>
       </el-table-column>
       <el-table-column label="SIM卡" v-if="simcheck" min-width="160">
-        <template slot-scope="scope">
-          <p>
+        <el-table-column label="卡1" min-width="48" prop="simcard1">
+          <template slot-scope="scope">
             {{
               scope.row.raw_report.hasOwnProperty("msgs")
                 ? scope.row.raw_report.msgs.simcard1
                 : ""
             }}
-          </p>
-          <p>
+          </template>
+        </el-table-column>
+        <el-table-column label="卡2" min-width="48" prop="simcard2">
+          <template slot-scope="scope">
             {{
               scope.row.raw_report.hasOwnProperty("msgs")
                 ? scope.row.raw_report.msgs.simcard2
                 : ""
             }}
-          </p>
-        </template>
+          </template>
+        </el-table-column>
       </el-table-column>
       <el-table-column
         label="版本"
@@ -373,12 +401,12 @@
           <el-checkbox v-model="xtcheck" @change="saveLocalStorage"
             >心跳信息</el-checkbox
           >
-          <el-checkbox v-model="xtcs" @change="saveLocalStorage"
+          <!-- <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
           >
@@ -591,6 +619,8 @@
 import { getdoActionApi, getqueryUpgradesApi } from "@/utils/api/index";
 import rowMsgDialog from "./rowMsgDialog.vue";
 import htmlToExcel from "@/utils/htmlToExcel";
+import { saveAs } from "file-saver";
+import XLSX from "xlsx";
 export default {
   props: ["tableData", "onlineNum", "offlineNum", "noPicNum"],
   components: {
@@ -643,8 +673,8 @@ export default {
       gycheck: false,
       dccheck: true,
       xtcheck: true,
-      xtcs: false,
-      xtzq: false,
+      // xtcs: false,
+      // xtzq: false,
       pzcheck: true,
       wlcheck: true,
       cqcheck: true,
@@ -815,6 +845,24 @@ export default {
   },
 
   methods: {
+    sortNumbers(a, b) {
+      return (
+        Number(a.raw_report.msgs.rebootTimes) -
+        Number(b.raw_report.msgs.rebootTimes)
+      );
+    },
+    // sortSignature1(a, b) {
+    //   return (
+    //     Number(a.raw_report.msgs.signature1.split("/")[0]) -
+    //     Number(b.raw_report.msgs.signature1.split("/")[0])
+    //   );
+    // },
+    // sortSignature2(a, b) {
+    //   return (
+    //     Number(a.raw_report.msgs.signature2.split("/")[0]) -
+    //     Number(b.raw_report.msgs.signature2.split("/")[0])
+    //   );
+    // },
     //获取运维勾选和快心跳勾选个数
     getNumber() {
       console.log(this.tableData);
@@ -1184,8 +1232,8 @@ export default {
       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("xtcs", this.xtcs);
+      // localStorage.setItem("xtzq", this.xtzq);
       localStorage.setItem("pzcheck", this.pzcheck);
       localStorage.setItem("wlcheck", this.wlcheck);
       localStorage.setItem("cqcheck", this.cqcheck);
@@ -1209,12 +1257,12 @@ export default {
       this.xtcheck = localStorage.getItem("xtcheck")
         ? JSON.parse(localStorage.getItem("xtcheck"))
         : true;
-      this.xtcs = localStorage.getItem("xtcs")
-        ? JSON.parse(localStorage.getItem("xtcs"))
-        : false;
-      this.xtzq = localStorage.getItem("xtzq")
-        ? JSON.parse(localStorage.getItem("xtzq"))
-        : 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"))
         : true;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 67d7d7f..3087652 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -151,7 +151,7 @@ export default {
     .loginMain {
       width: 400px;
       height: auto;
-      background-color: #0c1622;
+      // background-color: #0c1622;
       margin: 100px auto;
       border-radius: 10px;
       box-shadow: 0 15px 25px 0 rgba(0, 0, 0, 0.6);
diff --git a/src/views/report/index.vue b/src/views/report/index.vue
index a42e037..9f6d1b8 100644
--- a/src/views/report/index.vue
+++ b/src/views/report/index.vue
@@ -29,6 +29,7 @@
             }}</span
           >
           <el-button
+            v-if="leftCommand.length > 0"
             class="deletebtn"
             type="danger"
             icon="el-icon-delete"
@@ -87,6 +88,7 @@
             }}</span
           >
           <el-button
+            v-if="rightCommand.length > 0"
             class="deletebtn"
             type="danger"
             icon="el-icon-delete"