From 538ca1d9cb5e2fe5ac6bd4b5a7dc03eb43ebe986 Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Thu, 21 Aug 2025 15:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ALOps_sys_fe/alops-ui/.env.development        |   2 +-
 ALOps_sys_fe/alops-ui/.env.production         |   2 +-
 ALOps_sys_fe/alops-ui/.env.staging            |   2 +-
 ALOps_sys_fe/alops-ui/package.json            |   2 +-
 ALOps_sys_fe/alops-ui/src/api/device/files.js | 118 ++--------
 .../alops-ui/src/layout/components/Navbar.vue |  12 -
 .../alops-ui/src/views/device/files/index.vue | 215 +++++++++---------
 .../views/inMonitoring/earlyWarning/index.vue |  26 +--
 ALOps_sys_fe/alops-ui/src/views/index.vue     |   8 +-
 ALOps_sys_fe/alops-ui/vue.config.js           |   2 +-
 10 files changed, 141 insertions(+), 248 deletions(-)

diff --git a/ALOps_sys_fe/alops-ui/.env.development b/ALOps_sys_fe/alops-ui/.env.development
index b0e45d4b..fb5fbac8 100644
--- a/ALOps_sys_fe/alops-ui/.env.development
+++ b/ALOps_sys_fe/alops-ui/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 智能运维系统
+VUE_APP_TITLE = 中国烟草
 
 # 开发环境配置
 ENV = 'development'
diff --git a/ALOps_sys_fe/alops-ui/.env.production b/ALOps_sys_fe/alops-ui/.env.production
index 56677e2f..d23f04e4 100644
--- a/ALOps_sys_fe/alops-ui/.env.production
+++ b/ALOps_sys_fe/alops-ui/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 智能运维管理系统
+VUE_APP_TITLE = 中国烟草
 
 # 生产环境配置
 ENV = 'production'
diff --git a/ALOps_sys_fe/alops-ui/.env.staging b/ALOps_sys_fe/alops-ui/.env.staging
index db7c620f..f38170fe 100644
--- a/ALOps_sys_fe/alops-ui/.env.staging
+++ b/ALOps_sys_fe/alops-ui/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 智能运维系统
+VUE_APP_TITLE = 中国烟草
 
 BABEL_ENV = production
 
diff --git a/ALOps_sys_fe/alops-ui/package.json b/ALOps_sys_fe/alops-ui/package.json
index 56ba358e..7a122d05 100644
--- a/ALOps_sys_fe/alops-ui/package.json
+++ b/ALOps_sys_fe/alops-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.9.0",
-  "description": "智能运维系统",
+  "description": "中国烟草",
   "author": "若依",
   "license": "MIT",
   "scripts": {
diff --git a/ALOps_sys_fe/alops-ui/src/api/device/files.js b/ALOps_sys_fe/alops-ui/src/api/device/files.js
index 16227644..2d1afa91 100644
--- a/ALOps_sys_fe/alops-ui/src/api/device/files.js
+++ b/ALOps_sys_fe/alops-ui/src/api/device/files.js
@@ -1,130 +1,58 @@
 import request from '@/utils/request'
 import { parseStrEmpty } from "@/utils/ruoyi";
+const api = '/equipment/'
 
-// 查询用户列表
-export function listUser(query) {
+// 查询详细
+export function getDict() {
   return request({
-    url: '/system/user/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询用户详细
-export function getUser(userId) {
-  return request({
-    url: '/system/user/' + parseStrEmpty(userId),
+    url: '/sys_dict',
     method: 'get'
   })
 }
 
-// 新增用户
-export function addUser(data) {
-  return request({
-    url: '/system/user',
-    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
-  }
+// 查询列表
+export function list(query) {
   return request({
-    url: '/system/user/resetPwd',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户状态修改
-export function changeUserStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
-  return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
+    url: api + 'queryByVO',
+    method: 'get',
+    params: query
   })
 }
 
-// 查询用户个人信息
-export function getUserProfile() {
+// 查询详细
+export function getInfo(id) {
   return request({
-    url: '/system/user/profile',
+    url: api + '/queryById/' + parseStrEmpty(id),
     method: 'get'
   })
 }
 
-// 修改用户个人信息
-export function updateUserProfile(data) {
+// 新增
+export function add(data) {
   return request({
-    url: '/system/user/profile',
-    method: 'put',
+    url: api + 'add',
+    method: 'post',
     data: data
   })
 }
 
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
+// 修改
+export function update(data) {
   return request({
-    url: '/system/user/profile/updatePwd',
+    url: api + 'modify',
     method: 'put',
     data: data
   })
 }
 
-// 用户头像上传
-export function uploadAvatar(data) {
+// 删除
+export function del(id) {
   return request({
-    url: '/system/user/profile/avatar',
-    method: 'post',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    data: data
+    url: api + 'delete' + id,
+    method: 'delete'
   })
 }
 
-// 查询授权角色
-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/layout/components/Navbar.vue b/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue
index 5c31196d..cbe7284d 100644
--- a/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue
+++ b/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue
@@ -9,20 +9,8 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
diff --git a/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
index 12e56917..36adeed7 100644
--- a/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
@@ -2,14 +2,12 @@
   <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="68px">
-              <el-form-item label="设备名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入设备名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+              <el-form-item label="设备名称" prop="Name">
+                <el-input v-model="queryParams.Name" placeholder="请输入设备名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
               </el-form-item>
               <el-form-item label="安装位置" prop="phonenumber">
                 <el-input v-model="queryParams.phonenumber" placeholder="请输入安装位置" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
@@ -46,54 +44,50 @@
               <el-col :span="1.5">
                 <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['device:files:import']">导入</el-button>
               </el-col>
-              <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['device:files:export']">导出</el-button>
-              </el-col>
-              <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> -->
             </el-row>
 
-            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="设备编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-              <el-table-column label="设备名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="设备版本" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="设备类型" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="设备级别" align="center" key="phonenumber" prop="phonenumber" v-if="columns[2].visible" width="120" />
-              <el-table-column label="启用状态" align="center" key="status" v-if="columns[5].visible">
+              <el-table-column label="设备编号" align="center" key="Id" prop="Id" />
+              <el-table-column label="设备名称" align="center" key="Name" prop="Name" :show-overflow-tooltip="true" />
+              <el-table-column label="设备版本" align="center" key="Version" prop="Version" :show-overflow-tooltip="true" />
+              <el-table-column label="设备类型" align="center" key="EquType" prop="EquType" :show-overflow-tooltip="true" />
+              <el-table-column label="设备级别" align="center" prop="phonenumber" width="120" />
+              <el-table-column label="启用状态" align="center" key="status">
                 <template slot-scope="scope">
                   <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
                 </template>
               </el-table-column>
-              <el-table-column label="带外管理IP" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+              <el-table-column label="带外管理IP" align="center" key="Ip" prop="Ip" width="120" />
              
-              <el-table-column label="设备厂商" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="安装位置" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="安装时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+              <el-table-column label="设备厂商" align="center" key="Manufacture" prop="Manufacture" width="120" />
+              <el-table-column label="安装位置" align="center" key="Location" prop="Location" width="120" />
+              <el-table-column label="安装时间" align="center" prop="InstallDate" width="160">
                 <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                  <span>{{ parseTime(scope.row.InstallDate) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="设备管理员" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="预计年限" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="服役年限" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="质保时间" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="累计预警次数" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="累计维修次数" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="累计维修金额" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="设备添加人" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="添加时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+              <el-table-column label="设备管理员" align="center" prop="phonenumber" width="120" />
+              <el-table-column label="预计年限" align="center" key="LifeCycle" prop="LifeCycle" width="120" />
+              <el-table-column label="服役年限" align="center" key="ServiceTime" prop="ServiceTime" width="120" />
+              <el-table-column label="质保时间" align="center" key="warranty" prop="warranty"  width="120" />
+              <el-table-column label="累计预警次数" align="center" key="FailureFrequency" prop="FailureFrequency"  width="120" />
+              <el-table-column label="累计维修次数" align="center" key="RepairFrequency" prop="RepairFrequency"  width="120" />
+              <el-table-column label="累计维修金额" align="center" key="RepairCost" prop="RepairCost"  width="120" />
+              <el-table-column label="设备添加人" align="center" key="CreateBy" prop="CreateBy"  width="120" />
+              <el-table-column label="添加时间" align="center" prop="CreateDate" width="160">
                 <template slot-scope="scope">
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="修改人" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="修改时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+              <el-table-column label="修改人" align="center" prop="UpdateBy"  width="120" />
+              <el-table-column label="修改时间" align="center" prop="createTime" width="160">
                 <template slot-scope="scope">
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-                <template slot-scope="scope" v-if="scope.row.userId !== 1">
+                <template slot-scope="scope" v-if="scope.row.Id !== 1">
                   <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:files:edit']">修改</el-button>
                   <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['device:files:remove']">删除</el-button>
                 </template>
@@ -106,60 +100,67 @@
       </splitpanes>
     </el-row>
 
-    <el-dialog :title="title" :visible.sync="open" width="760px"  append-to-body>
-  <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+    <el-dialog :title="title" :visible.sync="open" width="800px"  append-to-body :close-on-click-modal="false">
+  <el-form ref="form" :model="form" :rules="rules" label-width="100px">
     <el-row :gutter="20">
-      <!-- 设备昵称 + 手机号码 -->
       <el-col :span="12">
-        <el-form-item label="设备昵称" prop="nickName">
-          <el-input v-model="form.nickName" placeholder="请输入设备昵称" maxlength="30" />
+        <el-form-item label="设备编号" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入设备编号" maxlength="30" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="手机号码" prop="phonenumber">
-          <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+        <el-form-item label="设备名称" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入设备名称" maxlength="30" />
         </el-form-item>
       </el-col>
-
-      <!-- 邮箱 + 设备名称 -->
       <el-col :span="12">
-        <el-form-item label="邮箱" prop="email">
-          <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+        <el-form-item label="设备版本" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入设备版本" maxlength="30" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item v-if="form.userId == undefined" label="设备名称" prop="userName">
-          <el-input v-model="form.userName" placeholder="请输入设备名称" maxlength="30" />
+        <el-form-item label="设备类型" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入设备类型" maxlength="30" />
         </el-form-item>
       </el-col>
-
-      <!-- 设备密码（仅新增）+ 设备性别 -->
       <el-col :span="12">
-        <el-form-item v-if="form.userId == undefined" label="设备密码" prop="password">
-          <el-input v-model="form.password" placeholder="请输入设备密码" type="password" maxlength="20" show-password />
+        <el-form-item label="设备级别" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入设备级别" maxlength="30" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="设备性别">
-          <el-select v-model="form.sex" placeholder="请选择性别" style="width: 100%">
-            <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
+        <el-form-item label="带外管理IP" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入带外管理IP" maxlength="30" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="设备厂商" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入设备厂商" maxlength="30" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="安装位置" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入安装位置" maxlength="30" />
         </el-form-item>
       </el-col>
-
-      <!-- 状态 + 角色 -->
       <el-col :span="12">
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
+        <el-form-item label="设备管理员" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入设备管理员" maxlength="30" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="角色">
-          <el-select v-model="form.roleIds" multiple placeholder="请选择角色" style="width: 100%">
-            <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
-          </el-select>
+        <el-form-item label="预计年限" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入预计年限" maxlength="30" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="服役年限" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入服役年限" maxlength="30" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="质保年限" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入质保年限" maxlength="30" />
         </el-form-item>
       </el-col>
 
@@ -202,7 +203,7 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/device/files"
+import { getDict, list, getInfo, del, add, update } from "@/api/device/files"
 import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
@@ -228,7 +229,7 @@ export default {
       // 总条数
       total: 0,
       // 设备表格数据
-      userList: null,
+      dataList: null,
       // 弹出层标题
       title: "",
       // 所有部门树选项
@@ -266,13 +267,13 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+        url: process.env.VUE_APP_BASE_API + "/equipment/import"
       },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
+        Name: undefined,
         phonenumber: undefined,
         status: undefined,
         deptId: undefined
@@ -290,31 +291,12 @@ export default {
 
       // 表单校验
       rules: {
-        userName: [
+        Name: [
           { required: true, message: "设备名称不能为空", trigger: "blur" },
           { min: 2, max: 20, message: '设备名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         nickName: [
           { required: true, message: "设备昵称不能为空", trigger: "blur" }
-        ],
-        password: [
-          { required: true, message: "设备密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '设备密码长度必须介于 5 和 20 之间', trigger: 'blur' },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
         ]
       }
     }
@@ -333,11 +315,18 @@ export default {
     })
   },
   methods: {
+    /** 查询设备列表 */
+    getDicts() {
+      getDict().then(response => {
+      console.log("%c 🗝️: getDict -> response ", "font-size:16px;background-color:#796b0d;color:white;", response)
+        }
+      )
+    },
     /** 查询设备列表 */
     getList() {
       this.loading = true
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows
+      list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.dataList = response.rows
           this.total = response.total
           this.loading = false
         }
@@ -375,8 +364,8 @@ export default {
     // 设备状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用"
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"设备吗？').then(function() {
-        return changeUserStatus(row.userId, row.status)
+      this.$modal.confirm('确认要"' + text + '""' + row.Name + '"设备吗？').then(function() {
+        return changeUserStatus(row.Id, row.status)
       }).then(() => {
         this.$modal.msgSuccess(text + "成功")
       }).catch(function() {
@@ -391,9 +380,9 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        userId: undefined,
+        Id: undefined,
         deptId: undefined,
-        userName: undefined,
+        Name: undefined,
         nickName: undefined,
         password: undefined,
         phonenumber: undefined,
@@ -414,33 +403,33 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = []
-      this.resetForm("queryForm")
-      this.queryParams.deptId = undefined
-      this.$refs.tree.setCurrentKey(null)
-      this.handleQuery()
+      // this.resetForm("queryForm")
+      // this.queryParams.deptId = undefined
+      // this.$refs.tree.setCurrentKey(null)
+      // this.handleQuery()
+      this.getDicts()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId)
+      this.ids = selection.map(item => item.Id)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
-      getUser().then(response => {
-        this.postOptions = response.posts
-        this.roleOptions = response.roles
+      // getInfo().then(response => {
+      //   this.postOptions = response.posts
+      //   this.roleOptions = response.roles
+      // })
         this.open = true
         this.title = "添加设备"
-        this.form.password = this.initPassword
-      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const userId = row.userId || this.ids
-      getUser(userId).then(response => {
+      const Id = row.Id || this.ids
+      getInfo(Id).then(response => {
         this.form = response.data
         this.postOptions = response.posts
         this.roleOptions = response.roles
@@ -453,7 +442,7 @@ export default {
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+      this.$prompt('请输入"' + row.Name + '"的新密码', "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnClickModal: false,
@@ -465,7 +454,7 @@ export default {
           }
         },
       }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
+          resetUserPwd(row.Id, value).then(response => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value)
           })
         }).catch(() => {})
@@ -474,14 +463,14 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+          if (this.form.Id != undefined) {
+            update(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addUser(this.form).then(response => {
+            add(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
@@ -492,9 +481,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids
-      this.$modal.confirm('是否确认删除设备编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds)
+      const Ids = row.Id || this.ids
+      this.$modal.confirm('是否确认删除设备编号为"' + Ids + '"的数据项？').then(function() {
+        return del(Ids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/earlyWarning/index.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/earlyWarning/index.vue
index 8e470ac8..c544ce9f 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/earlyWarning/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/earlyWarning/index.vue
@@ -29,35 +29,23 @@
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['device:deviceType:add']">新增</el-button>
               </el-col>
-              <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['device:deviceType:edit']">修改</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['device:deviceType:remove']">删除</el-button>
-              </el-col>
               <el-col :span="1.5">
                 <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['device:deviceType:import']">导入</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['device:deviceType:export']">导出</el-button>
               </el-col>
-              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
 
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="类型编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-              <el-table-column label="类型名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
-                </template>
-              </el-table-column>
-              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
+              <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+              <el-table-column label="名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="描述" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="触发条件" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="预警等级" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="预警方式" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="预警消息" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
               <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
                 <template slot-scope="scope" v-if="scope.row.userId !== 1">
                   <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:deviceType:edit']">修改</el-button>
diff --git a/ALOps_sys_fe/alops-ui/src/views/index.vue b/ALOps_sys_fe/alops-ui/src/views/index.vue
index bd6abd60..fddf5a8d 100644
--- a/ALOps_sys_fe/alops-ui/src/views/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="dashboard-container">
     <div class="welcome-message">
-      <h1>欢迎进入智能运维系统</h1>
-      <p>这里是智能运维系统的主界面，您可以在这里进行各种操作和管理。</p>
+      <h1>欢迎进入中国烟草</h1>
+      <p>这里是中国烟草的主界面，您可以在这里进行各种操作和管理。</p>
     </div>
   </div>
 </template><style scoped>
@@ -61,8 +61,8 @@
 </style><template>
   <div class="dashboard-container">
     <div class="welcome-message">
-      <h1><i class="el-icon-s-operation"></i> 欢迎进入智能运维系统</h1>
-      <p>这里是智能运维系统的主界面，您可以在这里进行各种操作和管理。</p>
+      <h1><i class="el-icon-s-operation"></i> 欢迎进入中国烟草</h1>
+      <p>这里是中国烟草的主界面，您可以在这里进行各种操作和管理。</p>
     </div>
   </div>
 </template>
diff --git a/ALOps_sys_fe/alops-ui/vue.config.js b/ALOps_sys_fe/alops-ui/vue.config.js
index e7ec6dfb..65cd2195 100644
--- a/ALOps_sys_fe/alops-ui/vue.config.js
+++ b/ALOps_sys_fe/alops-ui/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '智能运维管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '中国烟草运维管理系统' // 网页标题
 
 const baseUrl = 'http://39.102.212.161:8080' // 后端接口