diff --git a/package.json b/package.json
index 84c1526..4243a07 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@jeecg/antd-online-mini": "2.4.0-beta4",
     "@tinymce/tinymce-vue": "^2.1.0",
     "@toast-ui/editor": "^2.1.2",
+    "@videojs/http-streaming": "2.2.0",
     "ant-design-vue": "^1.7.2",
     "area-data": "^5.0.6",
     "axios": "^0.18.0",
@@ -33,6 +34,7 @@
     "nprogress": "^0.2.0",
     "spark-md5": "^3.0.2",
     "tinymce": "^5.3.2",
+    "video.js": "7.11.4",
     "viser-vue": "^2.4.8",
     "vue": "^2.6.10",
     "vue-area-linkage": "^5.1.0",
diff --git a/src/api/dataformatsRules.js b/src/api/dataformatsRules.js
index d816314..319c628 100644
--- a/src/api/dataformatsRules.js
+++ b/src/api/dataformatsRules.js
@@ -6,12 +6,13 @@ const deleteRules = (params)=>deleteAction("/dataFormatRules/deleteRules",params
 const queryPage = (params)=>getAction("/dataFormatRules/queryPage",params);
 const queryById = (params)=>getAction("/dataFormatRules/queryById",params);
 const queryRulesByTableName = (params)=>getAction("dataFormatRules/queryRulesByTableName",params);
-
+const querytableColumns = (params)=>getAction("/dataFormatRules/getTableColumns",params);
 export {
     createRules,
     updateRules,
     deleteRules,
     queryPage,
     queryById,
-    queryRulesByTableName
+    queryRulesByTableName,
+    querytableColumns
 }
\ No newline at end of file
diff --git a/src/views/data/dataIndexing.vue b/src/views/data/dataIndexing.vue
index 7b3fc31..7667fd3 100644
--- a/src/views/data/dataIndexing.vue
+++ b/src/views/data/dataIndexing.vue
@@ -24,6 +24,9 @@
               <a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="8">
+            <a-button type="primary" @click="getTableIndexList" icon="search" style="margin-left: 8px;left: 10px">查询</a-button>
+          </a-col>
           <!-- <a-col :md="6" :sm="8">
             <a-button type="primary" @click="handleAdd" icon="plus" style="margin-left: 8px;left: 10px">添加</a-button>
           </a-col> -->
diff --git a/src/views/datalink/modules/SliceUpload.vue b/src/views/datalink/modules/SliceUpload.vue
index b055016..4cad633 100644
--- a/src/views/datalink/modules/SliceUpload.vue
+++ b/src/views/datalink/modules/SliceUpload.vue
@@ -1,13 +1,28 @@
 <template>
   <div>
-    <a-row type="flex">
-      <a-col flex="auto">
+    <a-form layout="inline" >
+    <a-row :gutter="24">
+      <a-col :md="8">
         <a-select placeholder="选择模式" option-filter-prop="children" size="large" v-model="schemaName" style="width: 300px;">
             <a-select-option v-for="d in allSchemaName" :key="d">
               {{ d }}
           </a-select-option>
         </a-select>
-        <a-upload
+      </a-col>
+      <a-col :md="12" >
+        <a-form-item label="数据类型">
+          <a-select  placeholder="选择数据库类型" option-filter-prop="children" size="large" v-model="dbType" style="width: 300px;">
+            <a-select-option key="DM">
+              达梦数据库
+            </a-select-option>
+            <a-select-option key="MYSQL">
+              MySQL数据库
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
+      <a-col :md="4">
+       <a-upload
           class="upload-wrapper"
           :showUploadList="false"
           :disabled="maxFile && tableDate.length >= maxFile"
@@ -22,26 +37,8 @@
           </a-button>
         </a-upload>
       </a-col>
-      <a-col flex="100px" v-if="false" >
-        <a-button @click="customRequestUpload">
-          <a-icon type="upload" /> 文档上传
-        </a-button>
-      </a-col>
-    </a-row>
-    <a-row>
-      <a-col>
-        <a-form-item label="数据类型">
-          <a-select  placeholder="选择数据库类型" option-filter-prop="children" size="large" v-model="dbType" style="width: 300px;">
-            <a-select-option key="DM">
-              达梦数据库
-            </a-select-option>
-            <a-select-option key="MYSQL">
-              MySQL数据库
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
     </a-row>
+    </a-form>
     <div class="result-wrapper" :style="{minHeight: boxHeight + 'px'}" >
       <div class="item" v-for="(file,idx) in tableDate" :key="file.uid">
         <div class="content">
diff --git a/src/views/datalink/modules/uploadModal.vue b/src/views/datalink/modules/uploadModal.vue
index 0399b0a..f7c2fb8 100644
--- a/src/views/datalink/modules/uploadModal.vue
+++ b/src/views/datalink/modules/uploadModal.vue
@@ -1,7 +1,7 @@
 <template>
   <a-modal
     :title="title"
-    :width="800"
+    :width="1000"
     :visible="visible"
     :confirmLoading="confirmLoading"
     @ok="handleOk"
diff --git a/src/views/datawashing/dataformatsRules/index.vue b/src/views/datawashing/dataformatsRules/index.vue
index 4432938..e47f873 100644
--- a/src/views/datawashing/dataformatsRules/index.vue
+++ b/src/views/datawashing/dataformatsRules/index.vue
@@ -87,7 +87,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -147,7 +147,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/datawashing/dataformatsRules/rulesModel.vue b/src/views/datawashing/dataformatsRules/rulesModel.vue
index 6a842d4..a399826 100644
--- a/src/views/datawashing/dataformatsRules/rulesModel.vue
+++ b/src/views/datawashing/dataformatsRules/rulesModel.vue
@@ -26,8 +26,7 @@
 <script>
 import JCron from "@/components/jeecg/JCron";
 import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
-import { createRules, updateRules, queryById } from '@/api/dataformatsRules'
-import { querytableColumns } from '@/api/deEmphasisRules'
+import { createRules, updateRules, queryById,querytableColumns } from '@/api/dataformatsRules'
 import { TreeSelect } from 'ant-design-vue';
 const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 
diff --git a/src/views/datawashing/dataformatsRules/subPage.vue b/src/views/datawashing/dataformatsRules/subPage.vue
index b1fd5ef..8decabf 100644
--- a/src/views/datawashing/dataformatsRules/subPage.vue
+++ b/src/views/datawashing/dataformatsRules/subPage.vue
@@ -75,7 +75,7 @@ export default {
                     dataIndex: 'tableName',
                 },
                 {
-                    title: '转换字段',
+                    title: '字段名称',
                     align: "center",
                     dataIndex: 'transfFileds',
                 },
diff --git a/src/views/datawashing/datatypeConversionRules/index.vue b/src/views/datawashing/datatypeConversionRules/index.vue
index e751b89..615134c 100644
--- a/src/views/datawashing/datatypeConversionRules/index.vue
+++ b/src/views/datawashing/datatypeConversionRules/index.vue
@@ -87,7 +87,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -147,7 +147,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/datawashing/deEmphasisRules/index.vue b/src/views/datawashing/deEmphasisRules/index.vue
index 4564115..21cc6c5 100644
--- a/src/views/datawashing/deEmphasisRules/index.vue
+++ b/src/views/datawashing/deEmphasisRules/index.vue
@@ -92,7 +92,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -169,7 +169,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/datawashing/missingvalueRules/index.vue b/src/views/datawashing/missingvalueRules/index.vue
index 47a5a3a..470495a 100644
--- a/src/views/datawashing/missingvalueRules/index.vue
+++ b/src/views/datawashing/missingvalueRules/index.vue
@@ -94,7 +94,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -193,7 +193,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/datawashing/tempfive/index.vue b/src/views/datawashing/tempfive/index.vue
index ea8ec09..41eb33e 100644
--- a/src/views/datawashing/tempfive/index.vue
+++ b/src/views/datawashing/tempfive/index.vue
@@ -92,7 +92,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -163,7 +163,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/datawashing/tempfour/index.vue b/src/views/datawashing/tempfour/index.vue
index f115987..09895a3 100644
--- a/src/views/datawashing/tempfour/index.vue
+++ b/src/views/datawashing/tempfour/index.vue
@@ -87,7 +87,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -147,7 +147,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/datawashing/tempone/index.vue b/src/views/datawashing/tempone/index.vue
index f09963b..b18d18b 100644
--- a/src/views/datawashing/tempone/index.vue
+++ b/src/views/datawashing/tempone/index.vue
@@ -87,7 +87,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -147,7 +147,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/datawashing/tempone/rulesModel.vue b/src/views/datawashing/tempone/rulesModel.vue
index e5e2d61..7f7e1f4 100644
--- a/src/views/datawashing/tempone/rulesModel.vue
+++ b/src/views/datawashing/tempone/rulesModel.vue
@@ -7,7 +7,7 @@
                 <a-form-model-item label="表名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableName">
                     <a-input v-model="form.tableName" placeholder="请输入"></a-input>
                 </a-form-model-item>
-                <a-form-model-item label="转换字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="field">
+                <a-form-model-item label="字段名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="field">
                     <a-tree-select v-model="form.field" style="width: 100%"
                         :tree-data="treeData" :show-checked-strategy="SHOW_PARENT" search-placeholder="请选项" 
                         :dropdownStyle="{ maxHeight: '400px', overflowY: 'auto'}"/>
diff --git a/src/views/datawashing/tempthree/index.vue b/src/views/datawashing/tempthree/index.vue
index ac370b5..ad74f68 100644
--- a/src/views/datawashing/tempthree/index.vue
+++ b/src/views/datawashing/tempthree/index.vue
@@ -87,7 +87,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -147,7 +147,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/datawashing/temptwo/index.vue b/src/views/datawashing/temptwo/index.vue
index 44197c8..f7577f9 100644
--- a/src/views/datawashing/temptwo/index.vue
+++ b/src/views/datawashing/temptwo/index.vue
@@ -94,7 +94,7 @@ export default {
                 showQuickJumper: false,
                 pageSizeOptions: ['10', '20', '30'],
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
-                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
+                onShowSizeChange: (current, pageSize) => (this.queryParam.pageSize = pageSize)
             },
             dataTypeList: [],
             dataSource: [],
@@ -193,7 +193,7 @@ export default {
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
-            this.queryParam.pageNum = pagination.current - 1
+            this.queryParam.pageNum = pagination.current
             this.queryParam.pageSize = pagination.pageSize
             this.getQueryPage()
         },
diff --git a/src/views/fileManage/fullSearch.vue b/src/views/fileManage/fullSearch.vue
index 8e5f9bd..58a5a49 100644
--- a/src/views/fileManage/fullSearch.vue
+++ b/src/views/fileManage/fullSearch.vue
@@ -28,13 +28,14 @@
                         <a @click="download(record,$event)">下载</a>&nbsp; <a v-if="isPreviewable(record.fileName)" @click="viewFile(record,$event)">预览</a>
                     </span>
                 </a-table>
+                 <fileview ref="fileview"></fileview>
             </div>
         </a-layout-content>
 </template>
 <script>
 import {createDir,logicDelDir,renameDir,dirtreeList} from '@/api/dirapi'
 import {downloadFile,filePreview,fullTextSearching} from '@/api/fileapi'
-
+import fileview from './modules/fileview'
 export default {
     name: "fileManage",
     data() {
@@ -120,11 +121,15 @@ export default {
                 showTotal: total => `总共 ${total} 个项目`, // 显示总数
                 onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
             },
-            viewFileType:["png","bmp","jpg","jpeg","mp4","avi","mp3","pdf"]
+            viewFileType:["png","bmp","jpg","jpeg","mp4","avi","mp3","pdf","wmv"],
+            modalFileType:["mp3","mp4","wmv","avi"]
         }
     },
     created() {
     },
+    components: {
+        fileview
+    },
     mounted() {
         
 	},
@@ -150,13 +155,18 @@ export default {
             window.open(apiBaseUrl+"/file/downloadFile?fileId="+item.id);
         },
         viewFile(item){
-            filePreview({fileId:item.id}).then((res) => {
+            const parts = item.fileName.split('.');
+            filePreview({ fileId: item.id }).then((res) => {
                 if (res.success) {
-                    window.open("http://"+res.result,"_blank");
-                } else {
-                    this.$message.warning(res.message);
+                if(this.modalFileType.includes(parts.pop().toLowerCase())){
+                    this.$refs.fileview.add(parts.pop().toLowerCase(),'http://' + res.result)
+                }else{
+                    window.open('http://' + res.result, '_blank')
                 }
-            });
+                } else {
+                this.$message.warning(res.message)
+                }
+            })
         },
         reloadFileList(){
             this.searchFile.queryCriteria = "";
diff --git a/src/views/fileManage/index.vue b/src/views/fileManage/index.vue
index 2afeda0..4c56c0e 100644
--- a/src/views/fileManage/index.vue
+++ b/src/views/fileManage/index.vue
@@ -145,10 +145,12 @@
       <a-input placeholder="请输入" v-model="dirName" style="color: #000000 !important"></a-input>
     </a-modal>
     <uploadModal ref="modalForm"></uploadModal>
+    <fileview ref="fileview"></fileview>
   </div>
 </template>
 <script>
 import uploadModal from './modules/uploadModal'
+import fileview from './modules/fileview'
 import guaz from '@assets/guaz.png'
 import { createDir, logicDelDir, renameDir, dirtreeList } from '@/api/dirapi'
 import { downloadFile, filePreview, logicDeleteFile, pageList, uoloadFile, countFileNum } from '@/api/fileapi'
@@ -156,6 +158,7 @@ export default {
   name: 'fileManage',
   components: {
     uploadModal,
+    fileview
   },
   data() {
     return {
@@ -233,7 +236,8 @@ export default {
         audio: 0,
         total: 0,
       },
-      viewFileType:["png","bmp","jpg","jpeg","mp4","mp3","pdf"]
+      viewFileType:["png","bmp","jpg","jpeg","mp4","avi","mp3","pdf","wmv"],
+      modalFileType:["mp3","mp4","wmv","avi"]
     }
   },
   created() {},
@@ -307,9 +311,14 @@ export default {
       window.open(apiBaseUrl + '/file/downloadFile?fileId=' + item.id)
     },
     viewFile(item) {
+      const parts = item.fileName.split('.');
       filePreview({ fileId: item.id }).then((res) => {
         if (res.success) {
-          window.open('http://' + res.result, '_blank')
+          if(this.modalFileType.includes(parts.pop().toLowerCase())){
+            this.$refs.fileview.add(parts.pop().toLowerCase(),'http://' + res.result)
+          }else{
+            window.open('http://' + res.result, '_blank')
+          }
         } else {
           this.$message.warning(res.message)
         }
diff --git a/src/views/fileManage/modules/fileview.vue b/src/views/fileManage/modules/fileview.vue
new file mode 100644
index 0000000..d23e785
--- /dev/null
+++ b/src/views/fileManage/modules/fileview.vue
@@ -0,0 +1,218 @@
+<template>
+  <a-modal wrap
+    :title="title"
+    :width="939"
+    :height="700"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    :ok-button-props="{ style: { display: 'none' } }"
+    okText="保存"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <audio 
+        v-if="isAudio && supportedFormats.includes(ext)" 
+        ref="audioPlayer" 
+        controls
+      ></audio>
+      
+      <!-- 视频播放器容器 -->
+      <div 
+        v-else 
+        :class="['video-container', { 'unsupported': !isFormatSupported }]"
+      >
+        <video 
+          v-if="isFormatSupported && !forceVideoJS" 
+          ref="html5Player" 
+          class="video-js" 
+          controls
+        ></video>
+        <div v-else-if="isFormatSupported" ref="videoPlayer"></div>
+        
+        <!-- 不支持的格式提示 -->
+        <div v-if="!isFormatSupported" class="unsupported-message">
+          <p>不支持 {{ ext.toUpperCase() }} 格式播放</p>
+          <a :href="src" download>下载文件</a>
+        </div>
+      </div>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import moment from "moment"
+import videojs from 'video.js';
+import 'video.js/dist/video-js.css';
+import '@videojs/http-streaming';
+
+  export default {
+    name: "fileview",
+    components: {
+
+    },
+    data () {
+      return {
+        title:"操作",
+        buttonStyle: 'solid',
+        visible: false,
+        confirmLoading: false,
+        strategys:[],
+        src:'',
+        player:null,
+        supportedFormats: ['mp3', 'mp4', 'm3u8', 'mpd']
+      }
+    },
+    mounted() {
+      
+    },
+    beforeUnmount() {
+      this.disposePlayer();
+    },
+    computed:{
+      // 获取文件扩展名
+      ext() {
+        return this.src.split('.').pop().toLowerCase();
+      },
+      // 是否为音频
+      isAudio() {
+        if (this.type) return this.type === 'audio';
+        return ['mp3', 'wav', 'ogg'].includes(this.ext);
+      },
+      // 是否支持当前格式
+      isFormatSupported() {
+        return [...this.supportedFormats, 'wmv', 'avi'].includes(this.ext);
+      },
+      // 是否强制使用Video.js
+      forceVideoJS() {
+        return ['wmv', 'avi'].includes(this.ext);
+      },
+    },
+    methods: {
+      getVideoType() {
+        const types = {
+          wmv: 'video/x-ms-wmv',
+          avi: 'video/avi',
+          mp4: 'video/mp4'
+        };
+        return types[this.ext] || 'video/mp4';
+      },
+      initPlayer() {
+        this.disposePlayer();
+        
+        // 音频播放器
+        if (this.isAudio && this.supportedFormats.includes(this.ext)) {
+          this.$nextTick(() => {
+            this.$refs.audioPlayer.src = this.src;
+          });
+          return;
+        }
+
+        // 不支持的格式
+        if (!this.isFormatSupported) return;
+
+        this.$nextTick(() => {
+          // HTML5原生视频
+          if (!this.forceVideoJS) {
+            this.$refs.html5Player.src = this.src;
+            return;
+          }
+
+          //使用Video.js处理特殊格式
+          this.player = videojs(
+            this.$refs.videoPlayer,
+            {
+              controls: true,
+              autoplay: false,
+              sources: [{
+                src: this.src,
+                type: this.getVideoType()
+              }],
+              techOrder: ['html5', 'flash'] // 尝试使用Flash后备方案
+            },
+            () => {
+              console.log('Player ready');
+            }
+          );
+        });
+      },
+      disposePlayer() {
+        if (this.player) {
+          this.player.dispose();
+          this.player = null;
+        }
+      },
+      add (filetype,fileUrl) {
+        this.visible =true;
+        this.src = fileUrl;
+        this.initPlayer();
+      },
+      onOk(value) {
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.close();
+      },
+      handleCancel () {
+        this.close()
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.disabled{
+  pointer-events: none;
+}
+/deep/ .ant-modal-footer{
+  text-align: center;
+}
+/deep/ .ant-modal-content{
+  height: 100%;
+}
+/deep/ .ant-modal-body{
+  height: calc(100% - 112px);
+}
+.media-player {
+  max-width: 800px;
+  margin: 0 auto;
+}
+
+.video-container {
+  position: relative;
+  padding-top: 56.25%; /* 16:9 Aspect Ratio */
+}
+
+.video-js, .video-container > div {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.unsupported-message {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background: #333;
+  color: white;
+  text-align: center;
+  padding: 20px;
+}
+
+.unsupported-message a {
+  color: #4da9ff;
+  margin-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/fileManage/modules/uploadModal.vue b/src/views/fileManage/modules/uploadModal.vue
index 8fdfb38..c6ae1f1 100644
--- a/src/views/fileManage/modules/uploadModal.vue
+++ b/src/views/fileManage/modules/uploadModal.vue
@@ -7,6 +7,7 @@
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
+    :ok-button-props="{ style: { display: 'none' } }"
     okText="保存"
     cancelText="关闭">
 
diff --git a/yarn.lock b/yarn.lock
index 70e2975..a490a22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -828,6 +828,11 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.9.2":
+  version "7.27.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6"
+  integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==
+
 "@babel/template@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
@@ -1082,6 +1087,93 @@
     "@types/webpack-sources" "*"
     source-map "^0.6.0"
 
+"@videojs/http-streaming@2.16.3":
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.16.3.tgz#d9b460c3716436327dbab4b1faeb2a767f05dcef"
+  integrity sha512-91CJv5PnFBzNBvyEjt+9cPzTK/xoVixARj2g7ZAvItA+5bx8VKdk5RxCz/PP2kdzz9W+NiDUMPkdmTsosmy69Q==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "3.0.5"
+    aes-decrypter "3.1.3"
+    global "^4.4.0"
+    m3u8-parser "4.8.0"
+    mpd-parser "^0.22.1"
+    mux.js "6.0.1"
+    video.js "^6 || ^7"
+
+"@videojs/http-streaming@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.2.0.tgz#0eb48aff9fd3283ba5e7f9d757cbe19ae115078e"
+  integrity sha512-0LlotccmEt19Z03rI5busKGBvtpYNPHsnLNz0wl6zVEpx8trzYxTQSwKDCUD994hfzLeikQTHJc8BqMrfs1OgA==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    "@videojs/vhs-utils" "^2.2.0"
+    aes-decrypter "3.0.2"
+    global "^4.3.2"
+    m3u8-parser "4.4.3"
+    mpd-parser "0.12.0"
+    mux.js "5.6.6"
+    video.js "^6 || ^7"
+
+"@videojs/http-streaming@2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.4.2.tgz#0289c1833e33f3242d1faf5f52a4052ec15abdcf"
+  integrity sha512-yXT85ao2t9Sg/aQN2MV1AYikoRToxCaHD8rRR1+SuOWOv9+z8+M4X9ZvxIdFF3pFgZ67Widp/6xyRrDn2u2QWQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^2.3.0"
+    aes-decrypter "3.1.0"
+    global "^4.4.0"
+    m3u8-parser "4.5.0"
+    mpd-parser "0.15.0"
+    mux.js "5.8.0"
+    video.js "^6 || ^7"
+
+"@videojs/vhs-utils@3.0.5", "@videojs/vhs-utils@^3.0.4", "@videojs/vhs-utils@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz#665ba70d78258ba1ab977364e2fe9f4d4799c46c"
+  integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    global "^4.4.0"
+    url-toolkit "^2.2.1"
+
+"@videojs/vhs-utils@^1.0.0", "@videojs/vhs-utils@^1.1.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-1.3.0.tgz#04fe402f603af9a5df4b88881fabba0cf13814c2"
+  integrity sha512-oiqXDtHQqDPun7JseWkirUHGrgdYdeF12goUut5z7vwAj4DmUufEPFJ4xK5hYGXGFDyDhk2rSFOR122Ze6qXyQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    global "^4.3.2"
+    url-toolkit "^2.1.6"
+
+"@videojs/vhs-utils@^2.2.0", "@videojs/vhs-utils@^2.2.1", "@videojs/vhs-utils@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-2.3.0.tgz#490a3a00dfc1b51d85d5dcf8f8361e2d4c4d1440"
+  integrity sha512-ThSmm91S7tuIJ757ON50K4y7S/bvKN4+B0tu303gCOxaG57PoP1UvPfMQZ90XGhxwNgngexVojOqbBHhTvXVHQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    global "^4.3.2"
+    url-toolkit "^2.1.6"
+
+"@videojs/xhr@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.5.1.tgz#26bc5a79dbb3b03bfb13742c6ce559f89e90719e"
+  integrity sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    global "~4.4.0"
+    is-function "^1.0.1"
+
+"@videojs/xhr@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.6.0.tgz#cd897e0ad54faf497961bcce3fa16dc15a26bb80"
+  integrity sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    global "~4.4.0"
+    is-function "^1.0.1"
+
 "@vue/babel-helper-vue-jsx-merge-props@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81"
@@ -1474,6 +1566,11 @@
     "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
+"@xmldom/xmldom@^0.8.3":
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
+  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -1589,6 +1686,36 @@ adjust-sourcemap-loader@^1.1.0:
     object-path "^0.9.2"
     regex-parser "^2.2.9"
 
+aes-decrypter@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.2.tgz#dcd731406b0863d18207892200c2a9aaf618f498"
+  integrity sha512-SBAfPQpGTbHbAR6qSybPjMio+MYuZwdD/a/ltOq6hj53vK94dphAm88rR3FNaZyEa/x3SobYmdT5f46qUwroLQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    "@videojs/vhs-utils" "^1.0.0"
+    global "^4.3.2"
+    pkcs7 "^1.0.4"
+
+aes-decrypter@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.0.tgz#fc0b1d703f97a64aa3f7b13528f4661971db68c4"
+  integrity sha512-wL1NFwP2yNrJG4InpXYFhhYe9TfonnDyhyxMq2+K9/qt+SrZzUieOpviN6pkDly7GawTqw5feehk0rn5iYo00g==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    "@videojs/vhs-utils" "^2.2.1"
+    global "^4.3.2"
+    pkcs7 "^1.0.4"
+
+aes-decrypter@3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.3.tgz#65ff5f2175324d80c41083b0e135d1464b12ac35"
+  integrity sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.5"
+    global "^4.4.0"
+    pkcs7 "^1.0.4"
+
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
@@ -4775,6 +4902,11 @@ dom-serializer@0:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
+dom-walk@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
+  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -6227,6 +6359,22 @@ global-dirs@^0.1.0:
   dependencies:
     ini "^1.3.4"
 
+global@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
+  integrity sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ==
+  dependencies:
+    min-document "^2.19.0"
+    process "~0.5.1"
+
+global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
+  dependencies:
+    min-document "^2.19.0"
+    process "^0.11.10"
+
 globals@^11.0.1, globals@^11.1.0, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -6840,6 +6988,11 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
+individual@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
+  integrity sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==
+
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -7184,6 +7337,11 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-function@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
+  integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -7611,6 +7769,11 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+keycode@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.1.tgz#09c23b2be0611d26117ea2501c2c391a01f39eff"
+  integrity sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==
+
 killable@^1.0.0, killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -8193,6 +8356,33 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+m3u8-parser@4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.4.3.tgz#b4a516d98a61bc040e56a10b5ea917cc8d8ea5d9"
+  integrity sha512-o6Z2I0lVeL95gE3BHPB5mSACAA6PTubYCFKlbdQmGNH+Ij0A0oEW8N4V5kqTPgYVnuLcb5UdqNiP7V+xEORhYA==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    "@videojs/vhs-utils" "^1.1.0"
+    global "^4.3.2"
+
+m3u8-parser@4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.5.0.tgz#9c30b32c9b69cc3f81b5e6789717fa84b9fdb9aa"
+  integrity sha512-RGm/1WVCX3o1bSWbJGmJUu4zTbtJy8lImtgHM4CESFvJRXYztr1j6SW/q9/ghYOrUjgH7radsIar+z1Leln0sA==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    "@videojs/vhs-utils" "^2.2.1"
+    global "^4.3.2"
+
+m3u8-parser@4.8.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.8.0.tgz#4a2d591fdf6f2579d12a327081198df8af83083d"
+  integrity sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.5"
+    global "^4.4.0"
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8417,6 +8607,13 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==
+  dependencies:
+    dom-walk "^0.1.0"
+
 mini-css-extract-plugin@^0.8.0:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz#a875e169beb27c88af77dd962771c9eedc3da161"
@@ -8556,6 +8753,36 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
+mpd-parser@0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.12.0.tgz#b866c39288ddd3ad0e95bf3abb75f99e17300871"
+  integrity sha512-Ov5Oz9bw5X/G8V/6PlO+rHuqKywYYjQ6USyv8fqFMs413HkrzlpDjgUKSBD7C+/J19ID5mWtxzrpMf4Yp++iZg==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    "@videojs/vhs-utils" "^1.1.0"
+    global "^4.3.2"
+    xmldom "^0.1.27"
+
+mpd-parser@0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.15.0.tgz#2b4836e6bdbd92229110e31b189ed029535aea83"
+  integrity sha512-GfspJVaEnVbWKZQASvh9nsJkvxWh3M/c5Kb2RPnN5ZXPZ7jWWfarWkNKTEuqvoaAKIT8IB/r6PFTWA1GY4fzGg==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    "@videojs/vhs-utils" "^2.2.1"
+    global "^4.3.2"
+    xmldom "^0.1.27"
+
+mpd-parser@0.22.1, mpd-parser@^0.22.1:
+  version "0.22.1"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.22.1.tgz#bc2bf7d3e56368e4b0121035b055675401871521"
+  integrity sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.5"
+    "@xmldom/xmldom" "^0.8.3"
+    global "^4.4.0"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -8604,6 +8831,24 @@ mute-stream@~0.0.4:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+mux.js@5.6.6:
+  version "5.6.6"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.6.6.tgz#b22d305318c91933331e4ef3f6a7a4ab67e9f1d9"
+  integrity sha512-q5VIpqb28UVs5dKsOQkpHrPxqInMjiZ/f/4qW4gEBKlm2xeBasRjRJIokixFWj+r6PWfVSEygvPffXnG7aK99g==
+
+mux.js@5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.8.0.tgz#1e1ca927b498de5ae48f1284ccada4d88e47e187"
+  integrity sha512-v56I2YPyCq1bVbXW7vcuvQs8iHrDy7AeXsZyG1kxCxBUqUjZD0Xq/cU1wrd5dy9YTxRpvw37aTQ4ILwi40GXiw==
+
+mux.js@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-6.0.1.tgz#65ce0f7a961d56c006829d024d772902d28c7755"
+  integrity sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==
+  dependencies:
+    "@babel/runtime" "^7.11.2"
+    global "^4.4.0"
+
 mz@^2.4.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
@@ -9703,6 +9948,13 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
+pkcs7@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
+  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -10414,6 +10666,11 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
+  integrity sha512-oNpcutj+nYX2FjdEW7PGltWhXulAnFlM0My/k48L90hARCOJtvBbQXc/6itV2jDvU5xAAtonP+r6wmQgCcbAUA==
+
 progress@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
@@ -11221,6 +11478,13 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
+rust-result@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rust-result/-/rust-result-1.0.0.tgz#34c75b2e6dc39fe5875e5bdec85b5e0f91536f72"
+  integrity sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==
+  dependencies:
+    individual "^2.0.0"
+
 rw@1, rw@^1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
@@ -11255,6 +11519,13 @@ safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-json-parse@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz#7c0f578cfccd12d33a71c0e05413e2eca171eaac"
+  integrity sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==
+  dependencies:
+    rust-result "^1.0.0"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -12733,6 +13004,11 @@ url-parse@^1.1.8, url-parse@^1.4.3, url-parse@^1.4.7:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url-toolkit@^2.1.6, url-toolkit@^2.2.1:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.5.tgz#58406b18e12c58803e14624df5e374f638b0f607"
+  integrity sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -12853,6 +13129,51 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+video.js@7.11.4:
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.11.4.tgz#64300cb6def9f17ecba4808ae76ec7c10c952378"
+  integrity sha512-eT9n7YCugHyWNHI2gyK28XoozNmLiW4F9dRYEP6ET/JVmm7oXPhLeVfs5kqcRviquISqWsvsNmhK1b9vvZzyVA==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+    "@videojs/http-streaming" "2.4.2"
+    "@videojs/xhr" "2.5.1"
+    global "4.3.2"
+    keycode "^2.2.0"
+    safe-json-parse "4.0.0"
+    videojs-font "3.2.0"
+    videojs-vtt.js "^0.15.2"
+
+"video.js@^6 || ^7":
+  version "7.21.7"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.21.7.tgz#8feccac174c5f202144b2f84138352a81f263dcd"
+  integrity sha512-T2s3WFAht7Zjr2OSJamND9x9Dn2O+Z5WuHGdh8jI5SYh5mkMdVTQ7vSRmA5PYpjXJ2ycch6jpMjkJEIEU2xxqw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/http-streaming" "2.16.3"
+    "@videojs/vhs-utils" "^3.0.4"
+    "@videojs/xhr" "2.6.0"
+    aes-decrypter "3.1.3"
+    global "^4.4.0"
+    keycode "^2.2.0"
+    m3u8-parser "4.8.0"
+    mpd-parser "0.22.1"
+    mux.js "6.0.1"
+    safe-json-parse "4.0.0"
+    videojs-font "3.2.0"
+    videojs-vtt.js "^0.15.5"
+
+videojs-font@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"
+  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
+
+videojs-vtt.js@^0.15.2, videojs-vtt.js@^0.15.5:
+  version "0.15.5"
+  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.5.tgz#567776eaf2a7a928d88b148a8b401ade2406f2ca"
+  integrity sha512-yZbBxvA7QMYn15Lr/ZfhhLPrNpI/RmCSCqgIff57GC2gIrV5YfyzLfLyZMj0NnZSAz8syB4N0nHXpZg9MyrMOQ==
+  dependencies:
+    global "^4.3.1"
+
 viser-vue@^2.4.8:
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/viser-vue/-/viser-vue-2.4.8.tgz#3fdb058445cba59c1ccee9cc9c2024bec29926d4"
@@ -13475,6 +13796,11 @@ xe-utils@2.4.8:
   resolved "https://registry.yarnpkg.com/xe-utils/-/xe-utils-2.4.8.tgz#0efda3ca81f6b55f68a8a31e276fb17da59c98b3"
   integrity sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q==
 
+xmldom@^0.1.27:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"