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

81041

2018-11-03 bc9d72fa65b73e112a4648172b60c4e3941f5ec2

 gx_tieta/WebRoot/batt-fault-manage.jsp

@@ -102,6 +102,8 @@
   <div id="detailsOpts"></div>

   <!-- 存储显示图片详情的信息 -->

   <div id="detailImgs"></div>

   <!-- 存储解决方案的信息 -->

   <div id="subPlan"></div>

   <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>

   <script type="text/javascript" src="js/equip-stats-change.jquery.ui.js"></script>

   <script type="text/javascript" src="js/eleHistWarn1-jquery.ui.js"></script>

@@ -131,6 +133,7 @@
            ,element = layui.element

            ,$=layui.jquery

            ,form = layui.form;

         var uploadIframe;      // 面板

         // 表格数据配置项

         var tOptions = {

            elem: '#eleInfoTbl'

@@ -160,6 +163,9 @@
               switch(ev) {

                  case 'details':

                     faultDetails(obj.data);

                     break;

                  case 'delError':

                     addSubPlan(obj.data);

                     break;

                  default:

                     layer.msg('功能开发中...');

@@ -211,9 +217,38 @@
               return rs;

            }

            

            // 添加解决方案

            function addSubPlan(data) {

               var subPlanData = setSubPlanData(data);

            
               $('#subPlan').data('data', subPlanData);

            
               uploadIframe = layer.open({

               type: 2,

               title: '<span style="font-weight:bold">>>故障排除方案</span>',

               area: ['700px', '560px'],

               fixed: false, //不固定

               resize: false,

               maxmin: false,

               content: 'iframe/batt-fault-manage-del.html'

            });

            }

            
            // 构造解决方案的结果

            function setSubPlanData(data) {

               var rs = {

                  num: data.num,

                  error_en: 1,

                  error_dispose: ''

               };

            	
               return rs;

            }

            
            
            function getData(a,b){

               var arr=[];

               for(i=0;i<a;i++){

               for(var i=0;i<a;i++){

                  arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha哈哈卡卡卡卡卡卡卡卡'+i});

               }

                 return arr;

@@ -222,7 +257,7 @@
         $(document).on('click','.addbtn',function(){

                searchStationHistRecord();

            });

            var uploadIframe;

            //  添加故障信息

            function searchStationHistRecord(){

            // 显示面板

            uploadIframe = layer.open({