Authored by 王涛

Merge branch 'master-v32-xwx' into 'master'

杭州-大屏-添加白名单



See merge request !244
Showing 25 changed files with 40 additions and 47 deletions
... ... @@ -665,7 +665,7 @@ layui.define(['view'], function(exports){
//xwx add 首页增加业务健康度入口 2021-10-25 --end
, toBigScreen: function () {
//window.open(sessionStorage.getItem("bigScreen") + '?access_token=' + localStorage.getItem("access_token"));
window.open(window.location.origin + '/vue3/index.html#/zjdaping?access_token=' + localStorage.getItem("access_token"));
window.open(window.location.origin + '/vue3/index.html#/zjdaping');
}
, toYTHViewScreen: function () {
window.open(sessionStorage.getItem("ythView") + '?access_token=' + localStorage.getItem("access_token"));
... ...
... ... @@ -66,8 +66,7 @@ export default {
kpiIds: proxy.kpiIds,
busId: proxy.busId,
startTime:'',
endTime:'',
access_token:localStorage.getItem('access_token')
endTime:''
};
$.get(proxy.domainName +proxy.apiUrl,params,function (res) {
const data = res;
... ...
... ... @@ -45,7 +45,7 @@ export default {
getData () {
let that=this;
$.get(this.domainName +this.apiUrl+this.newCommandVal+'&access_token='+localStorage.getItem('access_token'),function (ret){
$.get(this.domainName +this.apiUrl+this.newCommandVal,function (ret){
if(ret){
let dataArr=[];
let xAxisData=[];
... ...
... ... @@ -70,7 +70,7 @@ export default {
async getData () {
// await this.$http.get()
// const { data: ret } = await this.$http.get('volume')
const { map: ret } = await $.get(this.domainName +this.apiUrl+'?access_token='+localStorage.getItem('access_token'))
const { map: ret } = await $.get(this.domainName +this.apiUrl)
//本月业务量
// const { data: ret1 } = await $.get(this.domainName +this.apiUrl1)
let retData=[];
... ...
... ... @@ -92,8 +92,7 @@ export default {
kpiIds: that.kpiIds,
subResId: 'cpu',
startTime:'',
endTime:'',
access_token:localStorage.getItem("access_token")
endTime:''
};
that.$http.get("/api-web/detail/his/line/base", params, function (res) {
... ... @@ -119,7 +118,7 @@ export default {
})
that.updateChart()
});
},undefined,true,false);
},
getData (that) {
... ... @@ -129,8 +128,7 @@ export default {
kpiIds: that.kpiIds,
subResId: 'cpu',
startTime:'',
endTime:'',
access_token:localStorage.getItem("access_token")
endTime:''
};
that.$http.get("/api-web/detail/his/line/base", params, function (res) {
... ... @@ -159,7 +157,7 @@ export default {
};
that.getData1(that)
});
},undefined,true,false);
},
updateChart () {
... ...
... ... @@ -85,13 +85,13 @@ export default {
rateTitle: that.rateTitle,
numerTitle: that.numerTitle
};
proxy.$http.get("/api-web/bigScreen/declarePolyline"+"?access_token="+localStorage.getItem('access_token'), params, function (res) {
proxy.$http.get("/api-web/bigScreen/declarePolyline", params, function (res) {
if(res.success){
that.allData = res.obj;
that.updateChart()
// that.startInterval()
}
});
},undefined,true,false);
},
updateChart () {
... ...
... ... @@ -80,7 +80,7 @@ export default {
that.optionInit();
}
});
},undefined,true,false);
},
optionInit(){
... ...
... ... @@ -86,7 +86,7 @@ export default {
})
}
});
},undefined,true,false);
},
updateChart () {
},
... ...
... ... @@ -153,7 +153,7 @@ export default {
kipValue1: that.kipValue1,
kipValue2: that.kipValue2
};
$.get(that.domainName +"/api-web/bigScreen/digitalBoardData"+'?access_token='+localStorage.getItem('access_token'), params, function (res) {
$.get(that.domainName +"/api-web/bigScreen/digitalBoardData", params, function (res) {
if(res.success){
const map = res.map
// 左边数
... ...
... ... @@ -155,7 +155,7 @@ export default {
kipValue1: that.kipValue1,
kipValue2: that.kipValue2
};
$.get(that.domainName +"/api-web/bigScreen/digitalBoardData"+'?access_token='+localStorage.getItem('access_token'), params, function (res) {
$.get(that.domainName +"/api-web/bigScreen/digitalBoardData", params, function (res) {
if(res.success){
const map = res.map
// 左边数
... ...
... ... @@ -87,8 +87,7 @@ export default {
kpiIds: that.kpiIds,
subResId: 'cpu',
startTime:'',
endTime:'',
access_token:localStorage.getItem("access_token")
endTime:''
};
that.$http.get("/api-web/detail/his/line/base", params, function (res) {
... ... @@ -113,7 +112,7 @@ export default {
}
})
that.updateChart()
});
},undefined,true,false);
},
getData (that) {
... ... @@ -123,8 +122,7 @@ export default {
kpiIds: that.kpiIds,
subResId: 'cpu',
startTime:'',
endTime:'',
access_token:localStorage.getItem("access_token")
endTime:''
};
that.$http.get("/api-web/detail/his/line/base", params, function (res) {
... ... @@ -152,7 +150,7 @@ export default {
};
that.getData1(that)
});
},undefined,true,false);
},
updateChart () {
... ...
... ... @@ -33,7 +33,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
proxy.screenAdapter();
$.get(proxy.domainName +proxy.apiUrl+'&access_token='+localStorage.getItem('access_token'),function (res) {
$.get(proxy.domainName +proxy.apiUrl,function (res) {
const data = res;
if (data && data.data) {
let monitoringBarData=data.data;
... ...
... ... @@ -51,7 +51,7 @@ export default {
let that=this;
// await this.$http.get()
// const { data: ret } = await proxy.$http.get('bigScreen/monitoring?function=')
$.get(this.domainName +this.apiUrl+this.newCommandVal+'&access_token='+localStorage.getItem('access_token'),(ret)=>{
$.get(this.domainName +this.apiUrl+this.newCommandVal,(ret)=>{
if(ret){
let dataArr=[];
let xAxisData='';
... ...
... ... @@ -143,7 +143,7 @@ export default {
that.updateChart()
}
});
},undefined,true,false);
},
updateChart () {
... ...
... ... @@ -19,7 +19,7 @@ export default {
const {proxy} = Vue.getCurrentInstance();
// 挂载完
Vue.onMounted(() => {
$.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) {
$.get(proxy.domainName +proxy.apiUrl,function (res) {
const data = res;
// const data = res.object;
//状态
... ...
... ... @@ -54,10 +54,9 @@ export default {
kpiIds: props.kpiIds,
busId: props.busId,
startTime:'',
endTime:'',
access_token:localStorage.getItem('access_token')
endTime:''
};
$.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),params,function (res) {
$.get(proxy.domainName +proxy.apiUrl,params,function (res) {
console.log("yewu")
const data = res;
let legendData=Vue.ref([]);
... ...
... ... @@ -19,7 +19,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
let yptRunTimer = null;
$.get(proxy.domainName +"/api-web/bigScreen/getCloudInfo"+'?access_token='+localStorage.getItem('access_token'),function(res){
$.get(proxy.domainName +"/api-web/bigScreen/getCloudInfo",function(res){
const data = res.data;
if(data && data.length > 0){
resData = data;
... ...
... ... @@ -27,7 +27,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
$.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) {
$.get(proxy.domainName +proxy.apiUrl,function (res) {
if(res.data){
proxy.jfdata=res.data;
... ...
... ... @@ -76,12 +76,12 @@ export default {
}
});
},undefined,true,false);
proxy.getDeclareData();
proxy.startInterval();
//业务量
$.get(proxy.domainName +proxy.apiUrl1+'?access_token='+localStorage.getItem('access_token'),function (res) {
$.get(proxy.domainName +proxy.apiUrl1,function (res) {
const data = res;
let noVlumeData=[
{
... ... @@ -132,7 +132,7 @@ export default {
},10000)
}
const getDeclareData=()=>{
$.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBF&kipValue2=KPIDA0ACBBD'+'&access_token='+localStorage.getItem('access_token'),function (res) {
$.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBF&kipValue2=KPIDA0ACBBD',function (res) {
const data = res;
if(data && data.map){
let reportableMonth=data.map.rightNumber;
... ... @@ -145,7 +145,7 @@ export default {
})
$.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBS&kipValue2=KPIDA0ACBBE'+'&access_token='+localStorage.getItem('access_token'),function (res) {
$.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBS&kipValue2=KPIDA0ACBBE',function (res) {
const data = res;
if(data && data.map){
let reportableToday=data.map.rightNumber;
... ... @@ -188,7 +188,7 @@ export default {
}
}
const goJump=()=>{
proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token'),msgKey: true}})
proxy.$router.push({path:'/zj/dp',query: {msgKey: true}})
// window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token"));
}
... ...
... ... @@ -36,7 +36,7 @@ export default {
const {colorData}=Vue.toRefs(props)
proxy.colorData=colorData.value
}
$.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) {
proxy.$http.get(proxy.apiUrl,null,function (res) {
const data = res;
let ySeriesCommon=[];
if (data && data.data) {
... ... @@ -83,7 +83,7 @@ export default {
proxy.yAxisData=yAxisData;
proxy.optionInit();
}
})
},undefined,true,false)
})
... ...
... ... @@ -27,7 +27,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
$.get(proxy.domainName +proxy.apiUrl+'&access_token='+localStorage.getItem('access_token'),function (res) {
$.get(proxy.domainName +proxy.apiUrl,function (res) {
const data = res;
if (data && data.data) {
let monitoringBarData=data.data;
... ...
... ... @@ -18,7 +18,7 @@ export default {
return {
timer:null,
domainName:sessionStorage.getItem('domainName'),
apiUrl:'/api-web/sxview/getbizListByUser?access_token=',
apiUrl:'/api-web/sxview/getbizListByUser',
checkId:0,//当前选中的tabs
listItem:1,//轮播数-总页数
pageSize:5,//每页显示5条数据
... ... @@ -35,7 +35,7 @@ export default {
const { busId} = indirectManage()
// 挂载完
Vue.onMounted(() => {
$.get(proxy.domainName +proxy.apiUrl+accessToken,function (res) {
$.get(proxy.domainName +proxy.apiUrl,function (res) {
const data = res;
if (data && data.data) {
let navTabsData=data.data;
... ...
... ... @@ -67,7 +67,7 @@ export default {
// 注册地图,传入数据
echarts.registerMap('echarts', geoJson);
//获取浙江各地市链路信息
$.get(proxy.domainName +proxy.cityUrl+'?access_token='+localStorage.getItem('access_token'),function(res){
$.get(proxy.domainName +proxy.cityUrl,function(res){
if(res.data && res.data.length > 0){
const mapData = res.data;
proxy.mapData=mapData;
... ...
... ... @@ -71,10 +71,9 @@ export default {
kpiIds: proxy.kpiIds,
busId: proxy.busId,
startTime:'',
endTime:'',
access_token:localStorage.getItem('access_token')
endTime:''
};
$.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),params,function (res) {
$.get(proxy.domainName +proxy.apiUrl,params,function (res) {
const data = res;
let legendData=Vue.ref([]);
let xAxisData=Vue.ref([]);
... ...
... ... @@ -41,7 +41,7 @@ export default {
})
const getData=()=>{
$.get(proxy.domainName +proxy.apiUrl+'?busId='+proxy.busId+'&access_token='+localStorage.getItem('access_token'),function (res) {
$.get(proxy.domainName +proxy.apiUrl+'?busId='+proxy.busId,function (res) {
const data = res;
if(data && data.data){
// proxy.resourceStatisticsData=data.data;
... ...