Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

src/views/menu/cockpit/components/overviewCom.vue

@@ -223,7 +223,7 @@ export default {
     height: 40px;
     margin-left: 10px;
     font-size: 40px;
-    font-family: fantasy;
+    //font-family: fantasy;
     text-align: left;
     // font-weight: bold;
     // border: 1px solid #ccc;
@@ -318,7 +318,7 @@ export default {
 .complete {
   text-align: center;
   font-size: 7vw;
-  font-family: fantasy;
+  // font-family: fantasy;
   margin-top: 30px;
 }
 ::v-deep.van-icon-play {

src/views/menu/protection/components/item.vue

@@ -66,7 +66,7 @@ export default {
           api.updateStatus(data.id, status).then(r => {
             if (r.data) {
               data.status = status
-              data.statusUpdateTime = dayjs(r.data).format('YYYY-MM-DD HH:MM:ss')
+              data.statusUpdateTime = dayjs(r.data).format('YYYY-MM-DD HH:mm')
             }
           })
         })

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

@@ -235,13 +235,14 @@ export default {
         } else {
           let list = []
           data.imageList = data.imageList.split(',')
-
+         
           data.imageList.forEach(item => {
             list.push({
               name: '',
               path: item
             })
           })
+          
           data.imageList = list || []
         }
         Object.assign(this.form, data)

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

@@ -279,10 +279,8 @@ export default {
           })
         }
         if (this.trainingData.imageList) {
-          // this.imgList = this.trainingData.imageList.split(',') || []
-          this.imgList = [
-            
-          ]
+          this.imgList = this.trainingData.imageList.split(',') || []
+         
         }
       }
     })