解决冲突

src/components/CommodityMan/materialMan.vue

@@ -401,7 +401,6 @@
           return arr.indexOf(item, 0) === index;
         });
       },
-
       SelectGroup(id) {
         this.PageMsg.GroupId = id;
         this.addpageMsg.GroupId = id;

src/components/global/Choosevideo.vue

@@ -53,7 +53,7 @@
             <div @click="PageSelect(item,index)" :class="selectId==item.Id ? 'selected' :''"
               class="el-tooltip item material-item ">
               <img :src="getIconLink(item.Image)" class="material-img" style="width: 100px; height: 100px;">
-              <div class="material-video-info"><i class="el-icon-video-play"></i> <span>{{item.VideoTime}}</span></div>
+              <div class="material-video-info"><i class="el-icon-video-play"></i> <span>{{Time(item.VideoTime)}}</span></div>
               <div flex="dir:left" style="margin-top: 5px;">
                 <div class="material-name">{{item.Name}}</div>
               </div>
@@ -172,6 +172,33 @@
       this.GetPageList();
     },
     methods: {
+             Time(value) {
+        var theTime = parseInt(value); // 秒
+        var middle = 0; // 分
+        var hour = 0; // 小时
+
+        if (theTime > 60) {
+          middle = parseInt(theTime / 60);
+          theTime = parseInt(theTime % 60);
+          if (middle > 60) {
+            hour = parseInt(middle / 60);
+            middle = parseInt(middle % 60);
+          }
+        }
+        var result = "" + parseInt(theTime);
+        if (theTime < 10) {
+          result = "0" + parseInt(theTime);
+        }
+        if (middle > 0) {
+          result = "" + parseInt(middle) + ":" + result;
+        } else {
+          result = "00:" + result;
+        }
+        if (hour > 0) {
+          result = "" + parseInt(hour) + "小时" + result;
+        }
+        return result;
+      },
       //上传视频
       UploadVideo(file) {
         var that = this;