注册忘记密码

.gitignore

@@ -65,6 +65,7 @@ docs/_build/
 /hvideo_photo/
 /hnews_photo/
 /garden_photo/
+/map_photo/
 /.vscode/
 # PyBuilder
 target/

apps/AppInfo/models.py

@@ -406,7 +406,7 @@ class GardenArea(models.Model):
     mobile = models.CharField(u'电话', max_length=20, blank=True, null=True)
     img = models.CharField(u'地块图片', max_length=200, blank=True, null=True)
     addr = models.CharField(u'地块地址',max_length=255, null=True, blank=True)
-    desc = models.CharField(u'地块介绍', max_length=50, blank=True,null=True)
+    desc = models.CharField(u'地块介绍', max_length=350, blank=True,null=True)
     upl_time = models.DateTimeField(u'创建时间', blank=True, null=True)
 
     class Meta:

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,Pic_locat)
+    Sightsee_Photo,Pic_locat,Home_Farm)
 
 app_name = 'Equipment'
 
@@ -244,6 +244,10 @@ urlpatterns = [
 
     url(r'^pic_locat$', Pic_locat.as_view(), name='pic_locat'),
     
+    url(r'^home_farm$', Home_Farm.as_view(), name='home_farm'),
+    
+    
+    
     
 
     # 配置文件夹路由:

apps/Equipment/views.py

@@ -17,6 +17,7 @@ from django.contrib.auth.hashers import make_password, check_password
 from PIL import Image
 from django.utils import timezone
 import xmltodict
+from requests.auth import HTTPBasicAuth
 from django.contrib.auth import get_user_model
 from apps.AppInfo.models import (
     Article, CKArticle, Equip, Equip_type, FarmList, FarmUser, GardenManage,
@@ -199,10 +200,16 @@ class Newslist_View(ListView):
     def get(self,request):
         con = request.GET.get("condition")
         page = int(request.GET.get("page"))
-        art_type = int(request.GET.get("type"))
-        art_list = CKArticle.objects.filter(art_type=art_type)
-        if con:
-            art_list = CKArticle.objects.filter(art_type=art_type,title__contains=con)
+        try:
+            art_type = int(request.GET.get("type"))
+            art_list = CKArticle.objects.filter(art_type=art_type)
+            if con:
+                art_list = CKArticle.objects.filter(art_type=art_type,title__contains=con)
+        except:
+            art_list = CKArticle.objects.all()
+            if con:
+                art_list = CKArticle.objects.filter(title__contains=con)
+        
         nums = art_list.count()
         art = art_list[(5*(page-1)):(page*5)]
         return render(request, 'outerNet/newsList.html', context={'art':art,"nums":nums,"con":con,"page":page})
@@ -313,6 +320,8 @@ class Tourist(ListView):
         return render(request, 'outerNet/tourist.html', context={})
     def post(self,request):
         pass
+    
+
 #旅游导览
 class Tourist_List(ListView):
     def get(self,request):
@@ -320,6 +329,7 @@ class Tourist_List(ListView):
     def post(self,request):
         pass
 
+
 # 民宿列表
 class Dorm_List(ListView):
     def get(self,request):
@@ -395,7 +405,8 @@ class Back_Manage(ListView):
         if request.user.is_authenticated():
             current_user = request.user.username
             current_user = MyUser.objects.get(username=current_user)
-            return render(request, 'backstageNet/home.html', context={"current_user":current_user})
+            garden = GardenArea.objects.all()
+            return render(request, 'backstageNet/home.html', context={"current_user":current_user,"garden":garden})
         else:
             return render(request, 'outerNet/index2.html')
     def post(self,request):
@@ -2922,8 +2933,11 @@ class Person_Farm(ListView):
 # 农场管理界面
 class Person_Farm_Edit(ListView):
     def get(self,request):
-        current_user = MyUser.objects.get(username='admin')
-        return render(request, 'backstageNet/production/person_farm_edit.html', context={"current_user":current_user})
+        username = request.user.username
+        print('username:',username)
+        user = MyUser.objects.get(username=username)
+        print("当前用户为：", username)
+        return render(request, 'backstageNet/production/person_farm_edit.html', context={"current_user":user})
     def post(self,request):
         current_user = MyUser.objects.get(username='admin')
         try:
@@ -2948,7 +2962,11 @@ class Person_Area_Pub(ListView):
     def get(self,request):
         pass
     def post(self,request):
-        current_user = MyUser.objects.get(username='admin')
+        # current_user = MyUser.objects.get(username='admin')
+        username = request.user.username
+        print('username:',username)
+        user = MyUser.objects.get(username=username)
+        print("当前用户为：", username)
         # 农场名称
         name = request.POST.get('name')
         # 负责人
@@ -2963,9 +2981,9 @@ class Person_Area_Pub(ListView):
         img = request.POST.get('img')
         location = request.POST.get('location')
         addr = request.POST.get('addr')
-        if GardenArea.objects.filter(user=current_user).exists():
+        if GardenArea.objects.filter(user=user).exists():
             try:
-                gar_obj = GardenArea.objects.get(user=current_user)
+                gar_obj = GardenArea.objects.get(user=user)
                 gar_obj.name = name
                 gar_obj.manage = manage
                 gar_obj.mobile = mobile
@@ -2981,7 +2999,7 @@ class Person_Area_Pub(ListView):
                 data = "0"
         else:
             try:
-                GardenArea.objects.create(user=current_user,name=name,manage=manage,mobile=mobile,
+                GardenArea.objects.create(user=user,name=name,manage=manage,mobile=mobile,
                     area=area,desc=desc,img=img,
                     location=location,addr=addr)
                 data = "1"
@@ -3456,4 +3474,19 @@ class Pic_locat(ListView):
             return HttpResponse("1")
         except Exception as e:
             print("--->>",e)
-            return HttpResponse("0")
+            return HttpResponse("0")
+        
+        
+
+
+class Home_Farm(ListView):
+    def get(self,request):
+        username = request.user.username
+        print('username:',username)
+        user = MyUser.objects.get(username=username)
+        print("当前用户为：", username)
+        farm_list = FarmList.objects.all()
+        return render(request, 'backstageNet/home.html', context={"farm_list":farm_list})
+
+    def post(self, request):
+        pass

apps/Home/urls.py

@@ -18,4 +18,5 @@ urlpatterns = [
     url(r'^user_news$',User_News.as_view(), name='user_news'),#新建用户
     url(r'^user_land$',User_Land.as_view(), name='user_land'),#用户登陆
     url(r'^user_check$',User_Check.as_view(), name='user_check'),#用户登陆
+    url(r'^logout$', views.logout, name='logout'),
 ]

apps/Home/views.py

@@ -25,7 +25,7 @@ from django.core.cache import cache
 import os
 
 from apps.AppInfo.models import Equip, Equip_type, MyUser, QXZdata, QXZstatus, QXZdata_New, JKdata, Article, QXZstatus_New, QXZswitchdata, QXZswitchstatus, CKArticle, GardenManage, Video_data,\
-    Product, Pick_Pub, FarmList, Hotel_Info
+    Product, Pick_Pub, FarmList, Hotel_Info, GardenArea
 
 
 from django.utils.decorators import method_decorator
@@ -146,8 +146,10 @@ class Home(View):
         video_news = Video_data.objects.all()[0:4]
         product = Product.objects.all()[0:8]
         pick = Pick_Pub.objects.all()[0:6]
-        farm = FarmList.objects.all()[0:6]
+        farm = FarmList.objects.all()
+        garden = GardenArea.objects.all()
         hotel = Hotel_Info.objects.all()[0:5]
+        article = CKArticle.objects.all()[0:12]
         if request.user.is_authenticated():
             user_name = request.user.username
             curr_user = MyUser.objects.get(username=user_name)
@@ -155,8 +157,8 @@ class Home(View):
             print('user=', curr_user.username)
         else:
             curr_user = ""
-        return render(request, 'outerNet/index2.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,
-                                                               "two_news": two_news, "video_news": video_news,"hotel":hotel,
+        return render(request, 'outerNet/index2.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,"article":article,
+                                                               "two_news": two_news, "video_news": video_news,"hotel":hotel,"garden":garden,
                                                                "product": product, "pick": pick, "farm": farm, "curr_user": curr_user})
 
     def post(self, request):
@@ -172,8 +174,9 @@ class Home2(View):
         video_news = Video_data.objects.all()[0:4]
         product = Product.objects.all()[0:8]
         pick = Pick_Pub.objects.all()[0:6]
-        farm = FarmList.objects.all()[0:6]
+        garden = GardenArea.objects.all()
         hotel = Hotel_Info.objects.all()[0:5]
+        article = CKArticle.objects.all()[0:12]
         if request.user.is_authenticated():
             user_name = request.user.username
             curr_user = MyUser.objects.get(username=user_name)
@@ -182,8 +185,8 @@ class Home2(View):
         else:
             curr_user = ""
         return render(request, 'outerNet/index2.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,
-                                                               "two_news": two_news, "video_news": video_news,"hotel":hotel,
-                                                               "product": product, "pick": pick, "farm": farm, "curr_user": curr_user})
+                                                               "two_news": two_news, "video_news": video_news,"hotel":hotel,"article":article,
+                                                               "product": product, "pick": pick, "garden": garden, "curr_user": curr_user})
 
     def post(self, request):
         pass
@@ -314,6 +317,14 @@ class User_Land(ListView):
                     return HttpResponse(data)
 
 
+# 用户退出 
+@login_required
+def logout(request):
+    print("用户退出")
+    del request.session['username']# 删除session
+    auth.logout(request)
+    return redirect('/login2')
+
 
 #判断用户是否已登陆
 class User_Check(ListView):

templates/backstageNet/home.html

@@ -291,7 +291,7 @@
                             <a href="user_change_pwd" target="BoardRight">修改密码</a>
                         </dd>
                         <dd>
-                            <a href="javascript:;">退了</a>
+                            <a href="logout">退了</a>
                         </dd>
                     </dl>
                 </li>

templates/outerNet/index2.html

@@ -163,7 +163,7 @@
                         <div class="userCtrlBtm"><a href="back_manage" target="_blank">进入后台管理</a></div>
                      </div>
                      <div class="exit">
-                         <a href="">
+                         <a href="logout">
                              <i class="fa fa-power-off" aria-hidden="true"></i>
                          </a>
                      </div>
@@ -217,96 +217,24 @@
                                 <div class="farmIntroduce">
                                     <div class="farmsSwiper">
                                         <ul class="farmsUl">
+                                            {% for farmItem in garden %}
                                             <li class="farm-item">
-                                                <a target="_blank" href="person_farm?name=admin">
-                                                  <img src="http://www.nzlyw.com/file/upload/202007/15/093517211.jpg" alt="">
+                                                <a target="_blank" href="person_farm?name={{farmItem.user}}">
+                                                  <img src="{{farmItem.farm_img}}" alt="">
                                                     <div class="news-item-txt">
                                                         <div class="title">
                                                             <h1>
-                                                                1,旅游体育消费年吉林省举办旅游体育。消费年吉林省举办旅游体育消费年”吉林省举办“旅游体育消费年”
+                                                                {{farmItem.name}}
                                                             </h1>
                                                         </div>
                                                         <div class="desc">
-                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                        </div>
-                                                    </div>  
-                                                </a>
-                                            </li>
-                                            <li class="farm-item">
-                                                <a target="_blank" href="person_farm?name=admin">
-                                                  <img src="http://www.nzlyw.com/file/upload/202007/16/161349721.jpg" alt="">
-                                                    <div class="news-item-txt">
-                                                        <div class="title">
-                                                            <h1>
-                                                                2,打工皇帝更换你的
-                                                            </h1>
-                                                        </div>
-                                                        <div class="desc">
-                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                        </div>
-                                                    </div>  
-                                                </a>
-                                            </li>
-                                            <li class="farm-item">
-                                                <a target="_blank" href="person_farm?name=admin">
-                                                  <img src="http://www.nzlyw.com/file/upload/202007/15/093857151.jpg" alt="">
-                                                    <div class="news-item-txt">
-                                                        <div class="title">
-                                                            <h1>
-                                                                3那个号码规范
-                                                            </h1>
-                                                        </div>
-                                                        <div class="desc">
-                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                        </div>
-                                                    </div>  
-                                                </a>
-                                            </li>
-                                            <li class="farm-item">
-                                                <a target="_blank" href="person_farm?name=admin">
-                                                  <img src="http://www.nzlyw.com/file/upload/202007/15/101622551.jpg" alt="">
-                                                    <div class="news-item-txt">
-                                                        <div class="title">
-                                                            <h1>
-                                                                4森岛帆高森岛帆高
-                                                            </h1>
-                                                        </div>
-                                                        <div class="desc">
-                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                        </div>
-                                                    </div>  
-                                                </a>
-                                            </li>
-                                            <li class="farm-item">
-                                                <a target="_blank" href="person_farm?name=admin">
-                                                  <img src="http://www.nzlyw.com/file/upload/202007/15/093517211.jpg" alt="">
-                                                    <div class="news-item-txt">
-                                                        <div class="title">
-                                                            <h1>
-                                                                5吉林省举办,旅游体育消费年吉林省举办旅游体育。消费年吉林省举办旅游体育消费年”吉林省举办“旅游体育消费年”
-                                                            </h1>
-                                                        </div>
-                                                        <div class="desc">
-                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
-                                                        </div>
-                                                    </div>  
-                                                </a>
-                                            </li>
-                                            <li class="farm-item">
-                                                <a target="_blank" href="person_farm?name=admin">
-                                                  <img src="http://www.nzlyw.com/file/upload/202007/28/091646681.jpg" alt="">
-                                                    <div class="news-item-txt">
-                                                        <div class="title">
-                                                            <h1>
-                                                                6吉林省举办,旅游体育消费年吉林省举办旅游体育。消费年吉林省举办旅游体育消费年”吉林省举办“旅游体育消费年”
-                                                            </h1>
-                                                        </div>
-                                                        <div class="desc">
-                                                            央广网长春7月3日消息（记者刘源源）“吉林旅游体育消费年”近日启动。将陆续陆续陆续陆续陆续陆续陆续陆续陆续陆续推出“周”游吉林主题活动，打造一批优质自质自质自驾游、生态游、健康游线路，包括吉林东线游长白山、西线游查干湖等经典线路。还新推出了“...
+                                                            {{farmItem.desc}}
                                                         </div>
                                                     </div>  
                                                 </a>
                                             </li>
+                                            {% endfor %}
+                                            
                                         </ul>
                                     </div>
                                 </div> 
@@ -317,47 +245,15 @@
                     <div class="news">
                         <div class="newsTitle">
                             <span>焦点新闻</span>
-                            <a href="newslist_view?page=1&type=0" target="_blank" class="more">更多</a>
+                            <a href="newslist_view?page=1&type=''" target="_blank" class="more">更多</a>
                         </div>
                         <div class="newsContent">
                             <ul class="news-txt-list">
+                                {% for news in article %}
                                 <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">田园乡村旅游攻略！一起来个田园乡村旅游吧。</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">英吉沙“杏”福路越走越宽</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">一起来个田园乡村旅游吧。</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">情暖建昌：百年董氏公司助力乡村党建工作</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">围绕乡村振兴战略总体要求和全市美丽乡村示范建设行动部署。</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">让母猪营养更精准——智能饲喂化解猪场双疫期尴尬</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">机场送“杏”福 感恩援疆情</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">金银花要怎么种？金银花的种植技术介绍</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="news_view?id=61" target="_blank">脐橙采果后要怎么施肥？脐橙施肥技术</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="">黄鳝为什么会变性？黄鳝是怎么变性的呢？</a>
-                                </li><li class="news-txt-item">
-                                    <a href="">甘蔗田要怎么施用除草剂除草？甘蔗田除草剂的正确施用方法</a>
-                                </li><li class="news-txt-item">
-                                    <a href="">蛏子怎么养能提高产量？蛏子养殖高产技术</a>
-                                </li>
-                                <li class="news-txt-item">
-                                    <a href="">要怎么给油菜施肥才能增产？油菜施肥介绍</a>
+                                    <a href="news_view?id={{news.id}}" target="_blank">{{news.title}}</a>
                                 </li>
+                                {% endfor %}
                             </ul>
                         </div>
                     </div>

templates/static/css/index2.css

@@ -93,7 +93,7 @@ span.swiper-pagination-bullet-active{
 .farmsbottom .farmImg .masking{
     padding-top: 20px;
     position: absolute;
-    bottom: 0;
+    bottom: 15px;
     left: 0;
     right: 0;
     background: rgba(58, 158, 89, 0.89);

templates/static/js/limit/limitUserManage.js

@@ -239,7 +239,7 @@ function getLimit() {
                 url: 'limit_view',
                 type: 'post',
                 data: {
-                    uname: $('#uname').val(),
+                    uname: $('#hiduname').val(),
                     limit: JSON.stringify(checkData)
                 },
                 success: function (data) {