upright
/
duoji-frontend
mirror of https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

控制后台名称及菜单栏部分名称修改、变倍接口联调

Browse Source
merge-requests/1/head
张鑫 5 years ago
parent 0bf45ec440
commit ded9e9c102
7 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
auth.json
Unescape Escape View File

@ -1,9 +1,9 @@
{ {
"description": "昆船随行垛机检测系统", "description": "德玛泰克垛机视觉系统",
"type": -1, "type": -1,
"rights": "duojiSystem", "rights": "duojiSystem",
"children": [{ "children": [{
"description": "实时监控", "description": "实时视频流",
"type": 1, "type": 1,
"rights": "realTimeMonitoring" "rights": "realTimeMonitoring"
}] }]

4
public/index.html
Unescape Escape View File

@ -6,12 +6,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>昆船随行式垛机监测系统</title> <title>德玛泰克垛机视觉系统</title>
</head> </head>
<body> <body>
<noscript> <noscript>
<strong>We're sorry but 昆船随行式垛机监测系统 doesn't work properly without JavaScript enabled. Please enable it to <strong>We're sorry but 德玛泰克垛机视觉系统 doesn't work properly without JavaScript enabled. Please enable it to
continue.</strong> continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>

1
src/assets/user.json
View File

File diff suppressed because one or more lines are too long

5
src/layouts/AsideMenu.vue
Unescape Escape View File

@ -1,8 +1,8 @@
<template> <template>
<a-layout-sider :class="['aside', collapsed ? 'merge' :'']" v-model="collapsed" theme="dark" :trigger="null" collapsible> <a-layout-sider :class="['aside', collapsed ? 'merge' :'']" v-model="collapsed" theme="dark" :trigger="null" collapsible>
<div class="logo"> <div class="logo">
<img src="@/assets/logo1.png" alt /> <!-- <img src="@/assets/logo1.png" alt />-->
<span class="logo-title">昆船随行式垛机监测系统</span> <span class="logo-title">德玛泰克垛机视觉系统</span>
</div> </div>
<a-menu :selectedKeys="selectedKeys" <a-menu :selectedKeys="selectedKeys"
:openKeys.sync="openKeys" :openKeys.sync="openKeys"
@ -149,6 +149,7 @@ export default {
} }
.logo-title{ .logo-title{
transition-delay: 0.5s; transition-delay: 0.5s;
margin-left: 25px;
} }
} }
.ant-menu-inline { .ant-menu-inline {

4
src/router/index.js
Unescape Escape View File

@ -34,7 +34,7 @@ const routes = [{
name: 'realTimeMonitoring', name: 'realTimeMonitoring',
meta: { meta: {
icon: 'desktop', icon: 'desktop',
name: '实时监控' name: '实时视频流'
}, },
component: () => import('@/views/realTimeMonitoring/index'), component: () => import('@/views/realTimeMonitoring/index'),
@ -52,7 +52,7 @@ const routes = [{
name: 'historyMonitoring', name: 'historyMonitoring',
meta: { meta: {
icon: 'line-chart', icon: 'line-chart',
name: '历史监控' name: '历史数据'
}, },
component: () => import('@/views/historyMonitoring/index') component: () => import('@/views/historyMonitoring/index')
}, { }, {

4
src/views/login.vue
View File

File diff suppressed because one or more lines are too long

53
src/views/realTimeMonitoring/model.vue
Unescape Escape View File

@ -14,13 +14,13 @@
<div class="video-mask"> <div class="video-mask">
<canvas class="video-canvas"></canvas> <canvas class="video-canvas"></canvas>
<div class="video-close" @click="handleCancel"> <div class="video-close" @click="handleCancel">
x ╳
</div> </div>
<div class="operation-list"> <div class="operation-list">
<div class="operation-item"> <div class="operation-item">
<img src="@/assets/sub-icon.png" alt=""> <img src="@/assets/sub-icon.png" alt="" @mousedown="zoomDecStart" @mouseup="zoomDecStop">
<span>变倍</span> <span>变倍</span>
<img src="@/assets/add-icon.png" alt=""> <img src="@/assets/add-icon.png" alt="" @mousedown="zoomAddStart" @mouseup="zoomAddStop">
</div> </div>
<div class="operation-item"> <div class="operation-item">
<img src="@/assets/sub-icon.png" alt=""> <img src="@/assets/sub-icon.png" alt="">
@ -119,6 +119,46 @@ export default {
console.log('mounted执行了') console.log('mounted执行了')
}, },
methods: { methods: {
zoomDecStart(){
console.log('变倍-按下')
this.$axios.post('/camera/control/zoomDec/start/'+this.id, {
data: {}
}).then(res => {
}).catch(err => {
})
},
zoomDecStop(){
console.log('变倍-按下')
this.$axios.post('/camera/control/zoomDec/stop/'+this.id, {
data: {}
}).then(res => {
}).catch(err => {
})
},
zoomAddStart(){
console.log('变倍+按下')
this.$axios.post('/camera/control/zoomAdd/start/'+this.id, {
data: {}
}).then(res => {
}).catch(err => {
})
},
zoomAddStop(){
console.log('变倍+按下')
this.$axios.post('/camera/control/zoomAdd/stop/'+this.id, {
data: {}
}).then(res => {
}).catch(err => {
})
},
leftUpStart(){ leftUpStart(){
console.log('左上鼠标按下') console.log('左上鼠标按下')
this.$axios.post('/camera/control/leftUp/'+this.id, { this.$axios.post('/camera/control/leftUp/'+this.id, {
@ -311,6 +351,13 @@ export default {
top: 20px; top: 20px;
color: #ffffff; color: #ffffff;
font-size: 24px; font-size: 24px;
width: 32px;
height: 32px;
background: rgba(0,0,0,0.5);
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
} }
.operation-list{ .operation-list{
position: absolute; position: absolute;

Write Preview
Loading…
Cancel
Save