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

didiyu

2018-09-28 97db75238a96a75f41bafd469548c2a84ba37080

 gx_tieta/WebRoot/pages/js/pages/siderbar.js

@@ -301,13 +301,12 @@
           success: function(data){

              var rs = JSON.parse(data.result);

              treeView.delProgress(container);

              console.info(rs);

              if(rs.code == 1) {

                 var _data= rs.data;

                 var formatData = [];

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

                    var __data = _data[i];

                    var tmp = treeView.getFolder(__data.StationName3, 'home', __data);

                    var tmp = treeView.getFolder(__data.StationName, 'home', __data);

                    formatData.push(tmp);

                 }

                 treeView.treeView(container, formatData);

@@ -329,7 +328,7 @@
      var tmp = {

         StationName1: data.StationName1,

         StationName2: data.StationName2,

         StationName3: data.StationName3,

         StationName: data.StationName,

         StationId: data.StationId

      };

      fourth(treeView, container, tmp, true);

@@ -357,7 +356,7 @@
                 var formatData = [];

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

                    var __data = _data[i];

                    var tmp = treeView.getFile(__data.StationName3, 'home', '',__data);

                    var tmp = treeView.getFile(__data.StationName, 'home', '',__data);

                    formatData.push(tmp);

                 }

                 treeView.treeView(container, formatData);