没有找到对应的元数据。
- \ No newline at end of file + \ No newline at end of file diff --git a/application/models/data/DataService.php b/application/models/data/DataService.php index 37ea50d5..108b1011 100644 --- a/application/models/data/DataService.php +++ b/application/models/data/DataService.php @@ -1,5 +1,9 @@ get($uuid); + + $info = $this->get($uuid); - $curl = new \helper\Curl(); + $curl = new Curl(); if($type == 'site') { $param = array( - //'uuid'=>$uuid, - 'uuid'=>'78e2423f-fe4a-4f9e-a368-c932afc5d257', ///TEST TEST TEST - 'uid'=>\view::User('id') + 'uuid'=>$uuid, + //'uuid'=> '78e2423f-fe4a-4f9e-a368-c932afc5d257', ///TEST TEST TEST + 'uid'=> view::User('id') ); $data = $curl->request($info['service_url']."site/",$param,"POST"); $data = json_decode($data['response'],TRUE); @@ -55,15 +57,27 @@ class DataService if($type == 'var') { $param_temp = array( - //'uuid'=>$uuid, - 'uuid'=>'78e2423f-fe4a-4f9e-a368-c932afc5d257', ///TEST TEST TEST - 'uid'=>\view::User('id'), + 'uuid'=>$uuid, + //'uuid'=> '78e2423f-fe4a-4f9e-a368-c932afc5d257', ///TEST TEST TEST + 'uid'=> view::User('id'), ); $param = array_merge($param,$param_temp); $data = $curl->request($info['service_url']."var/",$param,"POST"); $data = json_decode($data['response'],TRUE); } + if($type == 'submit') + { + $param_temp = array( + 'uuid'=>$uuid, + //'uuid'=> '78e2423f-fe4a-4f9e-a368-c932afc5d257', ///TEST TEST TEST + 'uid'=> view::User('id'), + ); + $param = array_merge($param,$param_temp); + $data = $curl->request($info['service_url']."insert/",$param,"POST"); + $data = json_decode($data['response'],TRUE); + } + if($data['status'] == 0) { return $data['error']; diff --git a/htdocs/js/lib/custom/models/dataservice.js b/htdocs/js/lib/custom/models/dataservice.js index 6e64a602..675e5011 100644 --- a/htdocs/js/lib/custom/models/dataservice.js +++ b/htdocs/js/lib/custom/models/dataservice.js @@ -54,6 +54,7 @@ westdc.dataservice = { $.colorbox({ initialHeight: '0', initialWidth: '0', + maxWidth : '80%', html: html, opacity: '0.3', onComplete: function(){ @@ -91,6 +92,7 @@ westdc.dataservice.wsn = { html = westdc.dataservice.wsn.dialog.vars(data); westdc.dataservice.creatWindow(html); + westdc.dataservice.wsn._init.vars(); }, 'timeout': 30000, @@ -99,6 +101,45 @@ westdc.dataservice.wsn = { } }); }, + Submit : function(){ + $.ajax({ + 'type':"POST", + 'url':'/data/wsn/', + 'data':$('#dataservice-wsn-form').serialize(), + 'success':function(data){ + if(typeof(data) == 'undefined') + { + alert("数据源错误，请联系管理员"); + return false; + } + + if(!$.isEmptyObject(data.error)) + { + alert(data.error); + return false; + } + + if($.isEmptyObject(data.data)) + { + alert("提交失败,可能是服务器通信错误，请联系管理员"); + return false; + } + + if(data.data.success == 1) + { + window.location = '/data/order/ac/offline1'; + return true; + }else{ + alert('提交失败，请重试'); + return false; + } + }, + 'timeout': 30000, + 'error': function(){ + alert('出现错误，请刷新后重试'); + } + }); + }, dialog : { site : function(data){ this.input = new Array(); @@ -124,29 +165,67 @@ westdc.dataservice.wsn = { return this.HTML; }, vars : function(data){ - this.input = new Array(); + this.selects = ""; + + this.uls = new Array(); for(i in data.data) { - for(i in data.data) - this.li = '