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

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 gx_tieta/WebRoot/mobil/control.html

@@ -311,7 +311,7 @@
                   var rs = JSON.parse(result.result);

                     console.info(rs);

                   var sdStatus = (rs.data == 0)?'正常': '<span style="color: #FF0000">故障</span>';

                     arrtdjifangstate .push(sdStatus);

                     arrtdjifangstate.push(sdStatus);

                   //console.log(sdStatus);

                  // status.setText('sdCard', "SD卡状态："+sdStatus);

                  arrTd1.push(sdStatus);

@@ -358,11 +358,7 @@
               alert(msg.signal);

            }

          },error:function(e){

             var model = {

                code:0,

                data:e,

                msg:'通信失败'

             };

             alert("通讯失败");

          }             

      });

   }