heyang

component/topWarn.vue

@@ -31,7 +31,7 @@
 
 		},
 		mounted(){
-			this.getWarn();
+			//this.getWarn();
 			// getApp().watch(this.getWarn,'warnData');
 			getApp().watch(this.lineDataFunction,'lineData');
 			// this.timeFuncontion();

pages/gasBottle/gasUse/gasUse.vue

@@ -35,6 +35,11 @@
 			</view>
 			<view class="register_li_min" v-if="pageType==0">
 				<view>*</view>
+				<view>使用时长：</view>
+				<input v-model="form.usageTime+usageTimeUnit" placeholder="--" disabled type="text" >
+			</view>
+			<view class="register_li_min" v-if="pageType==0">
+				<view>*</view>
 				<view>当前压力：</view>
 				<input v-model="form.currentPressure" @change="calculateAmountFun()" placeholder="请输入当前压力值"  type="text" >
 			</view>
@@ -100,7 +105,8 @@
 				dateTimeArray: null,
 				startYear: 0,
 				endYear: 0,
-				timeStr:''
+				timeStr:'',
+				usageTimeUnit:'分钟',
             }
         },
         onLoad(option) {
@@ -136,6 +142,12 @@
 				this.dateTimeArray=obj.dateTimeArray
 				this.dateTime=obj.dateTime
 			},
+			durationFun(){
+				let self=this;
+				let duration=new Date(self.form.usageEndTime).getTime()-new Date(self.form.usageStartTime).getTime()
+				let minutes = parseInt(duration/(1000 * 60))
+				this.$set(this.form,'usageTime',minutes);
+			},
 			//开始时间
 			changeDateTime(e) {
 			    this.dateTime = e.detail.value;
@@ -147,6 +159,7 @@
 			     this.dateTime = e.detail.value;
 			     this.form.usageEndTime= this.createTimeStr(this.dateTimeArray,this.dateTime);
 			     //ios时间不能用'-'解析成时间戳
+				 this.durationFun();//使用时长
 			  },
 			/*年,月切换时重新更新计算*/
 			changeDateTimeColumn(e) {