Commit c9c776b2 authored by lei's avatar lei

fix:监控视频部分修改

parent fb9b097c
# 页面标题 # 页面标题
VUE_APP_TITLE = AI 视频推理平台 VUE_APP_TITLE = 弘基AI视频推理平台
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
......
# 页面标题 # 页面标题
VUE_APP_TITLE = AI视频推理平台 VUE_APP_TITLE = 弘基AI视频推理平台
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
......
# 页面标题 # 页面标题
VUE_APP_TITLE = AI视频推理平台 VUE_APP_TITLE = 弘基AI视频推理平台
BABEL_ENV = production BABEL_ENV = production
......
...@@ -67,46 +67,46 @@ service.interceptors.request.use(config => { ...@@ -67,46 +67,46 @@ service.interceptors.request.use(config => {
} }
return config return config
}, error => { }, error => {
console.log(error) console.log(error)
Promise.reject(error) Promise.reject(error)
}) })
// 响应拦截器 // 响应拦截器
service.interceptors.response.use(res => { service.interceptors.response.use(res => {
// 未设置状态码则默认成功状态 // 未设置状态码则默认成功状态
const code = res.data.code || 200; const code = res.data.code || 200;
// 获取错误信息 // 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default'] const msg = errorCode[code] || res.data.msg || errorCode['default']
// 二进制数据则直接返回 // 二进制数据则直接返回
if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
return res.data return res.data
} }
if (code === 401) { if (code === 401) {
if (!isRelogin.show) { if (!isRelogin.show) {
isRelogin.show = true; isRelogin.show = true;
MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false; isRelogin.show = false;
store.dispatch('LogOut').then(() => { store.dispatch('LogOut').then(() => {
location.href = '/index'; location.href = '/index';
}) })
}).catch(() => { }).catch(() => {
isRelogin.show = false; isRelogin.show = false;
}); });
} }
return Promise.reject('无效的会话,或者会话已过期,请重新登录。') return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
} else if (code === 500) { } else if (code === 500) {
Message({ message: msg, type: 'error' }) Message({ message: msg, type: 'error' })
return Promise.reject(new Error(msg)) return Promise.reject(new Error(msg))
} else if (code === 601) { } else if (code === 601) {
Message({ message: msg, type: 'warning' }) Message({ message: msg, type: 'warning' })
return Promise.reject('error') return Promise.reject('error')
} else if (code !== 200) { } else if (code !== 200) {
Notification.error({ title: msg }) Notification.error({ title: msg })
return Promise.reject('error') return Promise.reject('error')
} else { } else {
return res.data return res.data
} }
}, },
error => { error => {
console.log('err' + error) console.log('err' + error)
let { message } = error; let { message } = error;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
> >
<div class="screen-box1"> <div class="screen-box1">
<div class="screen-title"> <div class="screen-title">
<span>智慧矿山AI推理平台</span> <span>弘基AI视频推理平台</span>
</div> </div>
<div class="screen-content"> <div class="screen-content">
<el-row> <el-row>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
v-model="checkAnalysisList" v-model="checkAnalysisList"
size="small" size="small"
:key="uniqueKey" :key="uniqueKey"
style="height: calc(100vh - 320px); overflow-y: auto"
> >
<!-- 自定义复选框组件 --> <!-- 自定义复选框组件 -->
<div <div
...@@ -81,6 +82,7 @@ ...@@ -81,6 +82,7 @@
@selection-change="cameraChange" @selection-change="cameraChange"
ref="cameraTable" ref="cameraTable"
row-key="cameraId" row-key="cameraId"
height="calc(100vh - 320px)"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column label="名称" prop="cameraName"></el-table-column> <el-table-column label="名称" prop="cameraName"></el-table-column>
...@@ -393,6 +395,9 @@ export default { ...@@ -393,6 +395,9 @@ export default {
cameraChange(val) { cameraChange(val) {
const currentAlgorithm = const currentAlgorithm =
this.checkAnalysisList[this.selectedAlgorithmIndex]; this.checkAnalysisList[this.selectedAlgorithmIndex];
this.checkCameraList = val;
console.log(this.checkCameraList);
if (currentAlgorithm) { if (currentAlgorithm) {
currentAlgorithm.checkCameraList = val.map((item) => ({ currentAlgorithm.checkCameraList = val.map((item) => ({
cameraId: item.cameraId, cameraId: item.cameraId,
......
...@@ -370,7 +370,7 @@ export default { ...@@ -370,7 +370,7 @@ export default {
var videoElement = document.getElementById("videoPlayer"); var videoElement = document.getElementById("videoPlayer");
var flvPlayer = flvjs.createPlayer({ var flvPlayer = flvjs.createPlayer({
type: "flv", type: "flv",
url: "http://192.168.3.248:2022/live/15_1_.flv", //你的url地址 url: "http://192.168.1.84:2022/live/15_1_.flv", //你的url地址
}); });
flvPlayer.attachMediaElement(videoElement); flvPlayer.attachMediaElement(videoElement);
flvPlayer.load(); flvPlayer.load();
......
...@@ -47,13 +47,6 @@ module.exports = { ...@@ -47,13 +47,6 @@ module.exports = {
} }
}, },
'/proxy-iframe': {
target: 'http://192.168.2.23:8080', // 替换为实际目标地址
changeOrigin: true,
pathRewrite: {
'^/proxy-iframe': '' // 替换为实际路径前缀
}
},
}, },
disableHostCheck: true disableHostCheck: true
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment