diff --git a/ALOps_sys_fe/alops-ui/src/api/inMonitoring/message.js b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/message.js
new file mode 100644
index 00000000..2ec5a5b0
--- /dev/null
+++ b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/message.js
@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/ruoyi";
+const api = '/inMonitoring/alertMessage/'
+
+// 查询详细
+export function getDict() {
+ return request({
+ url: '/sys_dict',
+ method: 'get'
+ })
+}
+
+// 查询列表
+export function list(query) {
+ return request({
+ url: api + 'list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询详细
+export function getInfo(id) {
+ return request({
+ url: api + '/queryById/' + parseStrEmpty(id),
+ method: 'get'
+ })
+}
+
+// 新增
+export function add(data) {
+ return request({
+ url: api + 'add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改
+export function update(data) {
+ return request({
+ url: api + 'editAlertMessage',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除
+export function del(id) {
+ return request({
+ url: api + id,
+ method: 'delete'
+ })
+}
+
+
+
+
diff --git a/ALOps_sys_fe/alops-ui/src/api/inMonitoring/rules.js b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/rules.js
new file mode 100644
index 00000000..1eec0a70
--- /dev/null
+++ b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/rules.js
@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/ruoyi";
+const api = '/inMonitoring/alertRule/'
+
+// 查询详细
+export function byTable() {
+ return request({
+ url: api + 'byTable',
+ method: 'get'
+ })
+}
+
+// 查询列表
+export function list(query) {
+ return request({
+ url: api + 'list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询详细
+export function getInfo(id) {
+ return request({
+ url: api + '/queryById/' + parseStrEmpty(id),
+ method: 'get'
+ })
+}
+
+// 新增
+export function add(data) {
+ return request({
+ url: api + 'addRule',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改
+export function update(data) {
+ return request({
+ url: api + 'editRule',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除
+export function del(id) {
+ return request({
+ url: api + id,
+ method: 'delete'
+ })
+}
+
+
+
+
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 18e5e9aa..4185cba1 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
@@ -52,7 +52,7 @@
- {{ scope.row.status ? '正常' : '停用' }}
+
@@ -271,12 +271,45 @@ export default {
},
// 表单校验
rules: {
+ equNumber: [
+ { required: true, message: "设备编号不能为空", trigger: "blur" },
+ ],
name: [
- { required: true, message: "设备名称不能为空", trigger: "blur" },
+ { required: true, message: "设备名称不能为空", trigger: "blur" }
+ ],
+ version: [
+ { required: true, message: "设备版本不能为空", trigger: "blur" },
+ ],
+ equType: [
+ { required: true, message: "设备类型不能为空", trigger: "blur" }
+ ],
+ deviceLevel: [
+ { required: true, message: "设备级别不能为空", trigger: "blur" },
+ ],
+ ip: [
+ { required: true, message: "带外管理IP不能为空", trigger: "blur" }
+ ],
+ manufacture: [
+ { required: true, message: "设备厂商不能为空", trigger: "blur" },
+ ],
+ location: [
+ { required: true, message: "安装位置不能为空", trigger: "blur" }
+ ],
+ inCharge: [
+ { required: true, message: "设备管理员不能为空", trigger: "blur" },
+ ],
+ lifeCycle: [
+ { required: true, message: "预计年限不能为空", trigger: "blur" }
+ ],
+ serviceTime: [
+ { required: true, message: "服役年限不能为空", trigger: "blur" },
+ ],
+ warranty: [
+ { required: true, message: "质保年限不能为空", trigger: "blur" }
+ ],
+ image: [
+ { required: true, message: "设备图片不能为空", trigger: "blur" }
],
- nickName: [
- { required: true, message: "设备昵称不能为空", trigger: "blur" }
- ]
}
}
},
@@ -361,11 +394,6 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
- add(this.form).then(response => {
- this.$modal.msgSuccess("新增成功")
- this.open = false
- this.getList()
- })
if (this.form.id != undefined) {
update(this.form).then(response => {
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
deleted file mode 100644
index fa9a3d99..00000000
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/earlyWarning/index.vue
+++ /dev/null
@@ -1,505 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
- 新增
-
-
- 导入
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 将文件拖到此处，或点击上传
-
-
- 是否更新已经存在的类型数据
-
-
仅允许导入xls、xlsx格式文件。
-
下载模板
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.handleTime) }}
+
+
+
+
+
+ 去处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ~
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+ 是否更新已经存在的设备档案
+
+
仅允许导入xls、xlsx格式文件。
+
下载模板
+
+