diff --git a/ruoyi-ui/src/api/base/baseBusbarInfo.js b/ruoyi-ui/src/api/base/baseBusbarInfo.js index 8446005..f78bb2d 100644 --- a/ruoyi-ui/src/api/base/baseBusbarInfo.js +++ b/ruoyi-ui/src/api/base/baseBusbarInfo.js @@ -53,6 +53,10 @@ export function countBusbar() { }) } + +/** + * 查询母排信息列表 + */ export function baseBusbarInfolist(data) { return request({ url: '/base/baseBusbarInfo/baseBusbarInfolist', diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 2403c1e..35b9718 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -8,7 +8,8 @@ Vue.use(Router) import Layout from '@/layout' import BoardLayout from '@/layout/index2' /*import VideoPlayer from "@/views/record/recordInspectionCabinet/OldVideoPlayer.vue";*/ -import VideoPlayer from "@/views/record/recordInspectionCabinet/VideoPlayer.vue"; +// import VideoPlayer from "@/views/record/recordInspectionCabinet/VideoPlayer.vue"; + /** * Note: 路由配置项 * @@ -49,11 +50,11 @@ export const constantRoutes = [ component: () => import('@/views/login'), hidden: true }, - { +/* { path: '/video-player', component: VideoPlayer - }, + },*/ { path: '/register', component: () => import('@/views/register'), diff --git a/ruoyi-ui/src/views/record/recordInspectionCabinet/OldVideoPlayer.vue b/ruoyi-ui/src/views/record/recordInspectionCabinet/OldVideoPlayer.vue deleted file mode 100644 index ec79dfe..0000000 --- a/ruoyi-ui/src/views/record/recordInspectionCabinet/OldVideoPlayer.vue +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - diff --git a/ruoyi-ui/src/views/record/recordInspectionCabinet/VideoPlayer.vue b/ruoyi-ui/src/views/record/recordInspectionCabinet/VideoPlayer.vue index 18f34a7..70f0318 100644 --- a/ruoyi-ui/src/views/record/recordInspectionCabinet/VideoPlayer.vue +++ b/ruoyi-ui/src/views/record/recordInspectionCabinet/VideoPlayer.vue @@ -1,3 +1,4 @@ + diff --git a/ruoyi-ui/src/views/record/recordInspectionCabinet/index.vue b/ruoyi-ui/src/views/record/recordInspectionCabinet/index.vue index 21b4cdb..4af3356 100644 --- a/ruoyi-ui/src/views/record/recordInspectionCabinet/index.vue +++ b/ruoyi-ui/src/views/record/recordInspectionCabinet/index.vue @@ -463,16 +463,16 @@ export default { }, `recordInspectionCabinet_${new Date().getTime()}.xlsx`) }, - openVideoPage(filePath) { +/* openVideoPage(filePath) { if(filePath){ const url = `/video-player`; - /* this.$router.push({path:url,query: {filePath}});*/ + /!* this.$router.push({path:url,query: {filePath}});*!/ const fullPath = `${url}?filePath=${encodeURIComponent(filePath)}`; window.open(fullPath, '_blank'); }else { this.$modal.msgError("暂无文件路径"); } - }, + },*/ } };