diff --git a/mysite/settings_dev.py b/mysite/settings_dev.py index 65f36ff1..ac7ff735 100644 --- a/mysite/settings_dev.py +++ b/mysite/settings_dev.py @@ -12,7 +12,7 @@ DATABASES = { 'NAME': 'safedb', 'USER':'postgres', 'PASSWORD':'cbma1234', - 'HOST':'47.94.4.206', + 'HOST':'39.105.200.14', 'PORT':'5432', # 'CONN_MAX_AGE': 60, }, diff --git a/safesite/daoru.py b/safesite/daoru.py index 3cf732d9..579168c4 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -451,7 +451,7 @@ def drequipments(companyid,path): a.cate=Dickey.objects.get(dickeyid=catedict[cate]) a.usecomp=Partment.objects.get(partid=companyid) a.save() - a.qrcode = makeqr('https://safeyun.ctcshe.com/miniprogram/equipment?id='+str(a.id)) + a.qrcode = makeqr('https://cbma.ctc-gz.com/miniprogram/equipment?id='+str(a.id)) a.save() numdict[num]=a else: @@ -617,7 +617,7 @@ def drrisks(companyid,path): if users.exists(): obj.zrr = users[0] obj.save() - obj.qrcode = makeqr_riskact('https://safeyun.ctcshe.com/miniprogram/riskact?id='+str(obj.id)) + obj.qrcode = makeqr_riskact('https://cbma.ctc-gz.com/miniprogram/riskact?id='+str(obj.id)) obj.save() a = Risk() a.riskact=obj @@ -659,7 +659,7 @@ def drrisks(companyid,path): # if users.exists(): # obj.zrr = users[0] # obj.save() - # obj.qrcode = makeqr3('https://safeyun.ctcshe.com/miniprogram/riskact?id='+str(obj.id)) + # obj.qrcode = makeqr3('https://cbma.ctc-gz.com/miniprogram/riskact?id='+str(obj.id)) # obj.save() # a = Risk() # a.riskact=obj @@ -778,7 +778,7 @@ def drsafelist(companyid,path): safelist.usecomp = user.usecomp safelist.name = safelist_name safelist.save() - safelist.qrcode = makeqr_safelist('https://safeyun.ctcshe.com/miniprogram/safelist?id='+str(safelist.id)) + safelist.qrcode = makeqr_safelist('https://cbma.ctc-gz.com/miniprogram/safelist?id='+str(safelist.id)) safelist.save() except: return {'code':0,'msg':'创建清单失败!'} diff --git a/safesite/export.py b/safesite/export.py index ea6fe65e..c6df9596 100644 --- a/safesite/export.py +++ b/safesite/export.py @@ -719,7 +719,7 @@ def exportxlsx(a,objs): if x.area: sheet['e'+num] = x.area.name sheet['f'+num] = '正常' if x.state==1 else '异常' - sheet['g'+num] = 'https://safeyun.ctcshe.com/miniprogram/equipment?id='+str(x.id) + sheet['g'+num] = 'https://cbma.ctc-gz.com/miniprogram/equipment?id='+str(x.id) nowtime = datetime.now().strftime('%Y%m%d%H%M%S') sheet['b1'] = nowtime filename = 'SBS' + nowtime diff --git a/safesite/templates/equipment.html b/safesite/templates/equipment.html index 3894dac2..4f1e22dc 100644 --- a/safesite/templates/equipment.html +++ b/safesite/templates/equipment.html @@ -277,7 +277,7 @@ // $('#qrimg').qrcode({ // "render": "canvas", // "size": 200, - // "text": 'https://safeyun.ctcshe.com/miniprogram/equipmentdetail?id='+res.id.toString() + // "text": 'https://cbma.ctc-gz.com/miniprogram/equipmentdetail?id='+res.id.toString() // }); $('#qrimg').attr('src', res.qrcode) }) diff --git a/safesite/templates/index.html b/safesite/templates/index.html index 6887c669..92d8e526 100644 --- a/safesite/templates/index.html +++ b/safesite/templates/index.html @@ -147,7 +147,7 @@ -->