折线图

whychdw

2021-06-22 ec68b91ebecf481de13d3de578e7f0efef1cbd68

折线图

 package.json

@@ -1,6 +1,6 @@
{
  "name": "admin_manage",
  "version": "2.2.1",
  "version": "1.0.5",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve --mode dev",

 src/assets/js/apis/pageSetting/realTime.js

@@ -23,6 +23,17 @@
        });
    },
    /**
     * 查询控制信息
     *  无参
     */
    searchConfig() {
        return axios({
            method: 'post',
            url: 'PageParamAction!findByCategoryId',
            data: 'json='+JSON.stringify({categoryId:2})
        });
    },
    /**
     * 批量添加
     *
     * @param   {Array}  list  id的集合

 src/assets/js/tools/getValByKey.js

@@ -1,8 +1,11 @@
function getValByKey(key, data, defaultVal) {
function getValByKey(key, data, defaultVal, fixed) {
    let result = defaultVal != 0?defaultVal:0;
    for(let _key in data) {
        if(key == _key) {
            result = data[key];
            if(typeof result == "number" && typeof fixed == 'number') {
                result = result.toFixed(fixed);
            }
        }
    }
    return result;

 src/components/PageMenu.vue

@@ -406,7 +406,7 @@
                        icon: "el-icon-s-management",
                        closable: false,
                        childrens: [{
                                label: "实时监测配置",
                                label: "系统配置",
                                name: "realTimeSetting",
                                permitName: "batt_test_op_permit",
                                src: "#/pageSetting/realTime",

 src/pages/dataMager/dialog/AddPowerMager.vue

@@ -79,11 +79,7 @@
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="协议名称" prop="protocolName">
                        <el-select v-model="params.protocolName" placeholder="请选择类型" :filterable="true"
                                   :disabled="showMoudle">
                            <el-option v-for="item in agreementList" :key="item.value" :label="item.label"
                                       :value="item.value"></el-option>
                        </el-select>
                        <el-input v-model="params.protocolName"></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">

 src/pages/dataTest/movingRingSystem/powerBox.vue

@@ -677,7 +677,7 @@
            let acTabs = this.acTabs;
            if(acTabs == "acData" || acTabs == "acSignalData") {
                this.acData.map(item=>{
                    item.value = getValByKey(item.key, data, "???");
                    item.value = getValByKey(item.key, data, "???", 2);
                });

                if(acTabs == "acData") {
@@ -695,7 +695,7 @@
            let acTabs = this.acTabs;
            if(acTabs == "acDcData" || acTabs == "acDcSignalData") {
                this.acDcData.map(item=>{
                    item.value = getValByKey(item.key, data, "???");
                    item.value = getValByKey(item.key, data, "???", 2);
                });

                if(acTabs == "acDcData") {
@@ -713,7 +713,7 @@
            let acTabs = this.acTabs;
            if(acTabs == "dcData" || acTabs == "dcSignalData") {
                this.dcData.map(item=>{
                    item.value = getValByKey(item.key, data, "???");
                    item.value = getValByKey(item.key, data, "???", 2);
                });
                if(acTabs == "dcData") {
                    this.setDcChart(this.dcData);

 src/pages/dataTest/realTime.vue

@@ -1533,7 +1533,7 @@
                    let volTempVol = [];
                    if (rs.code == 1) {
                        volTempVol = rs.data.map((item) => {
                            return ["#" + item.mon_num, item.mon_vol];
                            return ["#" + item.mon_num, item.mon_vol.toFixed(3)];
                        });
                    }
                    let volBarNum = getBarNum(volTempVol);

 src/pages/pageSetting/realTime.vue

@@ -1,7 +1,10 @@
<template>
    <content-box class="page-root" title="实时监测配置">
    <content-box class="page-root" title="系统配置">
        <el-tabs tab-position="left" style="height: 100%;">
            <el-tab-pane label="状态信息" class="el-transfer-container">
            <el-tab-pane label="系统功能配置">

            </el-tab-pane>
            <el-tab-pane label="实时监测状态信息" class="el-transfer-container">
                <el-transfer
                v-model="status.value"
                filterable
@@ -13,7 +16,7 @@
                @change="handlerChange">
                </el-transfer>
            </el-tab-pane>
            <el-tab-pane label="远程管理" class="el-transfer-container">
            <el-tab-pane label="实时监测远程管理" class="el-transfer-container">
                <el-transfer
                v-model="control.value"
                filterable
@@ -53,7 +56,15 @@
                },
                value: [],
                data: []
            }
            },
            config: {
                props: {
                    key: 'id',
                    label: 'param'
                },
                value: [],
                data: []
            },
        }
    },
    methods: {

 src/pages/reportStatistics/powerReport.vue

@@ -894,8 +894,9 @@
                return {
                    name: item.label1,
                    type: 'line',
                    sampling: 'average',
                    data: data.map(itemData=>{
                        return [itemData.record_time, getValByKey(item.prop, itemData)];
                        return [itemData.record_time, getValByKey(item.prop, itemData, '???', 2)];
                    }),
                };
            });