diff --git a/chart/tools.py b/chart/tools.py index d94ff43..6b70277 100644 --- a/chart/tools.py +++ b/chart/tools.py @@ -459,8 +459,9 @@ class Basics(object): # self.out_file.append({"Reverse_complementarity": temp}) def run(self): + print(self.args) for i in self.args.keys(): - if self.args[i] == "YES": + if self.args[i] == "on": eval(f"self.{self.args[i]}")() data = "" @@ -469,7 +470,7 @@ class Basics(object): data += f"\n{'-' * 15}\n{j[0]}\n" data += "\n".join(i[1]) - with open(self.file_path, "w") as f: + with open(f"{self.file_path}.txt", "w") as f: f.write(data) return data diff --git a/file_keep/chart/file/2150060262021653 b/file_keep/chart/file/2150060262021653 deleted file mode 100644 index 0125e28..0000000 --- a/file_keep/chart/file/2150060262021653 +++ /dev/null @@ -1,145 +0,0 @@ -"date","value" -1949-01-01,112 -1949-02-01,118 -1949-03-01,132 -1949-04-01,129 -1949-05-01,121 -1949-06-01,135 -1949-07-01,148 -1949-08-01,148 -1949-09-01,136 -1949-10-01,119 -1949-11-01,104 -1949-12-01,118 -1950-01-01,115 -1950-02-01,126 -1950-03-01,141 -1950-04-01,135 -1950-05-01,125 -1950-06-01,149 -1950-07-01,170 -1950-08-01,170 -1950-09-01,158 -1950-10-01,133 -1950-11-01,114 -1950-12-01,140 -1951-01-01,145 -1951-02-01,150 -1951-03-01,178 -1951-04-01,163 -1951-05-01,172 -1951-06-01,178 -1951-07-01,199 -1951-08-01,199 -1951-09-01,184 -1951-10-01,162 -1951-11-01,146 -1951-12-01,166 -1952-01-01,171 -1952-02-01,180 -1952-03-01,193 -1952-04-01,181 -1952-05-01,183 -1952-06-01,218 -1952-07-01,230 -1952-08-01,242 -1952-09-01,209 -1952-10-01,191 -1952-11-01,172 -1952-12-01,194 -1953-01-01,196 -1953-02-01,196 -1953-03-01,236 -1953-04-01,235 -1953-05-01,229 -1953-06-01,243 -1953-07-01,264 -1953-08-01,272 -1953-09-01,237 -1953-10-01,211 -1953-11-01,180 -1953-12-01,201 -1954-01-01,204 -1954-02-01,188 -1954-03-01,235 -1954-04-01,227 -1954-05-01,234 -1954-06-01,264 -1954-07-01,302 -1954-08-01,293 -1954-09-01,259 -1954-10-01,229 -1954-11-01,203 -1954-12-01,229 -1955-01-01,242 -1955-02-01,233 -1955-03-01,267 -1955-04-01,269 -1955-05-01,270 -1955-06-01,315 -1955-07-01,364 -1955-08-01,347 -1955-09-01,312 -1955-10-01,274 -1955-11-01,237 -1955-12-01,278 -1956-01-01,284 -1956-02-01,277 -1956-03-01,317 -1956-04-01,313 -1956-05-01,318 -1956-06-01,374 -1956-07-01,413 -1956-08-01,405 -1956-09-01,355 -1956-10-01,306 -1956-11-01,271 -1956-12-01,306 -1957-01-01,315 -1957-02-01,301 -1957-03-01,356 -1957-04-01,348 -1957-05-01,355 -1957-06-01,422 -1957-07-01,465 -1957-08-01,467 -1957-09-01,404 -1957-10-01,347 -1957-11-01,305 -1957-12-01,336 -1958-01-01,340 -1958-02-01,318 -1958-03-01,362 -1958-04-01,348 -1958-05-01,363 -1958-06-01,435 -1958-07-01,491 -1958-08-01,505 -1958-09-01,404 -1958-10-01,359 -1958-11-01,310 -1958-12-01,337 -1959-01-01,360 -1959-02-01,342 -1959-03-01,406 -1959-04-01,396 -1959-05-01,420 -1959-06-01,472 -1959-07-01,548 -1959-08-01,559 -1959-09-01,463 -1959-10-01,407 -1959-11-01,362 -1959-12-01,405 -1960-01-01,417 -1960-02-01,391 -1960-03-01,419 -1960-04-01,461 -1960-05-01,472 -1960-06-01,535 -1960-07-01,622 -1960-08-01,606 -1960-09-01,508 -1960-10-01,461 -1960-11-01,390 -1960-12-01,432 diff --git a/file_keep/chart/file/8180560442021361 b/file_keep/chart/file/8180560442021361 deleted file mode 100644 index 0125e28..0000000 --- a/file_keep/chart/file/8180560442021361 +++ /dev/null @@ -1,145 +0,0 @@ -"date","value" -1949-01-01,112 -1949-02-01,118 -1949-03-01,132 -1949-04-01,129 -1949-05-01,121 -1949-06-01,135 -1949-07-01,148 -1949-08-01,148 -1949-09-01,136 -1949-10-01,119 -1949-11-01,104 -1949-12-01,118 -1950-01-01,115 -1950-02-01,126 -1950-03-01,141 -1950-04-01,135 -1950-05-01,125 -1950-06-01,149 -1950-07-01,170 -1950-08-01,170 -1950-09-01,158 -1950-10-01,133 -1950-11-01,114 -1950-12-01,140 -1951-01-01,145 -1951-02-01,150 -1951-03-01,178 -1951-04-01,163 -1951-05-01,172 -1951-06-01,178 -1951-07-01,199 -1951-08-01,199 -1951-09-01,184 -1951-10-01,162 -1951-11-01,146 -1951-12-01,166 -1952-01-01,171 -1952-02-01,180 -1952-03-01,193 -1952-04-01,181 -1952-05-01,183 -1952-06-01,218 -1952-07-01,230 -1952-08-01,242 -1952-09-01,209 -1952-10-01,191 -1952-11-01,172 -1952-12-01,194 -1953-01-01,196 -1953-02-01,196 -1953-03-01,236 -1953-04-01,235 -1953-05-01,229 -1953-06-01,243 -1953-07-01,264 -1953-08-01,272 -1953-09-01,237 -1953-10-01,211 -1953-11-01,180 -1953-12-01,201 -1954-01-01,204 -1954-02-01,188 -1954-03-01,235 -1954-04-01,227 -1954-05-01,234 -1954-06-01,264 -1954-07-01,302 -1954-08-01,293 -1954-09-01,259 -1954-10-01,229 -1954-11-01,203 -1954-12-01,229 -1955-01-01,242 -1955-02-01,233 -1955-03-01,267 -1955-04-01,269 -1955-05-01,270 -1955-06-01,315 -1955-07-01,364 -1955-08-01,347 -1955-09-01,312 -1955-10-01,274 -1955-11-01,237 -1955-12-01,278 -1956-01-01,284 -1956-02-01,277 -1956-03-01,317 -1956-04-01,313 -1956-05-01,318 -1956-06-01,374 -1956-07-01,413 -1956-08-01,405 -1956-09-01,355 -1956-10-01,306 -1956-11-01,271 -1956-12-01,306 -1957-01-01,315 -1957-02-01,301 -1957-03-01,356 -1957-04-01,348 -1957-05-01,355 -1957-06-01,422 -1957-07-01,465 -1957-08-01,467 -1957-09-01,404 -1957-10-01,347 -1957-11-01,305 -1957-12-01,336 -1958-01-01,340 -1958-02-01,318 -1958-03-01,362 -1958-04-01,348 -1958-05-01,363 -1958-06-01,435 -1958-07-01,491 -1958-08-01,505 -1958-09-01,404 -1958-10-01,359 -1958-11-01,310 -1958-12-01,337 -1959-01-01,360 -1959-02-01,342 -1959-03-01,406 -1959-04-01,396 -1959-05-01,420 -1959-06-01,472 -1959-07-01,548 -1959-08-01,559 -1959-09-01,463 -1959-10-01,407 -1959-11-01,362 -1959-12-01,405 -1960-01-01,417 -1960-02-01,391 -1960-03-01,419 -1960-04-01,461 -1960-05-01,472 -1960-06-01,535 -1960-07-01,622 -1960-08-01,606 -1960-09-01,508 -1960-10-01,461 -1960-11-01,390 -1960-12-01,432 diff --git a/templates/page/tools.html b/templates/page/tools.html index 30db7f2..1eda928 100644 --- a/templates/page/tools.html +++ b/templates/page/tools.html @@ -293,7 +293,23 @@ }) } + + function b_data() { + console.log("wwwwwwwww") + + + //obj参数包含的信息，跟 choose回调完全一致，可参见上文。 + data_ = form.val('basics_name') + data_['csrfmiddlewaretoken'] = "{{ csrf_token }}" + console.log(data_) + + } + + var data_ = {} + function basics_run() { + + console.log("dddd") layui.use(['upload'], function () { var $ = layui.jquery , layer = layui.layer; @@ -302,20 +318,22 @@ , url: url_up + '/tools/' + "basics" , auto: false , accept: 'file' - , data: { - csrfmiddlewaretoken: '{{ csrf_token }}', - Sequence_cleaning: document.getElementById("Sequence_cleaning").value, - Sequence_length: document.getElementById("Sequence_length").value, - GC_content: document.getElementById("GC_content").value, - Sequence_flip: document.getElementById("Sequence_flip").value, - Reverse_complementarity: document.getElementById("Reverse_complementarity").value, - Codon_preference: document.getElementById("Codon_preference").value, - Codon_frequency: document.getElementById("Codon_frequency").value, + //{ + //csrfmiddlewaretoken: + //Sequence_cleaning_: document.getElementById("Sequence_cleaning").value, + //Sequence_length_: document.getElementById("Sequence_length").value, + //GC_content_: document.getElementById("GC_content").value, + //Sequence_flip_: document.getElementById("Sequence_flip").value, + //Reverse_complementarity_: document.getElementById("Reverse_complementarity").value, + // Codon_preference: document.getElementById("Codon_preference").value, + // Codon_frequency: document.getElementById("Codon_frequency").value, + //} + , before: function (obj) { + b_data() + layer.load(1); } - , before: function (obj) { //obj参数包含的信息，跟 choose回调完全一致，可参见上文。 - layer.load(1); //上传loading - } - , bindAction: '#orf_run' + , data: data_ + , bindAction: '#basics_run' , done: function (res, index) { layer.closeAll('loading'); //关闭loading ab = '' + ' ' @@ -446,6 +464,7 @@ } + diff --git a/templates/tools/Basics.html b/templates/tools/Basics.html index f31405c..0ea14b0 100644 --- a/templates/tools/Basics.html +++ b/templates/tools/Basics.html @@ -12,7 +12,7 @@
  • Basics
    • -
    +
    @@ -28,7 +28,7 @@
    -
    @@ -37,7 +37,7 @@
    -
    @@ -46,7 +46,7 @@
    - +
    @@ -54,7 +54,7 @@
    -
    @@ -63,7 +63,8 @@
    -
    @@ -72,7 +73,7 @@ {#
    #} {# #} {#
    #} - {# #} {#
    #} {#
    #} @@ -81,7 +82,7 @@ {#
    #} {# #} {#
    #} - {# #} {#
    #} {#
    #} diff --git a/tools/views.py b/tools/views.py index 817ee89..1e44641 100644 --- a/tools/views.py +++ b/tools/views.py @@ -73,13 +73,12 @@ def basics(request): tools.keep_file(file, file_path) josn = {} - for i in request.GET.lists(): - if i[0] not in ['_', 'file', 'k']: - josn[i[0]] = i[1][0] - + for i in request.POST.lists(): + josn[i[0]] = i[1][0] + print(josn) data = {"id": file_id} - tools.Basics(file_path, josn) + tools.Basics(file_path, josn).run() return JsonResponse(data)