zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

operation commit

This commit is contained in:
caoqianming 2019-12-06 17:36:05 +08:00
parent c1f9c9414d
commit fec9589d03
7 changed files with 3603 additions and 2837 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
safesite/migrations/0296_auto_20191206_1559.py Normal file
View File

@ -0,0 +1,21 @@
# Generated by Django 2.2.8 on 2019-12-06 15:59
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('safesite', '0295_auto_20191205_1702'),
]
operations = [
# migrations.RemoveField(
# model_name='companyinfo',
# name='liaison_fax',
# ),
migrations.RemoveField(
model_name='operation',
name='issimple',
),
]

1
safesite/models.py
View File

@ -471,7 +471,6 @@ class Operation(models.Model):#作业表
zyimg = models.CharField(max_length=1000,default='') zyimg = models.CharField(max_length=1000,default='')
zyimg2 = models.CharField(max_length=1000,default='') zyimg2 = models.CharField(max_length=1000,default='')
deletemark = models.IntegerField(default='1') deletemark = models.IntegerField(default='1')
issimple = models.IntegerField(default=1)
zyzt = JSONField() zyzt = JSONField()
fxcs = models.CharField(max_length=200) fxcs = models.CharField(max_length=200)
todouser = models.ForeignKey(User,related_name='zyclr',on_delete=models.CASCADE,null=True,blank=True) todouser = models.ForeignKey(User,related_name='zyclr',on_delete=models.CASCADE,null=True,blank=True)

16
safesite/static/safesite/mystatic/js/util.js
View File

@ -349,6 +349,22 @@ function choseusers(x) {
}); });
$('#userdd').window('center'); $('#userdd').window('center');
} }
function choseuser(x) {
var x = x || 'lecturer';
var myh = screen.availHeight * 0.7;
$('#userdd').dialog({
maximizable: true,
title: '选择人员',
width: 900,
height: myh,
closed: false,
cache: false,
href: 'getuserf?a=' + x,
modal: true,
border: false,
});
$('#userdd').window('center');
}
//导出excel //导出excel
function JSONToCSVConvertor(JSONData, ReportTitle, ShowLabel) { function JSONToCSVConvertor(JSONData, ReportTitle, ShowLabel) {
//If JSONData is not an object then JSON.parse will parse the JSON string in an Object //If JSONData is not an object then JSON.parse will parse the JSON string in an Object

18
safesite/templates/operation.html
View File

@ -1,7 +1,7 @@
<table id="zytable" style="width:auto;height:100%;"></table> <table id="zytable" style="width:auto;height:100%;"></table>
<div id="zytablebar" style="padding:6px;height:auto"> <div id="zytablebar" style="padding:6px;height:auto">
<div style="margin-bottom:2px;margin-top:2px"> <div style="margin-bottom:2px;margin-top:2px">
<!-- <a class="easyui-menubutton" data-options="menu:'#mm1',iconCls: 'fa-plus',plain:true">申请</a> --> <a class="easyui-linkbutton" data-options="iconCls: 'fa-plus',plain:true" onclick="javascript:opendg('申请作业','html/operation/add')">申请作业(无审批)</a>
<a onclick="javascript:$('#sdg_zy').dialog('open')" class="easyui-linkbutton" data-options="iconCls: 'fa-search',plain:true">详细筛选</a> <a onclick="javascript:$('#sdg_zy').dialog('open')" class="easyui-linkbutton" data-options="iconCls: 'fa-search',plain:true">详细筛选</a>
<a id="delzy" class="easyui-linkbutton" onclick="delzy()" data-options="iconCls: 'fa-trash',plain:true">删除</a> <a id="delzy" class="easyui-linkbutton" onclick="delzy()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
<a id="zydetail" onclick="zydetail()" class="easyui-linkbutton" data-options="iconCls: 'fa-info-circle',plain:true">查看详情</a> <a id="zydetail" onclick="zydetail()" class="easyui-linkbutton" data-options="iconCls: 'fa-info-circle',plain:true">查看详情</a>
@ -74,10 +74,20 @@
border:false, border:false,
columns: [[ columns: [[
{ field: 'zyid', title: 'ID', hidden: true }, { field: 'zyid', title: 'ID', hidden: true },
{ field: 'zynum', title: '编号', width: 120 }, { field: 'zynum', title: '编号', width: 100 },
{ field: 'zyzt', title: '作业状态', width: 120 ,formatter: function (value, row, index) { { field: 'zyzt', title: '作业状态', width: 60 ,formatter: function (value, row, index) {
if(value.splc==0){
return value.zyzt + '(无流程)'
}else{
return value.zyzt; return value.zyzt;
} }, }
}, styler: function (value, row, index) {
switch (value.zyzt) {
case '已关闭': return 'background-color:green;color:white'; break;
case '待关闭': return 'background-color:orange;'; break;
}
}},
{ field: 'zylx__dickeyname', title: '作业类型', width: 120 }, { field: 'zylx__dickeyname', title: '作业类型', width: 120 },
{ field: 'zyfzr__name', title: '作业负责人', width: 120 }, { field: 'zyfzr__name', title: '作业负责人', width: 120 },
{ field: 'zynr', title: '作业内容', width: 200 }, { field: 'zynr', title: '作业内容', width: 200 },

310
safesite/templates/operationadd.html
View File

@ -6,9 +6,56 @@
</div> </div>
<div data-options="region:'center'" style="height:100%;padding:15px 15px;"> <div data-options="region:'center'" style="height:100%;padding:15px 15px;">
<form id="zyff" method="post" name="zyff" enctype="multipart/form-data"> <form id="zyff" method="post" name="zyff" enctype="multipart/form-data">
<div style="margin-bottom:5px">
<input editable="false" class="easyui-combobox" required=true name="zylx" id="zylx" style="width:480px" data-options="
label:'作业类型',
url:'getdickey?dicclass=33&a=combobox',
method: 'get',
valueField:'value',
textField:'text',
" />
</div>
<div style="margin-bottom:5px">
<input id="zyqy" class="easyui-combotree" name="zyqy" style="width:480px" data-options="
label:'作业区域',
url: 'api/area?a=tree',
method: 'get',
editable: false,
loadFilter: function (rows) {
return convert(rows);
},
formatter: function (node) {
var s = node.text;
if (node.children) {
s += '&nbsp;<span style=\'color:blue\'>(' + node.children.length + ')</span>';
}
return s;
},"
required=true>
</div>
<div style="margin-top:10px;margin-bottom:5px"> <div style="margin-top:10px;margin-bottom:5px">
<input id="zydd" class="easyui-textbox" name="zydd" style="width:480px" data-options="label:'作业地点'" <input id="zydd" class="easyui-textbox" name="zydd" style="width:480px" data-options="label:'具体地点'" />
</div>
<div style="margin-bottom:5px">
<input id="zybm" name="zybm" style="width:480px;" class="easyui-combotree" data-options="label:'作业部门',"
required=true /> required=true />
<script>
$("#zybm").combotree({
url: 'parthandle?a=tree',
method: 'get',
loadFilter: function (rows) {
return convert(rows);
},
formatter: function (node) {
var s = node.text;
if (node.children) {
s += '&nbsp;<span style=\'color:blue\'>(' + node.children.length + ')</span>';
}
return s;
},
editable: false,
});
</script>
</div> </div>
<div style="margin-bottom:5px"> <div style="margin-bottom:5px">
<input id="sdbm" name="sdbm" style="width:480px;" class="easyui-combotree" data-options="label:'属地部门'," <input id="sdbm" name="sdbm" style="width:480px;" class="easyui-combotree" data-options="label:'属地部门',"
@ -32,16 +79,10 @@
</script> </script>
</div> </div>
<div style="margin-bottom:5px"> <div style="margin-bottom:5px">
<input id="zynr" class="easyui-textbox" name="zynr" style="width:480px;height:100px" <input class="easyui-textbox" id="zyfzrname" style="width:480px;" editable="false"
data-options="label:'作业内容',multiline:true" required=true /> data-options="label:'作业负责人',prompt:'请选择'" required=true>
</div> <input type="hidden" id="zyfzr" name="zyfzr" />
<div style="margin-bottom:5px;"> <a class='easyui-linkbutton' onclick="choseuser('zyfzr')" style="width:auto">选择</a>
<input id="kssj" editable="false" name="kssj" class="easyui-datetimebox" style="width:480px"
data-options="label:'开始时间',currentText:'今天',closeText:'关闭',showSeconds:false" required=true />
</div>
<div style="margin-bottom:5px;">
<input id="jssj" editable="false" name="jssj" class="easyui-datetimebox" style="width:480px"
data-options="label:'结束时间',currentText:'今天',closeText:'关闭',showSeconds:false" required=true />
</div> </div>
<div style="margin-bottom:5px"> <div style="margin-bottom:5px">
<input class="easyui-textbox" id="zyryname" style="width:480px;height:60px" editable="false" <input class="easyui-textbox" id="zyryname" style="width:480px;height:60px" editable="false"
@ -49,7 +90,20 @@
<input type="hidden" id="zyry" name="zyry" /> <input type="hidden" id="zyry" name="zyry" />
<a class='easyui-linkbutton' onclick="choseusers('zyry')" style="width:auto">选择</a> <a class='easyui-linkbutton' onclick="choseusers('zyry')" style="width:auto">选择</a>
</div> </div>
<div style="margin-bottom:5px;">
<input id="kssj" editable="false" name="kssj" class="easyui-datetimebox" style="width:480px"
data-options="label:'开始时间',currentText:'今天',closeText:'关闭',showSeconds:false" required=true />
</div>
<div style="margin-bottom:5px;">
<input id="jssj" editable="false" name="jssj" class="easyui-datetimebox" style="width:480px"
data-options="label:'预计结束',currentText:'今天',closeText:'关闭',showSeconds:false" required=true />
</div>
<div style="margin-bottom:5px"> <div style="margin-bottom:5px">
<input id="zynr" class="easyui-textbox" name="zynr" style="width:480px;height:100px"
data-options="label:'作业内容',multiline:true" required=true />
</div>
<!-- <div style="margin-bottom:5px">
<input type="hidden" name="zyimg" id="zyimg" /> <input type="hidden" name="zyimg" id="zyimg" />
<label>现场图片</label><input type="file" id="file" name="" accept="image/*" style="margin-left:30px;" /> <label>现场图片</label><input type="file" id="file" name="" accept="image/*" style="margin-left:30px;" />
<span id='ps' style="display:none"> <span id='ps' style="display:none">
@ -66,50 +120,54 @@
<p>安全措施：{{x.aqcs}}</p> <p>安全措施：{{x.aqcs}}</p>
<p>措施类型：{{x.cslx}}</p> <p>措施类型：{{x.cslx}}</p>
</div> </div>
</div> </div> -->
</form> </form>
</div> </div>
</div> </div>
<script> <script>
$.get('api/fxcs?a=listall&zylx='+{{zyid}}, function (data) { // $.get('api/fxcs?a=listall&zylx='+{{zyid}}, function (data) {
let html ='' // let html =''
for (var x = 0, len = data.length; x < len; x++) { // for (var x = 0, len = data.length; x < len; x++) {
html += '<div><input type="checkbox" name="fxcs" value="' + data[x].id + '">' + '</input></div>' // html += '<div><input type="checkbox" name="fxcs" value="' + data[x].id + '">' + '</input></div>'
} // }
$('#fxfxdiv').append(html) // $('#fxfxdiv').append(html)
}); // });
function aaa(x) { function aaa(x) {
if (x == "zyry") { if (x == "zyry") {
$('#zyry').attr('value', top.$('#in').val()); $('#zyry').attr('value', top.$('#in').val());
$('#zyryname').textbox('setValue', top.$('#in').attr('show')); $('#zyryname').textbox('setValue', top.$('#in').attr('show'));
$('#zyrynum').textbox('setValue', top.$('#in').attr('total')); $('#zyrynum').textbox('setValue', top.$('#in').attr('total'));
}else if(x == "zyfzr"){
$('#zyfzr').attr('value', top.$('#in').val());
$('#zyfzrname').textbox('setValue', top.$('#in').attr('show'));
} }
} }
function getfxcs() { // function getfxcs() {
obj = document.getElementsByName("fxfx"); // obj = document.getElementsByName("fxfx");
obj2 = document.getElementsByName("aqcs"); // obj2 = document.getElementsByName("aqcs");
check_val = {'fxfx':[],'aqcs':[]}; // check_val = {'fxfx':[],'aqcs':[]};
for (k in obj) { // for (k in obj) {
if (obj[k].checked) // if (obj[k].checked)
check_val['fxfx'].push(obj[k].value); // check_val['fxfx'].push(obj[k].value);
} // }
for (k in obj2) { // for (k in obj2) {
if (obj2[k].checked) // if (obj2[k].checked)
check_val['aqcs'].push(obj2[k].value); // check_val['aqcs'].push(obj2[k].value);
} // }
return check_val; // return check_val;
} // }
function zysubmitForm() { function zysubmitForm() {
var zyimg = new Array(); // var zyimg = new Array();
$(".zyimg").each(function () { // $(".zyimg").each(function () {
zyimg.push($(this).attr("filepath")); // zyimg.push($(this).attr("filepath"));
}); // });
var zydata = $('#zyff').serializeJSON(); var zydata = $('#zyff').serializeJSON();
zydata['zylx'] = {{zyid}} // zydata['zylx'] = {{zyid}}
zydata['zyimg'] = zyimg // zydata['zyimg'] = zyimg
zydata['fxcs'] = getfxcs() // zydata['fxcs'] = getfxcs()
zydata['zyry'] = zydata['zyry'].split(',') zydata['zyry'] = zydata['zyry'].split(',')
zydata['splc'] = 0
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: 'api/operation?a=add', url: 'api/operation?a=add',
@ -134,94 +192,94 @@
}, },
}); });
} }
document.getElementById('file').onchange = function () { // document.getElementById('file').onchange = function () {
var fileObj = this.files[0]; // var fileObj = this.files[0];
var url = 'upfile' // var url = 'upfile'
var form = new FormData(); // var form = new FormData();
if (fileObj.size / 1024 > 500) { //大于500k，进行压缩上传 // if (fileObj.size / 1024 > 500) { //大于500k，进行压缩上传
$("#file").after('<span id="tip" style="color:blue">图片大于500k,正在压缩...</span>'); // $("#file").after('<span id="tip" style="color:blue">图片大于500k,正在压缩...</span>');
photoCompress(fileObj, { // photoCompress(fileObj, {
quality: 0.2 // quality: 0.2
}, function (base64Codes) { // }, function (base64Codes) {
//console.log("压缩后：" + base.length / 1024 + " " + base); // //console.log("压缩后：" + base.length / 1024 + " " + base);
var bl = convertBase64UrlToBlob(base64Codes); // var bl = convertBase64UrlToBlob(base64Codes);
form.append("upfile", bl, fileObj.name); // 文件对象 // form.append("upfile", bl, fileObj.name); // 文件对象
xhr = new XMLHttpRequest(); // XMLHttpRequest 对象 // xhr = new XMLHttpRequest(); // XMLHttpRequest 对象
xhr.open("post", url, true); //post方式，url为服务器请求地址，true 该参数规定请求是否异步处理。 // xhr.open("post", url, true); //post方式，url为服务器请求地址，true 该参数规定请求是否异步处理。
$("#tip").remove(); // $("#tip").remove();
$('#ps').show(); // $('#ps').show();
xhr.onload = function (evt) { //服务断接收完文件返回的结果 // xhr.onload = function (evt) { //服务断接收完文件返回的结果
var data = JSON.parse(evt.target.responseText); // var data = JSON.parse(evt.target.responseText);
if (data.code = 1) { // if (data.code = 1) {
$('#ps').hide(); // $('#ps').hide();
$("#addImage").append('<li ><img title="点击放大" style="display:block;" onclick="bigger(this)" class = "zyimg" width="120" height="120" filepath="' + data.filepath + '" src="http://' + window.location.host + '/' + data.filepath + '"/><button onclick="removep(this)" >删除</button></li>'); // $("#addImage").append('<li ><img title="点击放大" style="display:block;" onclick="bigger(this)" class = "zyimg" width="120" height="120" filepath="' + data.filepath + '" src="http://' + window.location.host + '/' + data.filepath + '"/><button onclick="removep(this)" >删除</button></li>');
document.getElementById('file').value = ''; // document.getElementById('file').value = '';
} else { alert("上传失败！"); } // } else { alert("上传失败！"); }
}; //请求完成 // }; //请求完成
xhr.onerror = function (evt) { alert("上传失败！"); $('#ps').hide(); };; //请求失败 // xhr.onerror = function (evt) { alert("上传失败！"); $('#ps').hide(); };; //请求失败
xhr.upload.onprogress = progressFunction;//【上传进度调用方法实现】 // xhr.upload.onprogress = progressFunction;//【上传进度调用方法实现】
xhr.upload.onloadstart = function () {//上传开始执行方法 // xhr.upload.onloadstart = function () {//上传开始执行方法
ot = new Date().getTime(); //设置上传开始时间 // ot = new Date().getTime(); //设置上传开始时间
oloaded = 0;//设置上传开始时，以上传的文件大小为0 // oloaded = 0;//设置上传开始时，以上传的文件大小为0
}; // };
xhr.send(form); //开始上传，发送form数据 // xhr.send(form); //开始上传，发送form数据
}); // });
} else { //小于等于500k 原图上传 // } else { //小于等于500k 原图上传
form.append("upfile", fileObj); // 文件对象 // form.append("upfile", fileObj); // 文件对象
xhr = new XMLHttpRequest(); // XMLHttpRequest 对象 // xhr = new XMLHttpRequest(); // XMLHttpRequest 对象
xhr.open("post", url, true); //post方式，url为服务器请求地址，true 该参数规定请求是否异步处理。 // xhr.open("post", url, true); //post方式，url为服务器请求地址，true 该参数规定请求是否异步处理。
xhr.onload = function (evt) { //服务断接收完文件返回的结果 // xhr.onload = function (evt) { //服务断接收完文件返回的结果
var data = JSON.parse(evt.target.responseText); // var data = JSON.parse(evt.target.responseText);
if (data.code = 1) { // if (data.code = 1) {
$('#ps').hide(); // $('#ps').hide();
$("#addImage").append('<li ><img title="点击放大" style="display:block;" onclick="bigger(this)" class = "zyimg" width="120" height="120" filepath="' + data.filepath + '" src="http://' + window.location.host + '/' + data.filepath + '"/><button onclick="removep(this)" >删除</button></li>'); // $("#addImage").append('<li ><img title="点击放大" style="display:block;" onclick="bigger(this)" class = "zyimg" width="120" height="120" filepath="' + data.filepath + '" src="http://' + window.location.host + '/' + data.filepath + '"/><button onclick="removep(this)" >删除</button></li>');
document.getElementById('file').value = ''; // document.getElementById('file').value = '';
} else { alert("上传失败！"); } // } else { alert("上传失败！"); }
}; //请求完成 // }; //请求完成
xhr.onerror = function (evt) { alert("上传失败！"); $('#ps').hide(); };; //请求失败 // xhr.onerror = function (evt) { alert("上传失败！"); $('#ps').hide(); };; //请求失败
xhr.upload.onprogress = progressFunction;//【上传进度调用方法实现】 // xhr.upload.onprogress = progressFunction;//【上传进度调用方法实现】
xhr.upload.onloadstart = function () {//上传开始执行方法 // xhr.upload.onloadstart = function () {//上传开始执行方法
ot = new Date().getTime(); //设置上传开始时间 // ot = new Date().getTime(); //设置上传开始时间
oloaded = 0;//设置上传开始时，以上传的文件大小为0 // oloaded = 0;//设置上传开始时，以上传的文件大小为0
}; // };
xhr.send(form); //开始上传，发送form数据 // xhr.send(form); //开始上传，发送form数据
} // }
function progressFunction(evt) { // function progressFunction(evt) {
var progressBar = document.getElementById("progressBar"); // var progressBar = document.getElementById("progressBar");
var percentageDiv = document.getElementById("percentage"); // var percentageDiv = document.getElementById("percentage");
// event.total是需要传输的总字节，event.loaded是已经传输的字节。如果event.lengthComputable不为真，则event.total等于0 // // event.total是需要传输的总字节，event.loaded是已经传输的字节。如果event.lengthComputable不为真，则event.total等于0
if (evt.lengthComputable) {// // if (evt.lengthComputable) {//
progressBar.max = evt.total; // progressBar.max = evt.total;
progressBar.value = evt.loaded; // progressBar.value = evt.loaded;
percentageDiv.innerHTML = Math.round(evt.loaded / evt.total * 100) + "%"; // percentageDiv.innerHTML = Math.round(evt.loaded / evt.total * 100) + "%";
} // }
var time = document.getElementById("time"); // var time = document.getElementById("time");
var nt = new Date().getTime();//获取当前时间 // var nt = new Date().getTime();//获取当前时间
var pertime = (nt - ot) / 1000; //计算出上次调用该方法时到现在的时间差，单位为s // var pertime = (nt - ot) / 1000; //计算出上次调用该方法时到现在的时间差，单位为s
ot = new Date().getTime(); //重新赋值时间，用于下次计算 // ot = new Date().getTime(); //重新赋值时间，用于下次计算
var perload = evt.loaded - oloaded; //计算该分段上传的文件大小，单位b // var perload = evt.loaded - oloaded; //计算该分段上传的文件大小，单位b
oloaded = evt.loaded;//重新赋值已上传文件大小，用以下次计算 // oloaded = evt.loaded;//重新赋值已上传文件大小，用以下次计算
//上传速度计算 // //上传速度计算
var speed = perload / pertime;//单位b/s // var speed = perload / pertime;//单位b/s
var bspeed = speed; // var bspeed = speed;
var units = 'b/s';//单位名称 // var units = 'b/s';//单位名称
if (speed / 1024 > 1) { // if (speed / 1024 > 1) {
speed = speed / 1024; // speed = speed / 1024;
units = 'k/s'; // units = 'k/s';
} // }
if (speed / 1024 > 1) { // if (speed / 1024 > 1) {
speed = speed / 1024; // speed = speed / 1024;
units = 'M/s'; // units = 'M/s';
} // }
speed = speed.toFixed(1); // speed = speed.toFixed(1);
//剩余时间 // //剩余时间
var resttime = ((evt.total - evt.loaded) / bspeed).toFixed(1); // var resttime = ((evt.total - evt.loaded) / bspeed).toFixed(1);
time.innerHTML = '，速度：' + speed + units + '，剩余时间：' + resttime + 's'; // time.innerHTML = '，速度：' + speed + units + '，剩余时间：' + resttime + 's';
//if(bspeed==0) time.innerHTML = '上传已取消'; // //if(bspeed==0) time.innerHTML = '上传已取消';
} // }
} // }
</script> </script>

2
safesite/urls.py
View File

@ -47,7 +47,7 @@ urlpatterns = [
path('html/notice/detail/<int:id>/', views.noticedetail), path('html/notice/detail/<int:id>/', views.noticedetail),
path('html/zuoyepeizhi', views.zuoyepeizhi), path('html/zuoyepeizhi', views.zuoyepeizhi),
path('html/operation', views.operation), path('html/operation', views.operation),
path('html/operation/add/<int:zyid>/', views.operationadd), path('html/operation/add', views.operationadd),
path('html/operation/detail/<int:zyid>/', views.operationdetail), path('html/operation/detail/<int:zyid>/', views.operationdetail),
path('html/fxcs/add', views.fxcsadd), path('html/fxcs/add', views.fxcsadd),
path('html/operationspjd/add', views.operationspjdadd), path('html/operationspjd/add', views.operationspjdadd),

5966
safesite/views.py
View File

File diff suppressed because it is too large Load Diff