提交内容

whychdw

2019-10-21 e4c27e5bcfcfe25964626f659938388dffbae83f

提交内容

 .settings/org.eclipse.core.resources.prefs

New file
@@ -0,0 +1,2 @@
eclipse.preferences.version=1

encoding/<project>=UTF-8


 platforms/android/app/src/main/assets/www/css/common.css

@@ -47,6 +47,11 @@
    padding-top: .1rem;

    padding-bottom: .1rem;

}



.bui-btn.bui-btn-list-active {

    color: #2b85e4;

}



/* login */

.login-container {

    display: flex;


 platforms/android/app/src/main/assets/www/index.html

@@ -24,13 +24,13 @@


    <script src="js/common_functions.js"></script>

    

    <script src="index.js"></script>

    
    <script src="js/vue.min.js"></script>

    

    <script src="css/iview/iview.min.js"></script>

    

    <script src="js/componets.js"></script>

    
    <script src="index.js"></script>

</body>



</html>

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

@@ -26,7 +26,49 @@
            type: Array,
            default: function() {
                return [];
            }
            },
        },
        filename: {
            type: String,
            default: '',
        }
    }
    },
    template: `
        <ul class="bui-listview">
            <li v-for="(item, key) in list" :key="key">
                <div 
                class="bui-btn bui-box" 
                :class="{'bui-btn-list-active': getActiveClass(item.fileName)}"
                @click="handlerClick(item)">
                     <div class="span1">{{item.fileName}}</div>
                     <i class="icon-listright"></i>
                 </div>
            </li>
        </ul>
    `,
    data() {
        return {
            name: this.filename, 
        }
    },
    watch: {
        filename: function(newName) {
            this.name = newName;
        }
    },
    methods: {
        getActiveClass: function(name) {
            var rs = false;
            if(name == this.name) {
                rs = true;
            }
            return rs;
        },
        handlerClick: function(item) {
            // 设置被激活的列表
            this.name = item.fileName;
            // 给列表添加点击事件
            this.$emit('on-click', item);
        }
    },
});

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

@@ -2,20 +2,10 @@
<div id="battTestSidebarWrap" class="bui-sidebar-wrap">

    

    <div class="bui-sidebar swiperight">

        <ul class="bui-listview">

            <li>

                <div class="bui-btn bui-box">

                     <div class="span1">电池组1</div>

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

                 </div>

            </li>

            <li>

                <div class="bui-btn bui-box">

                     <div class="span1">电池组2</div>

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

                 </div>

            </li>

        </ul>

        <h-batt-list

        :filename="battList.name"

        :list="battList.list"

        @on-click="changeBatt"></h-batt-list>

    </div>

    

    <div class="bui-page">

@@ -36,9 +26,10 @@
                    <div class="span1">

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

                            <input 

                            v-model="groupInfo.battGroupName"

                            v-model="testParams.battName"

                            type="text" 

                            class="bui-input" 
                            class="bui-input"

                            disabled 
                            placeholder="请输入电池组名称">

                        </div>

                    </div>

@@ -48,7 +39,7 @@
                    <div class="span6">

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

                            <input 

                            v-model="groupInfo.monVol"

                            v-model="testParams.mon_vol"

                            type="number" 

                            class="bui-input" 

                            placeholder="请输入单体电压">

@@ -61,7 +52,7 @@
                    <div class="span6">

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

                            <input 

                            v-model="groupInfo.nomCap"

                            v-model="testParams.monCount"

                            type="number" 

                            class="bui-input"

                            placeholder="请输入标称容量">

@@ -99,7 +90,8 @@
                            <label class="bui-label">预设电流：</label>

                            <div class="span6">

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

                                    <input  
                                    <input

                                    v-model="testParams.disChargeCurr"  
                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入预设电流">

@@ -112,6 +104,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.disChargeCap"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入预设容量">

@@ -124,6 +117,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.disTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入预放时间">

@@ -136,6 +130,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.groupVolLow"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入组端下限">

@@ -148,6 +143,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.monVolLow"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入单体下限">

@@ -160,6 +156,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.monVolLowCount"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入下限个数">

@@ -176,6 +173,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.chargeVol"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入充电电压">

@@ -188,6 +186,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.chargeCurr"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入充电电流">

@@ -200,6 +199,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.floatVol"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入浮充电压">

@@ -211,7 +211,8 @@
                            <label class="bui-label">浮充电流：</label>

                            <div class="span6">

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

                                    <input 
                                    <input

                                    v-model="testParams.chargeStopCurr"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入浮充电流">

@@ -224,6 +225,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.monHighVol"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入单体上限">

@@ -236,6 +238,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.monHighVolCount"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入上限个数">

@@ -248,6 +251,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.chargeTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入均充时长">

@@ -260,6 +264,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.floatTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入浮充时长">

@@ -285,6 +290,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.cycleTimes"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入循环次数">

@@ -297,6 +303,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.waitdisTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入充完静置时长">

@@ -309,6 +316,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.waitchrTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入放完静置时长">

@@ -322,7 +330,7 @@
        </main>

        <footer>

            <div class="footer-inner" style="height: 50px; padding: 8px; text-align: right;">

                <i-button type="info" icon="ios-lock">保存</i-button>

                <i-button type="info" icon="ios-lock" disabled>保存</i-button>

                <i-button type="info" @click="routerTo">进入测试</i-button>

            </div>

        </footer>


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

@@ -13,9 +13,10 @@
        //  定义Worker线程

        getTestParamWorker = new Worker('worker/data.worker.js');

        getBattNamesWorker = new Worker('worker/data.worker.js');

        changeBattWorker = new Worker('worker/data.worker.js');

        var params = router.getPageParams();

        // 引入vue

        this.vm = new Vue({

        this.vm = new Vue({

            el: getPageRoot(module, true),

            data: {

                params: params,

@@ -23,6 +24,7 @@
                loading: bui.loading(),

                getTestParamWorker: getTestParamWorker,

                getBattNamesWorker: getBattNamesWorker,

                changeBattWorker: changeBattWorker,

                pages: {

                    name: 'activity',

                    title: '活化测试->参数',

@@ -36,6 +38,47 @@
                    nomCap: '100',

                    monNum: 24,

                },

                battList: {

                    name: '电池组1',

                    list: []

                },

                testParams: {

                    battName: '',    // 电池组名称

                    byteName: 0,    // 电池组名称字节数组

                    param_index: 0,    // 预置索引号

                    battStdCap: 0,    // 电池组标称容量

                    /* 放电参数 */

                    hourState: 1,     // 放电小时率

                    disChargeCurr: 0, // 放电电流

                    disChargeCap: 0,    // 放电电容

                    disTime: 0,        // 放电时长

                    monVolLow: 0,    // 单体下限

                    groupVolLow: 0,    // 组端下限

                    monCount: 0,    // 每组电池节数

                    groupCount: 0,    // 电池组组数

                    monVolLowCount: 0,    // 单体下限数量

                    dcVolHighLimit: 0,    // 升压上限

                    testType: 0,        // 测试类型（0:恒电流    1:恒功率      2:恒电阻）

                    dischargePower: 0,    // 预放功率

					
                    /* 充电参数 */

                    chargeCurr: 0,        // 充电电流

                    chargeVol: 0,        // 充电电压

                    floatVol: 0,         // 浮充电压

                    chargeCap: 0,        // 充电容量

                    chargeTime: 0,        // 充电时长

                    floatTime: 0,        // 浮充时长

                    chargeStopCurr: 0,    // 截止电流

                    groupHighVol: 0,    // 组端上限

                    monHighVol: 0,        // 单体上限

                    monHighVolCount: 0,    // 单体上限数量

					
                    /* 活化测试 */

                    cycleStart: 0,         // 活化起点

                    cycleTimes: 0,         // 活化次数

                    waitdisTime: 0,        // 充完静置

                    waitchrTime: 0,        // 放完静置

                }

            },

            methods: {

                setPages: function() {

@@ -87,16 +130,37 @@
                    if(typeof(JSInterface) != 'undefined') {

                        JSInterface.getTestParam();

                    }else {

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

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

                    }

                },

                getBattNames: function() {

                    if(typeof(JSInterface) != 'undefined') {

                        JSInterface.getBattNames();

                    }else {

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

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

                        getBattNamesWorker.postMessage({

                            cmd: '-1',

                            code: 1,

                            msg: '手动模拟数据',

                            data:[

                                {fileName: '电池组1'},

                                {fileName: '电池组2'},

                            ],

                        });

                    }

                }

                },

                setActive: function(name) {

                    this.battList.name = name;

                },

                changeBatt: function(item) {

                    var battName = item.fileName;

                    bui.alert(battName);

                    if(typeof(JSInterface) != 'undefined') {

                        JSInterface.changeBatt(battName);

                    }else {

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

                    }

                },

            },

            mounted: function mounted() {

                var self = this;

@@ -165,7 +229,13 @@
                

                // 设置Worker线程监控

                this.getTestParamWorker.onmessage = function(res) {

                    bui.alert(res.data);

                    if(res.data.code == 1) {

                        var data = res.data.data;

                        self.setActive(data.battName);

                        self.testParams = data;

                    }else {

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

                    }

                }

                

                // 获取电池列表

@@ -175,17 +245,22 @@
                this.getBattNamesWorker.onmessage = function(res) {

                    if(res.data.code == 1) {

                        //var data = JSON.parse(res.data.data);

                        bui.alert(res.data.data);

                        //bui.alert(res.data.data);

                        var data = res.data.data;

                        for(var i=0; i<data.length; i++) {

                            var _data = data[i];

                            bui.alert(_data.fileName);

                        }

                        setTimeout(function() {

                            self.battList.list = data;

                        }, 1000);

                    	
                    }else {

                        bui.alert('获取电池列表失败');

                    }

                    

                }



                // 切换电池参数

                this.changeBattWorker.onmessage = function(res) {

                    bui.alert(res.data);

                }

                // 设置高度

                //this.setTabPaneHt();

            },

@@ -193,6 +268,7 @@
                // 关闭获取电池参数

                this.getTestParamWorker.terminate();

                this.getBattNamesWorker.terminate();

                this.changeBattWorker.terminate();

            }

        });

    },


 www/css/common.css

@@ -47,6 +47,11 @@
    padding-top: .1rem;

    padding-bottom: .1rem;

}



.bui-btn.bui-btn-list-active {

    color: #2b85e4;

}



/* login */

.login-container {

    display: flex;


 www/index.html

@@ -24,13 +24,13 @@


    <script src="js/common_functions.js"></script>

    

    <script src="index.js"></script>

    
    <script src="js/vue.min.js"></script>

    

    <script src="css/iview/iview.min.js"></script>

    

    <script src="js/componets.js"></script>

    
    <script src="index.js"></script>

</body>



</html>

 www/js/componets.js

@@ -26,7 +26,49 @@
            type: Array,
            default: function() {
                return [];
            }
            },
        },
        filename: {
            type: String,
            default: '',
        }
    }
    },
    template: `
        <ul class="bui-listview">
            <li v-for="(item, key) in list" :key="key">
                <div 
                class="bui-btn bui-box" 
                :class="{'bui-btn-list-active': getActiveClass(item.fileName)}"
                @click="handlerClick(item)">
                     <div class="span1">{{item.fileName}}</div>
                     <i class="icon-listright"></i>
                 </div>
            </li>
        </ul>
    `,
    data() {
        return {
            name: this.filename, 
        }
    },
    watch: {
        filename: function(newName) {
            this.name = newName;
        }
    },
    methods: {
        getActiveClass: function(name) {
            var rs = false;
            if(name == this.name) {
                rs = true;
            }
            return rs;
        },
        handlerClick: function(item) {
            // 设置被激活的列表
            this.name = item.fileName;
            // 给列表添加点击事件
            this.$emit('on-click', item);
        }
    },
});

 www/js/workers.js

@@ -36,3 +36,10 @@
function getBattNamescalljs(content) {

    getBattNamesWorker.postMessage(content);

}



// 建立一个切换电池组的Worker线程

var changeBattWorker= '';



function changeBattcalljs(content) {

    changeBattWorker.postMessage(content);

}


 www/pages/batttest/batttest.html

@@ -2,20 +2,10 @@
<div id="battTestSidebarWrap" class="bui-sidebar-wrap">

    

    <div class="bui-sidebar swiperight">

        <ul class="bui-listview">

            <li>

                <div class="bui-btn bui-box">

                     <div class="span1">电池组1</div>

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

                 </div>

            </li>

            <li>

                <div class="bui-btn bui-box">

                     <div class="span1">电池组2</div>

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

                 </div>

            </li>

        </ul>

        <h-batt-list

        :filename="battList.name"

        :list="battList.list"

        @on-click="changeBatt"></h-batt-list>

    </div>

    

    <div class="bui-page">

@@ -36,9 +26,10 @@
                    <div class="span1">

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

                            <input 

                            v-model="groupInfo.battGroupName"

                            v-model="testParams.battName"

                            type="text" 

                            class="bui-input" 
                            class="bui-input"

                            disabled 
                            placeholder="请输入电池组名称">

                        </div>

                    </div>

@@ -48,7 +39,7 @@
                    <div class="span6">

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

                            <input 

                            v-model="groupInfo.monVol"

                            v-model="testParams.mon_vol"

                            type="number" 

                            class="bui-input" 

                            placeholder="请输入单体电压">

@@ -61,7 +52,7 @@
                    <div class="span6">

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

                            <input 

                            v-model="groupInfo.nomCap"

                            v-model="testParams.monCount"

                            type="number" 

                            class="bui-input"

                            placeholder="请输入标称容量">

@@ -99,7 +90,8 @@
                            <label class="bui-label">预设电流：</label>

                            <div class="span6">

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

                                    <input  
                                    <input

                                    v-model="testParams.disChargeCurr"  
                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入预设电流">

@@ -112,6 +104,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.disChargeCap"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入预设容量">

@@ -124,6 +117,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.disTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入预放时间">

@@ -136,6 +130,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.groupVolLow"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入组端下限">

@@ -148,6 +143,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.monVolLow"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入单体下限">

@@ -160,6 +156,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.monVolLowCount"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入下限个数">

@@ -176,6 +173,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.chargeVol"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入充电电压">

@@ -188,6 +186,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.chargeCurr"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入充电电流">

@@ -200,6 +199,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.floatVol"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入浮充电压">

@@ -211,7 +211,8 @@
                            <label class="bui-label">浮充电流：</label>

                            <div class="span6">

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

                                    <input 
                                    <input

                                    v-model="testParams.chargeStopCurr"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入浮充电流">

@@ -224,6 +225,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.monHighVol"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入单体上限">

@@ -236,6 +238,7 @@
                            <div class="span6">

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

                                    <input 

                                    v-model="testParams.monHighVolCount"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入上限个数">

@@ -248,6 +251,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.chargeTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入均充时长">

@@ -260,6 +264,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.floatTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入浮充时长">

@@ -285,6 +290,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.cycleTimes"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入循环次数">

@@ -297,6 +303,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.waitdisTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入充完静置时长">

@@ -309,6 +316,7 @@
                            <div class="span6">

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

                                    <input  

                                    v-model="testParams.waitchrTime"

                                    type="number" 

                                    class="bui-input" 

                                    placeholder="请输入放完静置时长">

@@ -322,7 +330,7 @@
        </main>

        <footer>

            <div class="footer-inner" style="height: 50px; padding: 8px; text-align: right;">

                <i-button type="info" icon="ios-lock">保存</i-button>

                <i-button type="info" icon="ios-lock" disabled>保存</i-button>

                <i-button type="info" @click="routerTo">进入测试</i-button>

            </div>

        </footer>


 www/pages/batttest/batttest.js

@@ -13,9 +13,10 @@
        //  定义Worker线程

        getTestParamWorker = new Worker('worker/data.worker.js');

        getBattNamesWorker = new Worker('worker/data.worker.js');

        changeBattWorker = new Worker('worker/data.worker.js');

        var params = router.getPageParams();

        // 引入vue

        this.vm = new Vue({

        this.vm = new Vue({

            el: getPageRoot(module, true),

            data: {

                params: params,

@@ -23,6 +24,7 @@
                loading: bui.loading(),

                getTestParamWorker: getTestParamWorker,

                getBattNamesWorker: getBattNamesWorker,

                changeBattWorker: changeBattWorker,

                pages: {

                    name: 'activity',

                    title: '活化测试->参数',

@@ -36,6 +38,47 @@
                    nomCap: '100',

                    monNum: 24,

                },

                battList: {

                    name: '电池组1',

                    list: []

                },

                testParams: {

                    battName: '',    // 电池组名称

                    byteName: 0,    // 电池组名称字节数组

                    param_index: 0,    // 预置索引号

                    battStdCap: 0,    // 电池组标称容量

                    /* 放电参数 */

                    hourState: 1,     // 放电小时率

                    disChargeCurr: 0, // 放电电流

                    disChargeCap: 0,    // 放电电容

                    disTime: 0,        // 放电时长

                    monVolLow: 0,    // 单体下限

                    groupVolLow: 0,    // 组端下限

                    monCount: 0,    // 每组电池节数

                    groupCount: 0,    // 电池组组数

                    monVolLowCount: 0,    // 单体下限数量

                    dcVolHighLimit: 0,    // 升压上限

                    testType: 0,        // 测试类型（0:恒电流    1:恒功率      2:恒电阻）

                    dischargePower: 0,    // 预放功率

					
                    /* 充电参数 */

                    chargeCurr: 0,        // 充电电流

                    chargeVol: 0,        // 充电电压

                    floatVol: 0,         // 浮充电压

                    chargeCap: 0,        // 充电容量

                    chargeTime: 0,        // 充电时长

                    floatTime: 0,        // 浮充时长

                    chargeStopCurr: 0,    // 截止电流

                    groupHighVol: 0,    // 组端上限

                    monHighVol: 0,        // 单体上限

                    monHighVolCount: 0,    // 单体上限数量

					
                    /* 活化测试 */

                    cycleStart: 0,         // 活化起点

                    cycleTimes: 0,         // 活化次数

                    waitdisTime: 0,        // 充完静置

                    waitchrTime: 0,        // 放完静置

                }

            },

            methods: {

                setPages: function() {

@@ -87,16 +130,37 @@
                    if(typeof(JSInterface) != 'undefined') {

                        JSInterface.getTestParam();

                    }else {

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

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

                    }

                },

                getBattNames: function() {

                    if(typeof(JSInterface) != 'undefined') {

                        JSInterface.getBattNames();

                    }else {

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

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

                        getBattNamesWorker.postMessage({

                            cmd: '-1',

                            code: 1,

                            msg: '手动模拟数据',

                            data:[

                                {fileName: '电池组1'},

                                {fileName: '电池组2'},

                            ],

                        });

                    }

                }

                },

                setActive: function(name) {

                    this.battList.name = name;

                },

                changeBatt: function(item) {

                    var battName = item.fileName;

                    bui.alert(battName);

                    if(typeof(JSInterface) != 'undefined') {

                        JSInterface.changeBatt(battName);

                    }else {

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

                    }

                },

            },

            mounted: function mounted() {

                var self = this;

@@ -165,7 +229,13 @@
                

                // 设置Worker线程监控

                this.getTestParamWorker.onmessage = function(res) {

                    bui.alert(res.data);

                    if(res.data.code == 1) {

                        var data = res.data.data;

                        self.setActive(data.battName);

                        self.testParams = data;

                    }else {

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

                    }

                }

                

                // 获取电池列表

@@ -175,17 +245,22 @@
                this.getBattNamesWorker.onmessage = function(res) {

                    if(res.data.code == 1) {

                        //var data = JSON.parse(res.data.data);

                        bui.alert(res.data.data);

                        //bui.alert(res.data.data);

                        var data = res.data.data;

                        for(var i=0; i<data.length; i++) {

                            var _data = data[i];

                            bui.alert(_data.fileName);

                        }

                        setTimeout(function() {

                            self.battList.list = data;

                        }, 1000);

                    	
                    }else {

                        bui.alert('获取电池列表失败');

                    }

                    

                }



                // 切换电池参数

                this.changeBattWorker.onmessage = function(res) {

                    bui.alert(res.data);

                }

                // 设置高度

                //this.setTabPaneHt();

            },

@@ -193,6 +268,7 @@
                // 关闭获取电池参数

                this.getTestParamWorker.terminate();

                this.getBattNamesWorker.terminate();

                this.changeBattWorker.terminate();

            }

        });

    },