提交内容

whychdw

2020-09-16 d58f97c45f5e2ff7a0d10e53a30251da7c31a008

提交内容

 src/assets/css/basic.css

@@ -16,18 +16,18 @@

div::-webkit-scrollbar {
    /* 滚动条整体样式 */
    width: 0.03rem;
    height: 0.1rem;
    width: 3px;
    height: 10px;
}
div::-webkit-scrollbar-thumb {
    /* 滚动条里面小方块 */
    border-radius: 0.1rem;
    -webkit-box-shadow: inset 0 0 0.05rem rgba(0,0,0,0.2);
    border-radius: 10px;
    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
    background: #f9fafa;
}
div::-webkit-scrollbar-track {
    /* 滚动条里面轨道 */
    -webkit-box-shadow: inset 0 0 0.05rem rgba(0,0,0,0.2);
    border-radius: 0.1rem;
    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
    border-radius: 10px;
    background: #003d64;
}

 src/assets/css/common.css

@@ -97,5 +97,7 @@
    display: inline-block;
}
.el-pagination-btns {
    margin-left: 8px;
    margin-right: 8px;
    display: inline-block;
}

 src/assets/css/theme/science-blue.css

@@ -149,9 +149,13 @@
.el-science-blue .el-table thead {
    color: #FFFFFF;
}
.el-science-blue .el-table--enable-row-hover .el-table__body tr:hover>td {
.el-science-blue .el-table--enable-row-hover .el-table__body tr:hover>td,
.el-science-blue .el-table__body tr.hover-row>td {
    background-color: #5990c4;
}
.el-science-blue .el-table__fixed-right {
    background-color: #1d4a77;
}

/* el-popover */
.el-popover {

 src/assets/js/apis/dataMager/battGroupMager.js

New file
@@ -0,0 +1,18 @@
import axios from 'axios'

export default {
    /**
     * 查询电池组信息
     *
     * @param   {[Object]}  data  查询条件
     * 参数：{"binf":{"StationName1":"","StationName2":"","StationName5":"","StationName3":""},"page":{"pageCurr":1,"pageSize":20,"pageAll":0}}
     *
     */
    search(data) {
        return axios({
            method: 'post',
            url: '/yckj/zijing_sx/BattInfAction!searchInform',
            data: 'json='+JSON.stringify(data),
        });
    }
}

 src/assets/js/apis/dataMager/index.js

New file
@@ -0,0 +1,5 @@
import battGroupMager from './battGroupMager'

export default {
    battGroupMager
}

 src/assets/js/apis/index.js

@@ -1,9 +1,11 @@
import dischargeTest from './dischargeTest' // 核荣参数管理
import system from './system'           // 系统参数管理
import userMager from './userMager'     // 用户管理
import dataMager from './dataMager'     // 数据管理

export default {
    dischargeTest,
    system,
    userMager
    userMager,
    dataMager
};

 src/assets/js/apis/userMager/index.js

@@ -1,3 +1,4 @@
import axios from 'axios'
import userInfo from './userInfo'       // 用户信息管理
import baojiGroup from './baojiGroup'   // 包机组管理
import operationRecord from './operationRecord'     // 操作记录管理

 src/pages/dataMager/battGroupMager.vue

@@ -46,7 +46,10 @@
                </div>
                <div class="table-cell text-right">机房名称：</div>
                <div class="table-cell w360">
                    <el-select v-model="filters.values.home"  size="small" placeholder="请选择机房名称">
                    <el-select 
                    v-model="filters.values.home"
                    @click="changeHome"  
                    size="small" placeholder="请选择机房名称">
                        <el-option
                        v-for="item in filters.data.home"
                        :key="item.value"
@@ -59,12 +62,228 @@
        </div>
        <div class="flex-page-content">
            <el-table border size="mini" header-row-class-name="header-primary" height="100%" :data="tableData">
                <el-table-column prop="yhid" align="center" label="用户ID"></el-table-column>
                <el-table-column prop="czrxm" align="center" label="操作人姓名"></el-table-column>
                <el-table-column prop="czlx" align="center" label="操作类型"></el-table-column>
                <el-table-column prop="czsj" align="center" label="操作时间"></el-table-column>
                <el-table-column prop="zdip" align="center" label="终端IP"></el-table-column>
                <el-table-column prop="cztime" align="center" label="操作事件"></el-table-column>
                <el-table-column
                prop="StationId"
                label="机房编号"
                min-width="150"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="StationName1"
                label="省"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="StationName2"
                label="市"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="StationName5"
                label="区县"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="StationName3"
                label="机房名称"
                min-width="280"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="StationName4"
                label="设备名称"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="FBSDeviceId"
                label="设备ID"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="FbsDeviceIp"
                label="设备IP"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="FbsDeviceIp_YM"
                label="子网掩码"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="FbsDeviceIp_WG"
                label="网关"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="FBSDeviceName"
                label="协议名称"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="GroupIndexInFBSDevice"
                label="FBS设备索引"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="BattGroupId"
                label="电池组ID"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="BattGroupNum"
                label="机房内电池组编号"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="BattGroupName"
                label="电池组名称"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="FloatVolLevel"
                label="浮充电压阀值(V)"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="OfflineVolLevel"
                label="离线电压阀值(V)"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="BattFloatCurrent"
                label="浮充电流阀值(A)"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="MonCount"
                label="单体数量"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="MonCapStd"
                label="标称容量(AH)"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="MonVolStd"
                label="标称单体电压(V)"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="MonResStd"
                label="标称单体内阻(mΩ)"
                min-width="150"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="MonSerStd"
                label="标称单体电导"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="MonVolLowToAvg"
                label="单体电压次低偏移量(V)"
                min-width="150"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="Load_curr"
                label="负载电流(A)"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="DisCurrMax"
                label="最大核容电流(A)"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="BattProducer"
                label="电池品牌"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="BattModel"
                label="电池型号"
                min-width="120"
                :resizable="false"
                align="center">
                </el-table-column>
                <el-table-column
                prop="BattProductDate"
                label="电池生产日期"
                min-width="160"
                :resizable="false"
                :formatter="dateSub"
                align="center">
                </el-table-column>
                <el-table-column
                prop="BattInUseDate"
                label="投入使用日期"
                min-width="160"
                :resizable="false"
                :formatter="dateSub"
                align="center">
                </el-table-column>
                <el-table-column
                fixed="right"
                label="操作"
                width="180"
                align="center">
                    <template slot-scope="scope">
                        <el-button @click="handleClick(scope.row)" type="primary" size="mini">编辑</el-button>
                        <el-button type="danger" size="mini" @click="confirmDelHome(scope.row)">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
        </div>
        <div class="flex-page-footer" slot="footer">
@@ -75,10 +294,16 @@
            <el-pagination size="mini" 
            :current-page="page.pageCurr" 
            :page-sizes="[10, 20, 30, 50, 100]" 
            :page-size="page.pagesize"
            :page-size="page.pageSize"
            layout="total, sizes, prev, pager, next, jumper"
            :total="page.pageAll"></el-pagination>
            :total="page.pageAll"
            @current-change="currentChange"
            @size-change="sizeChange"></el-pagination>
            <div class="el-pagination-btns">
                <el-button type="primary" round size="mini" icon="el-icon-plus">新建电池组</el-button>
            </div>
        </div>
        
    </flex-layout>
</template>

@@ -110,7 +335,7 @@
            },
            page: {
                pageCurr:1,
                pageSize:20,
                pageSize:10,
                pageAll:0,
            },
            tableData:[]
@@ -118,7 +343,7 @@
    },
    methods: {
        searchProvince() {      // 查询省
            //this.loading = this.$layer.loading(1);
            this.loading = this.$layer.loading(1);
            searchProvince().then((res)=>{
                var rs = JSON.parse(res.data.result);
                var data = [];
@@ -241,18 +466,22 @@

            // 请求后台
            searchHome(searchParams).then((res)=>{
                var rs = JSON.parse(res.data.result);
                var data = [];
                let rs = JSON.parse(res.data.result);
                let data = [];
                if(rs.code == 1) {
                    var rsData = rs.data;
                    let rsData = rs.data;
                    // 遍历结果集
                    for(var i=0; i<rsData.length; i++) {
                        var _rsData = rsData[i];
                        var tmp = {
                            label: _rsData.StationName3,
                            value: _rsData.StationName3
                        };
                        data.push(tmp);
                    for(let i=0; i<rsData.length; i++) {
                        let _rsData = rsData[i];
                        let index = this.checkValIsIn(_rsData.StationName3, data);
                        if(index == -1) {
                            let tmp = {
                                label: _rsData.StationName3,
                                value: _rsData.StationName3
                            };
                            data.push(tmp);
                        }
                        
                    }
                }
                // 设置第一笔数据
@@ -267,8 +496,71 @@
                this.searchData(true);
            });
        },
        searchData() {
        checkValIsIn(val, arr) {
            for(let i=0; i<arr.length; i++) {
                if(arr[i].label == val) {
                    return i;
                }
            }
            return -1;
        },
        changeHome: function() {
            // 重置分页信息
            this.page.pageCurr = 1;
            // 查询数据
            this.searchData();
        },
        searchData(noLoading) {
            if(!noLoading) {
                this.loading = this.$layer.loading(1);
            } 
            let filters= this.filters.values;
            // 构造查询条件
            let searchParams = {
                binf:{
                    StationName1: filters.province,        // 省
                    StationName2: filters.city,            // 市
                    StationName5: filters.county,        // 区/县
                    StationName3: filters.home,            // 站点
                },
                page: this.page,
            };
            // 请求后台
            this.$apis.dataMager.battGroupMager.search(searchParams).then(res=>{
                // 关闭弹出框
                this.$layer.close(this.loading);
                // 处理数据
                let rs = JSON.parse(res.data.result);
                let data = [];
                if(rs.code == 1) {
                    data = rs.data;
                    let _data = data[data.length-1];
                    // 设置数据总数
                    this.page.pageAll = _data.num;
                }else {
                    this.page.pageCurr = 1;
                    this.page.pageAll = 0;
                }
                // 设置表格数据
                this.tableData = data;

            }).catch(error=>{
                console.log(error);
                // 关闭弹出框
                this.$layer.close(this.loading);
            })
        },
        dateSub: function(row, column, cellValue) {
            return cellValue.substr(0,10);
        },
        currentChange(value) {
            this.page.pageCurr = value;
            this.searchData();
        },
        sizeChange(value) {
            this.page.pageCurr = 1;
            this.page.pageSize = value;
            this.searchData();
        }
    },
    mounted() {