修改内容

whychdw

2021-03-10 eb1a823b0627d1b3d944f79e397b385f7333c1de

修改内容

 src/assets/js/config.js

@@ -2,16 +2,16 @@
    uKey: {
        label: 'uKey',
        des: "用户需要通过插入uKey才可以登录",
        value: true,
        value: false,
    },
    face: {
        label: "人脸识别",
        des: "用户可以直接通过人脸识别登录",
        value: true
        value: false
    },
    autograph: {
        label: '签名',
        des: '电池信息配置中添加设备的签名，用于充放电测试时验证',
        value: true,
        value: false,
    },
}

 src/components/params/61850/DischargeParams.vue

@@ -70,7 +70,7 @@
                    </el-form-item>
                </div>
                <div class="table-cell">
                    <el-form-item label="单体电压下限（1.80~2.25V）" prop="MonomerVol_Low">
                    <el-form-item :label="rangeLabel.MonomerVol_Low" prop="MonomerVol_Low">
                        <el-input v-model="params.MonomerVol_Low" :readonly="readOnly"></el-input>
                    </el-form-item>
                </div>
@@ -125,6 +125,11 @@
        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,       // 操作命令
            testType: testType,    // 测试类型
@@ -138,6 +143,12 @@
                    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
                }
            },
            params: {
                num: 0,
@@ -373,7 +384,9 @@
            });
        },
        // 清除告警
        clearWarning() {}
        clearWarning() {

        }
    },
    computed: {
        otherParams() {
@@ -394,7 +407,6 @@
                let item = ranges[key];
                result[key] = item.name+"("+item.min+"~"+item.max+item.unit+")";
            }
            console.log(ranges);
            return result;
        },
    },

 src/pages/HomeList.vue

@@ -17,7 +17,7 @@
                @change="filterChange">
                    <el-option
                    v-for="item in homeList"
                    :key="item.id"
                    :key="item.key"
                    :label="item.label"
                    :value="item.id">
                    </el-option>
@@ -112,6 +112,7 @@
            data.forEach(item=>{
                let tmp = {};
                tmp.label = item.StationName1+"-"+item.StationName2+"-"+item.StationName5+"-"+item.StationName3;
                tmp.key = item.FBSDeviceId+Math.random();
                tmp.id = item.FBSDeviceId;
                tmp.data = item;
                let index = this.checkValIsIn(tmp.label, homeList);

 src/pages/dataTest/HomeList.vue

@@ -18,7 +18,7 @@
                @change="filterChange">
                    <el-option
                    v-for="item in homeList"
                    :key="item.id"
                    :key="item.key"
                    :label="item.label"
                    :value="item.id">
                    </el-option>
@@ -119,6 +119,7 @@
            data.forEach(item=>{
                let tmp = {};
                tmp.label = item.StationName1+"-"+item.StationName2+"-"+item.StationName5+"-"+item.StationName3;
                tmp.key = item.FBSDeviceId+Math.random();
                tmp.id = item.FBSDeviceId;
                tmp.data = item;
                let index = this.checkValIsIn(tmp.label, homeList);

 src/pages/dataTest/movingRingSystem/HomeList.vue

@@ -18,7 +18,7 @@
                    @change="filterChange">
                    <el-option
                        v-for="item in homeList"
                        :key="item.id"
                        :key="item.key"
                        :label="item.label"
                        :value="item.id">
                    </el-option>
@@ -122,6 +122,7 @@
            data.forEach(item => {
                let tmp = {};
                tmp.label = item.StationName1 + "-" + item.StationName2 + "-" + item.StationName5 + "-" + item.StationName3;
                tmp.key = item.FBSDeviceId+Math.random();
                tmp.id = item.FBSDeviceId;
                tmp.data = item;
                let index = this.checkValIsIn(tmp.label, homeList);

 src/pages/dataTest/realTime.vue

@@ -1058,7 +1058,6 @@
                    dev_id: batt.FBSDeviceId,
                }).then((res) => {
                    let rs = JSON.parse(res.data.result);
                    console.log(rs);
                    let outTime = 2 * 60; //设备超时时间(2分钟)
                    let isOutTime = true; //通讯中断        判断设备是否通讯中断    true:中断    false:正常
                    if (rs.code == 1) {