样式调整

src/projects/business/views-xsy/ApplyClass/My.vue

@@ -264,28 +264,32 @@
 		color: rgba(255, 255, 255, 100)!important;
 	}
 	.mycolor1{
-		background-color:rgba(66, 145, 255, 100);;
+		background-color:rgba(66, 145, 255, 100);
 	}
 	.mycolor2{
 		background-color:rgba(52, 199, 88, 100);
+		box-shadow: 0px 4px 4px 0px rgba(17, 96, 36, 30)!important;
 	}
 	.mycolor3{
 		background-color:rgba(174, 174, 178, 100);
+		box-shadow: 0px 4px 4px 0px rgba(72, 74, 77, 30) !important;
 	}
 	.mycolor4{
-		font-size: 14px;
+		box-shadow: 0px 4px 4px 0px rgba(128, 49, 0, 30)!important;
 		background-color:rgba(236, 136, 74, 100);
 	}
+	.mycolor5{
+		box-shadow: 0px 4px 4px 0px rgba(47, 49, 151, 30)!important;
+		background-color:rgba(118, 119, 206, 100);
+	}
 	.mycolor4 h5{
 		font-size: 14px !important;
+		
 	}
 	.mycolor5 h5{
 		font-size: 14px !important;
 	}
-	.mycolor5{
-	
-		background-color:rgba(118, 119, 206, 100);
-	}
+
 	.myclass-li{
 		padding: 15px;
 	    margin-bottom: 10px;

src/projects/business/views-xsy/PlanClass/Person.vue

@@ -24,7 +24,7 @@
 				</li> 
 			</ul>
 			<!--人员列表-->
-			<div class="vongi-fplist" :style="'margin-bottom:'+(clientHeight+10)+'px'">
+			<div class="vongi-fplist" :style="'margin-bottom:'+(clientHeight+100)+'px'">
 				<div class="mui-content-padded" v-show="arrangeShiftPersonList"  >
 					<h5><i class="iconfont icon-ze-friends blue"></i>人员列表</h5>
 				</div>

src/projects/business/views/Master/Attendance/LeaveForm.vue

@@ -28,7 +28,7 @@
 				</form>
 			</div>
 			<div class="mui-content-padded vongi-qingjia-date">
-				 <h5 v-if="tjForm.leaveType==4">可调休剩余时长<span class="color4fc5f7">{{workOverTime}}小时</span></h5>
+				 <h5 v-if="false&&tjForm.leaveType==4">可调休剩余时长<span class="color4fc5f7">{{workOverTime}}小时</span></h5>
 				<form class="mui-input-group">
 
 					<div class="mui-input-row">
@@ -313,7 +313,7 @@
 				} else if (this.tjForm.endTime== '请选择') {
 					mui.toast('请选择结束日期');
 					return false;
-				}else if (this.tjForm.leaveType==4&&!this.checkWorkOverTime()) {
+				}else if (false&&this.tjForm.leaveType==4&&!this.checkWorkOverTime()) {
                     mui.toast("调休剩余时长小于请假时长");
                     return false;
                 }

src/projects/business/views/Master/ExtraWork/Info.vue

@@ -18,9 +18,13 @@
 					<span>{{detail.endTime}}</span>
 				</div>
 		        <div class="mui-input-row">
-					<label>加班时长</label>
+					<label>预计时长</label>
 					<span>{{detail.hours}}小时</span>
 				</div>
+				<div class="mui-input-row" v-if="detail.durationStr">
+					<label>实际时长</label>
+					<span>{{detail.durationStr}}</span>
+				</div>
 				<div class="mui-input-row">
 					<label>加班原因</label>
 					<span>{{detail.reason}}</span>
@@ -29,6 +33,9 @@
 					<label>申请时间</label>
 					<span>{{detail.createTime}}</span>
 				</div>
+				
+			
+				
 				<div class="mui-input-row">
 					<label>审核状态</label>
 					<span class="" :class="{'colorf8b155':detail.status=='0','color55f868':detail.status=='1'||detail.status=='4','colorfe616c':detail.status=='2'||detail.status=='3'}">{{detail.statusName}}</span></span>

src/utils/request.js

@@ -14,8 +14,12 @@ axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'
 
 //检测是否可以访问通
 var BACKEND_URL = process.env.VUE_APP_BACKEND_URL;
+
+if (process.env.VUE_APP_NODE_NAME == 'devlopment') {
+		BACKEND_URL=BACKEND_URL;
+}
 //var BACKEND_URL="https://ykt-test.xiaoxinda.com/shinestar-server/"
-//var BACKEND_URL = 'http://192.168.33.220:8086/shinestar-server'
+//var BACKEND_URL = 'http://192.168.33.120:8086/shinestar-server'
 
 // 创建axios实例
 const service = axios.create({