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

apps/AppInfo/models.py

@@ -886,9 +886,8 @@ class Relations(models.Model):
 
 # 轮播图和广告图
 class SystemPhoto(models.Model):
-    name = models.CharField(u'图片名称', max_length=100, blank=True, null=True)
-    pic_1 = models.CharField(u'轮播图', max_length=100, blank=True, null=True)
-    pic_2 = models.CharField(u'广告图', max_length=100, blank=True, null=True)
+    code = models.CharField(u'图片区分', max_length=5, blank=True, null=True)
+    pic_img = models.CharField(u'图片链接', max_length=100, blank=True, null=True)
     upl_time = models.DateTimeField(u'创建时间', default=timezone.now)
 
     class Meta:

apps/Equipment/views.py

@@ -4608,14 +4608,38 @@ class System_Photo(ListView):
     def get(self,request):
         return render(request, 'backstageNet/systemSet/imageUpload.html', context={})
     def post(self,request):
-        
+        upl_time = timezone.now() 
         basestr = request.FILES.get("upload")
-        base_dir = 'media/uploads/'
+        basestr1 = request.FILES.get("upload1")
         now_time = time.strftime('%Y%m%d%H%M%S', time.localtime(time.time()))
         if basestr:
+            base_dir = 'media/uploads/'
             img = Image.open(basestr)
-            img.save(base_dir + now_time +".png")
-            SystemPhoto.objects.create(name=base_dir +now_time +".png",pic_1=base_dir +now_time +".png")
+            code = 1
+        else:
+            base_dir = 'media/uploads1/'
+            code = 2
+            img = Image.open(basestr1)
+        if os.path.exists(base_dir) == False:
+            os.makedirs(base_dir)
+        img.save(base_dir + now_time +".png")
+        pic_list = SystemPhoto.objects.filter(code=code).order_by("upl_time")
+        if code == 1:
+            if len(pic_list) <= 2:
+                SystemPhoto.objects.create(code=code,pic_img=base_dir +now_time +".png")
+            else:
+                for i in pic_list[:1]:
+                    i.pic_img=base_dir +now_time +".png"
+                    i.upl_time=upl_time
+                    i.save()
+        else:
+            if len(pic_list) <=3:
+                SystemPhoto.objects.create(code=code,pic_img=base_dir +now_time +".png")
+            else:
+                for i in pic_list[:1]:
+                    i.pic_img=base_dir +now_time +".png"
+                    i.upl_time=upl_time
+                    i.save()
         return HttpResponse("1")
     
 
@@ -4623,14 +4647,17 @@ class System_Photo(ListView):
 
 # 系统管理上传图片
 class System_Photo_Save(ListView):
-    def get(self,request):
-        pass
     def post(self,request):
-        pic_1 = request.POST.get('pic_1')
-        pic_2 = request.POST.get('pic_2')
-        if pic_1:
-            name = pic_1
-        elif pic_2:
-            name = pic_2
-        SystemPhoto.objects.create(name=name,pic_1=pic_1,pic_2=pic_2)
-        return HttpResponse("1")
+        code = request.POST.get("code")
+        data = []
+        if code != "1" and code != "2":
+            return HttpResponse("0")
+        else:
+           pic_list = SystemPhoto.objects.filter(code=code)
+        for i in pic_list:
+            data.append({
+                "pic_img":i.pic_img
+            })
+        data = json.dumps(data)
+        return HttpResponse(data)
+    

templates/backstageNet/systemSet/imageUpload.html

@@ -210,7 +210,6 @@
                 </span>
             </div>
         </div>
-
         <!-- 内容 -->
         <div>
             <!-- 发布详情 -->
@@ -653,14 +652,17 @@
                 closeTailorA();
                 $('#testListAction').removeClass('testListAction')
                 $('#delTestData').removeClass('delTestData')
-                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)
+                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',
@@ -676,6 +678,20 @@
                 })
             }
         });
+        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();