0.1.1.2 优化搜索

Author: hequan2017

.idea/chain.iml

@@ -59,11 +59,3 @@ def __str__(self):
         return self.hostname
 
 
-
-#
-# class asset_import(models.Model):
-#     userName = models.CharField(max_length = 30)
-#     uploadFile = models.FileField(upload_to = 'disk/upload/')
-#
-#     def __str__(self):
-#         return self.userName

apps/asset/__pycache__/__init__.cpython-36.pyc

@@ -1,5 +1,5 @@
 from django.urls import path
-from asset import views
+from . import views
 
 urlpatterns = [
     path('asset.html',views.AssetListAll.as_view(),name='asset_list'),

apps/asset/__pycache__/admin.cpython-36.pyc

@@ -8,14 +8,16 @@
 from django.urls import reverse_lazy
 from django.conf import settings
 from django.db.models import Q
-from  asset.form import FileForm
-from asset.models import asset
+from  asset.form   import  FileForm
+from  asset.models import  asset
+from  asset.models import  asset  as Asset
 import codecs,chardet
 import csv,time
 from io import StringIO
 import json
 
 
+
 class AssetListAll(LoginRequiredMixin,ListView):
     '''
     列表
@@ -24,20 +26,29 @@ class AssetListAll(LoginRequiredMixin,ListView):
     paginate_by = settings.DISPLAY_PER_PAGE
     model = asset
     context_object_name = "asset_list"
+    queryset = asset.objects.all()
     ordering = ('id',)
 
     def get_context_data(self, **kwargs):
+        search_data = self.request.GET.copy()
         context = {
             "asset_active": "active",
             "asset_list_active": "active",
+            "search_data":search_data.urlencode()
         }
         kwargs.update(context)
-        return super(AssetListAll, self).get_context_data(**kwargs)
+        return super().get_context_data(**kwargs)
+
+
+    def get_queryset(self,*args,**kwargs):
+        self.queryset = super().get_queryset()
+        if  self.request.GET.get('name'):
+            query = self.request.GET.get('name',None)
+            queryset = self.queryset.filter(Q(network_ip=query)| Q(hostname=query)  | Q(inner_ip=query)  | Q(manager=query)).order_by('id')
+        else:
+            queryset = super().get_queryset()
+        return queryset
 
-    def post(self, request):
-        query = request.POST.get("name")
-        ret = asset.objects.filter(Q(network_ip=query)| Q(hostname=query)  | Q(inner_ip=query)  | Q(manager=query))
-        return render(request, 'asset/asset.html',{"asset_active": "active", "asset_list_active": "active", "asset_list": ret})
 
 
 
@@ -119,10 +130,13 @@ class AssetAllDel(LoginRequiredMixin,View):
     def post(self, request):
         ret = {'status': True, 'error': None, }
         try:
-
-            ids = request.POST.getlist('id', None)  or request.POST.get('nid', None)
-            idstring = ','.join(ids)
-            asset.objects.extra(where=['id IN (' + idstring + ')']).delete()
+            if  request.POST.get('nid') :
+                id = request.POST.get('nid', None)
+                asset.objects.get(id=id).delete()
+            else:
+                ids = request.POST.getlist('id', None)
+                idstring = ','.join(ids)
+                asset.objects.extra(where=['id IN (' + idstring + ')']).delete()
         except Exception as e:
             ret['status'] = False
             ret['error'] = '删除请求错误,没有权限{}'.format(e)
@@ -136,7 +150,9 @@ class AssetExport(View):
     :param request:
     :return:
     """
-    def get(self,request):
+
+
+    def get(self,request,):
 
         fields = [
             field for field in Asset._meta.fields
@@ -153,16 +169,16 @@ def get(self,request):
 
         header = [field.verbose_name for field in fields]
         writer.writerow(header)
-        for asset in assets:
-            data = [getattr(asset, field.name) for field in fields]
+        for asset_ in assets:
+            data = [getattr(asset_, field.name) for field in fields]
             writer.writerow(data)
         return response
 
     def post(self,request):
         ids = request.POST.getlist('id', None)
         idstring = ','.join(ids)
         fields = [
-            field for field in Asset._meta.fields
+            field for field in   Asset._meta.fields
             if field.name not in [
                 'date_created'
             ]
@@ -171,14 +187,14 @@ def post(self,request):
         response = HttpResponse(content_type='text/csv')
         response['Content-Disposition'] = 'attachment; filename="%s"' % filename
         response.write(codecs.BOM_UTF8)
-        assets = Asset.objects.extra(where=['id IN (' + idstring + ')']).all()
+        assets =  Asset.objects.extra(where=['id IN (' + idstring + ')']).all()
         writer = csv.writer(response, dialect='excel', quoting=csv.QUOTE_MINIMAL)
 
         header = [field.verbose_name for field in fields]
         writer.writerow(header)
 
-        for asset in assets:
-            data = [getattr(asset, field.name) for field in fields]
+        for asset_ in assets:
+            data = [getattr(asset_, field.name) for field in fields]
             writer.writerow(data)
         return response
 
@@ -235,10 +251,11 @@ def  AssetImport(request):
                             v = 0
                     elif  k  in   ['ctime','utime']  :
                         try:
-                            v1 = time.strptime(v, '%Y/%m/%d %H:%I')
+                            v1 = time.strptime(v, '%Y/%m/%d %H:%M')
                             v =  time.strftime("%Y-%m-%d %H:%M",v1)
                         except  Exception as e :
                             print(e)
+                            v = v
                     else:
                         continue
                     asset_dict_id[k] =v
@@ -253,10 +270,11 @@ def  AssetImport(request):
                             v = 0
                     elif  k  in   ['ctime','utime']  :
                         try:
-                            v1 = time.strptime(v, '%Y/%m/%d %H:%I')
+                            v1 = time.strptime(v, '%Y/%m/%d %H:%M')
                             v =  time.strftime("%Y-%m-%d %H:%M",v1)
                         except  Exception as e :
                             print(e)
+                            v = v
                     else:
                         continue
                     asset_dict[k] = v

apps/asset/__pycache__/urls.cpython-36.pyc

@@ -40,6 +40,7 @@
     'bootstrap3',
     'asset',
     'index',
+    'pure_pagination',
 ]
 
 MIDDLEWARE = [
@@ -144,3 +145,8 @@
 TEMPLATE_DIRS = (os.path.join(BASE_DIR,  'templates'),)
 DISPLAY_PER_PAGE =  25
 
+PAGINATION_SETTINGS = {
+    'PAGE_RANGE_DISPLAYED': 20,
+    'MARGIN_PAGES_DISPLAYED': 2,
+    'SHOW_FIRST_PAGE_WHEN_INVALID': True,
+}

apps/asset/__pycache__/views.cpython-36.pyc

@@ -16,7 +16,7 @@
 from django.contrib import admin
 from django.urls import path
 from django.conf.urls import include
-from index.views import index,login_view,logout,password_update,LoginHistorys
+from  index.views   import  index,login_view,logout,password_update,LoginHistorys
 
 urlpatterns = [
     path('admin/', admin.site.urls,name='admin'),

apps/asset/migrations/__pycache__/__init__.cpython-36.pyc

@@ -64,7 +64,7 @@
             dom: '<"html5buttons"B>lTfgitp,',
 
             buttons: [],
-            lengthMenu: [[10, 25, 50, -1], [10, 25, 50, "全部"]]
+            lengthMenu: [[25, 50, 70, -1], [25, 50, 70, "全部"]]
         });
 
     });

apps/chain/__pycache__/__init__.cpython-36.pyc

@@ -55,10 +55,9 @@ <h5>资产信息</h5>
 
                         <div class="table-responsive">
 
-                            <form id="cha" class="form-horizontal" action="{% url 'asset:asset_list' %}" method="post">
+                            <form id="cha" class="form-horizontal" action="{% url 'asset:asset_list' %}" method="GET">
                                 {% csrf_token %}
-                                <div class="col-md-2"><input type="text" class="form-control" name="name"
-                                                             placeholder="主机名、IP、负责人" required></div>
+                                <div class="col-md-2"><input type="text" class="form-control" name="name" placeholder="主机名、IP、负责人" required></div>
 
                                 <button class="btn btn-sm btn-primary" type="submit">查询</button>
 
@@ -107,8 +106,8 @@ <h5>资产信息</h5>
                                             <td class="center">{{ row.is_active }}</td>
                                             <td><a class="btn btn-primary  btn-xs "
                                                    href="{% url  "asset:asset_update"  pk=row.id %}">编辑</a>
-                                                <a class="btn btn-danger  btn-xs  asset_del_1" data-toggle="modal"
-                                                   data-target="#myModal1">删除</a>
+                                                <a class="btn btn-danger  btn-xs  asset_del"
+                                                  >删除</a>
                                             </td>
                                         </tr>
                                     {% endfor %}
@@ -132,7 +131,7 @@ <h5>资产信息</h5>
                                             {% endif %}
 
                                             {% for p in paginator.page_range %}
-                                                {% if search_data %}  <!-- 判断是否是搜索分页-->
+                                                {% if  search_data  %}  <!-- 判断是否是搜索分页-->
                                                     {% if p == page_obj.number %}
                                                         <li class="active"><a
                                                                 href="{% url "asset:asset_list" %}?page={{ p }}&{{ search_data }}"> {{ p }} </a>
@@ -172,6 +171,7 @@ <h5>资产信息</h5>
                                 </div> <!--页码 -->
 
 
+
                             </form>
 
 
@@ -197,7 +197,7 @@ <h5>资产信息</h5>
 
 
            $(document).ready(function () {
-        $('.dataTables-asset').DataTable({
+            $('.dataTables-asset').DataTable({
 
             "oLanguage": {
                 "sLengthMenu": "每页显示 _MENU_ 条记录",
@@ -222,25 +222,11 @@ <h5>资产信息</h5>
             dom: '<"html5buttons"B>lTfgitp,'
 
         });
-
-
-
+              });
 
             $(function () {
 
-                $(document).on('click', '#export1', function () {
-                    $.ajax({
-                        url: "/asset/asset-export1.html",
-                        type: 'POST',
-                        data: $('#del_form_asset_all').serialize(),
-                        success: function (data) {
-
-                        }
-                    });
-                });
-
-
-                $(document).on('click', '.asset_del_1', function () {
+                $(document).on('click', '.asset_del', function () {
                     var id = $(this).parent().parent().attr('id');
                     swal({
                         title: "你确定删除",