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) { ...@@ -143,22 +143,6 @@ function postDataToServe(_url, _data, _fn, _async) {
143 function getApproveList(pageIndex, condition, starttimecondition, overtimecondition, typecondition) { 143 function getApproveList(pageIndex, condition, starttimecondition, overtimecondition, typecondition) {
144 layui.use('element', function () { 144 layui.use('element', function () {
145 var element = layui.element; 145 var element = layui.element;
146 /**
147 * $(this).ajaxStart(function(){
148 //parent.window.processBar.showBar();
149 parent.window.$.showLoading();
150 //微信loading hyh 新增 2017/10/27
151 //$.showLoading();
152
153 });
154
155 $(this).ajaxStop(function(){
156 //setTimeout(function() {parent.window.processBar.hideBar();}, 500);
157 //微信loading hyh 新增 2017/10/27
158 // setTimeout(function() {$.hideLoading()},1000);
159 parent.window.$.hideLoading();
160 });
161 * **/
162 currentPage = pageIndex; 146 currentPage = pageIndex;
163 if (searchInfo) { 147 if (searchInfo) {
164 condition = searchInfo; 148 condition = searchInfo;
...@@ -275,18 +259,6 @@ function getApproveList(pageIndex, condition, starttimecondition, overtimecondit ...@@ -275,18 +259,6 @@ function getApproveList(pageIndex, condition, starttimecondition, overtimecondit
275 } else { 259 } else {
276 zuiData(result); 260 zuiData(result);
277 } 261 }
278 // zuiData(result);
279
280 /*layuiPage(totalre);
281 if (totalre == 0){
282 $('#msg').css("display", "block");
283 $('#nvaTab').css("visibility", "hidden");
284 }else{
285 $('#msg').css("display", "none");
286 $('#nvaTab').css("visibility", "visible");
287 }*/
288 // parent.window.processBar.hideBar();
289
290 } 262 }
291 }); 263 });
292 264
...@@ -531,26 +503,12 @@ function zuiData(result) { ...@@ -531,26 +503,12 @@ function zuiData(result) {
531 if (orign === 'ghsc') { 503 if (orign === 'ghsc') {
532 //由于这块儿的过滤导致规划审查里的已办项目列表数据刷新不出来，暂时注释掉， 2020年6月2日 17:44:54 vers 504 //由于这块儿的过滤导致规划审查里的已办项目列表数据刷新不出来，暂时注释掉， 2020年6月2日 17:44:54 vers
533 data = data.filter(item => { 505 data = data.filter(item => {
534 // return item.FLOWNAME.indexOf('规划成果审查') > -1 ||
535 // item.FLOWNAME.indexOf('申请数据流程') > -1 ||
536 // item.FLOWNAME.indexOf('项目策划生成') > -1 ||
537 // item.FLOWNAME.indexOf('数据申请') > -1
538 if (isType == 1) { 506 if (isType == 1) {
539 return item.FLOWNAME.indexOf('数据申请') > -1 507 return item.FLOWNAME.indexOf('数据申请') > -1
540 } else { 508 } else {
541 return item.FLOWNAME.indexOf('规划成果审查') > -1 /*|| 509 return item.FLOWNAME.indexOf('规划成果审查') > -1
542 item.FLOWNAME.indexOf('申请数据流程') > -1 ||
543 item.FLOWNAME.indexOf('项目策划生成') > -1*/
544 }; 510 };
545 511
546
547 // item.FLOWNAME === "建设项目工程建设许可" ||
548 // item.FLOWNAME === "建设项目立项用地规划许可审批" ||
549 // item.FLOWNAME === "施工许可阶段流程" ||
550 // item.FLOWNAME === "竣工验收阶段流程" ||
551 // item.FLOWNAME === "成果审查子流程测试" ||
552 // item.FLOWNAME === "出让类项目储备策划生成" ||
553 // item.FLOWNAME === '项目策划生成'
554 }) 512 })
555 } else if (orign === 'ywxt') { 513 } else if (orign === 'ywxt') {
556 data = data.filter(item => (item.FLOWNAME === "项目策划流程" || item.FLOWNAME === "项目储备策划生成")) 514 data = data.filter(item => (item.FLOWNAME === "项目策划流程" || item.FLOWNAME === "项目储备策划生成"))
...@@ -829,95 +787,6 @@ function openlayer_continue() { ...@@ -829,95 +787,6 @@ function openlayer_continue() {
829 } 787 }
830 } 788 }
831 789
832 /* hzw 2018/3/15 注释 不影响可以删除
833 //check box 勾选事件
834 function CheckItem(obj){
835 // $("input[type='checkbox']:checked").each(function(i){
836 // $(this).prop('checked','');
837 // });
838 canFinishFlow = true;
839 var checkBoxs = $("input[type='checkbox']:checked");
840 var tds = checkBoxs.parent().parent().find("td");
841 if(checkBoxs.length==0){
842 projectId = null;
843 taskIds = null;
844 canFinishFlow = false;
845 $("#continueProject").attr("disabled","disabled");
846 return ;
847 }
848 if(checkBoxs.length>1){
849 $("#continueProject").attr("disabled","disabled");
850 projectId = null;
851 var i = 0;
852 taskIds = '';
853 $("#continueProject").attr("disabled","disabled");
854 $("input[type='checkbox']:checked").each(function(i){
855 var tds = $(this).parent().parent().find("td");
856 if(tds[4].innerText!="退件")
857 canFinishFlow = false;
858 if(i==0){
859 taskIds += tds[3].innerText;
860 }else{
861 taskIds += ','+tds[3].innerText;
862 }
863 i++;
864 });
865 i = 0;
866 }else{
867 $("#continueProject").attr("disabled",null);
868 projectId = tds[1].innerText;
869 taskIds = tds[3].innerText;
870 if(tds[4].innerText!="退件")
871 canFinishFlow = false;
872 }
873 }
874 */
875
876 /**
877 * 日志
878 */
879
880 /* hzw 2018/3/15 注释 提取到layuiDataList.js作为通用方法 不影响可以删除
881 * function openJournal(){
882 var checboxnumber=0;
883 var checboxdata = [];
884 var myDatatable = $('table.datatable').data('zui.datatable');
885 var rowdata = myDatatable.data.rows;
886 for(var i=0;i<rowdata.length;i++){
887 if(rowdata[i].checked==true){
888 checboxnumber++;
889 var obj = rowdata[i];
890 checboxdata.push(obj);
891 }
892 }
893 if(checboxnumber==0){
894 parent.layer.msg("请选择项目！", {icon : 2});
895 }
896 if(checboxnumber>1){
897 parent.layer.msg("只能查看一个项目！", {icon : 2});
898 }
899
900 if(checboxdata.length==1){
901 var data = checboxdata[0];
902 var flowInstanceId = data.data[1].text;
903 var url = CONF_FRONT_SERVERURL + 'view/projecttask/flowlog.jsp?flowInstanceId='
904 + flowInstanceId;
905
906 layer.open({
907 type : 2, //page层
908 area : [ '70%', '90%' ],
909 offset : '10px',
910 title : '流程日志',
911 shadeClose : true,
912 shade : 0.6, //遮罩透明度
913 moveType : 1, //拖拽风格，0是默认，1是传统拖动
914 moveOut : true,
915 //shift: 1, //0-6的动画形式，-1不开启
916 content : url
917 });
918
919 }
920 }*/
921 function selectProjecType() { 790 function selectProjecType() {
922 var index = layer.open({ 791 var index = layer.open({
923 type: 2, 792 type: 2,
......
...@@ -187,23 +187,6 @@ $(function () { ...@@ -187,23 +187,6 @@ $(function () {
187 document.title = "新建项目"; 187 document.title = "新建项目";
188 } 188 }
189 189
190 // FIXME: 暂时remove()
191 // initOneMap();
192 /*if (create === 0 || create == '0' || create == '1') {
193 creatingProject();
194 return;
195 } else {
196 $("#report_div").css("display", "none");
197 }
198 if (!taskId && stats != "Manage") {
199 lookThroughProject();
200 } else if (!taskId && stats == "Manage") {
201 lookProjectManage();
202 } else {
203 console.log("dealingProject() 开始处理");
204 dealingProject();
205 }*/
206
207 initOneMap(); 190 initOneMap();
208 if (create === 0 || create == '0' || create == '1') { 191 if (create === 0 || create == '0' || create == '1') {
209 creatingProject(); 192 creatingProject();
...@@ -4409,35 +4392,11 @@ function projectSend(projectid, newData, olddata, index, layero) { ...@@ -4409,35 +4392,11 @@ function projectSend(projectid, newData, olddata, index, layero) {
4409 function sendSuccessPage(index) { 4392 function sendSuccessPage(index) {
4410 var content = ""; 4393 var content = "";
4411 var source = ""; 4394 var source = "";
4412 /*$.ajax({
4413 url:CONF_BACK_SERVERURL + "/mvc/sctips/tiplist.do",
4414 async:false,
4415 headers:{
4416 "token":$.cookie('ftoken')
4417 },
4418 success:function(data){
4419 if(data.length>0){
4420 var index = Math.floor(Math.random()*data.length);
4421 content = data[index].content;
4422 source = data[index].source;
4423 }
4424 },
4425 error:function(){
4426 console.log("获取小贴士菜单出错");
4427 }
4428 })*/
4429 $(".button-operation").css("display", "none"); 4395 $(".button-operation").css("display", "none");
4430 //发送成功后右侧滚动条隐藏 4396 //发送成功后右侧滚动条隐藏
4431 $(".mCSB_dragger_bar").css("display", "none"); 4397 $(".mCSB_dragger_bar").css("display", "none");
4432 //发送成功自动滚到最上面 4398 //发送成功自动滚到最上面
4433 $("#bodycontent").mCustomScrollbar("scrollTo", "top"); 4399 $("#bodycontent").mCustomScrollbar("scrollTo", "top");
4434
4435 /*$("#content").html("&nbsp&nbsp&nbsp"+content);
4436 $("#source").html("----------《"+source+"》");
4437 $("#form").css('display','none');
4438 $("#divPrompt").css('display','block');
4439 $("#countDiv").css('display','block');
4440 $("#centerFooter").css('display','none');*/
4441 layer.close(index); 4400 layer.close(index);
4442 layer.closeAll(); 4401 layer.closeAll();
4443 if (saveprojectLoading) { 4402 if (saveprojectLoading) {
......
1 /*var dojoConfig = {}; 1 /*jshint esversion: 6 */
2 dojoConfig.baseUrl = "/frontweb/js/arcgis_js_api/dojo";*/
3 require([ 2 require([
4 "esri/Map", 3 'esri/Map',
5 "esri/views/MapView", 4 'esri/views/MapView',
6 "esri/Basemap", 5 'esri/layers/TileLayer',
7 "esri/layers/TileLayer", 6 'esri/geometry/Extent',
8 "esri/geometry/Extent" 7 'esri/layers/MapImageLayer',
9 ], function (Map, MapView, Basemap, TileLayer, Extent) { 8 'esri/layers/WebTileLayer',
10 9 ], function (
11 let dianzi_imageMap = new TileLayer({ 10 Map, MapView, TileLayer, Extent, MapImageLayer, WebTileLayer
12 url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer' //电子底图 11 ) {
12 let basemapIcon = {
13 yxdt: './image/dzdt_normal.png',
14 dzdt: './image/yxdt_normal.png'
15 };
16 let layer_electronicMap = new MapImageLayer({
17 url: 'https://192.168.5.143:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 影像地图
18 sublayers: [
19 {
20 id: 0,
21 visible: true
22 }
23 ]
13 }); 24 });
14 25 //天地图 电子地图
15 let ext = new Extent({ 26 const tiledLayer = new WebTileLayer({
16 xmin: 1.1333776806012768E7, 27 urlTemplate:
17 ymin: 4378389.417203172, 28 'http://{subDomain}.tianditu.gov.cn/DataServer?T=vec_w&x={col}&y={row}&l={level}&tk=b46395ce4ec77f490158eebe439ac559',
18 xmax: 1.133851590176645E7, 29 subDomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'],
19 ymax: 4382058.3945608605,
20 "spatialReference": {
21 "wkid": 3857
22 }
23 }); 30 });
24 31 //天地图 标注 电子地图
25 var basemap = new Basemap({ 32 const tiledLayer_poi = new WebTileLayer({
26 baseLayers: [ 33 urlTemplate:
27 new MapImageLayer({ 34 'http://{subDomain}.tianditu.gov.cn/DataServer?T=cva_w&x={col}&y={row}&l={level}&tk=b46395ce4ec77f490158eebe439ac559',
28 url: "https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer", 35 subDomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'],
29 title: "Basemap"
30 })
31 ],
32 title: "basemap",
33 id: "basemap"
34 }); 36 });
35 var map = new Map({ 37 // 创建地图实例
36 basemap: basemap 38 const ext = new Extent({
39 xmin: 1.1332182150213555E7,
40 ymin: 4379415.470661429,
41 xmax: 1.1339935515720293E7,
42 ymax: 4383168.328167147,
43 spatialReference: 3857
37 }); 44 });
38 var view = new MapView({ 45 var myMap = new Map();
39 container: "map", 46 var myView = new MapView({
40 map: map, 47 container: 'map',
41 constraints: { 48 map: myMap,
42 lods: TileInfo.create().lods 49 extent: ext,
43 }, 50 });
44 zoom: 12 51 myView.ui._removeComponents(['attribution']); // 移除地图来源信息
52 myMap.add(tiledLayer);
53 myMap.add(tiledLayer_poi);
54 var dt = 'dianzi';
55 $('#trigger').attr('src', basemapIcon.dzdt);
56 $(function () {
57 $('#trigger').click(function () {
58 if (dt === 'yingxiang') {
59 $('#trigger').attr('src', basemapIcon.dzdt);
60 myMap.remove(tiledLayer);
61 myMap.remove(tiledLayer_poi);
62 myMap.add(layer_electronicMap);
63 dt = 'dianzi';
64 } else if (dt === 'dianzi') {
65 $('#trigger').attr('src', basemapIcon.yxdt);
66 myMap.remove(layer_electronicMap);
67 myMap.add(tiledLayer);
68 myMap.add(tiledLayer_poi);
69 dt = 'yingxiang';
70 }
71 });
45 }); 72 });
46 }); 73 });
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,18 +8,33 @@ ...@@ -8,18 +8,33 @@
8 <script src="../../../../js/arcgis_js_api/init.js"></script> 8 <script src="../../../../js/arcgis_js_api/init.js"></script>
9 <script src="js/widget.js"></script> 9 <script src="js/widget.js"></script>
10 <style type="text/css"> 10 <style type="text/css">
11 #map { 11 html, body {
12 margin: 0;
12 width: 100%; 13 width: 100%;
13 height: 900px; 14 height: 100%;
14 border: #0a36e9 solid 1px; 15 overflow: hidden;
16 }
17
18 #map .esri-ui {
19 display: none;
20 }
21
22 .esri-view .esri-display-object, .esri-view .esri-bitmap {
23 position: absolute;
24 border: none;
25 margin: 0;
26 padding: 0;
27 -webkit-user-drag: none;
28 -webkit-user-select: none;
15 } 29 }
16 </style> 30 </style>
17 </head> 31 </head>
18 <body> 32 <body>
19 <div style=" position: absolute; right: 5px; top: 5px; z-index: 99;margin: 10px"> 33 <div style=" position: absolute; right: 5px; top: 5px; z-index: 99;">
20 <img id="trigger" style=" width: 50px; "> 34 <img id="trigger" src="" style=" width: 50px; ">
21 </div> 35 </div>
22 <div id="map"> 36 <div id="map" style="height: 250px; max-height: 250px">
37
23 </div> 38 </div>
24 </body> 39 </body>
25 </html> 40 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2059,7 +2059,7 @@ require([ ...@@ -2059,7 +2059,7 @@ require([
2059 2059
2060 let layer_electronicMap = new MapImageLayer({ 2060 let layer_electronicMap = new MapImageLayer({
2061 //url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer' // 电子地图 2061 //url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer' // 电子地图
2062 url: 'https://192.168.5.143:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 电子地图 2062 url: 'https://192.168.3.194:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 电子地图
2063 sublayers: [ 2063 sublayers: [
2064 { 2064 {
2065 id: 0, 2065 id: 0,
......
...@@ -305,31 +305,16 @@ tr td:first-child { ...@@ -305,31 +305,16 @@ tr td:first-child {
305 <a class="bumpbox_white">退件办结</a> 305 <a class="bumpbox_white">退件办结</a>
306 <!-- 结束改为退件办结 2018年12月5日 yyl--> 306 <!-- 结束改为退件办结 2018年12月5日 yyl-->
307 </button> 307 </button>
308 <!-- <button id="sendBtn" class="btn btn-info " type="button" -->
309 <!-- onclick="batchSendClick()"> -->
310 <!-- <span class="glyphicon glyphicon-send" style="font-size: 15px"></span> <a -->
311 <!-- class="bumpbox_white">发送</a> -->
312 <!-- </button> -->
313 <button id="continueProject" class="btn buttonStatusStyle disabled" 308 <button id="continueProject" class="btn buttonStatusStyle disabled"
314 type="button" style="display: none;" onclick="openlayer_continue()"> 309 type="button" style="display: none;" onclick="openlayer_continue()">
315 <span class="glyphicon glyphicon-play-circle" 310 <span class="glyphicon glyphicon-play-circle"
316 style="font-size: 15px"></span> <a class="bumpbox_white">续办</a> 311 style="font-size: 15px"></span> <a class="bumpbox_white">续办</a>
317 </button> 312 </button>
318 <!-- <button class="btn btn-info " type="button" -->
319 <!-- onclick="openlayer_type()" disabled="disabled"> -->
320 <!-- <span class="glyphicon glyphicon-pause" style="font-size: 15px"></span> <a -->
321 <!-- class="bumpbox_white">暂停</a> -->
322 <!-- </button> -->
323 <button id="journal" class="btn buttonStatusStyle disabled" 313 <button id="journal" class="btn buttonStatusStyle disabled"
324 type="button" style="display: none;" onclick="openJournal()"> 314 type="button" style="display: none;" onclick="openJournal()">
325 <span class="glyphicon glyphicon-list-alt" style="font-size: 15px"></span> 315 <span class="glyphicon glyphicon-list-alt" style="font-size: 15px"></span>
326 <a class="bumpbox_white">日志</a> 316 <a class="bumpbox_white">日志</a>
327 </button> 317 </button>
328 <!-- <button class="btn btn-info " type="button" disabled="disabled" -->
329 <!-- onclick="openProject()"> -->
330 <!-- <span class="icon-comments" style="font-size: 15px"></span> <a -->
331 <!-- class="bumpbox_white">上会</a> -->
332 <!-- </button> -->
333 <button id="projectTreebtn" class="btn buttonStatusStyle disabled" 318 <button id="projectTreebtn" class="btn buttonStatusStyle disabled"
334 type="button" style="display: none;" onclick="openlayer_tree()"> 319 type="button" style="display: none;" onclick="openlayer_tree()">
335 <span class="glyphicon glyphicon-tree-conifer" 320 <span class="glyphicon glyphicon-tree-conifer"
...@@ -350,12 +335,6 @@ tr td:first-child { ...@@ -350,12 +335,6 @@ tr td:first-child {
350 class="glyphicon glyphicon-plus bindingAssignee" title="选择类型" 335 class="glyphicon glyphicon-plus bindingAssignee" title="选择类型"
351 onclick="selectProjecType()"></a> 336 onclick="selectProjecType()"></a>
352 </div> 337 </div>
353 <%--<div class="search" style="position: relative;">
354 <label>业务类别</label> <select id="documentType" onchange="changeType()">
355 <option>所有</option>
356 <option v-for="option in options" v-bind:value="option.value">{{option.text}}</option>
357 </select>
358 </div>--%>
359 </div> 338 </div>
360 <div class="clearboth"></div> 339 <div class="clearboth"></div>
361 340
...@@ -363,9 +342,6 @@ tr td:first-child { ...@@ -363,9 +342,6 @@ tr td:first-child {
363 342
364 <!-- 以下更改lhy --> 343 <!-- 以下更改lhy -->
365 <div id="workingsTabDiv"> 344 <div id="workingsTabDiv">
366 <!-- <div id="workingsTabDiv"
367 style="min-height: 60px; overflow-x: hidden; overflow-y: auto; "> -->
368
369 345
370 </div> 346 </div>
371 <!-- 以上更改 --> 347 <!-- 以上更改 -->
...@@ -375,34 +351,6 @@ tr td:first-child { ...@@ -375,34 +351,6 @@ tr td:first-child {
375 <div id="page" style="float: right"></div> 351 <div id="page" style="float: right"></div>
376 </div> 352 </div>
377 353
378 <!-- <div id="page" style="float: right"></div> -->
379
380 <!-- <div id="nvaTab" class="data-list" style="margin-top:10px;display:none">
381 <div style="width: 100%;" dir="ltr" id="gbox_gridTable"
382 class="ui-jqgrid ui-widget ui-widget-content ui-corner-all">
383
384 <div style="width: 100%;" id="gview_gridTable"
385 class="ui-jqgrid-view">
386
387 <div id="dataTableDiv" class="ui-state-default ui-jqgrid-hdiv" style="width: 100%;">
388 <table class="table datatable">
389
390 </table>
391 <div class="nav-page">
392 <div>
393 共<span id="total_records"></span>条，共<span id="total_page"></span>页
394 </div>
395 <nav style="cursor:pointer;">
396 <ul class="pagination">
397 </ul>
398 </nav>
399 </div>
400
401 </div>
402 </div>
403 </div>
404 </div> -->
405
406 <div id="msg" 354 <div id="msg"
407 style="display: none; position: absolute; top: 50%; left: 50%;"> 355 style="display: none; position: absolute; top: 50%; left: 50%;">
408 <div 356 <div
......