Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DA-Platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
文档服务地址:
http://47.92.0.57:3000/
周报索引地址:
http://47.92.0.57:3000/s/NruNXRYmV
Open sidebar
Berlin
DA-Platform
Commits
8366dc41
Commit
8366dc41
authored
Oct 11, 2020
by
Wang Yuhang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
ssh://gitlab.redhtc.com:1422/Berlincen/DA-Platform
into dev
parents
1c1f8506
273453e0
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
45 additions
and
9 deletions
+45
-9
OngoingTaskDetail.vue
DAPlatform-front/src/components/OngoingTaskDetail.vue
+1
-1
data_set.py
DAPlatform/Dao/data_set.py
+14
-1
Task.py
DAPlatform/dao/Task.py
+2
-1
dataset.py
DAPlatform/views/dataset.py
+20
-2
file.py
DAPlatform/views/file.py
+2
-1
slice.py
DAPlatform/views/slice.py
+2
-1
task.py
DAPlatform/views/task.py
+2
-1
user.py
DAPlatform/views/user.py
+2
-1
No files found.
DAPlatform-front/src/components/OngoingTaskDetail.vue
View file @
8366dc41
...
@@ -89,7 +89,7 @@ export default {
...
@@ -89,7 +89,7 @@ export default {
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
axios
({
this
.
axios
({
methd
:
'post'
,
meth
o
d
:
'post'
,
url
:
'task/giveUpTask'
,
url
:
'task/giveUpTask'
,
params
:
{
params
:
{
userId
:
this
.
$store
.
state
.
userInfo
.
userId
,
userId
:
this
.
$store
.
state
.
userInfo
.
userId
,
...
...
DAPlatform/Dao/data_set.py
View file @
8366dc41
...
@@ -62,5 +62,18 @@ def set_complete(_id):
...
@@ -62,5 +62,18 @@ def set_complete(_id):
return
None
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__'
:
if
__name__
==
'__main__'
:
print
(
find_data_set
(
'123'
)
)
createtask
(
"5f787bfb18cf2c88516f48c8"
)
DAPlatform/dao/Task.py
View file @
8366dc41
...
@@ -329,7 +329,8 @@ def set_state(task_id, state):
...
@@ -329,7 +329,8 @@ def set_state(task_id, state):
if
flag
:
if
flag
:
t
.
task_state
=
4
t
.
task_state
=
4
elif
state
==
'giveup'
:
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
)
slice_list
=
Slice
.
find_slicelist_by_taskId
(
t
.
task_id
)
flag
=
True
flag
=
True
for
i
in
slice_list
:
for
i
in
slice_list
:
...
...
DAPlatform/views/dataset.py
View file @
8366dc41
...
@@ -33,4 +33,23 @@ def get_data_list():
...
@@ -33,4 +33,23 @@ def get_data_list():
'message'
:
"success"
,
'message'
:
"success"
,
'data'
:
list
'data'
:
list
}
}
return
json
.
dumps
(
res
)
return
json
.
dumps
(
res
)
\ No newline at end of file
@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
View file @
8366dc41
...
@@ -9,7 +9,8 @@ data = Blueprint("data", __name__, url_prefix="/api/file")
...
@@ -9,7 +9,8 @@ data = Blueprint("data", __name__, url_prefix="/api/file")
@data.before_request
@data.before_request
def
before_request
():
def
before_request
():
mysql
.
connect
()
if
mysql
.
is_closed
():
mysql
.
connect
()
@data.after_request
@data.after_request
...
...
DAPlatform/views/slice.py
View file @
8366dc41
...
@@ -9,7 +9,8 @@ slice = Blueprint("slice", __name__, url_prefix="/api/slice")
...
@@ -9,7 +9,8 @@ slice = Blueprint("slice", __name__, url_prefix="/api/slice")
@slice.before_request
@slice.before_request
def
before_request
():
def
before_request
():
mysql
.
connect
()
if
mysql
.
is_closed
():
mysql
.
connect
()
@slice.after_request
@slice.after_request
...
...
DAPlatform/views/task.py
View file @
8366dc41
...
@@ -8,7 +8,8 @@ task = Blueprint("task", __name__, url_prefix="/api/task")
...
@@ -8,7 +8,8 @@ task = Blueprint("task", __name__, url_prefix="/api/task")
@task.before_request
@task.before_request
def
before_request
():
def
before_request
():
mysql
.
connect
()
if
mysql
.
is_closed
():
mysql
.
connect
()
@task.after_request
@task.after_request
...
...
DAPlatform/views/user.py
View file @
8366dc41
...
@@ -9,7 +9,8 @@ user = Blueprint("user", __name__, url_prefix="/api/user")
...
@@ -9,7 +9,8 @@ user = Blueprint("user", __name__, url_prefix="/api/user")
@user.before_request
@user.before_request
def
before_request
():
def
before_request
():
mysql
.
connect
()
if
mysql
.
is_closed
():
mysql
.
connect
()
@user.after_request
@user.after_request
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment