用户接口调整

.gitignore

@@ -59,7 +59,7 @@ docs/_build/
 /hotel_photo/
 /hotel_photos/
 /hvideos/
-/cropcount_photo
+/cropcount_photo/
 /media/
 /guser_photo/
 /product_photo/
@@ -74,3 +74,4 @@ docs/_build/
 /crop_photo/
 /sightsee_photos/
 /user_photo/
+*.config

apps/Equipment/urls.py

@@ -256,22 +256,39 @@ urlpatterns = [
     
     url(r'^system_photo_save$', System_Photo_Save.as_view(), name='system_photo_save'),
     
+    #配置文件夹路由:
+    url(r'^hotel_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\hotel_photo'}), #本地
+    url(r'^hotel_photos/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\hotel_photos'}), #本地
+    url(r'^hvideos/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\hvideos'}), #本地
+    url(r'^hnews_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\hnews_photo'}), #本地
+    url(r'^hvideo_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\hvideo_photo'}), #本地
+    url(r'^product_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\product_photo'}), #本地
+    url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\garden_photo'}), #本地
+    url(r'^guser_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\guser_photo'}), #本地
+    url(r'^map_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\map_photo'}), #本地
+    url(r'^sightsee_photos/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\sightsee_photos'}), #本地
+    url(r'^media/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\media'}), #本地
+    url(r'^sell_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\sell_photo'}), #本地
+    url(r'^cropcount_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\cropcount_photo'}), #本地
+    url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'C:\webproject\second\garden_photo'}), #本地
     
     
 
     # 配置文件夹路由:
-    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'}), #本地
-    url(r'^hvideos/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\hvideos'}), #本地
-    url(r'^hnews_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\hnews_photo'}), #本地
-    url(r'^hvideo_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\hvideo_photo'}), #本地
-    url(r'^product_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\product_photo'}), #本地
-    url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\garden_photo'}), #本地
-    url(r'^guser_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\guser_photo'}), #本地
-    url(r'^map_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\map_photo'}), #本地
-    url(r'^sightsee_photos/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\sightsee_photos'}), #本地
-    url(r'^media/uploads/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\media\\uploads'}), #本地
-    
+    # 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'}), #本地
+    # url(r'^hvideos/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\hvideos'}), #本地
+    # url(r'^hnews_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\hnews_photo'}), #本地
+    # url(r'^hvideo_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\hvideo_photo'}), #本地
+    # url(r'^product_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\product_photo'}), #本地
+    # url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\garden_photo'}), #本地
+    # url(r'^guser_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\guser_photo'}), #本地
+    # url(r'^map_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\map_photo'}), #本地
+    # url(r'^sightsee_photos/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\sightsee_photos'}), #本地
+    # url(r'^media/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\media'}), #本地
+    # url(r'^sell_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\sell_photo'}), #本地
+    # url(r'^cropcount_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\cropcount_photo'}), #本地
+    # url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\garden_photo'}), #本地
     
 
     # url(r'^hotel_photo/(?P<path>.*)', serve, {'document_root': '/home/web/second/second/hotel_photo'}), #本地
@@ -282,6 +299,4 @@ urlpatterns = [
     # url(r'^product_photo/(?P<path>.*)', serve, {'document_root': '/home/web/second/second/product_photo'}), #本地
     # url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': '/home/web/second/second/garden_photo'}), #本地
     # url(r'^guser_photo/(?P<path>.*)', serve, {'document_root': '/home/web/second/second/garden_photo'}), #本地
-
-
 ]

apps/Equipment/views.py

@@ -2272,7 +2272,10 @@ class Garden_User_View(ListView):
             garden = GardenArea.objects.filter(user=current_user)
         if gardenname:
             garden = GardenArea.objects.filter(name=gardenname)
-        farm = FarmList.objects.filter(garden=garden[0])
+        if garden:
+            farm = FarmList.objects.filter(garden=garden[0])
+        else:
+            farm = ""
         if current_user.is_staff == True:
             garden = GardenArea.objects.all()
         elif current_user.is_staff != True:
@@ -2677,7 +2680,10 @@ class CropCount(ListView):
             garden = GardenArea.objects.filter(user=current_user)
         if gardenname:
             garden = GardenArea.objects.filter(name=gardenname)
-        farm = FarmList.objects.filter(garden=garden[0])
+        if garden:
+            farm = FarmList.objects.filter(garden=garden[0])
+        else:
+            farm = ""
         if current_user.is_staff == True:
             garden = GardenArea.objects.all()
         elif current_user.is_staff != True:
@@ -3636,7 +3642,7 @@ class Person_Limit(ListView):
         # print("current_user:", current_user)
         username = request.user.username
         print('username:',username)
-        current_user = MyUser.objects.get(username=username)
+        user_list = MyUser.objects.get(username=username)
         print("筛选：")
         f_name = request.POST.get('uname')
         page = int(request.POST.get('page'))

apps/Home/allocation.py

@@ -0,0 +1,440 @@
+
+#普通用户默认基本配置
+ordinary = [{
+		"id": 1,
+		"title": "首页",
+		"icon": "",
+		"url": "map",
+		"children": []
+	},
+	{
+		"id": 3,
+		"title": "信息发布",
+		"icon": "",
+		"url": "",
+		"children": [{
+				"id": 3.1,
+				"title": "新闻资讯",
+				"url": "news_pub",
+			},
+			{
+				"id": 3.2,
+				"title": "视频资讯",
+				"url": "video_pub",
+			},
+			{
+				"id": 3.2,
+				"title": "产品展厅",
+				"url": "equip_pub",
+			},
+			{
+				"id": 3.3,
+				"title": "四季采摘",
+				"url": "garden_pub",
+			},
+			{
+				"id": 3.4,
+				"title": "民宿导览",
+				"url": "dorm_pub",
+			},
+			{
+				"id": 3.5,
+				"title": "旅游景点",
+				"url": "sightsee_pub",
+			},
+		]
+	},
+	{
+		"id": 4,
+		"title": "我的发布",
+		"icon": "",
+		"url": "my_pub",
+		"children": []
+	},
+	{
+		"id": 8,
+		"title": "开心农场",
+		"icon": "",
+		"url": "",
+		"children": [{
+				"id": 8.1,
+				"title": "我的农场",
+				"url": "person_farm_edit",
+			},
+			{
+				"id": 8.2,
+				"title": "农场管理",
+				"url": "garden_manage_view",
+			},
+			{
+				"id": 8.4,
+				"title": "库存管理",
+				"url": "repertory_view",
+			},
+			{
+				"id": 8.5,
+				"title": "种植管理",
+				"url": "cropcount",
+			},
+			{
+				"id": 8.6,
+				"title": "入库管理",
+				"url": "pick",
+			},
+			{
+				"id": 8.7,
+				"title": "销售管理",
+				"url": "sell_view",
+			}
+		]
+	},
+	{
+		"id": 9,
+		"title": "数据中心",
+		"icon": "",
+		"url": "",
+		"children": [{
+				"id": 9.1,
+				"title": "产业数据",
+				"url": "industrydata",
+			},
+			{
+				"id": 9.2,
+				"title": "类型分析",
+				"url": "type",
+			},
+			{
+				"id": 9.3,
+				"title": "对比分析",
+				"url": "contrast",
+			},
+		]
+	},
+	{
+		"id": 13,
+		"title": "系统设置",
+		"icon": "",
+		"url": "",
+		"children": [{
+			"id": 13.2,
+			"title": "地图设置",
+			"url": "setMap",
+		}, ]
+	},
+	{
+		"id": 14,
+		"title": "专家诊断",
+		"icon": "",
+		"url": "",
+		"children": [{
+			"id": 14.1,
+			"title": "在线专家",
+			"url": "expert",
+			"disabled": "true",
+		}, ]
+	},
+]
+
+
+
+
+#管理员权限
+administrators = [
+    {
+        "id": 1,
+        "title": "首页",
+        "icon": "",
+        "url": "map",
+        "children": []
+    },
+    {
+        "id": 2,
+        "title": "设备分配",
+        "icon": "",
+        "url": "equipallot",
+        "disabled": "true",
+        "children": []
+    },
+    {
+        "id": 3,
+        "title": "信息发布",
+        "icon": "",
+        "url": "",
+        "children": [
+            {
+                "id": 3.1,
+                "title": "新闻资讯",
+                "url": "news_pub",
+            },
+            {
+                "id": 3.2,
+                "title": "视频资讯",
+                "url": "video_pub",
+            },
+            {
+                "id": 3.2,
+                "title": "产品展厅",
+                "url": "equip_pub",
+            },
+            {
+                "id": 3.3,
+                "title": "四季采摘",
+                "url": "garden_pub",
+            },
+            {
+                "id": 3.4,
+                "title": "民宿导览",
+                "url": "dorm_pub",
+            },
+            {
+                "id": 3.5,
+                "title": "旅游景点",
+                "url": "sightsee_pub",
+            },
+        ]
+    },
+    {
+        "id": 4,
+        "title": "我的发布",
+        "icon": "",
+        "url": "my_pub",
+        "children": []
+    },
+    {
+        "id": 5,
+        "title": "视频监控",
+        "icon": "",
+        "url": "jkview",
+        "children": []
+    },
+    {
+        "id": 6,
+        "title": "传感及控制",
+        "icon": "",
+        "url": "",
+        "children": [
+            {
+                "id": 6.1,
+                "title": "控制模块",
+                "url": "qxzcontrol",
+            },
+            {
+                "id": 6.2,
+                "title": "趋势分析",
+                "url": "qxzchart",
+            },
+            {
+                "id": 6.3,
+                "title": "数据统计",
+                "url": "qxz_status",
+            }
+        ]
+    },
+    {
+        "id": 7,
+        "title": "预警中心",
+        "icon": "",
+        "url": "",
+        "children": [
+            {
+                "id": 7.1,
+                "title": "阈值设置",
+                "url": "qxz_warning_view",
+            },
+            {
+                "id": 7.2,
+                "title": "生产方式设置",
+                "url": "productionset",
+            },
+            {
+                "id": 7.3,
+                "title": "预警记录",
+                "url": "qxz_warning_list",
+            },
+        ]
+    },
+    {
+        "id": 8,
+        "title": "开心农场",
+        "icon": "",
+        "url": "",
+        "children": [
+            {
+                "id": 8.1,
+                "title": "我的农场",
+                "url": "person_farm_edit",
+            },
+            {
+                "id": 8.2,
+                "title": "农场管理",
+                "url": "garden_manage_view",
+            },
+            {
+                "id": 8.4,
+                "title": "库存管理",
+                "url": "repertory_view",    
+            },
+            {
+                "id": 8.5,
+                "title": "种植管理",
+                "url": "cropcount",
+            },
+            {
+                "id": 8.6,
+                "title": "入库管理",
+                "url": "pick",
+            },
+            {
+                "id": 8.7,
+                "title": "销售管理",
+                "url": "sell_view",
+            }
+        ]
+    },
+    {
+        "id": 9,
+        "title": "数据中心",
+        "icon": "",
+        "url": "",
+        "children": [
+            {
+                "id": 9.1,
+                "title": "产业数据",
+                "url": "industrydata",
+            },
+            {
+                "id": 9.2,
+                "title": "类型分析",
+                "url": "type",
+            },
+            {
+                "id": 9.3,
+                "title": "对比分析",
+                "url": "contrast",
+            },
+        ]
+    },
+    {
+        "id": 10,
+        "title": "通知公告",
+        "icon": "",
+        "url": "",
+        "disabled": "true",
+        "children": [
+            {
+                "id": 10.1,
+                "title": "发布公告",
+                "url": "policy_pub",
+                "disabled": "true",
+            },
+            {
+                "id": 10.2,
+                "title": "查看公告",
+                "url": "policy_list_view",
+                "disabled": "true",
+            },
+        ]
+    },
+    {
+        "id": 11,
+        "title": "信息审核",
+        "icon": "",
+        "url": "",
+        "disabled": "true",
+        "children": [
+            {
+                "id": 11.1,
+                "title": "新闻资讯",
+                "url": "news_check",
+                "disabled": "true",
+            },
+
+            {
+                "id": 11.2,
+                "title": "视频资讯",
+                "url": "video_check",
+                "disabled": "true",
+            },
+            {
+                "id": 11.3,
+                "title": "产品展厅",
+                "url": "equip_check",
+                "disabled": "true",
+            },
+            {
+                "id": 11.4,
+                "title": "四季采摘",
+                "url": "garden_check",
+                "disabled": "true",
+            },
+            {
+                "id": 11.5,
+                "title": "民宿导览",
+                "url": "dorm_check",
+                "disabled": "true",
+            },
+            {
+                "id": 11.6,
+                "title": "旅游景点",
+                "url": "sightsee_check",
+                "disabled": "true",
+            },
+            {
+                "id": 11.7,
+                "title": "个人农场",
+                "url": "farm_check",
+                "disabled": "true",
+            },
+        ]
+    },
+    {
+        "id": 12,
+        "title": "权限",
+        "icon": "",
+        "url": "limit_view",
+        "disabled": "true",
+        "children": []
+    },
+    {
+        "id": 13,
+        "title": "系统设置",
+        "icon": "",
+        "url": "",
+        "disabled": "true",
+        "children": [
+            {
+                "id": 13.1,
+                "title": "用户管理",
+                "url": "person_view",
+                "disabled": "true",
+            },
+            {
+                "id": 13.2,
+                "title": "地图设置",
+                "url": "setMap",
+                "disabled": "true",
+            },
+            {
+                "id": 13.3,
+                "title": "合作伙伴",
+                "url": "add_relation",
+                "disabled": "true",
+            }
+        ]
+    },
+    {
+        "id": 14,
+        "title": "专家诊断",
+        "icon": "",
+        "url": "",
+        "disabled": "true",
+        "children": [
+            {
+                "id": 14.1,
+                "title": "在线专家",
+                "url": "expert",
+                "disabled": "true",
+            },
+        ]
+    },
+]

apps/Home/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import url
 from django.views.static import serve
-from apps.Home.views import Home_Test,Home,Login_View,Login2_View,ForgetPaw_View,register_View,Modify_Head ,User_Img,User_News,User_Land,User_Check,Prove_Code,Reset_Password
+from apps.Home.views import Home_Test,Home,Login_View,Login2_View,ForgetPaw_View,register_View,Modify_Head ,User_Img,User_News,User_Land,User_Check,Prove_Code,Reset_Password,Log_Verify
 from . import views
 
 app_name = 'Home'
@@ -23,4 +23,5 @@ urlpatterns = [
     url(r'^prove_code$',Prove_Code.as_view(), name='prove_code'),#注册账号
     url(r'^reset_password$',Reset_Password.as_view(), name='reset_password'),#重置密码
     url(r'^logout$', views.logout, name='logout'),
+    url(r'^log_verify$',Log_Verify.as_view(), name='log_verify'),#登陆校验
 ]

apps/Home/views.py

@@ -30,11 +30,153 @@ from apps.AppInfo.models import Equip, Equip_type, MyUser, QXZdata, QXZstatus, Q
 Product, Pick_Pub, FarmList, Hotel_Info, GardenArea, Sightsee_Info,Hotel_Info, Relations
 from qcloudsms_py import SmsSingleSender
 from qcloudsms_py.httpclient import HTTPError
-
+import requests
 from django.utils.decorators import method_decorator
-
+from .allocation import administrators,ordinary
 # Create your views here.
 
+"""
+appkey 和 AppSecret
+1、先调用我们开放的接口，获取 userid和code
+2、然后使用userid 和code 带上appkey 和 AppSecret 请求客户提供的接口地址，获取用户信息
+3、根据返回的数据进行判断是否登陆
+"""
+
+
+"""
+{
+	"timestamp": "2020-09-04 10:04:37",
+	"status": 404,
+	"error": "Not Found",
+	"message": "No message available",
+	"path": "/ducore//oauth/oauthLogin/oauthLogin/"
+}
+
+
+{
+	"success": true,
+	"message": "操作成功！",
+	"code": 200,
+	"result": {
+		"address": "",
+		"sex": 1,
+		"telephone": "",
+		"avatar": "files/20200902/3184478c3fe1ae8c6e2aa3828a6e62c_1599017263910.jpg",
+		"isAdmin": "N",
+		"delFlag": "0",
+		"realname": "黄豪",
+		"workNo": "11111",
+		"kodaE": "",
+		"post": "",
+		"phone": "15959191107",
+		"identity": "",
+		"orgCode": "A01A03",
+		"kodaPassword": "888888",
+		"id": "5b75626a-1559-4596-aca5-3dcfaa736254",
+		"kodaUsername": "0591002000007",
+		"kodaId": "0591002000007",
+		"email": "",
+		"status": 1,
+		"username": "15959191107"
+	},
+	"timestamp": 1599184606585
+}
+"""
+
+app_key = "u8dF3opl0xCq1a"
+app_secret = "Qz4jLdSisLDzyDxCdog7"
+urls = "http://10.10.0.227:17022/ducore/oauth/oauthLogin/oauthLogin/" 
+headers = {"app_key":app_key,"app_secret":app_secret}
+#登陆校验
+class Log_Verify(View):
+    def get(self,request):
+        user_news = CKArticle.objects.filter(art_type=5)[0:10]
+        zero_news = CKArticle.objects.filter(art_type=0)[0:10]
+        one_news = CKArticle.objects.filter(art_type=1)[0:10]
+        two_news = CKArticle.objects.filter(art_type=2)[0:10]
+        video_news = Video_data.objects.all()[0:4]
+        product = Product.objects.all()[0:8]
+        pick = Pick_Pub.objects.filter(hidden=True)[0:8]
+        farm = FarmList.objects.all()[0:8]
+        garden = GardenArea.objects.filter(hidden=True)[0:6]
+        hotel = Hotel_Info.objects.filter(hidden=True)[0:6]
+        article = CKArticle.objects.filter(hidden=True)[0:12]
+        sightsee = Sightsee_Info.objects.filter(hidden=True)[0:6]
+        hotel2 = Hotel_Info.objects.filter(hidden=True).order_by('-upl_time')[0:6]
+        relation = Relations.objects.all()
+
+        userId = request.GET.get("userId")
+        print("userId",userId)
+        code = request.GET.get("code")
+        print("code",code)
+        data = {"userId":userId,"code":code}
+        data = json.dumps(data)
+        url = urls + userId + "/" + code
+        res = requests.post(url,headers=headers)
+        rest = json.loads(res.text)
+        #校验登陆是否成功
+        try:
+            code  = rest["code"]
+        except:
+            code = 400
+        if code == 200:
+            username = rest["result"]["username"]
+            try:
+                curr_user = MyUser.objects.get(username=username)
+            except:
+                curr_user = ""
+            isadmin = rest["result"]["isAdmin"]
+            # 普通用户
+            if isadmin == "N":
+                limit = ordinary
+                num = 1
+
+            # 管理员
+            else:
+                limit = administrators
+                num = 2
+
+            # 设置默认密码
+            password = "qwerdf123456"
+
+            # 修改
+            if curr_user:
+                curr_user.user_remark = rest["result"]["realname"]
+                curr_user.user_picture = rest["result"]["avatar"]
+                curr_user.user_phone = rest["result"]["phone"]
+                curr_user.save()
+
+            # 新增
+            else:
+                if num == 1:
+                    # 普通用户
+                    MyUser.objects.create_user(
+                        user_remark = rest["result"]["realname"],
+                        user_picture = rest["result"]["avatar"],
+                        user_phone = rest["result"]["phone"],
+                        username = rest["result"]["username"],
+                        password=password,
+                        limit=limit
+                    )
+                else:
+                    # 管理员
+                    MyUser.objects.create_user(
+                        user_remark = rest["result"]["realname"],
+                        user_picture = rest["result"]["avatar"],
+                        user_phone = rest["result"]["phone"],
+                        username = rest["result"]["username"],
+                        password=password,
+                        limit=limit,
+                        is_superuser=1,
+                        is_staff=1
+                    )
+            request.session['username'] = username
+            return render(request, 'outerNet/index2.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,"article":article,"relation":relation,
+                                                               "two_news": two_news, "video_news": video_news,"hotel":hotel,"garden":garden,"hotel2":hotel2,
+                                                               "product": product, "pick": pick, "farm": farm, "curr_user": curr_user,"sightsee":sightsee})
+        else:
+            return render(request,"outerNet/error.html",context={})
+
 
 class Home_Test(View):
     def get(self, request):
@@ -123,6 +265,9 @@ class Login2_View(View):
     def post(self, request):
         pass
 
+
+
+
 # 注册
 class ForgetPaw_View(View):
     def get(self, request):

second_pro/settings.py

@@ -26,11 +26,7 @@ SECRET_KEY = 'k6xor0qx47hat_nflfgnccz+e&=jwovam2ec5)g!0zkxq&iwip'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*',
-                '120.27.222.26','.yfzhwlw.com','.zgzhwlw.com','iot.hnyfkj.cn',
-                '39.104.94.153', '.yfznscd.com',
-                '192.168.1.7'#手机app开发用端口
-                ]
+ALLOWED_HOSTS = ['*']
 
 
 # Application definition

templates/backstageNet/annunciate/policyPub.html

@@ -156,7 +156,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>通知公告</cite>
+                        <cite>发布公告</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/equipallot/equipallot.html

@@ -41,7 +41,7 @@
 						<span class="layui-breadcrumb">
 							<a target="BoardRight">首页</a>
 							<a>
-								<cite>用户列表</cite>
+								<cite>设备分配</cite>
 							</a>
 						</span>
 					</div>

templates/backstageNet/info/dormPub.html

@@ -222,7 +222,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>信息发布</cite>
+                        <cite>民宿导览</cite>
                     </a>
                 </span>
             </div>
@@ -460,7 +460,7 @@
                     $('#uploader-list').append(
                         '<div id="" class="file-iteme">' +
                         '<div class="handle"><i class="layui-icon">&#xe640;</i></div>' +
-                        '<img style="width: 100px;height: 100px;" src=http://127.0.0.1:8000/' + res.data.src + '>' +
+                        '<img style="width: 100px;height: 100px;" src=http://112.49.38.63:8011/' + res.data.src + '>' +
                         '<div class="info">' + res.data.src + '</div>' +
                         '</div>'
                     );

templates/backstageNet/info/gardenPub.html

@@ -150,7 +150,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>信息发布</cite>
+                        <cite>四季采摘</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/info/newsPub.html

@@ -154,7 +154,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>信息发布</cite>
+                        <cite>新闻资讯</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/info/productPub.html

@@ -150,7 +150,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>信息发布</cite>
+                        <cite>产品展厅</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/info/sightseePub.html

@@ -222,7 +222,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>信息发布</cite>
+                        <cite>旅游景点</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/info/videoPub.html

@@ -154,7 +154,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>信息发布</cite>
+                        <cite>视频资讯</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/infoManage/dormManage.html

@@ -129,7 +129,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>民宿审核</cite>
+                        <cite>民宿导览</cite>
                     </a>
                 </span>
             </div>
@@ -342,7 +342,7 @@
                         if(!(i == window.data.length-1)){
                             photoList += ',';
                         }
-                        html +='<div id="" class="file-iteme"><div class="handle" style="display: none;"><i class="layui-icon"></i></div><img style="width: 100px;height: 100px;" src="http://127.0.0.1:8000/'+window.data[i].addr_photo+'"><div class="info" style="display: none;">'+window.data[i].addr_photo+'</div></div>'
+                        html +='<div id="" class="file-iteme"><div class="handle" style="display: none;"><i class="layui-icon"></i></div><img style="width: 100px;height: 100px;" src="http://112.49.38.63:8011/'+window.data[i].addr_photo+'"><div class="info" style="display: none;">'+window.data[i].addr_photo+'</div></div>'
                         if(i == window.data.length-1){
                             body.find('#uploader-list').html(html) //图片
                             body.find('input[name="pic_list"]').val(photoList)

templates/backstageNet/infoManage/farmManage.html

@@ -130,7 +130,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>农场审核</cite>
+                        <cite>个人农场</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/infoManage/newsManage.html

@@ -129,7 +129,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>新闻审核</cite>
+                        <cite>新闻资讯</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/infoManage/pickManage.html

@@ -130,7 +130,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>采摘审核</cite>
+                        <cite>四季采摘</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/infoManage/productManage.html

@@ -130,7 +130,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>产品审核</cite>
+                        <cite>产品展厅</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/infoManage/sightseeManage.html

@@ -130,7 +130,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>景点审核</cite>
+                        <cite>旅游景点</cite>
                     </a>
                 </span>
             </div>
@@ -361,7 +361,7 @@
                         dataType: 'json',
                         success: function (data) {
                             window.data = data
-                            var html = '<div><p style="line-height: 14px;padding-left: 10px;border-left: 3px solid #23a3ee;">景点导览图</p><img src="127.0.0.1:8000/'+window.data.guide_img+'"/></div>'
+                            var html = '<div><p style="line-height: 14px;padding-left: 10px;border-left: 3px solid #23a3ee;">景点导览图</p><img src="http://112.49.38.63:8011/'+window.data.guide_img+'"/></div>'
                             layero.find('.table').html('<p style="line-height: 14px;padding-left: 10px;border-left: 3px solid #23a3ee;">详细介绍</p>'+window.data.content)
                             layero.find('.table').append(html)
                         }

templates/backstageNet/infoManage/videoManage.html

@@ -130,7 +130,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>视频审核</cite>
+                        <cite>视频资讯</cite>
                     </a>
                 </span>
             </div>
@@ -390,9 +390,9 @@
                 content: '<div class="table"></div>',
                 success: function(layero, index) {
                     var html = '<video id="my-video" class="video-js" controls width="100%" height="349" autoplay="autoplay" poster="{{video.video_img}}" data-setup="{}">'+
-                                '<source src="http://127.0.0.1:8000/'+videoUrl+'" type="video/mp4">'+
-                                '<source src="http://127.0.0.1:8000/'+videoUrl+'" type="video/webm">'+
-                                '<source src="http://127.0.0.1:8000/'+videoUrl+'}" type="video/ogg">'+
+                                '<source src="http://112.49.38.63:8011/'+videoUrl+'" type="video/mp4">'+
+                                '<source src="http://112.49.38.63:8011/'+videoUrl+'" type="video/webm">'+
+                                '<source src="http://112.49.38.63:8011/'+videoUrl+'}" type="video/ogg">'+
                                 '<p class="vjs-no-js">要查看此视频，请启用JavaScript，并考虑升级到一个web浏览器'+
                                     '<a href="http://videojs.com/html5-video-support/" target="_blank">支持HTML5视频</a>'+
                                 '</p></video>';

templates/backstageNet/jk/equipmanage_jk.html

@@ -830,12 +830,18 @@
                 script.appendChild(document.createTextNode(" new EZUIPlayer('myPlayer" + curIndex + "');")); 
             }
             else {
+                var playHtml = "<video id='myPlayer" + curIndex + "' style='width: 100%; height: 100%' class='videoNum" + divNum + "' poster='' controls playsinline webkit-playsinline autoplay>";
 
-                playHtml = "<iframe   id='playFrame" + curIndex + "'  src='https://open.ys7.com/ezopen/h5/iframe_se?url=ezopen://open.ys7.com/" + deviceSerial + "/" + cameraNo + ".hd.live&autoplay=1&accessToken="+token+"'  width='100%' height='100%' allowfullscreen frameborder='0' allowtransparency=true></iframe>"
-
-                script = document.createElement("script");
+                playHtml += "<source src='" + hls + "' type='' />";
+                playHtml += "</video>";
+                var script = document.createElement("script");
                 script.type = "text/javascript";
-                script.appendChild(document.createTextNode(" IframeOnClick.track(document.getElementById('playFrame" + curIndex + "'), function() { setCurIndex(" + curIndex + " ); }); "));
+                script.appendChild(document.createTextNode(" new EZUIPlayer('myPlayer" + curIndex + "');"));
+                // playHtml = "<iframe   id='playFrame" + curIndex + "'  src='https://open.ys7.com/ezopen/h5/iframe_se?url=ezopen://open.ys7.com/" + deviceSerial + "/" + cameraNo + ".hd.live&autoplay=1&accessToken="+token+"'  width='100%' height='100%' allowfullscreen frameborder='0' allowtransparency=true></iframe>"
+
+                // script = document.createElement("script");
+                // script.type = "text/javascript";
+                // script.appendChild(document.createTextNode(" IframeOnClick.track(document.getElementById('playFrame" + curIndex + "'), function() { setCurIndex(" + curIndex + " ); }); "));
 
             }
 

templates/backstageNet/limit/expert.html

@@ -259,10 +259,11 @@
 
 </body>
 <script>
-    var laypage, form, upload;
-    layui.use(['laypage', 'form', 'upload'], function () {
+    var laypage, form, upload,element;
+    layui.use(['laypage', 'form', 'upload','element'], function () {
         laypage = layui.laypage;
         form = layui.form;
+        element = layui.element;
         upload = layui.upload;
         var uploadInst = upload.render({
             elem: '#pickImg'

templates/backstageNet/limit/expertList.html

@@ -5,7 +5,7 @@
         <img src="{% static '/imgs/cornerIcon.png' %}" alt="">
         <div class="expertInner">
             <div class="expertImg">
-                <img src="http://127.0.0.1:8000{{msg.pic}}" alt="">
+                <img src="http://112.49.38.63:8011/{{msg.pic}}" alt="">
             </div>
             <div class="expertTxt">
                 <h1>{{msg.name}}</h1>

templates/backstageNet/limit/limitUserManage.html

@@ -55,7 +55,7 @@
 						<span class="layui-breadcrumb">
 							<a target="BoardRight">首页</a>
 							<a>
-								<cite>用户列表</cite>
+								<cite>权限</cite>
 							</a>
 						</span>
 					</div>

templates/backstageNet/map/map.html

@@ -106,7 +106,7 @@
         });
 
     });
-    var mapimg = 'http://127.0.0.1:8000/'+$('#imgaddr').val();
+    var mapimg = 'http://112.49.38.63:8011/'+$('#imgaddr').val();
     if($('#locat1').val()){
         var locat1 = eval('('+$('#locat1').val()+')');
     }else{

templates/backstageNet/production/cropcount.html

@@ -173,7 +173,7 @@
             <span class="layui-breadcrumb">
                 <a target="BoardRight">首页</a>
                 <a>
-                    <cite>种植统计</cite>
+                    <cite>种植管理</cite>
                 </a>
             </span>
         </div>
@@ -518,7 +518,6 @@
                             //         },
                             //         error: function (type) {
                             //             console.log(type)
-                            //             alert('失败')
                             //         }
                             //     })
                             // }
@@ -536,6 +535,7 @@
                 //页面数据渲染
                 gedata('cropcount_view', 1)
                 function gedata(url, page) {
+                    var ids = data.value
                     $.ajax({
                         url: 'cropcount_view',
                         type: 'get',
@@ -578,8 +578,7 @@
                                         '<div class="userItem">' +
                                         '<div class="userMsg">' +
                                         '<div class="fl imgDiv">' +
-                                        '<img src="" alt="">' +
-                                        '<p>' + group[i].data.cropname + '</p>' +
+                                        '<img src="' + group[i].data.crop_img + '" alt="">' +
                                         '</div>' +
                                         '<div class="userInfo">' +
                                         // '<p>当前阶段：' + group[i].curro + '</p>' +
@@ -612,7 +611,8 @@
                                                 url: 'cropcount_view',
                                                 type: 'get',
                                                 // data: { page: obj.curr, ids: sessionStorage.getItem('seelectID') },
-                                                data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                                // data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                                data: { page: obj.curr, ids: ids },
                                                 dataType: 'html',
                                                 success: function (data) {
                                                     //转换格式
@@ -649,7 +649,7 @@
                                                             '<div class="userItem">' +
                                                             '<div class="userMsg">' +
                                                             '<div class="fl imgDiv">' +
-                                                            '<img src="" alt="">' +
+                                                            '<img src="' + group[i].data.crop_img +'" alt="">' +
                                                             '<p>' + group[i].data.cropname + '</p>' +
                                                             '</div>' +
                                                             '<div class="userInfo">' +
@@ -686,7 +686,6 @@
                         },
                         error: function (type) {
                             console.log(type)
-                            // alert('失败')
                         }
                     })
                 }
@@ -719,8 +718,8 @@
                 return false;
             });
 
-             //图片上传
-             var uploadInst = upload.render({
+            //图片上传
+            var uploadInst = upload.render({
                 elem: '#pickImg'
                 , url: 'cropcount_photo'
                 , field: 'gar_img'
@@ -754,6 +753,164 @@
                 }
             });
 
+
+            // 选中农场进行渲染列表
+            gedata('cropcount_view', 1, $('#farmSelct').val())
+            function gedata(url, page, id) {
+                $.ajax({
+                    url: 'cropcount_view',
+                    type: 'get',
+                    data: {
+                        page: page,
+                        ids: id,
+                    },
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data.nums !== 0) {
+                            //获取需要的数据
+                            var group = data.dat;
+                            //拼接字符串
+                            var str = '';
+                            //对数据做遍历，拼接到页面显示
+                            for (var i = 0; i < group.length; i++) {
+                                var strSeparator = "-"; //日期分隔符
+                                var oDate1
+                                var oDate2
+                                var strDateStart = new Date()
+                                var Str = strDateStart.getFullYear() + '-' +
+                                    (strDateStart.getMonth() + 1) + '-' +
+                                    strDateStart.getDate() + ' '
+                                var strDateEnd = group[i].data.upl_time
+                                var iDays;
+                                oDate1 = Str.split(strSeparator);
+                                oDate2 = strDateEnd.split(strSeparator);
+                                var strDateS = new Date(oDate1[0], oDate1[1] - 1, oDate1[2]);
+                                var strDateE = new Date(oDate2[0], oDate2[1] - 1, oDate2[2]);
+                                iDays = parseInt(Math.ceil(strDateS - strDateE) / 1000 / 60 / 60 / 24)//把相差的毫秒数转换为天数
+                                if (iDays > 0) {
+                                    //正数
+                                    var dateNum = iDays
+                                } else if (iDays <= 0) {
+                                    //负数
+                                    var dateNum = 0
+                                }
+                                str += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4">' +
+                                    '<div class="userItem">' +
+                                    '<div class="userMsg">' +
+                                    '<div class="fl imgDiv">' +
+                                    '<img src="' + group[i].data.crop_img + '" alt="">' +
+                                    '<p>' + group[i].data.cropname + '</p>' +
+                                    '</div>' +
+                                    '<div class="userInfo">' +
+                                    // '<p>当前阶段：' + group[i].curro + '</p>' +
+                                    '<p>所属农场：' + group[i].data.area + '</p>' +
+                                    '<p>规　　模：' + group[i].data.crop_count + '</p>' +
+                                    '<p>种植日期：' + group[i].data.upl_time + '</p>' +
+                                    '<p>已生长/天：' + dateNum + '</p>' +
+                                    '</div>' +
+                                    '</div>' +
+                                    '<div class="operateDiv">' +
+                                    '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" onclick="amend( ' + group[i].data.id + ' )">修改</button>' +
+                                    '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="del(' + group[i].data.id + ')">删除</button>' +
+                                    // '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="over(\'' + group[i].data.id + '\',\'' + group[i].curro + '\')">结束</button>' +
+                                    '</div>' +
+                                    '</div>' +
+                                    '</div>';
+                            }
+                            //放入页面的容器显示
+                            $('#box').html(str)
+
+                            laypage.render({
+                                elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
+                                , count: data.nums
+                                , limit: '9'
+                                , theme: '#2ca9f9'
+                                , layout: ['prev', 'page', 'next', 'skip']
+                                , jump: function (obj, first) {
+                                    if (!first) {
+                                        $.ajax({
+                                            url: 'cropcount_view',
+                                            type: 'get',
+                                            // data: { page: obj.curr, ids: sessionStorage.getItem('seelectID') },
+                                            // data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                            data: { page: obj.curr, ids: $('#farmSelct').val() },
+                                            dataType: 'html',
+                                            success: function (data) {
+                                                //转换格式
+                                                var res = JSON.parse(data)
+                                                //获取需要的数据
+                                                var group = res.dat;
+                                                //拼接字符串
+                                                var str = '';
+                                                //对数据做遍历，拼接到页面显示
+                                                for (var i = 0; i < group.length; i++) {
+                                                    var strSeparator = "-"; //日期分隔符
+                                                    var oDate1
+                                                    var oDate2
+                                                    var strDateStart = new Date()
+                                                    var Str = strDateStart.getFullYear() + '-' +
+                                                        (strDateStart.getMonth() + 1) + '-' +
+                                                        strDateStart.getDate() + ' '
+                                                    var strDateEnd = group[i].data.upl_time
+                                                    var iDays;
+                                                    oDate1 = Str.split(strSeparator);
+                                                    oDate2 = strDateEnd.split(strSeparator);
+                                                    var strDateS = new Date(oDate1[0], oDate1[1] - 1, oDate1[2]);
+                                                    var strDateE = new Date(oDate2[0], oDate2[1] - 1, oDate2[2]);
+                                                    iDays = parseInt(Math.ceil(strDateS - strDateE) / 1000 / 60 / 60 / 24)//把相差的毫秒数转换为天数
+
+                                                    if (iDays > 0) {
+                                                        //正数
+                                                        var dateNum = iDays
+                                                    } else if (iDays <= 0) {
+                                                        //负数
+                                                        var dateNum = 0
+                                                    }
+                                                    str += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4">' +
+                                                        '<div class="userItem">' +
+                                                        '<div class="userMsg">' +
+                                                        '<div class="fl imgDiv">' +
+                                                        '<img src="' + group[i].data.crop_img + '" alt="">' +
+
+                                                        '<p>' + group[i].data.cropname + '</p>' +
+                                                        '</div>' +
+                                                        '<div class="userInfo">' +
+                                                        // '<p>当前阶段：' + group[i].curro + '</p>' +
+                                                        '<p>所属农场：' + group[i].data.area + '</p>' +
+                                                        '<p>规　　模：' + group[i].data.crop_count + '</p>' +
+                                                        '<p>种植日期：' + group[i].data.upl_time + '</p>' +
+                                                        '<p>已生长/天：' + dateNum + '</p>' +
+                                                        '</div>' +
+                                                        '</div>' +
+                                                        '<div class="operateDiv">' +
+                                                        '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" onclick="amend( ' + group[i].data.id + ' )">修改</button>' +
+                                                        '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="del(' + group[i].data.id + ')">删除</button>' +
+                                                        // '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="over(' + group[i].id + ')">结束</button>' +
+                                                        // '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="over(\'' + group[i].data.id + '\',\'' + group[i].curro + '\')">结束</button>' +
+                                                        '</div>' +
+                                                        '</div>' +
+                                                        '</div>';
+                                                }
+                                                //放入页面的容器显示
+                                                $('#box').html(str)
+                                            },
+                                            error: function (type) {
+                                                console.log(type)
+                                            }
+                                        })
+                                    }
+                                }
+                            });
+                        } else {
+                            var html = '<div class="layui-col-xs12 " style="line-height:100px;text-align:center">暂无数据</div>'
+                            $('#box').html(html);
+                        }
+                    },
+                    error: function (type) {
+                        console.log(type)
+                    }
+                })
+            }
         })
 
         // 渲染农场下拉框数据
@@ -773,7 +930,7 @@
         }
 
 
-        // 选中农场进行渲染列表
+        // // 选中农场进行渲染列表
         gedata('cropcount_view', 1, $('#farmSelct').val())
         function gedata(url, page, id) {
             $.ajax({
@@ -817,7 +974,6 @@
                                 '<div class="userItem">' +
                                 '<div class="userMsg">' +
                                 '<div class="fl imgDiv">' +
-                                // '<img src="" alt="">' +
                                 '<img src="' + group[i].data.crop_img +'" alt="">' +
                                 '<p>' + group[i].data.cropname + '</p>' +
                                 '</div>' +
@@ -852,7 +1008,8 @@
                                         url: 'cropcount_view',
                                         type: 'get',
                                         // data: { page: obj.curr, ids: sessionStorage.getItem('seelectID') },
-                                        data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                        // data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                        data: { page: obj.curr, ids: $('#farmSelct').val() },
                                         dataType: 'html',
                                         success: function (data) {
                                             //转换格式
@@ -889,7 +1046,7 @@
                                                     '<div class="userItem">' +
                                                     '<div class="userMsg">' +
                                                     '<div class="fl imgDiv">' +
-                                                    '<img src="" alt="">' +
+                                                    '<img src="' + group[i].data.crop_img + '" alt="">' +
                                                     '<p>' + group[i].data.cropname + '</p>' +
                                                     '</div>' +
                                                     '<div class="userInfo">' +
@@ -926,7 +1083,6 @@
                 },
                 error: function (type) {
                     console.log(type)
-                    // alert('失败')
                 }
             })
         }

templates/backstageNet/production/gardenNew.html

@@ -4,7 +4,7 @@
         <!-- <p class="username">{{ msg.art }}</p> -->
         <p class="username">{{ msg.name }}</p>
         <div class="userMsg">
-            <img src='http://127.0.0.1:8000/{{ msg.farm_img }}' class="fl" alt="">
+            <img src='{{ msg.farm_img }}' class="fl" alt="">
             <div class="userInfo">
                 <p>基地面积（亩）： {{ msg.area }}</p>
                 <p>管理者： {{ msg.manage_user.name }}</p>

templates/backstageNet/production/person_farm_edit.html

@@ -409,7 +409,7 @@
                             $('#uploader-list').append(
                                 '<div id="" class="file-iteme">' +
                                 '<div class="handle"><i class="layui-icon">&#xe640;</i></div>' +
-                                '<img style="width: 100px;height: 100px;" src=http://127.0.0.1:8000/' + currImg[i] + '>' +
+                                '<img style="width: 100px;height: 100px;" src=http://112.49.38.63:8011/' + currImg[i] + '>' +
                                 '<div class="info">' + currImg[i] + '</div>' +
                                 '</div>'
                             );
@@ -417,7 +417,7 @@
                     } else {
 
                     }
-                    $('#demo1').attr('src','http://127.0.0.1:8000/'+data.guide_img);
+                    $('#demo1').attr('src','http://112.49.38.63:8011/'+data.guide_img);
                 }
             },
             error: function (type) {
@@ -459,7 +459,7 @@
                     $('#uploader-list').append(
                         '<div id="" class="file-iteme">' +
                         '<div class="handle"><span class="iconfont"></span></div>' +
-                        '<img style="width: 100px;height: 100px;" src=http://127.0.0.1:8000/' + res.data.src + '>' +
+                        '<img style="width: 100px;height: 100px;" src=http://112.49.38.63:8011/' + res.data.src + '>' +
                         '<div class="info">' + res.data.src + '</div>' +
                         '</div>'
                     );

templates/backstageNet/production/pick.html

@@ -149,7 +149,7 @@
             <span class="layui-breadcrumb">
                 <a target="BoardRight">首页</a>
                 <a>
-                    <cite>开心农场</cite>
+                    <cite>入库管理</cite>
                 </a>
             </span>
         </div>

templates/backstageNet/production/sellManage.html

@@ -149,7 +149,7 @@
             <span class="layui-breadcrumb">
                 <a target="BoardRight">首页</a>
                 <a>
-                    <cite>开心农场</cite>
+                    <cite>销售管理</cite>
                 </a>
             </span>
         </div>

templates/backstageNet/qxzctrl/qxzchart.html

@@ -764,10 +764,18 @@
                             legend.push(dat[0].unit[j][3] + elementName);
                         }
                         if (seriesDat[j]) {
-                            seriesDat[j].unshift(parseFloat(dat[i].unit[j][0]));
+                            if(dat[i].unit[j][0] == '-99.99'){
+                                seriesDat[j].unshift('-');
+                            }else{
+                                seriesDat[j].unshift(parseFloat(dat[i].unit[j][0]));
+                            }
                         } else {
                             var arr = [];
-                            arr.unshift(parseFloat(dat[i].unit[j][0]));
+                            if(dat[i].unit[j][0] == '-99.99'){
+                                arr.unshift('-');
+                            }else{
+                                arr.unshift(parseFloat(dat[i].unit[j][0]));
+                            }
                             seriesDat[j] = arr;
                         }
                     }

templates/backstageNet/systemSet/imageUpload.html

@@ -194,6 +194,10 @@
         .delTestData {
             display: none;
         }
+
+        .imgHidden {
+            display: none;
+        }
     </style>
 </head>
 
@@ -205,7 +209,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>图片上传</cite>
+                        <cite>首页图片</cite>
                     </a>
                 </span>
             </div>
@@ -225,9 +229,9 @@
                     <span class="">轮播图片：</span>
                     <button type="button" class="layui-btn layui-btn-normal" id="testList">选择图片</button>
                     <div id="demo1" style="margin-top: 10px">
-                        <img src="" alt="" style="width: 1200px; height: 470px;" class="layui-upload-img"
-                            id="carouselImg">
+                        <img src="" alt="" class="layui-upload-img imgHidden" id="carouselImg">
                     </div>
+                    <ul id="listData"></ul>
                     <button type="button" class="layui-btn testListAction" id="testListAction">开始上传</button>
                     <button type="button" class="layui-btn layui-btn-danger delTestData" id="delTestData">取消上传</button>
                 </div>
@@ -246,8 +250,9 @@
                     <span class="">广告位图片：</span>
                     <button type="button" class="layui-btn layui-btn-normal" id="replaceImg">选择图片</button>
                     <div id="demo2" style="margin-top: 10px">
-                        <img src="" alt="" style="width: 1200px; height: 90px;" class="layui-upload-img" id="finalImg">
+                        <img src="" alt="" class="layui-upload-img imgHidden" id="finalImg">
                     </div>
+                    <ul id="listDataA"></ul>
                     <button type="button" class="layui-btn imgListAction" id="imgListAction">开始上传</button>
                     <button type="button" class="layui-btn layui-btn-danger delImgData" id="delImgData">取消上传</button>
                 </div>
@@ -316,10 +321,11 @@
             </div>
         </div>
         <!--图片裁剪框 end首页轮播-->
-
     </div>
 
 
+
+
     <script src="{% static '/lib/js/jquery-2.1.4.min.js'%}"></script>
     <script src="{% static '/lib/layui/layui.js'%}"></script>
     <script src="{% static 'lib/ckeditor/ckeditor.js'%}"></script>
@@ -336,8 +342,58 @@
             upload = layui.upload;
             layer = layui.layer;
             // $ = layui.jquery
+
+
+            imgListData() //请求已上传的图片列表-广告
+            imgListDataA() //请求已上传的图片列表-轮播
         });
 
+        //广告列表请求
+        function imgListData() {
+            $.ajax({
+                url: 'system_photo_save',
+                type: 'post',
+                data: {
+                    code: '2'
+                },
+                success: function (data) {
+                    var dat = JSON.parse(data)
+                    $('#listDataA li').remove()
+                    var html = ''
+                    for (var i = 0; i < dat.length; i++) {
+                        html = '<li class="" style="margin: 10px 0 10px 0"><img style="width: 800px !important; height: 60px" src="' + dat[i].pic_img + '" alt="" class=""></li>'
+                        $('#listDataA').append(html)
+                    }
+                },
+                error: function (err) {
+                    console.log(err)
+                }
+            })
+        }
+
+        //轮播列表请求
+        function imgListDataA() {
+            $.ajax({
+                url: 'system_photo_save',
+                type: 'post',
+                data: {
+                    code: '1'
+                },
+                success: function (data) {
+                    var dat = JSON.parse(data)
+                    $('#listData li').remove()
+                    var html = ''
+                    for (var i = 0; i < dat.length; i++) {
+                        html = '<li class="" style="margin: 10px 0 10px 0"><img style="width: 512px !important; height: 128px" src="' + dat[i].pic_img + '" alt="" class=""></li>'
+                        $('#listData').append(html)
+                    }
+                },
+                error: function (err) {
+                    console.log(err)
+                }
+            })
+        }
+
         windowAddMouseWheel();
         function windowAddMouseWheel() {
             var scrollFunc = function (e) {
@@ -383,30 +439,50 @@
 
         // 广告位开始上传按钮监听事件
         $('#imgListAction').on('click', function () {
-            var timestamp = Date.parse(new Date());
-            var arr = imgArr.split(','), mime = arr[0].match(/:(.*?);/)[1]
-            bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
-            while (n--) {
-                u8arr[n] = bstr.charCodeAt(n);
-            }
-            var imgFile = new File([u8arr], timestamp, { type: mime })
-            console.log(imgFile)
-
-            // var timestamp = Date.parse(new Date());
-            // var arr = base64url.split(','), mime = arr[0].match(/:(.*?);/)[1]
-            // if (imgArr.length == 1) {
-            //     var arr = imgArr[0].split(','), mime = arr[0].match(/:(.*?);/)[1],
-            // } else if (imgArr.length == 2) {
-            //     var arr = imgArr[1].split(','), mime = arr[0].match(/:(.*?);/)[1],
-            // } else if (imgArr.length == 3) {
-            //     var arr = imgArr[2].split(','), mime = arr[0].match(/:(.*?);/)[1],
-            // }
-            // var arr = imgArr[0].split(','), mime = arr[0].match(/:(.*?);/)[1],
-            // bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
-            // while (n--) {
-            //     u8arr[n] = bstr.charCodeAt(n);
-            // }
-            // var imgFile = new File([u8arr], timestamp, { type: mime })
+            var fileObj = dataURLtoFile(imgArr, $('#chooseImg').val())
+            var form = new FormData();
+            form.append("upload1", fileObj);
+
+            $.ajax({
+                url: 'system_photo',
+                type: 'post',
+                data: form,
+                processData: false, // 告诉jQuery不要去处理发送的数据
+                contentType: false, // 告诉jQuery不要去设置Content-Type请求头
+                success: function (data) {
+                    console.log(data)
+                    $.ajax({
+                        url: 'system_photo_save',
+                        type: 'post',
+                        data: {
+                            code: '2'
+                        },
+                        success: function (data) {
+                            var dat = JSON.parse(data)
+                            if (dat.length != 0) {
+                                layer.msg('上传成功', { icon: 1 });
+                                imgArr = [] //清空数组数据
+                                $('#delImgData').addClass('delImgData')
+                                $('#finalImg').addClass('imgHidden')
+                                // $('#demo2 img').remove();  //删除所有img
+                                $('#imgListAction').addClass('imgListAction') //隐藏上传按钮
+                                $('#delImgData').addClass('delImgData') //隐藏取消按钮
+                                imgListData() //请求已上传的图片列表-广告
+                            } else if (data == 0) {
+                                layer.msg('上传失败', { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            console.log(err)
+                        }
+                    })
+                },
+                error: function (err) {
+                    console.log(err)
+                }
+            })
+
+
         });
 
         // 广告位取消上传按钮监听事件
@@ -415,7 +491,9 @@
                 btn: ['确定', '取消'] //按钮
             }, function () {
                 imgArr = [] //清空数组数据
-                $('#demo2 img').remove();  //删除所有img
+                $('#delImgData').addClass('delImgData')
+                $('#finalImg').addClass('imgHidden')
+                // $('#demo2 img').remove();  //删除所有img
                 $('#imgListAction').addClass('imgListAction') //隐藏上传按钮
                 $('#delImgData').addClass('delImgData') //隐藏取消按钮
                 layer.msg('删除成功', { icon: 1 });
@@ -463,7 +541,7 @@
                 //更换cropper的图片
                 $('#tailoringImg').cropper('replace', replaceSrc, false);//默认false，适应高度，不失真
             }
-            advertisingName = fileA.files[0].name
+            advertisingName = file.files[0].name
             reader.readAsDataURL(file.files[0]);
         }
         //cropper图片裁剪
@@ -513,33 +591,29 @@
                 var cas = $('#tailoringImg').cropper('getCroppedCanvas');//获取被裁剪后的canvas
                 var base64url = cas.toDataURL('image/png'); //转换为base64地址形式
                 imgArr = base64url
-                console.log(imgArr)
                 $("#finalImg").prop("src", base64url);//显示为图片的形式
+                $('#finalImg').removeClass('imgHidden')
                 //关闭裁剪框
                 closeTailor();
                 $('#imgListAction').removeClass('imgListAction')
                 $('#delImgData').removeClass('delImgData')
-
-
-                // var timestamp = Date.parse(new Date());
-                // var arr = base64url.split(','), mime = arr[0].match(/:(.*?);/)[1],
-                //     bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
-                // while (n--) {
-                //     u8arr[n] = bstr.charCodeAt(n);
-                // }
-                // var imgFile = new File([u8arr], timestamp, { type: mime })
-                // imgArr.push(imgFile)
-                // if (imgArr.length == 1) {
-                //     $('#demo2').append('<img src="' + imgArr[0] + '"class="layui-upload-img">')
-                // } else if (imgArr.length == 2) {
-                //     $('#demo2').append('<img src="' + imgArr[1] + '" class="layui-upload-img">')
-                // } else if (imgArr.length == 3) {
-                //     $('#demo2').append('<img src="' + imgArr[2] + '"class="layui-upload-img">')
-                // }
-
-
-
-
+                // var fileObj = dataURLtoFile(imgArr, $('#chooseImg').val())
+                // var form = new FormData();
+                // form.append("upload1", fileObj);
+
+                // $.ajax({
+                //     url: 'system_photo',
+                //     type: 'post',
+                //     data: form,
+                //     processData: false, // 告诉jQuery不要去处理发送的数据
+                //     contentType: false, // 告诉jQuery不要去设置Content-Type请求头
+                //     success: function (data) {
+                //         console.log(data)
+                //     },
+                //     error: function (err) {
+                //         console.log(err)
+                //     }
+                // })
             }
         });
         //广告位关闭裁剪框
@@ -551,13 +625,46 @@
 
         // 首页轮播开始上传按钮监听事件
         $('#testListAction').on('click', function () {
-            // var timestamp = Date.parse(new Date());
-            // var arr = imgArrA.split(','), mime = arr[0].match(/:(.*?);/)[1]
-            //     bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
-            // while (n--) {
-            //     u8arr[n] = bstr.charCodeAt(n);
-            // }
-            // var imgFile = new File([u8arr], timestamp, { type: mime })
+            var fileObj = dataURLtoFile(imgArrA, $('#chooseImgA').val())
+            var form = new FormData();
+            form.append("upload", fileObj);
+            $.ajax({
+                url: 'system_photo',
+                type: 'post',
+                data: form,
+                processData: false, // 告诉jQuery不要去处理发送的数据
+                contentType: false, // 告诉jQuery不要去设置Content-Type请求头
+                success: function (data) {
+                    $.ajax({
+                        url: 'system_photo_save',
+                        type: 'post',
+                        data: {
+                            code: '1'
+                        },
+                        success: function (data) {
+                            console.log(JSON.parse(data))
+                            var dat = JSON.parse(data)
+                            if (dat.length != 0) {
+                                layer.msg('上传成功', { icon: 1 });
+                                imgArr = [] //清空数组数据
+                                $('#carouselImg').addClass('imgHidden')
+                                // $('#demo1 img').remove();  //删除所有img
+                                $('#testListAction').addClass('testListAction') //隐藏上传按钮
+                                $('#delTestData').addClass('delTestData') //隐藏取消按钮
+                                imgListDataA() //请求已上传的图片列表-轮播
+                            } else if (data == 0) {
+                                layer.msg('上传失败', { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            console.log(err)
+                        }
+                    })
+                },
+                error: function (err) {
+                    console.log(err)
+                }
+            })
         });
 
         // 首页轮播取消上传按钮监听事件
@@ -566,7 +673,8 @@
                 btn: ['确定', '取消'] //按钮
             }, function () {
                 imgArr = [] //清空数组数据
-                $('#demo1 img').remove();  //删除所有img
+                $('#carouselImg').addClass('imgHidden')
+                // $('#demo1 img').remove();  //删除所有img
                 $('#testListAction').addClass('testListAction') //隐藏上传按钮
                 $('#delTestData').addClass('delTestData') //隐藏取消按钮
                 layer.msg('删除成功', { icon: 1 });
@@ -578,8 +686,6 @@
         //首页轮播上传图片按钮监听事件
         $('#testList').on('click', function () {
             // $("#replaceImg").addClass("layui-btn-disabled")
-            boxSize1 = 4
-            boxSize2 = 1
             //弹出图片裁剪框
             $("#testList").on("click", function () {
                 $(".tailoring-container2").toggle();
@@ -648,50 +754,29 @@
                 var base64url = cas.toDataURL('image/png'); //转换为base64地址形式
                 imgArrA = base64url
                 $("#carouselImg").prop("src", base64url);//显示为图片的形式
+                $('#carouselImg').removeClass('imgHidden')
+
                 //关闭裁剪框
                 closeTailorA();
                 $('#testListAction').removeClass('testListAction')
                 $('#delTestData').removeClass('delTestData')
-                var fileObj = dataURLtoFile(imgArrA, $('#chooseImgA').val())
-				var form = new FormData();
-				form.append("upload", fileObj);
-                // var arr = imgArrA.split(','), mime = arr[0].match(/:(.*?);/)[1]
-                // bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
-                // while (n--) {
-                //     u8arr[n] = bstr.charCodeAt(n);
-                // }
-                // var imgFile = new File([u8arr], carouselName, { type: mime })
-                // var form = new FormData()
-                // form.append('upload', imgFile)
-                $.ajax({
-                    url: 'system_photo',
-                    type: 'post',
-                    data: form,
-                    processData: false, // 告诉jQuery不要去处理发送的数据
-                    contentType: false, // 告诉jQuery不要去设置Content-Type请求头
-                    success: function (data) {
-                        console.log(data)
-                    },
-                    error: function (err) {
-                        console.log(err)
-                    }
-                })
+
             }
         });
-        function dataURLtoFile(dataurl,filename) {
-			var arr = dataurl.split(',');
-			var mime = arr[0].match(/:(.*?);/)[1];
-			var bstr = atob(arr[1]);
-			var n = bstr.length;
-			var u8arr = new Uint8Array(n);
-			while (n--) {
-				u8arr[n] = bstr.charCodeAt(n);
-			}
-			//转换成file对象
-			return new File([u8arr], filename, { type: mime });
-			//转换成成blob对象
-			//return new Blob([u8arr],{type:mime});
-		}
+        function dataURLtoFile(dataurl, filename) {
+            var arr = dataurl.split(',');
+            var mime = arr[0].match(/:(.*?);/)[1];
+            var bstr = atob(arr[1]);
+            var n = bstr.length;
+            var u8arr = new Uint8Array(n);
+            while (n--) {
+                u8arr[n] = bstr.charCodeAt(n);
+            }
+            //转换成file对象
+            return new File([u8arr], filename, { type: mime });
+            //转换成成blob对象
+            //return new Blob([u8arr],{type:mime});
+        }
         //首页轮播关闭裁剪框
         function closeTailorA() {
             $(".tailoring-container2").toggle();

templates/backstageNet/systemSet/mapManage.html

@@ -200,7 +200,7 @@
                 <span class="layui-breadcrumb">
                     <a target="BoardRight">首页</a>
                     <a>
-                        <cite>首页设置</cite>
+                        <cite>地图设置</cite>
                     </a>
                 </span>
             </div>

templates/backstageNet/warn/productionset.html

@@ -223,7 +223,7 @@
             <span class="layui-breadcrumb">
                 <a target="BoardRight">首页</a>
                 <a>
-                    <cite>生产方式设置</cite>
+                    <cite>预警中心</cite>
                 </a>
             </span>
         </div>
@@ -233,7 +233,7 @@
                 <div class="ctrlDiv">
                     <div class="title">
                         <div class="widget-title">
-                            <h2>阈值控制
+                            <h2>阈值设置
                                 <span id="Uptime"></span>
                             </h2>
                         </div>
@@ -381,9 +381,9 @@
                                         var eNum = qxz_list[j].eNum;
                                         var txt = qxz_dict[qxz_list[j].eNum][1];
 
-                                        html += '<div class="layui-col-xs6 layui-col-md3"><div class="grid-demo ctrlItem">' +
+                                        html += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3"><div class="grid-demo ctrlItem">' +
                                             '<div class="ctrlUp"><input type="hidden" value=' + JSON.stringify(switchData[i]) + ' class="currStutas">' +
-                                            '<div class="ctrlName"><p class="switchName">开关' + switchData[i].JK + '（通道' + switchData[i].eKey + '）</p><div class="clearfix">' +
+                                            '<div class="ctrlName"><p class="switchName">开关' + (parseInt(switchData[i].JK)+1) + '（通道' + (parseInt(switchData[i].eKey)+1) + '）</p><div class="clearfix">' +
                                             '<div class="fl warnEleName"><div class="bySwitchName"><span title="' + txt + '">' + txt + '</span>' +
                                             '<img src="http://www.yfzhwlw.com/static/img/dev/icon_' + eNum + '.png" alt=""></div></div>' +
                                             '<div class="warnEleVal"><p>最大值：' + switchData[i].upper + '</p><p>最小值：' + switchData[i].lower + '</p></div></div></div>' +

templates/backstageNet/warn/warnRecord.html

@@ -97,7 +97,7 @@
             <span class="layui-breadcrumb">
                 <a href="info_pub" target="BoardRight">首页</a>
                 <a>
-                    <cite>预警记录</cite>
+                    <cite>预警中心</cite>
                 </a>
             </span>
         </div>

templates/backstageNet/warn/warnSet.html

@@ -124,14 +124,14 @@
             <span class="layui-breadcrumb">
                 <a target="BoardRight">首页</a>
                 <a>
-                    <cite>阈值设置</cite>
+                    <cite>预警中心</cite>
                 </a>
             </span>
         </div>
         <!-- 内容 -->
         <div class="mainContent">
             <div class="widget-title">
-                <h2>阈值设置</h2>
+                <h2>预警设置</h2>
             </div>
             <div class="currEquip">
                 当前设备： 

templates/outerNet/error.html

@@ -0,0 +1,31 @@
+{% load staticfiles %}
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>404</title>
+    <link rel="stylesheet" href="{% static '/lib/css/reset.css' %}">
+    <style>
+        div{
+            height: 100vh;
+            display: flex;
+            display: -webkit-flex;
+            justify-content: center;
+            align-items: center;
+        }
+        img{
+            width: 50%;
+        }
+    </style>
+</head>
+
+<body>
+    <div>
+        <img src="{% static 'imgs/errorPage.png'%}" alt="">
+    </div>
+</body>
+
+</html>

templates/outerNet/farmList.html

@@ -215,7 +215,7 @@
                             {% if garden_list|length %} {% for gardenItem in garden_list %}
                             <li class="haciendaItem">
                                 <div class="haciendaImg">
-                                    <img class="haciendaImg1" src="http://127.0.0.1:8000/{{gardenItem.img_1}}" alt="">
+                                    <img class="haciendaImg1" src="http://112.49.38.63:8011/{{gardenItem.img_1}}" alt="">
                                 </div>
                                 <div class="haciendaTxt">
                                     <h2>{{gardenItem.name}}</h2>

templates/outerNet/forgetPaw.html

@@ -261,71 +261,13 @@
                 </div>
                 <div class="partnerInner">
                     <ul class="partnerInnerList">
+                        {% for relationItem in relation %}
                         <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
+                            <a target="_blank" href="{{relationItem.relation}}">
+                                <img src="http://112.49.38.63:8011/{{relationItem.pic}}" alt="">        
                             </a>
                         </li>
+                        {% endfor %}
                         <li style="clear: both;"></li>
                     </ul>
                 </div>

templates/outerNet/index2.html

@@ -150,7 +150,7 @@
             <div class="yet_loginCover">
                 <div class="person">
                     <div class="userHeadImg">
-                        <img src="http://127.0.0.1:8000/{{curr_user.user_picture}}" alt="">
+                        <img src="http://112.49.38.63:8011/{{curr_user.user_picture}}" alt="">
                     </div>
                     <div class="userCtrl">
                         <div class="userCtrlTop">
@@ -220,7 +220,7 @@
                                             {% for farmItem in garden %}
                                             <li class="farm-item">
                                                 <a target="_blank" href="person_farm?name={{farmItem.user}}">
-                                                  <img src="http://127.0.0.1:8000/{{farmItem.img_1}}" alt="">
+                                                  <img src="http://112.49.38.63:8011/{{farmItem.img_1}}" alt="">
                                                     <div class="news-item-txt">
                                                         <div class="title">
                                                             <h1>
@@ -299,7 +299,7 @@
                                         <li class="productItem">
                                             <div>
                                                 <a href="garden_intro?id={{pickItem.id}}" target="_blank">
-                                                    <img src="http://127.0.0.1:8000/{{pickItem.pick_img}}" alt="">
+                                                    <img src="http://112.49.38.63:8011/{{pickItem.pick_img}}" alt="">
                                                 </a>
                                             </div>
                                             <p><a href="garden_intro?id={{pickItem.id}}" target="_blank">{{pickItem.name}}</a></p>
@@ -355,7 +355,7 @@
                                 {% for gardenItem in garden %}
                                 <li class="haciendaItem">
                                     <div class="haciendaImg">
-                                        <img class="haciendaImg1" src="http://127.0.0.1:8000/{{gardenItem.img_1}}" alt="">
+                                        <img class="haciendaImg1" src="http://112.49.38.63:8011/{{gardenItem.img_1}}" alt="">
                                         <img class="haciendaImg2" src="{% static 'imgs/22.png'%}" alt="">
                                     </div>
                                     <div class="haciendaTxt">
@@ -405,7 +405,7 @@
                                     <li class="travelItem">
                                         <a href="tourist?id={{sightseeItem.id}}" target="_blank">
                                             <div class="travelImg">
-                                                <img class="haciendaImg1" src="http://127.0.0.1:8000/{{sightseeItem.sightsee_img}}" alt="">
+                                                <img class="haciendaImg1" src="http://112.49.38.63:8011/{{sightseeItem.sightsee_img}}" alt="">
                                                 <img class="haciendaImg2" src="{% static 'imgs/22.png'%}" alt="">
                                             </div>
                                             <div class="travelTitle">
@@ -480,7 +480,7 @@
                                 {% for hotelItem in hotel2 %}
                                 <li class="hotHotelItem">
                                     <a href="dorm_detail?id={{hotelItem.id}}" target="_blank">
-                                        <img src="http://127.0.0.1:8000/{{hotelItem.hotel_img}}" width="96px" height="80px" alt="">
+                                        <img src="http://112.49.38.63:8011/{{hotelItem.hotel_img}}" width="96px" height="80px" alt="">
                                         <div class="desc">
                                             <h3>{{hotelItem.name}}</h3>
                                             <div>{{hotelItem.intro}}</div>
@@ -503,7 +503,7 @@
                                     <a href="dorm_detail?id={{hotelItem.id}}" target="_blank">
                                         <div style="height: 300px;">
                                             <div class="recommendHotelImg">
-                                                <img src="http://127.0.0.1:8000/{{hotelItem.hotel_img}}" alt="">
+                                                <img src="http://112.49.38.63:8011/{{hotelItem.hotel_img}}" alt="">
                                             </div>
                                             <h1>{{hotelItem.name}}</h1>
                                             <div class="area">{{hotelItem.intro}}</div>
@@ -538,7 +538,7 @@
                         {% for relationItem in relation %}
                         <li class="partnerInnerItem">
                             <a target="_blank" href="{{relationItem.relation}}">
-                                <img src="http://127.0.0.1:8000/{{relationItem.pic}}" alt="">        
+                                <img src="http://112.49.38.63:8011/{{relationItem.pic}}" alt="">        
                             </a>
                         </li>
                         {% endfor %}

templates/outerNet/login2.html

@@ -208,71 +208,13 @@
                 </div>
                 <div class="partnerInner">
                     <ul class="partnerInnerList">
+                        {% for relationItem in relation %}
                         <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
+                            <a target="_blank" href="{{relationItem.relation}}">
+                                <img src="http://112.49.38.63:8011/{{relationItem.pic}}" alt="">        
                             </a>
                         </li>
+                        {% endfor %}
                         <li style="clear: both;"></li>
                     </ul>
                 </div>
@@ -304,8 +246,6 @@
     </div>
 
     <script src="{% static '/lib/js/jquery-2.1.4.min.js'%}"></script>
-    <script
-        src="https://webapi.amap.com/maps?v=1.4.15&key=3939967b919a8003377dd113fc445a3d&plugin=AMap.Driving"></script>
     <!-- <script src="{% static '/lib/layui/layui.js'%}"></script> -->
     <!-- <script src="{% static '/js/index2.js'%}"></script> -->
     <script>

templates/outerNet/person_farm.html

@@ -269,7 +269,7 @@
             $('.magnifyDiv').append('<img />')
             var html = '';
             for(var i = 0;i<gardenImgArr.length;i++){
-                html += '<div class="swiper-slide"><img src="http://127.0.0.1:8000/'+gardenImgArr[i]+'" alt=""></div>';
+                html += '<div class="swiper-slide"><img src="http://112.49.38.63:8011/'+gardenImgArr[i]+'" alt=""></div>';
                 if(i == gardenImgArr.length-1){
                     $('#gardenSwiper').html(html);
                     // console.log(html)

templates/outerNet/pickIntro.html

@@ -48,7 +48,7 @@
                         <div class="sendTime title">{{pick.pub_time}}</div>
                         <div class="prodectIntro">
                             <div class="prodectImg">
-                                <img src="http://127.0.0.1:8000/{{pick.pick_img}}" alt="">
+                                <img src="http://112.49.38.63:8011/{{pick.pick_img}}" alt="">
                             </div>
                             <div class="descTxt">
                                 <div><span>产品名称：</span>{{pick.name}}</div>

templates/outerNet/register.html

@@ -241,71 +241,13 @@
                 </div>
                 <div class="partnerInner">
                     <ul class="partnerInnerList">
+                        {% for relationItem in relation %}
                         <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                            </a>
-                        </li>
-                        <li class="partnerInnerItem">
-                            <a href="">
-                                <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
+                            <a target="_blank" href="{{relationItem.relation}}">
+                                <img src="http://112.49.38.63:8011/{{relationItem.pic}}" alt="">        
                             </a>
                         </li>
+                        {% endfor %}
                         <li style="clear: both;"></li>
                     </ul>
                 </div>

templates/outerNet/tourist.html

@@ -68,7 +68,7 @@
                         <div class="sendTime title">{{sightsee.upl_time}}</div>
                         <div class="prodectIntro">
                             <div class="prodectImg">
-                                <img src="http://127.0.0.1:8000/{{sightsee.sightsee_img}}" alt="">
+                                <img src="http://112.49.38.63:8011/{{sightsee.sightsee_img}}" alt="">
                             </div>
                             <div class="descTxt">
                                 <div><span>景点名称：</span>{{sightsee.name}}</div>
@@ -84,7 +84,7 @@
                             <div>{{sightsee.content|safe}}</div>
                             <div class="descTitle">景区导览图</div>
                             <div>
-                                <img src="http://127.0.0.1:8000/{{sightsee.sightisee_img }}" width="100%" alt="">
+                                <img src="http://112.49.38.63:8011/{{sightsee.sightisee_img }}" width="100%" alt="">
                             </div>
                         </div>
                     </div>

templates/outerNet/touristList.html

@@ -56,7 +56,7 @@
                          {% if sightsee|length %} {% for hotelItem in sightsee %}
                         <li class="hotelItem">
                             <a href="tourist?id={{hotelItem.id}}">
-                                <img src="http://127.0.0.1:8000/{{hotelItem.sightsee_img}}" alt="">
+                                <img src="http://112.49.38.63:8011/{{hotelItem.sightsee_img}}" alt="">
                                 <div class="hotelDetial">
                                     <h2>{{hotelItem.name}}</h2>
                                     <div class="abstract-wrap">

templates/static/js/limit/limit.js

@@ -97,12 +97,12 @@ var navList = [
         "children": [
             {
                 "id": 7.1,
-                "title": "阈值设置",
+                "title": "预警设置",
                 "url": "qxz_warning_view",
             },
             {
                 "id": 7.2,
-                "title": "生产方式设置",
+                "title": "阈值设置",
                 "url": "productionset",
             },
             {
@@ -264,7 +264,6 @@ var navList = [
         "title": "系统设置",
         "icon": "",
         "url": "",
-        "disabled": "true",
         "children": [
             {
                 "id": 13.1,
@@ -276,7 +275,6 @@ var navList = [
                 "id": 13.2,
                 "title": "地图设置",
                 "url": "setMap",
-                "disabled": "true",
             },
             {
                 "id": 13.3,
@@ -297,7 +295,6 @@ var navList = [
         "title": "专家诊断",
         "icon": "",
         "url": "",
-        "disabled": "true",
         "children": [
             {
                 "id": 14.1,

templates/static/web.config

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <configuration>
+      <system.webServer>
+      <!-- this configuration overrides the FastCGI handler to let IIS serve the static files -->
+      <handlers>
+        <clear/>
+   <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" resourceType="File" requireAccess="Read" />
+     </handlers>
+   </system.webServer>
+</configuration>

web.config

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <configuration>
+        <system.webServer>
+            <defaultDocument>
+            <files>
+                <remove value="default.aspx" />
+                <remove value="iisstart.htm" />
+                <remove value="Default.asp" />
+                <remove value="Default.htm" />
+                <add value="index.php" />
+            </files>
+            </defaultDocument>
+
+            <handlers>
+                <add name="Python FastCGI" path="*" verb="*" modules="FastCgiModule" scriptProcessor="c:\python\python.exe|c:\python\lib\site-packages\wfastcgi.py" resourceType="Unspecified" requireAccess="Script" />
+            </handlers>
+        </system.webServer>
+        <appSettings>
+            <add key="WSGI_HANDLER" value="django.core.wsgi.get_wsgi_application()" />
+            <add key="PYTHONPATH" value="C:\webproject\second" />
+            <add key="DJANGO_SETTINGS_MODULE" value="second_pro.settings" />
+        </appSettings>
+    <system.web>
+        <identity impersonate="true" />
+    </system.web>
+    </configuration>