diff --git a/ALOps_sys_fe/alops-ui/src/api/device/deviceInformation.js b/ALOps_sys_fe/alops-ui/src/api/device/deviceInformation.js
index 16227644..198c5a64 100644
--- a/ALOps_sys_fe/alops-ui/src/api/device/deviceInformation.js
+++ b/ALOps_sys_fe/alops-ui/src/api/device/deviceInformation.js
@@ -1,130 +1,38 @@
 import request from '@/utils/request'
 import { parseStrEmpty } from "@/utils/ruoyi";
+const api = '/equipment/'
 
-// 查询用户列表
-export function listUser(query) {
+// 立即执行
+export function protoCollect() {
   return request({
-    url: '/system/user/list',
-    method: 'get',
-    params: query
+    url: api + 'protoCollect',
+    method: 'post'
   })
 }
-
-// 查询用户详细
-export function getUser(userId) {
-  return request({
-    url: '/system/user/' + parseStrEmpty(userId),
-    method: 'get'
-  })
-}
-
-// 新增用户
-export function addUser(data) {
+// 定时采集规则添加
+export function addTimerRule(data) {
   return request({
-    url: '/system/user',
+    url: api + 'addTimerRule',
     method: 'post',
     data: data
   })
 }
-
-// 修改用户
-export function updateUser(data) {
-  return request({
-    url: '/system/user',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除用户
-export function delUser(userId) {
-  return request({
-    url: '/system/user/' + userId,
-    method: 'delete'
-  })
-}
-
-// 用户密码重置
-export function resetUserPwd(userId, password) {
-  const data = {
-    userId,
-    password
-  }
-  return request({
-    url: '/system/user/resetPwd',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户状态修改
-export function changeUserStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
+// 查询规则
+export function queryTimerRule(data) {
   return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询用户个人信息
-export function getUserProfile() {
-  return request({
-    url: '/system/user/profile',
-    method: 'get'
-  })
-}
-
-// 修改用户个人信息
-export function updateUserProfile(data) {
-  return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
-  return request({
-    url: '/system/user/profile/updatePwd',
-    method: 'put',
+    url: api + 'queryTimerRule',
+    method: 'post',
     data: data
   })
 }
-
-// 用户头像上传
-export function uploadAvatar(data) {
+// 修改规则
+export function modifyTimerRule(data) {
   return request({
-    url: '/system/user/profile/avatar',
+    url: api + 'modifyTimerRule',
     method: 'post',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     data: data
   })
 }
 
-// 查询授权角色
-export function getAuthRole(userId) {
-  return request({
-    url: '/system/user/authRole/' + userId,
-    method: 'get'
-  })
-}
-
-// 保存授权角色
-export function updateAuthRole(data) {
-  return request({
-    url: '/system/user/authRole',
-    method: 'put',
-    params: data
-  })
-}
 
 
diff --git a/ALOps_sys_fe/alops-ui/src/api/inMonitoring/devicesState.js b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/devicesState.js
index 16227644..80023725 100644
--- a/ALOps_sys_fe/alops-ui/src/api/inMonitoring/devicesState.js
+++ b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/devicesState.js
@@ -1,5 +1,72 @@
 import request from '@/utils/request'
 import { parseStrEmpty } from "@/utils/ruoyi";
+const api = '/equipment/'
+
+// 查询多台设备列表
+export function list(query) {
+  return request({
+    url: api + 'queryByVO',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询单台设备
+export function getInfo(id) {
+  return request({
+    url: api + '/queryById/' + parseStrEmpty(id),
+    method: 'get'
+  })
+}
+
+// 查询设备历史预警
+export function historyQuery(query) {
+  return request({
+    url: '/alarm/historyQuery',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询接口信息
+export function interfaceQuery(query) {
+  return request({
+    url: '/interface/query',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增
+export function add(data) {
+  return request({
+    url: api + 'add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function update(data) {
+  return request({
+    url: api + 'modify',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function del(id) {
+  return request({
+    url: api + 'delete' + id,
+    method: 'delete'
+  })
+}
+
+
+//隔离
+
+
 
 // 查询用户列表
 export function listUser(query) {
@@ -126,5 +193,3 @@ export function updateAuthRole(data) {
     params: data
   })
 }
-
-
diff --git a/ALOps_sys_fe/alops-ui/src/views/device/deviceInformation/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/deviceInformation/index.vue
index dea501b6..b6b48861 100644
--- a/ALOps_sys_fe/alops-ui/src/views/device/deviceInformation/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/device/deviceInformation/index.vue
@@ -2,12 +2,9 @@
   <div class="app-container">
     <el-row :gutter="20">
       <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
-       
-       
         <!--用户数据-->
         <pane size="84">
           <el-col>
-
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="auto">
               <el-row>
                 <el-form-item>
@@ -62,6 +59,7 @@
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
+import { protoCollect, addTimerRule, queryTimerRule, modifyTimerRule } from "@/api/device/deviceInformation"
 import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
diff --git a/ALOps_sys_fe/alops-ui/src/views/device/deviceManufacturer/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/deviceManufacturer/index.vue
index 87f3beda..d7d18747 100644
--- a/ALOps_sys_fe/alops-ui/src/views/device/deviceManufacturer/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/device/deviceManufacturer/index.vue
@@ -81,11 +81,7 @@
           <el-input v-model="form.contactWay" placeholder="请输入手机号码" maxlength="11" />
         </el-form-item>
       </el-col>
-
-
     </el-row>
-
-  
   </el-form>
    <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/index.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/index.vue
index 03a0dfc3..6538bcd7 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/index.vue
@@ -2,8 +2,6 @@
   <div class="app-container">
     <el-row :gutter="20">
       <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
-       
-       
         <!--设备状态监控=-->
         <pane size="84">
           <el-col>