monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 7883e2d414a282e179b03fcd03f779cccb626674 2 parents 621d0976 06c08903

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

杭州-大屏-添加白名单



See merge request !244
Inline Side-by-side
Showing 25 changed files with 40 additions and 47 deletions
@@ -665,7 +665,7 @@ layui.define(['view'], function(exports){ @@ -665,7 +665,7 @@ layui.define(['view'], function(exports){
665 //xwx add 首页增加业务健康度入口 2021-10-25 --end 665 //xwx add 首页增加业务健康度入口 2021-10-25 --end
666 , toBigScreen: function () { 666 , toBigScreen: function () {
667 //window.open(sessionStorage.getItem("bigScreen") + '?access_token=' + localStorage.getItem("access_token")); 667 //window.open(sessionStorage.getItem("bigScreen") + '?access_token=' + localStorage.getItem("access_token"));
668 - window.open(window.location.origin + '/vue3/index.html#/zjdaping?access_token=' + localStorage.getItem("access_token")); 668 + window.open(window.location.origin + '/vue3/index.html#/zjdaping');
669 } 669 }
670 , toYTHViewScreen: function () { 670 , toYTHViewScreen: function () {
671 window.open(sessionStorage.getItem("ythView") + '?access_token=' + localStorage.getItem("access_token")); 671 window.open(sessionStorage.getItem("ythView") + '?access_token=' + localStorage.getItem("access_token"));
@@ -66,8 +66,7 @@ export default { @@ -66,8 +66,7 @@ export default {
66 kpiIds: proxy.kpiIds, 66 kpiIds: proxy.kpiIds,
67 busId: proxy.busId, 67 busId: proxy.busId,
68 startTime:'', 68 startTime:'',
69 - endTime:'',  
70 - access_token:localStorage.getItem('access_token') 69 + endTime:''
71 }; 70 };
72 $.get(proxy.domainName +proxy.apiUrl,params,function (res) { 71 $.get(proxy.domainName +proxy.apiUrl,params,function (res) {
73 const data = res; 72 const data = res;
@@ -45,7 +45,7 @@ export default { @@ -45,7 +45,7 @@ export default {
45 45
46 getData () { 46 getData () {
47 let that=this; 47 let that=this;
48 - $.get(this.domainName +this.apiUrl+this.newCommandVal+'&access_token='+localStorage.getItem('access_token'),function (ret){ 48 + $.get(this.domainName +this.apiUrl+this.newCommandVal,function (ret){
49 if(ret){ 49 if(ret){
50 let dataArr=[]; 50 let dataArr=[];
51 let xAxisData=[]; 51 let xAxisData=[];
@@ -70,7 +70,7 @@ export default { @@ -70,7 +70,7 @@ export default {
70 async getData () { 70 async getData () {
71 // await this.$http.get() 71 // await this.$http.get()
72 // const { data: ret } = await this.$http.get('volume') 72 // const { data: ret } = await this.$http.get('volume')
73 - const { map: ret } = await $.get(this.domainName +this.apiUrl+'?access_token='+localStorage.getItem('access_token')) 73 + const { map: ret } = await $.get(this.domainName +this.apiUrl)
74 //本月业务量 74 //本月业务量
75 // const { data: ret1 } = await $.get(this.domainName +this.apiUrl1) 75 // const { data: ret1 } = await $.get(this.domainName +this.apiUrl1)
76 let retData=[]; 76 let retData=[];
@@ -92,8 +92,7 @@ export default { @@ -92,8 +92,7 @@ export default {
92 kpiIds: that.kpiIds, 92 kpiIds: that.kpiIds,
93 subResId: 'cpu', 93 subResId: 'cpu',
94 startTime:'', 94 startTime:'',
95 - endTime:'',  
96 - access_token:localStorage.getItem("access_token") 95 + endTime:''
97 }; 96 };
98 that.$http.get("/api-web/detail/his/line/base", params, function (res) { 97 that.$http.get("/api-web/detail/his/line/base", params, function (res) {
99 98
@@ -119,7 +118,7 @@ export default { @@ -119,7 +118,7 @@ export default {
119 }) 118 })
120 that.updateChart() 119 that.updateChart()
121 120
122 - }); 121 + },undefined,true,false);
123 }, 122 },
124 123
125 getData (that) { 124 getData (that) {
@@ -129,8 +128,7 @@ export default { @@ -129,8 +128,7 @@ export default {
129 kpiIds: that.kpiIds, 128 kpiIds: that.kpiIds,
130 subResId: 'cpu', 129 subResId: 'cpu',
131 startTime:'', 130 startTime:'',
132 - endTime:'',  
133 - access_token:localStorage.getItem("access_token") 131 + endTime:''
134 }; 132 };
135 that.$http.get("/api-web/detail/his/line/base", params, function (res) { 133 that.$http.get("/api-web/detail/his/line/base", params, function (res) {
136 134
@@ -159,7 +157,7 @@ export default { @@ -159,7 +157,7 @@ export default {
159 }; 157 };
160 that.getData1(that) 158 that.getData1(that)
161 159
162 - }); 160 + },undefined,true,false);
163 161
164 }, 162 },
165 updateChart () { 163 updateChart () {
@@ -85,13 +85,13 @@ export default { @@ -85,13 +85,13 @@ export default {
85 rateTitle: that.rateTitle, 85 rateTitle: that.rateTitle,
86 numerTitle: that.numerTitle 86 numerTitle: that.numerTitle
87 }; 87 };
88 - proxy.$http.get("/api-web/bigScreen/declarePolyline"+"?access_token="+localStorage.getItem('access_token'), params, function (res) { 88 + proxy.$http.get("/api-web/bigScreen/declarePolyline", params, function (res) {
89 if(res.success){ 89 if(res.success){
90 that.allData = res.obj; 90 that.allData = res.obj;
91 that.updateChart() 91 that.updateChart()
92 // that.startInterval() 92 // that.startInterval()
93 } 93 }
94 - }); 94 + },undefined,true,false);
95 95
96 }, 96 },
97 updateChart () { 97 updateChart () {
@@ -80,7 +80,7 @@ export default { @@ -80,7 +80,7 @@ export default {
80 that.optionInit(); 80 that.optionInit();
81 81
82 } 82 }
83 - }); 83 + },undefined,true,false);
84 84
85 }, 85 },
86 optionInit(){ 86 optionInit(){
@@ -86,7 +86,7 @@ export default { @@ -86,7 +86,7 @@ export default {
86 86
87 }) 87 })
88 } 88 }
89 - }); 89 + },undefined,true,false);
90 }, 90 },
91 updateChart () { 91 updateChart () {
92 }, 92 },
@@ -153,7 +153,7 @@ export default { @@ -153,7 +153,7 @@ export default {
153 kipValue1: that.kipValue1, 153 kipValue1: that.kipValue1,
154 kipValue2: that.kipValue2 154 kipValue2: that.kipValue2
155 }; 155 };
156 - $.get(that.domainName +"/api-web/bigScreen/digitalBoardData"+'?access_token='+localStorage.getItem('access_token'), params, function (res) { 156 + $.get(that.domainName +"/api-web/bigScreen/digitalBoardData", params, function (res) {
157 if(res.success){ 157 if(res.success){
158 const map = res.map 158 const map = res.map
159 // 左边数 159 // 左边数
@@ -155,7 +155,7 @@ export default { @@ -155,7 +155,7 @@ export default {
155 kipValue1: that.kipValue1, 155 kipValue1: that.kipValue1,
156 kipValue2: that.kipValue2 156 kipValue2: that.kipValue2
157 }; 157 };
158 - $.get(that.domainName +"/api-web/bigScreen/digitalBoardData"+'?access_token='+localStorage.getItem('access_token'), params, function (res) { 158 + $.get(that.domainName +"/api-web/bigScreen/digitalBoardData", params, function (res) {
159 if(res.success){ 159 if(res.success){
160 const map = res.map 160 const map = res.map
161 // 左边数 161 // 左边数
@@ -87,8 +87,7 @@ export default { @@ -87,8 +87,7 @@ export default {
87 kpiIds: that.kpiIds, 87 kpiIds: that.kpiIds,
88 subResId: 'cpu', 88 subResId: 'cpu',
89 startTime:'', 89 startTime:'',
90 - endTime:'',  
91 - access_token:localStorage.getItem("access_token") 90 + endTime:''
92 }; 91 };
93 that.$http.get("/api-web/detail/his/line/base", params, function (res) { 92 that.$http.get("/api-web/detail/his/line/base", params, function (res) {
94 93
@@ -113,7 +112,7 @@ export default { @@ -113,7 +112,7 @@ export default {
113 } 112 }
114 }) 113 })
115 that.updateChart() 114 that.updateChart()
116 - }); 115 + },undefined,true,false);
117 }, 116 },
118 117
119 getData (that) { 118 getData (that) {
@@ -123,8 +122,7 @@ export default { @@ -123,8 +122,7 @@ export default {
123 kpiIds: that.kpiIds, 122 kpiIds: that.kpiIds,
124 subResId: 'cpu', 123 subResId: 'cpu',
125 startTime:'', 124 startTime:'',
126 - endTime:'',  
127 - access_token:localStorage.getItem("access_token") 125 + endTime:''
128 }; 126 };
129 that.$http.get("/api-web/detail/his/line/base", params, function (res) { 127 that.$http.get("/api-web/detail/his/line/base", params, function (res) {
130 128
@@ -152,7 +150,7 @@ export default { @@ -152,7 +150,7 @@ export default {
152 }; 150 };
153 that.getData1(that) 151 that.getData1(that)
154 152
155 - }); 153 + },undefined,true,false);
156 154
157 }, 155 },
158 updateChart () { 156 updateChart () {
@@ -33,7 +33,7 @@ export default { @@ -33,7 +33,7 @@ export default {
33 // 挂载完 33 // 挂载完
34 Vue.onMounted(() => { 34 Vue.onMounted(() => {
35 proxy.screenAdapter(); 35 proxy.screenAdapter();
36 - $.get(proxy.domainName +proxy.apiUrl+'&access_token='+localStorage.getItem('access_token'),function (res) { 36 + $.get(proxy.domainName +proxy.apiUrl,function (res) {
37 const data = res; 37 const data = res;
38 if (data && data.data) { 38 if (data && data.data) {
39 let monitoringBarData=data.data; 39 let monitoringBarData=data.data;
@@ -51,7 +51,7 @@ export default { @@ -51,7 +51,7 @@ export default {
51 let that=this; 51 let that=this;
52 // await this.$http.get() 52 // await this.$http.get()
53 // const { data: ret } = await proxy.$http.get('bigScreen/monitoring?function=') 53 // const { data: ret } = await proxy.$http.get('bigScreen/monitoring?function=')
54 - $.get(this.domainName +this.apiUrl+this.newCommandVal+'&access_token='+localStorage.getItem('access_token'),(ret)=>{ 54 + $.get(this.domainName +this.apiUrl+this.newCommandVal,(ret)=>{
55 if(ret){ 55 if(ret){
56 let dataArr=[]; 56 let dataArr=[];
57 let xAxisData=''; 57 let xAxisData='';
@@ -143,7 +143,7 @@ export default { @@ -143,7 +143,7 @@ export default {
143 that.updateChart() 143 that.updateChart()
144 144
145 } 145 }
146 - }); 146 + },undefined,true,false);
147 147
148 }, 148 },
149 updateChart () { 149 updateChart () {
@@ -19,7 +19,7 @@ export default { @@ -19,7 +19,7 @@ export default {
19 const {proxy} = Vue.getCurrentInstance(); 19 const {proxy} = Vue.getCurrentInstance();
20 // 挂载完 20 // 挂载完
21 Vue.onMounted(() => { 21 Vue.onMounted(() => {
22 - $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) { 22 + $.get(proxy.domainName +proxy.apiUrl,function (res) {
23 const data = res; 23 const data = res;
24 // const data = res.object; 24 // const data = res.object;
25 //状态 25 //状态
@@ -54,10 +54,9 @@ export default { @@ -54,10 +54,9 @@ export default {
54 kpiIds: props.kpiIds, 54 kpiIds: props.kpiIds,
55 busId: props.busId, 55 busId: props.busId,
56 startTime:'', 56 startTime:'',
57 - endTime:'',  
58 - access_token:localStorage.getItem('access_token') 57 + endTime:''
59 }; 58 };
60 - $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),params,function (res) { 59 + $.get(proxy.domainName +proxy.apiUrl,params,function (res) {
61 console.log("yewu") 60 console.log("yewu")
62 const data = res; 61 const data = res;
63 let legendData=Vue.ref([]); 62 let legendData=Vue.ref([]);
@@ -19,7 +19,7 @@ export default { @@ -19,7 +19,7 @@ export default {
19 // 挂载完 19 // 挂载完
20 Vue.onMounted(() => { 20 Vue.onMounted(() => {
21 let yptRunTimer = null; 21 let yptRunTimer = null;
22 - $.get(proxy.domainName +"/api-web/bigScreen/getCloudInfo"+'?access_token='+localStorage.getItem('access_token'),function(res){ 22 + $.get(proxy.domainName +"/api-web/bigScreen/getCloudInfo",function(res){
23 const data = res.data; 23 const data = res.data;
24 if(data && data.length > 0){ 24 if(data && data.length > 0){
25 resData = data; 25 resData = data;
@@ -27,7 +27,7 @@ export default { @@ -27,7 +27,7 @@ export default {
27 27
28 // 挂载完 28 // 挂载完
29 Vue.onMounted(() => { 29 Vue.onMounted(() => {
30 - $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) { 30 + $.get(proxy.domainName +proxy.apiUrl,function (res) {
31 if(res.data){ 31 if(res.data){
32 proxy.jfdata=res.data; 32 proxy.jfdata=res.data;
33 33
@@ -76,12 +76,12 @@ export default { @@ -76,12 +76,12 @@ export default {
76 76
77 77
78 } 78 }
79 - }); 79 + },undefined,true,false);
80 proxy.getDeclareData(); 80 proxy.getDeclareData();
81 proxy.startInterval(); 81 proxy.startInterval();
82 82
83 //业务量 83 //业务量
84 - $.get(proxy.domainName +proxy.apiUrl1+'?access_token='+localStorage.getItem('access_token'),function (res) { 84 + $.get(proxy.domainName +proxy.apiUrl1,function (res) {
85 const data = res; 85 const data = res;
86 let noVlumeData=[ 86 let noVlumeData=[
87 { 87 {
@@ -132,7 +132,7 @@ export default { @@ -132,7 +132,7 @@ export default {
132 },10000) 132 },10000)
133 } 133 }
134 const getDeclareData=()=>{ 134 const getDeclareData=()=>{
135 - $.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBF&kipValue2=KPIDA0ACBBD'+'&access_token='+localStorage.getItem('access_token'),function (res) { 135 + $.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBF&kipValue2=KPIDA0ACBBD',function (res) {
136 const data = res; 136 const data = res;
137 if(data && data.map){ 137 if(data && data.map){
138 let reportableMonth=data.map.rightNumber; 138 let reportableMonth=data.map.rightNumber;
@@ -145,7 +145,7 @@ export default { @@ -145,7 +145,7 @@ export default {
145 145
146 }) 146 })
147 147
148 - $.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBS&kipValue2=KPIDA0ACBBE'+'&access_token='+localStorage.getItem('access_token'),function (res) { 148 + $.get(proxy.domainName +proxy.apiUrl+'?kipValue1=KPIDA0ACBBS&kipValue2=KPIDA0ACBBE',function (res) {
149 const data = res; 149 const data = res;
150 if(data && data.map){ 150 if(data && data.map){
151 let reportableToday=data.map.rightNumber; 151 let reportableToday=data.map.rightNumber;
@@ -188,7 +188,7 @@ export default { @@ -188,7 +188,7 @@ export default {
188 } 188 }
189 } 189 }
190 const goJump=()=>{ 190 const goJump=()=>{
191 - proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token'),msgKey: true}}) 191 + proxy.$router.push({path:'/zj/dp',query: {msgKey: true}})
192 // window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token")); 192 // window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token"));
193 } 193 }
194 194
@@ -36,7 +36,7 @@ export default { @@ -36,7 +36,7 @@ export default {
36 const {colorData}=Vue.toRefs(props) 36 const {colorData}=Vue.toRefs(props)
37 proxy.colorData=colorData.value 37 proxy.colorData=colorData.value
38 } 38 }
39 - $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),function (res) { 39 + proxy.$http.get(proxy.apiUrl,null,function (res) {
40 const data = res; 40 const data = res;
41 let ySeriesCommon=[]; 41 let ySeriesCommon=[];
42 if (data && data.data) { 42 if (data && data.data) {
@@ -83,7 +83,7 @@ export default { @@ -83,7 +83,7 @@ export default {
83 proxy.yAxisData=yAxisData; 83 proxy.yAxisData=yAxisData;
84 proxy.optionInit(); 84 proxy.optionInit();
85 } 85 }
86 - }) 86 + },undefined,true,false)
87 87
88 88
89 }) 89 })
@@ -27,7 +27,7 @@ export default { @@ -27,7 +27,7 @@ export default {
27 27
28 // 挂载完 28 // 挂载完
29 Vue.onMounted(() => { 29 Vue.onMounted(() => {
30 - $.get(proxy.domainName +proxy.apiUrl+'&access_token='+localStorage.getItem('access_token'),function (res) { 30 + $.get(proxy.domainName +proxy.apiUrl,function (res) {
31 const data = res; 31 const data = res;
32 if (data && data.data) { 32 if (data && data.data) {
33 let monitoringBarData=data.data; 33 let monitoringBarData=data.data;
@@ -18,7 +18,7 @@ export default { @@ -18,7 +18,7 @@ export default {
18 return { 18 return {
19 timer:null, 19 timer:null,
20 domainName:sessionStorage.getItem('domainName'), 20 domainName:sessionStorage.getItem('domainName'),
21 - apiUrl:'/api-web/sxview/getbizListByUser?access_token=', 21 + apiUrl:'/api-web/sxview/getbizListByUser',
22 checkId:0,//当前选中的tabs 22 checkId:0,//当前选中的tabs
23 listItem:1,//轮播数-总页数 23 listItem:1,//轮播数-总页数
24 pageSize:5,//每页显示5条数据 24 pageSize:5,//每页显示5条数据
@@ -35,7 +35,7 @@ export default { @@ -35,7 +35,7 @@ export default {
35 const { busId} = indirectManage() 35 const { busId} = indirectManage()
36 // 挂载完 36 // 挂载完
37 Vue.onMounted(() => { 37 Vue.onMounted(() => {
38 - $.get(proxy.domainName +proxy.apiUrl+accessToken,function (res) { 38 + $.get(proxy.domainName +proxy.apiUrl,function (res) {
39 const data = res; 39 const data = res;
40 if (data && data.data) { 40 if (data && data.data) {
41 let navTabsData=data.data; 41 let navTabsData=data.data;
@@ -67,7 +67,7 @@ export default { @@ -67,7 +67,7 @@ export default {
67 // 注册地图,传入数据 67 // 注册地图,传入数据
68 echarts.registerMap('echarts', geoJson); 68 echarts.registerMap('echarts', geoJson);
69 //获取浙江各地市链路信息 69 //获取浙江各地市链路信息
70 - $.get(proxy.domainName +proxy.cityUrl+'?access_token='+localStorage.getItem('access_token'),function(res){ 70 + $.get(proxy.domainName +proxy.cityUrl,function(res){
71 if(res.data && res.data.length > 0){ 71 if(res.data && res.data.length > 0){
72 const mapData = res.data; 72 const mapData = res.data;
73 proxy.mapData=mapData; 73 proxy.mapData=mapData;
@@ -71,10 +71,9 @@ export default { @@ -71,10 +71,9 @@ export default {
71 kpiIds: proxy.kpiIds, 71 kpiIds: proxy.kpiIds,
72 busId: proxy.busId, 72 busId: proxy.busId,
73 startTime:'', 73 startTime:'',
74 - endTime:'',  
75 - access_token:localStorage.getItem('access_token') 74 + endTime:''
76 }; 75 };
77 - $.get(proxy.domainName +proxy.apiUrl+'?access_token='+localStorage.getItem('access_token'),params,function (res) { 76 + $.get(proxy.domainName +proxy.apiUrl,params,function (res) {
78 const data = res; 77 const data = res;
79 let legendData=Vue.ref([]); 78 let legendData=Vue.ref([]);
80 let xAxisData=Vue.ref([]); 79 let xAxisData=Vue.ref([]);
@@ -41,7 +41,7 @@ export default { @@ -41,7 +41,7 @@ export default {
41 41
42 }) 42 })
43 const getData=()=>{ 43 const getData=()=>{
44 - $.get(proxy.domainName +proxy.apiUrl+'?busId='+proxy.busId+'&access_token='+localStorage.getItem('access_token'),function (res) { 44 + $.get(proxy.domainName +proxy.apiUrl+'?busId='+proxy.busId,function (res) {
45 const data = res; 45 const data = res;
46 if(data && data.data){ 46 if(data && data.data){
47 // proxy.resourceStatisticsData=data.data; 47 // proxy.resourceStatisticsData=data.data;