代码微调，echarts组件更新

package.json

@@ -11,7 +11,7 @@
     "@element-plus/icons-vue": "^2.0.10",
     "@imengyu/vue3-context-menu": "^1.2.10",
     "axios": "^1.3.4",
-    "echarts": "^5.4.2",
+    "echarts": "^5.4.3",
     "element-plus": "^2.3.3",
     "pinia": "^2.0.32",
     "vue": "^3.2.47",

src/api/singleLayoutTemp.js

@@ -2,7 +2,13 @@ import request from '../utils/request';
 
 const api={}
 
-
+api.loadMultiTemps=(tempType)=>{
+	return request({
+	    url: '/base/temp/loadTempByTypes',
+	    method: 'post',
+		data:{tempType}
+	});
+}
 
 api.loadTempList=()=>{
 	return request({

src/api/wellPatrol.js

@@ -57,12 +57,19 @@ api.processAlarm=(alarm)=>{
 	return alarm
 }
 
-//暂时从模板表取
-api.loadSingleGrpCurveTemp=(tempId)=>{
+api.loadSingleGrpCurveTemp=(wellId)=>{
 	return request({
-	    url: '/base/temp/get',
+	    url: '/singlepatrol/getTempByType',
 	    method: 'post',
-		data:  {tempId}
+		data:  {wellId,tempType:'singleGroup'}
+	});
+}
+
+api.loadGrpCurveData=(wellId,paramCode,startDate,endDate)=>{
+	return request({
+	    url: '/paramdata/loadGrpCurve',
+	    method: 'post',
+		data:  {wellId,paramCode,startDate,endDate}
 	});
 }
 

src/components/ECLineChart.vue

@@ -106,7 +106,7 @@
 			//console.log(newData)
 			let opt=chartInstance.getOption()  //与初始化的opt有差别
 			//opt.xAxis.data=[]
-			console.log(opt)
+			//console.log(opt)
 			opt.yAxis[0].name=props.yUnit
 			opt.title[0].text=props.title
 			opt.series[0].data=newData

src/pages/base/OrgEdit.vue

@@ -115,10 +115,10 @@
 	const loadOrgTree=()=>{
 		let converDef={id:'id',name:'name',superId:'superId',superName:'superName',children:'children'}
 		stationAPI.loadOrgTree().then((resp) => {
-			console.log(resp)
+			//console.log(resp)
 			if(resp.code===0){
 				let treeDatas=utils.list2Tree(resp.data||[],converDef)
-				console.log(treeDatas['topNodes'])
+				//console.log(treeDatas['topNodes'])
 				orgTreeNodes.value=treeDatas['topNodes']
 			}
 			else{

src/pages/base/WellGroupCurveTemp.vue

@@ -220,7 +220,7 @@
 				   closeOnClickModal:false
 				}).then(({value })=>{
 					let saveData=getSaveData()
-					console.log(saveData)
+					//console.log(saveData)
 					saveData['tempName']=value 
 					saveAPI(saveData).then(resp=>{
 						if(resp.code!=0){

src/pages/single/ParamHisCurve.vue

@@ -23,7 +23,6 @@
 
 <script setup>
 	import {reactive,ref,toRaw,onMounted,useAttrs} from 'vue'
-	import * as echarts from 'echarts'
 	import ECLineChart from '../../components/ECLineChart.vue'
 	import paramHisAPI from '../../api/paramHis.js'
 	import wellParamAPI from '../../api/wellParam.js'

src/utils/utils.js

@@ -12,8 +12,10 @@ export default {
 		
 		return rtnCode
 	},
-	getNow:(fmt)=>{
-		let now=new Date();
+	getNow(fmt){
+		return this.dateFmt((new Date()),fmt)
+	},
+	dateFmt:(now,fmt)=>{
 		let y=now.getFullYear(),m=now.getMonth()+1,d=now.getDate(),h=now.getHours(),mi=now.getMinutes(),s=now.getSeconds();
 		m=m>9?m.toString():('0'+m);
 		d=d>9?d.toString():('0'+d);
@@ -23,6 +25,9 @@ export default {
 		if(fmt=='mm月dd日'){
 			return `${m}月${d}日`;
 		}
+		else if(fmt=='yyyy/MM/dd 00:00:00'){
+			return `${y}/${m}/${d} 00:00:00`;
+		}
 		return `${y}-${m}-${d} ${h}:${mi}:${s}`;
 	},