Karsa 1 vuosi sitten
vanhempi
commit
93c9a2f93a

+ 2 - 0
config/dev.env.js

@@ -7,6 +7,8 @@ module.exports = merge(prodEnv, {
   Domain:'"brilliantstart.cn"',
   Login:'"http://localhost:3030/login"',
   CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',
+  SHEET_LINK:'"https://charttest.hzinsights.com/sheetshow"',
+	REPORT_SHARE_LINK:'"http://rddpweb.brilliantstart.cn"',
   VUE_APP_HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
   VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/login"'

+ 2 - 0
config/prod.env.js

@@ -4,6 +4,8 @@ module.exports = {
 	Domain:'"hzinsights.com"',
 	Login:'"https://hzeta.hzinsights.com/login"',
 	CHART_LINK:'"https://chartlib.hzinsights.com/chartshow"',
+	SHEET_LINK:'"https://chartlib.hzinsights.com/sheetshow"',
+	REPORT_SHARE_LINK:'"https://ficc.hzinsights.com"',
 	VUE_APP_HR_MANAGEMENT_SYSTEM:'"https://hr.hzinsights.com/login"',
 	VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"https://fms.hzinsights.com/login"',
 	VUE_APP_CRM_SYSTEM:'"https://hzcrm.hzinsights.com/login"'

+ 2 - 0
config/prod.test.env.js

@@ -5,6 +5,8 @@ module.exports = {
 	// Login:'"http://rddpapi.brilliantstart.cn/login"',
 	Login:'"http://8.136.199.33:7778/login"',
 	CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',
+	SHEET_LINK:'"https://charttest.hzinsights.com/sheetshow"',
+	REPORT_SHARE_LINK:'"http://rddpweb.brilliantstart.cn"',
 	VUE_APP_HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
 	VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/login"'

+ 2 - 2
src/views/ppt_manage/mixins/pptMixins.js

@@ -508,7 +508,7 @@ export default {
     //加载iframe
     initSheetIframe(idName,sheetId){
       console.log('init sheet iframe',idName)
-      const LINK_URL = process.env.NODE_ENV === "production" ? 'https://chartlib.hzinsights.com/sheetshow' : 'https://charttest.hzinsights.com/sheetshow';
+      const LINK_URL = process.env.SHEET_LINK;
       $(`#${idName}`).append(`<iframe 
           src='${LINK_URL}?code=${sheetId}' 
           width='100%'
@@ -520,7 +520,7 @@ export default {
     },
     //获取表格iframe的高度,用于ppt转报告
     reInitIframe(e) {
-      const LINK_URLS=['https://chartlib.hzinsights.com','https://charttest.hzinsights.com']
+      const LINK_URLS=[process.env.CHART_LINK,process.env.SHEET_LINK]
       if(!LINK_URLS.includes(e.origin)) return
       /* console.log('iframe加载完成',e.data) */
       const { height,code } = e.data;

+ 1 - 1
src/views/report_manage/addreportNew.vue

@@ -670,7 +670,7 @@ export default {
 			}
 			//插入内容
 			let htmlStr=''
-			const LINK_CHART_URL = process.env.NODE_ENV === "production" ? 'https://chartlib.hzinsights.com/chartshow' : 'https://charttest.hzinsights.com/chartshow';
+			const LINK_CHART_URL = process.env.CHART_LINK;
 			
 			data.forEach(item=>{
 				const t=new Date().getTime()

+ 2 - 8
src/views/report_manage/editChapterReport.vue

@@ -872,10 +872,7 @@ export default {
         if (item.Disabled)
           return this.$message.warning("内部图表,不允许插入报告");
 
-        const LINK_CHART_URL =
-          process.env.NODE_ENV === "production"
-            ? "https://chartlib.hzinsights.com/chartshow"
-            : "https://charttest.hzinsights.com/chartshow";
+        const LINK_CHART_URL = process.env.CHART_LINK;
         this.$nextTick(() => {
           this.editor.html.insert(
             `<p style='text-align:left; margin-top:10px;'>
@@ -900,10 +897,7 @@ export default {
       }
       //插入内容
       let htmlStr = "";
-      const LINK_CHART_URL =
-        process.env.NODE_ENV === "production"
-          ? "https://chartlib.hzinsights.com/chartshow"
-          : "https://charttest.hzinsights.com/chartshow";
+      const LINK_CHART_URL = process.env.CHART_LINK;
 
       data.forEach((item) => {
         const t = new Date().getTime();

+ 1 - 1
src/views/report_manage/editreportNew.vue

@@ -664,7 +664,7 @@ export default {
 			}
 			//插入内容
 			let htmlStr=''
-			const LINK_CHART_URL = process.env.NODE_ENV === "production" ? 'https://chartlib.hzinsights.com/chartshow' : 'https://charttest.hzinsights.com/chartshow';
+			const LINK_CHART_URL = process.env.CHART_LINK;
 			
 			data.forEach(item=>{
 				const t=new Date().getTime()

+ 1 - 4
src/views/report_manage/mixins/editor.js

@@ -117,10 +117,7 @@ export default {
         selection.addRange(this.lastEditRange);
       }
       //插入内容
-      const LINK_CHART_URL =
-        process.env.NODE_ENV === "production"
-          ? "https://chartlib.hzinsights.com/chartshow"
-          : "https://charttest.hzinsights.com/chartshow";
+      const LINK_CHART_URL = process.env.CHART_LINK;
       this.$nextTick(() => {
         this.editor.html.insert(
           `<p style='text-align:left; margin-top:10px;'>

+ 2 - 8
src/views/report_manage/mixins/reportMixin.js

@@ -202,10 +202,7 @@ export default {
       if (item.Disabled)
         return this.$message.warning("内部图表,不允许插入报告");
 
-      const LINK_CHART_URL =
-        process.env.NODE_ENV === "production"
-          ? "https://chartlib.hzinsights.com/chartshow"
-          : "https://charttest.hzinsights.com/chartshow";
+      const LINK_CHART_URL = process.env.CHART_LINK;
       let fromPage = this.$route.path === "/reportEnEditor" ? "en" : "";
       this.$nextTick(() => {
         this.editor.html.insert(
@@ -218,10 +215,7 @@ export default {
 
     /* 插入表格 */
     insertSheet(item) {
-      const LINK_URL =
-        process.env.NODE_ENV === "production"
-          ? "https://chartlib.hzinsights.com/sheetshow"
-          : "https://charttest.hzinsights.com/sheetshow";
+      const LINK_URL = process.env.SHEET_LINK;
       this.$nextTick(() => {
         this.editor.html.insert(
           `<p style='text-align:left; margin-top:10px;'>

+ 1 - 2
src/views/report_manage/reportEn/reportEditor.vue

@@ -703,8 +703,7 @@ export default {
 			}
 			//插入内容
 			let htmlStr=''
-			const LINK_CHART_URL = process.env.NODE_ENV === "production" ? 'https://chartlib.hzinsights.com/chartshow' : 'https://charttest.hzinsights.com/chartshow';
-
+			const LINK_CHART_URL = process.env.CHART_LINK;
 			let fromPage = this.$route.path === '/reportEnEditor' ? 'en' :'';
 			
 			data.forEach(item=>{

+ 1 - 1
src/views/report_manage/reportdtl.vue

@@ -69,7 +69,7 @@
 		computed: {
 			linkUrl(){
 				let str=''
-				const baseUrl=process.env.NODE_ENV === "production"?'https://ficc.hzinsights.com':'http://rddpweb.brilliantstart.cn'
+				const baseUrl=process.env.REPORT_SHARE_LINK;
 				if(this.$route.query.code){
 					if(this.$route.query.fromPage == 'en'){
 						str=`${baseUrl}/reportshare_crm_report_en?code=${this.$route.query.code}`