diff --git a/system/login/views.py b/system/login/views.py index 457c44ea14aa65085fa8666368e17b352d3fc24e..eff05831a06458ff400135d73c9f1a860d5c7ac1 100644 --- a/system/login/views.py +++ b/system/login/views.py @@ -43,13 +43,17 @@ from pyecharts import options as opts from pyecharts.charts import Bar from pyecharts.globals import ThemeType from pyecharts.faker import Faker +import jieba +from collections import Counter + -ren4=queue.Queue() -ren5=queue.Queue() -ren6=queue.Queue() -ren7=queue.Queue() -ren8=queue.Queue() + +ren4=list() +ren5=list() +ren6=list() +ren7=list() +ren8=list() danmu4=list() danmu5=list() @@ -184,31 +188,31 @@ def my_view(request): class live: - def __init__(self,ID,path,mod1,record,live_nu,host,start,end): - global danmu5, danmu6, danmu7, danmu8, danmu4 + def __init__(self,ID,path,record,live_nu,host,start,end): + global danmu5,danmu6,danmu7,danmu8,danmu4,ren4,ren5,ren6,ren7,ren8 if ID==4: danmu4=[] - ren4.queue.clear() + ren4=[] self.d=danmu4 self.ren=ren4 elif ID==5: danmu5=[] - ren5.queue.clear() + ren5=[] self.d = danmu5 self.ren = ren5 elif ID == 6: danmu6=[] - ren6.queue.clear() + ren6=[] self.d = danmu6 self.ren = ren6 elif ID==7: danmu7=[] - ren7.queue.clear() + ren7=[] self.d = danmu7 self.ren = ren7 elif ID==8: danmu8=[] - ren8.queue.clear() + ren8=[] self.d = danmu8 self.ren = ren8 self.mod1=mod1 @@ -256,9 +260,7 @@ class live: ren={} ren['人数']=renshu ren['时间']=now.strftime("%Y-%m-%d %H:%M:%S") - self.ren.put(ren) - print(renshu) - self.mod1.objects.create(tim=ren['时间'],peo=renshu) + self.ren.append(ren) await asyncio.sleep(sec) renshu=lis[x] sec = 2 # 弹幕发送的随机间隔 @@ -390,9 +392,13 @@ class ChartView4(APIView):##生成一个展示数据的，用于交互的json文 class ChartUpdateView4(APIView):#通过该函数进行动态输入 def get(self, request, *args, **kwargs): - s4=ren4.get() - #print(s) - return JsonResponse({"name": s4["时间"], "value": s4["人数"]}) + try: + s=ren4.pop(-1) + print(s) + return JsonResponse({"name": s["时间"], "value": s["人数"]}) + except: + s={"时间":0,"人数":0} + return JsonResponse({"name": s["时间"], "value": s["人数"]}) def home_page4(request):#返回展示数据的模板 return render(request,'../templates/Pye_chart/test.html',{}) diff --git a/system/sales/views.py b/system/sales/views.py index dc8b4fbeccbc4c799e923a2c142446b446e63af5..15f6ded833db905f71245a841e2505e64d5eb476 100644 --- a/system/sales/views.py +++ b/system/sales/views.py @@ -37,10 +37,11 @@ def order_process(request): # order.save() if float(order_number) < 0: # 退货处理订单，规定其总价为负数。 - ReturnInfo.objects.create(return_id=f"RET+{order_id}", order=order_id, - apply_time=OrderInfo.objects.filter(order_id=order_id).order_time, - process_time=datetime.datetime.now(), - process_way="退货", retrun_status="已处理") + ReturnInfo.objects.create( + return_id=f"RET+{order_id}", order=order_id, + apply_time=OrderInfo.objects.filter(order_id=order_id).order_time, + process_time=datetime.datetime.now(), + process_way="退货", retrun_status="已处理") return sale_order(request) else: return sale_order(request) @@ -50,11 +51,11 @@ def deliver_process(request): deliver_list = OrderInfo.objects.filter(eid='SA42376', process_status='已处理') if deliver_list.exists(): for order in deliver_list: - deliver_goods = models.OrderDetails.objects.filter(order_id=order.order_id) + deliver_goods = OrderDetails.objects.filter(order_id=order.order_id) for good in deliver_goods: - models.StockOut.objects.create( + StockOut.objects.create( order_id=order.order_id, - goods_id=models.StockInfo.objects.get(goods=good.goods.goods_id).goods_id, + goods_id=StockInfo.objects.get(goods=good.goods.goods_id).goods_id, goods_name=good.goods.goods_name, out_time=datetime.datetime.now(), out_num=good.goods_num) deliver_list.update(process_status="已发货") @@ -75,7 +76,7 @@ def sales_movement(request): goods_list = list() goods_number = list() goods_sale_sum = list() - for item in models.GoodsInfo.objects.all().order_by('-goods_name'): + for item in GoodsInfo.objects.all().order_by('-goods_name'): goods_list.append(item.goods_name) tot_num_for_this_id = 0 for order in OrderDetails.objects.filter(goods=item.goods_id): diff --git a/system/static/css/style.css b/system/static/css/style.css index fcc1a580f95dc2139e2fac0d363fd6c2a7384700..025aa3a9f6ec413327b993f1cbaff5bd5c23bced 100644 --- a/system/static/css/style.css +++ b/system/static/css/style.css @@ -23186,70 +23186,4 @@ dl li { background-color: darkgrey; outline: 1px solid slategrey; } - -.shortselect{ - background:#fafdfe; - height:28px; - width:180px; - line-height:28px; - border:1px solid #9bc0dd; - -moz-border-radius:2px; - -webkit-border-radius:2px; - border-radius:2px; -} - - - body { - font-size: 20px; - color: #090; - background-color: #eee; - text-align: center; - } - .select { - display: inline-block; - width: 300px; - position: relative; - vertical-align: middle; - padding: 0; - overflow: hidden; - background-color: #fff; - color: #555; - border: 1px solid #aaa; - text-shadow: none; - border-radius: 4px; - transition: box-shadow 0.25s ease; - z-index: 2; - } - - .select:hover { - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.15); - } - - .select:before { - content: ""; - position: absolute; - width: 0; - height: 0; - border: 10px solid transparent; - border-top-color: #ccc; - top: 14px; - right: 10px; - cursor: pointer; - z-index: -2; - } - .select select { - cursor: pointer; - padding: 10px; - width: 100%; - border: none; - background: transparent; - background-image: none; - -webkit-appearance: none; - -moz-appearance: none; - } - - .select select:focus { - outline: none; - } - /*# sourceMappingURL=maps/style.css.map */