+
+
+
-
-
-
\ No newline at end of file
diff --git a/safesite/templates/inspectdetail.html b/safesite/templates/inspectdetail.html
new file mode 100644
index 00000000..1edfab62
--- /dev/null
+++ b/safesite/templates/inspectdetail.html
@@ -0,0 +1,138 @@
+
+
+
+
\ No newline at end of file
diff --git a/safesite/templates/inspectitem.html b/safesite/templates/inspectitem.html
index d339f694..5f766011 100644
--- a/safesite/templates/inspectitem.html
+++ b/safesite/templates/inspectitem.html
@@ -20,6 +20,7 @@
{% if request|has_permission:'b_inspect_del' %}
删除
{% endif %} -->
+
查看详情
@@ -158,4 +159,12 @@
}
else { $.messager.alert('提示', '请选择一行数据!'); }
}
+ function xjdetail2(){
+ var row = $('#xjtable').datagrid('getSelected');
+ if (row) {
+ var url = 'html/inspectitem/detail/' + row.id
+ opendg('查看详情',url)
+ }
+ else { $.messager.alert('提示', '请选择一行数据!'); }
+ }
\ No newline at end of file
diff --git a/safesite/templates/inspectitemdetail.html b/safesite/templates/inspectitemdetail.html
new file mode 100644
index 00000000..b369f69b
--- /dev/null
+++ b/safesite/templates/inspectitemdetail.html
@@ -0,0 +1,104 @@
+
+
+
+
\ No newline at end of file
diff --git a/safesite/urls.py b/safesite/urls.py
index fedf8a5c..ff042187 100644
--- a/safesite/urls.py
+++ b/safesite/urls.py
@@ -1,3 +1,4 @@
+from safesite.views import inspectitem
from django.urls import path,include
from . import views,viewsdrf
from . import datashowview
@@ -78,6 +79,8 @@ urlpatterns = [
path('html/equipment',views.equipment),
path('html/inspectitem',views.inspectitem),
path('html/inspect',views.inspect),
+ path('html/inspect/detail/
', views.inspectdetail),
+ path('html/inspectitem/detail/', views.inspectitemdetail),
path('html/risk//',views.risk),
path('html/riskact/add//',views.riskactadd),
path('html/riskact/edit//',views.riskactedit),
diff --git a/safesite/views.py b/safesite/views.py
index 2128c107..6b6f841c 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -211,9 +211,15 @@ def risk(req, kind):
def inspect(req):
return render(req, 'inspect.html')
+def inspectdetail(req, id):
+ return render(req, 'inspectdetail.html', {'id':id})
+
def inspectitem(req):
return render(req, 'inspectitem.html')
+def inspectitemdetail(req, id):
+ return render(req, 'inspectitemdetail.html', {'id':id})
+
def equipment(req):
return render(req, 'equipment.html')
@@ -6891,7 +6897,7 @@ def apiinspectitem(req):
else:
startnum, endnum = fenye(req)
objs = objs.order_by('-id')[startnum:endnum]
- objs = objs.values('id', 'state', 'inspect', 'checkitem', 'inspect__equipment__name', 'checkitem__name','checkitem__content','inspect__user__name', 'inspect__creattime', 'inspect__equipment__num', 'inspect__type__dickeyname','todouser__name')
+ objs = objs.values('id', 'state', 'inspect', 'checkitem', 'inspect__equipment__name', 'checkitem__name','checkitem__content','inspect__user__name', 'inspect__creattime', 'inspect__equipment__num', 'inspect__type__dickeyname','todouser__name', 'desc', 'desc2', 'img', 'img2')
return HttpResponse(transjson(total, objs), content_type="application/json")
elif a == 'detail':
id = req.GET.get('id')