Merge remote-tracking branch 'origin/master'

src/views/fileManagement/components/videoDialog.vue

@@ -20,7 +20,7 @@
           <div class="media-btns">
             <img class="window-btns" @click="singleFramePlayback('min')"  :src="backOnce.active? backOnce.srcAct :backOnce.src"/>
             <img class="window-btns" @click="singleFramePlayback('add')"  :src="goOnce.active? goOnce.srcAct :goOnce.src"/>
-            <img class="window-btns" @click="orderFlag = !orderFlag"  :src="orderFlag ? jiangxu : jiangxu"/>
+            <img class="window-btns" @click="orderFlag = !orderFlag"  :src="orderFlag ? jiangxu : rise"/>
             <img class="window-btns" @click="minusDigit"  :src="backBtn"/>
             <div class="btn-back">
               <div class="btn-back-text">
@@ -65,7 +65,8 @@ import goOnce from '@/assets/images/goOnce.png'
 import jiangxu from '@/assets/images/jiangxu.png'
 import backBtn from '@/assets/images/backBtn.png'
 import fowardBtn from '@/assets/images/fowardBtn.png'
-import photo from '@/assets/images/fowardBtn.png'
+import photo from '@/assets/images/photo.png'
+import rise from '@/assets/images/rise.png'
 
 export default {
   name: 'VideoDialog',
@@ -86,6 +87,7 @@ export default {
   },
   data() {
     return {
+      rise,
       photo,
       fowardBtn,
       jiangxu,
@@ -178,6 +180,11 @@ export default {
     background: #409EFF;
     height: 70%;
     width: 70%;
+    color: #fff;
+    font-size: 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 }
 .timeLine{

src/views/videoStorageManagement/components/videoDialog.vue

@@ -18,17 +18,17 @@
         <div>
           <!--          多媒体按钮-->
           <div class="media-btns">
-            <!--            <svg-icon icon-class="zuo" />-->
-            <!--            <svg-icon icon-class="you" />-->
-            <!--            <svg-icon icon-class="bofang" />-->
-            <!--            <svg-icon icon-class="zanting" />-->
-            <svg-icon icon-class="shangyitiao" @click="singleFramePlayback('min')" />
-            <svg-icon icon-class="xiayitiao" @click="singleFramePlayback('add')" />
-            <svg-icon :icon-class="orderFlag ? 'jiangxu' : 'shengxu'" @click="orderFlag = !orderFlag" />
-            <svg-icon icon-class="qianjin" @click="minusDigit" />
-            {{ Math.pow(2, multiplierDigit) }}x
-            <svg-icon icon-class="houtui" @click="addDigit" />
-            <svg-icon icon-class="paizhao" />
+            <img class="window-btns" @click="singleFramePlayback('min')"  :src="backOnce.active? backOnce.srcAct :backOnce.src"/>
+            <img class="window-btns" @click="singleFramePlayback('add')"  :src="goOnce.active? goOnce.srcAct :goOnce.src"/>
+            <img class="window-btns" @click="orderFlag = !orderFlag"  :src="orderFlag ? jiangxu : rise"/>
+            <img class="window-btns" @click="minusDigit"  :src="backBtn"/>
+            <div class="btn-back">
+              <div class="btn-back-text">
+                {{ Math.pow(2, multiplierDigit) }}x
+              </div>
+            </div>
+            <img class="window-btns" @click="addDigit"  :src="fowardBtn"/>
+            <img class="window-btns" :src="photo"/>
           </div>
           <!--        时间轴-->
           <div class="timeLine">
@@ -60,6 +60,13 @@ import 'video.js/dist/video-js.css'
 import 'vue-video-player/src/custom-theme.css'
 import videoA from '@/assets/video/a.mp4'
 import videoB from '@/assets/video/b.mp4'
+import backOnce from '@/assets/images/backOnce.png'
+import goOnce from '@/assets/images/goOnce.png'
+import jiangxu from '@/assets/images/jiangxu.png'
+import backBtn from '@/assets/images/backBtn.png'
+import fowardBtn from '@/assets/images/fowardBtn.png'
+import photo from '@/assets/images/photo.png'
+import rise from '@/assets/images/rise.png'
 
 export default {
   name: 'VideoDialog',
@@ -80,6 +87,21 @@ export default {
   },
   data() {
     return {
+      rise,
+      photo,
+      fowardBtn,
+      jiangxu,
+      backBtn,
+      backOnce: {
+        active: false,
+        src: backOnce,
+        srcAct: backOnce
+      },
+      goOnce: {
+        active: false,
+        src: goOnce,
+        srcAct: goOnce
+      },
       chooseVideo: null, // 选中的视频
       videoArray: [videoA, videoB],
       player: null, // 播放器实例
@@ -144,12 +166,43 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.btn-back{
+  display: inline-block;
+  background-color: #ffff;
+  border-radius: 4px;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .btn-back-text{
+    border-radius: 50%;
+    background: #409EFF;
+    height: 70%;
+    width: 70%;
+    color: #fff;
+    font-size: 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
 .timeLine{
   height: 50px;
 }
 .media-btns{
-  font-size: 30px;
+  display: flex;
+  align-items: center;
+  //font-size: 30px;
   margin-bottom: 10px;
+  height: 32px;
+  background: #409EFF;
+  opacity: 1;
+  border-radius: 0px;
+  .window-btns,.btn-back{
+    cursor: pointer;
+    margin: 0 4px;
+  }
   .svg-icon{
     margin: 0 5px;
     cursor: pointer;