Merge branch 'develop' of ssh://gitlab.redhtc.com:1422/Berlincen/DA-Platform into dev

DAPlatform-front/src/components/OngoingTaskDetail.vue

@@ -89,7 +89,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.axios({
-          methd: 'post',
+          method: 'post',
           url: 'task/giveUpTask',
           params: {
             userId: this.$store.state.userInfo.userId,

DAPlatform/Dao/data_set.py

@@ -62,5 +62,18 @@ def set_complete(_id):
         return None
 
 
+# 根据数据单id创建任务
+def createtask(id):
+    try:
+        results = collection.find()
+        for i in results:
+            if str(i.pop("_id")) == id:
+                print(111)
+                print(i.pop("user_id"))
+    except Exception as e:
+        print(e)
+        return False
+
+
 if __name__ == '__main__':
-    print(find_data_set('123'))
+    createtask("5f787bfb18cf2c88516f48c8")

DAPlatform/dao/Task.py

@@ -329,7 +329,8 @@ def set_state(task_id, state):
             if flag:
                 t.task_state = 4
         elif state == 'giveup':
-            if t.task_state != 5:
+            if not t.task_state == '5':
+                print(t.task_state)
                 slice_list = Slice.find_slicelist_by_taskId(t.task_id)
                 flag = True
                 for i in slice_list:

DAPlatform/views/dataset.py

@@ -34,3 +34,22 @@ def get_data_list():
         'data': list
     }
     return json.dumps(res)
+
+
+@dataset.route("/postDataFormList", methods=["Post"])
+def create_task():
+    data = request.get_json(silent=True)
+    id = data['id']
+    ret = data_set.createtask(id)
+    if ret is True:
+        data_set.set_complete(id)
+        res = {
+            'code': 1,
+            'message': "success",
+        }
+    else:
+        res = {
+            'code': 0,
+            'message': "failed",
+        }
+    return json.dump(res)

DAPlatform/views/file.py

@@ -9,6 +9,7 @@ data = Blueprint("data", __name__, url_prefix="/api/file")
 
 @data.before_request
 def before_request():
+    if mysql.is_closed():
         mysql.connect()
 
 

DAPlatform/views/slice.py

@@ -9,6 +9,7 @@ slice = Blueprint("slice", __name__, url_prefix="/api/slice")
 
 @slice.before_request
 def before_request():
+    if mysql.is_closed():
         mysql.connect()
 
 

DAPlatform/views/task.py

@@ -8,6 +8,7 @@ task = Blueprint("task", __name__, url_prefix="/api/task")
 
 @task.before_request
 def before_request():
+    if mysql.is_closed():
         mysql.connect()
 
 

DAPlatform/views/user.py

@@ -9,6 +9,7 @@ user = Blueprint("user", __name__, url_prefix="/api/user")
 
 @user.before_request
 def before_request():
+    if mysql.is_closed():
         mysql.connect()