From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue | 129 ++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 51 deletions(-)
diff --git a/zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue b/zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue
index 801fffe..1ff3b79 100644
--- a/zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue
+++ b/zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue
@@ -6,7 +6,7 @@
</div>
<div class="page-container-right">
<div class="form-card">
- <el-form :model="form" ref="queryRef" :inline="true" label-width="85px">
+ <el-form :model="form" ref="queryRef" :inline="true" label-width="68px">
<el-form-item prop="eierarchyFlag">
<el-radio-group v-model="form.eierarchyFlag">
<el-radio label="B" name="eierarchyFlag">鏈骇</el-radio>
@@ -14,14 +14,25 @@
</el-radio-group>
</el-form-item>
<el-form-item label="鏃堕棿閫夋嫨">
- <el-date-picker v-model="form.dataTime" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="鏃堕棿" style="width: 370px" unlink-panels
- time-format="HH:mm:ss" />
+ <el-date-picker
+ v-model="form.dataTime"
+ type="datetimerange"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="鏃堕棿"
+ style="width: 340px"
+ unlink-panels
+ time-format="HH:mm:ss"
+ />
</el-form-item>
<el-form-item label="鎶ヨ绫诲埆" prop="indexType">
<el-select v-model="form.indexType" placeholder="璇烽�夋嫨鎶ヨ绫诲埆" style="width: 200px">
- <el-option v-for="dict in alarm_record_category" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-option
+ v-for="dict in alarm_record_category"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
<!-- <el-form-item label="鑳芥簮绫诲瀷" prop="energyType">
@@ -39,18 +50,26 @@
</el-form-item>
</el-form>
</div>
- <BaseCard :title="currentNode ? currentNode.label + '--鑺傜偣閰嶇疆' : '鏆傛棤鑺傜偣閰嶇疆'
- ">
+ <BaseCard :title="currentNode ? currentNode.label + '--鑺傜偣閰嶇疆' : '鏆傛棤鑺傜偣閰嶇疆'">
<div class="table-box">
<el-table :data="tableData" v-loading="loading" height="calc(100vh - 450px)">
<el-table-column type="index" label="搴忓彿" width="70" />
<el-table-column label="鐢ㄨ兘鍗曞厓" prop="modelName" align="center" show-overflow-tooltip />
<el-table-column label="鎸囨爣鍚嶇О" prop="indexName" align="center" show-overflow-tooltip />
- <el-table-column label="鎶ヨ绫诲埆" prop="indexType" align="center" show-overflow-tooltip :formatter="(row, column) =>
- proxy.selectDictLabel(alarm_record_category, row.indexType)
- " />
- <el-table-column label="鑳芥簮绫诲瀷" prop="energyId" align="center" show-overflow-tooltip :formatter="(row, column) => formatterLabel(energyTypeList, row.energyId)
- " />
+ <el-table-column
+ label="鎶ヨ绫诲埆"
+ prop="indexType"
+ align="center"
+ show-overflow-tooltip
+ :formatter="(row, column) => proxy.selectDictLabel(alarm_record_category, row.indexType)"
+ />
+ <el-table-column
+ label="鑳芥簮绫诲瀷"
+ prop="energyId"
+ align="center"
+ show-overflow-tooltip
+ :formatter="(row, column) => formatterLabel(energyTypeList, row.energyId)"
+ />
<el-table-column label="棰勮鍊�" prop="energyType" align="center" show-overflow-tooltip />
<el-table-column label="鎶ヨ鍊�" prop="alarmValue" align="center" show-overflow-tooltip />
<el-table-column label="鎶ヨ鏃堕棿" prop="alarmBeginTime" align="center" show-overflow-tooltip />
@@ -58,17 +77,22 @@
</div>
</BaseCard>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize" @pagination="getList(currentNode)" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList(currentNode)"
+ />
</div>
</div>
</div>
</template>
<script setup name="alarmRecord">
-import { listEnergyTypeList } from "@/api/modelConfiguration/energyType";
-const { proxy } = getCurrentInstance();
-let { alarm_record_category } = proxy.useDict("alarm_record_category");
-import { historicalAlarm } from "@/api/alarmManage/alarmManage";
+import { listEnergyTypeList } from "@/api/modelConfiguration/energyType"
+const { proxy } = getCurrentInstance()
+let { alarm_record_category } = proxy.useDict("alarm_record_category")
+import { historicalAlarm } from "@/api/alarmManage/alarmManage"
let form = ref({
eierarchyFlag: "B",
dataTime: [
@@ -79,74 +103,77 @@
indexType: "",
// energyType: '',
indexName: "",
-});
-const energyTypeList = ref();
+})
+const energyTypeList = ref()
function getEnergyTypeList() {
listEnergyTypeList().then((res) => {
- energyTypeList.value = res.data;
- form.value.indexType = alarm_record_category.value[0].value;
+ energyTypeList.value = res.data
+ form.value.indexType = alarm_record_category.value[0].value
// form.value.energyType = energyTypeList.value[0].enersno
- getList();
- });
+ getList()
+ })
}
// getEnergyTypeList()
-let currentNode = ref();
+let currentNode = ref()
function handleNodeClick(data) {
- currentNode.value = data;
- getEnergyTypeList();
+ currentNode.value = data
+ getEnergyTypeList()
}
-let tableData = ref([]);
-let total = ref(0);
-let loading = ref(false);
+let tableData = ref([])
+let total = ref(0)
+let loading = ref(false)
let queryParams = ref({
pageNum: 1,
pageSize: 10,
-});
+})
function formatterLabel(list, value) {
- let dict = list.find((item) => item.enersno == value);
- return dict ? dict.enername : "";
+ let dict = list.find((item) => item.enersno == value)
+ return dict ? dict.enername : ""
}
function getList() {
- form.value.nodeId = currentNode.value.id;
- loading.value = true;
+ form.value.nodeId = currentNode.value.id
+ loading.value = true
historicalAlarm({
...form.value,
...queryParams.value,
beginTime: form.value.dataTime[0],
endTime: form.value.dataTime[1],
}).then((response) => {
- console.log(11, response);
+ console.log(11, response)
if (response.code === 200) {
- tableData.value = response.rows;
- total.value = response.total;
- loading.value = false;
+ tableData.value = response.rows
+ total.value = response.total
+ loading.value = false
} else {
- proxy.$modal.msgError(response.msg);
+ proxy.$modal.msgError(response.msg)
}
- });
+ })
}
function handleQuery() {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1
+ getList()
}
function resetQuery() {
form.value = {
- eierarchyFlag: 'B',
- dataTime: [proxy.dayjs(new Date()).format("YYYY-MM-DD 00:00:00"), proxy.dayjs(new Date()).format("YYYY-MM-DD 23:59:59")],
- nodeId: '',
+ eierarchyFlag: "B",
+ dataTime: [
+ proxy.dayjs(new Date()).format("YYYY-MM-DD 00:00:00"),
+ proxy.dayjs(new Date()).format("YYYY-MM-DD 23:59:59"),
+ ],
+ nodeId: "",
indexType: alarm_record_category.value[0].value,
// energyType: '',
- indexName: '',
+ indexName: "",
}
queryParams.value = {
pageNum: 1,
pageSize: 10,
- };
- getList();
+ }
+ getList()
}
</script>
@@ -190,4 +217,4 @@
.table-box {
height: calc(100vh - 464px);
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3