Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
721e176e by weimo934
Options

style(规划审查待办已办):分页条看不见了

1 parent 76492a13
Inline Side-by-side
Showing 7 changed files with 180 additions and 988 deletions
......@@ -143,22 +143,6 @@ function postDataToServe(_url, _data, _fn, _async) {
function getApproveList(pageIndex, condition, starttimecondition, overtimecondition, typecondition) {
layui.use('element', function () {
var element = layui.element;
/**
* $(this).ajaxStart(function(){
//parent.window.processBar.showBar();
parent.window.$.showLoading();
//微信loading hyh 新增 2017/10/27
//$.showLoading();
});
$(this).ajaxStop(function(){
//setTimeout(function() {parent.window.processBar.hideBar();}, 500);
//微信loading hyh 新增 2017/10/27
// setTimeout(function() {$.hideLoading()},1000);
parent.window.$.hideLoading();
});
* **/
currentPage = pageIndex;
if (searchInfo) {
condition = searchInfo;
......@@ -275,18 +259,6 @@ function getApproveList(pageIndex, condition, starttimecondition, overtimecondit
} else {
zuiData(result);
}
// zuiData(result);
/*layuiPage(totalre);
if (totalre == 0){
$('#msg').css("display", "block");
$('#nvaTab').css("visibility", "hidden");
}else{
$('#msg').css("display", "none");
$('#nvaTab').css("visibility", "visible");
}*/
// parent.window.processBar.hideBar();
}
});
......@@ -531,26 +503,12 @@ function zuiData(result) {
if (orign === 'ghsc') {
//由于这块儿的过滤导致规划审查里的已办项目列表数据刷新不出来，暂时注释掉， 2020年6月2日 17:44:54 vers
data = data.filter(item => {
// return item.FLOWNAME.indexOf('规划成果审查') > -1 ||
// item.FLOWNAME.indexOf('申请数据流程') > -1 ||
// item.FLOWNAME.indexOf('项目策划生成') > -1 ||
// item.FLOWNAME.indexOf('数据申请') > -1
if (isType == 1) {
return item.FLOWNAME.indexOf('数据申请') > -1
} else {
return item.FLOWNAME.indexOf('规划成果审查') > -1 /*||
item.FLOWNAME.indexOf('申请数据流程') > -1 ||
item.FLOWNAME.indexOf('项目策划生成') > -1*/
return item.FLOWNAME.indexOf('规划成果审查') > -1
};
// item.FLOWNAME === "建设项目工程建设许可" ||
// item.FLOWNAME === "建设项目立项用地规划许可审批" ||
// item.FLOWNAME === "施工许可阶段流程" ||
// item.FLOWNAME === "竣工验收阶段流程" ||
// item.FLOWNAME === "成果审查子流程测试" ||
// item.FLOWNAME === "出让类项目储备策划生成" ||
// item.FLOWNAME === '项目策划生成'
})
} else if (orign === 'ywxt') {
data = data.filter(item => (item.FLOWNAME === "项目策划流程" || item.FLOWNAME === "项目储备策划生成"))
......@@ -829,95 +787,6 @@ function openlayer_continue() {
}
}
/* hzw 2018/3/15 注释 不影响可以删除
//check box 勾选事件
function CheckItem(obj){
// $("input[type='checkbox']:checked").each(function(i){
// $(this).prop('checked','');
// });
canFinishFlow = true;
var checkBoxs = $("input[type='checkbox']:checked");
var tds = checkBoxs.parent().parent().find("td");
if(checkBoxs.length==0){
projectId = null;
taskIds = null;
canFinishFlow = false;
$("#continueProject").attr("disabled","disabled");
return ;
}
if(checkBoxs.length>1){
$("#continueProject").attr("disabled","disabled");
projectId = null;
var i = 0;
taskIds = '';
$("#continueProject").attr("disabled","disabled");
$("input[type='checkbox']:checked").each(function(i){
var tds = $(this).parent().parent().find("td");
if(tds[4].innerText!="退件")
canFinishFlow = false;
if(i==0){
taskIds += tds[3].innerText;
}else{
taskIds += ','+tds[3].innerText;
}
i++;
});
i = 0;
}else{
$("#continueProject").attr("disabled",null);
projectId = tds[1].innerText;
taskIds = tds[3].innerText;
if(tds[4].innerText!="退件")
canFinishFlow = false;
}
}
*/
/**
* 日志
*/
/* hzw 2018/3/15 注释 提取到layuiDataList.js作为通用方法 不影响可以删除
* function openJournal(){
var checboxnumber=0;
var checboxdata = [];
var myDatatable = $('table.datatable').data('zui.datatable');
var rowdata = myDatatable.data.rows;
for(var i=0;i<rowdata.length;i++){
if(rowdata[i].checked==true){
checboxnumber++;
var obj = rowdata[i];
checboxdata.push(obj);
}
}
if(checboxnumber==0){
parent.layer.msg("请选择项目！", {icon : 2});
}
if(checboxnumber>1){
parent.layer.msg("只能查看一个项目！", {icon : 2});
}
if(checboxdata.length==1){
var data = checboxdata[0];
var flowInstanceId = data.data[1].text;
var url = CONF_FRONT_SERVERURL + 'view/projecttask/flowlog.jsp?flowInstanceId='
+ flowInstanceId;
layer.open({
type : 2, //page层
area : [ '70%', '90%' ],
offset : '10px',
title : '流程日志',
shadeClose : true,
shade : 0.6, //遮罩透明度
moveType : 1, //拖拽风格，0是默认，1是传统拖动
moveOut : true,
//shift: 1, //0-6的动画形式，-1不开启
content : url
});
}
}*/
function selectProjecType() {
var index = layer.open({
type: 2,
......
......@@ -8,11 +8,12 @@ var pageSize = 100; //瘥△暺恕蝷箇100嚗hy20181226靽格嚗蛹鈭
let screenHeight = window.screen.height;
var pageSizeLayui
if(screenHeight >= 1080) {
if (screenHeight >= 1080) {
pageSizeLayui = 18; // 18
}else {
} else {
pageSizeLayui = 10;
};
}
;
var pageSizesLayui = [10, 15, 18, 30, 40, 50];
var currentLayui = 1;
......@@ -44,7 +45,7 @@ var orign = null; // 皞 created by zys
var isType = 2; // 默认数据申请 目前只在规划审查待办项目中
var isClickPage = false;
console.log('业务协同/规划审查js','webapp/js/projecttask/dealingproject.js')
console.log('业务协同/规划审查js', 'webapp/js/projecttask/dealingproject.js')
$(function () {
// FIXME: zys
......@@ -58,9 +59,10 @@ $(function () {
}
}
// 去掉tabs
if(orign != 'ghsc') {
if (orign != 'ghsc') {
$('#isTabs').remove();
};
}
;
if (orign === 'ghsc') {
$("#continueProject").remove();
$("#createProject").html('<span class="glyphicon glyphicon-download-alt" style="font-size: 15px"></span><a class="bumpbox_white">新建</a>').show();
......@@ -106,6 +108,7 @@ $(function () {
window.onresize = setListHeight;//当窗口改变宽度时执行此函数,lhy20181226修改
function setListHeight() {
debugger
var tableTop = parseInt($("#workingsTabDiv").offset().top) - 10;
// var tableTop = parseInt($("#tbodylist").offset().top)-10;
var wh = $(window).height();
......@@ -113,7 +116,8 @@ function setListHeight() {
var iframeTop = window.parent.$("#iframecontent").offset().top;
//$("#workingsTabDiv").css("height",wh-iframeTop-tableTop-bodyPadding+"px");
var height = wh - iframeTop - tableTop - bodyPadding - 40;//50大概是tablehead的高度
$("#tbodylist").css("height", height + "px");
//$("#tbodylist").css("height", height + "px");
$("#tbodylist").css("height", '80vh');
//$("#datalist").css("min-width",getTableInitWidth("datalist")+"px");//设置table的初始宽度
setTableMinWidth();//设置表格的最小宽度
setCellWidth();//设置单元格宽度
......@@ -151,127 +155,6 @@ function openlayer_type() {
});
}
/**
* 批量发送
*/
/*function batchSendClick(){
var checboxdata = [];
var myDatatable = $('table.datatable').data('zui.datatable');
var rowdata = myDatatable.data.rows;
for(var i=0;i<rowdata.length;i++){
if(rowdata[i].checked==true){
var obj = rowdata[i];
var tid = obj.data[2].text
checboxdata.push(tid);
}
}
taskIds = checboxdata.join(",");
if(!taskIds){
layer.msg('请选择需要发送的项目',{icon:2});
return ;
}
var tid = taskIds.split(",")[0];
//校验是否为同一流程同一环节
$.ajax({
type: "POST",
url: curserver + global.modelctls.project.task.batchSend,
headers:{
"token":$.cookie('ftoken')
},
data:{taskIds:taskIds},
dataType: 'json',
success:function(data){
if(data.status=='ok'){
//批量发送
$.ajax({
type: "POST",
url: curserver + global.modelctls.project.task.resource,
headers:{
"token":$.cookie('ftoken')
},
data:{taskid : tid},
dataType: 'json',
success:function(data){
canSelfTurning=data.activity.canSelfTurning;
flowObjectName=data.activity.flowObjectName;
task = data.task;
activityid = data.activity.id;
}
});
var index = layer.open({
type : 2,
title : '选择用户',
shadeClose : true,
shade : 0.3,
area : [ '640px', '600px' ],
offset : [ '50px' ],
content : '../../view/userlist.jsp?taskId=' + tid,
btn : [ '发送', '取消' ],
yes : function(index, layero) {
var iframeWin = window[layero.find('iframe')[0]['name']];
var splabel = iframeWin.splabel();
var toArray = [];
for (var i = 0; i < splabel.length; i++) {
var item = splabel[i];
toArray.push({
id : item.id,
name : item.name,
users : item.user
});
}
var sendInfo = {
from : {
id : task.flowObjectId,
name : task.name+",发送"
},
to : toArray
};
$.ajax({
type: "POST",
url: curserver + global.modelctls.flowEngine.task.batchComplete,
headers:{
"token":$.cookie('ftoken')
},
data:{
taskIds : taskIds,
activityId: activityid,
sendObject : JSON.stringify(sendInfo)
},
dataType: 'json',
success:function(result){
if (result.status == 'ok') {
//发送短信微信
var tousers=iframeWin.users();
var checkMessage=iframeWin.checkMessage();
if(checkMessage!=""){
var content = iframeWin.dWxWconContent();
allSend(tousers,checkMessage,content);
}
layer.close(index);
} else {
console.info(result);
layer.msg('发送失败！',{icon:2});
}
}
});
},
end : function(index, layero) {
}
});
}else
layer.msg(data.message,{icon: 2});
}
});
}*/
function getdoctype() {
return "batchsp";
......@@ -286,39 +169,6 @@ function getcanSelfTurningData() {
}
/**
* 批量结束流程
*
*/
/*function finishFlow(){
if(!taskIds){
layer.msg('请选择需要结束的项目',{icon:2});
return ;
}
if(!canFinishFlow){
layer.msg('所选择的项目包含非退件项目，无法结束',{icon:2});
return ;
}
layer.open({
content: '确定结束该项目吗？',
btn: ['确认', '取消'],
shadeClose: true,
icon: 3,
yes: function(){
var url = global.contextPath + global.modelctls.flowEngine.task.finishFlow;
$.post(url,{taskIds:taskIds},function(data){
if(data.status=='ok'){
layer.msg(data.message,{icon: 1});
getApproveList(1);
}else
layer.msg(data.message,{icon: 2});
});
}
});
}*/
/**
*显示流程日志
*/
function openlayer_flowlog() {
......@@ -354,24 +204,6 @@ function sendToUsers() {
});
}
/**
* 已经不使用，下次没发现什么问题可删除 2018-01-08
*/
/*function opendetailproject(obj){
var jqobj=$(obj);
var tds = jqobj.find("td");
var taskid = tds[3].innerText;
var title = tds[6].innerText;
var titleEncode = encodeURI(encodeURI(title));
var stats = "projecting";
var url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?taskId=' + taskid+"&stats="+stats+"&titleEncode="+titleEncode;
//打开后修改样式,修改未读样式
var obj_div=$(obj).css("font-weight","");
//window.open(url);
parent.saveOpenNew(window.open(url)); //hyh 修改 2017/11/6
}*/
/**
* 根据获取到的权限判断时候拥有列表显示的权限
......@@ -421,10 +253,10 @@ function getApproveList(pageIndex, condition, starttimecondition,
var projectTypes = $('#projectTypes').val();
var list = '/dblb/list/workings';
var username = null;
if(username == '' || username == null || username == "undefined"){
if (username == '' || username == null || username == "undefined") {
username = userInfo.user.loginname;
}
if(username == '' || username == null || username == "undefined"){
if (username == '' || username == null || username == "undefined") {
username = "申请者";
}
$.ajax({
......@@ -455,7 +287,7 @@ function getApproveList(pageIndex, condition, starttimecondition,
},
success: function (res) {
if (res.code===500){
if (res.code === 500) {
$('#msg').css("display", "block");
$('#nvaTab').css("visibility", "hidden");
return false
......@@ -505,40 +337,6 @@ function srollPage(pageIndex, nDivHight) {
}
/* hzw 2018/3/15 注释 不影响可以删除
* var zuidate = {
cols: [
{width: 'auto', text: '项目id', type: 'number', flex: false, colClass: 'hidden'},
{width: 'auto', text: '流程id', type: 'number', flex: false, colClass: 'hidden'},
{width: 'auto', text: '实例id', type: 'number', flex: false, colClass: 'hidden'},
{width: '40', text: '<img src="../../image/projecttask/projecttaskinfo.png "style="width:16px;">',type: 'string', flex: false,sort:false},//hyh 修改,给图标一栏的头部加个图标 2017/10/23
{width: '70', text: '状态', type: 'string', flex: false, colClass: '',sort:false},
{width: '100', text: '当前环节', type: 'string', flex: false, colClass: '',sort:false },
{width: 'auto', text: '项目类型', type: 'string', flex: false,colClass: '',sort:false},
{width: '200', text: '项目编号', type: 'number', flex: false, colClass: '',sort:false},
{width: 'auto', text: '项目名称', type: 'string', flex: false, colClass: '',sort:false },
{width: 'auto', text: '建设单位', type: 'string', flex: false,colClass: '',sort:false },
{width: 'auto', text: '主办科室 ', type: 'string', flex: false,colClass: '',sort:false },
{width: '100', text: '主办人', type: 'string', flex: false,colClass: '',sort:false },
{width: 'auto', text: '接件日期', type: 'date', flex: false,colClass: '',sort:true },
{width: '100', text: '理论办结日期', type: 'date', flex: false,sort:false}
// {width: '180', text: '<img src="../assets/images/projecttask/operation.png" style="width:20px;height:20px;margin-right:10px;">操作', type: 'string',flex: false,sort:false}
// ,],
rows:[]
}*/
/* hzw 2018/3/15 注释 不影响可以删除
* function zuitable(){
$('table.datatable').datatable({
checkable: true,
sortable: true,
checkByClickRow:false,
minFixedLeftWidth: 300,
});
}*/
var dataTable = [];
function dealingProjectDate(result, condition) {
......@@ -595,27 +393,27 @@ function dealingProjectDate(result, condition) {
var XMLX = map_result["XMLX"] ? map_result["XMLX"] : "";
console.log(XMLX);
var yt = null;
if(map_result["YT"] == "-"){
if (map_result["YT"] == "-") {
yt = "";
}else{
} else {
yt = map_result["YT"];
}
var mj = null;
if(map_result["MJ"] == "-" || map_result["MJ"] == "请选择"){
if (map_result["MJ"] == "-" || map_result["MJ"] == "请选择") {
mj = " ";
}else if(map_result["MJ"] == "1"){
} else if (map_result["MJ"] == "1") {
mj = "公开";
}else if(map_result["MJ"] == "2"){
} else if (map_result["MJ"] == "2") {
mj = "秘密";
}else if(map_result["MJ"] == "3"){
} else if (map_result["MJ"] == "3") {
mj = "机密";
}else if(map_result["MJ"] == "4"){
} else if (map_result["MJ"] == "4") {
mj = "绝密";
}
var xzqhbsm = null;
if(map_result["XZQHBSM"] == "-" || map_result["XZQHBSM"] == "请选择"){
if (map_result["XZQHBSM"] == "-" || map_result["XZQHBSM"] == "请选择") {
xzqhbsm = "";
}else{
} else {
xzqhbsm = map_result["XZQHBSM"];
}
//因为 审批列表使用的是zui组件，所以无法更换
......@@ -694,12 +492,12 @@ function dealingProjectDate(result, condition) {
"ATTACHPATH": attachpath,
"TASK_DEF_KEY_": taskkey,
"FLOWITEMTYPE": flowItemType,
"CGBBH":cgbbh,
"YT":yt,
"MJ":mj ? mj : '',
"XZQHBSM":xzqhbsm,
"SPJD":SPJD,
"XMLX":XMLX
"CGBBH": cgbbh,
"YT": yt,
"MJ": mj ? mj : '',
"XZQHBSM": xzqhbsm,
"SPJD": SPJD,
"XMLX": XMLX
}
data.push(row);
listShowObject.push(row);
......@@ -714,12 +512,6 @@ function dealingProjectDate(result, condition) {
}
/* hzw 2018/3/15 注释 不影响可以删除
* function openRefreshList(){
zuidate.rows = [];
$('table.datatable').datatable('load',getApproveList(1));
}*/
//check box 勾选事件
function CheckItem(obj) {
......@@ -765,74 +557,7 @@ function CheckItem(obj) {
}
}
/**
* 动态分页按钮
* @param tatalre
* @param totalpa
*/
/* hzw 2018/3/15 注释 不影响可以删除
* function dynamicPage(totalre,totalpa,currentPage){
$("#total_records").html(totalre);
$("#total_page").html(totalpa);
var pageStart = "";
var pageEnd = "";
if(currentPage<=Math.round(pageNum/2)+1){
pageStart = 1;
pageEnd = pageNum;
}
if(currentPage>Math.round(pageNum/2)+1){
pageStart = currentPage-Math.round(pageNum/2);
pageEnd = currentPage+Math.round(pageNum/2)-2;
}
if(pageEnd>totalpa){
pageEnd = totalpa;
}
var ulcontent = $(".pagination");
ulcontent.children().filter('li').remove();
ulcontent.append("<li> <a onclick=\"jumpPage(0)\" aria-label=\"Previous\">" +
"<span aria-hidden=\"true\">上一页</span></a></li> ");
for(var i=pageStart;i<=pageEnd;i++){
if(i==currentPage){
ulcontent.append("<li class=\"active\"><a onclick=\"getApproveList("+i+")\">"+i+"</a></li>");
}else{
ulcontent.append("<li><a onclick=\"getApproveList("+i+")\">"+i+"</a></li>");
}
}
ulcontent.append("<li> <a onclick=\"jumpPage(1)\" aria-label=\"Next\">" +
"<span aria-hidden=\"true\">下一页</span></a></li> ");
pagging.modifyPagging(totalre, totalpa,currentPage);
}*/
pagging.config.list = getApproveList;
/**
* 上一页、下一页调转
* @param index
*/
/* hzw 2018/3/15 注释 不影响可以删除
* function jumpPage(index){
var pageindex=1;
if(index==0){//上一页
pageindex = currentPage-1<=1?1:currentPage-1;
}else {
pageindex= currentPage+1>=totalpage?totalpage:currentPage+1;
}
getApproveList(pageindex);
}
function newTab(url, tabname, tabid){
window.parent.iframeLoad(url, tabname, tabid);
}
function refreshTable(){
zuidate.rows = [];
$('table.datatable').datatable('load',getApproveList(1));
}
function checkboxStop(){
$("input[type='checkbox']").click(function(e){
e.stopPropagation();
});
}*/
/**
* 上会
......@@ -1226,87 +951,6 @@ function openlayer_tree() {
/**
* 结束流程
*/
/*function openlayer_endtask(){
var taskArray=[];
var projectids =[];
var myDatatable = $('table.datatable').data('zui.datatable');
var rowdata = myDatatable.data.rows;
for(var i=0;i<rowdata.length;i++){
if(rowdata[i].checked==true){
var obj = rowdata[i];
var taskid = obj.data[2].text
if(obj.data[4].text != '退件'){
parent.layer.msg("结束失败！只有状态为'退件'的案件才可以结束！", {icon : 2});
return false ;
}else{
taskArray.push(taskid);
projectids.push(obj.data[0].text);
}
}
}
if(taskArray!=null && taskArray.length>0){
parent.layer.open({
content: '确定结束选中流程吗？',
btn: ['确认', '取消'],
shadeClose: true,
icon: 3,
yes: function(){
var taskString = taskArray.join();
$.ajax({
type: "POST",
url: curserver + global.modelctls.flowEngine.task.finishFlow,
headers:{
"token":$.cookie('ftoken')
},
data:{
taskIds : taskString,
},
success:function(result){
if(result.status == 'ok') {
action = "退件办结";
for(var i=0;i<projectids.length;i++){
projectid = projectids[i];
updateActionStatus();
}
var taskListArray=[];
var taskList=result.data;
for(var i=0;i<taskList.length;i++){
taskListArray.push(taskList[i].instanceId);
}
if(taskListArray!=null){
$.ajax({
type: "POST",
url: curserver + global.modelctls.project.updateProjectTwo,
headers:{
"token":$.cookie('ftoken')
},
data:{
taskList : taskListArray.join()
},
dataType: 'json',
success:function(msg){
}
});
}
parent.layer.msg(result.message,{icon: 1});
//openRefreshList();
}
}
});
parent.layer.closeAll();
}
});
}else{
parent.layer.msg("请选择项目！", {icon : 2});
}
}*/
/**
* TEST
* 日志
*/
......@@ -1477,8 +1121,8 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
if (orign === 'ghsc') {
// -- 规划审查 待办项目
//添加表头
if(isType == 1) {
// -- 数据申请 根据类型切换表头
if (isType == 1) {
// -- 数据申请 根据类型切换表头
htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
"<thead><tr class=\"tabletitle\"> " +
"<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" +
......@@ -1496,7 +1140,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
"</tr>" +
"</thead>" +
"<tbody id=\"tbodylist\">"
}else {
} else {
htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
"<thead><tr class=\"tabletitle\"> " +
"<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" +
......@@ -1513,7 +1157,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
"<th width=\"11%\"><div class=\"tableCell\">报送时间</div></th>" +
"</tr>" +
"</thead>" +
"<tbody id=\"tbodylist\">"
"<tbody id=\"tbodylist\" style='height: 80vh !important;'>"
}
// -- 筛选数据逻辑
......@@ -1521,12 +1165,13 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
// return item.FLOWNAME.indexOf('规划成果审查') > -1 ||
// item.FLOWNAME.indexOf('申请数据流程') > -1 ||
// item.FLOWNAME.indexOf('数据申请') > -1
if(isType == 1) {
if (isType == 1) {
return item.FLOWNAME.indexOf('数据申请') > -1
}else {
} else {
return item.FLOWNAME.indexOf('规划成果审查') > -1 ||
item.FLOWNAME.indexOf('申请数据流程') > -1
};
item.FLOWNAME.indexOf('申请数据流程') > -1
}
;
});
// -- 分页逻辑单独抽出
if (createdFlag || isClickPage) {
......@@ -1535,14 +1180,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
createPage(data);
}
// 分页没有被创建 并且 数据量大于 分页条数 才显示分页
// if(createdFlag && data.length > pageSizeLayui) {
// createPage(data);
// createdFlag = false;
// };
var _url = '/xm/getLcList';
// var user = JSON.parse(parent.userCookies).user;
var user={
// var user = JSON.parse(parent.userCookies).user;
var user = {
id: "t0101_8a8610de737b99270173941e5c50017e",
loginname: "案件查处",
realname: "案件查处",
......@@ -1571,9 +1211,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
}, false);
data.forEach((ele) => {
// -- REGISTERTIME 用rwjssj来 转化为时间戳 处理排序
if(ele.REGISTERTIME) {
if (ele.REGISTERTIME) {
ele.timeStampVal = (new Date(ele.REGISTERTIME)).getTime();
}else {
} else {
ele.timeStampVal = 0;
}
});
......@@ -1590,8 +1230,8 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
var htmlTableBodyTr = "";//归类项目内容
var _url = '/xm/getLcList';
// var user = JSON.parse(parent.userCookies).user;
var user={
// var user = JSON.parse(parent.userCookies).user;
var user = {
id: "t0101_8a8610de737b99270173941e5c50017e",
loginname: "案件查处",
realname: "案件查处",
......@@ -1606,33 +1246,6 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
userName: user.realname,
};
// data = data.filter(item => (
// item.FLOWNAME.indexOf('规划成果审查') > -1 ||
// item.FLOWNAME.indexOf('申请数据流程') > -1
// ));
// // --
// if(createdFlag) {
// createPage(data);
// createdFlag = false;
// };
//
// var pageData = data.slice((currentLayui - 1) * pageSizeLayui, (currentLayui - 1) * pageSizeLayui + pageSizeLayui);
// 优化调用 --
// postDataToServe(_url, {..._obj, pageData: JSON.stringify(pageData)}, res => {
// for (var i = 0; i < pageData.length; i++) {
// for (var j = 0; j < res.length; j++) {
// if (pageData[i].PROJECTID == res[j].id) {
// pageData[i].REGISTERTIME = res[j].rwjssj
// pageData[i].PROJECTNAME = res[j].xmmc || ""
// pageData[i].PROJECTCODE = res[j].xmbh || ""
// pageData[i].BINDINGASSIGNEE = res[j].jbr || ""
// pageData[i].BINDINGUNIT = res[j].bm || ""
// }
// }
// }
// }, false);
for (var j = 0; j < pageData.length; j++) {//遍历所有项目数据
var flowTypeStr = pageData[j]["PROJECTFLOWTYPE"];
var obj = JSON.stringify(pageData[j]);
......@@ -1640,68 +1253,65 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
var descrption = pageData[j]["DESCRIPTION"];
if (descrption != "read") {
fontweight = ' style=\"font-weight: 600;color: blue;\" ';
};
}
;
//状态-项目编号-项目名称-业务类型-发起部门-接受日期
if (flowType == flowTypeStr) {
if(isType == 1) {
if (isType == 1) {
// 数据申请
htmlTableBodyTr += "<tr id=\"" + pageData[j]["PROJECTID"] + "\" " + fontweight + ' class=\"group' + i + '\">' +
"<td width=\"1%\" class=\"checkboxCls\" >" + '<input class="son_check" type="checkbox" name="layTableCheckbox" lay-skin="primary" title="" >' + "</td>" +
"<td width=\"3%\" onclick=\'workingSeeDetail(this)\' class=\"statusIcon\">" + pageData[j]["BJQX"] + "</td>" +
"<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" +
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" +
"<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" +
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" +
// -- 数据类型
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["FLOWNAME"] +"><div class=\"tableCell\">" + pageData[j]["FLOWNAME"] + "</div></td>" +
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["FLOWNAME"] + "><div class=\"tableCell\">" + pageData[j]["FLOWNAME"] + "</div></td>" +
// -- 数据用途 暂无字段
"<td width=\"30%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["YT"] +"><div class=\"tableCell\">" + pageData[j]["YT"] + "</div></td>" +
"<td width=\"30%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["YT"] + "><div class=\"tableCell\">" + pageData[j]["YT"] + "</div></td>" +
// -- 密级 暂无字段
"<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["MJ"] +"><div class=\"tableCell\">" + pageData[j]["MJ"] + "</div></td>" +
"<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["MJ"] + "><div class=\"tableCell\">" + pageData[j]["MJ"] + "</div></td>" +
// -- 项目版本
// "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + '' +"><div class=\"tableCell\">" + '' + "</div></td>" +
// -- 当前环节
"<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["ACTIVITYNAME"] +"><div class=\"tableCell\">" + pageData[j]["ACTIVITYNAME"] + "</div></td>" +
"<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["ACTIVITYNAME"] + "><div class=\"tableCell\">" + pageData[j]["ACTIVITYNAME"] + "</div></td>" +
// -- 申请部门
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] +"><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" +
// "<td width=\"12%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["FLOWNAME"] + "</div></td>" +
// "<td width=\"8%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["BINDINGUNIT"] + "</div></td>" +
// "<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["REGISTERTIME"] +"><div class=\"tableCell\">" + pageData[j]["REGISTERTIME"] + "</div></td>" + // REGISTERTIME RECEIVETIME
`<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${ pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] + "><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" +
`<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
"</tr>";
}else {
} else {
// 成果审查
htmlTableBodyTr += "<tr id=\"" + pageData[j]["PROJECTID"] + "\" " + fontweight + ' class=\"group' + i + '\">' +
"<td width=\"1%\" class=\"checkboxCls\" >" + '<input class="son_check" type="checkbox" name="layTableCheckbox" lay-skin="primary" title="" >' + "</td>" +
"<td width=\"3%\" onclick=\'workingSeeDetail(this)\' class=\"statusIcon\">" + pageData[j]["BJQX"] + "</td>" +
"<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" +
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" +
"<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" +
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" +
// -- 规划类型
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["XMLX"] +"><div class=\"tableCell\">" + pageData[j]["XMLX"] + "</div></td>" +
"<td width=\"30%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTNAME"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTNAME"] + "</div></td>" +
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["XMLX"] + "><div class=\"tableCell\">" + pageData[j]["XMLX"] + "</div></td>" +
"<td width=\"30%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTNAME"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTNAME"] + "</div></td>" +
// -- 行政辖区
"<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["XZQHBSM"] +"><div class=\"tableCell\">" + pageData[j]["XZQHBSM"] + "</div></td>" +
"<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["XZQHBSM"] + "><div class=\"tableCell\">" + pageData[j]["XZQHBSM"] + "</div></td>" +
// -- 项目版本
"<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["CGBBH"] +"><div class=\"tableCell\">" + pageData[j]["CGBBH"] + "</div></td>" +
"<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["CGBBH"] + "><div class=\"tableCell\">" + pageData[j]["CGBBH"] + "</div></td>" +
// -- 当前环节
"<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["ACTIVITYNAME"] +"><div class=\"tableCell\">" + pageData[j]["ACTIVITYNAME"] + "</div></td>" +
"<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["ACTIVITYNAME"] + "><div class=\"tableCell\">" + pageData[j]["ACTIVITYNAME"] + "</div></td>" +
// -- 所属阶段
"<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["SPJD"] +"><div class=\"tableCell\">" + pageData[j]["SPJD"] + "</div></td>" +
"<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["SPJD"] + "><div class=\"tableCell\">" + pageData[j]["SPJD"] + "</div></td>" +
// -- 发起部门
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] +"><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" +
"<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] + "><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" +
// "<td width=\"12%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["FLOWNAME"] + "</div></td>" +
// "<td width=\"8%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["BINDINGUNIT"] + "</div></td>" +
// "<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title`=" + pageData[j]["REGISTERTIME"]+"><div class=\"tableCell\">" + pageData[j]["REGISTERTIME"] + "</div></td>" +
`<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${ pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
`<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
"</tr>";
}
......@@ -1736,14 +1346,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
"<th width=\"6%\"><div class=\"tableCell\">来件人</div></th>" +
"<th width=\"6%\"><div class=\"tableCell\">登记时间</div></th>" +
"<th width=\"11%\"><div class=\"tableCell\">接受时间</div></th>" +
// "<th width=\"10%\"><div class=\"tableCell\">当前环节</div></th>" +
// "<th width=\"7%\"><div class=\"tableCell\">接收时间</div></th>" +
// "<th width=\"5%\"><div class=\"tableCell\">经办人</div></th>" +
// "<th width=\"7%\"><div class=\"tableCell\">所属部门</div></th>" +
// "<th width=\"7%\"><div class=\"tableCell\">策划结论</div></th>" +
"</tr>" +
"</thead>" +
"<tbody id=\"tbodylist\">"
"<tbody id=\"tbodylist\" style='height: 80vh !important;'>"
for (var i = 0; i < groupData.length; i++) {//遍历分组数据
/*if(i>0){//TODO 测试
......@@ -1761,11 +1366,12 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
if (createdFlag && isClickPage) {
createPage(data);
createdFlag = false;
};
}
;
data.forEach((ele, index) => {
if(ele.RECEIVETIME) {
if (ele.RECEIVETIME) {
ele.timeStampVal = (new Date(ele.RECEIVETIME)).getTime();
}else {
} else {
ele.timeStampVal = 0;
}
});
......@@ -1809,166 +1415,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
htmlTable += htmlTableHeadTr + htmlTableBodyTr;
}
}
/*
* 业务协同项目审批页面
* */
// else if (orign === 'ywxt-xmsp' || orign === 'ywxt-all') {
// // 业务协同 代办项目 --
// // $("#ywxt-xmsp-tabs").show();
// // $("#workingsTabDiv").css('margin-top', '-15px');
// //添加表头
// htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
// "<thead><tr class=\"tabletitle\"> " +
// "<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" +
// "<th width=\"3%\" class=\"statusIcon\"></th>" +
// "<th width=\"5%\"><div class=\"tableCell\">状态</div></th>" +
// "<th width=\"8%\"><div class=\"tableCell\">项目编号</div></th>" +
// "<th width=\"20%\"><div class=\"tableCell\">项目名称</div></th> " +
// "<th width=\"12%\"><div class=\"tableCell\">业务类型</div></th>" +
// "<th width=\"7%\"><div class=\"tableCell\">发起部门</div></th>" +
// "<th width=\"11%\"><div class=\"tableCell\">接收时间</div></th>" +
// "</tr>" +
// "</thead>" +
// "<tbody id=\"tbodylist\">"
//
// for (var i = 0; i < groupData.length; i++) {//遍历分组数据
// /*if(i>0){//TODO 测试
// break;
// }*/
// var flowType = groupData[i]["type"];
// var flowTypeName = groupData[i]["name"];
// var sum = 0;//统计属于该类型的项目个数
// var htmlTableBodyTr = "";//归类项目内容
//
// // -- ↓
// data = data.filter(item => (
// item.FLOWNAME === "工程建设许可阶段并联审批" ||
// item.FLOWNAME === "立项用地规划许可阶段并联审批" ||
// item.FLOWNAME === "施工许可阶段并联审批" ||
// item.FLOWNAME === "竣工验收阶段并联审批" ||
// item.FLOWNAME === "成果审查子流程测试" ||
// item.FLOWNAME === "项目储备策划生成" ||
// item.FLOWNAME === "出让类项目储备策划生成" ||
// item.FLOWNAME==='项目策划生成（政府投资工程建设项目类）'||
// item.FLOWNAME==='项目策划生成（企业投资项目用地储备类）'
// // || item.FLOWNAME === "数据申请"
// ));
//
// if (createdFlag) {
// createPage(data);
// createdFlag = false;
// }
// ;
// data.forEach((ele) => {
// if(ele.RECEIVETIME) {
// ele.timeStampVal = (new Date(ele.REGISTERTIME)).getTime();
// }else {
// ele.timeStampVal = 0;
// }
// });
// ownSort(data);
// pageData = data.slice((currentLayui - 1) * pageSizeLayui, (currentLayui - 1) * pageSizeLayui + pageSizeLayui);
//
// var dataCopy = JSON.parse(JSON.stringify(pageData))
// var _url = '/xm/getLcList';
// var user = JSON.parse(parent.userCookies).user;
// var _obj = {
// userId: user.id,
// userName: user.realname,
//
// };
// postDataToServe(_url, {..._obj, data: JSON.stringify(pageData)}, res => {
// for (var i = 0; i < pageData.length; i++) {
// for (var j = 0; j < res.length; j++) {
// if (pageData[i].PROJECTID == res[j].id) {
// pageData[i].REGISTERTIME = res[j].rwjssj
// pageData[i].PROJECTNAME = res[j].xmmc || ""
// pageData[i].PROJECTCODE = res[j].xmbh || ""
// pageData[i].BINDINGASSIGNEE = res[j].jbr || ""
// pageData[i].ZPMSPH = res[j].cbbh || ""
// pageData[i].BUILDADDRESS = res[j].jsdw || ""
// pageData[i].CASECODE = res[j].jsdd || ""
// pageData[i].BINDINGUNIT = res[j].bm || ""
// pageData[i].SPJD = res[j].SPJD || ""
//
// if (pageData[i].ACTIVITYNAME === '发起项目' ||
// pageData[i].ACTIVITYNAME === '预选址及审核' ||
// pageData[i].ACTIVITYNAME === '空间协调' ||
// pageData[i].ACTIVITYNAME === '空间协调意见汇总' ||
// pageData[i].ACTIVITYNAME === '前期工作计划决策') {
// pageData[i].BUILDUNIT = "空间协调"
// } else if (pageData[i].ACTIVITYNAME === '提交可研材料' ||
// pageData[i].ACTIVITYNAME === '可研初审' ||
// pageData[i].ACTIVITYNAME === '联评联审' ||
// pageData[i].ACTIVITYNAME === '下达可研报告通知函') {
// pageData[i].BUILDUNIT = "可研协调"
// } else if (pageData[i].FLOWNAME === '工程建设许可阶段并联审批') {
// pageData[i].BUILDUNIT = "工程建设许可"
// } else if (pageData[i].FLOWNAME === '立项用地规划许可阶段并联审批') {
// pageData[i].BUILDUNIT = "用地规划许可"
// } else if (pageData[i].FLOWNAME === '施工许可阶段并联审批') {
// pageData[i].BUILDUNIT = "施工许可"
// } else if (pageData[i].FLOWNAME === '竣工验收阶段并联审批') {
// pageData[i].BUILDUNIT = "竣工验收"
// }
// }
// }
// }
// }, false);
// // -- ↑
// for (var j = 0; j < pageData.length; j++) {//遍历所有项目数据
// var flowTypeStr = pageData[j]["PROJECTFLOWTYPE"];
// var obj = JSON.stringify(pageData[j]);
// var fontweight = "";
// var descrption = pageData[j]["DESCRIPTION"];
// if (descrption != "read") {
// fontweight = ' style=\"font-weight: 600;color: blue;\" ';
// }
// // if (flowType == flowTypeStr) {
// htmlTableBodyTr += "<tr id=\"" + pageData[j]["PROJECTID"] + "\" " + fontweight + ' class=\"group' + i + '\">' +
// "<td width=\"1%\" class=\"checkboxCls\" >" + '<input class="son_check" type="checkbox" name="layTableCheckbox" lay-skin="primary" title="" >' + "</td>" +
// "<td width=\"3%\" onclick=\'workingSeeDetail(this)\' class=\"statusIcon\">" + pageData[j]["BJQX"] + "</td>" +
//
// "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" +
// "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" +
//
// "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTNAME"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTNAME"] + "</div></td>" +
//
// "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["FLOWNAME"] +"><div class=\"tableCell\">" + pageData[j]["FLOWNAME"] + "</div></td>" +
// "<td width=\"7%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] +"><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" +
// // "<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["REGISTERTIME"] +"><div class=\"tableCell\">" + pageData[j]["REGISTERTIME"] + "</div></td>" +
// `<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${ pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
//
// // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["FLOWNAME"] +"><div class=\"tableCell\">" + pageData[j]["FLOWNAME"] + "</div></td>" +
// "</tr>";
// sum++;
// showDataList.push(pageData[j]);//将显示的数据保存
// // }
// }
// if( i >= groupData.length) {
// ownSort(showDataList);
// //往表格中添加一行用于提示分类的标志行
// }
// var htmlTableHeadTr = "";
// htmlTable = "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
// "<thead><tr class=\"tabletitle\"> " +
// "<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" +
// "<th width=\"3%\" class=\"statusIcon\"></th>" +
// "<th width=\"5%\"><div class=\"tableCell\">状态</div></th>" +
// "<th width=\"8%\"><div class=\"tableCell\">项目编号</div></th>" +
// "<th width=\"20%\"><div class=\"tableCell\">项目名称</div></th> " +
// "<th width=\"22%\"><div class=\"tableCell\">业务类型</div></th>" +
// "<th width=\"10%\"><div class=\"tableCell\">发起部门</div></th>" +
// "<th width=\"14%\"><div class=\"tableCell\">接收时间</div></th>" +
// "</tr>" +
// "</thead>" +
// "<tbody id=\"tbodylist\">" + htmlTableHeadTr + htmlTableBodyTr;
//
// }
// }
else if(orign =='phgl'){
} else if (orign == 'phgl') {
//添加表头
htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
"<thead><tr class=\"tabletitle\"> " +
......@@ -2022,22 +1469,6 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
showDataList.push(data[j]);//将显示的数据保存
}
}
//往表格中添加一行用于提示分类的标志行
// var htmlTableHeadTr = "<tr class=\"flowtypeParent\" id=\"" + "group" + i + "\">" +
// "<td width=\"1%\" class=\"iconTd\">" + "<span class=\"glyphicon glyphicon-minus\"></span>" + "</td>" +
// "<td width=\"3%\">" + flowTypeName + "（" + sum + "）" + "</td>" +
// "<td width=\"5%\">" + "" + "</td>" +
// "<td width=\"10%\">" + "" + "</td>" +
// "<td width=\"10%\">" + "" + "</td>" +
// "<td width=\"10%\">" + "" + "</td>" +
// "<td width=\"20%\">" + "" + "</td>" +
// "<td width=\"8%\">" + "" + "</td>" +
// "<td width=\"8%\">" + "" + "</td>" +
// "<td width=\"10%\">" + "" + "</td>" +
// "<td width=\"5%\">" + "" + "</td>" +
// "<td width=\"10%\">" + "" + "</td>" +
// "</tr>";
// htmlTable += htmlTableHeadTr + htmlTableBodyTr;
}
}
;
......@@ -2062,6 +1493,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
}, 500)
})
}
/*
* 创建分页
* */
......@@ -2078,7 +1510,7 @@ function createPage(data) {
, layout: ['count', 'prev', 'page', 'next', 'skip', 'limit']
, jump: function (obj, first) {
//首次不执行
if(!first){
if (!first) {
parent.window.$.showLoading();
setTimeout(() => {
pageSizeLayui = obj.limit;
......@@ -2090,21 +1522,22 @@ function createPage(data) {
});
})
}
/*
* desc 冒泡排序
* */
function ownSort(arr){
for(i=0;i<arr.length-1;i++){
for(j=0;j<arr.length-1-i;j++){
function ownSort(arr) {
for (i = 0; i < arr.length - 1; i++) {
for (j = 0; j < arr.length - 1 - i; j++) {
/**
* 比较第j位和j+1的initial值
* 如果j位的initial值比j+1位的initial值大，那么他们的位置发生交换
* 如果j位的initial值比j+1位的initial值小，那么位置不变
*/
if(arr[j].timeStampVal < arr[j+1].timeStampVal){
var temp=arr[j];
arr[j]=arr[j+1];
arr[j+1]=temp;
if (arr[j].timeStampVal < arr[j + 1].timeStampVal) {
var temp = arr[j];
arr[j] = arr[j + 1];
arr[j + 1] = temp;
}
}
}
......@@ -2165,41 +1598,8 @@ function workingSeeDetail(td) {
//不再验证会议状态
console.log(data)
openApproveDetail(data);
/*if(data.MEETINGPROJECTSTATE!=null && data.MEETINGPROJECTSTATE!="" && parent.listName!="项目查询" && parent.listName!="已办项目"){
parent.layer?parent.layer.msg("项目正在"+data.MEETINGPROJECTSTATE, {icon : 7}):opener.parent.layer.msg("项目正在"+data.MEETINGPROJECTSTATE, {icon : 7});
return;
}else{
openApproveDetail(data);
}*/
}
/**
* 鼠标悬停显示title 这是修改过的代办项目显示页面使用，lhy修改20181227
* 待办项目未读加粗
*/
/*function setCell(data) {
$("#workingsTabDiv tbody td,#workingsTabDiv thead th").each(function() {
var text = $(this).first()[0].innerText.trim();
if(text == "") text = "";
$(this).attr("title", text);
})
if(window.parent.listName == "待办项目") {
$("#datalist tbody tr").not(".flowtypeParent").each(function(index) {//筛选不为分类行的tr，lhy20181227
if(data[index].DESCRIPTION != "read") {
$(this).css("font-weight", "600");
}
})
}*/
/* $(".layui-table-header th").each(function(index) {
var field = $(this).attr("data-field");
fields.push(field);
}) */
/* $(".laytable-cell-1-BJQX").each(function() {
$(this).removeClass("laytable-cell-1-BJQX");
})*/
}
/**
* 复选框的点击事件
......@@ -2394,15 +1794,6 @@ function setCellWidth() {
var td_width = thHeader.eq(index).width();
$(this).width(td_width);
/*var td_width1 = $(this).width();
if(index != thHeader.length-1){
$(this).width(thHeader.eq(index).width());
}else{
// TO需要判断是否出现了滚动条
$(this).width(thHeader.eq(index).width() - 10);//最后一个td减去滚动条的宽度
}*/
});
});
......@@ -2513,23 +1904,6 @@ function WaitingToStart() {
}
/*function getUnhandledProjectCount() {
$.ajax({
url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getUnhandledItemCount',
data: {roleid: roleIds},
success: function (result) {
if (result) {
$('.w-badge').text(result).css('display', 'inline-block');
} else {
$('.w-badge').css('display', 'none');
}
},
error: function (error) {
}
})
}*/
function uuid() {
function S4() {
return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
......@@ -2567,22 +1941,22 @@ function postDataToServe(_url, _data, _fn, _async) {
}
// ly 新加方法，变量列表
var lyfunc = {
tabsChanges: function (val) {
parent.window.$.showLoading();
if(val == 1) {
if (val == 1) {
$('#sjsqTable').addClass("select-tables");
$('#sjsqTable').find('img').attr("src","./img/menu-document-selected.png");
$('#sjsqTable').find('img').attr("src", "./img/menu-document-selected.png");
$('#cgscTable').removeClass("select-tables");
$('#cgscTable').find('img').attr("src","./img/menu-document-checkbox.png");
}else {
$('#cgscTable').find('img').attr("src", "./img/menu-document-checkbox.png");
} else {
$('#cgscTable').addClass("select-tables");
$('#cgscTable').find('img').attr("src","./img/menu-document-selected.png");
$('#sjsqTable').find('img').attr("src","./img/menu-document-checkbox.png");
$('#cgscTable').find('img').attr("src", "./img/menu-document-selected.png");
$('#sjsqTable').find('img').attr("src", "./img/menu-document-checkbox.png");
$('#sjsqTable').removeClass("select-tables");
};
}
;
isType = val;
isClickPage = true;
dynamicWorkingTable(resultTableData, "workingsTabDiv", 'searchtext');
......
......@@ -187,23 +187,6 @@ $(function () {
document.title = "新建项目";
}
// FIXME: 暂时remove()
// initOneMap();
/*if (create === 0 || create == '0' || create == '1') {
creatingProject();
return;
} else {
$("#report_div").css("display", "none");
}
if (!taskId && stats != "Manage") {
lookThroughProject();
} else if (!taskId && stats == "Manage") {
lookProjectManage();
} else {
console.log("dealingProject() 开始处理");
dealingProject();
}*/
initOneMap();
if (create === 0 || create == '0' || create == '1') {
creatingProject();
......@@ -4409,35 +4392,11 @@ function projectSend(projectid, newData, olddata, index, layero) {
function sendSuccessPage(index) {
var content = "";
var source = "";
/*$.ajax({
url:CONF_BACK_SERVERURL + "/mvc/sctips/tiplist.do",
async:false,
headers:{
"token":$.cookie('ftoken')
},
success:function(data){
if(data.length>0){
var index = Math.floor(Math.random()*data.length);
content = data[index].content;
source = data[index].source;
}
},
error:function(){
console.log("获取小贴士菜单出错");
}
})*/
$(".button-operation").css("display", "none");
//发送成功后右侧滚动条隐藏
$(".mCSB_dragger_bar").css("display", "none");
//发送成功自动滚到最上面
$("#bodycontent").mCustomScrollbar("scrollTo", "top");
/*$("#content").html("&nbsp&nbsp&nbsp"+content);
$("#source").html("----------《"+source+"》");
$("#form").css('display','none');
$("#divPrompt").css('display','block');
$("#countDiv").css('display','block');
$("#centerFooter").css('display','none');*/
layer.close(index);
layer.closeAll();
if (saveprojectLoading) {
......
/*var dojoConfig = {};
dojoConfig.baseUrl = "/frontweb/js/arcgis_js_api/dojo";*/
/*jshint esversion: 6 */
require([
"esri/Map",
"esri/views/MapView",
"esri/Basemap",
"esri/layers/TileLayer",
"esri/geometry/Extent"
], function (Map, MapView, Basemap, TileLayer, Extent) {
let dianzi_imageMap = new TileLayer({
url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer' //电子底图
'esri/Map',
'esri/views/MapView',
'esri/layers/TileLayer',
'esri/geometry/Extent',
'esri/layers/MapImageLayer',
'esri/layers/WebTileLayer',
], function (
Map, MapView, TileLayer, Extent, MapImageLayer, WebTileLayer
) {
let basemapIcon = {
yxdt: './image/dzdt_normal.png',
dzdt: './image/yxdt_normal.png'
};
let layer_electronicMap = new MapImageLayer({
url: 'https://192.168.5.143:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 影像地图
sublayers: [
{
id: 0,
visible: true
}
]
});
let ext = new Extent({
xmin: 1.1333776806012768E7,
ymin: 4378389.417203172,
xmax: 1.133851590176645E7,
ymax: 4382058.3945608605,
"spatialReference": {
"wkid": 3857
}
//天地图 电子地图
const tiledLayer = new WebTileLayer({
urlTemplate:
'http://{subDomain}.tianditu.gov.cn/DataServer?T=vec_w&x={col}&y={row}&l={level}&tk=b46395ce4ec77f490158eebe439ac559',
subDomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'],
});
var basemap = new Basemap({
baseLayers: [
new MapImageLayer({
url: "https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer",
title: "Basemap"
})
],
title: "basemap",
id: "basemap"
//天地图 标注 电子地图
const tiledLayer_poi = new WebTileLayer({
urlTemplate:
'http://{subDomain}.tianditu.gov.cn/DataServer?T=cva_w&x={col}&y={row}&l={level}&tk=b46395ce4ec77f490158eebe439ac559',
subDomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'],
});
var map = new Map({
basemap: basemap
// 创建地图实例
const ext = new Extent({
xmin: 1.1332182150213555E7,
ymin: 4379415.470661429,
xmax: 1.1339935515720293E7,
ymax: 4383168.328167147,
spatialReference: 3857
});
var view = new MapView({
container: "map",
map: map,
constraints: {
lods: TileInfo.create().lods
},
zoom: 12
var myMap = new Map();
var myView = new MapView({
container: 'map',
map: myMap,
extent: ext,
});
myView.ui._removeComponents(['attribution']); // 移除地图来源信息
myMap.add(tiledLayer);
myMap.add(tiledLayer_poi);
var dt = 'dianzi';
$('#trigger').attr('src', basemapIcon.dzdt);
$(function () {
$('#trigger').click(function () {
if (dt === 'yingxiang') {
$('#trigger').attr('src', basemapIcon.dzdt);
myMap.remove(tiledLayer);
myMap.remove(tiledLayer_poi);
myMap.add(layer_electronicMap);
dt = 'dianzi';
} else if (dt === 'dianzi') {
$('#trigger').attr('src', basemapIcon.yxdt);
myMap.remove(layer_electronicMap);
myMap.add(tiledLayer);
myMap.add(tiledLayer_poi);
dt = 'yingxiang';
}
});
});
});
\ No newline at end of file
......
......@@ -8,18 +8,33 @@
<script src="../../../../js/arcgis_js_api/init.js"></script>
<script src="js/widget.js"></script>
<style type="text/css">
#map {
html, body {
margin: 0;
width: 100%;
height: 900px;
border: #0a36e9 solid 1px;
height: 100%;
overflow: hidden;
}
#map .esri-ui {
display: none;
}
.esri-view .esri-display-object, .esri-view .esri-bitmap {
position: absolute;
border: none;
margin: 0;
padding: 0;
-webkit-user-drag: none;
-webkit-user-select: none;
}
</style>
</head>
<body>
<div style=" position: absolute; right: 5px; top: 5px; z-index: 99;margin: 10px">
<img id="trigger" style=" width: 50px; ">
<div style=" position: absolute; right: 5px; top: 5px; z-index: 99;">
<img id="trigger" src="" style=" width: 50px; ">
</div>
<div id="map">
<div id="map" style="height: 250px; max-height: 250px">
</div>
</body>
</html>
\ No newline at end of file
......
......@@ -2059,7 +2059,7 @@ require([
let layer_electronicMap = new MapImageLayer({
//url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer' // 电子地图
url: 'https://192.168.5.143:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 电子地图
url: 'https://192.168.3.194:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 电子地图
sublayers: [
{
id: 0,
......
......@@ -305,31 +305,16 @@ tr td:first-child {
<a class="bumpbox_white">退件办结</a>
<!-- 结束改为退件办结 2018年12月5日 yyl-->
</button>
<!-- <button id="sendBtn" class="btn btn-info " type="button" -->
<!-- onclick="batchSendClick()"> -->
<!-- <span class="glyphicon glyphicon-send" style="font-size: 15px"></span> <a -->
<!-- class="bumpbox_white">发送</a> -->
<!-- </button> -->
<button id="continueProject" class="btn buttonStatusStyle disabled"
type="button" style="display: none;" onclick="openlayer_continue()">
<span class="glyphicon glyphicon-play-circle"
style="font-size: 15px"></span> <a class="bumpbox_white">续办</a>
</button>
<!-- <button class="btn btn-info " type="button" -->
<!-- onclick="openlayer_type()" disabled="disabled"> -->
<!-- <span class="glyphicon glyphicon-pause" style="font-size: 15px"></span> <a -->
<!-- class="bumpbox_white">暂停</a> -->
<!-- </button> -->
<button id="journal" class="btn buttonStatusStyle disabled"
type="button" style="display: none;" onclick="openJournal()">
<span class="glyphicon glyphicon-list-alt" style="font-size: 15px"></span>
<a class="bumpbox_white">日志</a>
</button>
<!-- <button class="btn btn-info " type="button" disabled="disabled" -->
<!-- onclick="openProject()"> -->
<!-- <span class="icon-comments" style="font-size: 15px"></span> <a -->
<!-- class="bumpbox_white">上会</a> -->
<!-- </button> -->
<button id="projectTreebtn" class="btn buttonStatusStyle disabled"
type="button" style="display: none;" onclick="openlayer_tree()">
<span class="glyphicon glyphicon-tree-conifer"
......@@ -350,12 +335,6 @@ tr td:first-child {
class="glyphicon glyphicon-plus bindingAssignee" title="选择类型"
onclick="selectProjecType()"></a>
</div>
<%--<div class="search" style="position: relative;">
<label>业务类别</label> <select id="documentType" onchange="changeType()">
<option>所有</option>
<option v-for="option in options" v-bind:value="option.value">{{option.text}}</option>
</select>
</div>--%>
</div>
<div class="clearboth"></div>
......@@ -363,9 +342,6 @@ tr td:first-child {
<!-- 以下更改lhy -->
<div id="workingsTabDiv">
<!-- <div id="workingsTabDiv"
style="min-height: 60px; overflow-x: hidden; overflow-y: auto; "> -->
</div>
<!-- 以上更改 -->
......@@ -375,34 +351,6 @@ tr td:first-child {
<div id="page" style="float: right"></div>
</div>
<!-- <div id="page" style="float: right"></div> -->
<!-- <div id="nvaTab" class="data-list" style="margin-top:10px;display:none">
<div style="width: 100%;" dir="ltr" id="gbox_gridTable"
class="ui-jqgrid ui-widget ui-widget-content ui-corner-all">
<div style="width: 100%;" id="gview_gridTable"
class="ui-jqgrid-view">
<div id="dataTableDiv" class="ui-state-default ui-jqgrid-hdiv" style="width: 100%;">
<table class="table datatable">
</table>
<div class="nav-page">
<div>
共<span id="total_records"></span>条，共<span id="total_page"></span>页
</div>
<nav style="cursor:pointer;">
<ul class="pagination">
</ul>
</nav>
</div>
</div>
</div>
</div>
</div> -->
<div id="msg"
style="display: none; position: absolute; top: 50%; left: 50%;">
<div
......