diff --git a/zfipc-ui/src/App.vue b/zfipc-ui/src/App.vue
index 391d951..730904f 100644
--- a/zfipc-ui/src/App.vue
+++ b/zfipc-ui/src/App.vue
@@ -5,15 +5,25 @@
+
diff --git a/zfipc-ui/src/api/equip/equip.js b/zfipc-ui/src/api/equip/equip.js
index 36ecc7f..4a5a7c5 100644
--- a/zfipc-ui/src/api/equip/equip.js
+++ b/zfipc-ui/src/api/equip/equip.js
@@ -9,6 +9,14 @@ export function listInfo(query) {
});
}
+export function listAllInfo(query) {
+ return request({
+ url: "/equip/info/listAll",
+ method: "get",
+ params: query,
+ });
+}
+
// 查询设备信息详细
export function getInfo(id) {
return request({
diff --git a/zfipc-ui/src/api/industrial/record.js b/zfipc-ui/src/api/industrial/record.js
new file mode 100644
index 0000000..d20a60b
--- /dev/null
+++ b/zfipc-ui/src/api/industrial/record.js
@@ -0,0 +1,52 @@
+import request from "@/utils/request";
+
+// 查询报警记录列表
+export function listRecord(query) {
+ return request({
+ url: "/alarm/record/list",
+ method: "get",
+ params: query,
+ });
+}
+
+// 查询报警记录详细
+export function getRecord(id) {
+ return request({
+ url: "/alarm/record/" + id,
+ method: "get",
+ });
+}
+
+// 新增报警记录
+export function addRecord(data) {
+ return request({
+ url: "/alarm/record",
+ method: "post",
+ data: data,
+ });
+}
+
+// 修改报警记录
+export function updateRecord(data) {
+ return request({
+ url: "/alarm/record",
+ method: "put",
+ data: data,
+ });
+}
+
+export function batchUpdateAlarmRecord(data) {
+ return request({
+ url: "/alarm/record/batchUpdate",
+ method: "post",
+ data: data,
+ });
+}
+
+// 删除报警记录
+export function delRecord(id) {
+ return request({
+ url: "/alarm/record/" + id,
+ method: "delete",
+ });
+}
diff --git a/zfipc-ui/src/views/dataLog/index.vue b/zfipc-ui/src/views/dataLog/index.vue
index c6b7a6d..c8119eb 100644
--- a/zfipc-ui/src/views/dataLog/index.vue
+++ b/zfipc-ui/src/views/dataLog/index.vue
@@ -14,7 +14,7 @@
import {
- listInfo,
- getInfo,
- delInfo,
- addInfo,
- updateInfo,
+ listMonitorInfo,
+ getMonitorInfo,
+ delMonitorInfo,
+ addMonitorInfo,
+ updateMonitorInfo,
} from "@/api/industrial/monitorData";
export default {
@@ -350,7 +350,7 @@ export default {
/** 查询监控数据信息列表 */
getList() {
this.loading = true;
- listInfo(this.queryParams).then((response) => {
+ listMonitorInfo(this.queryParams).then((response) => {
this.infoList = response.rows;
this.total = response.total;
this.loading = false;
@@ -405,7 +405,7 @@ export default {
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
- getInfo(id).then((response) => {
+ getMonitorInfo(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改监控数据信息";
@@ -416,13 +416,13 @@ export default {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
- updateInfo(this.form).then((response) => {
+ updateMonitorInfo(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
- addInfo(this.form).then((response) => {
+ addMonitorInfo(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@@ -437,7 +437,7 @@ export default {
this.$modal
.confirm('是否确认删除监控数据信息编号为"' + ids + '"的数据项？')
.then(function () {
- return delInfo(ids);
+ return delMonitorInfo(ids);
})
.then(() => {
this.getList();
diff --git a/zfipc-ui/src/views/warn/record/index.vue b/zfipc-ui/src/views/warn/record/index.vue
new file mode 100644
index 0000000..c6a7948
--- /dev/null
+++ b/zfipc-ui/src/views/warn/record/index.vue
@@ -0,0 +1,655 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 批量处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.alarmTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.equipInfo.equipName }}
+
+
+
+
+ {{ form.alarmRules.alarmName }}
+
+
+
+
+
+
+ {{ form.alarmValue }}
+
+
+
+
+ {{ form.alarmRules.alarmInfoUnit }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(form.alarmTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}
+
+
+
+
+
+
+ {{ form.content }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.result }}
+
+
+
+
+
+
+
软辊合辊压力{{dsrghgyl}}bar
-
软辊加压压力{{dsrgjyyl}}bar
-
软辊实际压力{{dsrgsjyl}}bar
-
热辊合辊压力{{dsreghgyl}}bar
-
热辊加压压力{{dsregjyyl}}bar
-
热辊实际压力{{dsregsjyl}}bar
+
软辊加压压力{{dsrgjyyl}}bar
+
软辊实际压力{{dsrgsjyl}}bar
+
热辊合辊压力{{dsreghgyl}}bar
+
热辊加压压力{{dsregjyyl}}bar
+
热辊实际压力{{dsregsjyl}}bar
-
软辊{{cdcrgll}}L/min
-
热辊{{cdcregll}}L/min
+
软辊{{cdcrgll}}L/min
+
热辊{{cdcregll}}L/min
-
软辊合辊压力{{tsrghgyl}}bar
-
软辊加压压力{{tsrgjyyl}}bar
-
软辊实际压力{{tsrgsjyl}}bar
-
热辊合辊压力{{tsreghgyl}}bar
-
热辊加压压力{{tsregjyyl}}bar
-
热辊实际压力{{tsregsjyl}}bar
+
软辊合辊压力{{tsrghgyl}}bar
+
软辊加压压力{{tsrgjyyl}}bar
+
软辊实际压力{{tsrgsjyl}}bar
+
热辊合辊压力{{tsreghgyl}}bar
+
热辊加压压力{{tsregjyyl}}bar
+
热辊实际压力{{tsregsjyl}}bar
-
软辊{{czcrgll}}L/min
-
热辊{{czcregll}}L/min
+
软辊{{czcrgll}}L/min
+
热辊{{czcregll}}L/min
系统压力
+ 系统压力
- 系统液温
+ 系统液温
最大值{{ xtyweimax }}
- 系统液位(CP)
+ 系统液位(CP)
@@ -147,7 +220,11 @@
id="bscll"
style="height: 90%"
>
- 泵输出流量
+ 泵输出流量