From e8685e804ce5c3d88dd0de6e570656c4698de9ac Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 4 Mar 2021 16:25:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=80=83=E8=AF=95=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test_client/src/settings.js | 2 +- test_mini/app.js | 4 ++-- test_mini/project.config.json | 8 +++++--- test_server/demo.py | 13 +++++++++++++ test_server/examtest/views.py | 16 +++++++++++++++- test_server/requirements.txt | Bin 2756 -> 488 bytes 6 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 test_server/demo.py diff --git a/test_client/src/settings.js b/test_client/src/settings.js index 585109b..62625c2 100644 --- a/test_client/src/settings.js +++ b/test_client/src/settings.js @@ -12,5 +12,5 @@ module.exports = { * @type {boolean} true | false * @description Whether show the logo in sidebar */ - sidebarLogo: true + sidebarLogo: false } diff --git a/test_mini/app.js b/test_mini/app.js index 4e9ce27..75f30df 100644 --- a/test_mini/app.js +++ b/test_mini/app.js @@ -69,9 +69,9 @@ App({ globalData: { userInfo: {}, userinfo: {}, // 服务器传回的消费者信息 - host: 'https://apitest.ahctc.cn', + //host: 'https://apitest.ahctc.cn', mediahost: 'https://apitest.ahctc.cn', - //host: 'http://127.0.0.1:8000', + host: 'http://127.0.0.1:8000', //mediahost: 'http://127.0.0.1:8000', token : '', } diff --git a/test_mini/project.config.json b/test_mini/project.config.json index 51d0e35..988d27b 100644 --- a/test_mini/project.config.json +++ b/test_mini/project.config.json @@ -21,21 +21,23 @@ "checkSiteMap": true, "uploadWithSourceMap": true, "compileHotReLoad": false, - "useMultiFrameRuntime": false, + "useMultiFrameRuntime": true, "useApiHook": true, + "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, + "enableEngineNative": false, + "bundle": false, "useIsolateContext": true, "useCompilerModule": true, "userConfirmedUseCompilerModuleSwitch": false, "userConfirmedBundleSwitch": false, "packNpmManually": false, "packNpmRelationList": [], - "minifyWXSS": true, - "bundle": false + "minifyWXSS": true }, "compileType": "miniprogram", "libVersion": "2.14.1", diff --git a/test_server/demo.py b/test_server/demo.py new file mode 100644 index 0000000..53032fc --- /dev/null +++ b/test_server/demo.py @@ -0,0 +1,13 @@ +from sympy import * +a1 = Symbol('a1') +a2 = Symbol('a2') +a3 = Symbol('a3') +b1 = Symbol('b1') +b2 = Symbol('b2') +r = solve([ + a1+a2-40, + b1+b2-10, + 2*a1+4*b1-60, + 2*a2+4*b2-40 +], [a1,a2,b1,b2]) +print(r) diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py index 6cdb38f..5cddf32 100644 --- a/test_server/examtest/views.py +++ b/test_server/examtest/views.py @@ -84,7 +84,7 @@ class WorkScopeViewSet(ModelViewSet): ret['panduan_count'] = workscope.rule.panduan_count ret['panduan_score'] = workscope.rule.panduan_score question_queryset = Question.objects.none() - questioncats = workscope.questioncat.exclude(name='辐射小知识更新中').order_by('type') + questioncats = workscope.questioncat.exclude(name='辐射小知识更新中').order_by('type', 'create_time') if questioncats.count() == 3: import random b2 = random.randint(1,8) @@ -101,6 +101,20 @@ class WorkScopeViewSet(ModelViewSet): b2_set = queryset.filter(questioncat=questioncats[1], type='多选').order_by('?')[:b2] b3_set = queryset.filter(questioncat=questioncats[2], type='多选').order_by('?')[:b3] question_queryset = question_queryset|a1_set|a2_set|a3_set|b1_set|b2_set|b3_set + elif workscope.name == '辐射安全管理': + queryset = Question.objects.filter(is_delete=0) + a1_set = queryset.filter(questioncat=questioncats[0], type='单选').order_by('?')[:16] + a2_set = queryset.filter(questioncat=questioncats[1], type='单选').order_by('?')[:24] + b1_set = queryset.filter(questioncat=questioncats[0], type='多选').order_by('?')[:4] + b2_set = queryset.filter(questioncat=questioncats[1], type='多选').order_by('?')[:6] + question_queryset = question_queryset|a1_set|a2_set|b1_set|b2_set + elif workscope.name == '科研、生产及其他': + queryset = Question.objects.filter(is_delete=0) + a1_set = queryset.filter(questioncat=questioncats[0], type='单选').order_by('?')[:24] + a2_set = queryset.filter(questioncat=questioncats[1], type='单选').order_by('?')[:16] + b1_set = queryset.filter(questioncat=questioncats[0], type='多选').order_by('?')[:6] + b2_set = queryset.filter(questioncat=questioncats[1], type='多选').order_by('?')[:4] + question_queryset = question_queryset|a1_set|a2_set|b1_set|b2_set else: queryset = Question.objects.filter(is_delete=0,questioncat__in = workscope.questioncat.all()) if ret['danxuan_count']: diff --git a/test_server/requirements.txt b/test_server/requirements.txt index f13ab1c140afb97539382e47a8a6c917a0f271a3..9ec85aeedfeac263892a199d8608e045087d52c4 100644 GIT binary patch delta 47 zcmV+~0MP%$73c#3|NfJ-0W6ae0%DWA0~(W@16Y$j1Rj$_2O^V(2SAgA3MP}R2qcqk F0UWVB5Ly5L literal 2756 zcmb7`OK%fF5QOK9#7|j-odC&!8>dJ}NFar)ADgg_y>`6L^Tz}AO-*~U0uIPp%W}V} ztE*@B*Uwqnq}#MhAN850H|d?8X?mSrrCA!%b?VYSwdpF`PqGc4upeaI%4d0u$LA#5 z=lXxGPp3@#;(_(Oo{65f#cP`m$`SQX)A=8^lWZksqA0#UjA9px2PHY|MV;_k$ghmR z(rC%tjs2Mc{kFp22vMtAyHe9Sq1wOj4eDhhe^k?G7R>9AXHuuio=nQ7jBDR3x=jz# z6KZ%EVf~X0V>`&(x*-w`-5eRW3jZgvkp>=wxb8#Uw`JyiCq*1IVWv>MU^D7$)$g5r zn5w65-PH48spv&|ln+dWvg$rK~8fYP_BwE7fm>pjJF7C@*B`^X5-; zPH(9*!{91oW(Pq0Bm2-fXRS}Kl@QNMhoHhbdBO6H>>GL9bc`C`XkazLPaNFJ3AuyBKt+UOy7