From 8e4d807398eb86462e9e56f9490722f2972ed862 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 16 Nov 2020 17:40:35 +0800 Subject: [PATCH] socert up --- safesite/models.py | 4 +- safesite/safespider.py | 9 +- .../static/safesite/easyui/themes/icon.css | 4 +- .../easyui/themes/icons/scheduleset.png | Bin 0 -> 535 bytes safesite/templates/socert.html | 33 ++--- safesite/templates/socertadd.html | 11 +- safesite/templates/socertedit.html | 125 ++++++++++++++++++ safesite/views.py | 16 +++ 8 files changed, 172 insertions(+), 30 deletions(-) create mode 100644 safesite/static/safesite/easyui/themes/icons/scheduleset.png create mode 100644 safesite/templates/socertedit.html diff --git a/safesite/models.py b/safesite/models.py index fa26ed4a..1525cf8c 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -1291,13 +1291,13 @@ class Checktask(models.Model): checktype=models.ForeignKey(Checktable,on_delete=models.CASCADE)#关联检查表 checkname=models.ManyToManyField(User,related_name='jiancha')#检查人员 checktime= models.DateTimeField(null=True, blank=True)#任务首次执行时间 - checkplace=models.CharField(max_length=200)#检查地点 + checkplace=models.TextField(default='')#检查地点 createuser = models.ForeignKey(User,related_name='chuangjians',on_delete=models.CASCADE)#创建人 createdate = models.DateTimeField(default = timezone.now)#创建时间 usecomp = models.ForeignKey(Partment,related_name='taskscomp',on_delete=models.CASCADE,null=True,blank=True)#创建公司 deletemark = models.IntegerField(default=1)#是否删除 tasktype = models.IntegerField(default=0)#任务执行频率（1每天，2每周，3每月，4每季度，5每半年，6每年） - userlist = models.CharField(max_length=200,null=True,)#检查人列表 + userlist = models.TextField(default='')#检查人列表 zxstate = models.IntegerField(default=1)#1同时执行，2一个执行就执行 taskstate = models.IntegerField(default=1)#是否暂停，1运行，2暂停 diff --git a/safesite/safespider.py b/safesite/safespider.py index e9f58e90..0c697b9d 100644 --- a/safesite/safespider.py +++ b/safesite/safespider.py @@ -15,16 +15,11 @@ headers = { def getTzzs(certnum,stu_name):#特种证书(身份证号,姓名,均是字符) certtype_code='720' - proxies = { - "http": "http://112.91.78.240:5412" -} stu_name=parse.quote(parse.quote(stu_name)) - text1 = requests.post('http://cx.mem.gov.cn//cms/html/certQuery/certQuery.do?method=getServerTime',headers=headers, proxies=proxies).text - print(text1) + text1 = requests.post('http://cx.mem.gov.cn//cms/html/certQuery/certQuery.do?method=getServerTime',headers=headers).text sessionId = eval(text1)['time'] - url = "http://cx.mem.gov.cn/cms/html/certQuery/certQuery.do?method=getCertQueryResult&ref=ch&certtype_code="+certtype_code+"&certnum="+certnum+"&stu_name="+stu_name+'&passcode=1234'+'&sessionId='+sessionId - data = requests.get(url,headers=headers, proxies=proxies).text + data = requests.get(url,headers=headers).text tree = etree.HTML(data) e1 = tree.xpath("//th[text()='姓名']/following-sibling::td[1]/text()") e2 = tree.xpath("//th[text()='性别']/following-sibling::td[1]/text()") diff --git a/safesite/static/safesite/easyui/themes/icon.css b/safesite/static/safesite/easyui/themes/icon.css index 82778c70..5441ca86 100644 --- a/safesite/static/safesite/easyui/themes/icon.css +++ b/safesite/static/safesite/easyui/themes/icon.css @@ -178,7 +178,9 @@ .icon-inspectitem { background: url('icons/inspectitem.png') no-repeat center center; } - +.icon-scheduleset { + background: url('icons/scheduleset.png') no-repeat center center; +} .icon-mini-add{ diff --git a/safesite/static/safesite/easyui/themes/icons/scheduleset.png b/safesite/static/safesite/easyui/themes/icons/scheduleset.png new file mode 100644 index 0000000000000000000000000000000000000000..df1f8107882d6f0ac1748b01fc4ac86db33cc760 GIT binary patch literal 535 zcmV+y0_gpTP)vPKXKu@l5bL>onof~L|&w6NG+MMy}cL~jpK!Lt!|W)1}51Z{RsMJx;v zH14e+irARO50F#QMiB)oTMH4?+j%kvckEtrX)-Xy`go(6amhTRJI+&&%yaIqmDjv zzP^H}-Z~HFEk=eXdh|g+7oyW!Ao^tD;K~3X%b59YQwDQI05R_?)NC4$YapTt6Z?J% zP_1WIneo#|Ul*J7<;|WxVAJl`^O4RZ5!NKJf36JB=@cL)6X_pZYPhO8dkWauM20gZ zfa~%I{re!mwM2&5Vvwp%eG6*jykeVsr4qmyr|J)O2o`S{+-%A)DncqcH3X_yvOBNG zN8Sw`q_daOb$>hJ2EbcEG~Z3^Hj+M$diLbCi{X! -
-
- {% load myfilter %} - {% if request|has_permission:'b_socert_add' %} - - {% endif %} - {% if request|has_permission:'b_socert_del' %} - 删除 - {% endif %} - {% if request|has_permission:'b_socert_exportexl' %} - 导出Excel - {% endif %} -
-
+
+ +
@@ -23,6 +12,21 @@
+
+ {% load myfilter %} + {% if request|has_permission:'b_socert_add' %} + 新增 + {% endif %} + {% if request|has_permission:'b_socert_add' %} + 编辑 + {% endif %} + {% if request|has_permission:'b_socert_del' %} + 删除 + {% endif %} + {% if request|has_permission:'b_socert_exportexl' %} + 导出Excel + {% endif %} +
+
+ + + 选择 +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + +
+
+ \ No newline at end of file diff --git a/safesite/views.py b/safesite/views.py index 025531d1..c232b629 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -4060,6 +4060,22 @@ def apisocert(req): a = a.values('id', 'realname', 'gender', 'zylb', 'czxm', 'fzjg', 'ccfzrq', 'yfsrq', 'yxqkssj', 'yxqjssj', 'sjfssj', 'zszt', 'url', 'cardnum') return HttpResponse(transjson(total, a), content_type="application/json") + elif a == 'add': + postdata = json.loads(req.body.decode('utf-8')) + obj = Socertificate() + user = User.objects.get(userid = postdata['userid']) + obj.user = User.objects.get(userid = postdata['userid']) + obj.zylb = postdata['zylb'] + obj.fzjg = postdata['fzjg'] + obj.czxm = postdata['czxm'] + obj.ccfzrq = postdata['ccfzrq'] + obj.yfsrq = postdata['yfsrq'] + obj.yxqkssj = postdata['yxqkssj'] + obj.yxqjssj = postdata['yxqjssj'] + obj.zszt = guoqi(postdata['yfsrq']) + obj.usecomp = user.usecomp + obj.save() + return JsonResponse({'code':1}) # elif a == 'addspider': # postdata = json.loads(req.body.decode('utf-8')) # userid = postdata['userid']