Procházet zdrojové kódy

图片位置信息

yf_ymm před 5 roky
rodič
revize
e5e65d0f64
4 změnil soubory, kde provedl 79 přidání a 6 odebrání
  1. 32 2
      apps/AppInfo/admin.py
  2. 18 1
      apps/AppInfo/models.py
  3. 5 1
      apps/Equipment/urls.py
  4. 24 2
      apps/Equipment/views.py

+ 32 - 2
apps/AppInfo/admin.py

@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 # Register your models here.
 from apps.AppInfo.models import MyUser, QXZdata, QXZstatus, Equip, Equip_type, QXZdata_New, JKdata, Article, Video_data,Product,Blog,QXZstatus_New,QXZswitchstatus,QXZswitchdata,\
-CKArticle,GardenManage,GardenArea,Areacrop,Store_Manage,Hotel_Info,Hotel_Photo,FarmUser,FarmList,Pick_Pub,Sell_Manage,Person_Pick,QXZAutoswitch
+CKArticle,GardenManage,GardenArea,Areacrop,Store_Manage,Hotel_Info,Hotel_Photo,FarmUser,FarmList,Pick_Pub,Sell_Manage,Person_Pick,QXZAutoswitch, Pic_Info
 
 
 
@@ -673,4 +673,34 @@ class QXZAutoswitchAdmin(admin.ModelAdmin):
     # 搜索项:
     search_fields = ['equip_id__equip_id']
     # 设置每页显示记录数:
-    list_per_page = 10
+    list_per_page = 10
+    
+    
+
+# 气象站阈值表QXZAutoswitch模型注册和装饰:
+@admin.register(Pic_Info)
+class Pic_InfoAdmin(admin.ModelAdmin):
+    actions_on_bottom = False
+    actions_on_top = True
+    # 详情显示项:
+    fields = [
+        'locat1',
+        'locat2',
+        'addr',
+        'locat_info',
+        'upl_time',
+    ]
+    # 列表显示项:
+    list_display = [
+        'locat1',
+        'locat2',
+        'addr',
+        'locat_info',
+        'upl_time',
+    ]
+    # 筛选过滤项:
+    list_filter = ('upl_time',)
+    # 搜索项:
+    search_fields = ['addr']
+    # 设置每页显示记录数:
+    list_per_page = 10

+ 18 - 1
apps/AppInfo/models.py

@@ -350,7 +350,7 @@ class CKArticle(models.Model):
     author = models.ForeignKey(MyUser,verbose_name=u'作者',blank=True, null=True)
     art_type = models.CharField(u'文章类型',max_length=10, blank=True, null=True)  # 5 新闻资讯  6 视频资讯  7 产品展厅  8 四季采摘  9  民宿导览  10  旅游景点
     writer = models.CharField(u'发布人', max_length=10, blank=True, null=True)
-    title = models.CharField(u'标题',max_length=254, null=True, blank=True)       
+    title = models.CharField(u'标题',max_length=254, null=True, blank=True)
     video_url = models.FileField(upload_to="media/uploads/", null=True, blank=True, verbose_name="视频内容")
     intro = models.CharField(u'简介',max_length=255, null=True, blank=True)
     head_img = models.ImageField(u'封面图片',upload_to="media/uploads/" ,null=True, blank=True)
@@ -632,3 +632,20 @@ class Hotel_Photo(models.Model):
 
 
 
+# 图片信息表
+class Pic_Info(models.Model):
+    locat1 = models.CharField(u'图片东北点', max_length=50, blank=True, null=True)
+    locat2 = models.CharField(u'图片西南点', max_length=50, blank=True, null=True)
+    addr = models.CharField(u'照片路径', max_length=200, blank=True, null=True)
+    locat_info = models.CharField(u'图片框格信息', max_length=50, blank=True, null=True)
+    upl_time = models.DateTimeField(u'上传时间', default=timezone.now)
+    
+    def __str__(self):
+       return self.addr
+    class Meta:
+        verbose_name = u'图片信息表'
+        verbose_name_plural = verbose_name
+        ordering = ['-upl_time']
+        get_latest_by = 'upl_time'
+
+

+ 5 - 1
apps/Equipment/urls.py

@@ -20,7 +20,7 @@ from apps.Equipment.views import (
     Video_Upload,JKview,Person_Area_Pub,CropCount_View,Sell_Del,Pick_Del,
     Pick_New,Repertory_New_View,Park_Land,Contrast_Detail,Contrast_List,Person_View,Person_List,
     Area_Create,Area_Map,Person_Limit,Limit_View,Expert,learnDepot,Create_User,Change_Pwd,Delete_User,User_Change_Pwd,QXZ_Auto,QXZ_Value_Mqtt,QXZ_Status2, QXZ_Report_Detail2,
-    Sightsee_Photo)
+    Sightsee_Photo,Pic_locat)
 
 app_name = 'Equipment'
 
@@ -241,6 +241,10 @@ urlpatterns = [
 
     url(r'^test_photo$', Test_Photo.as_view(), name='test_photo'),
 
+    url(r'^pic_locat$', Pic_locat.as_view(), name='pic_locat'),
+    
+    
+
     # 配置文件夹路由:
     url(r'^hotel_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\hotel_photo'}), #本地
     url(r'^hotel_photos/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\hotel_photos'}), #本地

+ 24 - 2
apps/Equipment/views.py

@@ -22,7 +22,7 @@ from apps.AppInfo.models import (
     Article, CKArticle, Equip, Equip_type, FarmList, FarmUser, GardenManage,
     Hotel_Info, Hotel_Photo, JKdata, MyUser, Pick_Pub, Product, QXZdata,
     QXZdata_New, QXZstatus, QXZstatus_New, QXZswitchdata, QXZswitchstatus,
-    Video_data,GardenArea,Store_Manage,Areacrop,Sell_Manage,Person_Pick,QXZAutoswitch,Sightsee_Info)
+    Video_data,GardenArea,Store_Manage,Areacrop,Sell_Manage,Person_Pick,QXZAutoswitch,Sightsee_Info,Pic_Info)
 from apps.Equipment.all_dict import qxz_dict
 
 
@@ -3168,6 +3168,7 @@ class Person_Limit(ListView):
         user_list = user_list[(10*(page-1)):(page*10)]
         return render(request, 'backstageNet/limit/limit_user_list.html', context={'user_list': user_list, "nums": nums})
 
+
 # 专家诊断
 class Expert(ListView):
     def get(self,request):
@@ -3372,4 +3373,25 @@ class QXZ_Value_Mqtt(ListView):
         # else:
         #     data = "1"
         #     return HttpResponse(data)
-        return HttpResponse("0")
+        return HttpResponse("0")
+    
+    
+    
+# 保存图片信息
+class Pic_locat(ListView):
+    def get(self,request):
+        pass
+    
+    def post(self,request):
+        # 东北点
+        locat1 = request.POST.get('locat1')
+        # 西南点
+        locat2 = request.POST.get('locat2')
+        # 图片地址
+        addr = request.POST.get('addr')
+        locat_info = request.POST.get('locat_info')
+        try:
+            Pic_Info.object.create(locat1=locat1,locat2=locat2,addr=addr,locat_info=locat_info)
+            return HttpResponse("1")
+        except:
+            return HttpResponse("0")