fix api

Author: helight

web/aflow/controllers/Flow.php

@@ -316,51 +316,7 @@ public function show_flow($id) {
         $this->data['products'] = $products;
         $this->load->view('flow/show_flow', $this->data);
     }
-/*
-    public function api() {
-        if ($this->input->server('REQUEST_METHOD')!="POST") {
-	        var_dump($this->input->server('REQUEST_METHOD'));
-            return;
-        }
-        if (!$this->check_auth('group_user')) {
-            $this->load->view('comm/noright',$this->data);
-            return;
-        }
-
-        $url = 'http://localhost/data_flow/api';
-        $data = file_get_contents('php://input');
 
-        $headers = array();
-        foreach (getallheaders() as $name => $value) {
-            array_push($headers, "$name: $value");
-        }
-
-        $ch = curl_init($url);
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_POSTFIELDS,$data);
-        curl_setopt($ch, CURLOPT_HEADER, 1);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $response = curl_exec($ch);
-        $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-        $headers = substr($response, 0, $header_size);
-        $body = substr($response, $header_size);
-
-        if(curl_errno($ch)) {
-            show_error(curl_error($ch));
-        } else {
-            foreach (explode("\r\n", $headers) as $header) {
-                $header = trim($header);
-                if ($header) header($header);
-            }
-            echo $body;
-        }
-        curl_close($ch);
-        return;
-    }
-*/
     public function get_task_state_text($id)
     {
         $text = "";
@@ -384,29 +340,4 @@ public function get_task_state_text($id)
         }
         return $text;
     }
-}
-
-if (!function_exists('getallheaders'))
-{
-    function getallheaders()
-    {
-        $headers = array();
-       foreach ($_SERVER as $name => $value)
-       {
-       $iname = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
-	   // var_dump($iname);
-           if (substr($name, 0, 5) == 'HTTP_')
-           {
-               $headers[$iname] = $value;
-           }
-       }
-       return $headers;
-    }
-}
-
-if (!function_exists('json_exception'))
-{
-    function json_exception($code, $message) {
-        throw new Exception($message, $code);
-    }
-}
+}

web2/src/components/ElementTable.vue

@@ -2,39 +2,39 @@
   	<div class="main">
  	 <h1 class="page-header"><span id="page_title">流程实例列表</span> <div class="pull-right"></div></h1>
        <div class="table-responsive">
-       <form class="navbar-form navbar-left" role="form" method="post">
+       <form class="navbar-form navbar-left" id='form' role="form" method="post">
           <div class="form-group">
-              <input type="text" class="input-date form-control" id="begin_date" value="2019-03-29" name="begin_date">
+              <input type="text" class="input-date form-control" v-model="formdata.begin_date" value="2019-03-29">
               <span>至</span>
-              <input type="text" class="input-date form-control" id="end_date" value="2019-03-31" name="end_date">
+              <input type="text" class="input-date form-control" v-model="formdata.end_date" value="2019-03-31">
               <input type="hidden" class="form-control" name="env" value="data_flow">
-              <select name="set_nu" id="set_nu" class="form-control">
+              <select name="set_nu" v-model="formdata.set_nu" class="form-control">
                  <Option v-for="item in set_nu" :value="item.value" :key="item.value" name="set_type">
                       {{ item.label }}
                     </Option>
               </select>
-              <select name="process_type" id="process_type" class="form-control">
+              <select name="process_type" v-model="formdata.process_type" class="form-control">
                 <option value="all">所有流程</option>
                 <option value="NEW_FLOW">新流程</option>
                 <option value="NEW_FLOW2">新流程</option>
                 </select>
-                <Select name="process_state_type" id="process_state_type" class="form-control">
+                <Select name="process_state_type" v-model="formdata.process_state_type" class="form-control">
                     <Option v-for="item in process_state_type" :value="item.value" :key="item.value" name="state_type">
                       {{ item.label }}
                     </Option>
                 </Select>
-              <select class="chosen-select" style="width: 200px; display: none;" tabindex="-1" id="pid">
+              <select class="chosen-select" style="width: 200px; display: none;" tabindex="-1" v-model="formdata.pid">
                   <option value=""></option>
                   <option selected="selected" value="all">所有业务</option><option value="222">222(223)</option>              
                   </select>
 
-                <select  class="form-control" mame="pids" id="pids">
+                <select  class="form-control" mame="pids" v-model="formdata.pids">
                   <option value="all">所有</option>
                   <Option v-for="item in pids" :value="item.value" :key="item.value" name="state_type">
                       {{ item.label }}
                     </Option>
                 </select>
-              <button type="button" class="btn btn-success" onclick="show_flow_list()">查询</button>
+              <button type="button" class="btn btn-success" v-on:click="show_flow_list()">查询</button>
           </div>
         </form>
         <div id="processes_detail"></div>
@@ -61,35 +61,28 @@ export default {
   data () {
     return {
        process_state_type: [
-          {
-              value: '-1', label: '未成功'
-          },
-          {
-              value: 'all', label: '所有状态'
-          },
-          {
-              value: '2', label: '成功'
-          },
-          {
-              value: '3', label: '失败'
-          },
+          {value: '-1', label: '未成功'},
+          {value: 'all', label: '所有状态'},
+          {value: '2', label: '成功'},
+          {value: '3', label: '失败'},
        ],
        set_nu: [
-          {
-              value: 'all', label: '所有集群'
-          },
-          {
-              value: '0', label: 'set0'
-          },
-          {
-              value: '1', label: 'set1'
-          },
+          {value: 'all', label: '所有集群'},
+          {value: '0', label: 'set0'},
+          {value: '1', label: 'set1'},
        ],
        pids: [
-          {
-              value: '222', label: '222'
-          },
-
+          {value: '222', label: '222'},
+       ],
+       formdata: {
+         begin_date: "",
+         end_date: "",
+         process_type: {value:"all", label:"所有流程"},
+         process_state_type: {},
+         pids: ""
+       },
+       headers:[
+         {"Content-Type": "application/json"}
        ],
       info: null
     }
@@ -101,7 +94,7 @@ export default {
     show_flow_list: function () {
         let params = { project_id: 1};
         let headers = {"Content-Type": "application/json"};
-        axios.get(`${test}/oneflow/getInst`, { params: params, headers:headers}).then(
+        axios.get(`${test}/oneflow/GetFlowInsts`, { params: this.formdata, headers:headers}).then(
             res => (this.info = res.data));
     }
 }