89013ff3 by weimo934

修改待办已办

1 parent 6e2d016c
...@@ -209,7 +209,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f ...@@ -209,7 +209,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f
209 done: (res, curr, count) => { 209 done: (res, curr, count) => {
210 // 监听表格 210 // 监听表格
211 this.table.on('row(test)', function (obj) { 211 this.table.on('row(test)', function (obj) {
212 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', { 212 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
213 "projectCode": obj.data.id + '' 213 "projectCode": obj.data.id + ''
214 }).then(res => { 214 }).then(res => {
215 let projlocate = JSON.parse(res.data.projectLayers[0].geom); 215 let projlocate = JSON.parse(res.data.projectLayers[0].geom);
...@@ -316,7 +316,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f ...@@ -316,7 +316,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f
316 projectIds.push(res.data[i].id); 316 projectIds.push(res.data[i].id);
317 } 317 }
318 318
319 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', { 319 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', {
320 "projectIds": projectIds 320 "projectIds": projectIds
321 }).then(res => { 321 }).then(res => {
322 for(var i = 0; i < res.data.length; i++) { 322 for(var i = 0; i < res.data.length; i++) {
...@@ -360,7 +360,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f ...@@ -360,7 +360,7 @@ exportResultRequest=' <span class="export-wait" style="color: #ccc;"><i class="f
360 360
361 361
362 this.table.on('row(test)', function (obj) { 362 this.table.on('row(test)', function (obj) {
363 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', { 363 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
364 "projectCode": obj.data.id + '' 364 "projectCode": obj.data.id + ''
365 }).then(res => { 365 }).then(res => {
366 // let geo = res.data.projectLayers[0].geom; 366 // let geo = res.data.projectLayers[0].geom;
......
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
252 done: (res, curr, count) => { 252 done: (res, curr, count) => {
253 // 监听表格 253 // 监听表格
254 this.table.on('row(test)', function (obj) { 254 this.table.on('row(test)', function (obj) {
255 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', { 255 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
256 "projectCode": obj.data.id + '' 256 "projectCode": obj.data.id + ''
257 }).then(res => { 257 }).then(res => {
258 let projlocate = JSON.parse(res.data.projectLayers[0].geom); 258 let projlocate = JSON.parse(res.data.projectLayers[0].geom);
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
354 }, 354 },
355 done: (res, curr, count) => { 355 done: (res, curr, count) => {
356 this.table.on('row(test)', function (obj) { 356 this.table.on('row(test)', function (obj) {
357 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', { 357 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
358 "projectCode": obj.data.id + '' 358 "projectCode": obj.data.id + ''
359 }).then(res => { 359 }).then(res => {
360 let geo = res.data.projectLayers[0].geom; 360 let geo = res.data.projectLayers[0].geom;
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
435 for(let i = 0; i < length; i++) { 435 for(let i = 0; i < length; i++) {
436 arr_ids.push(res.data.list[i].id + ''); 436 arr_ids.push(res.data.list[i].id + '');
437 } 437 }
438 axios.post(CONF_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', { 438 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectLayersByPid', {
439 "projectIds": arr_ids 439 "projectIds": arr_ids
440 }).then(results => { 440 }).then(results => {
441 let arrID = []; 441 let arrID = [];
......
...@@ -139,10 +139,10 @@ var self = new Vue({ ...@@ -139,10 +139,10 @@ var self = new Vue({
139 jumpdetailPage(data) { 139 jumpdetailPage(data) {
140 var taskid = data.TASKID; 140 var taskid = data.TASKID;
141 var detailType = data.detailType; 141 var detailType = data.detailType;
142 var projectid = data.id; 142 var projectid = data.PROJECTID;
143 var flowInstanceId =data.INSTANCEID; 143 var flowInstanceId =data.INSTANCEID;
144 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME)); 144 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
145 var stats = data.stats ? data.stats : ''; 145 var stats = 'projecting';
146 var projecttype = data.FLOWNAME; 146 var projecttype = data.FLOWNAME;
147 var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS)); 147 var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
148 var FLOWREVISIONID = data.FLOWREVISIONID; 148 var FLOWREVISIONID = data.FLOWREVISIONID;
......
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
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_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', { 270 axios.post(CONF_GIS_ONEMAP + '/projectMap/getProjectMapAndProjectLayerOne', {
271 "projectCode": obj.data.id + '' 271 "projectCode": obj.data.id + ''
272 }).then(res => { 272 }).then(res => {
273 self.setCell(); 273 self.setCell();
...@@ -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_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', { 441 // axios.post(CONF_GIS_ONEMAP + '/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_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectMapAndProjectLayerOne', { 496 axios.post(CONF_GIS_ONEMAP + '/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,7 +620,7 @@ ...@@ -620,7 +620,7 @@
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_NEWGHSC_SERVERURL_2 + '/XAYZT/projectMap/getProjectLayersByPid', { 623 axios.post(CONF_GIS_ONEMAP + '/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;
......