Administrator
2018-11-20 cf762ff3a5b53aba5c44f296926c077e83518967
Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
8个文件已修改
96 ■■■■ 已修改文件
gx_tieta/WebRoot/charge-test.jsp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/ele-param.jsp 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/homeinfo.html 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/base.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/css/mylayui.css 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/pages/homeInfo.js 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/charge-test.jsp
@@ -484,6 +484,10 @@
                    <td><s:text name="Head"/></td>                                    <!-- 负责人 -->
                    <td></td>
                </tr>
                <tr>
                    <td>安装人员</td>                                    <!-- 负责人 -->
                    <td id="installUser"></td>
                </tr>
            </table>
        </div>
        <div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
gx_tieta/WebRoot/control.jsp
@@ -376,6 +376,10 @@
                    <td><s:text name="Head"/></td>                                    <!-- 负责人 -->
                    <td></td>
                </tr>
                <tr>
                    <td>安装人员</td>                                    <!-- 负责人 -->
                    <td id="installUser"></td>
                </tr>
            </table>
        </div>
        <div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
gx_tieta/WebRoot/ele-param.jsp
@@ -234,13 +234,13 @@
            '<s:text name="Computer_room"/><s:text name="Number"/>', '省','<s:text name="City"/>', '<s:text name="County"/>', '<s:text name="Computer_name"/>', '<s:text name="Equipment"/><s:text name="Name"/>', '<s:text name="Computer_room"/>IP', 'FBS<s:text name="Equipment"/>ID(<s:text name="Important"/>)',
            'FBS<s:text name="Equipment"/>IP(<s:text name="Important"/>)','子网掩码','网关', 'FBS<s:text name="Equipment"/><s:text name="Name"/>', 'FBS<s:text name="Batt"/><s:text name="Indexes"/>(0-3)', '<s:text name="Batt_group"/>ID', '<s:text name="Computer_room"/><s:text name="Within"/><s:text name="Batt_group"/><s:text name="Number"/>', '<s:text name="Battery_name"/>', '<s:text name="Floate_charge"/><s:text name="Voltage"/><s:text name="Threshold"/>(V)',
            '<s:text name="Offline"/><s:text name="Voltage"/><s:text name="Threshold"/>(V)', '<s:text name="Floate_charge"/><s:text name="Current"/><s:text name="Threshold"/>(A)', '<s:text name="Monomer_All"/>', '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Nomina_voltage_monomer"/>(V)', '<s:text name="Nominal"/><s:text name="Monomer_resistance"/>(mΩ)', '<s:text name="Nominal"/><s:text name="Monomer_conductance"/>',
            '<s:text name="Monomer_voltage"/><s:text name="Lower_order"/><s:text name="Offset"/>(V)','负载电流(A)','最大核容电流(A)','基站号码', '<s:text name="Battery_brand"/>', '<s:text name="Battery_model"/>', '<s:text name="Battery_produt_date"/>', '<s:text name="Put_into_use_time"/>'
            '<s:text name="Monomer_voltage"/><s:text name="Lower_order"/><s:text name="Offset"/>(V)','负载电流(A)','最大核容电流(A)','基站号码', '<s:text name="Battery_brand"/>', '<s:text name="Battery_model"/>', '<s:text name="Battery_produt_date"/>', '<s:text name="Put_into_use_time"/>', '安装人员'
        ]; 
        
        defaultArr = [
            '35000001','省','城市', '区县', '机房名称', '设备名称', '192.168.0.5', '0', '192.138.0.10','255.255.255.0','192.168.0.1', 'FBS-9600',
            '0', '1000001', '1', '新建电池组1', '2.230', '2.150', '30', '24', '3000',
            '2', '0.2', '5000', '0.05',15,0,'', '双登', 'GMF-3000', '2012-05-04', '2012-06-13'
            '2', '0.2', '5000', '0.05',15,0,'', '双登', 'GMF-3000', '2012-05-04', '2012-06-13', ''
        ];
        // 生成表格
        $(function() {
@@ -822,6 +822,7 @@
                            arrTd.push(model.data[i].BattModel);                //电池型号
                            arrTd.push(model.data[i].BattProductDate.substr(0,10));            //电池生产日期
                            arrTd.push(model.data[i].BattInUseDate.substr(0,10));            //投入使用日期
                            arrTd.push(model.data[i].install_user);                    // 设备安装人员
                            /* arrTd.push("");
                            arrTd.push("");
                            arrTd.push(model.data[i].StationId_ex);            //投入使用日期 */
@@ -1011,9 +1012,10 @@
                obj.BattModel = $(this).find('td').eq(29).text();                //电池型号
                obj.BattProductDate =  $(this).find('td').eq(30).text();        //电池生产日期
                obj.BattInUseDate =  $(this).find('td').eq(31).text();            //电池使用日期
                obj.install_user = $(this).find('td').eq(32).text();            //安装人员
                _arr.push(obj);
            });
            //console.info(_arr);
            console.info(_arr);
            return _arr;
        }
        
gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
@@ -154,6 +154,7 @@
                ,choose: function(obj){
                    addImgsOpts.files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
                    var files = this.files = obj.pushFile();
                    imgsInfo.text('');
                    //读取本地文件
                      obj.preview(function(index, file, result){
                          var tr = $(['<tr id="upload-'+ index +'">'
gx_tieta/WebRoot/iframe/homeinfo.html
@@ -44,7 +44,7 @@
            {{# layui.each(d.tabc, function(index, item){ }}
                {{# if(item.type == 'group'){ }}
                <div class="layui-tab-item {{ item.cshow }}">
                    <table class="hdw-tbl">
                    <table class="hdw-tbl mrb8">
                        <thead>
                            <tr>
                                <th style="width:30%">参数名称</th>
@@ -108,12 +108,16 @@
                                <td>负责人</td>
                                <td>{{ item.content.person }}</td>
                            </tr>
                            <tr>
                                <td>安装人员</td>
                                <td>{{ item.content.install_user }}</td>
                            </tr>
                        </tbody>
                    </table>
                </div>
                {{# }else if(item.type == 'home'){ }}
                <div class="layui-tab-item {{ item.cshow }}">
                    <table class="hdw-tbl">
                    <table class="hdw-tbl mrb8">
                        <thead>
                            <tr>
                                <th style="width:30%">参数名称</th>
@@ -303,11 +307,26 @@
                                </div>
                            </div>
                        </div>
                            <div class="layui-upload">
                                   <div class="layui-upload-list">
                                       <table class="layui-table">
                                           <thead>
                                            <tr>
                                                <th>文件名</th>
                                                <th>大小</th>
                                                <th>操作</th>
                                              </tr>
                                      </thead>
                                      <tbody id="videoInfoTbl"></tbody>
                                       </table>
                                   </div>
                               </div>
                        <div class="layui-progress layui-progress-big mrl8 mrr8" lay-showPercent="yes" lay-filter="uploadProgress">
                              <div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>
                        </div>
                        <div class="bottom-btn">
                            <button type="button" class="layui-btn layui-btn-normal" id="upload">确认上传</button>
                            </div>
                        </div>
                    </div>
                {{# } }}
@@ -345,7 +364,9 @@
            
            var player;
            element.on('tab(homeInfoTab)', function(data){
                if(!player) {
                var playerName = '基站环境短视频';
                var tabTxt = $(this).text();
                if(!player && tabTxt == playerName) {
                    player = new ckplayer(videoObject);
                }
            });
@@ -389,6 +410,33 @@
                    })
                }
                ,accept: 'video' //视频
                ,choose: function(obj) {
                    var files = this.files = obj.pushFile();
                    console.log(files);
                    videoInfoTbl.text('');
                    // 遍历
                    Object.keys(files).forEach(function(key) {
                        var file = files[key];
                        console.log(file);
                        var tr = $(['<tr id="upload-'+ key +'">'
                          ,'<td>'+ file.name +'</td>'
                          ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
                          ,'<td>'
                            ,'<button class="layui-btn layui-btn-xs layui-btn-danger imgs-delete">删除</button>'
                          ,'</td>'
                        ,'</tr>'].join(''));
                        //删除
                        tr.find('.imgs-delete').on('click', function(){
                          delete files[key]; //删除对应的文件
                          tr.remove();
                          uploadVideo.config.elem.next()[0].value = ''; //清空 input file 值,以免删除后出现同名文件不可选
                        });
                        videoInfoTbl.append(tr);
                    });
                }
                ,progress: function(e , percent) {
                    element.progress('uploadProgress',percent  + '%');
                }
@@ -396,6 +444,7 @@
                    var rs = JSON.parse(res.result);
                    if(rs.code == 1) {
                        element.progress('uploadProgress', '上传成功!');
                        getVideoList(sid, gFileName, true);
                    }
                }
            });
@@ -443,7 +492,7 @@
                               if(update) {
                               
                               }else{
                                   videoObject.video = [[videoUrl, 'video/mp4']];
                                   //videoObject.video = [[videoUrl, 'video/mp4']];
                               }
                           }else {
                               createVideosList(videoContainer, [], fileName);
@@ -478,7 +527,7 @@
                   }
                   
                   // 激活被选中的视频
                   container.find('.video-item').eq(acIndex).addClass('video-item-active');
                   // container.find('.video-item').eq(acIndex).addClass('video-item-active');
                   // 设置全局的正在播放的视频的名称
                   gFileName = list[acIndex].fileName;
                   
gx_tieta/WebRoot/js/base.js
@@ -412,7 +412,7 @@
                //console.info(data);
                document.getElementById("FBSDeviceIp").innerHTML=data.FbsDeviceIp;            //设备Ip
                document.getElementById("GroupIndexInFBSDevice").innerHTML=data.GroupIndexInFBSDevice;            //Bindex
                document.getElementById("installUser").innerHTML= data.install_user;    // 安装人员
                
                //显示电池组机历卡
                $('#card_infor').show();
@@ -424,7 +424,7 @@
//根据stationid查询基站的信息
function findStationInfoByStation(temp){
    console.info(JSON.stringify(temp));
    //console.info(JSON.stringify(temp));
    $.ajax({     
        type:"post",                 
        url: "Battinf_exAction!serchByCondition",                
@@ -433,7 +433,7 @@
        data:"json="+JSON.stringify(temp),        
        success: function(data){ 
            var model = eval('('+data.result+')');
            console.log(model);
            //console.log(model);
            if(model.code == 1 && model.data.length>0){
                var station = model.data[0];
                //console.info(station);
gx_tieta/WebRoot/pages/css/mylayui.css
@@ -188,6 +188,9 @@
.mrr8 {
    margin-right: 8px;
}
.mrb8 {
    margin-bottom: 8px;
}
/* bg-color */
.bg-red {
    background-color: #FF0000;
gx_tieta/WebRoot/pages/js/pages/homeInfo.js
@@ -37,6 +37,7 @@
// 格式化机房信息数据
function formatHomeInfo(data) {
    //console.log(data);
    var groupDefaults = {
        homeid: '',
        homename: '',
@@ -51,7 +52,8 @@
        chargecurr: '',
        chargevol: '',
        equipeinfo: '',
        person: ''
        person: '',
        install_user: ''
    };
    
    var homeDefaults = {
@@ -96,10 +98,12 @@
                        +';IP:'+_data.FbsDeviceIp+';BIndex:'+_data.GroupIndexInFBSDevice;
        content.equipeinfo = equipeinfo;
        content.person = '';
        content.install_user = _data.install_user;
        
        tabc.push(tmp);
    }
    var StationId_ex = data[0].StationId_ex;
    var install_user = data[0].install_user;
    var homeData = data[0].binf_ex;
    var tmp = {};
    tmp.title = '基站信息';
@@ -158,6 +162,7 @@
    content.distance = homeData.upperStationRoute;
    content.degree = homeData.upperStationDifficult;
    content.repair = homeData.clienteleErrorService;
    content.install_user = install_user;
    
    // 是否添加基站信息
    if(content.stationid != '0') {
@@ -168,12 +173,16 @@
    var tmp = {};
    tmp.type = 'env';
    tmp.title = '基站环境短视频';
    tmp.tshow = '';
    tmp.cshow = '';
    tabc.push(tmp);
    
    // 上传视频
    var tmp = {};
    tmp.type = 'upload';
    tmp.title = '上传短视频';
    tmp.tshow = '';
    tmp.cshow = '';
    tabc.push(tmp);