whychdw
2021-06-19 c92f5e10ecdd51b4cd35e71c20c51b4a4a267458
提交内容
8个文件已修改
239 ■■■■ 已修改文件
src/assets/js/config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/params/BTS/DischargeParams.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/history.vue 88 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/movingRingSystem/const/getPowerConfigData.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/movingRingSystem/dialog/acConfig.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/movingRingSystem/dialog/acDcConfig.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/movingRingSystem/dialog/dcConfig.vue 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/movingRingSystem/powerBox.vue 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/config.js
@@ -28,6 +28,6 @@
    dischargeByFace: {
        label: '启动放电添加人脸识别',
        des: '启动充放电测试使用人脸识别',
        value: true,
        value: false,
    },
}
src/components/params/BTS/DischargeParams.vue
@@ -106,7 +106,7 @@
                    </el-form-item>
                </div>
                <div class="table-cell pr16">
                    <el-form-item label="温度上限(℃)">
                    <el-form-item label="设备温度上限(℃)">
                        <el-input v-model="params.MonomerTmp_High"></el-input>
                    </el-form-item>
                </div>
src/pages/dataTest/history.vue
@@ -19,7 +19,8 @@
      </div>
      <div slot="box-tools" class="box-tools" style="right: 96px;">
        <el-tooltip class="item" effect="dark" content="标准曲线" placement="bottom">
          <i class="iconfont el-icon-biaozhunquxian" @click="confirmAddStandardLine" style="font-size: 20px"></i>
                    <i class="iconfont el-icon-biaozhunquxian" @click="confirmAddStandardLine"
                       style="font-size: 20px"></i>
        </el-tooltip>
      </div>
      <flex-layout :no-bg="true">
@@ -28,7 +29,8 @@
            <div class="table-row">
              <div class="table-cell text-right w80">电池状态:</div>
              <div class="table-cell">
                <el-input v-model="formateBattState" placeholder="" size="small" :disabled="true"></el-input>
                                <el-input v-model="formateBattState" placeholder="" size="small"
                                          :disabled="true"></el-input>
              </div>
              <div class="table-cell text-right w80">端电压:</div>
              <div class="table-cell">
@@ -41,13 +43,15 @@
              </div>
              <div class="table-cell text-right w80">测试时长:</div>
              <div class="table-cell">
                <el-input v-model="top.test_long" placeholder="" size="small" :disabled="true"></el-input>
                                <el-input v-model="top.test_long" placeholder="" size="small"
                                          :disabled="true"></el-input>
              </div>
            </div>
            <div class="table-row">
              <div class="table-cell text-right w80">测试日期:</div>
              <div class="table-cell">
                <el-cascader v-model="test_record.value" :options="test_record.list" size="small" placeholder="请选择测试日期"
                                <el-cascader v-model="test_record.value" :options="test_record.list" size="small"
                                             placeholder="请选择测试日期"
                             style="width: 100%; min-width:16rem"
                             @change="testRecordChange">
                  <template slot-scope="{ node, data }">
@@ -58,7 +62,8 @@
              </div>
              <div class="table-cell text-right w80">测试容量:</div>
              <div class="table-cell">
                <el-input v-model="top.test_cap" placeholder="" size="small" :disabled="true"></el-input>
                                <el-input v-model="top.test_cap" placeholder="" size="small"
                                          :disabled="true"></el-input>
              </div>
              <div class="table-cell text-right w80">剩余容量:</div>
              <div class="table-cell">
@@ -68,7 +73,8 @@
              <div class="table-cell text-right w80">续航时长:</div>
              <div class="table-cell">
                <el-tooltip class="item" effect="dark" content="机房停电时电池对实际负载供电时长" placement="top">
                  <el-input v-model="top.xuhang" placeholder="" size="small" :disabled="true"></el-input>
                                    <el-input v-model="top.xuhang" placeholder="" size="small"
                                              :disabled="true"></el-input>
                </el-tooltip>
              </div>
            </div>
@@ -111,7 +117,8 @@
        </div>
        <div class="content-footer" slot="footer">
          <div class="slider-container">
            <el-slider v-model="slider" size="small" :format-tooltip="formatTooltip" @input="sliderInput"></el-slider>
                        <el-slider v-model="slider" size="small" :format-tooltip="formatTooltip"
                                   @input="sliderInput"></el-slider>
          </div>
        </div>
      </flex-layout>
@@ -144,6 +151,8 @@
      <input type="hidden" name="JH_curr" ref="JH_curr" value="">  <!-- 单体均衡电流 -->
      <input type="hidden" name="last_vol" ref="last_vol" value=""> <!-- 终止电压柱状图 -->
      <input type="hidden" name="last_tmp" ref="last_tmp" value=""> <!-- 终止温度柱状图 -->
            <input type="hidden" name="restcap_line_echart" ref="restcap_line_echart" value=""> <!-- 剩余容量 -->
      <input type="hidden" name="obj-bmd" ref="obj_bmd" value=""/>
      <input type="hidden" name="obj-title" ref="obj_title" value=""/>      <!-- 落后单体阀值信息 -->
      <input type="hidden" name="arr-data" ref="arr_data" value=""/>      <!--存放单体的起始信息二维数组-->
@@ -335,6 +344,7 @@
        JH_curr: "",            // 单体均衡电流
        last_vol: "",           // 终止电压柱状图
        last_tmp: "",           // 终止温度柱状图
                restcap_line_echart: "",    // 剩余容量
        obj_bmd: "",            //
        obj_title: "",          // 落后单体阀值信息
        arr_data: [],           // 存放单体的起始信息二维数组
@@ -571,6 +581,9 @@
        case "temp":
          dataList = monLineData.temp;
          break;
                case "resCap":
                    dataList = monLineData.resCap;
                    break;
        default:
          isUpdate = false;
          break;
@@ -581,6 +594,7 @@
      }
      this.monInfo.title = title;
      this.monInfo.unit = unit;
            monLineChart.title.show=false;
      monLineChart.series = dataList.map((item, index) => {
        let monNum = "#" + (index + 1);
        return {
@@ -795,6 +809,7 @@
          // 开辟空间
          monLineData.vol[index] = [];
          monLineData.temp[index] = [];
                    monLineData.resCap[index] = [];
        }
        // 获取到需要使用的空间
        let monLineVol = monLineData.vol[mon_num - 1];
@@ -829,6 +844,14 @@
          monBarData.preCap[i].push([batt_num_text, (actionvalue * 100 / batt.MonCapStd).toFixed(0)]);
        }
      }
            // 容量
            monLineData.vol.forEach((item, key)=>{
                item.forEach((volItem, volItemKey)=>{
                    let resCapItem = monBarData.resCap[volItemKey];
                    monLineData.resCap[key].push([volItem[0], resCapItem[key][1]]);
                });
            });
    },
    // 获取测试的信息
    getTestRecord() {
@@ -1008,16 +1031,6 @@
        backgroundColor: '#fff'
      });
      // 单体电压折线图
      let monLineChartVolOption = this.$refs.groupVol.getOption(monLineChart);
      monLineChartVolOption.title.show = true;
      monLineChartVolOption.title.x = 'center';
      this.createGraphByOpt(monLineChartVolOption);
      let vol_line = allGraph.getDataURL({
        pixelRatio: 1,
        backgroundColor: '#fff'
      });
      //获取起始单体电压
      lastarray.push(monBarData.vol[0].map(item => {
        return item[1];
@@ -1103,6 +1116,24 @@
        backgroundColor: '#fff'
      });
            // 单体电压折线图
            monLineChart.title.show = true;
            monLineChart.title.text = "单体电压(V)";
            monLineChart.title.x = 'center';
            monLineChart.series = monLineData.vol.map((item, index) => {
                let monNum = "#" + (index + 1);
                return {
                    name: monNum,
                    data: item
                };
            });
            let monLineChartVolOption = this.$refs.groupVol.getOption(monLineChart);
            this.createGraphByOpt(monLineChartVolOption);
            let vol_line = allGraph.getDataURL({
                pixelRatio: 1,
                backgroundColor: '#fff'
            });
      // 单体温度折线图
      monLineChart.title.show = true;
      monLineChart.title.text = "单体温度(℃)";
@@ -1121,12 +1152,29 @@
        backgroundColor: '#fff'
      });
            // 单体剩余容量折线图
            monLineChart.title.show = true;
            monLineChart.title.text = "剩余容量(AH)";
            monLineChart.title.x = 'center';
            monLineChart.series = monLineData.resCap.map((item, index) => {
                let monNum = "#" + (index + 1);
                return {
                    name: monNum,
                    data: item
                };
            });
            let monLineChartResCapOption = this.$refs.groupVol.getOption(monLineChart);
            this.createGraphByOpt(monLineChartResCapOption);
            let resCap_line = allGraph.getDataURL({
                pixelRatio: 1,
                backgroundColor: '#fff'
            });
      // 单体内阻
      let monBarRes = monBarData.res;
      let monBarResArr = monBarRes.map(item => {
        return item[1];
      });
      debugger;
      monBarChart.title.show = true;
      monBarChart.title.text = this.getTitle(monBarResArr, "Resistance");
      monBarChart.title.x = 'center';
@@ -1213,6 +1261,7 @@
      this.$refs.restcap_echart.value = orbottom3;    //单体剩余容量
      this.$refs.capperc_echart.value = orbottom4;    //单体容量百分比
      this.$refs.tmp_echart.value = tmp_line;    // 单体温度
            this.$refs.restcap_line_echart.value = resCap_line;      // 剩余容量
      this.$refs.mon_res.value = mon_res;    // 单体内阻
      this.$refs.JH_curr.value = JH_curr;    // 单体均衡电流
      this.$refs.last_vol.value = last_vol;    // 终止单体电压柱状图
@@ -1465,7 +1514,8 @@
          type: 'null',
        }).then(() => {
          this.addStandardLine(searchParams);
        }).catch(() => {});
                }).catch(() => {
                });
      } else {
        this.$layer.msg('暂无放电数据,请先选择充放电数据!');
      }
src/pages/dataTest/movingRingSystem/const/getPowerConfigData.js
@@ -4,6 +4,7 @@
        moduleCap: 0,
        moduleInUseCount: 16,
        moduleSlotCount: 16,
        usePurpose: '没意图',
    };
    let ac = {
        powerDeviceId: 0,
src/pages/dataTest/movingRingSystem/dialog/acConfig.vue
@@ -23,6 +23,30 @@
                        </el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="交流母线输入开关个数" prop="inputSWCount">
                        <el-input
                            placeholder="请输入交流母线输出开关个数"
                            v-model="params.inputSWCount">
                        </el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="容量" prop="cap">
                        <el-input
                            placeholder="请输入容量"
                            v-model="params.cap">
                        </el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="用途" prop="usePurpose">
                        <el-input
                            placeholder="请输入用途"
                            v-model="params.usePurpose">
                        </el-input>
                    </el-form-item>
                </el-col>
            </el-row>
            <div class="form-footer">
                <three-btn @click="validData">确定</three-btn>
@@ -83,9 +107,18 @@
                usePurpose: '没意图',
            },
            rules: {
                inputSWCount: [
                    {required: true, message: '请输入交流母线输入开关个数', trigger: 'change'},
                ],
                outputSWCount: [
                    {required: true, message: '请输入交流母线输出开关个数', trigger: 'change'},
                ]
                ],
                cap: [
                    {required: true, message: '请输入容量', trigger: 'change'},
                ],
                usePurpose: [
                    {required: true, message: '请输入用途', trigger: 'change'},
                ],
            },
        }
    },
src/pages/dataTest/movingRingSystem/dialog/acDcConfig.vue
@@ -35,7 +35,7 @@
                    <el-form-item label="模块容量(AH)" prop="moduleCap">
                        <el-input
                            placeholder="请输入模块容量"
                            v-model="params.moduleSlotCount">
                            v-model="params.moduleCap">
                        </el-input>
                    </el-form-item>
                </el-col>
src/pages/dataTest/movingRingSystem/dialog/dcConfig.vue
@@ -18,8 +18,32 @@
                <el-col :span="layout.span">
                    <el-form-item label="直流开关路数" prop="outputSWCount">
                        <el-input
                            placeholder="请输入直流开关路数"
                            placeholder="请输入直流开关输出路数"
                            v-model="params.outputSWCount">
                        </el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="直流开关路数" prop="inputSWCount">
                        <el-input
                            placeholder="请输入直流开关输入路数"
                            v-model="params.inputSWCount">
                        </el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="容量" prop="cap">
                        <el-input
                            placeholder="请输入容量"
                            v-model="params.cap">
                        </el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="用途" prop="usePurpose">
                        <el-input
                            placeholder="请输入用途"
                            v-model="params.usePurpose">
                        </el-input>
                    </el-form-item>
                </el-col>
@@ -83,9 +107,18 @@
                usePurpose: '没意图',
            },
            rules: {
                inputSWCount: [
                    {required: true, message: '请输入直流开关输入路数', trigger: 'change'},
                ],
                outputSWCount: [
                    {required: true, message: '请输入交流母线输出开关个数', trigger: 'change'},
                ]
                ],
                cap: [
                    {required: true, message: '请输入容量', trigger: 'change'},
                ],
                usePurpose: [
                    {required: true, message: '请输入用途', trigger: 'change'},
                ],
            },
        }
    },
src/pages/dataTest/movingRingSystem/powerBox.vue
@@ -2,6 +2,20 @@
    <flex-layout direction="row" class="page-real-time" :no-bg="true">
        <content-box style="margin-left: 4px; margin-right: 4px;" :title="battFullName">
            <div class="flex-page-content">
                <div class="page-content-tools">
                    <div>
                        <el-row :gutter="8">
                            <el-col :span="16" class="status-text">
                                通讯状态:
                            </el-col>
                            <el-col :span="8">
                                <hdw-light :type="allSignal"></hdw-light>
                            </el-col>
                        </el-row>
                    </div>
                </div>
                <el-tabs type="border-card" class="flex-layout noborder top-border" v-model="acTabs" @tab-click="tabsChange">
                    <el-tab-pane label="交流配电柜遥测量" name="acData">
                        <div class="full-height">
@@ -61,7 +75,8 @@
                        </div>
                    </el-tab-pane>
                    <el-tab-pane label="交流配电柜遥信量" name="acSignalData">
                        <power-box-component title="交流配电柜遥信量" :data="acSignalData" :length="6">
                        <power-box-component title="交流配电柜遥测量" :data="acData" :length="1"></power-box-component>
                        <power-box-component title="交流配电柜遥信量" :data="acSignalData" :length="4">
                            <div slot="tools">
                                <i class="box-tools el-icon-s-tools" @click="acDialog=true"></i>
                            </div>
@@ -141,7 +156,8 @@
                        </div>
                    </el-tab-pane>
                    <el-tab-pane label="高频开关电源柜遥信量" name="acDcSignalData">
                        <power-box-component title="高频开关电源柜遥信量" :data="acDcSignalData" :length="6">
                        <power-box-component title="高频开关电源柜遥测量" :data="acDcData" :length="1"></power-box-component>
                        <power-box-component title="高频开关电源柜遥信量" :data="acDcSignalData" :length="4">
                            <div slot="tools">
                                <i class="box-tools el-icon-s-tools" @click="acDcDialog=true"></i>
                            </div>
@@ -197,7 +213,8 @@
                        </div>
                    </el-tab-pane>
                    <el-tab-pane label="直流配电柜遥信量" name="dcSignalData">
                        <power-box-component title="直流配电柜遥信量" :data="dcSignalData" :length="6">
                        <power-box-component title="直流配电柜遥测量" :data="dcData" :length="1"></power-box-component>
                        <power-box-component title="直流配电柜遥信量" :data="dcSignalData" :length="4">
                            <div slot="tools">
                                <i class="box-tools el-icon-s-tools" @click="dcDialog=true"></i>
                            </div>
@@ -273,9 +290,11 @@
import getYMax from "@/components/chart/js/getYMax";
import getItemByKey from "@/assets/js/tools/getItemByKey";
import ChartTypeConfig from "@/pages/dataTest/movingRingSystem/dialog/chartTypeConfig";
import HdwLight from "@/pages/dataMager/components/HdwLight";
export default {
    name: "powerBox",
    components: {
        HdwLight,
        ChartTypeConfig,
        FlexBox,
        DcConfig,
@@ -354,6 +373,7 @@
            },
            timer: new Timeout(),
            acTabs: "acData",
            allSignal: -1,
            batt: {},
            powerData: {
                info: {
@@ -432,6 +452,7 @@
                        moduleCap: data.moduleCap,
                        moduleInUseCount: data.moduleInUseCount,
                        moduleSlotCount: data.moduleSlotCount,
                        usePurpose: data.usePurpose,
                    };
                }else {
                    this.configs.acDc = getPowerConfigData('acDc');
@@ -620,14 +641,32 @@
            this.$apis.dataMager.powerMager.getPowerBoxData(id).then(res=>{
                let rs = JSON.parse(res.data.result);
                if(rs.code == 1) {
                    this.allSignal = 0;
                    let data = rs.data;
                    // 交流
                    if(data.ac.commStatus) {
                    this.setAcInfo(data.ac);
                    }else {
                        this.setAcInfo({});
                    }
                    // 高频
                    if(data.acdc.commStatus) {
                    this.setAcDcInfo(data.acdc);
                    }else {
                        this.setAcDcInfo({});
                    }
                    // 直流
                    if(data.dc.commStatus) {
                    this.setDcInfo(data.dc);
                    }else {
                        this.setDcInfo({});
                    }
                }else {
                    this.setAcInfo({});
                    this.setAcDcInfo({});
                    this.setDcInfo({});
                    this.allSignal = 1;
                }
            }).catch(error=>{
@@ -636,11 +675,14 @@
        },
        setAcInfo(data) {       // 设置交流配电柜的值
            let acTabs = this.acTabs;
            if(acTabs == "acData") {
            if(acTabs == "acData" || acTabs == "acSignalData") {
                this.acData.map(item=>{
                    item.value = getValByKey(item.key, data, "???");
                });
                if(acTabs == "acData") {
                this.setAcChart(this.acData);
                }
            }
            if(acTabs == "acSignalData") {
@@ -651,11 +693,15 @@
        },
        setAcDcInfo(data) {     // 设置高频开关电源柜的值
            let acTabs = this.acTabs;
            if(acTabs == "acDcData") {
            if(acTabs == "acDcData" || acTabs == "acDcSignalData") {
                this.acDcData.map(item=>{
                    item.value = getValByKey(item.key, data, "???");
                });
                if(acTabs == "acDcData") {
                this.setAcDcChart(this.acDcData);
                }
            }
            if(acTabs == "acDcSignalData") {
                this.acDcSignalData.map(item=>{
@@ -665,11 +711,14 @@
        },
        setDcInfo(data) {       // 设置直流配电柜的值
            let acTabs = this.acTabs;
            if(acTabs == "dcData") {
            if(acTabs == "dcData" || acTabs == "dcSignalData") {
                this.dcData.map(item=>{
                    item.value = getValByKey(item.key, data, "???");
                });
                if(acTabs == "dcData") {
                this.setDcChart(this.dcData);
                }
            }
            if(acTabs == "dcSignalData") {
                this.dcSignalData.map(item=>{
@@ -1001,4 +1050,15 @@
.flex-box-tools-icon:active {
    color: #FF0000;
}
.page-content-tools {
    position: absolute;
    top: 12px;
    right: 12px;
    z-index: 99;
}
.status-text {
    line-height: 32px;
    white-space: nowrap;
    font-size: 14px;
}
</style>