Commit 60eed144 authored by qjeslks's avatar qjeslks

7.26.1

parent c7982d6f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<el-option label="总管" value="GetPipeAlarmData" /> <el-option label="总管" value="GetPipeAlarmData" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="换热机组:"> <el-form-item label="设备:">
<el-cascader :options="options" v-model="AlarmInfo.Id" :props="props" collapse-tags clearable :show-all-levels="false" <el-cascader :options="options" v-model="AlarmInfo.Id" :props="props" collapse-tags clearable :show-all-levels="false"
placeholder="请选择" style="min-width: 210px;" /> placeholder="请选择" style="min-width: 210px;" />
</el-form-item> </el-form-item>
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<el-card class="moduleCard" :height="tableHeight"> <el-card class="moduleCard" :height="tableHeight">
<el-table :data="tableData" :height="tableHeight" v-loading="loading" :cell-style="setCellStyle" id="out-table" <el-table :data="tableData" :height="tableHeight" v-loading="loading" :cell-style="setCellStyle" id="out-table"
border highlight-current-row :header-cell-style="setHeaderCellStyle" @sort-change="sortMethod" :header-cell-class-name="handleHeadAddClass" > border highlight-current-row :header-cell-style="setHeaderCellStyle" @sort-change="sortMethod" :header-cell-class-name="handleHeadAddClass" >
<el-table-column prop="index" label="编号" :sortable="false" width="80px" fixed />
<el-table-column prop="name" label="设施名称" :sortable="true" width="200px" fixed /> <el-table-column prop="name" label="设施名称" :sortable="true" width="200px" fixed />
<el-table-column prop="cnName" label="报警类型" :sortable="false" width="200px" fixed /> <el-table-column prop="cnName" label="报警类型" :sortable="false" width="200px" fixed />
<el-table-column prop="alarmDate" label="报警时间" :sortable="true" width="200px" fixed /> <el-table-column prop="alarmDate" label="报警时间" :sortable="true" width="200px" fixed />
...@@ -58,9 +59,6 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue'; ...@@ -58,9 +59,6 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue';
import http from '../../api/http'; import http from '../../api/http';
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import store from "../../store/index"; import store from "../../store/index";
import { getFileName } from '../../utils/utils';
import CfgSupply from '../../components/CfgSupply.vue';
import { column } from 'element-plus/es/components/table-v2/src/common.mjs';
//分页设置 //分页设置
const currentPage = ref(1) const currentPage = ref(1)
...@@ -109,8 +107,8 @@ function sortMethod({ order, prop }){ ...@@ -109,8 +107,8 @@ function sortMethod({ order, prop }){
} }
if(i === "name"){ if(i === "name"){
sortname = "name"; sortname = "name";
}else if(i === "alartDate"){ }else if(i === "alarmDate"){
sortname = "alartDate"; sortname = "alarmDate";
} }
// console.log(sortname) // console.log(sortname)
if(sortnames===""){ if(sortnames===""){
...@@ -167,7 +165,7 @@ const AlarmInfo = reactive({ ...@@ -167,7 +165,7 @@ const AlarmInfo = reactive({
"endTime": endTime, "endTime": endTime,
"start": 0, "start": 0,
"count": 30, "count": 30,
"sort": "" "sort": " alarmDate"
}) })
getSupplys(); getSupplys();
...@@ -340,10 +338,7 @@ function setHeaderCellStyle({ row, column, rowIndex, columnIndex }) { ...@@ -340,10 +338,7 @@ function setHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
// AlarmInfo.pageIndex = 0; // AlarmInfo.pageIndex = 0;
// AlarmInfo.pageCount = 100000; // AlarmInfo.pageCount = 100000;
// if (AlarmInfo.interval === undefined) { // var fileName = getFileName("报警信息历史数据");
// AlarmInfo.interval = 2;
// }
// var fileName = getFileName("换热站历史数据");
// await http.post("/api/transfer/hisExport", AlarmInfo, '正在导出数据....', { responseType: 'blob' }).then((content) => { // await http.post("/api/transfer/hisExport", AlarmInfo, '正在导出数据....', { responseType: 'blob' }).then((content) => {
// try{ // try{
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment