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

apps/Equipment/views.py

@@ -55,7 +55,8 @@ class Equip_Test(View):
 # 监控界面
 class JKview(ListView):
     def get(self,request):
-        return render(request, 'backstageNet/jk/equipmanage_jk.html', context={})
+        equip_id = request.GET.get('equip_id')
+        return render(request, 'backstageNet/jk/equipmanage_jk.html', context={"equip_id":equip_id})
     def post(self,request):
         pass