Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
223a6124 by weimo934
Options

更新监测评估代码

1 parent c1a66e0a
Inline Side-by-side
Showing 3 changed files with 91 additions and 11 deletions
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 <!-- <input id="searchtxt" type="text" placeholder="地名、地址、道路" onfocus="this.placeholder=''" onblur="this.placeholder='地名、地址、道路'" 63 <!-- <input id="searchtxt" type="text" placeholder="地名、地址、道路" onfocus="this.placeholder=''" onblur="this.placeholder='地名、地址、道路'"
64 /> --> 64 /> -->
65 <!-- FIXME: ZYS --> 65 <!-- FIXME: ZYS -->
66 <input id="searchtxt" type="text" placeholder="地名、地址、道路" /> 66 <input id="searchtxt" type="text" placeholder="地名、地址、道路" style="color: #0e0e0e"/>
67 <!-- END --> 67 <!-- END -->
68 </div> 68 </div>
69 <div class="jimu-widget-Search-searchbtn"> 69 <div class="jimu-widget-Search-searchbtn">
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> 104 <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
105 <ul class="layui-tab-title"> 105 <ul class="layui-tab-title">
106 <li class="layui-this">策划生成</li> 106 <li class="layui-this">策划生成</li>
107 <li>行政审批</li> 107 <!-- <li>行政审批</li>-->
108 <!-- <li>批后监管</li>--> 108 <!-- <li>批后监管</li>-->
109 </ul> 109 </ul>
110 <div class="layui-tab-content"> 110 <div class="layui-tab-content">
......
...@@ -76,6 +76,7 @@ body, ...@@ -76,6 +76,7 @@ body,
76 background: none; 76 background: none;
77 margin-left: -26px; 77 margin-left: -26px;
78 padding-left: 8px; 78 padding-left: 8px;
79 color: #151313;
79 } 80 }
80 .jimu-widget-searchtxt input::-webkit-input-placeholder{ 81 .jimu-widget-searchtxt input::-webkit-input-placeholder{
81 color: black; 82 color: black;
...@@ -280,6 +281,7 @@ body, ...@@ -280,6 +281,7 @@ body,
280 .layui-tab-brief>.layui-tab-title .layui-this { 281 .layui-tab-brief>.layui-tab-title .layui-this {
281 color: #1890FF; 282 color: #1890FF;
282 font-weight: 600; 283 font-weight: 600;
284 text-align: left;
283 } 285 }
284 286
285 .layui-tab-brief>.layui-tab-title .layui-this::after { 287 .layui-tab-brief>.layui-tab-title .layui-this::after {
...@@ -294,9 +296,11 @@ body, ...@@ -294,9 +296,11 @@ body,
294 .container-right-title-content { 296 .container-right-title-content {
295 display: flex; 297 display: flex;
296 width: 100%; 298 width: 100%;
297 padding: 24px 8px 24px 8px; 299 padding: 24px 20px;
298 border-bottom: 1px solid rgba(0, 0, 0, 0.06); 300 border-bottom: 1px solid rgba(0, 0, 0, 0.06);
299 box-sizing: border-box; 301 box-sizing: border-box;
302 align-items: center;
303 justify-content:space-between;
300 } 304 }
301 305
302 .container-right-title-content-item { 306 .container-right-title-content-item {
...@@ -708,7 +712,7 @@ body, ...@@ -708,7 +712,7 @@ body,
708 712
709 713
710 .container-right .layui-tab-title li{ 714 .container-right .layui-tab-title li{
711 width: 50% !important; 715 width: 100% !important;
712 } 716 }
713 717
714 .selected-border { 718 .selected-border {
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
183 this.initTable(); 183 this.initTable();
184 this.initChscCharts(); 184 this.initChscCharts();
185 // this.initXmlxtjCharts(); 185 // this.initXmlxtjCharts();
186 this.getXmlztjData('2'); 186 this.getXmlztjData('1');
187 $(window).resize(() => { 187 $(window).resize(() => {
188 this.table.reload('dtstbgTest', { 188 this.table.reload('dtstbgTest', {
189 height: window.innerHeight - $('#dtstbg').siblings('.container-right-content-header-left')[0].offsetTop - 280, 189 height: window.innerHeight - $('#dtstbg').siblings('.container-right-content-header-left')[0].offsetTop - 280,
...@@ -267,10 +267,11 @@ ...@@ -267,10 +267,11 @@
267 self.setCell(); 267 self.setCell();
268 // 监听表格 268 // 监听表格
269 this.table.on('row(test)', function (obj) { 269 this.table.on('row(test)', function (obj) {
270 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', { 270 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
271 "projectCode": obj.data.id + '' 271 "projectCode": obj.data.id + ''
272 }).then(res => { 272 }).then(res => {
273 self.setCell(); 273 self.setCell();
274 debugger
274 // let projlocate = JSON.parse(res.data.projectLayers[0].geom); 275 // let projlocate = JSON.parse(res.data.projectLayers[0].geom);
275 // locateProj(projlocate.coordinates[0]); 276 // locateProj(projlocate.coordinates[0]);
276 // function locateProj(val) { 277 // function locateProj(val) {
...@@ -324,9 +325,7 @@ ...@@ -324,9 +325,7 @@
324 self.myView.map.add(self.highlight); 325 self.myView.map.add(self.highlight);
325 self.myView.extent = graphic.geometry.extent 326 self.myView.extent = graphic.geometry.extent
326 self.myView.zoom = self.myView.zoom - 1; 327 self.myView.zoom = self.myView.zoom - 1;
327
328 } 328 }
329
330 }); 329 });
331 }); 330 });
332 // 监听详情 331 // 监听详情
...@@ -371,6 +370,7 @@ ...@@ -371,6 +370,7 @@
371 * @param item 370 * @param item
372 */ 371 */
373 chscId(item, index) { 372 chscId(item, index) {
373 this.getXmlztjData(item.id);
374 this.chscbg(); 374 this.chscbg();
375 this.fName = item.periodName; 375 this.fName = item.periodName;
376 this.fId = item.id; 376 this.fId = item.id;
...@@ -438,7 +438,7 @@ ...@@ -438,7 +438,7 @@
438 // projectIds.push(res.data[i].id); 438 // projectIds.push(res.data[i].id);
439 // } 439 // }
440 // 440 //
441 // axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', { 441 // axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', {
442 // "projectIds": projectIds 442 // "projectIds": projectIds
443 // }).then(res => { 443 // }).then(res => {
444 // for(var i = 0; i < res.data.length; i++) { 444 // for(var i = 0; i < res.data.length; i++) {
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
493 } 493 }
494 494
495 this.table.on('row(test)', function (obj) { 495 this.table.on('row(test)', function (obj) {
496 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', { 496 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
497 "projectCode": obj.data.id + '' 497 "projectCode": obj.data.id + ''
498 }).then(res => { 498 }).then(res => {
499 // let geo = res.data.projectLayers[0].geom; 499 // let geo = res.data.projectLayers[0].geom;
...@@ -620,12 +620,14 @@ ...@@ -620,12 +620,14 @@
620 for(let i = 0; i < length; i++) { 620 for(let i = 0; i < length; i++) {
621 arr_ids.push(res.data.list[i].id + ''); 621 arr_ids.push(res.data.list[i].id + '');
622 } 622 }
623 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', { 623 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', {
624 "projectIds": arr_ids 624 "projectIds": arr_ids
625 }).then(results => { 625 }).then(results => {
626 let arrID = [], rings = [], projectPolygon; 626 let arrID = [], rings = [], projectPolygon;
627 let projectcodeArr = [];
627 for(let i = 0; i < results.data.length; i++) { 628 for(let i = 0; i < results.data.length; i++) {
628 arrID.push(JSON.parse(results.data[i].st_asgeojson).coordinates[0]); 629 arrID.push(JSON.parse(results.data[i].st_asgeojson).coordinates[0]);
630 projectcodeArr.push(results.data[i].projectcode);
629 } 631 }
630 if(arrID.length) { 632 if(arrID.length) {
631 for(let i = 0; i < arrID.length; i++) { 633 for(let i = 0; i < arrID.length; i++) {
...@@ -643,6 +645,7 @@ ...@@ -643,6 +645,7 @@
643 type: "simple-fill", 645 type: "simple-fill",
644 color: [255, 87, 34, 0 ], 646 color: [255, 87, 34, 0 ],
645 style: "solid", 647 style: "solid",
648 projectcode:projectcodeArr[i],
646 outline: { 649 outline: {
647 color: "red", 650 color: "red",
648 width: 1 651 width: 1
...@@ -674,6 +677,75 @@ ...@@ -674,6 +677,75 @@
674 677
675 self.myView.zoom = self.myView.zoom - 1 678 self.myView.zoom = self.myView.zoom - 1
676 679
680
681 self.myView.on("click", (event) => {
682 self.myView.hitTest(event).then((res) => {
683 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
684 "projectCode": res.results[0].graphic.symbol.projectcode + ''
685 }).then(res => {
686 self.setCell();
687 if(!res.data) { layer.msg('暂无数据'); return; }
688 self.highlight && self.highlight.removeAll()
689 self.myView.map.remove(this.highlight);
690 var geom=JSON.parse(res.data.projectLayers[0].geom);
691 openLandByGeom(geom);
692 function openLandByGeom(geom){
693 var pl=null;
694 var sfs=null;
695 pl=new Polygon();
696 pl.rings=geom.coordinates[0];
697 sfs = new SimpleFillSymbol({
698 color: [ 0, 0, 0, 0 ],
699 style: "solid",
700 outline: {
701 color: [0, 197, 205],
702 width: 2
703 }
704 });
705 pl.spatialReference=4545;
706 //绑定模板
707 self.highlight = new GraphicsLayer({
708 popupTemplate: null,
709 // minScale: 10000,
710 });
711 var graphic = new Graphic({
712 attributes: null,
713 geometry: pl,
714 symbol: sfs
715 });
716 self.highlight.add(graphic);
717 self.myView.map.add(self.highlight);
718 self.myView.extent = graphic.geometry.extent
719 self.myView.zoom = self.myView.zoom - 1;
720 }
721 });
722 $.ajax({
723 type: "POST",
724 url: CONF_NEWGHSC_SERVERURL + '/bz/getlcXx?id=' + res.results[0].graphic.symbol.projectcode,
725 contentType: 'application/json;charset=utf-8',
726 dataType: 'json',
727 success: function (res) {
728 var res = res.data[0];
729 var _data = {
730 PROJECTID: res.projectId,
731 PROJECTSTATUS: res.projectStatus,
732 ACTIVITYNAME: res.activityName,
733 PROJECTCODE: res.projectCode,
734 TASKID: res.taskId,
735 INSTANCEID: res.instanceId,
736 PROJECTNAME: res.projectName,
737 FLOWREVISIONID: res.flowRevisionId,
738 FLOWITEMTYPE: res.flowItemType,
739 FLOWVERSION: '2.0'
740 };
741 window.parent.listName = '已办项目'
742 openApproveDetail(_data);
743 }
744 });
745 // event.mapPoint.spatialReference.wkid
746 })
747 });
748
677 } 749 }
678 }); 750 });
679 }, 751 },
...@@ -886,14 +958,17 @@ ...@@ -886,14 +958,17 @@
886 }).then(res => { 958 }).then(res => {
887 for (var i = 0; i < res.data.data.length; i++) { 959 for (var i = 0; i < res.data.data.length; i++) {
888 let obj = {}; 960 let obj = {};
961 if(res.data.data[i].periodName=='项目储备' || res.data.data[i].periodName=='项目策划' || res.data.data[i].periodName=='前期计划&用地实施'){
889 obj.value = res.data.data[i].count; 962 obj.value = res.data.data[i].count;
890 obj.name = res.data.data[i].periodName; 963 obj.name = res.data.data[i].periodName;
891 obj.zs = res.data.data[i].count; 964 obj.zs = res.data.data[i].count;
892 obj.fid = res.data.data[i].id; 965 obj.fid = res.data.data[i].id;
893 arr.push(obj); 966 arr.push(obj);
894 } 967 }
968 }
895 this.echartData.chsc = arr; 969 this.echartData.chsc = arr;
896 }) 970 })
971 console.log('this.chscChartOpt',this.chscChartOpt)
897 this.chscChartOpt = { 972 this.chscChartOpt = {
898 tooltip: { 973 tooltip: {
899 trigger: 'item', 974 trigger: 'item',
...@@ -978,6 +1053,7 @@ ...@@ -978,6 +1053,7 @@
978 series.push({ 1053 series.push({
979 name: ele.XMLX ? ele.XMLX : '-' , 1054 name: ele.XMLX ? ele.XMLX : '-' ,
980 type: 'bar', 1055 type: 'bar',
1056 barWidth: '10%',
981 itemStyle: { 1057 itemStyle: {
982 normal: { 1058 normal: {
983 color: color[index] 1059 color: color[index]
......