From c50455f69a949197196734620687024f65872bfc Mon Sep 17 00:00:00 2001
From: liyan <1593821058@qq.com>
Date: Fri, 22 Jan 2021 16:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productConfig/mostedit/MostList.vue       | 200 ++++++++++--------
 1 file changed, 117 insertions(+), 83 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/productConfig/mostedit/MostList.vue b/epmet-oper-web/src/views/modules/productConfig/mostedit/MostList.vue
index cb9f20e..af12de0 100644
--- a/epmet-oper-web/src/views/modules/productConfig/mostedit/MostList.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/mostedit/MostList.vue
@@ -1,57 +1,52 @@
 <template>
 <!-- 项目滞留超期提醒	-->
-	<div class="m-body">
+	<div v-show="showType==='customize'" class="m-body">
 		<el-tag class="mh">
 			<div class="h-left">
-				
 				<div class="line">
 					项目滞留超期提醒
 				</div>
 			</div>
 			<div class="h-right">
-				<el-tag>取消返回</el-tag>
-				<button class="h-right-one" @click="stayover()">恢复默认</button>
+				
 				<button class="h-right-two" @click="one_two()">保存设置</button>
+				<button class="h-right-one" @click="stayover()">恢复默认</button>
+				 <el-button class="diaCancel" @click="diaCancel()">取消返回</el-button>
 			</div>
 		</el-tag>
      <!-- 设定核算单位prefix-icon="el-icon-date" -->
 		<div class="mh-child">
 			  <el-tag class="set-accont">设定核算单位天/日起止时间：</el-tag>
 			  <el-time-picker
+			     class="overtime-input"
 			     arrow-control
 				 prefix-icon=el-icon-date
 			     v-model="startTime"
 			     :picker-options="{
-					 
 			        selectableRange: '00:00:00'+ '-' + '23:59:59' ,
-					
 			     }"
 			     placeholder="任意时间点"
 				 value-format="HH:mm:ss">
 			   </el-time-picker>
 			   <text-align style=" padding: 20px;">至</text-align>
 			   <el-time-picker
+			      class="overtime-input"
 			      arrow-control
 				  prefix-icon=el-icon-date
 			      v-model="endTime"
-			      :picker-options="{
-			   					 
+			      :picker-options="{		 
 			         selectableRange: startTime + '-' + '23:59:59' ,
-			   					
 			      }"
 			      placeholder="任意时间点"
 			   	 value-format="HH:mm:ss">
 			    </el-time-picker>
-			   
 		</div>
      <!-- 设定滞留超期时间    start: '08:30:00',
 			         step: '00:15:00',
 			         end: '23:30:00' -->
 		<div class="mh-child">
 			  <el-tag class="set-overtime">设定滞留超期时间：</el-tag>
-			   
 			  <el-from-item class="el-from-item">
-				 
 				  <button class="btn btn-delet" @click="staytime_subtract()">-</button> 
 			</el-from-item>
 				  <el-input class="overtime-input" v-model="detentionDays"></el-input>
@@ -59,7 +54,7 @@
 				  <button class="btn btn-add" @click="staytime_add()">+</button> 
 			  </el-from-item>
 			  <el-tag style="padding-left: 14px;padding-right: 14px;font-size: 15px;background-color: white;border: 0px;color: #000000;">/</el-tag>
-			 <el-select v-model="value" placeholder="请选择">
+			 <el-select v-model="value" placeholder="请选择" class="overtime-input">
 				 <el-option
 				   v-for="item in options"
 				   :key="item.value"
@@ -73,23 +68,21 @@
 		<div class="mh-child">
 			  <el-tag class="set-overtime">设定即将超期时间提醒：</el-tag>
 			  <el-from-item class="el-from-item">
-			  	 
 			  	  <button class="btn btn-delet" @click="subtract_remind()">-</button> 
 			  </el-from-item>
 			  <el-from-item>
-				  <el-input class="overtime-input" v-model="remindTime"></el-input>
+				  <el-input class="overtime-input" v-model="remindTime" ></el-input>
 			  </el-from-item>
 			  <el-from-item class="el-from-item">
-			  	 
 			  	  <button class="btn btn-add" @click="add_remind()">+</button> 
 			  </el-from-item>
 			  <el-tag style="font-size: 14px; background-color: white;border: white;color: black;">单位天</el-tag>
 		</div> 
      <!-- 统一定时消息推送时间 -->	
-	 
 		<div class="mh-child">
 		  <el-tag class="set-overtime">统一定时消息推送时间：</el-tag>
 		  <el-time-select
+		    class="overtime-input"
 		    v-model="pushTime"
 		    :picker-options="{
 		      start: '06:00',
@@ -101,17 +94,16 @@
 		</div>
    
 <!-- 议题发布前经网络员审核-->
-	
 		<el-tag class="mh">
 			<div class="h-left">
 				<div class="line">
 					议题发布前经网络员审核
-				</div>
-				
+				</div>	
 			</div>
 			<div class="h-right">
-				<button class="h-right-one" @click="yitimoren()">恢复默认</button>
+				
 				<button class="h-right-two">保存设置</button>
+				<button class="h-right-one" @click="yitimoren()">恢复默认</button>
 			</div>
 		</el-tag>
      <!-- 议题发布前经网络员审核 -->
@@ -130,11 +122,11 @@
 				<div class="line">
 					待办事项短信通知
 				</div>
-				
 			</div>
 			<div class="h-right">
-				<button class="h-right-one" @click="daibanshi()">恢复默认</button>
+				
 				<button class="h-right-two">保存设置</button>
+				<button class="h-right-one" @click="daibanshi()">恢复默认</button>
 			</div>
 		</el-tag>
      <!-- 代办事项发送短信通知 -->
@@ -153,7 +145,7 @@
 			  placeholder="请输入内容"
 			  v-model="input"
 			  clearable
-			  class="set-overtime">
+			  class="overtime-input">
 			</el-input>
 			<el-tag style="font-size: 14px; background-color: white;border: white;color: black;">单位条</el-tag>
 		</div>	
@@ -163,11 +155,11 @@
 			<div class="line">
 				小组审核机制
 			</div>
-			
 		</div>
 		<div class="h-right">
-			<button class="h-right-one">恢复默认</button>
+			
 			<button class="h-right-two">保存设置</button>
+			<button class="h-right-one">恢复默认</button>
 		</div>
 	</el-tag> 
 	<!-- 新建小组进组需小组审核-->
@@ -181,27 +173,24 @@
 		</div> 
 <!-- 其他设置-->
 	<el-tag class="mh">
-		
 		<div class="h-left">
 			<div class="line">
 				其他设置
 			</div>
-			
 		</div>
 		<div class="h-right">
-			<button class="h-right-one">恢复默认</button>
+			
 			<button class="h-right-two">保存设置</button>
+			<button class="h-right-one">恢复默认</button>
 		</div>
 	</el-tag> 		
 	</div>	
  
 </template>
-
 <script>
 	 export default { 
 			 data() {
 				  return {
-					
 					options:[{
 							  value: 'work',
 							  label: '工作日'
@@ -210,7 +199,6 @@
 							  label: '休息日'
 					}],
 					value: 'rest',  
-					
 					button1: false,
 					button2: true,
 					button3: true,
@@ -225,11 +213,20 @@
 					calculation: '',
 					remindTime: '1',
 					pushTime: "18:10",
-					
-					
-					
+					showType:'customize',
 				  } 
 				},
+				watch: {
+					input: function(val){
+						this.input = val.replace(/\D/g,'')
+					},
+					detentionDays: function(val){
+						this.detentionDays = val.replace(/\D/g,'')
+					},
+					remindTime: function(val){
+						this.remindTime = val.replace(/\D/g,'')
+					}
+				},
 			// mounted:function(){
 			// 	this.one_one();
 			// },
@@ -238,13 +235,11 @@
 				staytime_subtract:function(detentionDays){
 					
 					if(this.detentionDays>=1){
-						this.detentionDays--
-						
+						this.detentionDays--	
 					}
 					else if(this.detentionDays==0){
 						alert("已达最小值","注意","ss");
 					}
-					
 				},
 				staytime_add:function(detentionDays){
 					this.detentionDays++;
@@ -252,18 +247,24 @@
 				subtract_remind:function(remindTime){
 					
 					if(this.remindTime>=1){
-						this.remindTime--;
-						
+						this.remindTime--;	
 					}
 					else if(this.remindTime==0){
 						alert("已达最小值","注意","ss");
 					}
-					
 				},
-				
 				add_remind:function(remindTime){
 					this.remindTime++;
 				},
+				//取消返回
+				// cancleBack:function(){
+				// 	this.showType = 'customize';
+					
+				// },
+				diaCancel() {
+				   this.$emit('cancleBack')
+				 },
+				
 				// 议题默认设置
 				yitimoren (row) {
 				  this.$confirm('确认恢复默认值', '提示', {
@@ -345,7 +346,6 @@
 				
 				
 				
-				
 				// ------
 				
 			},
@@ -353,18 +353,19 @@
 			  } 
 </script>
 
-<style scoped>
-	.line{
-		position: relative;
+<style lang="scss" scoped>
+		
 		
-		width: 120px;
-		border-bottom: 3px solid #17b3a3;
-	}
-	.el-card__body{
-		padding-top: 0px;
-		margin-left: ;
-	}
-	.m-body{
+		.line{
+			position: relative;
+			
+			width: 120px;
+			border-bottom: 3px solid #17b3a3;
+		}
+		.el-card__body{
+			padding: 0px;
+		}
+	    .m-body{ 
 			height: 790px;
 			width: 100%;
 			padding-top: 0px;
@@ -408,53 +409,82 @@
 		.el-switch.is-checked .el-switch__core::after{
 			margin-left: -20px;
 		}
-	    .h-right{
-	       /* position: absolute;
-			
-			width: 50%;
-			margin-top: 5px;
-			padding: 0px;
-			border: 0px; */
-			padding-bottom: 2px;
-			padding-top: 8px;
-			font-size: 15px;
-			position: relative;
-			width: 16%;  
-			}
+	    
 		.h-left{
 			padding: 9px;
 			margin: auto 0;
 			font-size: 15px;
 			position: relative;
-			width: 84%;
+			width: 70%;
 			padding-left: 0px;
-			padding-top: 18px;
+			padding-top: 15px;
 			padding-bottom: 2px;
 			
 			
 		}
+		.h-right{
+			padding-bottom: 2px;
+			padding-top: 8px;
+			font-size: 15px;
+			position: relative;
+			width: 30%;  
+			
+			}
+			.h-right-one{
+				background-color: #d4d2ce;
+				color: black;
+				border: 0px;
+				width:30%;
+				height: 30px;
+				text-align: center;
+				padding-left: 2px;
+				padding-right: 2px;
+				border-radius: 4px;
+				float: right;
+				
+				
+			}	
+			.h-right-one:hover {
+				background-color: #deddda;
+				color: black;
+				border: 0px;
+				width:30%;
+				height: 30px;
+				text-align: center;
+				padding-left: 2px;
+				padding-right: 2px;
+				border-radius: 4px;
+				float: right;
+				
+			}
 		.h-right-two{
 			background-color: #17b3a3;
 			color: white;
-			width:50%;
+			width:30%;
 			height: 30px;
 			border: 0px;
 			margin-left: 10px;
 			text-align: center;
 			padding-left: 2px;
 			padding-right: 2px;
+			border-radius: 4px;
+			float: right;
+			
+		}
+		.h-right-two:hover {
+			background-color: #18bfac;
+			
+			
 		}
-		.h-right-one{
-			background-color: #d4d2ce;
-			color: black;
-			border: 0px;
-			width:50%;
-			height: 30px;
-			text-align: center;
-			padding-left: 2px;
-			padding-right: 2px;
-		}	
 		
+		.diaCancel{
+			float: right;
+			margin-right: 10px;
+			width: 30%;
+			height: 30px;
+			padding: 0px;
+			font-size: 15px;
+		}
 		
 		.set-accont{
 			width: 250px;
@@ -476,10 +506,14 @@
 			
 			}
 		.overtime-input{
-			width: 300px; 
-			 
+			width: 280px; 
+			border-radius: 0px;
+		}
+		.el-input--medium{
+			text-align: center;
+			
 		}
-		.el-input__inner{
+		input.el-input__inner{
 			border-radius: 0px;
 			text-align: center;
 			padding-right: 5px;