Skip to content

蔡永松 / fontweb-dc

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

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

2 parents c27af4e9 09ee7373
Inline Side-by-side
Showing 4 changed files with 12 additions and 12 deletions
......@@ -209,7 +209,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f
done: (res, curr, count) => {
// 监听表格
this.table.on('row(test)', function (obj) {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": obj.data.id + ''
}).then(res => {
let projlocate = JSON.parse(res.data.projectLayers[0].geom);
......@@ -316,7 +316,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f
projectIds.push(res.data[i].id);
}
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', {
"projectIds": projectIds
}).then(res => {
for(var i = 0; i < res.data.length; i++) {
......@@ -360,7 +360,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f
this.table.on('row(test)', function (obj) {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": obj.data.id + ''
}).then(res => {
// let geo = res.data.projectLayers[0].geom;
......
......@@ -252,7 +252,7 @@
done: (res, curr, count) => {
// 监听表格
this.table.on('row(test)', function (obj) {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": obj.data.id + ''
}).then(res => {
let projlocate = JSON.parse(res.data.projectLayers[0].geom);
......@@ -354,7 +354,7 @@
},
done: (res, curr, count) => {
this.table.on('row(test)', function (obj) {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": obj.data.id + ''
}).then(res => {
let geo = res.data.projectLayers[0].geom;
......@@ -435,7 +435,7 @@
for(let i = 0; i < length; i++) {
arr_ids.push(res.data.list[i].id + '');
}
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', {
"projectIds": arr_ids
}).then(results => {
let arrID = [];
......
......@@ -154,10 +154,10 @@ var self = new Vue({
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.id;
var projectid = data.PROJECTID;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = data.stats ? data.stats : '';
var stats = 'projecting';
var projecttype = data.FLOWNAME;
var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
var FLOWREVISIONID = data.FLOWREVISIONID;
......
......@@ -267,7 +267,7 @@
self.setCell();
// 监听表格
this.table.on('row(test)', function (obj) {
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": obj.data.id + ''
}).then(res => {
self.setCell();
......@@ -438,7 +438,7 @@
// projectIds.push(res.data[i].id);
// }
//
// axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', {
// axios.post(CONF_GIS_ONEMAP + '/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_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
"projectCode": obj.data.id + ''
}).then(res => {
// let geo = res.data.projectLayers[0].geom;
......@@ -620,7 +620,7 @@
for(let i = 0; i < length; i++) {
arr_ids.push(res.data.list[i].id + '');
}
axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', {
axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', {
"projectIds": arr_ids
}).then(results => {
let arrID = [], rings = [], projectPolygon;
......