Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/views/menu/rehearsalTask/components/addRehearsalTask.vue

@@ -21,7 +21,6 @@
         label="演练开始时间"
         placeholder="请选择演练开始时间"
         @click="showStartDate = true"
-       
       />
       <van-popup v-model="showStartDate" position="bottom">
         <van-datetime-picker
@@ -53,7 +52,7 @@
           @cancel="showEndDate = false"
         />
       </van-popup>
-     
+
       <!-- 演练地点 -->
       <van-field
         required
@@ -177,7 +176,7 @@ export default {
     VuePdf,
     yldialog,
     NavBar,
-    
+
     Upload,
     CheckPeople
   },
@@ -197,7 +196,7 @@ export default {
         note: '', //演练总结
         taskUserList: [], //人员数组
         imageList: [], //图片数组
-       
+
         presetCase: '', //预设案由
         drillSituation: '', //演练情况
         drillEndTime: '', //结束时间
@@ -359,7 +358,7 @@ export default {
         this.falg = true
         return
       }
-      
+
       if (this.userPeopleList.length > this.lackPeopleList.length) {
         let isTrue = false
         this.userPeopleList.forEach(item => {
@@ -421,21 +420,13 @@ export default {
       obj.taskUserList = []
 
       obj.taskUserList.push(...this.userPeopleList, ...this.lackPeopleList)
-      let drillStartTime = obj.drillStartTime
-      let drillEndTime = obj.drillEndTime
-      if (drillStartTime && drillStartTime.length == 19) {
-        obj.drillStartTime = obj.drillStartTime ? obj.drillStartTime : ''
-      } else {
-        obj.drillStartTime = obj.drillStartTime ? obj.trainingStartDateTime + ':00' : ''
-      }
-      if (drillEndTime && drillEndTime.length == 19) {
-        obj.drillEndTime = obj.drillEndTime ? obj.drillEndTime : ''
-      } else {
-        obj.drillEndTime = obj.drillEndTime ? obj.drillEndTime + ':00' : ''
-      }
- 
-      console.log(obj)
-      
+
+      obj.drillStartTime = obj.drillStartTime ? obj.drillStartTime + ':00' : ''
+
+      obj.drillEndTime = obj.drillEndTime ? obj.drillEndTime + ':00' : ''
+
+     
+
       drillInfo({
         id: this.trainingData.id,
         submitType: type,
@@ -467,8 +458,7 @@ export default {
         tempLink.click()
         document.body.removeChild(tempLink)
       }
-    },
-   
+    }
   }
 }
 </script>

src/views/menu/training/components/addTraining.vue

@@ -415,20 +415,13 @@ export default {
     submitHandlerConfirm(type) {
       let obj = JSON.parse(JSON.stringify(this.form))
       //动态拼接秒钟
-      let trainingStartDateTime = obj.trainingStartDateTime
-      let trainingEndDateTime = obj.trainingEndDateTime
-      if (trainingStartDateTime && trainingStartDateTime.length == 19) {
-        obj.trainingStartDateTime = obj.trainingStartDateTime ? obj.trainingStartDateTime : ''
-      } else {
-        obj.trainingStartDateTime = obj.trainingStartDateTime ? obj.trainingStartDateTime + ':00' : ''
-      }
-      if (trainingEndDateTime && trainingEndDateTime.length == 19) {
-        obj.trainingEndDateTime = obj.trainingEndDateTime ? obj.trainingEndDateTime : ''
-      } else {
-        obj.trainingEndDateTime = obj.trainingEndDateTime ? obj.trainingEndDateTime + ':00' : ''
-      }
+
+      obj.trainingStartDateTime = obj.trainingStartDateTime ? obj.trainingStartDateTime + ':00' : ''
+
+      obj.trainingEndDateTime = obj.trainingEndDateTime ? obj.trainingEndDateTime + ':00' : ''
+
       obj.imageList = obj.imageList.map(item => item.path).join(',')
-      
+
       obj.taskUserList = []
       let list = this.studyList
       obj.fileList = []