From 274ba0739e12b12fe919b279922e85cace4e50d6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 22 Sep 2021 09:11:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_daq/main.aardio | 1 + 1 file changed, 1 insertion(+) diff --git a/hb_daq/main.aardio b/hb_daq/main.aardio index ab39ff1..fe3c075 100644 --- a/hb_daq/main.aardio +++ b/hb_daq/main.aardio @@ -76,6 +76,7 @@ if(!atom){ mainForm.onMinimize = function(lParam){ var tray = win.util.tray(mainForm) //创建托盘图标 tray.tip = "数据采集"; + tray.pop("数据采集已最小化运行" ) mainForm.show(false); //隐藏窗口 return true;//阻击默认消息传递,取消最小化过程 } From 81aede9497a9dd442294197400ee0cdc139887dc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 22 Sep 2021 14:45:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81handle=20seriali?= =?UTF-8?q?ze?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/serializers.py | 6 +++++- hb_server/apps/wf/views.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index eedf40c..cddfaff 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -78,4 +78,8 @@ class TicketFlowSerializer(serializers.ModelSerializer): model = TicketFlow fields = '__all__' - \ No newline at end of file + +class TicketHandleSerializer(serializers.Serializer): + transition = serializers.IntegerField(label="流转id") + ticket_data = serializers.JSONField(label="表单数据json") + suggestion = serializers.CharField(label="处理意见", required = False) \ No newline at end of file diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index 40732c8..3740fec 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -2,7 +2,7 @@ from django.core.exceptions import AppRegistryNotReady from rest_framework.response import Response from rest_framework import serializers from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModelMixin, RetrieveModelMixin, UpdateModelMixin -from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketCreateSerializer, TicketFlowSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer +from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketCreateSerializer, TicketFlowSerializer, TicketHandleSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer from django.shortcuts import get_object_or_404, render from rest_framework.viewsets import GenericViewSet, ModelViewSet from rest_framework.decorators import action, api_view @@ -99,6 +99,8 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin def get_serializer_class(self): if self.action == 'create': return TicketCreateSerializer + elif self.action == 'handle': + return TicketHandleSerializer return super().get_serializer_class() def create(self, request, *args, **kwargs):