From 4841001751c6fdfd596053c068f4be999cb7c0f9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 30 Apr 2021 15:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=B4=BE=E4=BA=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client_mp/store/index.js | 8 ++++---- server/apps/quality/views.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client_mp/store/index.js b/client_mp/store/index.js index 6ece716..5860176 100644 --- a/client_mp/store/index.js +++ b/client_mp/store/index.js @@ -34,12 +34,12 @@ const store = new Vuex.Store({ vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {}, vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '', // vuex_host: 'http://127.0.0.1:8000', - vuex_api: 'http://127.0.0.1:8000/api', - vuex_apifile: 'http://127.0.0.1:8000/api/file/', + // vuex_api: 'http://127.0.0.1:8000/api', + // vuex_apifile: 'http://127.0.0.1:8000/api/file/', vuex_host: 'https://testsearch.ctc.ac.cn', - // vuex_api: 'https://testsearch.ctc.ac.cn/api', - // vuex_apifile: 'https://testsearch.ctc.ac.cn/api/file/', + vuex_api: 'https://testsearch.ctc.ac.cn/api', + vuex_apifile: 'https://testsearch.ctc.ac.cn/api/file/', // 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式 // vuex_version: '1.0.1', diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py index 4ac22f2..eaefee3 100644 --- a/server/apps/quality/views.py +++ b/server/apps/quality/views.py @@ -277,12 +277,12 @@ class InspectRecordViewSet(OptimizationMixin, PageOrNot, ModelViewSet): data = request.data records = InspectRecord.objects.filter(id__in=data['records']) checker = User.objects.get(pk=data['checker']) - records.update(checker=checker) + records.filter(checked=False).update(checker=checker) # 子任务下未分配检查项目按该逻辑分配 subtask = records.first().subtask items = records.values_list('item', flat=True) - InspectRecord.objects.filter(item__in=items, subtask=subtask, checker__isnull=True).update(checker=checker) - return Response(data) + InspectRecord.objects.filter(item__in=items, subtask=subtask, checker__isnull=True, checked= False).update(checker=checker) + return Response(status=status.HTTP_200_OK) @action(methods=['put'], detail=True, perms_map = {'put':'inspectrecord_update'}, permission_classes=[IsAdminUser|IsInspectRecordChecker|IsSubInspectTaskLeader])