修改下拉

whychdw

2019-10-22 aea3c38984253aba79d38353ed24d10175e2bf7d

修改下拉

 platforms/android/app/src/main/assets/www/js/common_functions.js

@@ -9,6 +9,80 @@
    return rs;
}

// 电池放电类型
var TESTTYPE = [
    {
        name: '恒电流',
        value: 0,
    },
    {
        name: '恒功率',
        value: 1,
    },
    {
        name: '恒电阻',
        value: 2,
    }
];

// 电池单体电压
var MONVOL = [
    {
        name: 2,
        value: 2,
    },
    {
        name: 6,
        value: 6,
    },
    {
        name: 12,
        value: 12,
    }
];

// 活化开始
var CYCLESTART = [
    {
        name: '放电',
        value: 0,
    },
    {
        name: '充电',
        value: 1,
    }
];

// 根据value值获取对应的name值
function getNameByValue(val, lists) {
    var name = '';
    // 遍历列表
    for(var i=0; i<lists.length; i++) {
        var list = lists[i];
        if(list.value == val) {
            name = list.name;
            break;
        }
    }
	
    return name;
}

// 根据value值获取对应的name值
function getValueByName(name, lists) {
    var value = '';
    // 遍历列表
    for(var i=0; i<lists.length; i++) {
        var list = lists[i];
        if(list.name == name) {
            value = list.value;
            break;
        }
    }
	
    return value;
}

// 定义设备状态对应关系
var devWorkerStates = [
    {

 platforms/android/app/src/main/assets/www/pages/batttest/batttest.html

@@ -37,12 +37,9 @@
                <li class="bui-btn bui-box clearactive">

                    <label class="bui-label">单体电压：</label>

                    <div class="span6">

                        <div class="bui-input h-input">

                            <input 
                            v-model="testParams.mon_vol"

                            type="number" 
                            class="bui-input" 
                            placeholder="请输入单体电压">

                        <div id="monVolSelect" class="bui-btn bui-box bui-btn-sm">

                            <div class="span1">2</div>

                            <i class="icon-listright"></i>

                        </div>

                    </div>

                    <div class="span1">V</div>


 platforms/android/app/src/main/assets/www/pages/batttest/batttest.js

@@ -85,7 +85,10 @@
                saveState: {

                    isDisabled: true,

                    isNew: true,

                }

                },

                dischargeModeSelect: '',        // 放电模式

                activitySelect: '',            // 活化开始

                monVolSelect: '',         // 单体电压

            },

            watch: {

                testParams: {        // 监控测试数据修改保存按钮的状态

@@ -166,7 +169,10 @@
                    if(typeof(JSInterface) != 'undefined') {

                        JSInterface.getTestParam();

                    }else {

                        // bui.alert('请使用手机端登陆！');

                        getTestParamWorker.postMessage({

                            code:1,

                            data: this.testParams,

                        });

                    }

                },

                getBattNames: function() {

@@ -217,6 +223,33 @@
                        bui.alert("请使用手机端登陆！");

                    }

                },

                /* 测试类型 */

                setTestType: function(name) {    // 设置测试类型

                    var value = getValueByName(name, TESTTYPE);

                    this.testParams.testType = value;

                },

                setDischargeModeSelect: function(val) {        // 设置下拉框的值

                    var name = getNameByValue(val, TESTTYPE);

                    this.dischargeModeSelect.value(name);

                },

                /* 活化开始 */

                setCycleStart: function(name) {

                    var value = getValueByName(name, CYCLESTART);

                    this.testParams.cycleStart = value;

                },

                setActivitySelect: function(val) {

                    var name = getNameByValue(val, CYCLESTART);

                    this.activitySelect.value(name);

                },

                /* 设置单体单体电压 */

                setMonVol: function(name) {

                    var value = getValueByName(name, MONVOL);

                    this.testParams.mon_vol = value;

                },

                setMonVolSelect: function(val) {

                    var name = getNameByValue(val, MONVOL);

                    this.monVolSelect.value(name);

                }

            },

            mounted: function mounted() {

                var self = this;

@@ -231,7 +264,7 @@
                });

                

                // 活化开始下拉框

                var activitySelect = bui.select({

                var activitySelect = this.activitySelect = bui.select({

                    trigger: "#activitySelect",

                    title: "请选择活化开始",

                    type: "radio",

@@ -240,21 +273,34 @@
                    field: {

                        value: "name"

                    },

                    value: ['放电'],

                    data: [

                        {

                            name: '放电',

                            value: 0,

                        },

                        {

                            name: '充电',

                            value: 1,

                        }

                    ]

                    value: [CYCLESTART[0].name],

                    data: CYCLESTART,

                    onChange: function() {

                        // 设置放电测试类型

                        self.setCycleStart(activitySelect.value());

                    }

                });



                // 单体电压系列框

                var monVolSelect = this.monVolSelect = bui.select({

                    trigger: "#monVolSelect",

                    title: "请选择单体电压",

                    type: "radio",

                    height: 300,

                    autoClose: true,

                    field: {

                        value: "name"

                    },

                    value: [MONVOL[0].name],

                    data: MONVOL,

                    onChange: function() {

                        // 设置放电测试类型

                        self.setMonVol(monVolSelect.value());

                    }

                });

                

                // 放电模式下拉框

                var dischargeModeSelect = bui.select({

                var dischargeModeSelect = this.dischargeModeSelect = bui.select({

                    trigger: "#dischargeModeSelect",

                    title: "请选择放电模式",

                    type: "radio",

@@ -263,23 +309,14 @@
                    field: {

                        value: "name"

                    },

                    value: ['恒电流'],

                    data: [

                        {

                            name: '恒电流',

                            value: 0,

                        },

                        {

                            name: '恒功率',

                            value: 1,

                        },

                        {

                            name: '恒电阻',

                            value: 2,

                        }

                    ]

                    value: [TESTTYPE[0].name],

                    data: TESTTYPE,

                    onChange: function() {

                        // 设置放电测试类型

                        self.setTestType(dischargeModeSelect.value());

                    }

                });

                


                // 获取电池参数

                this.getTestParam();

                

@@ -292,6 +329,12 @@
                        var data = res.data.data;

                        self.setActive(data.battName);

                        self.testParams = data;

                        // 设置放电测试类型

                        self.setDischargeModeSelect(data.testType);

                        // 设置活化开始

                        self.setActivitySelect(data.cycleStart);

                        // 设置单体电压

                        self.setMonVolSelect(data.mon_vol);

                    }else {

                        bui.alert('获取测试参数失败！');

                    }


 platforms/android/app/src/main/assets/www/pages/router/router.js

@@ -14,11 +14,11 @@
        url: '../discharge/discharge.html'
    },
    {
         path: 'batttest',
        path: 'batttest',
        url: '../batttest/batttest.html'
    },
    {
         path: 'testdata',
        path: 'testdata',
        url: '../testdata/testdata.html'
    },
];

 www/js/common_functions.js

@@ -9,6 +9,80 @@
    return rs;
}

// 电池放电类型
var TESTTYPE = [
    {
        name: '恒电流',
        value: 0,
    },
    {
        name: '恒功率',
        value: 1,
    },
    {
        name: '恒电阻',
        value: 2,
    }
];

// 电池单体电压
var MONVOL = [
    {
        name: 2,
        value: 2,
    },
    {
        name: 6,
        value: 6,
    },
    {
        name: 12,
        value: 12,
    }
];

// 活化开始
var CYCLESTART = [
    {
        name: '放电',
        value: 0,
    },
    {
        name: '充电',
        value: 1,
    }
];

// 根据value值获取对应的name值
function getNameByValue(val, lists) {
    var name = '';
    // 遍历列表
    for(var i=0; i<lists.length; i++) {
        var list = lists[i];
        if(list.value == val) {
            name = list.name;
            break;
        }
    }
	
    return name;
}

// 根据value值获取对应的name值
function getValueByName(name, lists) {
    var value = '';
    // 遍历列表
    for(var i=0; i<lists.length; i++) {
        var list = lists[i];
        if(list.name == name) {
            value = list.value;
            break;
        }
    }
	
    return value;
}

// 定义设备状态对应关系
var devWorkerStates = [
    {

 www/pages/batttest/batttest.html

@@ -37,12 +37,9 @@
                <li class="bui-btn bui-box clearactive">

                    <label class="bui-label">单体电压：</label>

                    <div class="span6">

                        <div class="bui-input h-input">

                            <input 
                            v-model="testParams.mon_vol"

                            type="number" 
                            class="bui-input" 
                            placeholder="请输入单体电压">

                        <div id="monVolSelect" class="bui-btn bui-box bui-btn-sm">

                            <div class="span1">2</div>

                            <i class="icon-listright"></i>

                        </div>

                    </div>

                    <div class="span1">V</div>


 www/pages/batttest/batttest.js

@@ -85,7 +85,10 @@
                saveState: {

                    isDisabled: true,

                    isNew: true,

                }

                },

                dischargeModeSelect: '',        // 放电模式

                activitySelect: '',            // 活化开始

                monVolSelect: '',         // 单体电压

            },

            watch: {

                testParams: {        // 监控测试数据修改保存按钮的状态

@@ -166,7 +169,10 @@
                    if(typeof(JSInterface) != 'undefined') {

                        JSInterface.getTestParam();

                    }else {

                        // bui.alert('请使用手机端登陆！');

                        getTestParamWorker.postMessage({

                            code:1,

                            data: this.testParams,

                        });

                    }

                },

                getBattNames: function() {

@@ -217,6 +223,33 @@
                        bui.alert("请使用手机端登陆！");

                    }

                },

                /* 测试类型 */

                setTestType: function(name) {    // 设置测试类型

                    var value = getValueByName(name, TESTTYPE);

                    this.testParams.testType = value;

                },

                setDischargeModeSelect: function(val) {        // 设置下拉框的值

                    var name = getNameByValue(val, TESTTYPE);

                    this.dischargeModeSelect.value(name);

                },

                /* 活化开始 */

                setCycleStart: function(name) {

                    var value = getValueByName(name, CYCLESTART);

                    this.testParams.cycleStart = value;

                },

                setActivitySelect: function(val) {

                    var name = getNameByValue(val, CYCLESTART);

                    this.activitySelect.value(name);

                },

                /* 设置单体单体电压 */

                setMonVol: function(name) {

                    var value = getValueByName(name, MONVOL);

                    this.testParams.mon_vol = value;

                },

                setMonVolSelect: function(val) {

                    var name = getNameByValue(val, MONVOL);

                    this.monVolSelect.value(name);

                }

            },

            mounted: function mounted() {

                var self = this;

@@ -231,7 +264,7 @@
                });

                

                // 活化开始下拉框

                var activitySelect = bui.select({

                var activitySelect = this.activitySelect = bui.select({

                    trigger: "#activitySelect",

                    title: "请选择活化开始",

                    type: "radio",

@@ -240,21 +273,34 @@
                    field: {

                        value: "name"

                    },

                    value: ['放电'],

                    data: [

                        {

                            name: '放电',

                            value: 0,

                        },

                        {

                            name: '充电',

                            value: 1,

                        }

                    ]

                    value: [CYCLESTART[0].name],

                    data: CYCLESTART,

                    onChange: function() {

                        // 设置放电测试类型

                        self.setCycleStart(activitySelect.value());

                    }

                });



                // 单体电压系列框

                var monVolSelect = this.monVolSelect = bui.select({

                    trigger: "#monVolSelect",

                    title: "请选择单体电压",

                    type: "radio",

                    height: 300,

                    autoClose: true,

                    field: {

                        value: "name"

                    },

                    value: [MONVOL[0].name],

                    data: MONVOL,

                    onChange: function() {

                        // 设置放电测试类型

                        self.setMonVol(monVolSelect.value());

                    }

                });

                

                // 放电模式下拉框

                var dischargeModeSelect = bui.select({

                var dischargeModeSelect = this.dischargeModeSelect = bui.select({

                    trigger: "#dischargeModeSelect",

                    title: "请选择放电模式",

                    type: "radio",

@@ -263,23 +309,14 @@
                    field: {

                        value: "name"

                    },

                    value: ['恒电流'],

                    data: [

                        {

                            name: '恒电流',

                            value: 0,

                        },

                        {

                            name: '恒功率',

                            value: 1,

                        },

                        {

                            name: '恒电阻',

                            value: 2,

                        }

                    ]

                    value: [TESTTYPE[0].name],

                    data: TESTTYPE,

                    onChange: function() {

                        // 设置放电测试类型

                        self.setTestType(dischargeModeSelect.value());

                    }

                });

                


                // 获取电池参数

                this.getTestParam();

                

@@ -292,6 +329,12 @@
                        var data = res.data.data;

                        self.setActive(data.battName);

                        self.testParams = data;

                        // 设置放电测试类型

                        self.setDischargeModeSelect(data.testType);

                        // 设置活化开始

                        self.setActivitySelect(data.cycleStart);

                        // 设置单体电压

                        self.setMonVolSelect(data.mon_vol);

                    }else {

                        bui.alert('获取测试参数失败！');

                    }


 www/pages/router/router.js

@@ -14,11 +14,11 @@
        url: '../discharge/discharge.html'
    },
    {
         path: 'batttest',
        path: 'batttest',
        url: '../batttest/batttest.html'
    },
    {
         path: 'testdata',
        path: 'testdata',
        url: '../testdata/testdata.html'
    },
];