Merge branch 'master' of http://8.136.199.33:3000/eta_front/eta_front

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -703,9 +703,11 @@ export default {
 			this.updateData.splice(index, 1)
 			this.$message.success(this.$t('MsgPrompt.delete_msg'))
 			//删除指标时，检测上下限，修改上下限
-			this.isModifyEdb = true
-			if(this.updateLimit){
-				this.EdbAxisChange()
+			if(![7,10,11].includes(this.chartInfo.ChartType)){
+				this.isModifyEdb = true
+				if(this.updateLimit){
+					this.EdbAxisChange()
+				}
 			}
 			//添加图表时重置默认样式
 			this.$route.path==='/addchart' && this.resetChartEdbDefault();

src/views/predictEdb_manage/predictEdb.vue

@@ -1527,9 +1527,9 @@ export default {
 	mounted() {
 		const obj=sessionStorage.getItem('predictEdbTreeData')
 		if(obj||this.$route.query.code){
-			let code=obj?this.$route.query.code:JSON.parse(obj).code
-			let id=obj?this.$route.query.id:JSON.parse(obj).id
-			let classifyId=obj?this.$route.query.classifyId:JSON.parse(obj).classifyId
+			let code=this.$route.query.code?this.$route.query.code:JSON.parse(obj).code
+			let id=this.$route.query.code?this.$route.query.id:JSON.parse(obj).id
+			let classifyId=this.$route.query.code?this.$route.query.classifyId:JSON.parse(obj).classifyId
 			this.getTreeData({code: code,id: Number(id),classifyId:Number(classifyId)})
 		}else{
 			this.getTreeData()