whycwx
2021-02-01 48c7a6d31cbafb46ee0f34aa236f904999e49268
优化列表显示
3个文件已修改
34 ■■■■ 已修改文件
src/assets/js/alarmAdmian/powerInfoData.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/powerHistoryInfo.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/powerRealtimeInfo.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/alarmAdmian/powerInfoData.js
@@ -44,4 +44,13 @@
        {value:"110115,110116",label:"三相不平衡",model:true},
        {value:"110117,110118",label:"频率异常",model:true},
    ]
};
// 告警等级
export const estateFn = function(str){
    let estateArr = ["一级告警","二级告警","三级告警","四级告警","五级告警","六级告警","七级告警"];
    if(str<1){
        console.log("告警等级为0")
        return ""
    }
    return estateArr[str-1];
}
src/pages/alarmMager/powerHistoryInfo.vue
@@ -150,7 +150,12 @@
                    </template>
                </el-table-column>
                <el-table-column v-for="header in table.headers" :key="header.prop" :prop="header.prop" :label="header.label"
                 :width="header.width" :min-width="header.minWidth" align="center"></el-table-column>
                 :width="header.width" :min-width="header.minWidth" align="center">
                     <template slot-scope="scope">
                        <div v-if="header.prop == 'alarmLevel'">{{ estateFn(scope.row[header.prop]) }}</div>
                        <div v-else>{{ scope.row[header.prop] }}</div>
                    </template>
                 </el-table-column>
            </el-table>
        </div>
@@ -173,7 +178,7 @@
    import { Timeout, } from "../../assets/js/tools";
    // 引入导出表格
    import {export_json_to_excel} from '../../assets/js/excel/Export2Excel.js'
    import { checkboxs } from '../../assets/js/alarmAdmian/powerInfoData'
    import { checkboxs ,estateFn } from '../../assets/js/alarmAdmian/powerInfoData'
    export default {
        data() {
            let thieTime = new Date().format('yyyy-MM-dd');
@@ -266,6 +271,8 @@
            this.searchProvince();//查询省
        },
        methods: {
            // 引用告警
            estateFn:estateFn,
            // 初始化查询列表
            searchData() {
                let vm = this;
src/pages/alarmMager/powerRealtimeInfo.vue
@@ -145,7 +145,7 @@
                 :width="header.width" :min-width="header.minWidth" align="center"></el-table-column>
                 <el-table-column label="确认告警时间" align="center" :width="180">
                    <template slot-scope="scope">
                        {{ scope.row.alarmIsConfirmed !=0?scope.row.alarmConfirmedTime:"" }}
                        {{ scope.row.alarmConfirmedTimeStr }}
                    </template>
                </el-table-column>
                <el-table-column label="确认告警" align="center" :width="80">
@@ -182,7 +182,7 @@
    import { isHasPermit, Timeout, } from "../../assets/js/tools";
    // 引入导出表格
    import {export_json_to_excel} from '../../assets/js/excel/Export2Excel.js'
    import { checkboxs } from '../../assets/js/alarmAdmian/powerInfoData'
    import { checkboxs,estateFn } from '../../assets/js/alarmAdmian/powerInfoData'
    export default {
        data() {
            let permits = this.$store.state.user.permits;
@@ -232,7 +232,7 @@
                            width: 80
                        },
                        {
                            prop: "alarmLevel",
                            prop: "estateStr",
                            label: "告警等级",
                            width: 120
                        },
@@ -271,7 +271,11 @@
                let rs = JSON.parse(res.data);
                if (rs.code == 1 && rs.data && rs.data.obj.length > 0) {
                    this.total=rs.data.totalSize;
                    this.table.datas = rs.data.obj;
                    this.table.datas = rs.data.obj.map(function(item){
                        item.estateStr = estateFn(item.alarmLevel);
                        item.alarmConfirmedTimeStr = item.alarmIsConfirmed > 0?item.alarmConfirmedTime:"";
                        return item;
                    })
                }else {
                    this.total=0;
                    this.table.datas = [];
@@ -511,7 +515,7 @@
                    filterVal.push(item.prop)
                })
                tHeader.push('确认告警时间')
                filterVal.push('alarmConfirmedTime')
                filterVal.push('alarmConfirmedTimeStr')
                tHeader.push('确认告警')
                filterVal.push('alarmIsConfirmed')
                let list = this.table.datas;