Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-11-21 5f155618a479d7a5456404a4893cc928e97a702c

Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/mobil/base-station-info.html

@@ -41,155 +41,155 @@
                <tbody id="t_body">

                      <tr>

                          <td>站点ID</td>

                          <td id=""></td>

                          <td id="station_stationid_ex"></td>

                      </tr>

                      <tr>

                          <td>站点名称</td>

                          <td id=""></td>

                          <td id="station_stationname"></td>

                      </tr>

                      <tr>

                          <td>机房ID</td>

                          <td id=""></td>

                          <td id="station_stationid"></td>

                      </tr>

                      <tr>

                          <td>所属组织</td>

                          <td id=""></td>

                          <td id="station_affiliation"></td>

                      </tr>

                      <tr>

                          <td>数据来源</td>

                          <td id=""></td>

                          <td id="station_dataSources"></td>

                      </tr>

                      <tr>

                          <td>站址类型</td>

                          <td id=""></td>

                          <td id="station_stationType"></td>

                      </tr>

                      <tr>

                          <td>经纬度</td>

                          <td id=""></td>

                          <td id="station_jinweidu"></td>

                      </tr>

                      <tr>

                          <td>所在地址</td>

                          <td id=""></td>

                          <td id="station_stationAddr"></td>

                      </tr>

                      <tr>

                          <td>站址状态</td>

                          <td id=""></td>

                          <td id="station_stationstate"></td>

                      </tr>

                      <tr>

                          <td>维护单位</td>

                          <td id=""></td>

                          <td id="station_maintenanceCompany"></td>

                      </tr>

                      <tr>

                          <td>站址场景</td>

                          <td id=""></td>

                          <td id="station_stationscenario"></td>

                      </tr>

                      <tr>

                          <td>站址产权</td>

                          <td id=""></td>

                          <td id="station_stationproperty"></td>

                      </tr>

                      <tr>

                          <td>使用单位</td>

                          <td id=""></td>

                          <td id="station_useUnit"></td>

                      </tr>

                      <tr>

                          <td>物理站址编码</td>

                          <td id=""></td>

                          <td id="station_siteCode"></td>

                      </tr>

                      <tr>

                          <td>历史物理站址编码</td>

                          <td id=""></td>

                          <td id="station_historySiteCode"></td>

                      </tr>

                      <tr>

                          <td>站址内部编号</td>

                          <td id=""></td>

                          <td id="station_siteInternalNumber"></td>

                      </tr>

                      <tr>

                          <td>站址拼音简称</td>

                          <td id=""></td>

                          <td id="station_sitePinyinReferred"></td>

                      </tr>

                      <tr>

                          <td>中文简称</td>

                          <td id=""></td>

                          <td id="station_siteChineseReferred"></td>

                      </tr>

                      <tr>

                          <td>是否开通业务</td>

                          <td id=""></td>

                          <td id="station_isOpenBusiness"></td>

                      </tr>

                      <tr>

                          <td>录入人员</td>

                          <td id=""></td>

                          <td id="station_schoolPersonnel"></td>

                      </tr>

                      <tr>

                          <td>录入时间</td>

                          <td id=""></td>

                          <td id="station_entryTime"></td>

                      </tr>

                      <tr>

                          <td>修改人</td>

                          <td id=""></td>

                          <td id="station_modifyPeople"></td>

                      </tr>

                      <tr>

                          <td>修改时间</td>

                          <td id=""></td>

                          <td id="station_modifyTime"></td>

                      </tr>

                      <tr>

                          <td>备注</td>

                          <td id=""></td>

                          <td id="station_note"></td>

                      </tr>

                      <tr>

                          <td>站址接收标记及是否有效</td>

                          <td id=""></td>

                          <td id="station_receiveorvalidity"></td>

                      </tr>

                      <tr>

                          <td>移动站址名称</td>

                          <td id=""></td>

                          <td id="station_siteNameCMCC"></td>

                      </tr>

                      <tr>

                          <td>电信站址名称</td>

                          <td id=""></td>

                          <td id="station_siteNameCTC"></td>

                      </tr>

                      <tr>

                          <td>联通站址名称</td>

                          <td id=""></td>

                          <td id="station_siteNameCUCC"></td>

                      </tr>

                      <tr>

                          <td>品牌</td>

                          <td id=""></td>

                          <td id="station_producer"></td>

                      </tr>

                      <tr>

                          <td>续航测算时长</td>

                          <td id=""></td>

                          <td id="station_lastTimeLong"></td>

                      </tr>

                      <tr>

                          <td>续航测算类别</td>

                          <td id=""></td>

                          <td id="station_lastTimeType"></td>

                      </tr>

                      <tr>

                          <td>续航发生时间</td>

                          <td id=""></td>

                          <td id="station_lastTimeDate"></td>

                      </tr>

                      <tr>

                          <td>共享情况</td>

                          <td id=""></td>

                          <td id="station_shareInfo"></td>

                      </tr>

                      <tr>

                          <td>运营商购买发电服务状况</td>

                          <td id=""></td>

                          <td id="station_electPower"></td>

                      </tr>

                      <tr>

                          <td>是否具备发电条件</td>

                          <td id=""></td>

                          <td id="station_isCanElectPower"></td>

                      </tr>

                      <tr>

                          <td>上站路程</td>

                          <td id=""></td>

                          <td id="station_upperStationRoute"></td>

                      </tr>

                      <tr>

                          <td>上站难易程度</td>

                          <td id=""></td>

                          <td id="station_upperStationDifficult"></td>

                      </tr>

                      <tr>

                          <td>客户问题库未完成蓄电池维修</td>

                          <td id=""></td>

                          <td id="station_clienteleErrorService"></td>

                      </tr>

                 </tbody>

             </table>

@@ -210,9 +210,50 @@
            data : "json="+JSON.stringify(batt),

            dataType :    "json",

            success : function(data){

                var temp = batt;

                var model=eval("("+data.result+")");

                console.info(model);		
            },

                console.info(model);

                var station = model.data[0];

                $('#station_stationid_ex').text(temp.StationId_ex);                                            //站点id

                $('#station_stationname').text(station.stationName);                                        //机房名称

                $('#station_stationid').text(station.stationId);                                            //机房名称

                $('#station_affiliation').text(station.affiliation);                                        //所属组织

                $('#station_dataSources').text(station.dataSources);                                        //数据来源

                $('#station_stationType').text(station.stationType);                                        //站址类型

                $('#station_jinweidu').text("经度:" + station.longitude+";纬度:"+station.latitude);            //经纬度

                $('#station_stationAddr').text(station.stationAddr);                                        //所在地址

                $('#station_stationstate').text("站址等级:"+station.stationLevel+";维护状态:"+station.maintenanceState+";封锁状态:"+(station.blockedState==0?'否':'是'));            //机房状态

                $('#station_maintenanceCompany').text(station.maintenanceCompany);                                                                                                //维护单位

                $('#station_stationscenario').text("业务场景:"+station.businessScenario+";覆盖场景:"+station.CoverScenario+";站址地形:"+station.siteTerrain);                        //站址场景

                $('#station_stationproperty').text("产权性质:"+station.propertyRights+";(原)产权单位:"+station.propertyUnit+";是否共享:"+(station.isShare==1?'是':'否'));            //站址产权

                $('#station_useUnit').text(station.useUnit);                                        //使用单位

                $('#station_siteCode').text(station.siteCode);                                        //物理站址编码

                $('#station_historySiteCode').text(station.historySiteCode);                        //历史物理站址编码

                $('#station_siteInternalNumber').text(station.siteInternalNumber);                    //站址内部编号

                $('#station_sitePinyinReferred').text(station.sitePinyinReferred);                    //站址拼音简称

                $('#station_siteChineseReferred').text(station.siteChineseReferred);                //中文简称

                $('#station_isOpenBusiness').text(station.isOpenBusiness);                            //是否开通业务

                $('#station_schoolPersonnel').text(station.schoolPersonnel);                        //录入人员

                $('#station_entryTime').text(station.entryTime);                                    //录入时间

                $('#station_modifyPeople').text(station.modifyPeople);                                //修改人

                $('#station_modifyTime').text(station.modifyTime);                                    //修改时间

                $('#station_note').text(station.note);                                                //备注

                $('#station_receiveorvalidity').text("站址接收标记:"+(station.siteReceivesMark==1?'是':'否')+";是否有效:"+(station.siteValidity==1?'是':'否'));                                                //备注

                $('#station_siteNameCMCC').text(station.siteNameCMCC);                                //移动站址名称

                $('#station_siteNameCTC').text(station.siteNameCTC);                                //联通站址名称

                $('#station_siteNameCUCC').text(station.siteNameCUCC);                                //电信站址名称

                $('#station_producer').text(station.producer);                                        //品牌

                $('#station_lastTimeLong').text(station.lastTimeLong);                                //续航测算时长

                $('#station_lastTimeType').text(station.lastTimeType);                                //续航测算类别

                $('#station_lastTimeDate').text(station.lastTimeDate);                                //续航发生时间

                $('#station_shareInfo').text(station.shareInfo);                                    //共享情况

                $('#station_electPower').text("移动购买:"+(station.electPowerCMCC==1?'是':'否')+";电信购买:"+(station.electPowerCTC==1?'是':'否')+";联通购买:"+(station.electPowerCUCC==1?'是':'否'));                                    //共享情况

                $('#station_isCanElectPower').text(station.isCanElectPower==1?'是':'否');            //是否具备发电条件

                $('#station_upperStationRoute').text(station.upperStationRoute);                    //上站路程

                $('#station_upperStationDifficult').text(station.upperStationDifficult);            //上站难易程度

                $('#station_clienteleErrorService').text(station.clienteleErrorService);            //客户问题库未完成蓄电池维修

						
            },                                      
            error : function(er) {

                console.info(er);

            }


 gx_tieta/WebRoot/mobil/testdata.html

@@ -25,9 +25,11 @@
            <script type="text/javascript">

                 var batt;

                  var temp=getCookie("batt");

		  		
                  $(document).on('pagecreate', function() {

                      if(temp!=null){

                        batt=eval("("+temp+")");

                        console.info(batt);

                        $('#battName').text(batt.BattGroupName);

                    }

                  });