Merge remote-tracking branch 'origin/0.8.X' into 0.8.X
This commit is contained in:
@@ -45,6 +45,7 @@
|
||||
"echarts": "5.4.0",
|
||||
"element-ui": "2.15.12",
|
||||
"file-saver": "2.0.5",
|
||||
"flv.js": "^1.6.2",
|
||||
"fuse.js": "6.4.3",
|
||||
"highlight.js": "10.5.0",
|
||||
"js-beautify": "1.13.0",
|
||||
@@ -58,6 +59,7 @@
|
||||
"screenfull": "5.0.2",
|
||||
"sortablejs": "1.10.2",
|
||||
"vditor": "^3.11.1",
|
||||
"video.js": "^8.23.3",
|
||||
"vue": "2.6.12",
|
||||
"vue-count-to": "1.0.13",
|
||||
"vue-cropper": "0.5.5",
|
||||
|
||||
44
klp-ui/src/api/wms/cameraManagement.js
Normal file
44
klp-ui/src/api/wms/cameraManagement.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询摄像头管理列表
|
||||
export function listCameraManagement(query) {
|
||||
return request({
|
||||
url: '/wms/cameraManagement/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询摄像头管理详细
|
||||
export function getCameraManagement(cameraId) {
|
||||
return request({
|
||||
url: '/wms/cameraManagement/' + cameraId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增摄像头管理
|
||||
export function addCameraManagement(data) {
|
||||
return request({
|
||||
url: '/wms/cameraManagement',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改摄像头管理
|
||||
export function updateCameraManagement(data) {
|
||||
return request({
|
||||
url: '/wms/cameraManagement',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除摄像头管理
|
||||
export function delCameraManagement(cameraId) {
|
||||
return request({
|
||||
url: '/wms/cameraManagement/' + cameraId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
67
klp-ui/src/components/FLVPlayer/index.vue
Normal file
67
klp-ui/src/components/FLVPlayer/index.vue
Normal file
@@ -0,0 +1,67 @@
|
||||
<template>
|
||||
<div>
|
||||
<video ref="videoElement" controls autoplay></video>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import flvjs from 'flv.js'
|
||||
|
||||
export default {
|
||||
name: 'FlvPlayer',
|
||||
props: {
|
||||
url: {
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
type: {
|
||||
type: String,
|
||||
default: 'flv' // 'flv' 或 'mp4'
|
||||
},
|
||||
isLive: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
flvPlayer: null
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.initPlayer()
|
||||
},
|
||||
beforeDestroy() {
|
||||
this.destroyPlayer()
|
||||
},
|
||||
methods: {
|
||||
initPlayer() {
|
||||
if (flvjs.isSupported()) {
|
||||
this.flvPlayer = flvjs.createPlayer({
|
||||
type: this.type,
|
||||
url: this.url,
|
||||
isLive: this.isLive
|
||||
})
|
||||
|
||||
this.flvPlayer.attachMediaElement(this.$refs.videoElement)
|
||||
this.flvPlayer.load()
|
||||
|
||||
this.flvPlayer.play().catch(e => {
|
||||
console.error('播放错误:', e)
|
||||
})
|
||||
} else {
|
||||
console.error('当前浏览器不支持flv.js')
|
||||
}
|
||||
},
|
||||
destroyPlayer() {
|
||||
if (this.flvPlayer) {
|
||||
this.flvPlayer.pause()
|
||||
this.flvPlayer.unload()
|
||||
this.flvPlayer.detachMediaElement()
|
||||
this.flvPlayer.destroy()
|
||||
this.flvPlayer = null
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
307
klp-ui/src/views/wms/video/index.vue
Normal file
307
klp-ui/src/views/wms/video/index.vue
Normal file
@@ -0,0 +1,307 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="摄像头编号" prop="cameraCode">
|
||||
<el-input
|
||||
v-model="queryParams.cameraCode"
|
||||
placeholder="请输入摄像头编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="摄像头名称" prop="cameraName">
|
||||
<el-input
|
||||
v-model="queryParams.cameraName"
|
||||
placeholder="请输入摄像头名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</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-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="cameraManagementList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="自增主键" align="center" prop="cameraId" v-if="false"/>
|
||||
<el-table-column label="摄像头编号" align="center" prop="cameraCode" />
|
||||
<el-table-column label="摄像头名称" align="center" prop="cameraName" />
|
||||
<el-table-column label="RTSP 推流地址" align="center" prop="rtspUrl" />
|
||||
<el-table-column label="ws - fmp4 播放地址" align="center" prop="wsFmp4" />
|
||||
<el-table-column label="状态：0-未启用 1-正常 2-离线 3-故障" align="center" prop="status" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改摄像头管理对话框 -->
|
||||
<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="cameraCode">
|
||||
<el-input v-model="form.cameraCode" placeholder="请输入摄像头编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="摄像头名称" prop="cameraName">
|
||||
<el-input v-model="form.cameraName" placeholder="请输入摄像头名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="RTSP 推流地址" prop="rtspUrl">
|
||||
<el-input v-model="form.rtspUrl" placeholder="请输入RTSP 推流地址" />
|
||||
</el-form-item>
|
||||
<el-form-item label="ws - fmp4 播放地址" prop="wsFmp4">
|
||||
<el-input v-model="form.wsFmp4" placeholder="请输入ws - fmp4 播放地址" />
|
||||
</el-form-item>
|
||||
<el-form-item label="http - fmp4 播放地址" prop="httpFmp4">
|
||||
<el-input v-model="form.httpFmp4" placeholder="请输入http - fmp4 播放地址" />
|
||||
</el-form-item>
|
||||
<el-form-item label="rtsp 播放地址" prop="rtspAddr">
|
||||
<el-input v-model="form.rtspAddr" placeholder="请输入rtsp 播放地址" />
|
||||
</el-form-item>
|
||||
<el-form-item label="hls 播放地址" prop="hlsAddr">
|
||||
<el-input v-model="form.hlsAddr" placeholder="请输入hls 播放地址" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listCameraManagement, getCameraManagement, delCameraManagement, addCameraManagement, updateCameraManagement } from "@/api/wms/cameraManagement";
|
||||
|
||||
export default {
|
||||
name: "CameraManagement",
|
||||
data() {
|
||||
return {
|
||||
// 按钮loading
|
||||
buttonLoading: false,
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 摄像头管理表格数据
|
||||
cameraManagementList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
cameraCode: undefined,
|
||||
cameraName: undefined,
|
||||
status: undefined,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询摄像头管理列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listCameraManagement(this.queryParams).then(response => {
|
||||
this.cameraManagementList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
cameraId: undefined,
|
||||
cameraCode: undefined,
|
||||
cameraName: undefined,
|
||||
rtspUrl: undefined,
|
||||
wsFmp4: undefined,
|
||||
httpFmp4: undefined,
|
||||
rtspAddr: undefined,
|
||||
hlsAddr: undefined,
|
||||
location: undefined,
|
||||
groupName: undefined,
|
||||
warehouseName: undefined,
|
||||
status: undefined,
|
||||
username: undefined,
|
||||
password: undefined,
|
||||
createTime: undefined,
|
||||
createBy: undefined,
|
||||
updateTime: undefined,
|
||||
updateBy: undefined,
|
||||
delFlag: undefined,
|
||||
remark: undefined
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.cameraId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加摄像头管理";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.loading = true;
|
||||
this.reset();
|
||||
const cameraId = row.cameraId || this.ids
|
||||
getCameraManagement(cameraId).then(response => {
|
||||
this.loading = false;
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改摄像头管理";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
this.buttonLoading = true;
|
||||
if (this.form.cameraId != null) {
|
||||
updateCameraManagement(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
} else {
|
||||
addCameraManagement(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const cameraIds = row.cameraId || this.ids;
|
||||
this.$modal.confirm('是否确认删除摄像头管理编号为"' + cameraIds + '"的数据项？').then(() => {
|
||||
this.loading = true;
|
||||
return delCameraManagement(cameraIds);
|
||||
}).then(() => {
|
||||
this.loading = false;
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('wms/cameraManagement/export', {
|
||||
...this.queryParams
|
||||
}, `cameraManagement_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Reference in New Issue
Block a user