Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
6d1abd58 by 焦小希
Options

Merge branch '3ddc' of http://yun.pashanhoo.com:9090/xian-java/fontweb-dc into 3ddc

2 parents 65b96fd6 223a6124
Inline Side-by-side
Showing 3 changed files with 91 additions and 11 deletions
......@@ -63,7 +63,7 @@
<!-- <input id="searchtxt" type="text" placeholder="地名、地址、道路" onfocus="this.placeholder=''" onblur="this.placeholder='地名、地址、道路'"
/> -->
<!-- FIXME: ZYS -->
<input id="searchtxt" type="text" placeholder="地名、地址、道路" />
<input id="searchtxt" type="text" placeholder="地名、地址、道路" style="color: #0e0e0e"/>
<!-- END -->
</div>
<div class="jimu-widget-Search-searchbtn">
......@@ -104,7 +104,7 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li class="layui-this">策划生成</li>
<li>行政审批</li>
<!-- <li>行政审批</li>-->
<!-- <li>批后监管</li>-->
</ul>
<div class="layui-tab-content">
......
......@@ -76,6 +76,7 @@ body,
background: none;
margin-left: -26px;
padding-left: 8px;
color: #151313;
}
.jimu-widget-searchtxt input::-webkit-input-placeholder{
color: black;
......@@ -280,6 +281,7 @@ body,
.layui-tab-brief>.layui-tab-title .layui-this {
color: #1890FF;
font-weight: 600;
text-align: left;
}
.layui-tab-brief>.layui-tab-title .layui-this::after {
......@@ -294,9 +296,11 @@ body,
.container-right-title-content {
display: flex;
width: 100%;
padding: 24px 8px 24px 8px;
padding: 24px 20px;
border-bottom: 1px solid rgba(0, 0, 0, 0.06);
box-sizing: border-box;
align-items: center;
justify-content:space-between;
}
.container-right-title-content-item {
......@@ -708,7 +712,7 @@ body,
.container-right .layui-tab-title li{
width: 50% !important;
width: 100% !important;
}
.selected-border {
......
......@@ -183,7 +183,7 @@
this.initTable();
this.initChscCharts();
// this.initXmlxtjCharts();
this.getXmlztjData('2');
this.getXmlztjData('1');
$(window).resize(() => {
this.table.reload('dtstbgTest', {
height: window.innerHeight - $('#dtstbg').siblings('.container-right-content-header-left')[0].offsetTop - 280,
......@@ -267,10 +267,11 @@
self.setCell();
// 监听表格
this.table.on('row(test)', function (obj) {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": obj.data.id + ''
}).then(res => {
self.setCell();
debugger
// let projlocate = JSON.parse(res.data.projectLayers[0].geom);
// locateProj(projlocate.coordinates[0]);
// function locateProj(val) {
......@@ -324,9 +325,7 @@
self.myView.map.add(self.highlight);
self.myView.extent = graphic.geometry.extent
self.myView.zoom = self.myView.zoom - 1;
}
});
});
// 监听详情
......@@ -371,6 +370,7 @@
* @param item
*/
chscId(item, index) {
this.getXmlztjData(item.id);
this.chscbg();
this.fName = item.periodName;
this.fId = item.id;
......@@ -438,7 +438,7 @@
// projectIds.push(res.data[i].id);
// }
//
// axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', {
// axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', {
// "projectIds": projectIds
// }).then(res => {
// for(var i = 0; i < res.data.length; i++) {
......@@ -493,7 +493,7 @@
}
this.table.on('row(test)', function (obj) {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": obj.data.id + ''
}).then(res => {
// let geo = res.data.projectLayers[0].geom;
......@@ -620,12 +620,14 @@
for(let i = 0; i < length; i++) {
arr_ids.push(res.data.list[i].id + '');
}
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', {
"projectIds": arr_ids
}).then(results => {
let arrID = [], rings = [], projectPolygon;
let projectcodeArr = [];
for(let i = 0; i < results.data.length; i++) {
arrID.push(JSON.parse(results.data[i].st_asgeojson).coordinates[0]);
projectcodeArr.push(results.data[i].projectcode);
}
if(arrID.length) {
for(let i = 0; i < arrID.length; i++) {
......@@ -643,6 +645,7 @@
type: "simple-fill",
color: [255, 87, 34, 0 ],
style: "solid",
projectcode:projectcodeArr[i],
outline: {
color: "red",
width: 1
......@@ -674,6 +677,75 @@
self.myView.zoom = self.myView.zoom - 1
self.myView.on("click", (event) => {
self.myView.hitTest(event).then((res) => {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": res.results[0].graphic.symbol.projectcode + ''
}).then(res => {
self.setCell();
if(!res.data) { layer.msg('暂无数据'); return; }
self.highlight && self.highlight.removeAll()
self.myView.map.remove(this.highlight);
var geom=JSON.parse(res.data.projectLayers[0].geom);
openLandByGeom(geom);
function openLandByGeom(geom){
var pl=null;
var sfs=null;
pl=new Polygon();
pl.rings=geom.coordinates[0];
sfs = new SimpleFillSymbol({
color: [ 0, 0, 0, 0 ],
style: "solid",
outline: {
color: [0, 197, 205],
width: 2
}
});
pl.spatialReference=4545;
//绑定模板
self.highlight = new GraphicsLayer({
popupTemplate: null,
// minScale: 10000,
});
var graphic = new Graphic({
attributes: null,
geometry: pl,
symbol: sfs
});
self.highlight.add(graphic);
self.myView.map.add(self.highlight);
self.myView.extent = graphic.geometry.extent
self.myView.zoom = self.myView.zoom - 1;
}
});
$.ajax({
type: "POST",
url: CONF_NEWGHSC_SERVERURL + '/bz/getlcXx?id=' + res.results[0].graphic.symbol.projectcode,
contentType: 'application/json;charset=utf-8',
dataType: 'json',
success: function (res) {
var res = res.data[0];
var _data = {
PROJECTID: res.projectId,
PROJECTSTATUS: res.projectStatus,
ACTIVITYNAME: res.activityName,
PROJECTCODE: res.projectCode,
TASKID: res.taskId,
INSTANCEID: res.instanceId,
PROJECTNAME: res.projectName,
FLOWREVISIONID: res.flowRevisionId,
FLOWITEMTYPE: res.flowItemType,
FLOWVERSION: '2.0'
};
window.parent.listName = '已办项目'
openApproveDetail(_data);
}
});
// event.mapPoint.spatialReference.wkid
})
});
}
});
},
......@@ -886,14 +958,17 @@
}).then(res => {
for (var i = 0; i < res.data.data.length; i++) {
let obj = {};
if(res.data.data[i].periodName=='项目储备' || res.data.data[i].periodName=='项目策划' || res.data.data[i].periodName=='前期计划&用地实施'){
obj.value = res.data.data[i].count;
obj.name = res.data.data[i].periodName;
obj.zs = res.data.data[i].count;
obj.fid = res.data.data[i].id;
arr.push(obj);
}
}
this.echartData.chsc = arr;
})
console.log('this.chscChartOpt',this.chscChartOpt)
this.chscChartOpt = {
tooltip: {
trigger: 'item',
......@@ -978,6 +1053,7 @@
series.push({
name: ele.XMLX ? ele.XMLX : '-' ,
type: 'bar',
barWidth: '10%',
itemStyle: {
normal: {
color: color[index]
......