From 523e8c6a9c5fc148c0783f2005db14d14ca89a70 Mon Sep 17 00:00:00 2001
From: 鲁尚清 <lushangqing@honggroup.com.cn>
Date: Sat, 13 Nov 2021 17:56:06 +0800
Subject: [PATCH] 接口调用传access_token
---
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/businessVolume/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js | 25 +++++++++++++++++++------
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/monitoring/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/assetOverview/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/cloudPlatform/index.js | 4 ++--
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/dataCenter/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declare/index.js | 4 ++--
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declareLine/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/monitoringMonth/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/networkTopology/index.js | 2 +-
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js | 38 ++++++++++++++++++++++++++++++--------
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/resourceStatistics/index.js | 2 +-
16 files changed, 170 insertions(+), 44 deletions(-)
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js
index af1c55a..ace0fac 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js
@@ -45,7 +45,7 @@ export default {
getData () {
let that=this;
- $.get(this.domainName +this.apiUrl+this.newCommandVal,function (ret){
+ $.get(this.domainName +this.apiUrl+this.newCommandVal+'&access_token='+localStorage.getItem('access_token'),function (ret){
if(ret){
let dataArr=[];
let xAxisData=[];
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/businessVolume/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/businessVolume/index.js
index 9439148..7257b8f 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/businessVolume/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/businessVolume/index.js
@@ -70,7 +70,7 @@ export default {
async getData () {
// await this.$http.get()
// const { data: ret } = await this.$http.get('volume')
- const { data: ret } = await $.get(this.domainName +this.apiUrl)
+ const { data: ret } = await $.get(this.domainName +this.apiUrl+'?access_token='+localStorage.getItem('access_token'))
//本月业务量
// const { data: ret1 } = await $.get(this.domainName +this.apiUrl1)
let retData=[];
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js
index 461f26d..3bf1259 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js
@@ -39,7 +39,12 @@ export default {
numerTitle: 'KPIDA0ACBBG'
}
},
-
+ setUp(){
+ const allData=ref({});
+ return{
+ allData
+ }
+ },
mounted () {
this.getData(this)
@@ -64,7 +69,7 @@ export default {
access_token:localStorage.getItem("access_token")
};
// proxy.$http.get("/api-web/detail/his/line/base", params, function (res) {
- var res={
+ var res1={
code:'0',
data:{
kpiUnit:'%',
@@ -78,9 +83,10 @@ export default {
]
}
}
- if(res && res.data){
- let resData=res.data;
- that.allData.polyline.data.push(resData.series)
+ if(res1 && res1.data){
+ let resData=res1.data;
+ that.allData.polyline.data.push(resData.series[0])
+ console.log("123",that.allData)
that.updateChart()
}
@@ -114,11 +120,14 @@ export default {
}
if(res && res.data){
let resData=res.data;
+ let seriesData1=[];
+ seriesData1.push(resData.series[0])
+ // that.seriesData1=resData.series;
that.allData = {
polyline: {
title: "申报库CPU监控",
unit: "cpu%",
- data: resData.series
+ data: seriesData1
},
xAxis: {
today:resData.names
@@ -155,7 +164,11 @@ export default {
let seriesData=[];
+ console.log("***",seriesArr)
$.each(seriesArr,function (index,item){
+ console.log("&&&",item)
+ console.log("/*/*/*",item.name)
+
seriesData .push({
name: item.name,
type: 'line',
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js
index 08575b0..1bbeedf 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js
@@ -85,7 +85,7 @@ export default {
rateTitle: that.rateTitle,
numerTitle: that.numerTitle
};
- proxy.$http.get("/api-web/bigScreen/declarePolyline", params, function (res) {
+ proxy.$http.get("/api-web/bigScreen/declarePolyline"+"?access_token="+localStorage.getItem('access_token'), params, function (res) {
if(res.success){
that.allData = res.obj;
that.updateChart()
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js
index 1f00c52..b5aa482 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js
@@ -25,13 +25,23 @@ export default {
today: ["00", "02", "04", "06", "08", "10", "12", "14", "16", "18", "20", "22"]
}
},
+ titleFontSize: 30,
+ kpiIds:'KPI20352505',
+ resId:'166eb917fe734dafa2d2474b0a66c37b',
+ resId1:'0002fe6fd00c4ab3b6383104b1565c18',
startValue: 0, // 区域缩放的起点值
endValue: 6, // 区域缩放的终点值
timerId: null // 定时器的标识
}
},
+ setUp(){
+ const allData=ref({});
+ return{
+ allData
+ }
+ },
mounted () {
- this.getData()
+ this.getData(this)
window.addEventListener('resize', this.screenAdapter)
this.screenAdapter()
},
@@ -41,13 +51,86 @@ export default {
},
methods: {
- async getData () {
- // await this.$http.get()
- // const { data: ret } = await this.$http.get('documentcpu')
- // this.allData = ret
- // console.log(ret)
- this.updateChart()
- this.startInterval()
+ getData1(that){
+ const { proxy } = Vue.getCurrentInstance();
+
+ var params = {
+ resId: that.resId1,
+ kpiIds: that.kpiIds,
+ subResId: 'vmem',
+ startTime:'',
+ endTime:'',
+ access_token:localStorage.getItem("access_token")
+ };
+ // proxy.$http.get("/api-web/detail/his/line/base", params, function (res) {
+ var res1={
+ code:'0',
+ data:{
+ kpiUnit:'%',
+ names:['20:10','21:10','22:15','23:15'],
+ series:[
+ {
+ name:'89.12.97.3',
+ datas:[0.7,1,1,0.7,1,0.7,0.5,1],
+ flag:'vmem'
+ }
+ ]
+ }
+ }
+ if(res1 && res1.data){
+ let resData=res1.data;
+ that.allData.polyline.data.push(resData.series[0])
+ console.log("123",that.allData)
+ that.updateChart()
+
+ }
+ // });
+ },
+
+ getData (that) {
+ const { proxy } = Vue.getCurrentInstance();
+ var params = {
+ resId: that.resId,
+ kpiIds: that.kpiIds,
+ subResId: 'vmem',
+ startTime:'',
+ endTime:'',
+ access_token:localStorage.getItem("access_token")
+ };
+ // proxy.$http.get("/api-web/detail/his/line/base", params, function (res) {
+ var res={
+ code:'0',
+ data:{
+ kpiUnit:'%',
+ names:['20:10','21:10','22:15','23:15'],
+ series:[
+ {
+ name:'89.12.97.2',
+ datas:[0.9,0.9,1,1,0.9,1,1,1],
+ flag:'vmem'
+ }
+ ]
+ }
+ }
+ if(res && res.data){
+ let resData=res.data;
+ let seriesData1=[];
+ seriesData1.push(resData.series[0])
+ // that.seriesData1=resData.series;
+ that.allData = {
+ polyline: {
+ title: "文书库CPU监控",
+ unit: "cpu%",
+ data: seriesData1
+ },
+ xAxis: {
+ today:resData.names
+ }
+ };
+ that.getData1(that)
+ }
+ // });
+
},
updateChart () {
// 半透明的颜色值
@@ -69,11 +152,21 @@ export default {
'rgba(250, 105, 0, 0)'
]
const timeArr = this.allData.xAxis.today
- const seriesArr = this.allData.polyline.data.map((item, index) => {
- return {
+ const seriesArr = this.allData.polyline.data;
+ const title=this.allData.polyline.title;
+ const unit=this.allData.polyline.unit;
+
+ let seriesData=[];
+
+ console.log("***",seriesArr)
+ $.each(seriesArr,function (index,item){
+ console.log("&&&",item)
+ console.log("/*/*/*",item.name)
+
+ seriesData .push({
name: item.name,
type: 'line',
- data: item.data,
+ data: item.datas,
smooth: true,
showSymbol:false,
itemStyle : {
@@ -97,15 +190,13 @@ export default {
} // 100%的颜色值
])
}
- }
+ })
})
+
// 图例的数据
const legendArr = this.allData.polyline.data.map(item => {
return item.name
})
- const title = this.allData.polyline.title
- const unit = this.allData.polyline.unit
- const seriesData=seriesArr;
let xAxisData=timeArr;
this.optionData = {
title: {
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/monitoring/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/monitoring/index.js
index 45ded9e..f46d3ac 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/monitoring/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/monitoring/index.js
@@ -33,7 +33,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
proxy.screenAdapter();
- $.get(proxy.domainName +proxy.apiUrl,function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'&access_token='+localStorage.getItem('access_token'),function (res) {
const data = res;
if (data && data.data) {
let monitoringBarData=data.data;
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js
index 7722ede..8c56ab8 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js
@@ -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,(ret)=>{
+ $.get(this.domainName +this.apiUrl+this.newCommandVal+'&access_token='+localStorage.getItem('access_token'),(ret)=>{
if(ret){
let dataArr=[];
let xAxisData='';
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/assetOverview/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/assetOverview/index.js
index 898dcb8..2c6aef8 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/assetOverview/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/assetOverview/index.js
@@ -19,7 +19,7 @@ export default {
const {proxy} = Vue.getCurrentInstance();
// 挂载完
Vue.onMounted(() => {
- $.get(proxy.domainName +proxy.apiUrl,function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) {
const data = res;
// const data = res.object;
//状态
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/cloudPlatform/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/cloudPlatform/index.js
index fb5961d..071b9c8 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/cloudPlatform/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/cloudPlatform/index.js
@@ -7,7 +7,7 @@ export default {
},
data(){
return {
- domainName:'http://192.168.0.245:8180/api-web',
+ domainName:sessionStorage.getItem('domainName'),
isActive:false,
cloudData:''
}
@@ -18,7 +18,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
let yptRunTimer = null;
- $.get(proxy.domainName +"/datavis/getCloudInfo",function(res){
+ $.get(proxy.domainName +"/api-web/datavis/getCloudInfo"+'?access_token='+localStorage.getItem('access_token'),function(res){
const data = res.data;
if(data && data.length > 0){
proxy.cloudData=data;
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/dataCenter/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/dataCenter/index.js
index 6d6e5f4..0d3ccb1 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/dataCenter/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/dataCenter/index.js
@@ -14,7 +14,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
- $.get(proxy.domainName +proxy.apiUrl,function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) {
if(res.data){
proxy.jfdata=res.data;
/* const html = $("#sjzx_machineroom_id_Tmpl").render(res.data);
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declare/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declare/index.js
index c78e1e7..278f993 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declare/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declare/index.js
@@ -34,7 +34,7 @@ export default {
const {proxy} = Vue.getCurrentInstance();
// 挂载完
Vue.onMounted(() => {
- $.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBF&kipValue2=KPIDA0ACBBD',function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBF&kipValue2=KPIDA0ACBBD'+'&access_token='+localStorage.getItem('access_token'),function (res) {
const data = res;
if(data && data.map){
let reportableMonth=data.map.rightNumber;
@@ -59,7 +59,7 @@ export default {
})
- $.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBS&kipValue2=KPIDA0ACBBE',function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBS&kipValue2=KPIDA0ACBBE'+'&access_token='+localStorage.getItem('access_token'),function (res) {
const data = res;
if(data && data.map){
let reportableToday=data.map.rightNumber;
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declareLine/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declareLine/index.js
index e8151ea..f9b01cb 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declareLine/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/declareLine/index.js
@@ -34,7 +34,7 @@ export default {
const {colorData}=Vue.toRefs(props)
proxy.colorData=colorData.value
}
- $.get(proxy.domainName +proxy.apiUrl,function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) {
const data = res;
let ySeriesCommon=[];
if (data && data.data) {
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/monitoringMonth/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/monitoringMonth/index.js
index d836ba2..dc03bd5 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/monitoringMonth/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/monitoringMonth/index.js
@@ -27,7 +27,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
- $.get(proxy.domainName +proxy.apiUrl,function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'&access_token='+localStorage.getItem('access_token'),function (res) {
const data = res;
if (data && data.data) {
let monitoringBarData=data.data;
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/networkTopology/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/networkTopology/index.js
index 11452de..84af004 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/networkTopology/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/networkTopology/index.js
@@ -67,7 +67,7 @@ export default {
// 注册地图,传入数据
echarts.registerMap('echarts', geoJson);
//获取浙江各地市链路信息
- $.get(proxy.domainName +proxy.cityUrl,function(res){
+ $.get(proxy.domainName +proxy.cityUrl+'?access_token='+localStorage.getItem('access_token'),function(res){
if(res.data && res.data.length > 0){
const mapData = res.data;
proxy.mapData=mapData;
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js
index 8c179d3..5f61862 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/performance/index.js
@@ -21,6 +21,9 @@ export default {
},
setup(props, {attrs, slots, emit}) {
const {proxy} = Vue.getCurrentInstance();
+ const xAxisData=Vue.ref();
+ const yAxisData=Vue.ref([]);
+ const legendData=Vue.ref([]);
// 半透明的颜色值
const colorArr1 = [
'rgba(151,213,244, 0.8)',
@@ -50,18 +53,34 @@ export default {
endTime:'',
access_token:localStorage.getItem('access_token')
};
- $.get(proxy.domainName +proxy.apiUrl,params,function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),params,function (res) {
const data = res;
- console.log("ttttt",data)
- if (data && data.map) {
- let resData=data.map;
- proxy.legendData=resData.legend;
- proxy.xAxisData=resData.x;
- proxy.yAxisData=resData.y;
+ if (data ) {
+ if(data.map){
+ let resData=data.map;
+ proxy.legendData=resData.legend;
+ proxy.xAxisData=resData.x;
+ proxy.yAxisData=resData.y;
+ }else{
+ let nullArr=[];
+ for(let i=0;i<4;i++){
+ nullArr.push(i)
+ proxy.legendData.push({
+ name:''
+ })
+ }
+ proxy.xAxisData=nullArr;
+ for(let i=0;i<4;i++){
+ proxy.yAxisData.push(nullArr);
+
+ }
+
+ }
+
+ proxy.optionInit();
}
- proxy.optionInit();
})
// proxy.optionInit();
@@ -358,6 +377,9 @@ export default {
calMax,
calMin,
getData,
+ xAxisData,
+ yAxisData,
+ legendData,
optionInit
}
}
diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/resourceStatistics/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/resourceStatistics/index.js
index a322b06..42dea0d 100644
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/resourceStatistics/index.js
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/zjdaping/components/resourceStatistics/index.js
@@ -40,7 +40,7 @@ export default {
})
const getData=()=>{
- $.get(proxy.domainName +proxy.apiUrl+'?busId='+proxy.busId,function (res) {
+ $.get(proxy.domainName +proxy.apiUrl+'?busId='+proxy.busId+'&access_token='+localStorage.getItem('access_token'),function (res) {
const data = res;
if(data && data.data){
// proxy.resourceStatisticsData=data.data;
--
libgit2 0.24.0