diff --git a/dist.zip b/dist.zip
index 9aed178d..bde6df01 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index bc06aac2..34650fea 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -43,12 +43,12 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  // axios.defaults.baseURL = 'http://192.168.34.216:18070/'   // 邱平毅本地
+  axios.defaults.baseURL = 'http://192.168.34.216:18070/'   // 邱平毅本地
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
-  axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
+  // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
 
   // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index 3b7f4c7b..c605f304 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -216,6 +216,8 @@
               class="startTime"
               placeholder="起始时间"
               v-model="cardForm.eduStartTime"
+              :clearable="false"
+              @change = "startTime"
               :picker-options="{
                 start: '08:30',
                 step: '00:15',
@@ -227,6 +229,8 @@
               class="endTime"
               placeholder="结束时间"
               v-model="cardForm.eduEndTime"
+              :clearable="false"
+              @change = "endTime"
               :picker-options="{
                 start: '08:30',
                 step: '00:15',
@@ -250,6 +254,7 @@
           >
             <el-input
               v-model="cardForm.eduClasshour"
+              disabled
               :placeholder="$t('message.personnelPosition.please_enter')"
             ></el-input>
           </el-form-item>
@@ -523,6 +528,13 @@ export default {
     //   }
     //   };
     return {
+      studyTime:'',
+      startingTime:'',
+      min1:'',
+      min2:'',
+      hour1:'',
+      hour2:'',
+      finishTime:'',
       uploadaurl:'',
       fileList:[],
       searchForm: {
@@ -575,7 +587,53 @@ export default {
     let xxx = this.$store.state.FILEURL
     console.log('url',xxx)
   },
+  watch:{
+    startingTime:{
+      handler(n,o){
+        if(n != o){
+          this.getTime()
+        }
+      }
+    },
+    finishTime:{
+      handler(n,o){
+        if(n != o){
+          this.getTime()
+        }
+      }
+    }
+  },
   methods: {
+    // 开始时间
+    startTime(val){
+      // console.log('开始时间',val)
+      this.startingTime = val
+    },
+    endTime(val){
+      // console.log('结束时间',val)
+      this.finishTime = val
+      console.log( this.cardForm.eduClasshour)
+    },
+    getTime(){
+      if( this.startingTime != null){
+        this.hour1 = this.startingTime.split(':')[0]
+        this.min1 = this.startingTime.split(':')[1]
+        if(this.finishTime != null){
+          this.hour2 = this.finishTime.split(':')[0]
+        this.min2 = this.finishTime.split(':')[1]
+          if(this.hour2 > this.hour1 && this.min2>this.min1){
+            this.cardForm.eduClasshour = this.min2 - this.min1 + (this.hour2-this.hour1)*60
+          }if(this.hour2 > this.hour1 && this.min2<this.min1){
+            this.cardForm.eduClasshour = (this.hour2-this.hour1)*60  + (this.min2  - this.min1)
+          }if(this.hour2 > this.hour1 && this.min2==this.min1){
+            this.cardForm.eduClasshour = (this.hour2-this.hour1)*60
+          }
+          if( this.hour2 == this.hour1) {
+            this.cardForm.eduClasshour = this.min2 - this.min1
+          }
+        }
+        }
+    },
      picName(i){
       // console.log('========',this.cardForm[ `edu${i === 1 ? 'Before': i === 2 ? 'In' : 'After'}Photo` ])
       return this.cardForm[ `edu${i === 1 ? 'Before': i === 2 ? 'In' : 'After'}Photo` ]
@@ -857,6 +915,12 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+::v-deep .el-date-editor {
+  .el-range__close-icon {
+    color: red;
+    line-height: 23px;
+  }
+}
 .uploadpoint{
   text-decoration: none;
   color:black;