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({
}).then(res => {
debugger
this.total=res.data.data.total;
this.tabaledata = res.data.data.Data[0];
let data=res.data.data.Data;
for (let i=0;i<data.length;i++){
for (let j=0;j<data[i].length;j++){
this.tabaledata.push( data[i][[j]]);
}
}
}).catch(res=>{
console.log(res)
......@@ -64,6 +69,7 @@ var self = new Vue({
},
click(val) {
this.isActive = val
console.log(val)
},
openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') {
var unique = uuid();
......
......@@ -95,7 +95,12 @@ var self = new Vue({
}).then(res => {
console.log(res)
this.total=res.data.total;
this.tabaledata = res.data.data.Data[0];
let data=res.data.data.Data;
for (let i=0;i<data.length;i++){
for (let j=0;j<data[i].length;j++){
this.tabaledata.push( data[i][[j]]);
}
}
}).catch(res=>{
console.log(res)
});
......
......@@ -5,7 +5,7 @@ var self = new Vue({
search:'',
projectId:null,
userId:null,
flowid: 't1001_8a8610de737b99270173937337e00133',
flowid: 't1001_8a8610d86117e3b401611848a8690000',
userName: '案件查处',
pageNum:1,
pageSize:2,
......@@ -57,8 +57,15 @@ var self = new Vue({
}
}).then(res => {
this.total=res.data.total;
this.tabaledata =res.data.data.Data[0];
}).catch();
let data=res.data.data.Data;
for (let i=0;i<data.length;i++){
for (let j=0;j<data[i].length;j++){
this.tabaledata.push( data[i][[j]]);
}
}
});
},
clickData(row){
......
......@@ -5,102 +5,13 @@ var self = new Vue({
search:'',
projectId:null,
userId:null,
flowid: 't1001_8a8610de737b99270173937337e00133',
flowid: 't1001_8a8610d86117e3b401611848a8690000',
userName: '案件查处',
pageNum:1,
pageSize:2,
total:0,
// 表格数据
tabaledata:[
/*{
xmbh:'QJ202000027',
xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
djbh:'GX3-18-25',
ydmj:'87.608',
zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以南',
tdyt:'住宅',
zrdw:'高新分局',
ssqy:'高新分局',
cjsj:'2020-07-05'
},
{
xmbh:'QJ202000028',
xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
djbh:'GX3-18-25',
ydmj:'87.608',
zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
tdyt:'商铺',
zrdw:'高新分局',
ssqy:'高新分局',
cjsj:'2020-07-05'
},
{
xmbh:'QJ202000028',
xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
djbh:'GX3-18-25',
ydmj:'87.608',
zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
tdyt:'商铺',
zrdw:'高新分局',
ssqy:'高新分局',
cjsj:'2020-07-05'
},
{
xmbh:'QJ202000028',
xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
djbh:'GX3-18-25',
ydmj:'87.608',
zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
tdyt:'商铺',
zrdw:'高新分局',
ssqy:'高新分局',
cjsj:'2020-07-05'
},
{
xmbh:'QJ202000028',
xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
djbh:'GX3-18-25',
ydmj:'87.608',
zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
tdyt:'商铺',
zrdw:'高新分局',
ssqy:'高新分局',
cjsj:'2020-07-05'
},
{
xmbh:'QJ202000028',
xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
djbh:'GX3-18-25',
ydmj:'87.608',
zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
tdyt:'商铺',
zrdw:'高新分局',
ssqy:'高新分局',
cjsj:'2020-07-05'
},
{
xmbh:'QJ202000028',
xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
djbh:'GX3-18-25',
ydmj:'87.608',
zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
tdyt:'商铺',
zrdw:'高新分局',
ssqy:'高新分局',
cjsj:'2020-07-05'
},
{
xmbh:'QJ202000028',
xmmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
djbh:'GX3-18-25',
ydmj:'87.608',
zdwz:'高新区纬二十六路以北,西太路以西,纬二十四路以北',
tdyt:'商铺',
zrdw:'碑林分局',
ssqy:'碑林分局',
cjsj:'2020-07-05'
},*/
],
tabaledata:[],
multipleSelection:[]
}
},
......@@ -132,9 +43,13 @@ var self = new Vue({
userName: this.userName,
}
}).then(res => {
debugger
/* this.total=res.data.Data.total;*/
this.tabaledata = res.data.data.Data[0];
let data=res.data.data.Data;
for (let i=0;i<data.length;i++){
for (let j=0;j<data[i].length;j++){
this.tabaledata.push( data[i][[j]]);
}
}
})
},
......