82f3f4c1 by 焦小希

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

2 parents 188d1562 bb6a331b
...@@ -44,7 +44,12 @@ var self = new Vue({ ...@@ -44,7 +44,12 @@ var self = new Vue({
44 }).then(res => { 44 }).then(res => {
45 debugger 45 debugger
46 this.total=res.data.data.total; 46 this.total=res.data.data.total;
47 this.tabaledata = res.data.data.Data[0]; 47 let data=res.data.data.Data;
48 for (let i=0;i<data.length;i++){
49 for (let j=0;j<data[i].length;j++){
50 this.tabaledata.push( data[i][[j]]);
51 }
52 }
48 53
49 }).catch(res=>{ 54 }).catch(res=>{
50 console.log(res) 55 console.log(res)
...@@ -64,6 +69,7 @@ var self = new Vue({ ...@@ -64,6 +69,7 @@ var self = new Vue({
64 }, 69 },
65 click(val) { 70 click(val) {
66 this.isActive = val 71 this.isActive = val
72 console.log(val)
67 }, 73 },
68 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') { 74 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') {
69 var unique = uuid(); 75 var unique = uuid();
......
...@@ -95,7 +95,12 @@ var self = new Vue({ ...@@ -95,7 +95,12 @@ var self = new Vue({
95 }).then(res => { 95 }).then(res => {
96 console.log(res) 96 console.log(res)
97 this.total=res.data.total; 97 this.total=res.data.total;
98 this.tabaledata = res.data.data.Data[0]; 98 let data=res.data.data.Data;
99 for (let i=0;i<data.length;i++){
100 for (let j=0;j<data[i].length;j++){
101 this.tabaledata.push( data[i][[j]]);
102 }
103 }
99 }).catch(res=>{ 104 }).catch(res=>{
100 console.log(res) 105 console.log(res)
101 }); 106 });
......
...@@ -5,7 +5,7 @@ var self = new Vue({ ...@@ -5,7 +5,7 @@ var self = new Vue({
5 search:'', 5 search:'',
6 projectId:null, 6 projectId:null,
7 userId:null, 7 userId:null,
8 flowid: 't1001_8a8610de737b99270173937337e00133', 8 flowid: 't1001_8a8610d86117e3b401611848a8690000',
9 userName: '案件查处', 9 userName: '案件查处',
10 pageNum:1, 10 pageNum:1,
11 pageSize:2, 11 pageSize:2,
...@@ -57,8 +57,15 @@ var self = new Vue({ ...@@ -57,8 +57,15 @@ var self = new Vue({
57 } 57 }
58 }).then(res => { 58 }).then(res => {
59 this.total=res.data.total; 59 this.total=res.data.total;
60 this.tabaledata =res.data.data.Data[0]; 60 let data=res.data.data.Data;
61 }).catch(); 61 for (let i=0;i<data.length;i++){
62 for (let j=0;j<data[i].length;j++){
63 this.tabaledata.push( data[i][[j]]);
64 }
65 }
66
67
68 });
62 69
63 }, 70 },
64 clickData(row){ 71 clickData(row){
......
...@@ -5,102 +5,13 @@ var self = new Vue({ ...@@ -5,102 +5,13 @@ var self = new Vue({
5 search:'', 5 search:'',
6 projectId:null, 6 projectId:null,
7 userId:null, 7 userId:null,
8 flowid: 't1001_8a8610de737b99270173937337e00133', 8 flowid: 't1001_8a8610d86117e3b401611848a8690000',
9 userName: '案件查处', 9 userName: '案件查处',
10 pageNum:1, 10 pageNum:1,
11 pageSize:2, 11 pageSize:2,
12 total:0, 12 total:0,
13 // 表格数据 13 // 表格数据
14 tabaledata:[ 14 tabaledata:[],
15 /*{
16 xmbh:'QJ202000027',
17 xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
18 djbh:'GX3-18-25',
19 ydmj:'87.608',
20 zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以南',
21 tdyt:'住宅',
22 zrdw:'高新分局',
23 ssqy:'高新分局',
24 cjsj:'2020-07-05'
25 },
26 {
27 xmbh:'QJ202000028',
28 xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
29 djbh:'GX3-18-25',
30 ydmj:'87.608',
31 zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
32 tdyt:'商铺',
33 zrdw:'高新分局',
34 ssqy:'高新分局',
35 cjsj:'2020-07-05'
36 },
37 {
38 xmbh:'QJ202000028',
39 xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
40 djbh:'GX3-18-25',
41 ydmj:'87.608',
42 zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
43 tdyt:'商铺',
44 zrdw:'高新分局',
45 ssqy:'高新分局',
46 cjsj:'2020-07-05'
47 },
48 {
49 xmbh:'QJ202000028',
50 xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
51 djbh:'GX3-18-25',
52 ydmj:'87.608',
53 zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
54 tdyt:'商铺',
55 zrdw:'高新分局',
56 ssqy:'高新分局',
57 cjsj:'2020-07-05'
58 },
59 {
60 xmbh:'QJ202000028',
61 xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
62 djbh:'GX3-18-25',
63 ydmj:'87.608',
64 zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
65 tdyt:'商铺',
66 zrdw:'高新分局',
67 ssqy:'高新分局',
68 cjsj:'2020-07-05'
69 },
70 {
71 xmbh:'QJ202000028',
72 xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
73 djbh:'GX3-18-25',
74 ydmj:'87.608',
75 zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
76 tdyt:'商铺',
77 zrdw:'高新分局',
78 ssqy:'高新分局',
79 cjsj:'2020-07-05'
80 },
81 {
82 xmbh:'QJ202000028',
83 xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
84 djbh:'GX3-18-25',
85 ydmj:'87.608',
86 zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
87 tdyt:'商铺',
88 zrdw:'高新分局',
89 ssqy:'高新分局',
90 cjsj:'2020-07-05'
91 },
92 {
93 xmbh:'QJ202000028',
94 xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
95 djbh:'GX3-18-25',
96 ydmj:'87.608',
97 zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
98 tdyt:'商铺',
99 zrdw:'碑林分局',
100 ssqy:'碑林分局',
101 cjsj:'2020-07-05'
102 },*/
103 ],
104 multipleSelection:[] 15 multipleSelection:[]
105 } 16 }
106 }, 17 },
...@@ -132,9 +43,13 @@ var self = new Vue({ ...@@ -132,9 +43,13 @@ var self = new Vue({
132 userName: this.userName, 43 userName: this.userName,
133 } 44 }
134 }).then(res => { 45 }).then(res => {
135 debugger
136 /* this.total=res.data.Data.total;*/ 46 /* this.total=res.data.Data.total;*/
137 this.tabaledata = res.data.data.Data[0]; 47 let data=res.data.data.Data;
48 for (let i=0;i<data.length;i++){
49 for (let j=0;j<data[i].length;j++){
50 this.tabaledata.push( data[i][[j]]);
51 }
52 }
138 }) 53 })
139 54
140 }, 55 },
......