token适配

@@ -4,6 +4,6 @@ const prodEnv = require('./prod.env')
 
 
 module.exports = merge(prodEnv, {
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   NODE_ENV: '"development"',
-  BASE_API: '"/aj-web"',
-  MONITOR_GATEWAY: '"/mj"'
+  BASE_API: '"http://127.0.0.1:8089"',
+  MONITOR_GATEWAY: '"http://127.0.0.1:7895/mj"'
 })
 })

@@ -75,13 +75,19 @@ export function getData(data) {
   let contextData = data.contextData;
   let contextData = data.contextData;
   if(contextData && Object.keys(contextData).length > 0){
   if(contextData && Object.keys(contextData).length > 0){
     for(var item in contextData ){
     for(var item in contextData ){
-      let val = getQueryVariable(item);
+      let key = item;
+      let val = getQueryVariable(key);
       if(val && val != false){
       if(val && val != false){
           contextData[item] = val;
           contextData[item] = val;
       }
       }
     }
     }
     data.contextData = contextData;
     data.contextData = contextData;
   }
   }
+  let queryVariable = getQueryVariable('AuthVal');
+  if(!queryVariable){
+    queryVariable  = localStorage.getItem("AuthVal");
+  }
+  data.contextData['accessToken'] = queryVariable
   return request({
   return request({
     url: 'reportDashboard/getData',
     url: 'reportDashboard/getData',
     method: 'post',
     method: 'post',

@@ -59,18 +59,31 @@ export default {
       let flag = this.optionsSetUp.flag;
       let flag = this.optionsSetUp.flag;
       let reportCode = this.optionsSetUp.ajCode;
       let reportCode = this.optionsSetUp.ajCode;
       let title = this.optionsSetUp.buttonText;
       let title = this.optionsSetUp.buttonText;
-      let param = {
-        type: 'openAJ',
-        data: {
+      // let param = {
+      //   type: 'openAJ',
+      //   data: {
+      //     resId: resId,
+      //     kpiId: kpiId,
+      //     flag: flag,
+      //     reportCode:reportCode,
+      //     title:title
+      //   }
+      //
+      // }
+      // window.parent.postMessage(param, '*')
+
+      let params = {
         resId: resId,
         resId: resId,
         kpiId: kpiId,
         kpiId: kpiId,
         flag: flag,
         flag: flag,
-          reportCode:reportCode,
-          title:title
+        reportCode: reportCode,
+        title: title
       }
       }
 
 
-      }
-      window.parent.postMessage(param, '*')
+      window.top.postMessage({
+        type: 'openAJ',
+        message: {'params': params}
+      }, '*')
     }
     }
   },
   },
 }
 }

 <template>
 <template>
   <div :style="styleObj">
   <div :style="styleObj">
-    <el-button type="primary" size="small" plain @click="openJimuReport">{{optionsSetUp.buttonText}}</el-button>
+    <el-button type="primary" size="small" plain @click="openJimuReport">{{ optionsSetUp.buttonText }}</el-button>
   </div>
   </div>
 
 
 </template>
 </template>
@@ -59,18 +59,32 @@ export default {
       let flag = this.optionsSetUp.flag;
       let flag = this.optionsSetUp.flag;
       let reportCode = this.optionsSetUp.reportCode;
       let reportCode = this.optionsSetUp.reportCode;
       let title = this.optionsSetUp.buttonText;
       let title = this.optionsSetUp.buttonText;
-      let param = {
-        type: 'openJimu',
-        data: {
+      // let param = {
+      //   type: 'openJimu',
+      //   data: {
+      //     resId: resId,
+      //     kpiId: kpiId,
+      //     flag: flag,
+      //     reportCode:reportCode,
+      //     title:title
+      //   }
+      //
+      // }
+      // window.parent.postMessage(param, '*')
+
+
+      let params = {
         resId: resId,
         resId: resId,
         kpiId: kpiId,
         kpiId: kpiId,
         flag: flag,
         flag: flag,
-          reportCode:reportCode,
-          title:title
+        reportCode: reportCode,
+        title: title
       }
       }
 
 
-      }
-      window.parent.postMessage(param, '*')
+      window.top.postMessage({
+        type: 'openJimu',
+        message: {'params': params}
+      }, '*')
     }
     }
   },
   },
 }
 }

@@ -149,8 +149,13 @@ export default {
       this.$store.commit('CHANGE_TREE',data)
       this.$store.commit('CHANGE_TREE',data)
     },
     },
     setSrc(data,node){
     setSrc(data,node){
-      let origin=window.location.origin;//当前域名
-      let srcName=origin+'/#/bigscreen/viewer?reportCode=';
+      let prePath = window.location.origin;
+      let basePath = process.env.BASE_API;
+      if(basePath.indexOf('http://') == -1){
+        prePath += basePath + "/index.html";
+      }
+      console.log('=====>1111111111111111111');
+      let srcName = prePath + '/#/bigscreen/viewer?reportCode=';
       // serviceCode,resourceCode
       // serviceCode,resourceCode
       let codeArr=[];
       let codeArr=[];
       let codeArrSecond=[];
       let codeArrSecond=[];