diff --git a/src/views/xm/core/xmRptData/XmRptDataMng.vue b/src/views/xm/core/xmRptData/XmRptDataMng.vue
index 961540c6..fa7ce390 100644
--- a/src/views/xm/core/xmRptData/XmRptDataMng.vue
+++ b/src/views/xm/core/xmRptData/XmRptDataMng.vue
@@ -4,8 +4,7 @@
查询
-
-
+
diff --git a/src/views/xm/rpt/his/rptDataSelect.vue b/src/views/xm/rpt/his/rptDataSelect.vue
index eedaa1ea..67fcc0f0 100644
--- a/src/views/xm/rpt/his/rptDataSelect.vue
+++ b/src/views/xm/rpt/his/rptDataSelect.vue
@@ -1,12 +1,10 @@
-
-
- 查询
-
-
-
+
+ 我的
+
+
@@ -68,6 +66,7 @@ export default {
key: '',
startBizDate:'',
endBizDate:'',
+ myCreate:'',
},
xmRptDatas: [],//查询结果
pageInfo:{//分页数据
@@ -147,6 +146,9 @@ export default {
if(this.filters.key){
params.key=this.filters.key
}
+ if(this.filters.myCreate=='1'){
+ params.cuserid=this.userInfo.userid
+ }
if(this.filters.startBizDate){
params.startBizDate=this.filters.startBizDate
params.endBizDate=this.filters.endBizDate
diff --git a/src/views/xm/rpt/index/CompsCard.vue b/src/views/xm/rpt/index/CompsCard.vue
index c236da02..ef7a3d17 100644
--- a/src/views/xm/rpt/index/CompsCard.vue
+++ b/src/views/xm/rpt/index/CompsCard.vue
@@ -317,17 +317,10 @@ export default {
})
return;
}
- var compCfgListTemp=JSON.parse(JSON.stringify(this.compCfgList))
- compCfgListTemp.sort((i1,i2)=>{
- return i2.i-i1.i
- })
- var maxI=(compCfgListTemp.length>0?(compCfgListTemp[0].i+1):1);
- compCfgListTemp.sort((i1,i2)=>{
- return i2.y-i1.y
- })
- var maxY=(compCfgListTemp.length>0?(compCfgListTemp[0].y+6):0);
- var compCfg={...comp,i:maxI, x: 0, y: maxY, w: 12, h: 6,id:comp.compId+seq.sn()}
- this.compCfgList.push(compCfg)
+ var allCheckedList=this.$refs.compsSet.datas.filter(k=>k.isChecked)
+ var index=allCheckedList.findIndex(k=>k.compId==comp.compId)
+ var compCfg={...comp,id:comp.compId+seq.sn()}
+ this.compCfgList.splice(index,0,compCfg)
this.$nextTick(()=>{
setTimeout(()=>{
this.scrollToComp(compCfg)
@@ -436,7 +429,7 @@ export default {
},
onCompChange(compCfg,checked){
if(checked=='false'||!checked){
- var index=this.compCfgList.findIndex(k=>k.id==compCfg.id)
+ var index=this.compCfgList.findIndex(k=>k.compId==compCfg.compId)
if(index>=0){
this.compCfgList.splice(index,1)
}
diff --git a/src/views/xm/rpt/index/CompsCardHisDetail.vue b/src/views/xm/rpt/index/CompsCardHisDetail.vue
index 683b7fbe..de5368e6 100644
--- a/src/views/xm/rpt/index/CompsCardHisDetail.vue
+++ b/src/views/xm/rpt/index/CompsCardHisDetail.vue
@@ -130,9 +130,10 @@ export default {
})
return;
}
-
+ var allCheckedList=this.$refs.compsSet.datas.filter(k=>k.isChecked)
+ var index=allCheckedList.findIndex(k=>k.compId==comp.compId)
var compCfg={...comp,id:comp.compId+seq.sn()}
- this.compCfgList.push(compCfg)
+ this.compCfgList.splice(index,0,compCfg)
this.$nextTick(()=>{
setTimeout(()=>{
this.scrollToComp(compCfg)
diff --git a/src/views/xm/rpt/index/indexForHis.vue b/src/views/xm/rpt/index/indexForHis.vue
index 6e7003b3..fe19fe43 100644
--- a/src/views/xm/rpt/index/indexForHis.vue
+++ b/src/views/xm/rpt/index/indexForHis.vue
@@ -1,9 +1,11 @@
-
-
- 查询
+
+ 我的
+
+
+
@@ -12,12 +14,12 @@
-
+
{{scope.row.rptName}}
-
+
{{scope.row.bizDate}}
@@ -67,6 +69,7 @@ export default {
key: '',
startBizDate:'',
endBizDate:'',
+ myCreate:'0',
},
xmRptDatas: [],//查询结果
pageInfo:{//分页数据
@@ -150,6 +153,10 @@ export default {
params.startBizDate=this.filters.startBizDate
params.endBizDate=this.filters.endBizDate
}
+
+ if(this.filters.myCreate=='1'){
+ params.cuserid=this.userInfo.userid
+ }
this.load.list = true;
listXmRptData(params).then((res) => {
var tips=res.data.tips;