diff --git a/src/Permission.vue b/src/Permission.vue
new file mode 100644
index 0000000..c64b8da
--- /dev/null
+++ b/src/Permission.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="error-page">
+    <div class="error-code">4<span>0</span>3</div>
+    <div class="error-desc">啊哦~ 你没有权限访问该页面哦</div>
+    <div class="error-handle">
+      <router-link to="/stritl">
+        <el-button type="primary" size="large">返回首页</el-button>
+      </router-link>
+      <el-button class="error-btn" type="primary" size="large" @click="goBack"
+        >返回上一页</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="less">
+.error-page {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  background: #f3f3f3;
+  box-sizing: border-box;
+  .error-code {
+    line-height: 1;
+    font-size: 250px;
+    font-weight: bolder;
+    color: #f02d2d;
+  }
+  .error-code span {
+    color: #00a854;
+  }
+  .error-desc {
+    font-size: 30px;
+    color: #777;
+  }
+  .error-handle {
+    margin-top: 30px;
+    padding-bottom: 200px;
+  }
+  .el-button--primary {
+    width: auto !important;
+  }
+  .error-btn {
+    margin-left: 100px;
+  }
+}
+</style>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 1b7b5b0..a8e480d 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -27,12 +27,12 @@ export default {
         },
         {
           path: "/upgradation",
-          name: "上传Apk",
-        },
-        {
-          path: "/upgradationOta",
-          name: "上传Ota",
+          name: "上传APK/OTA",
         },
+          // {
+          //   path: "/upgradationOta",
+          //   name: "上传Ota",
+          // },
         {
           path: "/activity",
           name: "活动列表",
diff --git a/src/main.js b/src/main.js
index d50880b..b592b15 100644
--- a/src/main.js
+++ b/src/main.js
@@ -36,14 +36,41 @@ Vue.component(UTableColumn.name, UTableColumn);
 //使用钩子函数对路由进行权限跳转
 router.beforeEach((to, from, next) => {
   document.title = `${to.meta.title} | 运维管理系统`;
+  // 获取用户的角色和token
+  const role = localStorage.getItem("role");
   const token = localStorage.getItem("token");
+
+  // 如果没有token，并且不是登录页面，重定向到登录页面
   if (!token && to.path !== "/login") {
-    next({
-      path: "/login",
-    });
-  } else {
-    next();
+    return next({ path: "/login" });
+  }
+  // 如果用户是超级管理员（role == 0），则允许访问任何页面
+  if (role === "0") {
+    return next();
+  }
+  // 如果用户从登录页面跳转到其他页面，并且已经拥有token，则允许通过
+  if (from.path === "/login" && token) {
+    return next();
+  }
+  // 获取权限列表（这里假设permissions是从后端获取的权限数组）
+  const permissions = JSON.parse(localStorage.getItem("menuPermission")) || [];
+
+  // 检查用户是否有访问当前路由的权限
+  const hasPermission = permissions.some(
+    (permission) => permission.key === to.path
+  );
+
+  // 如果路由需要权限，但用户没有权限，则重定向到无权限页面
+  if (to.meta.requiresAuth && !hasPermission) {
+    return next({ path: "/permission" });
+  }
+
+  // 如果路由在免登录白名单中，则直接通过
+  if (to.meta.noAuth) {
+    return next();
   }
+  // 如果以上条件都不满足，正常通过
+  next();
 });
 
 new Vue({
diff --git a/src/router/index.js b/src/router/index.js
index 0ddeae9..ac8ba79 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,10 +4,20 @@ import VueRouter from "vue-router";
 Vue.use(VueRouter);
 
 const routes = [
+ 
   {
     path: "/login",
+    name: "login",
     component: () => import("../views/login/index.vue"),
-    meta: { title: "登录" },
+    meta: { title: "登录", noAuth: true }, // 标记为免登录页面
+  },
+  {
+    // 权限页面
+    path: "/permission",
+    name: "permission",
+    component: () =>
+      import(/* webpackChunkName: "permission" */ "../Permission.vue"),
+    meta: { title: "权限测试" },
   },
   {
     path: "/",
@@ -21,6 +31,7 @@ const routes = [
         meta: {
           title: "首页",
           keepAlive: true,
+          noAuth: true,
         },
       },
       {
@@ -50,15 +61,7 @@ const routes = [
           keepAlive: true,
         },
       },
-      {
-        path: "/upgradationOta",
-        component: () => import("../views/upgradationOta/index.vue"),
-        name: "upgradationOta",
-        meta: {
-          title: "上传Ota",
-          keepAlive: true,
-        },
-      },
+      
       {
         path: "/activity",
         component: () => import("../views/activityList/index.vue"),
diff --git a/src/store/index.js b/src/store/index.js
index d7edee2..e600128 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,11 +6,87 @@ Vue.use(Vuex);
 export default new Vuex.Store({
   state: {
     //用户登录token 存储
-
+    token: "",
+    userName: "",
+    uid: "",
+    role: "",
+    currentData: "",
+    channelId: "",
+    termId: "",
+    protocol: "",
+    cmdId: "",
+    channelIdList: [],
     isRenderTab: true,
   },
-  getters: {},
+  getters: {
+    token: (state) => state.token,
+    userName: (state) => state.userName,
+    role: (state) => state.role,
+    menuPermission: (state) => state.resources,
+  },
   mutations: {
+    //点击获取的左侧列表
+    currentData(state, currentData) {
+      state.currentData = currentData;
+      console.log("保存起来currentData", state.currentData);
+      localStorage.setItem("currentData", JSON.stringify(currentData));
+    },
+
+    channelId(state, channelId) {
+      state.channelId = channelId;
+      console.log("channelId", state.channelId);
+      localStorage.setItem("channelId", JSON.stringify(channelId));
+    },
+    termId(state, termId) {
+      state.termId = termId;
+      console.log("termId", state.termId);
+      localStorage.setItem("termId", JSON.stringify(termId));
+    },
+
+    protocol(state, protocol) {
+      state.protocol = protocol;
+      console.log("protocol", state.protocol);
+      localStorage.setItem("protocol", JSON.stringify(protocol));
+    },
+    cmdId(state, cmdId) {
+      state.cmdId = cmdId;
+      console.log("protocol", state.cmdId);
+      localStorage.setItem("protocol", JSON.stringify(cmdId));
+    },
+    channelIdList(state, channelIdList) {
+      state.channelIdList = channelIdList;
+      console.log("channelIdList", state.channelIdList);
+      localStorage.setItem("channelIdList", JSON.stringify(channelIdList));
+    },
+
+    SET_TOKEN(state, token) {
+      state.token = token;
+      localStorage.setItem("token", state.token);
+    },
+    SET_USERINFO(state, val) {
+      state.userName = val.userName;
+      state.uid = val.uid;
+      state.role = val.role;
+      if (val.role !== 0) {
+        state.resources = val.resources;
+        const menuArr = val.resources
+          .filter((item) => item.key.includes("/"))
+          .sort((a, b) => a.id - b.id);
+        const btnArr = val.resources
+          .filter((item) => item.key.includes("Btn"))
+          .sort((a, b) => a.id - b.id);
+        localStorage.setItem("menuPermission", JSON.stringify(menuArr));
+        localStorage.setItem("btnPermission", JSON.stringify(btnArr));
+      }
+
+      localStorage.setItem("userName", state.userName);
+      localStorage.setItem("uid", state.uid);
+      localStorage.setItem("role", state.role);
+    },
+    //退出清除locastorge
+    REMOVE_INFO(state) {
+      localStorage.clear();
+    },
     setIsRenderTab(state, data) {
       state.isRenderTab = data;
     },
diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index cc6e08c..9594337 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -2,171 +2,216 @@ import request from "../request";
 //获取登录
 export function loginJoggle(data) {
   return request({
-    url: "api/login.php",
+    url: "/xymanager/login",
     method: "post",
     data,
   });
 }
-//获取line
-export function getqueryLineApi(data) {
+
+//获取用户装置信息
+export function getTerminalJoggle(data) {
   return request({
-    url: "api/queryLine.php",
+    url: "/xymanager/terminal/listForMaintain",
     method: "get",
     params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
   });
 }
-export function getqueryTermsApi(data) {
+export function exportTerminalApi(data) {
   return request({
-    url: "api/queryTerms.php",
+    url: "/xymanager/terminal/exportForMaintain",
     method: "get",
     params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
+    responseType: 'blob' 
   });
 }
-//获取规约
 
-export function getqueryProtocolApi(data) {
+
+//获取规约
+export function getProtocolList(data) {
   return request({
-    url: "api/queryProtocol.php",
+    url: "/xymanager/getProtocolList",
     method: "get",
     params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
+  });
+}
+//获取 电压  线路  杆塔  
+export function getSearchInfo(data) {
+  return request({
+    url: "/xymanager/getLineAndGt",
+    method: "post",
+    data,
   });
 }
 
-//运维，快心跳
-export function getdoActionApi(data) {
+//获取活动列表
+export function getActivityApi(data) {
   return request({
-    url: "api/doAction.php",
+    url: "/xymanager/activity/listAll",
     method: "get",
     params: data,
+  });
+}
+//新增活动列表
+export function addActiveApi(data) {
+  return request({
+    url: "/xymanager/activity/add",
+    method: "post",
+    data,
+  });
+}
+//修改活动列表
+export function updActiveApi(data) {
+  return request({
+    url: "/xymanager/activity/update",
+    method: "post",
+    data,
+  });
+}
+
+//删除活动列表
+export function delActiveApi(data) {
+  return request({
+    url: "/xymanager/activity/delete",
+    method: "post",
+    data,
     headers: {
       "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
     },
   });
 }
-//上传日志列表
-export function getqueryUploadsApi(data) {
+////运维，快心跳
+export function cmdSendApi(data) {
+  return request({
+    url: "/xymanager/cmd/send",
+    method: "post",
+    data,
+  });
+}
+
+//获取命令列表
+export function getCmdActionApi(data) {
   return request({
-    url: "api/queryUploads.php",
+    url: "/xymanager/cmd/listAction",
     method: "get",
     params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
   });
 }
-//删除日志列表
-export function updUploadApi(data) {
+
+//查询正在下发的命令
+export function cmdActlistApi(data) {
   return request({
-    url: "api/updUpload.php",
+    url: "/xymanager/cmd/list",
     method: "get",
     params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
   });
 }
 
-//获取信息装置的信息
-export function getqueryRawApi(data) {
+
+//查询已经下发的命令
+export function cmdActHislistApi(data) {
   return request({
-    url: "api/queryRawData.php",
+    url: "/xymanager/cmd/listHistory",
     method: "get",
     params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
   });
 }
 
-//带下发状态
-export function getqueryCmdsApi(data) {
+//查询历史心跳信息
+
+export function heartListApi(data) {
   return request({
-    url: "api/queryCmds.php",
+    url: "/xymanager/terminal/listReport",
     method: "get",
     params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
   });
 }
 
-//上传apk
-
-export function postuploadFileApi(data) {
+//修改备注
+export function updCommentApi(data) {
   return request({
-    url: "api/uploadFile.php",
+    url: "/xymanager/terminal/updateComment",
     method: "post",
-    params: data,
-    headers: {
-      "Content-Type": "multipart/form-data", // set the content type to multipart/form-data
-    },
+    data,
   });
 }
-//获取上传列表
-export function getqueryUpgradesApi(data) {
+
+//日志列表相关接口
+export function logListApi(data) {
   return request({
-    url: "api/queryUpgrades.php",
+    url: "/xymanager/upload/listAll",
     method: "get",
     params: data,
+  });
+}
+//日志删除
+export function logDeleteApi(data) {
+  return request({
+    url: "/xymanager/upload/delete",
+    method: "post",
+    data,
     headers: {
       "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
     },
   });
 }
 
-//删除列表
-export function getupdUpgradeApi(data) {
+
+//获取升级列表
+export function upgradeListApi(data) {
   return request({
-    url: "api/updUpgrade.php",
+    url: "/xymanager/upgrade/listAll",
     method: "get",
     params: data,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    },
   });
 }
-
-//新建活动和删除活动
-
-export function updActivityApi(data) {
+//修改备注
+export function upgradeTitleApi(data) {
   return request({
-    url: "api/updActivity.php",
+    url: "/xymanager/upgrade/updateTitle",
     method: "post",
     data,
-    headers: {
-      "Content-Type": "multipart/form-data", // set the content type to multipart/form-data
-    },
   });
 }
 
-//获取活动列表和详细列表
-export function getqueryActivityApi(data) {
+//上传升级文件
+export function upgradeUpLoadApi(data, onUploadProgress) {
   return request({
-    url: "api/queryActivity.php",
-    method: "get",
-    params: data,
+    url: "/xymanager/upgrade/upload",
+    method: "post",
+    data,
     headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+      "Content-Type": "multipart/form-data", // set the content type to multipart/form-data
     },
+    onUploadProgress: onUploadProgress, // 允许外部传递进度回调函数
   });
 }
-
-export function updComment(data) {
+//删除升级的文件
+export function upgradeDeleteApi(data) {
   return request({
-    url: "api/updComment.php",
-    method: "get",
-    params: data,
+    url: "/xymanager/upgrade/delete",
+    method: "post",
+    data,
     headers: {
       "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
     },
   });
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/utils/request.js b/src/utils/request.js
index cecd94f..a5169b6 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,73 +7,68 @@ const service = axios.create({
   // easy-mock服务挂了，暂时不使用了
   // baseURL: '',
   // timeout: 5000
-  baseURL: "/web", //把原来的项目地址，改成api，解决跨域问题
+  baseURL: "api", //把原来的项目地址，改成api，解决跨域问题
   timeout: 30000,
 });
 
-// 添加请求拦截器，一下内容是axios的拦截器，可以不用写
-service.interceptors.request.use(
-  function (config) {
-    // 在发送请求之前做些什么
-    return config;
-  },
-  function (error) {
-    // 对请求错误做些什么
-    return Promise.reject(error);
+service.interceptors.request.use((config) => {
+  if (localStorage.getItem("token")) {
+    // console.log("aaaaaaaaaaaaaa", localStorage.getItem("token"));
+    config.headers.Authorization = localStorage.getItem("token");
   }
-);
-
-// 添加响应拦截器
+  return config;
+});
 service.interceptors.response.use(
-  function (response) {
-    // 对响应数据做点什么
-    return response.data;
+  (response) => {
+    const res = response.data;
+    if (res.code !== 200) {
+      if (res.code === 401) {
+        Message({
+          showClose: true,
+          message: res.msg,
+          type: "error",
+          duration: 1500,
+        });
+        localStorage.removeItem("token");
+        router.push("/login");
+      }
+
+      if (res.code === 400) {
+        Message({
+          showClose: true,
+          message: res.msg,
+          type: "error",
+          duration: 1500,
+        });
+      }
+      if (res.code === 500) {
+        //alert(res.msg || "Error");
+
+        Message({
+          showClose: true,
+          message: res.msg,
+          type: "error",
+          duration: 1500,
+        });
+      }
+     if (!res.code) { // 如果没有返回code，可能是下载excel
+        // return resolve(response.data, res);
+        return res
+      }
+      return Promise.reject(new Error(res.msg || "Error"));
+    } else {
+      return res;
+    }
   },
-  function (error) {
-    // 对响应错误做点什么
+  (error) => {
+    Message({
+      message: error.message,
+      showClose: true,
+      type: "error",
+      duration: 1500,
+    });
     return Promise.reject(error);
   }
 );
-export default service;
-// service.interceptors.request.use((config) => {
-//   if (localStorage.getItem("token")) {
-//     config.headers.sessionId = localStorage.getItem("token");
-//   }
-//   return config;
-// });
-// service.interceptors.response.use(
-//   (response) => {
-//     const res = response.data;
-//     if (res.code !== 200) {
-//       if (res.code === 401) {
-//         Message({ message: res.msg, type: "error", duration: 1500 });
-//         router.push("/login");
-//       }
 
-//       if (res.code === 400) {
-//         Message({ message: res.msg, type: "error", duration: 1500 });
-//       }
-
-//       if (res.code === 500) {
-//         Message({
-//           showClose: true,
-//           message: 服务器错误(500),
-//           type: "error",
-//           duration: 1500,
-//         });
-//       }
-//       return Promise.reject(new Error(res.msg || "Error"));
-//     } else {
-//       return res;
-//     }
-//   },
-//   (error) => {
-//     Message({
-//       message: error.message,
-//       showClose: true,
-//       type: "error",
-//       duration: 1500,
-//     });
-//     return Promise.reject(error);
-//   }
-// );
+export default service;
diff --git a/src/views/activityList/index.vue b/src/views/activityList/index.vue
index e01dedc..c082387 100644
--- a/src/views/activityList/index.vue
+++ b/src/views/activityList/index.vue
@@ -106,8 +106,8 @@
       >
         <el-table-column type="index" width="50" label="序号">
         </el-table-column>
-        <el-table-column prop="line_name" label="线路名称"> </el-table-column>
-        <el-table-column prop="tower_name" label="杆塔名称"> </el-table-column>
+        <el-table-column prop="lineName" label="线路名称"> </el-table-column>
+        <el-table-column prop="towerName" label="杆塔名称"> </el-table-column>
         <el-table-column prop="cmdid" label="装置编号">
           <template slot="header" slot-scope="scope">
             装置编号<el-tag
@@ -130,7 +130,7 @@
   </div>
 </template>
 <script>
-import { updActivityApi, getqueryActivityApi } from "@/utils/api/index";
+import { getActivityApi,addActiveApi,updActiveApi,delActiveApi } from "@/utils/api/index";
 import htmlToExcel from "@/utils/htmlToExcel";
 import { saveAs } from "file-saver";
 import XLSX from "xlsx";
@@ -145,6 +145,7 @@ export default {
         title: "",
         cmdidArr: "",
       },
+      cmdObjects: [], // 用于存储转换后的对象数组  
       titleFlag: false, //title为空
       cmdidFlag: false, //cmdid为空
       termsShow: false,
@@ -162,15 +163,33 @@ export default {
         65285: "河南全景",
         65286: "河南郑州",
         65290: "河南统一视频v2020",
+        65298:"宁夏",
+        2:"南网"
       },
       ActibityId: "", //判断是否是修改
     };
   },
   computed: {},
+  watch: {  
+    'activityForm.cmdidArr': {  
+      handler(newVal) {  
+        // 每当 activityForm.cmdidArr 发生变化时，调用 convertToCmdObjects 方法  
+        this.cmdObjects = this.convertToCmdObjects(newVal);  
+      },  
+      deep: false, // 不需要深度监听，因为我们直接监听的是字符串  
+      immediate: false, // 不需要立即触发一次 handler 函数  
+    },  
+  }, 
   mounted() {
     this.getactivityList();
   },
   methods: {
+    convertToCmdObjects(text) {  
+      // 去除文本首尾的空白字符，并按换行符分割成数组  
+      const cmdids = text.trim().split(/\r?\n/);  
+      // 映射每个 cmdid 到一个对象，并返回对象数组  
+      return cmdids.map(cmdid => ({ cmdid }));  
+    }, 
     async handleHeaderClick(column) {
       console.log(column);
       // 获取当前列的数据字段名
@@ -215,9 +234,7 @@ export default {
     getactivityList() {
       this.activityloading = true;
       this.activityData = [];
-      getqueryActivityApi({
-        act: "list",
-      })
+      getActivityApi()
         .then((res) => {
           console.log(res);
           this.activityData = res.data;
@@ -225,48 +242,22 @@ export default {
         })
         .catch((err) => {});
     },
-    //修改活动详情
-    handleEditClick(row) {
-      console.log(row);
-      getqueryActivityApi({
-        act: "detail",
-        id: row.id,
-      })
-        .then((res) => {
-          console.log(res);
-          this.ActibityId = res.data.activity.id;
-          this.activityForm.title = res.data.activity.title;
-          console.log(this.activityForm.title);
-          const columnData = res.data.terms.map((item) => item.cmdid);
-          console.log(columnData);
-          this.activityForm.cmdidArr = columnData.join("\n");
-        })
-        .catch((err) => {});
-    },
+    
     //活动详情
     handleLookClick(row) {
+      console.log(row)
       this.termsShow = true;
       this.termsLoading = true;
-      this.termsData = [];
-      getqueryActivityApi({
-        act: "detail",
-        id: row.id,
-      })
-        .then((res) => {
-          console.log(res);
-          this.termsLoading = false;
-          this.activityNameTitle = res.data.activity.title;
-          this.activityName =
-            res.data.activity.title + "(" + res.data.terms.length + ")";
-          this.termsData = res.data.terms;
-        })
-        .catch((err) => {});
-    },
+      this.termsData =  row.terms;
+      this.activityNameTitle = row.title;
+      this.activityName =
+      row.title + "(" + row.terms.length + ")";
+          this.termsData = row.terms;
+     },
     //删除该活动
     handleDeleteClick(row) {
       console.log(row);
-      updActivityApi({
-        act: "del",
+      delActiveApi({
         id: row.id,
       })
         .then((res) => {
@@ -297,6 +288,14 @@ export default {
     textfocus() {
       this.cmdidFlag = false;
     },
+    //修改活动详情
+    handleEditClick(row) {
+      console.log(row);
+      this.ActibityId = row.id;
+      this.activityForm.title = row.title;
+      const columnData = row.terms.map((item) => item.cmdid);
+      this.activityForm.cmdidArr = columnData.join("\n");
+    },
     //上传活动列表
     submitUpload() {
       if (this.activityForm.title == "") {
@@ -309,24 +308,30 @@ export default {
       }
       let actParams = {};
       if (this.ActibityId !== "") {
+        //修改
         console.log(this.ActibityId);
         actParams = {
           id: this.ActibityId,
           title: this.activityForm.title,
-          cmdids: this.activityForm.cmdidArr,
-          act: "edt",
+          terms: this.cmdObjects,
         };
+        updActiveApi(actParams)
+        .then((res) => {
+          console.log(res);
+          this.getactivityList();
+          this.activityForm.title = "";
+          this.activityForm.cmdidArr = "";
+          this.ActibityId = "";
+        })
+        .catch((err) => {});
       } else {
+        //新增
+        console.log(this.cmdObjects);  
         actParams = {
           title: this.activityForm.title,
-          cmdids: this.activityForm.cmdidArr,
-          act: "new",
+          terms: this.cmdObjects, 
         };
-      }
-      console.log(this.activityForm.title);
-      console.log(this.activityForm.cmdidArr);
-      //console.log(arrList);
-      updActivityApi(actParams)
+        addActiveApi(actParams)
         .then((res) => {
           console.log(res);
           this.getactivityList();
@@ -335,6 +340,7 @@ export default {
           this.ActibityId = "";
         })
         .catch((err) => {});
+      }
     },
   },
 };
diff --git a/src/views/homePage/components/rowMsgDialog.vue b/src/views/homePage/components/rowMsgDialog.vue
index 5af267a..b173551 100644
--- a/src/views/homePage/components/rowMsgDialog.vue
+++ b/src/views/homePage/components/rowMsgDialog.vue
@@ -16,141 +16,108 @@
       >
         <el-table-column type="index" width="50" label="序号">
         </el-table-column>
-        <el-table-column prop="createTime" 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.raw_report.id }}
+            {{ scope.row.reportMap.id }}
           </template>
         </el-table-column>
 
         <el-table-column label="i1服务器">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.cma
-            }}</span>
-            <span v-else>{{ scope.row.raw_report.msgs.cma }}</span>
+            <span>{{ scope.row.reportMap.cma }}</span>
           </template>
         </el-table-column>
         <el-table-column label="心跳间隔" width="70">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.heartbeatDuration
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.msgs.heartbeatDuration
-            }}</span>
+            <span>{{ scope.row.reportMap.heartbeatDuration }}</span>
           </template>
         </el-table-column>
         <el-table-column label="电池">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.battary
-            }}</span>
-            <span v-else> {{ scope.row.raw_report.msgs.battery }}</span>
+            <span>{{ scope.row.reportMap.battery }}</span>
+           
           </template>
         </el-table-column>
         <el-table-column label="电池温度" width="70">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.batteryTmp
-            }}</span>
-            <span v-else>{{ scope.row.raw_report.msgs.batteryTmp }}</span>
+            <span>{{ scope.row.reportMap.batteryTmp }}</span>
+           
           </template>
         </el-table-column>
         <el-table-column label="主板温度" width="70">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.mainBoardTmp
-            }}</span>
-            <span v-else> {{ scope.row.raw_report.msgs.mainBoardTmp }}</span>
+            <span>{{ scope.row.reportMap.mainBoardTmp }}</span>
+           
           </template>
         </el-table-column>
 
         <el-table-column label="系统重启" width="70">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.rebootTimes
-            }}</span>
-            <span v-else>{{ scope.row.raw_report.msgs.rebootTimes }}</span>
+            <span>{{ scope.row.reportMap.rebootTimes }}</span>
+           
           </template>
         </el-table-column>
         <el-table-column label="i1重启" width="70">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.i1RebootTimes
-            }}</span>
-            <span v-else>{{ scope.row.raw_report.msgs.i1RebootTimes }}</span>
+            <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.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.recv
-            }}</span>
-            <span v-else> {{ scope.row.raw_report.msgs.recv }}</span>
+            <span>{{ scope.row.reportMap.recv }}</span>
+            
           </template>
         </el-table-column>
         <el-table-column label="传图" width="70">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.pic
-            }}</span>
-            <span v-else> {{ scope.row.raw_report.pic }}</span>
+            <span>{{ scope.row.reportMap.pic }}</span>
+           
           </template>
         </el-table-column>
         <el-table-column label="拍" width="60">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.photoTimes
-            }}</span>
-            <span v-else> {{ scope.row.raw_report.msgs.photoTimes }}</span>
+            <span>{{ scope.row.reportMap.photoTimes }}</span>
+           
           </template>
         </el-table-column>
         <el-table-column label="成/败/传" width="70">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">
-              {{ scope.row.raw_report.success }}/{{
-                scope.row.raw_report.failure
-              }}/{{ scope.row.raw_report.uploads }}</span
-            >
-            <span v-else>
-              {{ scope.row.raw_report.msgs.success }}/{{
-                scope.row.raw_report.msgs.failure
-              }}/{{ scope.row.raw_report.msgs.uploads }}</span
-            >
+            <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 v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.numberOfHb
-            }}</span>
-            <span v-else> {{ scope.row.raw_report.msgs.numberOfHb }}</span>
+            <span>{{ scope.row.reportMap.numberOfHb }}</span>
+            
           </template>
         </el-table-column>
         <el-table-column label="网络异常" width="80">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.networkError
-            }}</span>
-            <span v-else>{{ scope.row.raw_report.msgs.networkError }}</span>
+            <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.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.signature1
-            }}</span>
-            <span v-else>{{ scope.row.raw_report.msgs.signature1 }}</span>
+            <span>{{ 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.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.signature2
-            }}</span>
-            <span v-else> {{ scope.row.raw_report.msgs.signature2 }}</span>
+            <span>{{ scope.row.reportMap.signature2 }}</span>
+           
           </template>
         </el-table-column>
         <!-- <el-table-column label="其他">
@@ -192,7 +159,7 @@
   </el-dialog>
 </template>
 <script>
-import { getqueryRawApi } from "@/utils/api/index";
+import { heartListApi } from "@/utils/api/index";
 export default {
   props: {},
   data() {
@@ -201,7 +168,7 @@ export default {
       girdloading: true,
       isShow: false,
       page: 1, // 当前页数
-      pageSize: 20, // 每页数量
+      pageSize: 50, // 每页数量
       total: 0, //总条数
       termid: "",
     };
@@ -219,15 +186,16 @@ export default {
     },
     getQueryList() {
       this.girdloading = true;
-      getqueryRawApi({
+      this.gridData = []
+      heartListApi({
         termId: this.termid,
-        p: this.page,
-        ps: this.pageSize,
+        pageNum: this.page,
+        pageSize: this.pageSize,
       })
         .then((res) => {
           console.log(res);
-          this.gridData = res.data;
-          this.total = Number(res.page.totalRecords);
+          this.gridData = res.data.list;
+           this.total = Number(res.data.total);
           this.girdloading = false;
         })
         .catch((err) => {});
diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 042abc6..57b3096 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -8,7 +8,7 @@
               <el-option
                 v-for="item in operateOptions"
                 :key="item.id"
-                :label="item.name"
+                :label="item.desc"
                 :value="item.id"
               ></el-option>
             </el-select>
@@ -100,10 +100,10 @@
               scope.row.list[0].estimatedPublishTime * 1000 - newupdatatime > 0
             "
           >
-            <b v-if="scope.row.list[0].cmdDesc == ''">{{
-              cmdCn[scope.row.list[0].cmdName]
+            <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].cmdDesc }}</b>
+            ><b v-else>{{ scope.row.list[0].desc }}</b>
 
             <b
               v-if="
@@ -116,8 +116,8 @@
           </span>
           <span v-else>
             {{
-              scope.row.raw_report.hasOwnProperty("oid")
-                ? scope.row.raw_report.oid
+              scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("oid")
+                ? scope.row.mntnStatus.reportMap.oid
                 : ""
             }}
           </span>
@@ -129,13 +129,13 @@
         <template slot-scope="scope">
           <el-tag
             type="success"
-            v-if="nowTime - scope.row.last_heartbeat_ts <= 720"
+            v-if=" scope.row.onlinestatus ==1"
             >在线</el-tag
           >
           <el-tag type="danger" v-else>离线</el-tag>
         </template>
       </u-table-column>
-      <u-table-column label="运维" prop="in_maintain" width="68" sortable fixed>
+      <u-table-column label="运维" prop="mntnStatus.inMaintain" width="68" sortable fixed>
         <template slot="header" slot-scope="scope">
           <p :class="ywNumber != 0 ? 'redClass' : 'noClass'">
             {{ ywNumber }}<span> / {{ tableData.length }}</span>
@@ -156,14 +156,14 @@
         </template>
         <template slot-scope="scope">
           <el-checkbox
-            v-model="scope.row.in_maintain"
-            :true-label="'1'"
-            :false-label="'0'"
+            v-model="scope.row.mntnStatus.inMaintain"
+            :true-label="1"
+            :false-label="0"
             @change="(val) => UpdateMaintainMode(val, scope.row)"
           ></el-checkbox>
         </template>
       </u-table-column>
-      <u-table-column label="快心跳" prop="quick_hb" width="90" sortable fixed>
+      <u-table-column label="快心跳" prop="mntnStatus.quickHb" width="90" sortable fixed>
         <template slot="header" slot-scope="scope">
           <p :class="kxtNumber != 0 ? 'redClass' : 'noClass'">
             {{ kxtNumber }}<span> / {{ tableData.length }}</span>
@@ -184,40 +184,43 @@
         </template>
         <template slot-scope="scope">
           <el-checkbox
-            v-model="scope.row.quick_hb"
-            :true-label="'1'"
-            :false-label="'0'"
+            v-model="scope.row.mntnStatus.quickHb"
+            :true-label="1"
+            :false-label="0"
             @change="(val) => UpdateQuickHbMode(val, scope.row)"
           ></el-checkbox>
         </template>
       </u-table-column>
+      
       <u-table-column
-        prop="last_heartbeat"
+        prop="mntnStatus.rawReportTime"
         label="最后心跳"
         width="130"
-        sortable
+        :sortable="true"
         class-name="hbClass"
       >
         <template slot-scope="scope">
           <span
             @click="handleMsgClick(scope.row)"
-            :title="scope.row.last_heartbeat"
-            >{{ scope.row.last_heartbeat }}</span
+            :title="formatLastHeartbeat(scope.row.mntnStatus.rawReportTime)"
+            >{{  formatLastHeartbeat(scope.row.mntnStatus.rawReportTime) }}</span
           >
         </template>
       </u-table-column>
       <u-table-column
         label="传图"
-        prop="raw_report.pic"
+        prop="mntnStatus.reportMap.pic"
         width="50"
         class-name="picBg"
         sortable
+        :sort-method="picSort"
       >
         <template slot-scope="scope">
-          {{ scope.row.raw_report.pic }}
+          {{ scope.row.mntnStatus.reportMap && scope.row.mntnStatus.reportMap.hasOwnProperty("pic")  
+        ? Number(scope.row.mntnStatus.reportMap.pic)  
+        : 0 }}  
         </template>
       </u-table-column>
-
       <u-table-column
         prop="protocol"
         label="规约"
@@ -232,57 +235,44 @@
       </u-table-column>
       <u-table-column label="电池状态" width="126" key="dc" v-if="dccheck">
         <template slot-scope="scope">
-          <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-            scope.row.raw_report.battary
-          }}</span>
-          <span v-else>{{
-            scope.row.raw_report.hasOwnProperty("msgs")
-              ? scope.row.raw_report.msgs.battery
-              : ""
+          <span>{{
+             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 v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.numberOfHb
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.msgs.hasOwnProperty("numberOfHb")
-                ? Number(scope.row.raw_report.msgs.numberOfHb)
-                : ""
-            }}</span>
+            <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 v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.heartbeatDuration
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.heartbeatDuration
-                : ""
-            }}</span>
+            <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.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.recv
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.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>
@@ -290,14 +280,12 @@
       <u-table-column label="拍照" v-if="pzcheck" key="pz">
         <u-table-column label="计划/实际" min-width="48">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.photoTimes
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.photoTimes
-                : ""
-            }}</span>
+            <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
@@ -307,14 +295,12 @@
           :sort-method="sortSuccess"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.success
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.msgs.hasOwnProperty("success")
-                ? Number(scope.row.raw_report.msgs.success)
-                : ""
-            }}</span>
+            <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
@@ -324,14 +310,12 @@
           :sort-method="sortFailure"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.failure
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.msgs.hasOwnProperty("failure")
-                ? Number(scope.row.raw_report.msgs.failure)
-                : ""
-            }}</span>
+            <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>
@@ -342,49 +326,38 @@
             <el-tooltip
               class="item"
               effect="dark"
-              :content="scope.row.raw_report.msgs.signature1"
+              :content='scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("signature1")? scope.row.mntnStatus.reportMap.signature1
+                :""'
               placement="top"
             >
-              <span>{{
-                scope.row.raw_report.msgs.hasOwnProperty("signature1")
-                  ? scope.row.raw_report.msgs.signature1.split("/")[0]
-                  : ""
-              }}</span>
+            <span>{{
+             scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("signature1")
+                ? scope.row.mntnStatus.reportMap.signature1.split("/")[0]
+                :""
+          }}</span>
+             
             </el-tooltip>
           </template>
         </u-table-column>
         <u-table-column label="卡2" min-width="60" prop="signature2">
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">
-              <el-tooltip
-                class="item"
-                effect="dark"
-                :content="scope.row.raw_report.msgs.signature2"
-                placement="top"
-                ><span>{{
-                  scope.row.raw_report.msgs.signature2
-                }}</span></el-tooltip
-              ></span
-            >
-            <span v-else>
+           
+            <span >
               <el-tooltip
                 class="item"
                 effect="dark"
-                :content="scope.row.raw_report.msgs.signature2"
+                :content='scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("signature2")? scope.row.mntnStatus.reportMap.signature2
+                :""'
                 placement="top"
               >
-                <span>{{
-                  scope.row.raw_report.msgs.hasOwnProperty("signature2")
-                    ? scope.row.raw_report.msgs.signature2.split("/")[0]
-                    : ""
-                }}</span>
+              <span>{{
+             scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("signature2")
+                ? scope.row.mntnStatus.reportMap.signature2.split("/")[0]
+                :""
+          }}</span>
               </el-tooltip>
             </span>
-            <!-- {{
-              scope.row.raw_report.msgs.hasOwnProperty("signature2")
-                ? scope.row.raw_report.msgs.signature2.split("/")[0]
-                : ""
-            }} -->
+            
           </template>
         </u-table-column>
         <u-table-column
@@ -395,14 +368,12 @@
           :sort-method="sortNumbersErr"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.networkError
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.msgs.hasOwnProperty("networkError")
-                ? Number(scope.row.raw_report.msgs.networkError)
-                : ""
-            }}</span>
+            <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>
@@ -413,17 +384,15 @@
           min-width="48"
           prop="rebootTimes"
           sortable
-          :sort-method="sortNumbers"
+          :sort-method="sortRebootTimes"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.rebootTimes
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.msgs.hasOwnProperty("rebootTimes")
-                ? Number(scope.row.raw_report.msgs.rebootTimes)
-                : ""
-            }}</span>
+            <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
@@ -431,47 +400,36 @@
           min-width="48"
           prop="i1RebootTimes"
           sortable
-          :sort-method="sortNumbers2"
+          :sort-method="sortI1Reb"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-              scope.row.raw_report.i1RebootTimes
-            }}</span>
-            <span v-else>{{
-              scope.row.raw_report.msgs.hasOwnProperty("i1RebootTimes")
-                ? Number(scope.row.raw_report.msgs.i1RebootTimes)
-                : ""
-            }}</span>
+            <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 v-if="scope.row.raw_report.hasOwnProperty('XyDev')">
-              {{ scope.row.raw_report.simcard1 }}</span
-            >
-            <span v-else>
-              {{
-                scope.row.raw_report.msgs.hasOwnProperty("simcard1")
-                  ? scope.row.raw_report.msgs.simcard1
-                  : ""
-              }}</span
-            >
+            <span>{{
+             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 v-if="scope.row.raw_report.hasOwnProperty('XyDev')">
-              {{ scope.row.raw_report.simcard2 }}</span
-            >
-            <span v-else>
-              {{
-                scope.row.raw_report.msgs.hasOwnProperty("simcard2")
-                  ? scope.row.raw_report.msgs.simcard2
-                  : ""
-              }}</span
-            >
+            <span>{{
+             scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("simcard2")
+                ?scope.row.mntnStatus.reportMap.simcard2
+                :""
+          }}</span>
           </template>
         </u-table-column>
       </u-table-column>
@@ -484,38 +442,29 @@
         :sort-method="sortfreeNumbers"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">
-            {{ scope.row.raw_report.freeROM }}</span
-          >
-          <span v-else>{{
-            scope.row.raw_report.msgs.hasOwnProperty("freeROM")
-              ? scope.row.raw_report.msgs.freeROM
-              : ""
+          <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 v-if="scope.row.raw_report.hasOwnProperty('XyDev')">
-            {{ scope.row.raw_report.cma }}</span
-          >
-          <span v-else>{{
-            scope.row.raw_report.hasOwnProperty("msgs")
-              ? scope.row.raw_report.msgs.cma
-              : ""
+          <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 v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-            scope.row.raw_report.i1Version
-          }}</span>
-          <span v-else>{{
-            scope.row.raw_report.msgs.hasOwnProperty("i1Version")
-              ? scope.row.raw_report.msgs.i1Version
-              : ""
+          <span>{{
+             scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("i1Version")
+                ?scope.row.mntnStatus.reportMap.i1Version
+                :""
           }}</span>
         </template>
       </u-table-column>
@@ -526,16 +475,12 @@
         key="ywbb"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-            scope.row.raw_report.maintainVersion
+          <span>{{
+             scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("maintainVersion")
+                ?scope.row.mntnStatus.reportMap.maintainVersion
+                :""
           }}</span>
-          <span v-else>
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("maintainVersion")
-                ? scope.row.raw_report.msgs.maintainVersion
-                : ""
-            }}</span
-          >
+         
         </template>
       </u-table-column>
       <u-table-column
@@ -545,29 +490,32 @@
         key="Camera"
       >
         <template slot-scope="scope">
-          {{
-            scope.row.raw_report.msgs.hasOwnProperty("cameraService")
-              ? scope.row.raw_report.msgs.cameraService
-              : ""
-          }}
+          <span>{{
+             scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("cameraService")
+                ?scope.row.mntnStatus.reportMap.cameraService
+                :""
+          }}</span>
+        
         </template>
       </u-table-column>
       <u-table-column label="AI版本" v-if="AIcheck" min-width="80" key="AI">
         <template slot-scope="scope">
-          {{
-            scope.row.raw_report.msgs.hasOwnProperty("aiVersion")
-              ? scope.row.raw_report.msgs.aiVersion
-              : ""
-          }}
+          <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">
-          {{
-            scope.row.raw_report.msgs.hasOwnProperty("mcu")
-              ? scope.row.raw_report.msgs.mcu
-              : ""
-          }}
+          <span>{{
+             scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("mcu")
+                ?scope.row.mntnStatus.reportMap.mcu
+                :""
+          }}</span>
+         
         </template>
       </u-table-column>
       <u-table-column
@@ -577,7 +525,7 @@
         key="lastIp"
       >
         <template slot-scope="scope">
-          <span> {{ scope.row.last_ip }}</span>
+          <span> {{ scope.row.mntnStatus.lastIp }}</span>
         </template>
       </u-table-column>
       <u-table-column
@@ -596,12 +544,12 @@
             <el-input
               class="noteclass"
               v-if="scope.$index == cellIndex"
-              v-model="scope.row.comment"
+              v-model="scope.row.mntnStatus.comment"
               @blur="handleCommentBlur(scope)"
               placeholder="请输入备注"
             ></el-input>
-            <span v-else :title="scope.row.comment">{{
-              scope.row.comment
+            <span v-else :title="scope.row.mntnStatus.comment">{{
+              scope.row.mntnStatus.comment
             }}</span>
           </div>
         </template>
@@ -766,6 +714,7 @@
             v-model="upgradationform.upVal"
             placeholder="请选择升级文件"
             @change="selectChanged"
+            filterable
           >
             <el-option
               v-for="item in upOptions"
@@ -804,6 +753,7 @@
             v-model="upgradationformOta.upVal"
             placeholder="请选择升级文件"
             @change="selectChangedOta"
+            filterable
           >
             <el-option
               v-for="item in upOptionsOta"
@@ -902,9 +852,10 @@
 
 <script>
 import {
-  getdoActionApi,
-  getqueryUpgradesApi,
-  updComment,
+  cmdSendApi,
+  getCmdActionApi,
+  upgradeListApi,
+  updCommentApi,
 } from "@/utils/api/index";
 import rowMsgDialog from "./rowMsgDialog.vue";
 import htmlToExcel from "@/utils/htmlToExcel";
@@ -957,7 +908,7 @@ export default {
         i1_cmd_set_i1_heart_beat_time: "设置心跳周期",
         yw_cmd_upload_i1_zip_log: "上传日志",
         upgrade: "升级",
-        updOta: "Ota升级",
+        yw_upd_ota: "Ota升级",
         yw_cmd_start_frpc: "开启frpc",
         yw_cmd_stop_frpc: "停止frpc",
         i1_cmd_stop_aging_test: "停止老化测试",
@@ -974,6 +925,8 @@ export default {
         65285: "河南全景",
         65286: "河南郑州",
         65290: "河南统一视频v2020",
+        65298:"宁夏",
+        2:"南网"
       },
       multipleSelection: [],
 
@@ -1005,19 +958,8 @@ export default {
       notecheck: false,
       lastIpcheck: false,
       //运维操作列表
-      operateOptions: [
-        { id: 1, name: "重启设备" },
-        { id: 2, name: "MCU单片机重启" },
-        { id: 3, name: "设置I1服务器" },
-        // { id: 4, name: "设置运维服务器" },
-        { id: 5, name: "设置心跳周期" },
-        { id: 6, name: "上传日志" },
-        { id: 7, name: "升级" },
-        { id: 11, name: "OTA升级" },
-        { id: 8, name: "开启frpc" },
-        { id: 9, name: "停止frpc" },
-        { id: 10, name: "停止老化测试" },
-      ],
+      operateOptions:[],
+     
       formIssue: {
         operate: "",
       }, //运维操作
@@ -1170,6 +1112,7 @@ export default {
     this.loadLocalStorage();
     this.calculateHeight(this.showFlag);
     window.addEventListener("resize", this.calculateHeight(this.showFlag));
+   
   },
   computed: {
     // 使用计算属性来扩展数据，为每个项目添加 isEditing 字段
@@ -1192,8 +1135,22 @@ export default {
       deep: true,
     },
   },
-  created() {},
+  created() {
+    this.getCmdOptionsFun()
+  },
   methods: {
+    //获取命令列表
+    getCmdOptionsFun(){
+      getCmdActionApi()
+          .then((res) => {
+            console.log(res);
+           this.operateOptions = res.data
+          })
+          .catch((err) => {});
+    },
+    formatLastHeartbeat(timestamp) {  
+    return this.$moment(timestamp * 1000).format("YYYY-MM-DD HH:mm:ss");  
+    },  
     calculateHeight(val) {
       console.log(val);
       this.showFlag = val;
@@ -1208,67 +1165,110 @@ export default {
 
       console.log(this.tableHeight);
     },
+    //判断磁盘空间
     tableRowSetting({ row }) {
-      if (row.raw_report.msgs.hasOwnProperty("freeROM")) {
-        // console.log(row.raw_report.msgs.freeROM);
-        // console.log(parseInt(row.raw_report.msgs.freeROM));
-        if (parseInt(row.raw_report.msgs.freeROM) < 50) {
-          return "has-color";
-        }
-      }
-      // 根据if条件定义到该行
-      // if (row.rank === 1) {
-      //   return "has-color";
-      // }
-      // return "";
-    },
-    sortNumbers(a, b) {
-      return (
-        Number(a.raw_report.msgs.rebootTimes) -
-        Number(b.raw_report.msgs.rebootTimes)
-      );
+      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";  
+      }  
     },
-    sortNumbers2(a, b) {
-      return (
-        Number(a.raw_report.msgs.i1RebootTimes) -
-        Number(b.raw_report.msgs.i1RebootTimes)
-      );
+    //传图pic排序
+    picSort(a, b) {  
+      // 确保 a 和 b 都有 mntnStatus.reportMap 对象  
+      const aPic = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.pic) || 0;  
+      const bPic = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.pic) || 0;  
+      // 将 pic 转换为数字进行比较  
+      const numA = Number(aPic);  
+      const numB = Number(bPic);  
+      // 根据需要进行升序或降序排序  
+      // 这里假设你想要升序排序（从小到大）  
+      return numA - numB;  
+      // 如果你想要降序排序（从大到小），则返回 numB - numA  
     },
-    sortNumbersErr(a, b) {
-      return (
-        Number(a.raw_report.msgs.networkError) -
-        Number(b.raw_report.msgs.networkError)
-      );
+    //心跳次数排序
+    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) {
-      return (
-        Number(a.raw_report.msgs.success) - Number(b.raw_report.msgs.success)
-      );
+      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) {
-      return (
-        Number(a.raw_report.msgs.failure) - Number(b.raw_report.msgs.failure)
-      );
+      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;  
     },
-    sortnumberOfHb(a, b) {
-      return (
-        Number(a.raw_report.msgs.numberOfHb) -
-        Number(b.raw_report.msgs.numberOfHb)
-      );
+    //网络错误
+    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) {
-      return (
-        parseInt(a.raw_report.msgs.freeROM) -
-        parseInt(b.raw_report.msgs.freeROM)
-      );
+      // 确保 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.comment === null ? "" : String(a.comment);
-      const bValue = b.comment === null ? "" : String(b.comment);
+      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; // 空字符串排在非空字符串后面
@@ -1279,26 +1279,15 @@ export default {
         sensitivity: "base",
       });
     },
-    // 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);
       this.ywNumber = this.tableData.filter(
-        (item) => item.in_maintain == 1
+        (item) => item.mntnStatus.inMaintain == 1
       ).length;
       this.kxtNumber = this.tableData.filter(
-        (item) => item.quick_hb == 1
+        (item) => item.mntnStatus.quickHb == 1
       ).length;
       console.log("我这里是运维和快心跳的数据");
       console.log(this.ywNumber, this.kxtNumber);
@@ -1325,100 +1314,11 @@ export default {
       //   ).length;
     },
     //导出表格
-    // handleExport() {
-    //   htmlToExcel.getExcel("#ywTable", "设备运维信息");
-    // },
-    //导出表格
     handleExport() {
-      // 准备 CSV 文件的头部信息
-      const headers = [
-        "出厂ID",
-        "装置编号",
-        "状态",
-        "最后心跳时间",
-        "传图",
-        "规约",
-        "电池状态",
-
-        "心跳次数",
-        "心跳周期",
-        "CMA消息",
-        "拍照计划/实际",
-        "拍照成功",
-        "拍照失败",
-        "卡1信号",
-        "卡2信号",
-        "网络错误",
-        "系统重启",
-        "I1重启",
-        "SIM卡1",
-        "SIM卡2",
-
-        "CMA服务器",
-        "磁盘剩余空间",
-        "I1版本",
-        "运维版本",
-        "camera版本",
-        "AI版本",
-        "MCU版本",
-      ];
-      // 准备 CSV 文件的内容数据
-      //let csvContent = headers.join(",") + "\n";
-      let csvContent = headers.map((header) => `"${header}"`).join(",") + "\n"; // 对所有头部使用双引号
-      this.tableData.forEach((item) => {
-        const rawReport = item.raw_report;
-        const msgs = item.raw_report.msgs;
-
-        // 处理 raw_report 数据
-        const rawReportData = [
-          item.oid,
-          item.cmdid,
-          this.nowTime - item.last_heartbeat_ts <= 720 ? "在线" : "离线",
-          item.last_heartbeat,
-          rawReport.pic || "",
-          this.protocolMap[item.protocol],
-          msgs.battery || "",
-          msgs.numberOfHb || "",
-          msgs.heartbeatDuration || "",
-          msgs.recv || "",
-          //msgs.photoTimes || "",
-          String(msgs.photoTimes + "," || ""), // 确保是字符串
-          msgs.success || "",
-          msgs.failure || "",
-          msgs.signature1 || "",
-          msgs.signature2 || "",
-          msgs.networkError || "",
-          msgs.rebootTimes || "",
-          msgs.i1RebootTimes || "",
-          // msgs.simcard1 || "",
-          // msgs.simcard2 || "",
-          String(msgs.simcard1 + "," || ""), // 确保是字符串
-          String(msgs.simcard2 + "," || ""), // 确保是字符串
-          msgs.freeROM || "",
-          msgs.cma || "",
-          msgs.i1Version || "",
-          msgs.maintainVersion || "",
-          msgs.cameraService || "",
-          msgs.aiVersion || "",
-          msgs.mcu || "",
-        ];
-
-        // 如果需要处理 msgs 数据，可以在这里添加逻辑
-        // 将数据添加到 CSV 内容中
-        //csvContent += rawReportData.join(",") + "\n";
-        csvContent +=
-          rawReportData.map((value) => `"${value}"`).join(",") + "\n"; // 对每个值使用双引号
-      });
-
-      // 获取当前时间并格式化
-      const now = this.$moment(new Date());
-      const formattedTime = now.format("YYYY年MM月DD日HH时mm分"); // 格式化时间字符串，例如 "2023-04-01_15_30_00"
-      console.log(formattedTime);
-      // 创建CSV文件的Blob对象
-      const blob = new Blob([csvContent], { type: "text/csv;charset=utf-8" });
-      // 使用FileSaver.js保存文件，文件名后加上当前时间
-      saveAs(blob, `运维数据报表_${formattedTime}.csv`);
+      this.$parent.exportTable();
     },
+    //导出表格
+   
     // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据
     getRowKey(row) {
       return row.id;
@@ -1457,10 +1357,10 @@ export default {
         }
         this.termidsArray = [...new Set(this.termidsArray)];
         console.log(this.termidsArray);
-        getdoActionApi({
-          act: "mntn",
-          termIds: this.termidsArray.join("-"),
-          mntn: 1,
+        cmdSendApi({
+          action: "mntn",
+          termIds: this.termidsArray,
+          mntnMode: 1,
         })
           .then((res) => {
             console.log(res);
@@ -1476,10 +1376,10 @@ export default {
         }
         this.termidsArray = [...new Set(this.termidsArray)];
         console.log(this.termidsArray);
-        getdoActionApi({
-          act: "mntn",
-          termIds: this.termidsArray.join("-"),
-          mntn: 0,
+        cmdSendApi({
+          action: "mntn",
+          termIds: this.termidsArray,
+          mntnMode: 0,
         })
           .then((res) => {
             console.log(res);
@@ -1492,10 +1392,11 @@ export default {
     UpdateMaintainMode(val, row) {
       console.log("运维");
       console.log(val, row);
-      getdoActionApi({
-        act: "mntn",
-        termId: row.id,
-        mntn: val,
+      
+      cmdSendApi({
+        action: "mntn",
+        termIds: [row.id],
+        mntnMode: val,
       })
         .then((res) => {
           console.log(res);
@@ -1514,10 +1415,10 @@ export default {
         }
         this.termidsArray = [...new Set(this.termidsArray)];
         console.log(this.termidsArray);
-        getdoActionApi({
-          act: "quickhb",
-          termIds: this.termidsArray.join("-"),
-          quickhb: 1,
+        cmdSendApi({
+          action: "quickhb",
+          termIds: this.termidsArray,
+          quickHeartbeat: 1,
         })
           .then((res) => {
             console.log(res);
@@ -1533,10 +1434,10 @@ export default {
         }
         this.termidsArray = [...new Set(this.termidsArray)];
         console.log(this.termidsArray);
-        getdoActionApi({
-          act: "quickhb",
-          termIds: this.termidsArray.join("-"),
-          quickhb: 0,
+        cmdSendApi({
+          action: "quickhb",
+          termIds: this.termidsArray,
+          quickHeartbeat: 0,
         })
           .then((res) => {
             console.log(res);
@@ -1548,10 +1449,10 @@ export default {
     //快心跳
     UpdateQuickHbMode(val, row) {
       console.log("快心跳");
-      getdoActionApi({
-        act: "quickhb",
-        termId: row.id,
-        quickhb: val,
+      cmdSendApi({
+        action: "quickhb",
+        termIds: [row.id],
+        quickHeartbeat: val,
       })
         .then((res) => {
           console.log(res);
@@ -1585,16 +1486,16 @@ export default {
         case 1:
           console.log("重启");
           var params = {
-            act: "reset",
-            termIds: this.idArray.join("-"),
+            action:"yw_cmd_android_reboot",
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           return;
         case 2:
           console.log("重启MCU");
           var params = {
-            act: "reset-mcu",
-            termIds: this.idArray.join("-"),
+            action:"yw_cmd_mcu_reboot",
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           return;
@@ -1613,9 +1514,9 @@ export default {
         case 6:
           console.log("上传日志");
           var params = {
-            act: "upload-logs",
+            action:"yw_cmd_upload_i1_zip_log",
             url: "http://180.166.218.222:40101/upload/",
-            termIds: this.idArray.join("-"),
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           return;
@@ -1632,16 +1533,16 @@ export default {
         case 9:
           console.log("停止frpc");
           var params = {
-            act: "stop-frpc",
-            termIds: this.idArray.join("-"),
+            action:"yw_cmd_stop_frpc",
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           return;
         case 10:
           console.log("停止老化测试");
           var params = {
-            act: "stop-aging-test",
-            termIds: this.idArray.join("-"),
+            action:"i1_cmd_stop_aging_test",
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           return;
@@ -1654,7 +1555,7 @@ export default {
     },
     //执行操作
     changeIssue(params) {
-      getdoActionApi(params)
+      cmdSendApi(params)
         .then((res) => {
           console.log(res);
           this.$refs.ywMultipleTable.clearSelection();
@@ -1669,10 +1570,10 @@ export default {
       this.$refs.ieRuleForm.validate((valid) => {
         if (valid) {
           var params = {
-            act: "set-cma",
+            action:"i1_cmd_set_i1_server_ip_port",
             ip: this.ieform.ip,
             port: this.ieform.port,
-            termIds: this.idArray.join("-"),
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           this.ieVisible = false;
@@ -1685,25 +1586,25 @@ export default {
       this.$refs.operationRuleForm.validate((valid) => {
         if (valid) {
           var params = {
-            act: "set-mntn",
+            action:"i1_cmd_set_xy_yw_ip_port",
             ip: this.operationform.ip,
             port: this.operationform.port,
-            termIds: this.idArray.join("-"),
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           this.operationVisible = false;
         }
       });
     },
-    //点击运维服务器确定
+    //点击心跳设置确定
     handleheartBeat() {
       console.log(this.$refs.heartBeatRuleForm);
       this.$refs.heartBeatRuleForm.validate((valid) => {
         if (valid) {
           var params = {
-            act: "set-hb",
+            action:"i1_cmd_set_i1_heart_beat_time",
             hb: this.heartBeatform.heart,
-            termIds: this.idArray.join("-"),
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           this.heartBeatVisible = false;
@@ -1712,19 +1613,19 @@ export default {
     },
     //获取升级apkList
     getUpgradeList() {
-      getqueryUpgradesApi()
+      upgradeListApi({type:0})
         .then((res) => {
           console.log(res);
-          this.upOptions = res.data.filter(item => item.type === "0");
+          this.upOptions = res.data
         })
         .catch((err) => {});
     },
      //获取Ota升级apkList
      getUpgradeOtaList() {
-      getqueryUpgradesApi()
+      upgradeListApi({type:1})
         .then((res) => {
           console.log(res);
-          this.upOptionsOta = res.data.filter(item => item.type === "1");
+          this.upOptionsOta = res.data
         })
         .catch((err) => {});
     },
@@ -1750,11 +1651,11 @@ export default {
       this.$refs.upgradationRuleForm.validate((valid) => {
         if (valid) {
           var params = {
-            act: "upgrade",
+            action:"upgrade",
             url: this.upgradationform.upVal,
             md5: this.selectUpObj.md5,
             fn: this.selectUpObj.fileName,
-            termIds: this.idArray.join("-"),
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           this.upgradationVisible = false;
@@ -1766,11 +1667,11 @@ export default {
       this.$refs.upgradationRuleFormOta.validate((valid) => {
         if (valid) {
           var params = {
-            act: "upd-ota",
+            action:"yw_upd_ota",
             url: this.upgradationformOta.upVal,
             md5: this.selectUpObjOta.md5,
             fn: this.selectUpObjOta.fileName,
-            termIds: this.idArray.join("-"),
+            termIds: this.idArray,
           };
           this.changeIssue(params);
           this.upgradationVisibleOta = false;
@@ -1797,7 +1698,7 @@ export default {
       this.$refs.frpcRuleForm.validate((valid) => {
         if (valid) {
           var params = {
-            act: "start-frpc",
+            action:"yw_cmd_start_frpc",
             server_addr: this.frpcform.server_addr,
             server_port: this.frpcform.server_port,
             local_ip: this.frpcform.local_ip,
@@ -1805,7 +1706,7 @@ export default {
             remote_port: this.frpcform.remote_port,
             frpc_type: this.frpcform.frpc_type,
             type: this.frpcform.type,
-            termIds: this.idArray.join("-"),
+            termId: this.idArray[0],
           };
           this.changeIssue(params);
           this.frpcVisible = false;
@@ -1969,9 +1870,9 @@ export default {
     },
     handleCommentBlur({ row }) {
       console.log(row);
-      updComment({
-        id: row.id,
-        comment: row.comment,
+      updCommentApi({
+        termId: row.id,
+        comment: row.mntnStatus.comment,
       })
         .then((res) => {
           if (res.data) {
diff --git a/src/views/homePage/components/tableMainbak.vue b/src/views/homePage/components/tableMainbak.vue
deleted file mode 100644
index 59411ed..0000000
--- a/src/views/homePage/components/tableMainbak.vue
+++ /dev/null
@@ -1,1898 +0,0 @@
-<template>
-  <div class="tableContain">
-    <div class="headTitle">
-      <div class="xfMl">
-        <el-form :inline="true" :model="formIssue" class="demo-form-inline">
-          <el-form-item label="运维操作">
-            <el-select v-model="formIssue.operate" placeholder="请输入运维操作">
-              <el-option
-                v-for="item in operateOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="onIssue">下发命令</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="zzMsg">
-        <p class="total">
-          <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>
-        <el-button type="primary" @click="handleExport">导出</el-button>
-        <el-tooltip class="item" effect="dark" content="扩展列" placement="top">
-          <el-button
-            class="drawBox"
-            size="small"
-            type="primary"
-            icon="el-icon-s-operation"
-            @click="drawer = true"
-          ></el-button>
-        </el-tooltip>
-      </div>
-    </div>
-    <el-table
-      v-loading="tableLoaidng"
-      class="ywTableBox"
-      id="ywTable"
-      ref="ywMultipleTable"
-      :data="tableData"
-      border
-      stripe
-      :row-key="getRowKey"
-      style="width: 100%"
-      @selection-change="handleSelectionChange"
-      height="calc(100% - 40px)"
-      :default-sort="{ order: 'descending' }"
-      :row-class-name="tableRowSetting"
-    >
-      <el-table-column
-        type="selection"
-        :reserve-selection="true"
-        width="50"
-        fixed
-      >
-      </el-table-column>
-      <el-table-column type="index" width="50" label="序号" fixed>
-      </el-table-column>
-      <!-- <el-table-column prop="id" label="ID" width="60" sortable>
-      </el-table-column> -->
-      <el-table-column prop="oid" label="出厂ID" width="180" 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].cmdDesc == ''">{{
-              cmdCn[scope.row.list[0].cmdName]
-            }}</b
-            ><b v-else>{{ scope.row.list[0].cmdDesc }}</b>
-
-            <b
-              v-if="
-                scope.row.list[0].estimatedPublishTime * 1000 - newupdatatime >
-                0
-              "
-            >
-              {{ remainingTime(scope.row.list[0]) }}
-            </b>
-          </span>
-          <span v-else>
-            {{
-              scope.row.raw_report.hasOwnProperty("oid")
-                ? scope.row.raw_report.oid
-                : ""
-            }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="cmdid" label="装置编号" width="150" sortable fixed>
-      </el-table-column>
-      <el-table-column label="状态" width="72" fixed>
-        <template slot-scope="scope">
-          <el-tag
-            type="success"
-            v-if="nowTime - scope.row.last_heartbeat_ts <= 720"
-            >在线</el-tag
-          >
-          <el-tag type="danger" v-else>离线</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="运维"
-        prop="in_maintain"
-        width="100"
-        sortable
-        fixed
-      >
-        <template slot="header" slot-scope="scope">
-          <p :class="ywNumber != 0 ? 'redClass' : 'noClass'">
-            {{ ywNumber }}<span> / {{ tableData.length }}</span>
-          </p>
-          <span @click.stop>
-            <el-checkbox
-              v-model="checkAllYW"
-              @change="handlecheckAllYW"
-              :class="
-                (ywNumber == tableData.length && tableData.length != 0) ||
-                ywNumber == 0
-                  ? ''
-                  : 'is-indeterminate'
-              "
-            ></el-checkbox>
-            运维
-          </span>
-        </template>
-        <template slot-scope="scope">
-          <el-checkbox
-            v-model="scope.row.in_maintain"
-            :true-label="'1'"
-            :false-label="'0'"
-            @change="(val) => UpdateMaintainMode(val, scope.row)"
-          ></el-checkbox>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="快心跳"
-        prop="quick_hb"
-        width="108"
-        sortable
-        fixed
-      >
-        <template slot="header" slot-scope="scope">
-          <p :class="kxtNumber != 0 ? 'redClass' : 'noClass'">
-            {{ kxtNumber }}<span> / {{ tableData.length }}</span>
-          </p>
-          <span @click.stop>
-            <el-checkbox
-              v-model="checkAllKXT"
-              @change="handlecheckAllKXT"
-              :class="
-                (kxtNumber == tableData.length && tableData.length != 0) ||
-                kxtNumber == 0
-                  ? ''
-                  : 'is-indeterminate'
-              "
-            ></el-checkbox>
-            快心跳
-          </span>
-        </template>
-        <template slot-scope="scope">
-          <el-checkbox
-            v-model="scope.row.quick_hb"
-            :true-label="'1'"
-            :false-label="'0'"
-            @change="(val) => UpdateQuickHbMode(val, scope.row)"
-          ></el-checkbox>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="last_heartbeat"
-        label="最后心跳"
-        width="142"
-        sortable
-        class-name="hbClass"
-      >
-        <template slot-scope="scope">
-          <span @click="handleMsgClick(scope.row)">{{
-            scope.row.last_heartbeat
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="传图"
-        prop="raw_report.pic"
-        width="80"
-        class-name="picBg"
-        sortable
-      >
-        <template slot-scope="scope">
-          {{ scope.row.raw_report.pic }}
-        </template>
-      </el-table-column>
-
-      <el-table-column
-        prop="protocol"
-        label="规约"
-        width="80"
-        v-if="gycheck"
-        sortable
-        key="gy"
-      >
-        <template slot-scope="scope">
-          {{ protocolMap[scope.row.protocol] }}
-        </template>
-      </el-table-column>
-      <el-table-column label="电池状态" width="118" key="dc" v-if="dccheck">
-        <template slot-scope="scope">
-          {{
-            scope.row.raw_report.hasOwnProperty("msgs")
-              ? scope.row.raw_report.msgs.battery
-              : ""
-          }}
-        </template>
-      </el-table-column>
-
-      <el-table-column label="心跳信息" v-if="xtcheck" key="xt">
-        <el-table-column
-          label="次数"
-          min-width="68"
-          sortable
-          :sort-method="sortnumberOfHb"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("numberOfHb")
-                ? Number(scope.row.raw_report.msgs.numberOfHb)
-                : ""
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column label="周期" min-width="48">
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.heartbeatDuration
-                : ""
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column label="CMA消息" min-width="60">
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.recv
-                : ""
-            }}
-          </template>
-        </el-table-column>
-      </el-table-column>
-
-      <el-table-column label="拍照" v-if="pzcheck" key="pz">
-        <el-table-column label="计划/实际" min-width="60">
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.hasOwnProperty("msgs")
-                ? scope.row.raw_report.msgs.photoTimes
-                : ""
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="成功"
-          min-width="70"
-          sortable
-          :sort-method="sortSuccess"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("success")
-                ? Number(scope.row.raw_report.msgs.success)
-                : ""
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="失败"
-          min-width="70"
-          sortable
-          :sort-method="sortFailure"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("failure")
-                ? Number(scope.row.raw_report.msgs.failure)
-                : ""
-            }}
-          </template>
-        </el-table-column>
-      </el-table-column>
-
-      <el-table-column label="网络信号" v-if="wlcheck" key="wl">
-        <el-table-column label="卡1" min-width="60" prop="signature1">
-          <template slot-scope="scope">
-            <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" prop="signature2">
-          <template slot-scope="scope">
-            <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"
-          prop="networkError"
-          sortable
-          :sort-method="sortNumbersErr"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("networkError")
-                ? Number(scope.row.raw_report.msgs.networkError)
-                : ""
-            }}
-          </template>
-        </el-table-column>
-      </el-table-column>
-
-      <el-table-column label="重启次数" v-if="cqcheck" key="cq">
-        <el-table-column
-          label="系统"
-          min-width="48"
-          prop="rebootTimes"
-          sortable
-          :sort-method="sortNumbers"
-        >
-          <template slot-scope="scope">
-            {{
-              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"
-          prop="i1RebootTimes"
-          sortable
-          :sort-method="sortNumbers2"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("i1RebootTimes")
-                ? Number(scope.row.raw_report.msgs.i1RebootTimes)
-                : ""
-            }}
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="SIM卡" v-if="simcheck" min-width="160" key="sim">
-        <el-table-column label="卡1" width="158" prop="simcard1">
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("simcard1")
-                ? scope.row.raw_report.msgs.simcard1
-                : ""
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column label="卡2" width="158" prop="simcard2">
-          <template slot-scope="scope">
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("simcard2")
-                ? scope.row.raw_report.msgs.simcard2
-                : ""
-            }}
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column
-        label="磁盘剩余空间"
-        v-if="freecheck"
-        min-width="100"
-        key="free"
-        sortable
-        :sort-method="sortfreeNumbers"
-      >
-        <template slot-scope="scope">
-          <span>{{
-            scope.row.raw_report.msgs.hasOwnProperty("freeROM")
-              ? scope.row.raw_report.msgs.freeROM
-              : ""
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="CMA服务器" v-if="cmacheck" width="160" key="cma">
-        <template slot-scope="scope">
-          {{
-            scope.row.raw_report.hasOwnProperty("msgs")
-              ? scope.row.raw_report.msgs.cma
-              : ""
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column label="I1版本" v-if="i1check" min-width="160" key="I1">
-        <template slot-scope="scope">
-          <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-            scope.row.raw_report.i1Version
-          }}</span>
-          <span v-else>{{
-            scope.row.raw_report.msgs.hasOwnProperty("i1Version")
-              ? scope.row.raw_report.msgs.i1Version
-              : ""
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="运维版本"
-        v-if="ywbbcheck"
-        min-width="160"
-        key="ywbb"
-      >
-        <template slot-scope="scope">
-          <span v-if="scope.row.raw_report.hasOwnProperty('XyDev')">{{
-            scope.row.raw_report.maintainVersion
-          }}</span>
-          <span v-else>
-            {{
-              scope.row.raw_report.msgs.hasOwnProperty("maintainVersion")
-                ? scope.row.raw_report.msgs.maintainVersion
-                : ""
-            }}</span
-          >
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="Camera版本"
-        v-if="Cameracheck"
-        width="100"
-        key="Camera"
-      >
-        <template slot-scope="scope">
-          {{
-            scope.row.raw_report.msgs.hasOwnProperty("cameraService")
-              ? scope.row.raw_report.msgs.cameraService
-              : ""
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column label="AI版本" v-if="AIcheck" width="80" key="AI">
-        <template slot-scope="scope">
-          {{
-            scope.row.raw_report.msgs.hasOwnProperty("aiVersion")
-              ? scope.row.raw_report.msgs.aiVersion
-              : ""
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="MCU版本"
-        v-if="MCUcheck"
-        min-width="180"
-        key="MCU"
-      >
-        <template slot-scope="scope">
-          {{
-            scope.row.raw_report.msgs.hasOwnProperty("mcu")
-              ? scope.row.raw_report.msgs.mcu
-              : ""
-          }}
-        </template>
-      </el-table-column>
-    </el-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
-          >
-        </div>
-      </div>
-    </el-drawer>
-    <!-- 设置ie服务器 -->
-    <el-dialog
-      title="设置ie服务器"
-      :visible.sync="ieVisible"
-      width="30%"
-      :close-on-click-modal="false"
-    >
-      <el-form :model="ieform" ref="ieRuleForm" :rules="ieRules">
-        <el-form-item label="CMA IP：" prop="ip">
-          <el-input v-model="ieform.ip" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="CMA Port：" prop="port">
-          <el-input v-model.number="ieform.port" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="ieVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handleIeServe">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!-- 设置运维服务器 -->
-    <el-dialog
-      title="设置运维服务器"
-      :visible.sync="operationVisible"
-      :close-on-click-modal="false"
-      width="30%"
-    >
-      <el-form
-        :model="operationform"
-        ref="operationRuleForm"
-        :rules="operationRules"
-      >
-        <el-form-item label="运维服务器IP：" prop="ip">
-          <el-input v-model="operationform.ip" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="运维服务器Port：" prop="port">
-          <el-input
-            v-model.number="operationform.port"
-            autocomplete="off"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="ieVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handleOperationServe"
-          >确 定</el-button
-        >
-      </div>
-    </el-dialog>
-    <!-- 设置心跳周期 -->
-    <el-dialog
-      title="设置运维服务器"
-      :visible.sync="heartBeatVisible"
-      :close-on-click-modal="false"
-      width="30%"
-    >
-      <el-form
-        :model="heartBeatform"
-        ref="heartBeatRuleForm"
-        :rules="heartBeatRules"
-      >
-        <el-form-item label="心跳周期：(分钟)" prop="heart">
-          <el-input
-            v-model.number="heartBeatform.heart"
-            autocomplete="off"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="heartBeatVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handleheartBeat">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!-- 升级 -->
-    <el-dialog
-      class="upDialogBox"
-      title="请选择升级文件"
-      :visible.sync="upgradationVisible"
-      :close-on-click-modal="false"
-      width="30%"
-    >
-      <el-form
-        :model="upgradationform"
-        :rules="upgradationRules"
-        ref="upgradationRuleForm"
-      >
-        <el-form-item label="文件名称" prop="upVal">
-          <el-select
-            v-model="upgradationform.upVal"
-            placeholder="请选择升级文件"
-            @change="selectChanged"
-          >
-            <el-option
-              v-for="item in upOptions"
-              :key="item.id"
-              :label="item.fileName"
-              :value="item.path"
-              :title="item.title"
-            >
-              {{ item.fileName }}
-              <i class="title">（{{ item.title }}</i
-              ><i class="time">{{ item.createTime }}）</i>
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="upgradationVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handleupgradation">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!-- 开启frpc服务器 -->
-    <el-dialog
-      title="设置frpc"
-      :visible.sync="frpcVisible"
-      :close-on-click-modal="false"
-      width="40%"
-      class="frpcDialogBox"
-    >
-      <el-button type="primary" @click="handleModelForm">模板一</el-button>
-      <el-form
-        :model="frpcform"
-        ref="frpcRuleForm"
-        :rules="frpcRules"
-        label-width="132px"
-      >
-        <el-form-item label="服务器IP：" prop="server_addr">
-          <el-input
-            v-model="frpcform.server_addr"
-            autocomplete="off"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="服务器端口：" prop="server_port">
-          <el-input
-            v-model.number="frpcform.server_port"
-            autocomplete="off"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="FRPC类型：">
-          <el-select v-model="frpcform.frpc_type" placeholder="请选择">
-            <el-option
-              v-for="item in frpc_typeOption"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网络类型：">
-          <el-select v-model="frpcform.type" placeholder="请选择">
-            <el-option
-              v-for="item in typeOption"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="本地IP：" prop="local_ip">
-          <el-input v-model="frpcform.local_ip" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="本地端口：" prop="local_port">
-          <el-input
-            v-model.number="frpcform.local_port"
-            autocomplete="off"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="远程端口：" prop="remote_port">
-          <el-input
-            v-model.number="frpcform.remote_port"
-            autocomplete="off"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="frpcVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handleFrpc">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!-- 装置详细信息 -->
-    <rowMsgDialog ref="rowMsgDialogref"></rowMsgDialog>
-  </div>
-</template>
-
-<script>
-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", "tableLoaidng"],
-  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 {
-      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_cmd_start_frpc: "开启frpc",
-        yw_cmd_stop_frpc: "停止frpc",
-        i1_cmd_stop_aging_test: "停止老化测试",
-      },
-      taskdrawer: false,
-      drawer: false,
-      protocolMap: {
-        65280: "国网I1",
-        65296: "陕西",
-        65281: "安徽",
-        65282: "江苏",
-        65283: "湖南",
-        65284: "浙江",
-        65285: "河南全景",
-        65286: "河南郑州",
-        65290: "河南统一视频v2020",
-      },
-      multipleSelection: [],
-
-      checkAllYW: false,
-      checkAllKXT: false,
-
-      ywNumber: 0,
-      kxtNumber: 0,
-      freeNum: 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,
-      freecheck: false,
-      //运维操作列表
-      operateOptions: [
-        { id: 1, name: "重启设备" },
-        { id: 2, name: "MCU单片机重启" },
-        { id: 3, name: "设置I1服务器" },
-        // { id: 4, name: "设置运维服务器" },
-        { id: 5, name: "设置心跳周期" },
-        { id: 6, name: "上传日志" },
-        { id: 7, name: "升级" },
-        { id: 8, name: "开启frpc" },
-        { id: 9, name: "停止frpc" },
-        { id: 10, name: "停止老化测试" },
-      ],
-      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: [],
-      //设置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,
-    };
-  },
-  mounted() {
-    this.loadLocalStorage();
-  },
-  watch: {
-    tableData: {
-      handler(newVal) {
-        // 数据发生变化时的处理逻辑
-        console.log("数据已更新：", newVal);
-
-        this.getNumber();
-        this.startCountdown();
-      },
-      deep: true,
-    },
-  },
-  created() {},
-  methods: {
-    tableRowSetting({ row }) {
-      if (row.raw_report.msgs.hasOwnProperty("freeROM")) {
-        // console.log(row.raw_report.msgs.freeROM);
-        // console.log(parseInt(row.raw_report.msgs.freeROM));
-        if (parseInt(row.raw_report.msgs.freeROM) < 40) {
-          return "has-color";
-        }
-      }
-      // 根据if条件定义到该行
-      // if (row.rank === 1) {
-      //   return "has-color";
-      // }
-      // return "";
-    },
-    sortNumbers(a, b) {
-      return (
-        Number(a.raw_report.msgs.rebootTimes) -
-        Number(b.raw_report.msgs.rebootTimes)
-      );
-    },
-    sortNumbers2(a, b) {
-      return (
-        Number(a.raw_report.msgs.i1RebootTimes) -
-        Number(b.raw_report.msgs.i1RebootTimes)
-      );
-    },
-    sortNumbersErr(a, b) {
-      return (
-        Number(a.raw_report.msgs.networkError) -
-        Number(b.raw_report.msgs.networkError)
-      );
-    },
-    sortSuccess(a, b) {
-      return (
-        Number(a.raw_report.msgs.success) - Number(b.raw_report.msgs.success)
-      );
-    },
-    sortFailure(a, b) {
-      return (
-        Number(a.raw_report.msgs.failure) - Number(b.raw_report.msgs.failure)
-      );
-    },
-    sortnumberOfHb(a, b) {
-      return (
-        Number(a.raw_report.msgs.numberOfHb) -
-        Number(b.raw_report.msgs.numberOfHb)
-      );
-    },
-    sortfreeNumbers(a, b) {
-      return (
-        parseInt(a.raw_report.msgs.freeROM) -
-        parseInt(b.raw_report.msgs.freeROM)
-      );
-    },
-    // 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);
-      this.ywNumber = this.tableData.filter(
-        (item) => item.in_maintain == 1
-      ).length;
-      this.kxtNumber = this.tableData.filter(
-        (item) => item.quick_hb == 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() {
-      htmlToExcel.getExcel("#ywTable", "设备运维信息");
-    },
-    // 保存选中的数据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(this.idArray);
-    },
-    // 点击装置名称
-    handleMsgClick(val) {
-      console.log(val);
-      this.$refs.rowMsgDialogref.display(val);
-    },
-    handlecheckAllYW(val) {
-      console.log(val);
-      if (val) {
-        console.log("我全选了了运维了");
-        console.log(this.tableData);
-        this.termidsArray = [];
-        for (let i = 0; i < this.tableData.length; i++) {
-          this.termidsArray.push(this.tableData[i].id);
-        }
-        this.termidsArray = [...new Set(this.termidsArray)];
-        console.log(this.termidsArray);
-        getdoActionApi({
-          act: "mntn",
-          termIds: this.termidsArray.join("-"),
-          mntn: 1,
-        })
-          .then((res) => {
-            console.log(res);
-            this.$parent.onSubmit();
-          })
-          .catch((err) => {});
-      } else {
-        console.log("我取消了运维全选了");
-        console.log(this.tableData);
-        this.termidsArray = [];
-        for (let i = 0; i < this.tableData.length; i++) {
-          this.termidsArray.push(this.tableData[i].id);
-        }
-        this.termidsArray = [...new Set(this.termidsArray)];
-        console.log(this.termidsArray);
-        getdoActionApi({
-          act: "mntn",
-          termIds: this.termidsArray.join("-"),
-          mntn: 0,
-        })
-          .then((res) => {
-            console.log(res);
-            this.$parent.onSubmit();
-          })
-          .catch((err) => {});
-      }
-    },
-    //运维
-    UpdateMaintainMode(val, row) {
-      console.log("运维");
-      console.log(val, row);
-      getdoActionApi({
-        act: "mntn",
-        termId: row.id,
-        mntn: val,
-      })
-        .then((res) => {
-          console.log(res);
-        })
-        .catch((err) => {});
-    },
-    //快心跳
-    handlecheckAllKXT(val) {
-      console.log(val);
-      if (val) {
-        console.log("我全选了快心跳了");
-        console.log(this.tableData);
-        this.termidsArray = [];
-        for (let i = 0; i < this.tableData.length; i++) {
-          this.termidsArray.push(this.tableData[i].id);
-        }
-        this.termidsArray = [...new Set(this.termidsArray)];
-        console.log(this.termidsArray);
-        getdoActionApi({
-          act: "quickhb",
-          termIds: this.termidsArray.join("-"),
-          quickhb: 1,
-        })
-          .then((res) => {
-            console.log(res);
-            this.$parent.onSubmit();
-          })
-          .catch((err) => {});
-      } else {
-        console.log("我取消了运维全选了");
-        console.log(this.tableData);
-        this.termidsArray = [];
-        for (let i = 0; i < this.tableData.length; i++) {
-          this.termidsArray.push(this.tableData[i].id);
-        }
-        this.termidsArray = [...new Set(this.termidsArray)];
-        console.log(this.termidsArray);
-        getdoActionApi({
-          act: "quickhb",
-          termIds: this.termidsArray.join("-"),
-          quickhb: 0,
-        })
-          .then((res) => {
-            console.log(res);
-            this.$parent.onSubmit();
-          })
-          .catch((err) => {});
-      }
-    },
-    //快心跳
-    UpdateQuickHbMode(val, row) {
-      console.log("快心跳");
-      getdoActionApi({
-        act: "quickhb",
-        termId: row.id,
-        quickhb: val,
-      })
-        .then((res) => {
-          console.log(res);
-        })
-        .catch((err) => {});
-    },
-    //下发命令
-    onIssue() {
-      console.log(this.formIssue.operate);
-      console.log(this.multipleSelection);
-      if (this.formIssue.operate == "") {
-        this.$message({
-          duration: 1500,
-          showClose: true,
-          message: "请选择运维操作",
-          type: "warning",
-        });
-        return;
-      }
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          duration: 1500,
-          showClose: true,
-          message: "至少选中一个设备",
-          type: "warning",
-        });
-        return;
-      }
-      this.$parent.fetchData();
-      switch (this.formIssue.operate) {
-        case 1:
-          console.log("重启");
-          var params = {
-            act: "reset",
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          return;
-        case 2:
-          console.log("重启MCU");
-          var params = {
-            act: "reset-mcu",
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          return;
-        case 3:
-          console.log("设置I1服务器");
-          this.ieVisible = true;
-          return;
-        case 4:
-          console.log("设置运维服务器");
-          this.operationVisible = true;
-          return;
-        case 5:
-          console.log("设置心跳周期");
-          this.heartBeatVisible = true;
-          return;
-        case 6:
-          console.log("上传日志");
-          var params = {
-            act: "upload-logs",
-            url: "http://180.166.218.222:40101/upload/",
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          return;
-        case 7:
-          console.log("升级");
-          this.upgradationVisible = true;
-          this.getUpgradeList();
-
-          return;
-        case 8:
-          console.log("开启frpc");
-          this.frpcVisible = true;
-          return;
-        case 9:
-          console.log("停止frpc");
-          var params = {
-            act: "stop-frpc",
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          return;
-        case 10:
-          console.log("停止老化测试");
-          var params = {
-            act: "stop-aging-test",
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          return;
-      }
-    },
-    //执行操作
-    changeIssue(params) {
-      getdoActionApi(params)
-        .then((res) => {
-          console.log(res);
-          this.$refs.ywMultipleTable.clearSelection();
-          this.idArray = [];
-          console.log(this.multipleSelection);
-        })
-        .catch((err) => {});
-    },
-    //点击ie服务器确定
-    handleIeServe() {
-      console.log(this.$refs.ieRuleForm);
-      this.$refs.ieRuleForm.validate((valid) => {
-        if (valid) {
-          var params = {
-            act: "set-cma",
-            ip: this.ieform.ip,
-            port: this.ieform.port,
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          this.ieVisible = false;
-        }
-      });
-    },
-    //点击运维服务器确定
-    handleOperationServe() {
-      console.log(this.$refs.operationRuleForm);
-      this.$refs.operationRuleForm.validate((valid) => {
-        if (valid) {
-          var params = {
-            act: "set-mntn",
-            ip: this.operationform.ip,
-            port: this.operationform.port,
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          this.operationVisible = false;
-        }
-      });
-    },
-    //点击运维服务器确定
-    handleheartBeat() {
-      console.log(this.$refs.heartBeatRuleForm);
-      this.$refs.heartBeatRuleForm.validate((valid) => {
-        if (valid) {
-          var params = {
-            act: "set-hb",
-            hb: this.heartBeatform.heart,
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          this.heartBeatVisible = false;
-        }
-      });
-    },
-    //获取升级apkList
-    getUpgradeList() {
-      getqueryUpgradesApi()
-        .then((res) => {
-          console.log(res);
-          this.upOptions = res.data;
-        })
-        .catch((err) => {});
-    },
-    selectChanged(val) {
-      console.log(val);
-      // 找到选中项的整个object对象
-      this.selectUpObj = this.upOptions.find((item) => {
-        return item["path"] === val;
-      });
-      console.log(this.selectUpObj);
-    },
-    //升级确定阿
-    handleupgradation() {
-      this.$refs.upgradationRuleForm.validate((valid) => {
-        if (valid) {
-          var params = {
-            act: "upgrade",
-            url: this.upgradationform.upVal,
-            md5: this.selectUpObj.md5,
-            fn: this.selectUpObj.fileName,
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          this.upgradationVisible = false;
-        }
-      });
-    },
-    //点击模板
-    handleModelForm() {
-      this.frpcform = {
-        // ip: "",
-        // port: "",
-        server_addr: "180.166.218.222",
-        server_port: 40204,
-        frpc_type: "adb",
-        type: "tcp",
-        local_ip: "127.0.0.1",
-        local_port: 5555,
-        remote_port: 40205,
-      };
-    },
-    //开启frpc
-    handleFrpc() {
-      console.log(this.$refs.frpcRuleForm);
-      this.$refs.frpcRuleForm.validate((valid) => {
-        if (valid) {
-          var params = {
-            act: "start-frpc",
-            server_addr: this.frpcform.server_addr,
-            server_port: this.frpcform.server_port,
-            local_ip: this.frpcform.local_ip,
-            local_port: this.frpcform.local_port,
-            remote_port: this.frpcform.remote_port,
-            frpc_type: this.frpcform.frpc_type,
-            type: this.frpcform.type,
-            termIds: this.idArray.join("-"),
-          };
-          this.changeIssue(params);
-          this.frpcVisible = false;
-        }
-      });
-    },
-
-    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("freecheck", this.freecheck);
-
-      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.freecheck = localStorage.getItem("freecheck")
-        ? JSON.parse(localStorage.getItem("freecheck"))
-        : false;
-
-      console.log(
-        "规约：" + this.gycheck,
-        "电池：" + this.dccheck,
-        "心跳：" + this.xtcheck,
-        "拍照：" + this.pzcheck,
-        "网络信号：" + this.wlcheck,
-        "重启次数：" + this.cqcheck,
-        "sim卡：" + this.simcheck,
-        "cma服务器：" + this.cmacheck,
-        "版本：" + this.bbcheck
-      );
-    },
-    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 {
-          return ` ${minutes} : ${seconds} `;
-        }
-      }
-    },
-  },
-};
-</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;
-      }
-    }
-    .zzMsg {
-      display: flex;
-      margin-left: auto;
-      margin-right: 48px;
-      .total {
-        margin-left: 8px;
-        //width: 100%;
-        height: 32px;
-        line-height: 32px;
-        font-size: 14px;
-        color: #333;
-        span {
-          margin-right: 12px;
-        }
-        .el-tag--info {
-          color: #333;
-        }
-      }
-      .drawBox {
-        //margin-left: auto;
-      }
-    }
-  }
-  .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;
-          }
-        }
-      }
-    }
-    .hbClass {
-      .cell {
-        cursor: pointer;
-        &:hover {
-          color: #169e8c;
-          text-decoration: underline;
-        }
-      }
-    }
-    .has-color {
-      background: #f5dab1;
-    }
-    .has-color td.el-table__cell {
-      background: #f5dab1 !important;
-    }
-
-    .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;
-    }
-  }
-}
-.contenBoxMsg {
-  p {
-    color: #333;
-    line-height: 24px;
-    font-size: 14px;
-  }
-}
-.el-select-dropdown__item {
-  i {
-    margin-left: 8px;
-    font-size: 12px;
-    font-style: normal;
-  }
-}
-</style>
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index b2360fc..1af0ba5 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -8,6 +8,21 @@
         class="demo-form-inline"
       >
         <div class="topSearch">
+          <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"
@@ -20,7 +35,7 @@
                 :label="item.name"
                 :value="item.id"
               >
-                {{ item.vname + item.name }}
+               
               </el-option>
             </el-select>
           </el-form-item>
@@ -45,13 +60,15 @@
             </el-select>
           </el-form-item>
           <el-form-item label="是否运维" class="ismntClass">
-            <el-select v-model="formdata.ismntend">
+            <el-select v-model="formdata.mntn">
               <el-option
                 v-for="item in mntendOptions"
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
-              ></el-option>
+              >
+            
+            </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="规约" class="gybox">
@@ -61,7 +78,9 @@
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
-              ></el-option>
+              >
+              {{ item.name }}-{{ item.id }}
+            </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="活动" class="activitybox">
@@ -79,10 +98,10 @@
             </el-select>
           </el-form-item>
         </div>
-        <div class="bottomSearch">
-          <el-form-item label="出厂ID" class="oidbox">
+       <div class="bottomSearch">
+           <el-form-item label="出厂ID" class="oidbox">
             <el-input
-              v-model="formdata.oidInput"
+              v-model="formdata.bsIdentifier"
               placeholder="请输入出厂ID"
               clearable
             ></el-input>
@@ -94,8 +113,8 @@
               placement="top"
             >
               <el-checkbox
-                v-model="formdata.oidCheck"
-                :checked="formdata.oidCheck == 1 ? true : false"
+                v-model="formdata.bsIdentifierExclude"
+                :checked="formdata.bsIdentifierExclude == 1 ? true : false"
                 true-label="1"
                 false-label="0"
               ></el-checkbox>
@@ -104,7 +123,7 @@
 
           <el-form-item label="装置编号" class="cmdibox">
             <el-input
-              v-model="formdata.cmdidInput"
+              v-model="formdata.cmdid"
               placeholder="请输入装置编号"
               clearable
             ></el-input>
@@ -115,8 +134,8 @@
               placement="top"
             >
               <el-checkbox
-                v-model="formdata.cmdidCheck"
-                :checked="formdata.cmdidCheck == 1 ? true : false"
+                v-model="formdata.cmdidExclude"
+                :checked="formdata.cmdidExclude == 1 ? true : false"
                 true-label="1"
                 false-label="0"
               ></el-checkbox>
@@ -125,7 +144,7 @@
 
           <el-form-item label="CMA服务器" class="cmabox">
             <el-input
-              v-model="formdata.cmaInput"
+              v-model="formdata.cma"
               placeholder="请输入CMA服务器"
               clearable
             ></el-input>
@@ -136,8 +155,8 @@
               placement="top"
             >
               <el-checkbox
-                v-model="formdata.cmaCheck"
-                :checked="formdata.cmaCheck == 1 ? true : false"
+                v-model="formdata.cmaExclude"
+                :checked="formdata.cmaExclude == 1 ? true : false"
                 true-label="1"
                 false-label="0"
               ></el-checkbox>
@@ -146,7 +165,7 @@
 
           <el-form-item label="版本" class="versionbox">
             <el-input
-              v-model="formdata.versionInput"
+              v-model="formdata.version"
               placeholder="请输入版本"
               clearable
             ></el-input>
@@ -157,8 +176,8 @@
               placement="top"
             >
               <el-checkbox
-                v-model="formdata.versionCheck"
-                :checked="formdata.versionCheck == 1 ? true : false"
+                v-model="formdata.versionExclude"
+                :checked="formdata.versionExclude == 1 ? true : false"
                 true-label="1"
                 false-label="0"
               ></el-checkbox>
@@ -168,7 +187,7 @@
             <el-button type="primary" @click="onSubmit">查询</el-button>
             <el-button type="primary" @click="onReset">重置</el-button>
           </el-form-item>
-        </div>
+        </div> 
       </el-form>
       <el-tooltip
         class="item"
@@ -203,11 +222,13 @@
 </template>
 <script>
 import {
-  getqueryLineApi,
-  getqueryTermsApi,
-  getqueryProtocolApi,
-  getqueryActivityApi,
-  getqueryCmdsApi,
+
+  cmdActlistApi,
+  getTerminalJoggle,
+  getActivityApi,
+  getProtocolList,
+  getSearchInfo,
+  exportTerminalApi
 } from "@/utils/api/index";
 import tableMain from "./components/tableMain";
 export default {
@@ -218,37 +239,41 @@ export default {
   data() {
     return {
       showDiv: true, // 控制div的显示与隐藏
-      nowTime: new Date().getTime() / 1000,
-      xlOptions: [{ id: 0, name: "全部" }], //线路数据
-      gtOptions: [{ id: 0, name: "全部" }], //杆塔数据
+    
+      dyOptions: [{ id: -1, name: "全部" }], //电压数据
+      xlOptions: [{ id: -1, name: "全部" }], //线路数据
+      gtOptions: [{ id: -1, name: "全部" }], //杆塔数据
       onlineOptions: [
         { id: -1, name: "全部" },
         { id: 1, name: "在线" },
         { id: 0, name: "离线" },
       ],
-      formdata: {
-        lineId: 0,
-        towerId: 0,
-        isonline: -1,
-        protocolId: 0,
-        activityId: 0,
-        ismntend: 1,
-        oidInput: "",
-        oidCheck: 0,
-        cmdidInput: "",
-        cmdidCheck: 0,
-        cmaInput: "",
-        cmaCheck: 0,
-        versionInput: "",
-        versionCheck: 0,
-      },
-      protocolOptions: [{ id: 0, name: "全部" }], //规约
-      activityOptions: [{ id: 0, name: "全部" }], //活动
+      protocolOptions: [{ id: -1, name: "全部" }], //规约数据
+      activityOptions: [{ id: -1, name: "全部" }], //活动
       mntendOptions: [
-        { id: 0, name: "全部" },
+        { id: -1, name: "全部" },
         { id: 1, name: "运维" },
         { id: 2, name: "未运维" },
       ], //是否运维
+      formdata: {
+        dyId:-1,
+        lineId:-1,
+        towerId:-1,
+        isonline: -1,
+        protocolId: -1,
+        mntn: 1,
+        activityId: -1,
+        bsIdentifier: "",
+        bsIdentifierExclude: 0,
+        cmdid: "",
+        cmdidExclude: 0,
+        cma: "",
+        cmaExclude: 0,
+        version: "",
+        versionExclude: 0,
+       
+      },
+      
       dataList: [],
       dataListNew: [],
       tableLoaidng: true,
@@ -262,13 +287,7 @@ export default {
     };
   },
   created() {
-    var that = this;
-    document.onkeydown = function (e) {
-      var key = window.event.keyCode;
-      if (key === 13) {
-        that.onSubmit(); // 触发事件
-      }
-    };
+    
     this.activityIdLoc =
       JSON.parse(localStorage.getItem("activeId")) !== null
         ? JSON.parse(localStorage.getItem("activeId"))
@@ -279,70 +298,143 @@ export default {
       JSON.parse(localStorage.getItem("searchParams")) !== null
         ? JSON.parse(localStorage.getItem("searchParams"))
         : {
-            lineId: 0,
-            towerId: 0,
-            isonline: -1,
-            protocolId: 0,
-            activityId: 0,
-            ismntend: 1,
-            oidInput: "",
-            oidCheck: 0,
-            cmdidInput: "",
-            cmdidCheck: 0,
-            cmaInput: "",
-            cmaCheck: 0,
-            versionInput: "",
-            versionCheck: 0,
+          dyId:-1,
+          lineId:-1,
+          towerId:-1,
+          isonline: -1,
+          protocolId: -1,
+          mntn: 1,
+          activityId: -1,
+          bsIdentifier: "",
+          bsIdentifierExclude: 0,
+          cmdid: "",
+          cmdidExclude: 0,
+          cma: "",
+          cmaExclude: 0,
+          version: "",
+          versionExclude: 0,
           };
   },
   mounted() {
-    this.getActivityList();
-    this.getLineList();
-    this.getprotocolList();
+    this.getSearchdy();
+    this.getProtocol();
+    this.getactiveList()
   },
   watch: {},
   methods: {
-    //获取linelist 线路内容
-    getLineList() {
-      getqueryLineApi()
+    //导出数据
+    exportTable(){let params = {
+        pageindex:1,
+        pagesize:10000,
+      };
+      // 根据条件添加参数
+      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.protocolId !== -1) {
+        params.protocolId = this.formdata.protocolId;
+      }
+      if (this.formdata.mntn !== -1) {
+        params.mntn = this.formdata.mntn;
+      }
+      if (this.formdata.activityId !== -1) {
+        params.activityId = this.formdata.activityId;
+      }
+      
+      if (this.formdata.bsIdentifier !== "") {
+        params.bsIdentifier = this.formdata.bsIdentifier;
+      }
+      console.log(this.formdata.bsIdentifierExclude)
+      if (this.formdata.bsIdentifierExclude !== 0) {
+        params.bsIdentifierExclude = this.formdata.bsIdentifierExclude;
+      }
+      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);
-          this.xlOptions = [{ id: 0, name: "全部", vname: "" }];
-          this.xlOptions = this.xlOptions.concat(res.data);
+          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 = this.xlOptions.concat(res.data.list);
           this.formdata.lineId = this.xlOptions[0].id;
+          this.getSearchgt();
         })
         .catch((err) => {});
     },
-    //通过线路获取杆塔
+    //获取杆塔数据
     getSearchgt() {
-      getqueryLineApi({ lineId: this.formdata.lineId })
+      getSearchInfo({ type: 3, id: this.formdata.lineId })
         .then((res) => {
-          this.gtOptions = [{ id: 0, name: "全部" }];
-          this.gtOptions = this.gtOptions.concat(res.data);
+          this.gtOptions = this.gtOptions.concat(res.data.list);
           this.formdata.towerId = this.gtOptions[0].id;
         })
         .catch((err) => {});
     },
-    //获取linelist 线路内容
-    getprotocolList() {
-      getqueryProtocolApi()
+    getProtocol() {
+      //获取规约版本
+      getProtocolList()
         .then((res) => {
           console.log(res);
-          this.protocolOptions = [{ id: 0, name: "全部" }];
-          this.protocolOptions = this.protocolOptions.concat(res.data);
-          this.formdata.protocolId = this.protocolOptions[0].id;
+          this.protocolOptions = this.protocolOptions.concat(res.data.list);
+          this.formdata.protocol = this.protocolOptions[0].id;
         })
         .catch((err) => {});
     },
     //获取活动列表
-    getActivityList() {
-      getqueryActivityApi({
-        act: "list",
-      })
+    getactiveList(){
+      getActivityApi()
         .then((res) => {
           console.log(res);
-          console.log("222222222222222");
-          this.activityOptions = [{ id: 0, name: "全部" }];
+          // this.activityOptions = this.activityOptions.concat(res.data.list);
           let activeArr = res.data.map((item) => ({
             id: item.id,
             name: item.title,
@@ -363,236 +455,117 @@ export default {
     },
     onSubmit() {
       this.tableLoaidng = true;
-      this.dataList = [];
-      console.log("我是查询", this.formdata);
       localStorage.setItem("searchParams", JSON.stringify(this.formdata));
-      let params = {
-        lineId: this.formdata.lineId,
-        towerId: this.formdata.towerId,
-        isonLine: this.formdata.isonline,
-      };
-      var nonmntnedObj = {
-        name: "mntned",
-        value: this.formdata.ismntend,
-        invertVal: "",
-      };
-      var protocolObj = {
-        name: "protocol",
-        value: this.formdata.protocolId,
-        invertVal: 0,
-      };
-      var activityObj = {
-        name: "activity",
-        value: this.formdata.activityId,
-        invertVal: 0,
-      };
-      var oidObj = {
-        name: "oid",
-        value: this.formdata.oidInput.trim(),
-        invertVal: this.formdata.oidCheck,
-      };
-      var cmdidObj = {
-        name: "cmdid",
-        value: this.formdata.cmdidInput.trim(),
-        invertVal: this.formdata.cmdidCheck,
-      };
-      var cmaObj = {
-        name: "cma",
-        value: this.formdata.cmaInput.trim(),
-        invertVal: this.formdata.cmaCheck,
-      };
-      var versionObj = {
-        name: "version",
-        value: this.formdata.versionInput.trim(),
-        invertVal: this.formdata.versionCheck,
-      };
-      let arrayOfObjects = [nonmntnedObj, protocolObj, activityObj];
-      if (oidObj.value !== "") {
-        arrayOfObjects.push(oidObj);
-      }
-      if (cmaObj.value !== "") {
-        arrayOfObjects.push(cmaObj);
-      }
-      if (cmdidObj.value !== "") {
-        arrayOfObjects.push(cmdidObj);
-      }
-      if (versionObj.value !== "") {
-        arrayOfObjects.push(versionObj);
-      }
-      console.log(arrayOfObjects);
-      for (var k = 0; k < arrayOfObjects.length; k++) {
-        params["fc"] = arrayOfObjects.length;
-        params["fn" + (k + 1)] = arrayOfObjects[k].name;
-        params["fv" + (k + 1)] = arrayOfObjects[k].value;
-        params["frev" + (k + 1)] = arrayOfObjects[k].invertVal;
-      }
-      console.log(params);
-
+      this.dataList = [];
       // 停止之前的定时器
       if (this.intervalId) {
         clearInterval(this.intervalId);
         this.intervalId = null;
       }
+      this.fetchData();
       const interval = 60000; // 60000毫秒等于一分钟
       this.intervalId = setInterval(() => {
         // 在这里执行接口请求的代码
         this.fetchData();
       }, interval);
-      getqueryTermsApi(params)
-        .then((res) => {
-          res.data = res.data.map((item) => {
-            if (!item.raw_report.pic) {
-              item.raw_report.pic = 0;
-            }
-            return item;
-          });
-
-          if (this.formdata.isonline == "-1") {
-            //全部
-            this.dataList = res.data;
-            // console.log(this.dataList)
-          } else if (this.formdata.isonline == "1") {
-            //在线
-            this.dataList = res.data.filter(
-              (item) => this.nowTime - item.last_heartbeat_ts <= 720
-            );
-          } else if (this.formdata.isonline == "0") {
-            //离线
-            this.dataList = res.data.filter(
-              (item) => this.nowTime - item.last_heartbeat_ts > 720
-            );
-          }
-          this.onlineNum = this.dataList.filter(
-            (item) => this.nowTime - item.last_heartbeat_ts <= 720
-          ).length;
-          this.offlineNum = this.dataList.length - this.onlineNum;
-          this.noPicNum = this.dataList.filter(
-            (item) =>
-              item.raw_report.pic == undefined ||
-              item.raw_report.pic == 0 ||
-              item.raw_report.pic == -1
-          ).length;
-          this.freeNum = this.dataList.filter(
-            (item) => parseInt(item.raw_report.msgs.freeROM) < 50
-          ).length;
-          console.log("我是磁盘", this.freeNum);
-          this.getCmdList();
-          this.tableLoaidng = false;
-        })
-        .catch((err) => {});
+      
     },
     fetchData() {
       let params = {
-        lineId: this.formdata.lineId,
-        towerId: this.formdata.towerId,
-        isonLine: this.formdata.isonline,
-      };
-      var nonmntnedObj = {
-        name: "mntned",
-        value: this.formdata.ismntend,
-        invertVal: "",
-      };
-      var protocolObj = {
-        name: "protocol",
-        value: this.formdata.protocolId,
-        invertVal: 0,
-      };
-      var activityObj = {
-        name: "activity",
-        value: this.formdata.activityId,
-        invertVal: 0,
+        pageindex:1,
+        pagesize:10000,
       };
-      var oidObj = {
-        name: "oid",
-        value: this.formdata.oidInput,
-        invertVal: this.formdata.oidCheck,
-      };
-      var cmdidObj = {
-        name: "cmdid",
-        value: this.formdata.cmdidInput,
-        invertVal: this.formdata.cmdidCheck,
-      };
-      var cmaObj = {
-        name: "cma",
-        value: this.formdata.cmaInput,
-        invertVal: this.formdata.cmaCheck,
-      };
-      var versionObj = {
-        name: "version",
-        value: this.formdata.versionInput,
-        invertVal: this.formdata.versionCheck,
-      };
-      let arrayOfObjects = [nonmntnedObj, protocolObj, activityObj];
-      if (oidObj.value !== "") {
-        arrayOfObjects.push(oidObj);
+      // 根据条件添加参数
+      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.protocolId !== -1) {
+        params.protocolId = this.formdata.protocolId;
+      }
+      if (this.formdata.mntn !== -1) {
+        params.mntn = this.formdata.mntn;
+      }
+      if (this.formdata.activityId !== -1) {
+        params.activityId = this.formdata.activityId;
+      }
+      
+      if (this.formdata.bsIdentifier !== "") {
+        params.bsIdentifier = this.formdata.bsIdentifier;
+      }
+      console.log(this.formdata.bsIdentifierExclude)
+      if (this.formdata.bsIdentifierExclude !== 0) {
+        params.bsIdentifierExclude = this.formdata.bsIdentifierExclude;
+      }
+      if (this.formdata.cma !== "") {
+        params.cma = this.formdata.cma;
+      }
+      if (this.formdata.cmaExclude !== 0) {
+        params.cmaExclude = this.formdata.cmaExclude;
       }
-      if (cmaObj.value !== "") {
-        arrayOfObjects.push(cmaObj);
+      if (this.formdata.cmdid !=="") {
+        params.cmdid = this.formdata.cmdid;
       }
-      if (cmdidObj.value !== "") {
-        arrayOfObjects.push(cmdidObj);
+      if (this.formdata.cmdidExclude !== 0) {
+        params.cmdidExclude = this.formdata.cmdidExclude;
       }
-      if (versionObj.value !== "") {
-        arrayOfObjects.push(versionObj);
+      if (this.formdata.version !== "") {
+        params.version = this.formdata.version;
       }
-      console.log(arrayOfObjects);
-      for (var k = 0; k < arrayOfObjects.length; k++) {
-        params["fc"] = arrayOfObjects.length;
-        params["fn" + (k + 1)] = arrayOfObjects[k].name;
-        params["fv" + (k + 1)] = arrayOfObjects[k].value;
-        params["frev" + (k + 1)] = arrayOfObjects[k].invertVal;
+      if (this.formdata.versionExclude !== 0) {
+        params.versionExclude = this.formdata.versionExclude;
       }
-      console.log(params);
-      getqueryTermsApi(params)
+      console.log(params)
+      getTerminalJoggle(params)
         .then((res) => {
-          console.log(res);
-          res.data = res.data.map((item) => {
-            if (!item.raw_report.pic) {
-              item.raw_report.pic = 0;
-            }
-            return item;
-          });
-          if (this.formdata.isonline == "-1") {
-            //全部
-            this.dataList = res.data;
-          } else if (this.formdata.isonline == "1") {
-            //在线
-
-            this.dataList = res.data.filter(
-              (item) => this.nowTime - item.last_heartbeat_ts <= 720
-            );
-          } else if (this.formdata.isonline == "0") {
-            //离线
-            this.dataList = res.data.filter(
-              (item) => this.nowTime - item.last_heartbeat_ts > 720
-            );
-          }
+          console.log(res)
+          this.dataList = res.data;
+          this.getCmdList();
           this.onlineNum = this.dataList.filter(
-            (item) => this.nowTime - item.last_heartbeat_ts <= 720
+            (item) => item.onlinestatus ==1
           ).length;
           this.offlineNum = this.dataList.length - this.onlineNum;
+          this.tableLoaidng = false;
           this.noPicNum = this.dataList.filter(
-            (item) =>
-              item.raw_report.pic == undefined ||
-              item.raw_report.pic == 0 ||
-              item.raw_report.pic == -1
+            (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) => parseInt(item.raw_report.msgs.freeROM) < 50
-          ).length;
-          console.log("我是磁盘", this.freeNum);
-          this.getCmdList();
+          
+          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() {
-      getqueryCmdsApi({ p: 1, ps: 10000 })
+      cmdActlistApi({ p: 1, ps: 10000 })
         .then((res) => {
           console.log(res);
           console.log("我是命令列表");
           console.log(this.dataList);
-          this.runCommand = res.data;
+          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" }];
 
@@ -613,30 +586,28 @@ export default {
             }
           });
           this.dataListNew = this.dataList;
-          console.log(this.dataList);
+          console.log(this.dataListNew);
         })
         .catch((err) => {});
     },
     //重置
     onReset() {
       this.formdata = {
-        lineId: 0,
-        towerId: 0,
+        dyId:-1,
+        lineId:-1,
+        towerId:-1,
         isonline: -1,
-        protocolId: 0,
-        activityId:
-          JSON.parse(localStorage.getItem("activeId")) !== null
-            ? JSON.parse(localStorage.getItem("activeId"))
-            : 0,
-        ismntend: 1,
-        oidInput: "",
-        oidCheck: 0,
-        cmdidInput: "",
-        cmdidCheck: 0,
-        cmaInput: "",
-        cmaCheck: 0,
-        versionInput: "",
-        versionCheck: 0,
+        protocolId: -1,
+        mntn: 1,
+        activityId: -1,
+        bsIdentifier: "",
+        bsIdentifierExclude: 0,
+        cmdid: "",
+        cmdidExclude: 0,
+        cma: "",
+        cmaExclude: 0,
+        version: "",
+        versionExclude: 0,
       };
 
       this.onSubmit();
@@ -689,6 +660,11 @@ export default {
           }
         }
       }
+      .dybox{
+        .el-select {
+          width: 120px;
+        }
+      }
       .ismntClass {
         .el-select {
           width: 100px;
@@ -722,6 +698,9 @@ export default {
           }
         }
       }
+      .cmdibox {
+        background: #d0ece8;
+      }
       .el-form-item__label,
       .el-checkbox {
         color: #333;
diff --git a/src/views/logList/index.vue b/src/views/logList/index.vue
index 88fbbe7..1436425 100644
--- a/src/views/logList/index.vue
+++ b/src/views/logList/index.vue
@@ -13,27 +13,28 @@
         <el-table-column type="index" width="50" label="序号">
         </el-table-column>
         <!-- <el-table-column prop="id" label="Id" width="80"> </el-table-column> -->
-        <el-table-column prop="line_name" label="线路"> </el-table-column>
-        <el-table-column prop="cmdid" label="装置编号"> </el-table-column>
-        <el-table-column label="规约" width="100">
+        <el-table-column prop="lineName" label="线路"> </el-table-column>
+        <el-table-column prop="cmdid" label="装置编号" width="160"> </el-table-column>
+        <el-table-column label="规约" width="140">
           <template slot-scope="scope">
             {{ protocolMap[scope.row.protocol] }}
           </template>
         </el-table-column>
-        <el-table-column prop="file_name" label="文件名">
+        <el-table-column prop="fileName" label="文件名">
           <template slot-scope="scope">
-            <a :href="'/dl/?id=' + scope.row.id" class="buttonText">{{
-              scope.row.file_name
-            }}</a>
+            <!-- <a :href="'http://61.169.135.146:40085/dl/' + scope.row.path" class="buttonText"></a> -->
+            <el-button type="text" @click="downFile(scope.row)" class="buttonText">{{
+              scope.row.fileName
+            }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="文件大小">
+        <el-table-column label="文件大小" width="100">
           <template slot-scope="scope">
-            {{ scope.row.file_size | changeType }}
+            {{ scope.row.fileSize | changeType }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_time" label="上传时间"> </el-table-column>
-        <el-table-column label="操作" class-name="editClass">
+        <el-table-column prop="createTime" label="上传时间" width="160"> </el-table-column>
+        <el-table-column label="操作" class-name="editClass" >
           <template slot-scope="scope">
             <el-link
               type="danger"
@@ -49,7 +50,7 @@
   </div>
 </template>
 <script>
-import { getqueryUploadsApi, updUploadApi } from "@/utils/api/index";
+import { logListApi,logDeleteApi} from "@/utils/api/index";
 export default {
   name: "log",
   components: {},
@@ -67,6 +68,8 @@ export default {
         65285: "河南全景",
         65286: "河南郑州",
         65290: "河南统一视频v2020",
+        65298:"宁夏",
+        2:"南网"
       },
     };
   },
@@ -88,7 +91,7 @@ export default {
   methods: {
     getLogList() {
       this.logLoading = true;
-      getqueryUploadsApi()
+      logListApi()
         .then((res) => {
           this.tableData = res.data;
           this.logLoading = false;
@@ -102,8 +105,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          updUploadApi({
-            act: "del",
+          logDeleteApi({
             id: row.id,
           })
             .then((res) => {
@@ -120,6 +122,24 @@ export default {
         })
         .catch(() => {});
     },
+    //下载日志文件
+    downFile(row){
+      
+      // 创建一个新的a标签元素  
+      const a = document.createElement('a');  
+      // 设置a标签的href属性为文件的URL  
+      a.href = '/dl/'+row.path;  
+      console.log(a.href)
+      // 设置文件名（可选，取决于服务器配置）  
+      a.download = row.fileName; // 你希望保存的文件名  
+
+      // 触发点击事件  
+      document.body.appendChild(a);  
+      a.click();  
+
+      // 然后移除a标签  
+      document.body.removeChild(a); 
+    }
   },
 };
 </script>
@@ -147,9 +167,9 @@ export default {
     }
     .buttonText {
       cursor: pointer;
-      color: #606266;
+      white-space: pre-wrap;
       &:hover {
-        color: #337ab7;
+       
         text-decoration: underline;
       }
     }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3087652..254c2c4 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -39,7 +39,9 @@
 </template>
 <script>
 import { loginJoggle } from "@/utils/api/index";
+import { mapMutations } from "vuex";
 export default {
+  name: "login",
   components: {},
   data: function () {
     return {
@@ -59,47 +61,21 @@ export default {
       token: "",
     };
   },
-  computed: {},
+  computed: {
+    ...mapMutations(["SET_TOKEN", "SET_USERINFO"]),
+  },
   methods: {
     submitForm() {
       this.$refs.loginForm.validate((valid) => {
         if (valid) {
           console.log(this.userInfo);
-          // if (
-          //   (this.userInfo.userName == "admin" &&
-          //     this.userInfo.password == "shxy123456") ||
-          //   (this.userInfo.userName == "cacuser" &&
-          //     this.userInfo.password == "cac123456")
-          // ) {
-          //   localStorage.setItem("token", "13747c96ff9f434cb09ecf78e4b9a8bc");
-          //   this.$message({
-          //     duration: 1500,
-          //     showClose: true,
-          //     message: "登录成功",
-          //     type: "success",
-          //   });
-          //   this.$router.push("/");
-          //   return;
-          // } else {
-          //   this.$message({
-          //     duration: 1500,
-          //     showClose: true,
-          //     message: "账号密码错误，请重新输入！",
-          //     type: "warning",
-          //   });
-          //   return;
-          // }
           //注释
           loginJoggle(this.userInfo)
             .then((res) => {
-              if (res.res == 1) {
-                // this.$store.commit("SET_TOKEN", res.data.sessionId); //将token保存在vuex中
-                // this.$store.commit("SET_USERINFO", res.data); //将用户信息保存在vuex中
-                localStorage.setItem(
-                  "token",
-                  "13747c96ff9f434cb09ecf78e4b9a8bc"
-                );
+              if (res.code == 200) {
                 console.log(res.data);
+                this.$store.commit("SET_TOKEN", res.data.token); //将token保存在vuex中
+                this.$store.commit("SET_USERINFO", res.data); //将用户信息保存在vuex中
                 this.$router.push("/");
                 this.$message({
                   duration: 1500,
diff --git a/src/views/report/index.vue b/src/views/report/index.vue
index 1357dd7..21ed943 100644
--- a/src/views/report/index.vue
+++ b/src/views/report/index.vue
@@ -11,9 +11,9 @@
           >
             <el-option
               v-for="item in operateOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+              :key="item.key"
+              :label="item.desc"
+              :value="item.key"
             ></el-option>
           </el-select>
           <el-input
@@ -36,10 +36,12 @@
             @click="deleteml"
           ></el-button>
         </div>
+        <div class="mlbpox" v-loading="leftComLoading">
         <div
           class="commandList"
-          v-loading="leftComLoading"
+         
           v-if="leftCommand.length != 0"
+         
         >
           <p
             class="comLi"
@@ -50,11 +52,11 @@
             <span class="indexClass">{{ index + 1 }}</span>
             <span class="comMsg"
               ><b>时间：{{ item.createTime }}</b>
-              <b>设备ID：{{ item.cmdid }}</b>
-              <b v-if="item.cmd.fileName">apk版本：{{ item.cmd.fileName }}</b>
-              <b v-if="item.cmdDesc == ''">命令：{{ cmdCn[item.cmdName] }}</b
-              ><b v-else>命令：{{ item.cmdDesc }}</b>
-
+              <b v-if="item.terminal && item.terminal.cmdid">设备ID：{{ item.terminal.cmdid }}</b>
+              <b v-if="item.cmdMap &&item.cmdMap.fileName">apk版本：{{ item.cmdMap.fileName }}</b>
+              <b>命令：{{ cmdCn[item.name] }}</b
+              >
+             
               <b v-if="item.estimatedPublishTime * 1000 - newupdatatime > 0"
                 >命令预计拿走时间：
 
@@ -72,6 +74,7 @@
           <p>暂无下发命令</p>
         </div>
       </div>
+      </div>
       <div class="commandRunRight commandClass">
         <div class="headTitle">
           <span class="title">已下发终端</span>
@@ -82,9 +85,9 @@
           >
             <el-option
               v-for="item in operateOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+              :key="item.key"
+              :label="item.desc"
+              :value="item.key"
             ></el-option>
           </el-select>
           <el-input
@@ -107,7 +110,8 @@
             @click="deletehis"
           ></el-button>
         </div>
-        <div class="commandList" v-if="rightCommand.length != 0">
+        <div class="mlbpox" v-loading="rightComLoading">
+        <div class="commandList" v-if="rightCommand.length != 0" >
           <p class="comLi" v-for="(item, index) in rightCommand" :key="index">
             <el-tooltip
               class="item"
@@ -122,13 +126,12 @@
                 >{{ index + 1 }}</span
               >
             </el-tooltip>
-
-            <span class="comMsg"
+            <span class="comMsg" 
               ><b>下发时间：{{ item.publishTime }}</b>
-              <b>设备ID：{{ item.cmdid }}</b>
-              <b>命令：{{ cmdCn[item.cmdName] }}</b>
-              <b v-if="item.cmd.fileName">apk版本：{{ item.cmd.fileName }}</b>
-              <b v-else>cmd：{{ item.cmd }}</b>
+              <b v-if="item.terminal && item.terminal.cmdid">设备ID：{{ item.terminal.cmdid }}</b>
+              <b>命令：{{ cmdCn[item.name] }}</b>
+              <b v-if="item.cmdMap &&item.cmdMap.fileName">apk版本：{{ item.cmdMap.fileName }}</b>
+              <b v-else>cmd：{{ item.cmdMap }}</b>
             </span>
           </p>
         </div>
@@ -136,6 +139,7 @@
           <p>暂无已下发命令</p>
         </div>
       </div>
+      </div>
     </div>
     <el-dialog
       class="MsgDialog"
@@ -146,9 +150,9 @@
     >
       <div class="cmdMain">
         <!-- {{ deveceMsg }} -->
-        <p>设备ID:{{ deveceMsg.cmdid }}</p>
+        <p>设备ID:{{ devCmdid }}</p>
         <p>操作时间：{{ deveceMsg.createTime }}</p>
-        <p>待执行操作：{{ deveceMsg.cmdName }}</p>
+        <p>待执行操作：{{cmdCn[deveceMsg.name]}}  {{ deveceMsg.name }}</p>
         <p>cmd：{{ deveceMsg.cmd }}</p>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -158,19 +162,21 @@
   </div>
 </template>
 <script>
-import { getdoActionApi, getqueryCmdsApi } from "@/utils/api/index";
+import { cmdSendApi,getCmdActionApi,cmdActlistApi,cmdActHislistApi } from "@/utils/api/index";
 export default {
   name: "report",
   components: {},
   data() {
     return {
       leftComLoading: false, //左侧loading
-      runCommand: [],
-      endCommand: [],
+      rightComLoading:false,//右侧loiading
+      // runCommand: [],
+      // endCommand: [],
       leftCommand: [],
       rightCommand: [],
       commandShow: false,
-      deveceMsg: "",
+      deveceMsg: {},
+      devCmdid:'',
       cmdCn: {
         yw_cmd_android_reboot: "重启设备",
         yw_cmd_mcu_reboot: "MCU单片机重启",
@@ -179,7 +185,7 @@ export default {
         i1_cmd_set_i1_heart_beat_time: "设置心跳周期",
         yw_cmd_upload_i1_zip_log: "上传日志",
         upgrade: "升级",
-        updOta: "Ota升级",
+        yw_upd_ota: "Ota升级",
         yw_cmd_start_frpc: "开启frpc",
         yw_cmd_stop_frpc: "停止frpc",
         i1_cmd_stop_aging_test: "停止老化测试",
@@ -190,21 +196,10 @@ export default {
       newupdatatime: null,
       //运维操作列表
       operateOptions: [
-        { id: 0, name: "全部" },
-        { id: 1, name: "重启设备" },
-        { id: 2, name: "MCU单片机重启" },
-        { id: 3, name: "设置I1服务器" },
-        // { id: 4, name: "设置运维服务器" },
-        { id: 5, name: "设置心跳周期" },
-        { id: 6, name: "上传日志" },
-        { id: 7, name: "升级" },
-        { id: 11, name: "OTA升级" },
-        { id: 8, name: "开启frpc" },
-        { id: 9, name: "停止frpc" },
-        { id: 10, name: "停止老化测试" },
+        {id: 0, key: "all", desc: "全部"}
       ],
-      operateL: 0,
-      operateR: 0,
+      operateL: 'all',
+      operateR: 'all',
       leftcmdVal: "",
       rightcmdVal: "",
       intervalId: null, // 用于存储setInterval返回的ID
@@ -218,10 +213,20 @@ export default {
   mounted() {
     this.getCmdList();
     this.getEndList();
+    this.getCmdOptionsFun()
     this.startCountdown(); // 在组件挂载后开始倒计时
   },
 
   methods: {
+    getCmdOptionsFun(){
+      getCmdActionApi()
+          .then((res) => {
+            console.log(res);
+            this.operateOptions = this.operateOptions.concat(res.data);
+           // this.operateL = this.operateOptions[0].desc;
+          })
+          .catch((err) => {});
+    },
     startCountdown() {
       this.newupdatatime = new Date().getTime(); // 更新当前时间
       // 清空之前可能存在的定时器
@@ -254,13 +259,26 @@ export default {
       }
     },
     getCmdList() {
-      //this.leftComLoading = true;
-      getqueryCmdsApi({ p: 1, ps: 10000 })
+      this.leftComLoading = true;
+      let params = {
+        pageNum:1,
+        pageSize:300,
+      };
+      console.log(this.operateL)
+      // 根据条件添加参数
+      if (this.operateL!=='all') {
+        params.action = this.operateL;
+      }
+      if (this.leftcmdVal !== "") {
+        params.cmdid = this.leftcmdVal;
+      }
+      cmdActlistApi(params)
         .then((res) => {
           console.log(res);
-          this.runCommand = res.data;
+           //this.runCommand = res.data.list;
+          this.leftCommand = res.data.list;
           this.leftComLoading = false;
-          this.selectLeftChanged(this.operateL);
+          
           this.updateTime = new Date();
         })
         .catch((err) => {});
@@ -270,11 +288,56 @@ export default {
       this.commandShow = true;
       console.log(this.commandShow);
       this.deveceMsg = val;
+      this.devCmdid = val.terminal.cmdid
+    },
+   
+    //获取已取走列表
+    getEndList() {
+      this.rightComLoading = true;
+      let params = {
+        pageNum:1,
+        pageSize:300,
+      };
+      // 根据条件添加参数
+      if (this.operateR!== 'all') {
+        params.action = this.operateR;
+      }
+      if (this.rightcmdVal!== "") {
+        params.cmdid = this.rightcmdVal;
+      }
+      cmdActHislistApi(params)
+        .then((res) => {
+          console.log(res);
+          //this.endCommand = res.data;
+           //this.endCommand = res.data.list
+          this.rightCommand = res.data.list;
+          
+          this.rightComLoading = false;
+          this.updateTime = new Date();
+        })
+        .catch((err) => {});
+    },
+    //左侧筛选
+    selectLeftChanged() {
+      this.getCmdList()
+    },
+    leftInputChange() {
+      console.log(this.leftcmdVal);
+      this.getCmdList()
+    },
+
+    //右侧筛选
+    selectRightChanged() {
+      this.getEndList()
+    },
+    rightInputChange() {
+      this.getEndList()
     },
-    //取消操作
-    handleCancel(val) {
-      getdoActionApi({
-        act: "cancel",
+     //取消操作
+     handleCancel(val) {
+      console.log(val)
+      cmdSendApi({
+        action: "cancel",
         id: val,
       })
         .then((res) => {
@@ -303,166 +366,9 @@ export default {
         .catch((err) => {});
     },
 
-    //获取已取走列表
-    getEndList() {
-      getqueryCmdsApi({ qt: "his", p: 1, ps: 10000 })
-        .then((res) => {
-          console.log(res);
-          //this.endCommand = res.data;
-          this.endCommand = res.data.filter((item) => item.status == "1");
-          this.selectRightChanged(this.operateR);
-          // this.leftComLoading = false;
-          this.updateTime = new Date();
-        })
-        .catch((err) => {});
-    },
-    //左侧筛选
-    selectLeftChanged(val) {
-      console.log(val);
-      switch (val) {
-        case 0:
-          this.leftCommand = this.runCommand;
-          return;
-        case 1:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "yw_cmd_android_reboot"
-          );
-          return;
-        case 2:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "yw_cmd_mcu_reboot"
-          );
-          return;
-        case 3:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "i1_cmd_set_i1_server_ip_port"
-          );
-          return;
-        case 4:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "i1_cmd_set_xy_yw_ip_port"
-          );
-          return;
-        case 5:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "i1_cmd_set_i1_heart_beat_time"
-          );
-          return;
-        case 6:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "yw_cmd_upload_i1_zip_log"
-          );
-          return;
-        case 7:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "upgrade"
-          );
-          return;
-        case 8:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "yw_cmd_start_frpc"
-          );
-          return;
-        case 9:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "yw_cmd_stop_frpc"
-          );
-          return;
-        case 10:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "i1_cmd_stop_aging_test"
-          );
-          return;
-          case 11:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "updOta"
-          );
-          return;
-      }
-    },
-    leftInputChange() {
-      console.log(this.leftcmdVal);
-      this.leftCommand = this.runCommand.filter((item) =>
-        item.cmdid.includes(this.leftcmdVal)
-      );
-    },
-
-    //右侧筛选
-    selectRightChanged(val) {
-      console.log(val);
-      switch (val) {
-        case 0:
-          this.rightCommand = this.endCommand;
-          console.log(this.rightCommand);
-          return;
-        case 1:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "yw_cmd_android_reboot"
-          );
-          console.log(this.rightCommand);
-          return;
-        case 2:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "yw_cmd_mcu_reboot"
-          );
-          return;
-        case 3:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "i1_cmd_set_i1_server_ip_port"
-          );
-          return;
-        case 4:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "i1_cmd_set_xy_yw_ip_port"
-          );
-          return;
-        case 5:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "i1_cmd_set_i1_heart_beat_time"
-          );
-          return;
-        case 6:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "yw_cmd_upload_i1_zip_log"
-          );
-          return;
-        case 7:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "upgrade"
-          );
-          return;
-        case 8:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "yw_cmd_start_frpc"
-          );
-          return;
-        case 9:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "yw_cmd_stop_frpc"
-          );
-          return;
-        case 10:
-          this.rightCommand = this.endCommand.filter(
-            (item) => item.cmdName == "i1_cmd_stop_aging_test"
-          );
-          return;
-          case 11:
-          this.leftCommand = this.runCommand.filter(
-            (item) => item.cmdName == "updOta"
-          );
-          return;
-      }
-    },
-    rightInputChange() {
-      console.log(this.rightcmdVal);
-      this.rightCommand = this.endCommand.filter((item) =>
-        item.cmdid.includes(this.rightcmdVal)
-      );
-    },
-
     deleteml() {
-      getdoActionApi({
-        act: "clear",
+      cmdSendApi({
+        action: "clear",
       })
         .then((res) => {
           console.log(res);
@@ -490,8 +396,8 @@ export default {
         .catch((err) => {});
     },
     deletehis() {
-      getdoActionApi({
-        act: "clearHis",
+      cmdSendApi({
+        action: "clearHis",
       })
         .then((res) => {
           console.log(res);
@@ -536,7 +442,7 @@ export default {
   padding: 12px;
   .commandBox {
     display: flex;
-    height: 100%;
+    height: calc(100% - 18px);
     .commandClass {
       width: 50%;
       padding: 12px;
@@ -573,9 +479,12 @@ export default {
           padding: 4px;
         }
       }
+      .mlbpox{
+        height: calc(100% - 40px);
+      }
       .commandList {
         width: 100%;
-        height: calc(100% - 32px);
+        height: calc(100% - 0px);
         //background: #fcc;
         overflow: auto;
         p {
diff --git a/src/views/upgradation/index.vue b/src/views/upgradation/index.vue
index 2732da9..a785880 100644
--- a/src/views/upgradation/index.vue
+++ b/src/views/upgradation/index.vue
@@ -1,19 +1,29 @@
 <template>
   <div class="upgradationBox">
     <div class="uploadForm">
+      <div class="noteBox">
+        <h3 class="lableBox">文件类型：</h3>
+        <el-select v-model="reportData.type" placeholder="请选择">
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
       <div class="upgradeBox">
         <h3 class="lableBox">文件上传：</h3>
         <el-upload
           class="upload-demo"
           ref="upload"
-          action="/web/api/uploadFile.php"
+          action="#"
+          :before-upload="beforeUpload"
+          :http-request="customUpload"
           :limit="1"
           :file-list="fileList"
           :data="reportData"
-          :on-progress="handleProgress"
           :auto-upload="false"
-          :on-success="handleAvatarSuccess"
-          @before-upload="beforeAvatarUpload"
         >
           <el-button slot="trigger" size="small" type="primary"
             >选取文件</el-button
@@ -35,6 +45,7 @@
           >上传到服务器</el-button
         >
       </div>
+      
     </div>
     <div class="uploadPressMask" v-if="progressLoading">
       <div class="centerClass">
@@ -60,8 +71,6 @@
         <el-table-column prop="fileName" label="文件名称">
           <template slot-scope="scope">
             <span
-              @dblclick="handleDblClick(scope.row.path)"
-              style="cursor: pointer"
             >
               {{ scope.row.fileName }}</span
             >
@@ -70,18 +79,14 @@
         <el-table-column prop="path" label="文件路径">
           <template slot-scope="scope">
             <span
-              @dblclick="handleDblClick(scope.row.path)"
-              style="cursor: pointer"
+              @click="handleClick(scope.row)"
+              class="buttonText"
+              
             >
               {{ scope.row.path }}</span
             >
           </template>
         </el-table-column>
-        <el-table-column prop="fileSize" label="文件大小"> 
-          <template slot-scope="scope">
-            {{ scope.row.fileSize | changeType }}
-          </template>
-        </el-table-column>
         <el-table-column prop="title" label="备注"> </el-table-column>
         <!-- <el-table-column prop="path" label="文件路径"> </el-table-column> -->
         <el-table-column label="操作" width="300" class-name="editClass">
@@ -130,13 +135,14 @@
 </template>
 <script>
 import {
-  postuploadFileApi,
-  getqueryUpgradesApi,
-  getupdUpgradeApi,
+  upgradeListApi,
+  upgradeUpLoadApi,
+  upgradeDeleteApi,
+  upgradeTitleApi
 } from "@/utils/api/index";
 
 export default {
-  name: "upgradation",
+  name: "deviceUpgrade",
   components: {},
   data() {
     return {
@@ -144,8 +150,15 @@ export default {
       fileList: [],
       reportData: {
         title: "",
-        upgradeType:0,
+        type:0,
       },
+      typeOptions:[{
+          value: 0,
+          label: 'APK'
+        }, {
+          value:1,
+          label:'OTA'
+        }],
       fileData: [], //数据列表
       fileloading: false,
       editShow: false,
@@ -163,37 +176,26 @@ export default {
       progressLoading: false,
     };
   },
-  filters: {
-    changeType(val) {
-      if (val == "0") return "0B";
-      var k = 1024;
-      var sizes = ["B", "KB", "MB", "GB", "TB"];
-
-      let i = Math.floor(Math.log(val) / Math.log(k)); //得出该数字的单位应该是kB?MB
-      return (val / Math.pow(k, i)).toPrecision(3) + "" + sizes[i];
-    },
-  },
   computed: {},
   mounted() {
     this.getUpgradeList();
   },
   methods: {
     //双击选中复制
-    handleDblClick(val) {
-      // alert(val);
-      var input = document.createElement("input"); // 创建input对象
-      input.value = val; // 设置复制内容
-      document.body.appendChild(input); // 添加临时实例
-      input.select(); // 选择实例内容
-      document.execCommand("Copy"); // 执行复制
-      document.body.removeChild(input); // 删除临时实例
-      //this.$message.success("复制成功！");
-      this.$message({
-        duration: 1500,
-        showClose: true,
-        message: "复制成功！" + val,
-        type: "success",
-      });
+    handleClick(row) {
+      console.log(row)
+     // 创建一个新的a标签元素  
+     const a = document.createElement('a');  
+      // 设置a标签的href属性为文件的URL  
+      a.href = '/apk/'+row.path;  
+      console.log(a.href)
+      // 设置文件名（可选，取决于服务器配置）  
+      a.download = row.fileName; // 你希望保存的文件名  
+      // 触发点击事件  
+      document.body.appendChild(a);  
+      a.click();  
+      // 然后移除a标签  
+      document.body.removeChild(a); 
     },
     //上传进度
     handleProgress(event, file, fileList) {
@@ -204,57 +206,101 @@ export default {
       } else {
         this.progress = Math.round(event.percent);
       }
-
       // 显示上传进度
       console.log(this.progress); // 或者你可以使用其他方式来显示进度，比如使用进度条组件等。
     },
-    //点击升级确定
-    beforeAvatarUpload(file) {
-      console.log(this.reportData.title);
-      console.log(this.reportData.title);
-      console.log(file);
+    beforeUpload(file) {
+      const fileName = file.name;
+      console.log(fileName);
+      if (fileName.toLowerCase().includes('apk')) {
+        this.reportData.type=0
+      }
+      if (fileName.toLowerCase().includes('zip')) {
+        this.reportData.type=1
+      }
+      if (fileName.length > 19) {
+        this.$message.error("文件名长度不能超过 19 个字符！");
+        return false; // 阻止文件自动上传
+      }
+      return true; // 允许文件继续上传
     },
+   
     //上传apk
     submitUpload() {
       //console.log();
       this.$refs.upload.submit();
     },
-    handleAvatarSuccess(res, file) {
-      this.progressLoading = false;
-      console.log(res);
-      this.$message({
-        duration: 1500,
-        showClose: true,
-        message: "文件上传成功",
-        type: "success",
-      });
-      this.reportData.title = "";
-      this.$refs.upload.clearFiles();
-      this.getUpgradeList();
+    customUpload(options) {
+      console.log(options);
+      const formData = new FormData();
+      formData.append("file", options.file);
+      formData.append("title", this.reportData.title); // 假设后端需要这个字段
+      formData.append("type", this.reportData.type); // 假设后端需要这个字段
+      console.log(formData);
+      upgradeUpLoadApi(formData, (progressEvent) => {
+        // 计算上传进度百分比
+        const percentCompleted = Math.round(
+          (progressEvent.loaded * 100) / progressEvent.total
+        );
+        this.progressLoading = true;
+        // 更新UI或执行其他逻辑，比如显示进度条
+        console.log(`上传进度: ${percentCompleted}%`);
+        this.progress = Math.round(percentCompleted);
+        // 你可以通过其他方式将进度信息传递给组件或Vue实例
+        // this.uploadProgress = percentCompleted; // 假设你有一个data属性来存储进度
+      })
+        .then((res) => {
+          console.log(res);
+          // this.progressLoading = true;
+          if (res.code == 200) {
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: "文件上传成功",
+              type: "success",
+            });
+            this.reportData.title = "";
+            this.$refs.upload.clearFiles();
+            this.getUpgradeList();
+            this.progressLoading = false;
+          } else {
+           
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: res.msg,
+              type: "error",
+            });
+            this.progressLoading = false;
+            this.reportData.title = "";
+            this.$refs.upload.clearFiles();
+          }
+        })
+        .catch((error) => {});
     },
+    
     getUpgradeList() {
       this.fileloading = true;
-      getqueryUpgradesApi()
+      upgradeListApi()
         .then((res) => {
           console.log(res);
-          this.fileData = res.data.filter(item => item.type === "0");
+          this.fileData = res.data;
           this.fileloading = false;
         })
         .catch((err) => {});
     },
     handleDeleteClick(row) {
-      getupdUpgradeApi({
-        act: "del",
-        id: row.id,
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-        .then((res) => {
-          console.log(res);
-          this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
+        .then(() => {
+          upgradeDeleteApi({
+            id: row.id,
           })
-            .then(() => {
+            .then((res) => {
+              console.log(res);
               this.$message({
                 duration: 1500,
                 showClose: true,
@@ -265,7 +311,7 @@ export default {
             })
             .catch(() => {});
         })
-        .catch((err) => {});
+        .catch(() => {});
     },
     handleEditClick(row) {
       console.log(row);
@@ -277,8 +323,7 @@ export default {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           console.log(this.ruleForm.notesNewVal);
-          getupdUpgradeApi({
-            act: "edt",
+          upgradeTitleApi({
             id: this.rowData.id,
             title: this.ruleForm.notesNewVal,
           })
@@ -308,6 +353,7 @@ export default {
   height: calc(100% - 24px);
   width: calc(100% - 24px);
   padding: 12px;
+  
   .upgradeBox {
     height: 32px;
     line-height: 32px;
@@ -368,9 +414,15 @@ export default {
   .uploadBtn {
     margin-left: 12px;
   }
+  .uploadForm {
+    .el-button--default,
+    .el-button--primary {
+      width: auto;
+    }
+  }
   .uploadList {
     margin-top: 20px;
-    height: calc(100% - 100px);
+    height: calc(100% - 148px);
     .el-table {
       .el-table__cell {
         text-align: center;
@@ -401,6 +453,17 @@ export default {
       height: 100%;
     }
   }
+
+  .el-table::before {
+    height: 1px !important;
+  }
+  .buttonText{
+    color:#169e8c;
+    cursor: pointer;
+    &:hover {
+       text-decoration: underline;
+     }
+  }
 }
 .el-dialog__headerbtn {
   top: 18px;
diff --git a/src/views/upgradationOta/index.vue b/src/views/upgradationOta/index.vue
deleted file mode 100644
index ce82335..0000000
--- a/src/views/upgradationOta/index.vue
+++ /dev/null
@@ -1,413 +0,0 @@
-<template>
-  <div class="upgradationOta">
-    <div class="uploadForm">
-      <div class="upgradeBox">
-        <h3 class="lableBox">文件上传：</h3>
-        <el-upload
-          class="upload-demo"
-          ref="upload"
-          action="/web/api/uploadFile.php"
-          :limit="1"
-          :file-list="fileList"
-          :data="reportData"
-          :on-progress="handleProgress"
-          :auto-upload="false"
-          :on-success="handleAvatarSuccess"
-          @before-upload="beforeAvatarUpload"
-        >
-          <el-button slot="trigger" size="small" type="primary"
-            >选取文件</el-button
-          >
-        </el-upload>
-      </div>
-      <div class="noteBox">
-        <h3 class="lableBox">文件备注：</h3>
-        <el-input
-          class="noteClass"
-          v-model="reportData.title"
-          placeholder="输入备注"
-        ></el-input>
-        <el-button
-          class="uploadBtn"
-          size="small"
-          type="primary"
-          @click="submitUpload"
-          >上传到服务器</el-button
-        >
-      </div>
-    </div>
-    <div class="uploadPressMask" v-if="progressLoading">
-      <div class="centerClass">
-        <el-progress type="circle" :percentage="progress"></el-progress>
-      </div>
-    </div>
-    <div class="uploadList">
-      <el-table
-        :data="fileData"
-        style="width: 100%"
-        border
-        stripe
-        height="calc(100% - 0px)"
-        v-loading="fileloading"
-      >
-        <el-table-column type="index" width="50" label="序号">
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          width="180"
-        ></el-table-column>
-        <el-table-column prop="fileName" label="文件名称">
-          <template slot-scope="scope">
-            <span
-              @dblclick="handleDblClick(scope.row.path)"
-              style="cursor: pointer"
-            >
-              {{ scope.row.fileName }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column prop="path" label="文件路径">
-          <template slot-scope="scope">
-            <span
-              @dblclick="handleDblClick(scope.row.path)"
-              style="cursor: pointer"
-            >
-              {{ scope.row.path }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column prop="fileSize" label="文件大小"> 
-          <template slot-scope="scope">
-            {{ scope.row.fileSize | changeType }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="title" label="备注"> </el-table-column>
-        <!-- <el-table-column prop="path" label="文件路径"> </el-table-column> -->
-        <el-table-column label="操作" width="300" class-name="editClass">
-          <template slot-scope="scope">
-            <el-link
-              type="primary"
-              @click="handleEditClick(scope.row)"
-              size="small"
-              icon="el-icon-edit"
-              >修改</el-link
-            >
-            <el-link
-              type="danger"
-              @click="handleDeleteClick(scope.row)"
-              size="small"
-              icon="el-icon-delete"
-              >删除</el-link
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <el-dialog
-      class="titleDialog"
-      title="修改备注"
-      :visible.sync="titleShow"
-      :close-on-click-modal="false"
-      width="480px"
-    >
-      <el-form
-        :model="ruleForm"
-        :rules="rules"
-        ref="ruleForm"
-        label-width="100px"
-        class="demo-ruleForm"
-      >
-        <el-form-item label="文件备注" prop="notesNewVal">
-          <el-input v-model="ruleForm.notesNewVal"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="confirmClick">确认</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import {
-  postuploadFileApi,
-  getqueryUpgradesApi,
-  getupdUpgradeApi,
-} from "@/utils/api/index";
-
-export default {
-  name: "upgradationOta",
-  components: {},
-  data() {
-    return {
-      //上传apk notesVal
-      fileList: [],
-      reportData: {
-        title: "",
-        upgradeType:1,
-      },
-      fileData: [], //数据列表
-      fileloading: false,
-      editShow: false,
-      titleShow: false,
-      ruleForm: {
-        notesNewVal: "",
-      },
-      rules: {
-        notesNewVal: [
-          { required: true, message: "请输入备注信息", trigger: "blur" },
-        ],
-      },
-      rowData: "", //选中数据
-      progress: 0,
-      progressLoading: false,
-    };
-  },
-  filters: {
-    changeType(val) {
-      if (val == "0") return "0B";
-      var k = 1024;
-      var sizes = ["B", "KB", "MB", "GB", "TB"];
-
-      let i = Math.floor(Math.log(val) / Math.log(k)); //得出该数字的单位应该是kB?MB
-      return (val / Math.pow(k, i)).toPrecision(3) + "" + sizes[i];
-    },
-  },
-  computed: {},
-  mounted() {
-    this.getUpgradeList();
-  },
-  methods: {
-    //双击选中复制
-    handleDblClick(val) {
-      // alert(val);
-      var input = document.createElement("input"); // 创建input对象
-      input.value = val; // 设置复制内容
-      document.body.appendChild(input); // 添加临时实例
-      input.select(); // 选择实例内容
-      document.execCommand("Copy"); // 执行复制
-      document.body.removeChild(input); // 删除临时实例
-      //this.$message.success("复制成功！");
-      this.$message({
-        duration: 1500,
-        showClose: true,
-        message: "复制成功！" + val,
-        type: "success",
-      });
-    },
-    //上传进度
-    handleProgress(event, file, fileList) {
-      this.progressLoading = true;
-      // 获取上传进度百分比
-      if (event.percent == 100) {
-        this.progress = 98;
-      } else {
-        this.progress = Math.round(event.percent);
-      }
-
-      // 显示上传进度
-      console.log(this.progress); // 或者你可以使用其他方式来显示进度，比如使用进度条组件等。
-    },
-    //点击升级确定
-    beforeAvatarUpload(file) {
-      console.log(this.reportData.title);
-      console.log(file);
-    },
-    //上传apk
-    submitUpload() {
-      //console.log();
-      this.$refs.upload.submit();
-    },
-    handleAvatarSuccess(res, file) {
-      this.progressLoading = false;
-      console.log(res);
-      this.$message({
-        duration: 1500,
-        showClose: true,
-        message: "文件上传成功",
-        type: "success",
-      });
-      this.reportData.title = "";
-      this.$refs.upload.clearFiles();
-      this.getUpgradeList();
-    },
-    getUpgradeList() {
-      this.fileloading = true;
-      getqueryUpgradesApi()
-        .then((res) => {
-          console.log(res);
-          this.fileData = res.data.filter(item => item.type === "1");
-          this.fileloading = false;
-        })
-        .catch((err) => {});
-    },
-    handleDeleteClick(row) {
-      getupdUpgradeApi({
-        act: "del",
-        id: row.id,
-      })
-        .then((res) => {
-          console.log(res);
-          this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.$message({
-                duration: 1500,
-                showClose: true,
-                message: "文件删除成功",
-                type: "success",
-              });
-              this.getUpgradeList();
-            })
-            .catch(() => {});
-        })
-        .catch((err) => {});
-    },
-    handleEditClick(row) {
-      console.log(row);
-      this.titleShow = true;
-      this.ruleForm.notesNewVal = row.title;
-      this.rowData = row;
-    },
-    confirmClick() {
-      this.$refs.ruleForm.validate((valid) => {
-        if (valid) {
-          console.log(this.ruleForm.notesNewVal);
-          getupdUpgradeApi({
-            act: "edt",
-            id: this.rowData.id,
-            title: this.ruleForm.notesNewVal,
-          })
-            .then((res) => {
-              console.log(res);
-              this.$message({
-                duration: 1500,
-                showClose: true,
-                message: "修改备注成功",
-                type: "success",
-              });
-              this.titleShow = false;
-              this.getUpgradeList();
-            })
-            .catch((err) => {});
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-  },
-};
-</script>
-<style lang="less">
-.upgradationOta {
-  height: calc(100% - 24px);
-  width: calc(100% - 24px);
-  padding: 12px;
-  .upgradeBox {
-    height: 32px;
-    line-height: 32px;
-    display: flex;
-    margin-bottom: 16px;
-    // align-items: center;
-    // flex-direction: column;
-    .lableBox {
-      font-size: 14px;
-      font-weight: normal;
-      width: 78px;
-    }
-
-    .upload-demo {
-      position: relative;
-      display: flex;
-      flex-direction: row-reverse;
-      margin-right: 32px;
-      .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;
-          }
-        }
-      }
-    }
-  }
-  .noteBox {
-    height: 32px;
-    line-height: 32px;
-    display: flex;
-    margin-bottom: 16px;
-    .noteClass {
-      width: 322px;
-    }
-    .lableBox {
-      font-size: 14px;
-      font-weight: normal;
-      width: 78px;
-    }
-  }
-  .uploadBtn {
-    margin-left: 12px;
-  }
-  .uploadList {
-    margin-top: 20px;
-    height: calc(100% - 100px);
-    .el-table {
-      .el-table__cell {
-        text-align: center;
-      }
-    }
-  }
-  .editClass {
-    .el-link.el-link--primary {
-      margin-right: 14px;
-    }
-  }
-  .uploadPressMask {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    background-color: hsla(0, 0%, 100%, 0.9);
-    margin: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 3;
-    .centerClass {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 100%;
-      height: 100%;
-    }
-  }
-}
-.el-dialog__headerbtn {
-  top: 18px;
-  .el-dialog__close {
-    font-size: 26px;
-    &:hover {
-      background: #e2e2e2;
-    }
-  }
-}
-</style>
diff --git a/src/views/userList/components/setPermission.vue b/src/views/userList/components/setPermission.vue
index 545d0b8..efd0ff7 100644
--- a/src/views/userList/components/setPermission.vue
+++ b/src/views/userList/components/setPermission.vue
@@ -43,7 +43,7 @@
 </template>
 <script>
 // import { addUserApi, updateUserApi } from "@/utils/api/index";
-import { getqueryActivityApi } from "@/utils/api/index";
+import {  } from "@/utils/api/index";
 
 export default {
   props: {},
diff --git a/vue.config.js b/vue.config.js
index 103aa27..98433bb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -16,11 +16,12 @@ module.exports = defineConfig({
   transpileDependencies: true,
   lintOnSave: false,
   devServer: {
-    port: 1234, // 端口号的配置
+    port: 8989, // 端口号的配置
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        target: "http://61.169.135.146:40101/", //
+       // target: "http://61.169.135.146:40101/", //
+        target: "http://61.169.135.146:40080/", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的