提交内容

whychdw

2021-06-02 d03dd9bb6ef1eb094e4f2e889cc5ec27fb770b8e

提交内容

 .gitignore

@@ -21,3 +21,6 @@
*.njsproj
*.sln
*.sw?
.project
.settings/
.vs

 src/assets/js/apis/outline/index.js

@@ -47,6 +47,21 @@
            url: 'Fbs9100_setparamAction_action_updateMaintain',
            data: 'json='+JSON.stringify(data),
        });
    },
    /**
     * 重启设备
     * @param id
     * @returns {AxiosPromise}
     */
    restart(id) {
        return axios({
            method: 'post',
            url: 'Fbs9100_setparamAction_action_updateMaintain',
            data: 'json='+JSON.stringify({
                dev_id: id,
                op_cmd: 16
            }),
        });
    }
    /**
     * ps: 更新，启动和停止公用一个接口，但是发送的命令不同

 src/assets/js/const/const_9100.js

@@ -22,9 +22,13 @@
            value: 50
        },
        {
            label: '充电测试',
            value: 0x40,
        }
            label: 'K1/D1测试',
            value: 72
        },
        // {
        //     label: '充电测试',
        //     value: 0x40,
        // }
    ],
    dischargeRules: {
        DisCurr: {  // 放电电流

 src/assets/js/const/const_plan.js

@@ -93,14 +93,14 @@
            msg: '取值范围1~10000（整数）'
        },
        preset_monvol: {        // 单体电压下限
            pattern: /^[0-9]{1,3}(\.[0-9]{0,2})?$/,
            pattern: /^[0-9]+(\.[0-9]{0,2})?$/,
            regVal: true,
            min: 0,
            max: 1000,
            msg: '取值范围0~1000（保留两位小数）'
        },
        preset_groupvol: {      // 组端电压下限
            pattern: /^[0-9]{1,2}(\.[0-9]{0,1})?$/,
            pattern: /^[0-9]+(\.[0-9]{0,1})?$/,
            regVal: true,
            min: 43,
            max: 54,

 src/components/params/BTS/DischargeParams.vue

@@ -65,12 +65,12 @@
                    </el-form-item>
                </div>
                <div class="table-cell pr16">
                    <el-form-item label="单体下限阀值（0~20V）" prop="MonomerVol_Low">
                    <el-form-item :label="rangeLabel.MonomerVol_Low" prop="MonomerVol_Low">
                        <el-input v-model="params.MonomerVol_Low"></el-input>
                    </el-form-item>
                </div>
                <div class="table-cell">
                    <el-form-item label="组端下限阀值（0~420V）" prop="GroupVol_Low">
                    <el-form-item :label="rangeLabel.GroupVol_Low" prop="GroupVol_Low">
                        <el-input v-model="params.GroupVol_Low"></el-input>
                    </el-form-item>
                </div>
@@ -142,6 +142,18 @@
        let cmd = const_9100.cmd;
        let testType = const_9100.testType;
        let rules = const_9100.dischargeRules;
        let batt = this.batt;

        // 修改组端下限的取值范围
        rules.GroupVol_Low.min = (batt.MonCount*batt.MonVolStd*0.875).toHold(1);
        rules.GroupVol_Low.max = (batt.MonCount*batt.MonVolStd*1.125).toHold(1);
        rules.GroupVol_Low.msg = "取值范围"+rules.GroupVol_Low.min+"~"+rules.GroupVol_Low.max+"(保留一位小数)";

        // 修改电池单体下限的取值范围
        rules.MonomerVol_Low.min = (batt.MonVolStd*0.9).toHold(1);
        rules.MonomerVol_Low.max = (batt.MonVolStd*1.2).toHold(1);
        rules.MonomerVol_Low.msg = "取值范围"+rules.MonomerVol_Low.min+"~"+rules.MonomerVol_Low.max+"(保留一位小数)";

        return {
            cmd: cmd,               // 操作命令
            startTestFlag: false,   // 启动测试的状态
@@ -163,6 +175,20 @@
                ChargeCurrSet: 0,   //充电电流
                DCVolHighLimit: 0,  //升压上限
                MonomerTmp_High: 0  //温度上限
            },
            ranges: {
                GroupVol_Low: {
                    name: '组端电压下限',
                    unit: 'V',
                    min: rules.GroupVol_Low.min,
                    max: rules.GroupVol_Low.max
                },
                MonomerVol_Low: {
                    name: '单体电压下限',
                    unit: 'V',
                    min: rules.MonomerVol_Low.min,
                    max: rules.MonomerVol_Low.max
                }
            },
            rules: {
                DisCurr: [{
@@ -368,7 +394,16 @@
                groupInfo: groupInfo,
                GroupIndexInFBSDevice: this.batt.GroupIndexInFBSDevice + 1,
            }
        }
        },
        rangeLabel() {
            let ranges = this.ranges;
            let result = {};
            for(let key in ranges) {
                let item = ranges[key];
                result[key] = item.name+"("+item.min+"~"+item.max+item.unit+")";
            }
            return result;
        },
    },
    mounted() {
        // 获取数据

 src/pages/dataTest/realTime.vue

@@ -92,7 +92,7 @@
                                        <a @click="restartPlanDialog.show = true" href="javascript:void(0);">定期重启设备</a>
                                    </li>
                                    <li class="hdw-menu-item" v-if="control.data.restart.show">
                                        <a href="javascript:void(0);">重启设备</a>
                                        <a href="javascript:void(0);" @click="restartSystem">重启设备</a>
                                    </li>
                                </ul>
                            </div>
@@ -1071,7 +1071,7 @@
            realTimePowerOffs() {
                let batt = this.batt;
                // 设备为61850显示右侧的面板
                if (regEquipType(batt.FBSDeviceId, ["equip61850", "BTS9110"])) {
                if (regEquipType(batt.FBSDeviceId, ["equip61850"])) {
                    this.stateListShow = true;
                } else {
                    this.stateListShow = false;
@@ -1905,7 +1905,36 @@
            },
            closeDisChargeDialog() {
                this.dischargeDialog.show = false;
            }
            },
            restartSystem() {
                let self = this;
                let batt = this.batt;
                let resetPwd = 'restart123456';
                this.$prompt('请输入重启密码', '提示', {
                    confirmButtonText: '确定',
                    cancelButtonText: '取消',
                    inputType: 'password',
                }).then(({value})=>{
                    if(value == resetPwd) {
                        let loading = this.$layer.loading();
                        this.$apis.outline.restart(batt.FBSDeviceId).then(res=>{
                            let rs = JSON.parse(res.data.result);
                            if(rs.code == 1){
                                this.$alert('发送重启命令成功', '系统提示');
                            }else{
                                this.$alert('发送重启命令失败!', '系统提示');
                            }
                            this.$layer.close(loading);
                        }).catch(error=>{

                        });
                    }else {
                        this.$layer.msg("密码不正确");
                    }
                }).catch(() => {

                });
            },
        },
        computed: {
            battFullName() {
@@ -2205,4 +2234,4 @@
        flex: 1;
        overflow: hidden;
    }
</style>
</style>

 src/pages/jobManage/params/DischargePlan.vue

@@ -24,12 +24,12 @@
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="单体电压下限(0~1000V)" prop="preset_monvol">
                    <el-form-item :label="rangeLabel.preset_monvol" prop="preset_monvol">
                        <el-input v-model="params.preset_monvol"></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="组端电压下限(43.0~54.0V)" prop="preset_groupvol">
                    <el-form-item :label="rangeLabel.preset_groupvol" prop="preset_groupvol">
                        <el-input v-model="params.preset_groupvol"></el-input>
                    </el-form-item>
                </el-col>
@@ -106,10 +106,27 @@
        addPlan: {
            type: Boolean,
            default: false
        },
        batt: {
            type: Object,
            default() {
                return {}
            }
        }
    },
    data() {
        let rules = const_plan.rules;
        let batt = this.batt;

        // 修改组端下限的取值范围
        rules.preset_groupvol.min = (batt.MonCount*batt.MonVolStd*0.875).toHold(1);
        rules.preset_groupvol.max = (batt.MonCount*batt.MonVolStd*1.125).toHold(1);
        rules.preset_groupvol.msg = "取值范围"+rules.preset_groupvol.min+"~"+rules.preset_groupvol.max+"(保留一位小数)";

        // 修改电池单体下限的取值范围
        rules.preset_monvol.min = (batt.MonVolStd*0.9).toHold(1);
        rules.preset_monvol.max = (batt.MonVolStd*1.2).toHold(1);
        rules.preset_monvol.msg = "取值范围"+rules.preset_monvol.min+"~"+rules.preset_monvol.max+"(保留一位小数)";
        return {
            layout: {
                gutter: 16,
@@ -136,6 +153,20 @@
                discharge_starttime: "",        // 放电开始时间
                discharge_starttime1: "",
                discharge_stoptime1: "",
            },
            ranges: {
                preset_groupvol: {
                    name: '组端电压下限',
                    unit: 'V',
                    min: rules.preset_groupvol.min,
                    max: rules.preset_groupvol.max
                },
                preset_monvol: {
                    name: '单体电压下限',
                    unit: 'V',
                    min: rules.preset_monvol.min,
                    max: rules.preset_monvol.max
                }
            },
            rules: {
                preset_cap: [{
@@ -291,6 +322,17 @@
            this.$emit("update:visible", false);
        },
    },
    computed: {
        rangeLabel() {
            let ranges = this.ranges;
            let result = {};
            for(let key in ranges) {
                let item = ranges[key];
                result[key] = item.name+"("+item.min+"~"+item.max+item.unit+")";
            }
            return result;
        },
    },
    mounted() {
        // 对plan进行处理, 对params添加初始值
        Object.keys(this.params).forEach(key=>{

 src/pages/jobManage/params/addplan1.vue

@@ -103,6 +103,7 @@
            <discharge-plan
                v-if="dialogs.dischargePlan.show"
                :plan="plan"
                :batt="batt"
                add-plan
                @changeParams="changeParams"></discharge-plan>
        </el-dialog>
@@ -167,6 +168,7 @@
            start_time:'',
            stop_time:'',
            loading: '',
            batt: {},
            filters: {
                values: {
                    province: '',
@@ -508,9 +510,8 @@
                let transfromData = this.objTransformUtil(this.transformObj, data);
                transfromData.StationName = transfromData.note;
                this.plan = transfromData;
                this.dialogs.dischargePlan.show = true;
                // 关闭等待框
                this.$layer.close(loading);
                // 获取电池信息并显示面板和关闭等待框
                this.getBattGroupInfo(params.BattGroupId, loading);
            }).catch(error=>{
                console.log(error);
                // 关闭等待框
@@ -585,6 +586,27 @@
                this.$layer.close(loading);
            });
        },
        getBattGroupInfo(BattGroupId, loading) {
            this.$apis.dataMager.battGroupMager
                .getBattGroupInfo(BattGroupId)
                .then((res) => {
                    let rs = JSON.parse(res.data.result);
                    if (rs.code == 1) {
                        this.batt = rs.data[0];
                        this.dialogs.dischargePlan.show = true;
                    } else {
                        this.batt = {};
                        this.$layer.msg("未获取到电池组的信息");
                    }
                    // 关闭等待框
                    this.$layer.close(loading);
                })
                .catch((error) => {
                    // 关闭等待框
                    this.$layer.close(loading);
                    console.log(error);
                });
        },
    },
    mounted() {
        // 查询省-市-区县-机房