yf_ymm 5 лет назад
Родитель
Сommit
ae0b0ba597
2 измененных файлов с 32 добавлено и 31 удалено
  1. 29 28
      apps/AppInfo/admin.py
  2. 3 3
      apps/Equipment/views.py

+ 29 - 28
apps/AppInfo/admin.py

@@ -5,7 +5,8 @@ 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, Pic_Info,Sightsee_Info,QXZ_Alarm_Log
+CKArticle,GardenManage,GardenArea,Areacrop,Store_Manage,Hotel_Info,Hotel_Photo,FarmUser,FarmList,Pick_Pub,Sell_Manage,Person_Pick,QXZAutoswitch, Pic_Info,Sightsee_Info,QXZ_Alarm_Log,\
+Experts
 
 
 
@@ -785,32 +786,32 @@ class QXZ_Alarm_LogAdmin(admin.ModelAdmin):
     
 
 
-# # 专家表
-# @admin.register(Expert)
-# class ExpertAdmin(admin.ModelAdmin):
-#     actions_on_bottom = False
-#     actions_on_top = True
-#     # 详情显示项:
-#     fields = [
-#         'name',
-#         'relation',
-#         'desc',
-#         'pic',
-#         'upl_time',
-#     ]
-#     # 列表显示项:
-#     list_display = [
-#         'name',
-#         'relation',
-#         'desc',
-#         'pic',
-#         'upl_time',
-#     ]
-#     # 筛选过滤项:
-#     list_filter = ('upl_time',)
-#     # 搜索项:
-#     search_fields = ['name']
-#     # 设置每页显示记录数:
-#     list_per_page = 10    
+# 专家表
+@admin.register(Experts)
+class ExpertsAdmin(admin.ModelAdmin):
+    actions_on_bottom = False
+    actions_on_top = True
+    # 详情显示项:
+    fields = [
+        'name',
+        'relation',
+        'desc',
+        'pic',
+        'upl_time',
+    ]
+    # 列表显示项:
+    list_display = [
+        'name',
+        'relation',
+        'desc',
+        'pic',
+        'upl_time',
+    ]
+    # 筛选过滤项:
+    list_filter = ('upl_time',)
+    # 搜索项:
+    search_fields = ['name']
+    # 设置每页显示记录数:
+    list_per_page = 10    
 
 

+ 3 - 3
apps/Equipment/views.py

@@ -24,7 +24,7 @@ from apps.AppInfo.models import (
     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,Pic_Info,
-    QXZ_Alarm_Log)
+    QXZ_Alarm_Log,Experts)
 from apps.Equipment.all_dict import qxz_dict
 
 
@@ -3693,7 +3693,7 @@ class Expert_Img(ListView):
 class Expert_Info(ListView):
     def get(self,request):
         page = int(request.GET.get("page"))
-        expert = Expert.objects.all()
+        expert = Experts.objects.all()
         nums = expert.count()
         expert = expert[(10*(page-1)):(page*10)]
         return render(request, 'backstageNet/limit/expertList.html', context={"expert":expert,"nums":nums})
@@ -3702,5 +3702,5 @@ class Expert_Info(ListView):
         relation = request.POST.get('relation')
         desc = request.POST.get('desc')
         pic = request.POST.get('pic')
-        Expert.objects.create(name=name,relation=relation,desc=desc,pic=pic)
+        Experts.objects.create(name=name,relation=relation,desc=desc,pic=pic)
         return HttpResponse("1")