Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/Equipment/views.py

@@ -2007,6 +2007,8 @@ class CKArticle_View(ListView):
         content = request.POST.get('content')
         try:
             # CKArticle.objects.create(auther=current_user.username,art_type=art_type,writer=writer,intro=intro,title=title,content=content,head_img=news_photo)
+            if art_type == "5":
+                return HttpResponse("1")
             CKArticle.objects.create(art_type=art_type,writer=writer,intro=intro,title=title,content=content,head_img=news_photo)
             data = "1"
         except Exception as e:
@@ -2459,7 +2461,7 @@ class Sell_View(ListView):
                         "id":x.id,
                         "farm":x.farm.name,"name":x.name,
                         "num":x.num,"money":x.money,
-                        "time":x.upl_time.strftime('%Y-%m-%d %H:%M:%S')
+                        "time":x.upl_time.strftime('%Y-%m-%d')
                     })
         except Exception as e:
             print(e)
@@ -2620,7 +2622,7 @@ class CropCount_View(ListView):
                     h2 = {"cropname":x.cropname,
                         "area":x.area.name,
                         "crop_count":x.crop_count,
-                        "img":x.area.img,
+                        "img":x.area.farm_img,
                         "time":data,
                         "id":x.id,
                         "upl_time":x.upl_time.strftime('%Y-%m-%d')
@@ -3830,4 +3832,23 @@ class Add_Relation_List(ListView):
         partner = partner[(10*(page-1)):(page*10)]
         return render(request, 'backstageNet/systemSet/partnersList.html', context={"partner":partner,"nums":nums})
     def post(self, request):
-        pass
+        pass
+    
+    
+    
+
+class Equip_Addr(ListView):
+    def get(self,request):
+        pass
+    def post(self, request):
+        username = request.user.username
+        print('username:',username)
+        user = MyUser.objects.get(username=username)
+        if user.is_staff == True:
+            equip_list = Equip.objects.all()
+        else:
+            equip_list = Equip.objects.filter(equip_user=user)
+        data = []
+        for i in equip_list:
+            pass
+