1、球机列表没有按四个排列bug修复

2、巷道管理--点击编辑按钮球机名称自动删除bug修复
3、巷道管理--对应球机名称显示重复bug修复
4、 球机管理--巷道已绑定球机点击删除按钮未显示提示语bug修复

src/layouts/AsideMenu.vue

@@ -62,7 +62,7 @@ export default {
                 parents = this.$router.options.routes[0].children.filter(ele => {
                     if (
                         this.userInfo.permissionList.some(item => {
-                            return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("camodel") < 0;
+                            return item.rights === ele.name && ele.name.indexOf("center") < 0;
                         })
                     ) {
                         return ele;
@@ -81,9 +81,9 @@ export default {
                     }
                 };
                 recursionRoute(parents);
-            } else {
+            }else {
                 parents = this.$router.options.routes[0].children.filter(item => {
-                    return !item.name.startsWith("center") && !item.name.startsWith("camodel");
+                    return !item.name.startsWith("center");
                 });
             }
             this.routes = parents;

src/plugins/axios/axios.js

@@ -29,7 +29,7 @@ instance.interceptors.response.use((response) => {
     // 对响应数据做点什么
     if (res.code !== 200 && res.code!==0) {
         console.log(res);
-        Vue.prototype.$message.error(res.msg);
+        Vue.prototype.$message.error(res.message);
         // 未认证
         if (res.code === 401) {
             // 未登录

src/router/index.js

@@ -39,14 +39,6 @@ const routes = [{
             component: () => import('@/views/realTimeMonitoring/index'),
 
         },
-        // {
-        //     path: 'realTimeMonitoring/model',
-        //     name: 'camodel',
-        //     meta: {
-        //         name: '球机操作'
-        //     },
-        //     component: () => import('@/views/realTimeMonitoring/model')
-        // },
         {
             path: 'historyMonitoring',
             name: 'historyMonitoring',
@@ -55,7 +47,46 @@ const routes = [{
                 name: '历史数据'
             },
             component: () => import('@/views/historyMonitoring/index')
-        }, {
+        },
+        //设置二级菜单
+        // {
+        //     path: 'checkManage',
+        //     name: 'checkManage',
+        //     meta: {
+        //         icon: 'form',
+        //         name: '盘点管理',
+        //         unfold:true
+        //     },
+        //     children: [
+        //         {
+        //             path: 'checkManage',
+        //             name: 'checkManage',
+        //             meta: {
+        //                 name: '盘点管理'
+        //             },
+        //             component: () => import('@/views/checkManage/index'),
+        //         },
+        //         {
+        //             path: 'checkOperation',
+        //             name: 'checkOperation',
+        //             meta: {
+        //                 name: '盘点操作'
+        //             },
+        //             component: () => import('@/views/checkManage/checkOperation'),
+        //         },
+        //     ]
+        // },
+
+        {
+            path: 'checkManage',
+            name: 'checkManage',
+            meta: {
+                icon: 'form',
+                name: '盘点管理',
+            },
+            component: () => import('@/views/checkManage/index')
+        },
+        {
             path: 'roadwayManage',
             name: 'roadwayManage',
             meta: {

src/views/cameraManage/index.vue

@@ -16,11 +16,11 @@
             @change="handleGetCameraList"
         >
           <span slot="action" slot-scope="text, record">
-          <a @click="showModel('edit',record)">
+          <a>
             测试
           </a>
           <a-divider type="vertical"/>
-          <a @click="showModel('edit',record)">
+          <a>
             配置
           </a>
           <a-divider type="vertical"/>

src/views/checkManage/checkOperation.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        盘点操作
+    </div>
+</template>

src/views/checkManage/index.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        盘点管理
+    </div>
+</template>

src/views/realTimeMonitoring/index.vue

@@ -109,8 +109,8 @@ export default {
                                 }
                             }).then(res => {
                                 console.log(res.data)
-                                // var url = 'ws://192.168.66.56:9007/api/lychee/stream/live/'+res.data.channel
+                                var url = 'ws://192.168.66.56:9007/api/lychee/stream/live/'+res.data.channel
-                                var url = 'ws://127.0.0.1:9007/api/lychee/stream/live/'+res.data.channel
+                                // var url = 'ws://127.0.0.1:9007/api/lychee/stream/live/'+res.data.channel
                                 var player = new JSMpeg.Player(url, {
                                     canvas: document.querySelector('.video'+item.id),
                                     audio: false,
@@ -216,7 +216,7 @@ export default {
     }
     .flex-layouts{
         display: flex;
-        width: 1550px;
+        width: 1630px;
         flex-wrap: wrap;
     }
     .video-list{

src/views/realTimeMonitoring/model.vue

@@ -150,7 +150,8 @@ export default {
                 }
             }).then(res => {
                 console.log(res.data)
-                var url = 'ws://127.0.0.1:9007/api/lychee/stream/live/'+res.data.channel
+                var url = 'ws://192.168.66.56:9007/api/lychee/stream/live/'+res.data.channel
+                // var url = 'ws://127.0.0.1:9007/api/lychee/stream/live/'+res.data.channel
                 var player = new JSMpeg.Player(url, {
                     canvas: document.querySelector('.video-canvas'),
                     audio: false,
@@ -373,11 +374,9 @@ export default {
 
             })
         },
-        leftStop(e){
+        leftStop(){
             this.leftUrl=require('@/assets/left-icon.png')
             console.log('左转鼠标抬起')
-            // e.unbind('mousemove')
-            console.log(e)
             this.$axios.post('/camera/control/left/stop/'+this.id, {
                 data: {}
             }).then(res => {

src/views/roadwayManage/index.vue

@@ -18,9 +18,11 @@
           </span>
           <span slot="actions" slot-scope="text">
             <template>
-                <span v-if="text.camera1Name">{{text.camera1Name}}</span>
+                <span v-if="text.camera1Name && text.camera2Name">{{text.camera1Name}} 、{{text.camera2Name}}</span>
-                <span v-if="text.camera2Name">{{text.camera2Name}}</span>
+                <span v-else>
-                <span v-if="text.camera1Name && text.camera2Name">{{text.camera1Name}}/{{text.camera2Name}}</span>
+                    <span v-if="text.camera1Name">{{text.camera1Name}}</span>
+                    <span v-if="text.camera2Name">{{text.camera2Name}}</span>
+                </span>
             </template>
           </span>
           <span slot="action" slot-scope="text, record">

src/views/roadwayManage/model.vue

@@ -240,8 +240,8 @@ export default {
                         rightShelveId:newVal.rightShelveId,
                         rightInsideShelveId:newVal.rightInsideShelveId,
                         rightOutsideShelveId:newVal.rightOutsideShelveId,
-                        camera1Id:newVal.camera1Id,
+                        camera1Id:newVal.camera1Name,
-                        camera2Id:newVal.camera2Id,
+                        camera2Id:newVal.camera2Name,
                         camera1Name:newVal.camera1Name,
                         camera2Name:newVal.camera2Name
                     })
@@ -306,6 +306,11 @@ export default {
                                 values.rightType='1'
                                 break;
                             }
+                            if(!this.cameraList.length>0){
+                                // console.log(this.mdata.camera1Id)
+                                values.camera1Id = this.mdata.camera1Id
+                                values.camera2Id = this.mdata.camera2Id
+                            }
                             this.$api.httpApi.editStreet({
                                 data:values
                             }).then(res => {