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

5 years ago · ded9e9c102
parent 0bf45ec440
commit ded9e9c102
7 changed files with 62 additions and 13 deletions
--- a/auth.json
+++ b/auth.json
@ -1,9 +1,9 @@
 {
-    "description": "昆船随行垛机检测系统",
+    "description": "德玛泰克垛机视觉系统",
    "type": -1,
    "rights": "duojiSystem",
    "children": [{
-        "description": "实时监控",
+        "description": "实时视频流",
        "type": 1,
        "rights": "realTimeMonitoring"
    }]
--- a/public/index.html
+++ b/public/index.html
@ -6,12 +6,12 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>昆船随行式垛机监测系统</title>
+    <title>德玛泰克垛机视觉系统</title>
 </head>

 <body>
    <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>
    </noscript>
    <div id="app"></div>
--- a/src/assets/user.json
+++ b/src/assets/user.json
--- a/src/layouts/AsideMenu.vue
+++ b/src/layouts/AsideMenu.vue
@ -1,8 +1,8 @@
 <template>
    <a-layout-sider :class="['aside', collapsed ? 'merge' :'']" v-model="collapsed" theme="dark" :trigger="null" collapsible>
        <div class="logo">
-            <img src="@/assets/logo1.png" alt />
-            <span class="logo-title">昆船随行式垛机监测系统</span>
+<!--            <img src="@/assets/logo1.png" alt />-->
+            <span class="logo-title">德玛泰克垛机视觉系统</span>
        </div>
        <a-menu :selectedKeys="selectedKeys"
                :openKeys.sync="openKeys"
@ -149,6 +149,7 @@ export default {
        }
        .logo-title{
            transition-delay: 0.5s;
+            margin-left: 25px;
        }
    }
    .ant-menu-inline {
--- a/src/router/index.js
+++ b/src/router/index.js
@ -34,7 +34,7 @@ const routes = [{
            name: 'realTimeMonitoring',
            meta: {
                icon: 'desktop',
-                name: '实时监控'
+                name: '实时视频流'
            },
            component: () => import('@/views/realTimeMonitoring/index'),

@ -52,7 +52,7 @@ const routes = [{
            name: 'historyMonitoring',
            meta: {
                icon: 'line-chart',
-                name: '历史监控'
+                name: '历史数据'
            },
            component: () => import('@/views/historyMonitoring/index')
        }, {
--- a/src/views/login.vue
+++ b/src/views/login.vue
--- a/src/views/realTimeMonitoring/model.vue
+++ b/src/views/realTimeMonitoring/model.vue
@ -14,13 +14,13 @@
        <div class="video-mask">
            <canvas class="video-canvas"></canvas>
            <div class="video-close" @click="handleCancel">
-                x
+                ╳
            </div>
            <div class="operation-list">
                <div class="operation-item">
-                    <img src="@/assets/sub-icon.png" alt="">
+                    <img src="@/assets/sub-icon.png" alt="" @mousedown="zoomDecStart" @mouseup="zoomDecStop">
                    <span>变倍</span>
-                    <img src="@/assets/add-icon.png" alt="">
+                    <img src="@/assets/add-icon.png" alt="" @mousedown="zoomAddStart" @mouseup="zoomAddStop">
                </div>
                <div class="operation-item">
                    <img src="@/assets/sub-icon.png" alt="">
@ -119,6 +119,46 @@ export default {
        console.log('mounted执行了')
    },
    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(){
            console.log('左上鼠标按下')
            this.$axios.post('/camera/control/leftUp/'+this.id, {
@ -311,6 +351,13 @@ export default {
            top: 20px;
            color: #ffffff;
            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{
            position: absolute;