monitor_v3 / anji-plus-report · Commits

Go to a project

Authored by 王涛
Commit 839c926a5bfa3e2f1c256054a0a30ebbdb2aa644 2 parents 9384e64e e3149715

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

sql 全部参数改为动态传参



See merge request !50
Inline Side-by-side
Showing 4 changed files with 66 additions and 43 deletions
... ... @@ -139,7 +139,12 @@ export default {
},
formData:{
handler(val){
this.formDataNew=val
this.formDataNew=val,
this.formDataNew.map(item=>{
if(!item.isDisplay){
item.isDisplay=1
}
})
},
deep:true
}
... ... @@ -207,6 +212,11 @@ export default {
setFormData(){
if(this.tableHeadInfos){
this.formDataNew=this.tableHeadInfos;
this.formDataNew.map(item=>{
if(!item.isDisplay){
item.isDisplay=1
}
})
}
},
//搜索指标
... ...
... ... @@ -110,7 +110,7 @@ export default {
for (let i = 0; i < this.userNameList.length; i++) {
contextData[this.userNameList[i].paramName] = this.userNameList[
i
].sampleItem;
].sampleItem+'';
}
let locationUrl=this.$route.query;
for(let key in contextData){
... ...
... ... @@ -31,12 +31,12 @@
</el-col>
<!-- && attrKey.attrKeyVal.includes(item.code)-->
</el-row>
<!-- <el-row class="basic-item 111" :style="[itemStyle,borderStlyeLast]" v-if="dataLength==informationData.length && informationData.length%2==0">
<el-row class="basic-item 111" :style="[itemStyle,borderStlyeLast]" v-if="informationData.length%2==0">
<el-col class="basic-border basic-item-title basic-flex" :span="10">
</el-col>
<el-col class="basic-border basic-flex basic-item-content" :span="14"><span></span>
</el-col>
</el-row>-->
</el-row>
</div>
</div>
... ... @@ -297,19 +297,19 @@
})
}
this.setDisplay();
this.dataLength=this.informationData.length;
console.log("this.dataLength",this.dataLength)
let addTableData=[];
this.informationDataAll.map((item,index)=>{
addTableData.push({
key:item.code,
name:item.name,
width:"50%",
isDisplay:item.isDisplay
// isDisplay:item.isDisplay,
state:item.state,
value:item.value
})
})
this.setDisplay();
this.$store.commit('CHANGW_HEAD_INFO', addTableData);
},
handlerDynamicData(data, refreshTime) {
... ... @@ -341,7 +341,6 @@
if (this.imgStyle.dataNum) {
this.informationData = this.informationDataAll.slice(0, this.imgStyle.dataNum);
}
this.dataLength=this.informationData.length;
let addTableData=[];
this.informationDataAll.map((item,index)=>{
addTableData.push({
... ... @@ -370,20 +369,31 @@
head.map(hv=>{
arr.push({
code:hv.key,
isDisplay:hv.isDisplay
name:hv.name,
isDisplay:hv.isDisplay,
state:hv.state,
value:hv.value
})
})
this.informationDataAll.map(item=>{
/*this.informationDataAll.map(item=>{
console.log("&&&&&&",item)
arr.map(hv=>{
if(item.code==hv.key){
if(item.code==hv.code){
console.log("***")
item.isDisplay=hv.isDisplay;
}
})
})
})*/
this.informationDataAll=arr;
/* for(let i=0;i<arr.length;i++){
if(arr[i].code==this.informationDataAll[i].code){
this.informationDataAll[i].isDisplay=arr[i].isDisplay;
}
}*/
if (this.imgStyle.dataNum) {
this.informationData = this.informationDataAll.slice(0, this.imgStyle.dataNum);
}
console.log(" this.informationData", this.informationData)
console.log(" this.informationData",head,arr,this.informationDataAll, this.informationData)
},
pressingTimes() {
this.pressingVisible = true;
... ...
... ... @@ -299,22 +299,24 @@ export default {
getEchartData(val) {
const data = this.queryEchartsData(val);
data.then(res => {
if(this.optionsData.dynamicData.contextData.isMore){
console.log("all")
this.listAll=res;
this.loadingAll = false;
if (this.listAll && this.listAll.length > 0) {
this.totalAll = this.listAll[0].lineCount;
}
}else{
// if(this.optionsData.dynamicData.contextData.isMore){
// console.log("all")
// this.listAll=res;
// this.loadingAll = false;
// this.loading = false;
// if (this.listAll && this.listAll.length > 0) {
// this.totalAll = this.listAll[0].lineCount;
// }
// }else{
console.log("111")
this.list = res;
this.loading = false;
this.loadingAll = false;
if (this.list && this.list.length > 0) {
this.total = this.list[0].lineCount;
}
}
// }
this.hackResetFun();
... ... @@ -400,34 +402,36 @@ export default {
let serviceTop = 44;
let hotelTop = 344;
if(e.target.scrollTop){
if (e.target.scrollTop > 44 && e.target.scrollTop < 344) {
if (e.target.scrollTop > 44 && e.target.scrollTop < 344) {
this.selectNum = 0;
}
this.selectNum = 0;
}
if (e.target.scrollTop > 344) {
if (e.target.scrollTop > 344) {
this.selectNum = 1;
this.selectNum = 1;
}
let scrollHeight=e.target.documentElement.scrollTop;
}
let scrollHeight=e.target.documentElement.scrollTop;
if (self != top) {
//嵌入到监控系统iframe中弹框位置样式
if(scrollHeight<600){
// this.marginStyle+="margin-top:"+(110)+'px;';
if (self != top) {
//嵌入到监控系统iframe中弹框位置样式
if(scrollHeight<600){
// this.marginStyle+="margin-top:"+(110)+'px;';
}else{
// this.marginStyle+="margin-top:"+(230)+'px;';
}else{
// this.marginStyle+="margin-top:"+(230)+'px;';
}
this.marginStyle+="top:"+(scrollHeight+60)+'px;';
}else{
//ajreport中弹框位置样式
this.marginStyle+="top:"+(scrollHeight)+'px;';
}
this.marginStyle+="top:"+(scrollHeight+60)+'px;';
}else{
//ajreport中弹框位置样式
this.marginStyle+="top:"+(scrollHeight)+'px;';
}
},
//打开详情页
goTrend(item, itemChildKey) {
... ... @@ -453,7 +457,6 @@ export default {
let limit = 30;
let page = parseInt(this.currentPage - 1) * limit;
//改变参数值-月季度年，重新加载动态数据--待测
console.log("&&&&&&&&&",page,limit)
this.optionsData.dynamicData.contextData.page = page;
this.optionsData.dynamicData.contextData.limit = 30;
this.optionsData.dynamicData.contextData.isMore = true;
... ...