Tony/god-ytr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Tony:a4915dcf50e127abd845063726ad6a4007932633
Branches Tags
Tony:main
Tony:zhoumingxiu
Tony:feature_chejian_chanxian
..
compare: Tony:878a5ead58758f881d5edaccfbb1d8422f0d2590
Branches Tags
Tony:main
Tony:zhoumingxiu
Tony:feature_chejian_chanxian

No commits in common. "a4915dcf50e127abd845063726ad6a4007932633" and "878a5ead58758f881d5edaccfbb1d8422f0d2590" have entirely different histories.
a4915dcf50 ... 878a5ead58

3 changed files with 48 additions and 295 deletions
Show Stats Expand all files Collapse all files

BIN
god-ui/public/images/vlog.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 45 KiB

10
god-ui/src/views/login.vue
View File

@ -272,16 +272,8 @@ export default {
const dom13 = document.querySelector('.login-form')
dom13.style.marginLeft = '34vw'
break;
case '':
document.title = '汉丰湖Vlog短视频应用系统'
this.title = '汉丰湖Vlog短视频应用系统'
loginDom.style.backgroundImage = 'url(/images/vlog.png)'
this.redirect = '/index'
const dom133 = document.querySelector('.login-form')
dom133.style.marginLeft = '34vw'
dom133.style.border = 'none'
break;
default:
document.title = ''
loginDom.style.backgroundImage = 'url(/images/gangyin-bg.png)'
this.redirect = '/index'

333
god-ui/src/views/vlog/video/index.vue
View File

@ -1,13 +1,6 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="设备名称" prop="equipName">
<el-input
v-model="queryParams.equipName"
@ -24,10 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item
label="用户名"
prop="userName"
>
<el-form-item label="用户名" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名"
@ -35,10 +25,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item
label="用户id"
prop="userId"
>
<el-form-item label="用户id" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户id"
@ -55,24 +42,12 @@
/>
</el-form-item>-->
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row
:gutter="10"
class="mb8"
>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
@ -93,7 +68,6 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['vlog:video:edit']"
v-show="false"
>修改
</el-button>
</el-col>
@ -119,108 +93,26 @@
v-hasPermi="['vlog:video:export']"
>导出</el-button>
</el-col>-->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<div
class="moving-video-grid"
v-loading="loading"
>
<div
class="moving-video-card"
v-for="item, index in videoList"
:key="index"
>
<video
:src="baseUrl + item.fileUrl"
class="moving-video-img"
controls
/>
<div class="moving-card-info">
<div class="moving-card-title">{{ item.equipName }}</div>
<div class="moving-card-time">
<span style="font-size: 12px;">{{ item.videoTime }}</span>
<el-button
type="text"
icon="el-icon-delete"
style="margin-left: 1rem;"
@click="handleDelete(item)"
v-hasPermi="['vlog:video:remove']"
>删除</el-button>
<el-button
type="text"
icon="el-icon-delete"
style="margin-left: 1rem;"
@click="handleUpdate(item)"
v-hasPermi="['vlog:video:edit']"
>修改</el-button>
</div>
</div>
</div>
</div>
<el-table
v-loading="loading"
:data="videoList"
v-show="false"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
/>
<el-table-column
label="设备名称"
align="center"
prop="equipName"
/>
<el-table-column
label="设备id"
align="center"
prop="equipId"
/>
<el-table-column
label="用户名"
align="center"
prop="userName"
/>
<el-table-column
label="用户id"
align="center"
prop="userId"
/>
<el-table-column
label="视频名称"
align="center"
prop="videoName"
/>
<el-table-column
label="时间"
align="center"
prop="videoTime"
width="150"
/>
<!-- <el-table-column label="视频地址" align="center" prop="fileUrl" />-->
<el-table v-loading="loading" :data="videoList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="设备名称" align="center" prop="equipName"/>
<el-table-column label="设备id" align="center" prop="equipId"/>
<el-table-column label="用户名" align="center" prop="userName"/>
<el-table-column label="用户id" align="center" prop="userId"/>
<el-table-column label="视频名称" align="center" prop="videoName"/>
<el-table-column label="时间" align="center" prop="videoTime" width="150"/>
<el-table-column label="视频地址" align="center" prop="fileUrl" show-overflow-tooltip/>
<!-- <el-table-column label="图片" align="center" prop="phoneInfo" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.phoneInfo" :width="50" :height="50"/>
</template>
</el-table-column>-->
<!-- <el-table-column label="数据类型" align="center" prop="dataType" />-->
<el-table-column
label="备注"
align="center"
prop="remark"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope">
<el-button
size="mini"
@ -258,93 +150,34 @@
/>
<!-- 添加或修改运动视频管理对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="500px"
append-to-body
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="80px"
>
<el-form-item
label="设备名称"
prop="equipName"
>
<el-input
v-model="form.equipName"
placeholder="请输入设备名称"
/>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="设备名称" prop="equipName">
<el-input v-model="form.equipName" placeholder="请输入设备名称"/>
</el-form-item>
<el-form-item
label="设备id"
prop="equipId"
>
<el-input
v-model="form.equipId"
placeholder="请输入设备id"
/>
<el-form-item label="设备id" prop="equipId">
<el-input v-model="form.equipId" placeholder="请输入设备id"/>
</el-form-item>
<el-form-item
label="用户名"
prop="userName"
>
<el-input
v-model="form.userName"
placeholder="请输入用户名"
/>
<el-form-item label="用户名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名"/>
</el-form-item>
<el-form-item
label="用户id"
prop="userId"
>
<el-input
v-model="form.userId"
placeholder="请输入用户id"
/>
<el-form-item label="用户id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户id"/>
</el-form-item>
<el-form-item
label="视频名称"
prop="videoName"
>
<el-input
v-model="form.videoName"
placeholder="请输入视频名称"
/>
<el-form-item label="视频名称" prop="videoName">
<el-input v-model="form.videoName" placeholder="请输入视频名称"/>
</el-form-item>
<el-form-item
label="视频时间"
prop="videoTime"
>
<el-date-picker
clearable
v-model="form.videoTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择视频时间"
style="width: 100%"
>
<el-form-item label="时间" prop="videoTime">
<el-date-picker clearable
v-model="form.videoTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
<el-form-item
label="视频地址"
prop="fileUrl"
>
<el-input v-model="form.fileUrl" />
</el-form-item>
<el-form-item
label="备注"
prop="remark"
>
<el-input
v-model="form.remark"
placeholder="请输入备注"
/>
</el-form-item>
<el-form-item label="视频上传">
<el-form-item label="视频地址" prop="fileUrl">
<el-input v-model="form.fileUrl" disabled/>
<el-upload
class="upload-demo"
ref="uploadFile"
@ -356,14 +189,8 @@
:file-list="fileList"
:auto-upload="true"
>
<el-button
size="small"
type="primary"
>上传视频</el-button>
<div
slot="tip"
class="el-upload__tip"
>只能上传mp4文件，且不超过100M</div>
<el-button size="small" type="primary">上传视频</el-button>
<div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过50M</div>
</el-upload>
</el-form-item>
<el-form-item label="备注" prop="remark">
@ -376,25 +203,13 @@
<el-input v-model="form.dataType" placeholder="请输入数据类型" />
</el-form-item>-->
</el-form>
<div
slot="footer"
class="dialog-footer"
>
<el-button
type="primary"
@click="submitForm"
>确 定</el-button>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog
title
:visible="isShow"
width="600px"
@close="closeDialog"
class="videoBox"
>
<el-dialog title :visible="isShow" width="600px" @close="closeDialog" class="videoBox">
<video
:src="videoUrl"
controls
@ -407,8 +222,8 @@
</template>
<script>
import { listVideo, getVideo, delVideo, addVideo, updateVideo } from "@/api/vlog/video";
import { getToken } from "@/utils/auth";
import {listVideo, getVideo, delVideo, addVideo, updateVideo} from "@/api/vlog/video";
import {getToken} from "@/utils/auth";
import request from "@/utils/request";
const dataType = "vlog"
@ -416,7 +231,6 @@ export default {
name: "Video",
data() {
return {
baseUrl: process.env.VUE_APP_BASE_API,
// 遮罩层
loading: true,
// 选中数组
@ -457,7 +271,7 @@ export default {
//文件上传参数
upload: {
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
headers: {Authorization: "Bearer " + getToken()},
url: "/vlog/video/upload/file",
// 上传的图片地址
imageUrl: "",
@ -656,56 +470,3 @@ export default {
}
};
</script>
<style lang="scss" scoped>
@media screen and (min-width: 800px) {
.moving-video-grid {
grid-template-columns: repeat(2, 1fr);
}
}
@media screen and (min-width: 1200px) {
.moving-video-grid {
grid-template-columns: repeat(4, 1fr);
}
}
@media screen and (min-width: 1600px) {
.moving-video-grid {
grid-template-columns: repeat(6, 1fr);
}
}
@media screen and (min-width: 2000px) {
.moving-video-grid {
grid-template-columns: repeat(6, 1fr);
}
}
@media screen and (min-width: 2400px) {
.moving-video-grid {
grid-template-columns: repeat(8, 1fr);
}
}
@media screen and (min-width: 2800px) {
.moving-video-grid {
grid-template-columns: repeat(8, 1fr);
}
}
.moving-video-grid {
display: grid;
gap: 16px;
.moving-video-card {
border-radius: 8px;
box-shadow: 2px 2px 6px #25252525, -2px -2px 2px #14141414;
.moving-video-img {
width: 100%;
aspect-ratio: 1.7;
object-fit: cover;
}
.moving-card-info {
padding: 12px 16px;
.moving-card-title {
}
.moving-card-time {
margin-top: 10px;
}
}
}
}
</style>