diff --git a/client/package.json b/client/package.json index f48ca35..a7eed94 100644 --- a/client/package.json +++ b/client/package.json @@ -23,6 +23,7 @@ "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", + "vod-js-sdk-v6": "^1.4.12", "vue": "2.6.10", "vue-router": "3.0.6", "vuex": "3.1.0", diff --git a/client/src/api/video.js b/client/src/api/video.js new file mode 100644 index 0000000..8c53ae3 --- /dev/null +++ b/client/src/api/video.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + + +export function getVideoList(query) { + return request({ + url: '/vod/video/', + method: 'get', + params: query + }) +} + +export function getsignature() { + return request({ + url: '/vod/signature/', + method: 'get' + }) +} +export function createVideo(data) { + return request({ + url: '/vod/video/', + method: 'post', + data + }) +} +export function deletevideo(id, data) { + return request({ + url: `/vod/video/${id}/`, + method: 'delete', + data + }) +} +export function updatevideo(id, data) { + return request({ + url: `/vod/video/${id}/`, + method: 'put', + data + }) +} +export function getVideo(id) { + return request({ + url: `/vod/video/${id}/`, + method: 'get' + }) +} diff --git a/client/src/assets/year-100-bg.png b/client/src/assets/year-100-bg.png new file mode 100644 index 0000000..10d16de Binary files /dev/null and b/client/src/assets/year-100-bg.png differ diff --git a/client/src/main.js b/client/src/main.js index 0684b68..34a81de 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -7,7 +7,6 @@ import 'element-ui/lib/theme-chalk/index.css' // import locale from 'element-ui/lib/locale/lang/en' // lang i18n import '@/styles/index.scss' // global css - import App from './App' import store from './store' import router from './router' diff --git a/client/src/router/index.js b/client/src/router/index.js index b9d7fd6..f49b12e 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -202,6 +202,35 @@ export const asyncRoutes = [ }, ] }, + { + path: '/test', + component: Layout, + redirect: '/test/', + name: 'TestVideo', + meta: { title: '视频培训', icon: 'guide', perms: ['testvideo'] }, + alwaysShow: true, + children: [ + { + path: 'videolist', + name: 'videolist', + component: () => import('@/views/testvideo/videolist.vue'), + meta: { title: '视频列表', perms: ['videolist'] } + }, + { + path: 'upload', + name: 'upload', + component: () => import('@/views/testvideo/upload.vue'), + meta: { title: '上传视频', perms: ['uploadvideo'] } + }, + { + path: 'index/:id', + name: 'Index', + component: () => import('@/views/testvideo/index.vue'), + meta: { title: '视频播放', perms: ['uploadvideo'] }, + hidden: true + }, + ] + }, { path: '/pt', component: Layout, diff --git a/client/src/views/qualityinspect/inspectdoc.vue b/client/src/views/qualityinspect/inspectdoc.vue index 837440c..f285bec 100644 --- a/client/src/views/qualityinspect/inspectdoc.vue +++ b/client/src/views/qualityinspect/inspectdoc.vue @@ -136,7 +136,6 @@ export default { upUrl: upUrl(), fileList:[], Content: defaultContent, - typeOptions: [], listLoading: true, dialogVisible: false, diff --git a/client/src/views/system/user.vue b/client/src/views/system/user.vue index a225cd1..0162e29 100644 --- a/client/src/views/system/user.vue +++ b/client/src/views/system/user.vue @@ -41,6 +41,21 @@ :label="item.display_name" :value="item.key" /> + + + + + + + + 检验管理部培训视频 + + + + + + + +
+
+ + +
+
+ + +
+ 视频名称: + {{ video.name }} +
+
+
+ + +
+ 视频描述: + {{ video.description }} +
+
+
+ +
+
+ +
+
+ + + + \ No newline at end of file diff --git a/client/src/views/testvideo/upload.vue b/client/src/views/testvideo/upload.vue new file mode 100644 index 0000000..907b93c --- /dev/null +++ b/client/src/views/testvideo/upload.vue @@ -0,0 +1,453 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/client/src/views/testvideo/videolist.vue b/client/src/views/testvideo/videolist.vue new file mode 100644 index 0000000..6992a41 --- /dev/null +++ b/client/src/views/testvideo/videolist.vue @@ -0,0 +1,225 @@ + + + + + \ No newline at end of file