Skip to content

蔡永松 / fontweb-dc

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

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

1 parent 76492a13
Expand all
Inline Side-by-side
Showing 7 changed files with 89 additions and 271 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,
......
......@@ -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' //电子底图
});
let ext = new Extent({
xmin: 1.1333776806012768E7,
ymin: 4378389.417203172,
xmax: 1.133851590176645E7,
ymax: 4382058.3945608605,
"spatialReference": {
"wkid": 3857
'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
}
]
});
//天地图 电子地图
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'],
});
//天地图 标注 电子地图
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 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 ext = new Extent({
xmin: 1.1332182150213555E7,
ymin: 4379415.470661429,
xmax: 1.1339935515720293E7,
ymax: 4383168.328167147,
spatialReference: 3857
});
var map = new Map({
basemap: basemap
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';
}
});
var view = new MapView({
container: "map",
map: map,
constraints: {
lods: TileInfo.create().lods
},
zoom: 12
});
});
\ 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
......