Merge branch 'ETA1.0.3'

src/views/dataEntry_manage/databaseComponents/chartTrendRender.vue

@@ -130,12 +130,16 @@ export default {
 		}
 	},
 	watch: {
-		edbid(newval){
-			if(newval){
-				this.chart_type = 1
-				this.isShowOnyearData = false
-				this.getDataByPath()
-			}
+		edbid:{
+			handler(newVal){
+				console.log('??')
+				if(newVal){
+					this.chart_type = 1
+					this.isShowOnyearData = false
+					this.getDataByPath()
+				}
+			},
+			immediate:true
 		}
 	},
 	data () {

src/views/dataEntry_manage/databaseList.vue

@@ -696,10 +696,8 @@ export default {
 				this.defaultWarn = '请在左侧选择指标';
 				this.activeTab=''
 			}else {
+				console.log('new val')
 				this.activeTab='Chart'
-				this.page_no = 1
-				this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
-				console.log('scroll 置0')
 				this.initGetData();
 			}
 		},
@@ -710,7 +708,9 @@ export default {
 					(item) => item.EdbInfoId === newval
 				);
 				this.page_no = 1;
-				this.$refs.valueUl&&(this.$refs.valueUl.scrollTop = 0);
+				if(this.$refs.edb_detail_data){
+					this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
+				}
 				this.select_node = search_obj.UniqueCode;
 				this.selected_edbid = newval;
 			}
@@ -844,7 +844,9 @@ export default {
 						this.$refs.menuTree.setCurrentKey(null)
 					}
 					if(type==='refresh') {
-						this.$refs.valueUl&&(this.$refs.valueUl.scrollTop = 0);
+						if(this.$refs.edb_detail_data){
+							this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
+						}
 					}
 					this.$nextTick(()=>{
 						const _node = this.$refs.menuTree.getNode(this.select_node)
@@ -1603,8 +1605,8 @@ export default {
 
 		initGetData() {
 			this.page_no = 1;
-			if(this.$refs.valueUl){
-				this.$refs.valueUl.scrollTop = 0;
+			if(this.$refs.edb_detail_data){
+				this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
 			}
 			this.getDataList();
 		},
@@ -1759,7 +1761,9 @@ export default {
 		/* 重新刷新 重新计算后重置刷数据 */
 		initDataStatus() {
 			this.page_no = 1;
-			this.$refs.valueUl.scrollTop = 0;
+			if(this.$refs.edb_detail_data){
+				this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
+			}
 			this.getDataList();
 		},
 		/* 用于复制指标 */
@@ -1900,7 +1904,8 @@ export default {
 			const {MaxValue=0,MinValue=0} = this.$refs.createChart.chartInfo
 			dataBaseInterface.saveEdbChartLimit({
 				EdbInfoId:this.EdbData.EdbInfoId,
-				MaxValue,MinValue
+				MaxValue:Number(MaxValue),
+				MinValue:Number(MinValue)
 			}).then(res=>{
 				if(res.Ret!==200) return 
 				this.$message.success('保存成功')
@@ -2201,7 +2206,7 @@ export default {
 					}
 					.list-item{
 						width:23%;
-						/* height:280px; */
+						height:375px;
 						background-color: #fff;
 						display: flex;
 						flex-direction: column;

src/views/predictEdb_manage/components/edbDetail.vue

@@ -24,7 +24,7 @@
                 :key="item.EdbDataId"
             >
                 <span class="value-label date" style="width:240px">
-                    <span>
+                    <span style="position: relative;">
                         <i class="new-tag" v-if="EdbData.LatestDate===item.DataTime"></i>
                         {{ item.DataTime }}
                     </span>