Merge branch 'master' into ybht_6.1

.gitignore

@@ -5,9 +5,9 @@
 /package-lock.json
 /dist.zip
 
-/hz_eta
-/hz_eta.rar
-/hz_eta.zip
+/eta_front
+/eta_front.rar
+/eta_front.zip
 
 /yarn-error.log
 

README.md

@@ -1,4 +1,4 @@
-# 弘则 ETA 模块项目
+# ETA 模块项目(弘则，试用平台，客户)
 
 ### styles
 - element-ui.scss elment-ui相关重置样式
@@ -6,5 +6,9 @@
 - global.scss 当做全局样式吧
 
 ### branch
-- master debug 内部eta分支
-- company_output 外部eta分支 同步时merge master
+- master  debug  sandbox
+
+### link
+- http://8.136.199.33:7778 弘则测试
+- https://eta.hzinsights.com 弘则正式
+- https://exptest.hzinsights.com 试用平台

build/build.js

@@ -10,7 +10,7 @@ var webpack = require('webpack')
 var config = require('../config')
 var webpackConfig = require('./webpack.prod.conf')
 
-var spinner = ora('building for production...,打包后的静态资源在 hz_eta 文件夹中')
+var spinner = ora('building for production...,打包后的静态资源在 eta_front 文件夹中')
 spinner.start()
 
 rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {

build/build.test.js

@@ -13,7 +13,7 @@ var webpackConfig = require('./webpack.prod.test.conf')
 var argv = process.argv.slice(2);
 var isPreProduction  = argv.indexOf('preProduction') !== -1;
 
-var spinner = ora('building for production.test...,打包后的静态资源在 hz_eta 文件夹中')
+var spinner = ora('building for production.test...,打包后的静态资源在 eta_front 文件夹中')
 spinner.start()
 
 rm(path.join(config.test.assetsRoot, config.test.assetsSubDirectory), err => {

config/index.js

@@ -9,8 +9,8 @@ console.log(argv,isPreProduction);
 module.exports = {
   build: {
     env: require('./prod.env'),
-    index: path.resolve(__dirname, '../hz_eta/index.html'),
-    assetsRoot: path.resolve(__dirname, '../hz_eta'),
+    index: path.resolve(__dirname, '../eta_front/index.html'),
+    assetsRoot: path.resolve(__dirname, '../eta_front'),
     assetsSubDirectory: 'static',
 //  assetsPublicPath: '/vue-admin/',
 		assetsPublicPath: './',
@@ -54,8 +54,8 @@ module.exports = {
   },
   test: {
     env: !isPreProduction ? require('./prod.test.env') : require('./prod.pre.env'),
-    index: !isPreProduction ? path.resolve(__dirname, '../hz_eta/index.html') : path.resolve(__dirname, '../hz_eta/index.html') ,
-    assetsRoot: !isPreProduction ? path.resolve(__dirname, '../hz_eta') : path.resolve(__dirname, '../hz_eta'),
+    index: !isPreProduction ? path.resolve(__dirname, '../eta_front/index.html') : path.resolve(__dirname, '../eta_front/index.html') ,
+    assetsRoot: !isPreProduction ? path.resolve(__dirname, '../eta_front') : path.resolve(__dirname, '../eta_front'),
     assetsSubDirectory: 'static',
 //  assetsPublicPath: '/vue-admin/',
 		assetsPublicPath: './',

index.html

@@ -6,7 +6,7 @@
 	<meta name="renderer" content="webkit" />
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-	<title>弘则ETA</title>
+	<title>ETA</title>
 
 	<link rel="stylesheet" href="./static/css/iconfont.css"/>
 	<link rel="icon" type="image/x-icon" href="./static/fa.ico" id="icon"/>

src/api/crypto.js

@@ -1,4 +1,6 @@
-const key = '6WpHp4vSvLVQK8SLioNZ7WMq';
+const key = '6WpHp4vSvLVQK8SLioNZ7WMq'; //eta
+// const key = 'cJ3b1I4YBlTc85vnxy36xip2'; //逸诺
+// const key = 'bvS3kVp7QIZoD70fPk1wk41n'; //试用
 
 class CryptoJS {
 	// 3DES加密，CBC/PKCS5Padding

src/main.js

@@ -176,8 +176,8 @@ router.beforeEach(async(to, from, next) => {
 router.afterEach((to, from, next) => {
   // 改变页面标题
   document.title = to.matched[to.matched.length - 1].name
-    ? `弘则ETA-${to.matched[to.matched.length - 1].name}`
-    : "弘则ETA";
+    ? `ETA-${to.matched[to.matched.length - 1].name}`
+    : "ETA";
   window.scrollTo(0, 0);
 });
 

src/views/Home.vue

@@ -446,7 +446,7 @@ export default {
     };
   },
   created() {
-    this.isInitialPwd(); //判断是否为初始密码
+    //this.isInitialPwd(); //判断是否为初始密码
     this.Role = localStorage.getItem("Role") || "";
     this.RoleType = localStorage.getItem("RoleType") || "";
     this.sysUserName = localStorage.getItem("userName") || "";
@@ -989,6 +989,7 @@ export default {
       padding: 0 30px;
       .main_left_container {
         display: flex;
+        flex-shrink: 0;
         align-items: center;
         .main_left_section {
           display: flex;

src/views/chartRelevance_manage/relevanceChartEditor.vue

@@ -147,7 +147,18 @@
         </div>  
 
         <div class="section">
-          <div>相关性</div>
+          <div>相关性
+            <el-tooltip
+              effect="dark"
+            >
+              <div
+                slot="content"
+                v-html="useTip['correlation']"
+                style="line-height: 20px;width:350px"
+              ></div>
+              <i class="el-icon-question" style="color:#666"/>
+            </el-tooltip>
+          </div>
           <div class="section-item">
             <div style="flex-shrink:0;min-width:70px"><span style="color:red;font-size:18px;">*</span>计算窗口</div>
             <el-input
@@ -196,7 +207,18 @@
 
 
       <div class="section" v-for="(item,index) in chartInfo.RollingCorrelation" :key="index">
-        <div>滚动相关性{{index+1}}</div>
+        <div>滚动相关性{{index+1}}
+          <el-tooltip
+            effect="dark"
+          >
+            <div
+              slot="content"
+              v-html="useTip['rollingCorrelation']"
+              style="line-height: 20px;width:350px"
+            ></div>
+            <i class="el-icon-question" style="color:#666"/>
+          </el-tooltip>
+        </div>
         <div class="section-item">
           <span style="flex-shrink:0;min-width:70px">计算窗口</span>
           <el-input
@@ -478,6 +500,14 @@ export default {
        /* 指标入库 */
       isSaveEdbToBase: false,
 
+      /* 使用说明 */
+      useTip:{
+        correlation: `计算窗口：参与计算的历史数据时间段；<br>
+          分析周期：指标B领先A的期数，如配置参数10个月，表示B领先A -10月、B领先A -9月，...，B领先A 9月、B领先A 10月，每期分别计算相关性值；`,
+        rollingCorrelation:`计算窗口：参与计算的时间段长度，从两个指标都有值的日期开始滚动的取计算窗口长度的值进行计算，如配置计算窗口1个月，则2023.7.28的值取2023.6.28~2023.7.28时间段，2023.7.27的值取2023.6.27~2023.7.27时间段；<br>
+        B领先A：B指标领先A指标的参数，为0时不领先；`
+      }
+
     };
   },
   methods: {

src/views/dataEntry_manage/chartSetting.vue

@@ -1055,7 +1055,7 @@ export default {
     resetNodeStyle: _.debounce(function (node) {
       const tree = $('.target_tree')[0];
       let width = tree.offsetWidth;
-      let label_wid = width > 500 ? 'auto' : width <= 250 ? 80 : 0.58 * width;
+      let label_wid = width > 500 ? 'auto' : width <= 250 ? 80 : 0.4 * width;
       this.$set(node, 'Nodewidth', label_wid + 'px');
     }, 300),
     /* 双击label出现input修改框 */
@@ -1166,42 +1166,35 @@ export default {
              * 1 关联图表一
              * 2 有子目录无图表
              */
-            if (res.Data.DeleteStatus === 1)
-              this.$confirm('该分类下关联图表不可删除', '删除失败', {
+            const deleteLabelMap = {
+              1: '该分类下关联图表不可删除',
+              2: '确认删除当前分类及包含的子分类吗？',
+              4: res.Data.TipsMsg
+            }
+
+            if([1,4].includes(res.Data.DeleteStatus)) this.$confirm(
+                deleteLabelMap[res.Data.DeleteStatus],
+                '删除失败',
+                {
                 confirmButtonText: '知道了',
-                showCancelButton: false,
-                type: 'error',
-              });
-            else if (res.Data.DeleteStatus === 0 && !data.ChartInfoId)
-              this.$confirm('确定删除当前分类吗？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-              })
-                .then(() => {
-                  this.delHandle(data.ChartClassifyId, data.ChartInfoId);
-                })
-                .catch(() => {});
-            else if (res.Data.DeleteStatus === 0 && data.ChartInfoId)
-              this.$confirm('删除后该图表将不能再引用，确认删除吗？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
+                showCancelButton:false,
+                type: 'error'
               })
-                .then(() => {
-                  this.delHandle(data.ChartClassifyId, data.ChartInfoId, 1);
-                })
-                .catch(() => {});
-            else if (res.Data.DeleteStatus === 2)
-              this.$confirm('确认删除当前分类及包含的子分类吗？', '提示', {
+            else if([0,2].includes(res.Data.DeleteStatus)) this.$confirm(
+                res.Data.DeleteStatus === 2 
+                ? deleteLabelMap[res.Data.DeleteStatus]
+                : data.ChartInfoId?'删除后该图表将不能再引用，确认删除吗？':'确定删除当前分类吗?', 
+                '提示',
+                {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
-                type: 'warning',
-              })
-                .then(() => {
-                  this.delHandle(data.ChartClassifyId, data.ChartInfoId);
-                })
-                .catch(() => {});
+                type: 'warning'
+              }).then(() => {
+                res.Data.DeleteStatus === 0 && data.ChartInfoId 
+                ? this.delHandle(data.ChartClassifyId, data.ChartInfoId, 1)
+                : this.delHandle(data.ChartClassifyId, data.ChartInfoId);
+              }).catch(() => {         
+              });
           }
         });
     },
@@ -2651,7 +2644,7 @@ export default {
       }
       .main-left {
         width: 400px;
-        min-width: 300px;
+        min-width: 350px;
         background: #fff;
         margin-right: 20px;
         border: 1px solid #ececec;

src/views/dataEntry_manage/databaseList.vue

@@ -990,6 +990,7 @@ export default {
 		resetNodeStyle: _.debounce(function(node) {
 			const tree = $('.target_tree')[0];
 			let width = tree.offsetWidth;
+			console.log(width)
 			// let label_wid = width > 500 ? 'auto' : (width <= 300 && width < 360) ?  100 : 0.7*width;
 			let label_wid =
 				width > 500
@@ -1190,40 +1191,25 @@ export default {
 					 * 1 关联指标
 					 * 2 有子目录无指标
 					*/
+					const deleteLabelMap = {
+						1: '该目录关联指标不可删除',
+						2: '确认删除当前目录及包含的子目录吗？',
+						3: '当前指标已用作画图，不可删除',
+						4: res.Data.TipsMsg
+					}
+
 					if([1,3,4].includes(res.Data.DeleteStatus)) this.$confirm(
-							res.Data.DeleteStatus === 1 ? '该目录关联指标不可删除' 
-							: res.Data.DeleteStatus === 3 ? '当前指标已用作画图，不可删除'
-							: res.Data.TipsMsg,
+							deleteLabelMap[res.Data.DeleteStatus],
 							'删除失败',
 							{
 							confirmButtonText: '知道了',
 							showCancelButton:false,
 							type: 'error'
 						})
-					else if(res.Data.DeleteStatus === 0 && !data.EdbCode) this.$confirm(
-							'确定删除当前目录吗?', 
-							'提示',
-							{
-							confirmButtonText: '确定',
-							cancelButtonText: '取消',
-							type: 'warning'
-						}).then(() => {
-							this.delHandle(data.ClassifyId,data.EdbInfoId);
-						}).catch(() => {         
-						});
-					else if(res.Data.DeleteStatus === 0 && data.EdbCode) this.$confirm(
-							'删除后指标和指标值均不可使用，确认删除吗？', 
-							'提示',
-							{
-							confirmButtonText: '确定',
-							cancelButtonText: '取消',
-							type: 'warning'
-						}).then(() => {
-							this.delHandle(data.ClassifyId,data.EdbInfoId);
-						}).catch(() => {         
-						});
-					else if(res.Data.DeleteStatus === 2) this.$confirm(
-							'确认删除当前目录及包含的子目录吗？', 
+					else if([0,2].includes(res.Data.DeleteStatus)) this.$confirm(
+							res.Data.DeleteStatus === 2 
+							? deleteLabelMap[res.Data.DeleteStatus]
+							: data.EdbCode?'删除后指标和指标值均不可使用，确认删除吗？':'确定删除当前目录吗?', 
 							'提示',
 							{
 							confirmButtonText: '确定',

src/views/positionAnalysis_manage/components/chartDetail.vue

@@ -23,23 +23,6 @@
             >
           </el-radio-group>
         </div>
-        <div>
-          <el-date-picker
-            v-model="selectDate"
-            type="date"
-            placeholder="请选择日期"
-            value-format="yyyy-MM-dd"
-            :picker-options="pickerOption"
-            @change="getInfo"
-            style="margin-right: 10px"
-          />
-          <el-button type="primary" @click="handleDateChange('before')"
-            >查看前一天</el-button
-          >
-          <el-button type="primary" @click="handleDateChange('next')"
-            >查看后一天</el-button
-          >
-        </div>
       </div>
       <div
         class="chart-wrap"
@@ -75,22 +58,6 @@ import {
 import chartBox from "./chartBox.vue";
 export default {
   components: { chartBox },
-  computed: {
-    pickerOption() {
-      let that = this;
-      let obj = {
-        // 周六日禁用
-        disabledDate(t) {
-          if ([5, 6].includes(that.$moment(t).weekday())) {
-            return true;
-          } else {
-            return false;
-          }
-        },
-      };
-      return obj;
-    },
-  },
   watch: {
     "$route.query": {
       handler(nval) {
@@ -106,7 +73,7 @@ export default {
       isRefresh: false,
 
       minDate: new Date("2000/01/01"),
-      currentDate: "", //
+      latestDate: "", //
       selectDate: "",
 
       allClassifyTypeList: [],
@@ -248,10 +215,12 @@ export default {
           };
         }
         this.chartItemInfo = this.chartListState[this.tabKey];
+        this.latestDate = res.Data.LastDataTime;
         if (res.Data.DataTime) {
           this.selectDate = this.$moment(res.Data.DataTime).format(
             "YYYY-MM-DD"
           );
+          this.$emit('setInfo',{date: this.selectDate})
         }
 
         this.$store.commit(

src/views/positionAnalysis_manage/detail.vue

@@ -1,15 +1,27 @@
 <template>
   <div class="hasrightaside-box position-analysis-detail-page">
     <div class="detail-top">
-      <span></span>
       <div>
-        <el-button type="primary" @click="refreshData" plain>一键刷新</el-button>
+          <el-date-picker
+            v-model="selectDate"
+            type="date"
+            placeholder="请选择日期"
+            value-format="yyyy-MM-dd"
+            :picker-options="pickerOption"
+            @change="handleOpt('date')"
+            style="margin-right: 10px"
+          />
+          <el-button type="primary" plain @click="handleOpt('beforeDate')">查看前一天</el-button>
+          <el-button type="primary" plain @click="handleOpt('nextDate')" :disabled="disabledNextBtn">查看后一天</el-button>
+        </div>
+      <div>
+        <!-- <el-button type="primary" @click="refreshData" plain>一键刷新</el-button> -->
         <el-button type="primary" @click="handleOpt('beforeClassifyType')">上一个合约</el-button>
         <el-button type="primary" @click="handleOpt('nextClassifyType')">下一个合约</el-button>
       </div>
     </div>
     <div class="content-box detail-content">
-        <chartDetail ref="chartDetailRef"/>
+        <chartDetail ref="chartDetailRef" @setInfo="e => { selectDate=e.date; }"/>
     </div>
    
   </div>
@@ -21,9 +33,33 @@ export default {
   components: { chartDetail },
   data() {
     return {
+      selectDate: ''
     }
   },
+  computed: {
+    pickerOption() {
+      let that = this;
+      let obj = {
+        // 周六日禁用
+        disabledDate(t) {
+          if ([5, 6].includes(that.$moment(t).weekday())) {
+            return true;
+          } else {
+            return false;
+          }
+        },
+      };
+      return obj;
+    },
 
+    disabledNextBtn() {
+      if(this.selectDate) {
+        return new Date(this.selectDate).getTime() >= new Date(this.$refs.chartDetailRef.latestDate).getTime()
+      }else {
+        return true
+      }
+    }
+  },
   methods: {
     // 操作选项
     handleOpt(type){

src/views/predictEdb_manage/components/chartInfo.vue

@@ -169,15 +169,15 @@ export default {
         // 曲线图/季节图切换
         chartTypeChange(){
             this.chartInfo.ChartType=this.chartInfo.ChartType==1?2:1
-            this.$emit('refreshData')
+            this.$emit('refreshData','saveLimit')
         },
 
         seasonYearChange(){
-            this.$emit('refreshData')
+            this.$emit('refreshData','saveLimit')
         },
 
         seasonTypeChange2(){
-            this.$emit('refreshData')
+            this.$emit('refreshData','saveLimit')
         }
     },
 }

src/views/predictEdb_manage/predictEdb.vue

@@ -823,21 +823,55 @@ export default {
 
 			const { Data } = await preDictEdbInterface.classifyDelCheck({ ClassifyId,EdbInfoId })
 
-			const { DeleteStatus } = Data;
-
-			DeleteStatus === 1 
-			? this.$confirm('该分类下关联指标不可删除', '删除失败', {
-				confirmButtonText: '知道了',
-				showCancelButton: false,
-				type: 'error',
-			}) : DeleteStatus === 0 && !EdbInfoId
-			?  this.$confirm('确定删除当前分类吗？', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			}).then(() => {
-				this.delApi(ClassifyId, EdbInfoId)
-			}): null;
+			const { DeleteStatus,TipsMsg } = Data;
+
+			// DeleteStatus === 1 
+			// ? this.$confirm('该分类下关联指标不可删除', '删除失败', {
+			// 	confirmButtonText: '知道了',
+			// 	showCancelButton: false,
+			// 	type: 'error',
+			// }) : DeleteStatus === 0 && !EdbInfoId
+			// ?  this.$confirm('确定删除当前分类吗？', '提示', {
+			// 	confirmButtonText: '确定',
+			// 	cancelButtonText: '取消',
+			// 	type: 'warning',
+			// }).then(() => {
+			// 	this.delApi(ClassifyId, EdbInfoId)
+			// }): null;
+
+			/**
+			 * 0 可删除
+			 * 1 关联指标
+			 * 2 有子目录无指标
+			*/
+			const deleteLabelMap = {
+				1: '该目录关联指标不可删除',
+				2: '确认删除当前目录及包含的子目录吗？',
+				3: '当前指标已用作画图，不可删除',
+				4: TipsMsg
+			}
+
+			if([1,3,4].includes(DeleteStatus)) this.$confirm(
+					deleteLabelMap[DeleteStatus],
+					'删除失败',
+					{
+					confirmButtonText: '知道了',
+					showCancelButton:false,
+					type: 'error'
+				})
+			else if([0,2].includes(DeleteStatus)) this.$confirm(
+					DeleteStatus === 2 
+					? deleteLabelMap[DeleteStatus]
+					: EdbInfoId?'删除后指标和指标值均不可使用，确认删除吗？':'确定删除当前目录吗?', 
+					'提示',
+					{
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.delApi(ClassifyId, EdbInfoId)
+				}).catch(() => {         
+				});
 
     },