Merge branch 'master' into ETA1.1.4_report

config/dev.env.js

@@ -13,5 +13,6 @@ module.exports = merge(prodEnv, {
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
   VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"',
   VUE_APP_ETA_DOCS:'"http://8.136.199.33:8622/update/index"',
-	VUE_APP_ETA_HELP_DOCS:'"http://8.136.199.33:8622/help/index"'
+	VUE_APP_ETA_HELP_DOCS:'"http://8.136.199.33:8622/help/index"',
+    VUE_APP_ETA_VIDEO:'"http://8.136.199.33:8622/video/list"',
 });

config/prod.env.js

@@ -10,6 +10,7 @@ module.exports = {
 	VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"https://fms.hzinsights.com/login"',
 	VUE_APP_CRM_SYSTEM:'"https://admin.hzinsights.com/temppage"',
 	VUE_APP_ETA_DOCS:'"https://etadocs.hzinsights.com/update/index"',
-	VUE_APP_ETA_HELP_DOCS:'"https://etadocs.hzinsights.com/help/index"'
+	VUE_APP_ETA_HELP_DOCS:'"https://etadocs.hzinsights.com/help/index"',
+	VUE_APP_ETA_VIDEO:'"https://etadocs.hzinsights.com/video/list"',
 		
 }

config/prod.test.env.js

@@ -10,5 +10,6 @@ module.exports = {
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
 	VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"',
 	VUE_APP_ETA_DOCS:'"http://8.136.199.33:8622/update/index"',
-	VUE_APP_ETA_HELP_DOCS:'"http://8.136.199.33:8622/help/index"'
+	VUE_APP_ETA_HELP_DOCS:'"http://8.136.199.33:8622/help/index"',
+	VUE_APP_ETA_VIDEO:'"http://8.136.199.33:8622/video/list"',
 }

src/mixins/theme.js

@@ -30,5 +30,6 @@ export default {
   login_logo: require('@/assets/img/login_logo.png'),
   g_logo: require('@/assets/img/home/logo.png'),
   g_mini_logo: require('@/assets/img/home/eta_mini.png'),
-  dynamicOutLinks:{}//动态的外部link链接
+  dynamicOutLinks:{},//动态的外部link链接
+  bus_code:'',
 }

src/utils/common.js

@@ -64,7 +64,7 @@ export function getUrlParams(str=window.location.href,key) {
 
 // 上传文件 直接走对象存取服务器
 export function uploadFileDirect(objectStorageClient,file,temName,options={}){
-  const objectStorageType= (objectStorageClient || JSON.parse(localStorage.getItem('dynamicOutLinks')).ObjectStorageClient)
+  const objectStorageType= (objectStorageClient || JSON.parse(localStorage.getItem('dynamicOutLinks')).ObjectStorageClient || 'oss')
   // console.log(objectStorageType,'objectStorageType');
   // return 
   if(!objectStorageType){
@@ -106,7 +106,7 @@ const handleUploadToOSS= (file,fileName,options={})=>{
     // 获取oss临时签名
     const res=await getOSSSign({StorageSource:1})
     // console.log(res);
-    if(res.Ret!==200) reject("获取阿里云oss临时签名错误")
+    if(res.Ret!==200) reject("获取阿里云oss临时签名错误,res.Ret="+res.Ret)
     try {
 
       let oss_params = {
@@ -153,7 +153,7 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
 
     const res=await getOSSSign({StorageSource:2})
     // console.log(res);
-    if(res.Ret!==200) reject("获取minio临时签名错误")
+    if(res.Ret!==200) reject("获取minio临时签名错误,res.Ret="+res.Ret)
     // return
     const minioClient = new Minio.Client({
       endPoint: res.Data.Endpoint.split(':')[0],

src/utils/svgToblob.js

@@ -30,7 +30,7 @@
           );
         })
       }else {
-        bus.$message.warning('浏览器暂不支持')
+        bus.$message.warning('当前协议暂不支持，仅支持https协议')
       }
     }	
  

src/views/Home.vue

@@ -497,6 +497,7 @@ export default {
       getBusinessCode().then(res=>{
         if(res.Ret!==200) return 
         this.bus_code = res.Data||''
+        this.$setting.bus_code = this.bus_code
       })
     },
     //判断是否为初始密码

src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -28,7 +28,7 @@
         :disabled="operationForm.view"
       >
 			
-        <el-form-item label="自变量" prop="self_variate">
+        <el-form-item label="自变量（x）" prop="self_variate">
           <el-select
             v-model="formData.self_variate"
             v-loadMore="searchLoad"
@@ -72,7 +72,7 @@
           </template>  
         </el-form-item>
 
-        <el-form-item label="因变量" prop="depend_variate">
+        <el-form-item label="因变量（y）" prop="depend_variate">
           <el-select
             v-model="formData.depend_variate"
             v-loadMore="searchLoad"
@@ -117,7 +117,7 @@
             @change="changeDate"
             :picker-options="endDateOptions"
           />
-					<span v-if="correlationIndex" class="editsty" style="margin-left: 20px">相关系数:{{correlationIndex}}</span>
+					<span v-if="correlationStr" class="editsty" style="margin-left: 20px">{{correlationStr}}</span>
         </el-form-item>
         <el-form-item label="指标名称" prop="edb_name" class="target-form-cont">
           <el-input
@@ -225,6 +225,8 @@ export default {
 					StartDate: item.StartDate,
 					EndDate: item.EndDate,
 				}))
+
+				this.correlationStr = backData.correlationStr;
 				
 			}
 		}
@@ -298,7 +300,7 @@ export default {
 			depend_edb_name: '',
 			self_edb_name: '',
 
-			correlationIndex: '',//相关系数
+			correlationStr: '',//相关系数
 
 		};
 	},
@@ -397,9 +399,9 @@ export default {
 		/* 获取相关系数 */
 		async getCorrelationIndex() {
 
-			if(!this.formData.self_variate || !this.formData.depend_variate || !this.formData.date[0] || !this.formData.date[1]) return this.correlationIndex = '';
+			if(!this.formData.self_variate || !this.formData.depend_variate || !this.formData.date[0] || !this.formData.date[1]) return this.correlationStr = '';
 			
-			if(this.formData.self_move_type===1 && !this.formData.self_move_val) return this.correlationIndex = '';
+			if(this.formData.self_move_type===1 && !this.formData.self_move_val) return this.correlationStr = '';
 
 			const { date,self_variate,self_move_type,self_move_val,depend_variate } = this.formData;
 			let params = {
@@ -423,7 +425,7 @@ export default {
 
 			if(res.Ret !==200) return
 			
-			this.correlationIndex = res.Data;
+			this.correlationStr = res.Data;
 		},
 
     /* 选择日期 */
@@ -445,6 +447,7 @@ export default {
 
 		init() {
 			this.searchOptions = [];
+			this.correlationStr = '';
 			this.formData = {
 				self_variate: '',
         self_move_type: 0,

src/views/dataEntry_manage/databaseList.vue

@@ -1754,6 +1754,7 @@ export default {
 							old_stay_edb: type === 24 ? old_edb.find(item => item.FromTag === 'A').FromEdbInfoId : '',
 							concat_edb: type === 24 ? old_edb.find(item => item.FromTag === 'B').FromEdbInfoId : '',
 							from_arr: old_edb,
+							correlationStr: dataInfo.CorrelationStr
 						} 
 					: {
 							...public_params,

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -1934,7 +1934,7 @@ export const chartSetMixin = {
             );
           });
         }else {
-          this.$message.warning('浏览器暂不支持')
+          this.$message.warning('当前协议暂不支持，仅支持https协议')
         }
       };
     },

src/views/ppt_manage/mixins/mixins.js

@@ -337,9 +337,10 @@ export default {
 
 
       // 农历数据需要去除第一项 在ETA1.0.5之后，除了这里 农历和公历处理逻辑一样
+      const temChartDataList=chartData.DataList||[]
       const chartDataHandle=this.calendar_type === '农历'?
-      chartData.DataList.filter((item, index) => index > 0):
-      chartData.DataList
+      temChartDataList.filter((item, index) => index > 0):
+      temChartDataList
       let seasonYdata = [],
         seasonData = [],
         chart = {

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -249,7 +249,10 @@
         <div class="tool-side ppt-page-wrap">
           <div class="ppt-info">
             <div>作者：{{pptItem.AdminRealName}}</div>
-            <div>{{pptItem.PptxUrl?'发布':'保存'}}时间：{{$moment(pptTime).format('YYYY-MM-DD')}}</div>
+            <div>
+              {{pptItem.PptxUrl?'发布':'保存'}}
+              时间：{{$moment(pptItem.PptxUrl?pptItem.PublishTime || undefined:pptItem.PptModifyTime || undefined).format('YYYY-MM-DD')}}
+            </div>
           </div>
           <div class="tool-list-operation">
             <span>操作</span>

src/views/ppt_manage/newVersion/pptEnCatalog.vue

@@ -239,7 +239,10 @@
         <div class="tool-side ppt-page-wrap">
           <div class="ppt-info">
             <div>作者：{{pptItem.AdminRealName}}</div>
-            <div>{{pptItem.PptxUrl?'发布':'保存'}}时间：{{$moment(pptTime).format('YYYY-MM-DD')}}</div>
+            <div>
+              {{pptItem.PptxUrl?'发布':'保存'}}
+              时间：{{$moment(pptItem.PptxUrl?pptItem.PublishTime || undefined:pptItem.PptModifyTime || undefined).format('YYYY-MM-DD')}}
+            </div>
           </div>
           <div class="tool-list-operation">
             <span>操作</span>

src/views/ppt_manage/newVersion/utils/untils.js

@@ -500,6 +500,7 @@ export const caclShapeRealSize = (layer,shape)=>{
 //将rgba转为hex+透明度的格式
 //rgba(91,155,213,0.44) -> {color: "#5b9bd5",transparency: 56}
 const parseRgbaColor = (color) => {
+  if(!color) color='rgba(51, 51, 51, 1)'
   const arr = color.match(/(\d(\.\d+)?)+/g) || [];
   const res = arr.map((s) => parseInt(s, 10));
   return {

src/views/predictEdb_manage/addPredicEdb.vue

@@ -379,6 +379,7 @@
         <div class="top-title">{{ formData.edbName }}</div>
         <chartInfo
           :edbData="edbData"
+          :isAllowEditLimit="true"
           @refreshData="refreshData"
           ref="chartInfo"
         />

src/views/predictEdb_manage/predictEdb.vue

@@ -1112,7 +1112,7 @@ export default {
 		},
 
 		/* 计算指标回显 */
-		setComputedDialogForm({Source,CalculateList,CalculateFormula,EdbInfoId,EdbName,Unit,Frequency,ClassifyId,MoveType,MoveFrequency,Calendar},type='') {
+		setComputedDialogForm({Source,CalculateList,CalculateFormula,EdbInfoId,EdbName,Unit,Frequency,ClassifyId,MoveType,MoveFrequency,Calendar,CorrelationStr},type='') {
 			//找到指标的父级
 			let deep_arr = _.cloneDeep(this.treeData);
 			const parentNodes = this.findParentNodeHandle(deep_arr,ClassifyId,'ClassifyId')
@@ -1154,6 +1154,7 @@ export default {
 						old_stay_edb: Source === 48 ? CalculateList.find(item => item.FromTag === 'A').FromEdbInfoId : '',
 						concat_edb: Source === 48 ? CalculateList.find(item => item.FromTag === 'B').FromEdbInfoId : '',
 						from_arr: CalculateList,
+						correlationStr: CorrelationStr
 					}
 					return
 				}

src/views/sandbox_manage/index.vue

@@ -549,7 +549,7 @@ export default {
           });
         }else {
           this.lockLoding && this.lockLoding.close();
-          this.$message.warning('浏览器暂不支持')
+          this.$message.warning('当前协议暂不支持，仅支持https协议')
         }
       }
     }, 500),

src/views/sandbox_manage/sandFlow/index.vue

@@ -303,7 +303,7 @@ export default {
 										});
 									}else {
 										this.lockLoding && this.lockLoding.close();
-										this.$message.warning('浏览器暂不支持')
+										this.$message.warning('当前协议暂不支持，仅支持https协议')
 									}	
                 }
 			},{

src/views/semantics_manage/semanticsPage.vue

@@ -311,7 +311,7 @@ export default {
               );
             });
           }else {
-            this.$message.warning('浏览器暂不支持')
+            this.$message.warning('当前协议暂不支持，仅支持https协议')
           }
 
       }

src/views/system_manage/dataAuthManage.vue

@@ -178,11 +178,7 @@ export default {
 		/* 选择人员 */
 		chooseUser(val) {
 			if(!val) return
-			if(val.length) {
-				// console.log(val)
-				let id = val[2];
-				this.filterClassify(this.classifyArr,Number(id));
-			}
+			this.filterClassify(this.classifyArr,Number(val));
 		},
 		// 遍历取值 push数组
 		filterClassify(arr,id) {

src/views/system_manage/etaBaseConfig.vue

@@ -449,11 +449,13 @@ export default {
             let form = new FormData();
             form.append('file',file.file);
             bannerupload(form).then(res=>{
+                console.log(res);
                 if(res.Ret!==200) return 
                 if(['CnPptCoverImgs','EnPptCoverImgs'].includes(key)){
                     this.formData[key].push(res.Data.ResourceUrl)
                 }else{
-                    this.formData[key] = res.Data.ResourceUrl
+                    this.$set(this.formData,key,res.Data.ResourceUrl)
+                    // this.formData[key] = res.Data.ResourceUrl
                 }
                 console.log(this.formData);
             })
@@ -495,7 +497,8 @@ export default {
                 this.checkList = WatermarkChart==='true'?['研报图表']:[]
                 this.Iflytek = UseXf==='true'?true:false
                 if(res.Data){
-                    this.formData = res.Data
+                    // this.$set(this,'formData',res.Data)
+                    this.formData = {...this.formData,...res.Data}
                     this.formData.CnPptCoverImgs = CnPptCoverImgs.length?CnPptCoverImgs.split(','):[]
                     this.formData.EnPptCoverImgs = EnPptCoverImgs.length?EnPptCoverImgs.split(','):[]
                 }

src/views/system_manage/outlinkList.vue

@@ -35,6 +35,12 @@ import {outlinkConfigInterence} from "@/api/modules/etaBaseConfigApi.js"
           if(res.Ret == 200){
             this.outlinkData = res.Data.List || []
             // console.log(this.outlinkData);
+            //ETA1.0.8 在数组开头增加一项培训视频链接
+            this.outlinkData.unshift({
+                Id:9999,
+                Title:'培训视频课堂',
+                Url:`${process.env.VUE_APP_ETA_VIDEO}?bus_code=${this.$setting.bus_code}`
+            })
           }
         })
       },