Browse Source

组件微调(井参数增加排序字段,分页表格调整页面记录数选项)

chenwen 2 years ago
parent
commit
dd6ec4f68c

+ 6 - 0
src/api/wellHisCurve.js

@@ -0,0 +1,6 @@
+import request from '../utils/request';
+
+const api={}
+
+
+export  default api

+ 0 - 3
src/components/ECLineChart.vue

@@ -24,9 +24,6 @@
 			type:Object,   //{x:[],y:[]}
 			required:true
 		},
-		dataLoad:{
-			type:Function
-		},
 		title:{
 			type:String
 		},

+ 1 - 1
src/components/crudtable/CrudTable.vue

@@ -42,7 +42,7 @@
 		pageSize:Number,
 		pageSizeOpts:{
 			type:Array,
-			default:[5,20,50,100]
+			default:[10,20,50,100]
 		},
 		pageInfoOpts:String,
 		url:String,

+ 1 - 0
src/pages/base/WellParam.vue

@@ -28,6 +28,7 @@
 				  <el-table-column prop="calibrateA" label="标定系数A" width="100" align="center"/>
 				  <el-table-column prop="calibrateB" label="标定系数B" width="100" align="center"/>
 				  <el-table-column prop="calibrateC" label="标定系数C" width="100" align="center"/>
+				  <el-table-column prop="displayNum" label="显示序号" width="60" align="center"/>
 				  
 				  <el-table-column prop="oper" label="操作" width="160" fixed="right">
 				  					<template #default="scope">

+ 10 - 3
src/pages/base/WellParamEdit.vue

@@ -84,6 +84,12 @@
 					</el-form-item>
 				</el-col>
 				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="显示序号">
+						<el-input-number v-model="formModel.displayNum" :min="1" :max="10000" style="width:100%"/>
+					</el-form-item>
+				</el-col>
+				
 			</el-row>
 			  
 		      
@@ -117,7 +123,8 @@
 	  gatherUnit:null,
 	  calibrateA:null,
 	  calibrateB:null,
-	  calibrateC:null
+	  calibrateC:null,
+	  displayNum:1
 	})
 	
 	const props=defineProps({
@@ -150,8 +157,8 @@
 		try{
 			await initForm()
 			if(props.record){
-				let {paramId,wellId,paramCode,paramName,displayUnit,displayFormat,insertUnit,gatherUnit,calibrateA,calibrateB,calibrateC}=props.record
-				Object.assign(formModel,{paramId,wellId,paramCode,paramName,displayUnit,displayFormat,insertUnit,gatherUnit,calibrateA,calibrateB,calibrateC})
+				let {paramId,wellId,paramCode,paramName,displayUnit,displayFormat,insertUnit,gatherUnit,calibrateA,calibrateB,calibrateC,displayNum}=props.record
+				Object.assign(formModel,{paramId,wellId,paramCode,paramName,displayUnit,displayFormat,insertUnit,gatherUnit,calibrateA,calibrateB,calibrateC,displayNum})
 			}
 		}
 		catch(err){

+ 4 - 3
src/pages/single/ParamHisCurve.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="page-container">
+	<div class="qpage">
 		<el-form :inline="true" :model="queryForm" class="query-form-inline"  label-width="auto">
 		  <el-form-item label=" ">
 		    <el-date-picker
@@ -48,7 +48,7 @@
 		let endDate=formdata.dataTime?formdata.dataTime[1]:null
 		paramHisAPI.loadHis({startDate,endDate,wellId:attrs['ctxObj']['wellId'],paramCode:attrs['ctxObj']['paramCode']}).then(resp=>{
 			isQuerying.value=false
-			console.log(resp)
+			//console.log(resp)
 			if(resp.code!=0){
 				ElMessage.error(resp.msg)
 				return
@@ -65,7 +65,7 @@
 	}
 	
 	
-	
+	//远程获取的数据转为曲线组件要求的格式
 	const buildCurveData=(datas)=>{  //[{gatherTime,dispDataVal}]
 		let curveDatas=[]
 		datas.forEach(data=>{
@@ -90,4 +90,5 @@
 </script>
 
 <style scoped>
+	@import url('../../assets/css/qpage.css');
 </style>