Merge branch 'liuzhou-yancao' into 'master'

Liuzhou yancao

See merge request duoji/duoji-frontend!3

logistics.conf

@@ -4,7 +4,7 @@ server {
   client_max_body_size   90m;
 
   location /api {
-	proxy_pass http://localhost:8099/api;
+	proxy_pass http://192.168.77.91:8099/api;
   }
 
   location /{

package-lock.json

@@ -1859,6 +1859,16 @@
                     "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
                     "dev": true
                 },
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
                 "cacache": {
                     "version": "13.0.1",
                     "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
@@ -1885,6 +1895,34 @@
                         "unique-filename": "^1.1.1"
                     }
                 },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "optional": true
+                },
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -1915,6 +1953,25 @@
                         "path-exists": "^4.0.0"
                     }
                 },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "optional": true
+                },
+                "loader-utils": {
+                    "version": "2.0.2",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+                    "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^2.1.2"
+                    }
+                },
                 "locate-path": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -1985,6 +2042,16 @@
                         "minipass": "^3.1.1"
                     }
                 },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                },
                 "terser-webpack-plugin": {
                     "version": "2.3.8",
                     "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
@@ -2001,6 +2068,18 @@
                         "terser": "^4.6.12",
                         "webpack-sources": "^1.4.3"
                     }
+                },
+                "vue-loader-v16": {
+                    "version": "npm:vue-loader@16.8.3",
+                    "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+                    "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "chalk": "^4.1.0",
+                        "hash-sum": "^2.0.0",
+                        "loader-utils": "^2.0.0"
+                    }
                 }
             }
         },
@@ -13788,87 +13867,6 @@
                 }
             }
         },
-        "vue-loader-v16": {
-            "version": "npm:vue-loader@16.8.3",
-            "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
-            "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "chalk": "^4.1.0",
-                "hash-sum": "^2.0.0",
-                "loader-utils": "^2.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true,
-                    "optional": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true,
-                    "optional": true
-                },
-                "loader-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-                    "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "big.js": "^5.2.2",
-                        "emojis-list": "^3.0.0",
-                        "json5": "^2.1.2"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "vue-ref": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz",

public/index.html

@@ -10,12 +10,12 @@
     
     <!-- <script src="/video_play_plugins/video.js"></script> -->
     <script src="/video_play_plugins/webrtcplayer.js"></script>
-    <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>
     

src/store/modules/styles.js

@@ -11,7 +11,7 @@ const store =  {
                 "primary-color":"rgba(184, 68, 13, 1)"
             },
             "title":{
-                "text":"垛机智能视觉系统",
+                "text":"昆船垛机智能视觉系统",
                 "style":{
                     "color":"rgba(255, 255, 255, 1)",
                     "background-color":"rgba(163, 60, 12, 1)",

src/views/cameraManage/model.vue

@@ -110,40 +110,40 @@
                  <div class="operation-list">
                      <div class="operation-item">
                          <img :src="zoomSubUrl" alt="" @mousedown="zoomDecStart"
-                              @mouseup="zoomDecStop">
+                              @mouseup="zoomDecStop" @mouseleave="zoomDecStop">
                          <span>变倍</span>
                          <img :src="zoomAddUrl" alt="" @mousedown="zoomAddStart"
-                              @mouseup="zoomAddStop">
+                              @mouseup="zoomAddStop" @mouseleave="zoomAddStop">
                      </div>
                      <div class="operation-item">
                          <img :src="focusSubUrl" alt="" @mousedown="focusDecStart"
-                              @mouseup="focusDecStop">
+                              @mouseup="focusDecStop" @mouseleave="focusDecStop">
                          <span>变焦</span>
                          <img :src="focusAddUrl" alt="" @mousedown="focusAddStart"
-                              @mouseup="focusAddStop">
+                              @mouseup="focusAddStop" @mouseleave="focusAddStop">
                      </div>
                      <div class="operation-item">
-                         <img :src="irisSubUrl" alt="" @mousedown="irisDecStart" @mouseup="irisDecStop">
+                         <img :src="irisSubUrl" alt="" @mousedown="irisDecStart" @mouseup="irisDecStop" @mouseleave="irisDecStop">
                          <span>光圈</span>
-                         <img :src="irisAddUrl" alt="" @mousedown="irisAddStart" @mouseup="irisAddStop">
+                         <img :src="irisAddUrl" alt="" @mousedown="irisAddStart" @mouseup="irisAddStop" @mouseleave="irisAddStop">
                      </div>
                  </div>
                  <div class="direction-list">
                      <div class="direction-item">
-                         <img :src="leftUpUrl" alt="" @mousedown="leftUpStart" @mouseup="leftUpStop">
-                         <img :src="upUrl" alt="" @mousedown="upStart" @mouseup="upStop">
-                         <img :src="rightUpUrl" alt="" @mousedown="rightUpStart" @mouseup="rightUpStop">
+                         <img :src="leftUpUrl" alt="" @mousedown="leftUpStart" @mouseup="leftUpStop" @mouseleave="leftUpStop">
+                         <img :src="upUrl" alt="" @mousedown="upStart" @mouseup="upStop" @mouseleave="upStop">
+                         <img :src="rightUpUrl" alt="" @mousedown="rightUpStart" @mouseup="rightUpStop" @mouseleave="rightUpStop">
                      </div>
                      <div class="direction-item">
-                         <img :src="leftUrl" alt="" @mousedown="leftStart" @mouseup="leftStop">
-                         <img :src="rightUrl" alt="" @mousedown="rightStart" @mouseup="rightStop">
+                         <img :src="leftUrl" alt="" @mousedown="leftStart" @mouseup="leftStop" @mouseleave="leftStop">
+                         <img :src="rightUrl" alt="" @mousedown="rightStart" @mouseup="rightStop" @mouseleave="rightStop">
                      </div>
                      <div class="direction-item">
                          <img :src="leftDownUrl" alt="" @mousedown="leftDownStart"
-                              @mouseup="leftDownStop">
-                         <img :src="downUrl" alt="" @mousedown="downStart" @mouseup="downStop">
+                              @mouseup="leftDownStop" @mouseleave="leftDownStop">
+                         <img :src="downUrl" alt="" @mousedown="downStart" @mouseup="downStop" @mouseleave="downStop">
                          <img :src="rightDownUrl" alt="" @mousedown="rightDownStart"
-                              @mouseup="rightDownStop">
+                              @mouseup="rightDownStop" @mouseleave="rightDownStop">
                      </div>
                  </div>
                  <div class="config-table">
@@ -768,6 +768,10 @@ export default {
             .operation-item{
                 img{
                     width: 42px;
+                    -webkit-user-select: none;
+                    -ms-user-select: none;
+                    -webkit-user-drag: none;
+                    user-select: none;
                 }
                 span{
                     padding: 5px 10px;
@@ -790,6 +794,10 @@ export default {
                 justify-content: space-between;
                 img{
                     width: 42px;
+                    -webkit-user-select: none;
+                    -ms-user-select: none;
+                    -webkit-user-drag: none;
+                    user-select: none;
                 }
             }
         }
@@ -811,6 +819,10 @@ export default {
             .operation-item{
                 img{
                     width: 32px;
+                    -webkit-user-select: none;
+                    -ms-user-select: none;
+                    -webkit-user-drag: none;
+                    user-select: none;
                 }
                 span{
                     padding: 3px 6px;
@@ -833,6 +845,10 @@ export default {
                 justify-content: space-between;
                 img{
                     width: 32px;
+                    -webkit-user-select: none;
+                    -ms-user-select: none;
+                    -webkit-user-drag: none;
+                    user-select: none;
                 }
             }
         }

src/views/realTimeMonitoring/index.vue

@@ -20,41 +20,41 @@
                 </video>
                 <div class="operation-list">
                      <div class="operation-item">
-                         <img :src="zoomSubUrl" alt="" @mousedown=zoomDecStart($event,item.id)
-                              @mouseup=zoomDecStop($event,item.id)>
+                         <img :src="zoomSubUrl" alt="" @mousedown=zoomDecStart($event,item.id) @mouseleave=zoomDecStop($event,item.id)
+                              >
                          <span>变倍</span>
-                         <img :src="zoomAddUrl" alt="" @mousedown=zoomAddStart($event,item.id)
-                              @mouseup=zoomAddStop($event,item.id)>
+                         <img :src="zoomAddUrl" alt="" @mousedown=zoomAddStart($event,item.id) @mouseleave=zoomAddStop($event,item.id)
+                              >
                      </div>
                      <div class="operation-item">
-                         <img :src="focusSubUrl" alt="" @mousedown=focusDecStart($event,item.id)
+                         <img :src="focusSubUrl" alt="" @mousedown=focusDecStart($event,item.id) @mouseleave=focusDecStop($event,item.id)
                               @mouseup=focusDecStop($event,item.id)>
                          <span>变焦</span>
-                         <img :src="focusAddUrl" alt="" @mousedown=focusAddStart($event,item.id)
+                         <img :src="focusAddUrl" alt="" @mousedown=focusAddStart($event,item.id) @mouseleave=focusAddStop($event,item.id)
                               @mouseup=focusAddStop($event,item.id)>
                      </div>
                      <div class="operation-item">
-                         <img :src="irisSubUrl" alt="" @mousedown=irisDecStart($event,item.id) @mouseup=irisDecStop($event,item.id)>
+                         <img :src="irisSubUrl" alt="" @mousedown=irisDecStart($event,item.id) @mouseup=irisDecStop($event,item.id) @mouseleave=irisDecStop($event,item.id)>
                          <span>光圈</span>
-                         <img :src="irisAddUrl" alt="" @mousedown=irisAddStart($event,item.id) @mouseup=irisAddStop($event,item.id)>
+                         <img :src="irisAddUrl" alt="" @mousedown=irisAddStart($event,item.id) @mouseup=irisAddStop($event,item.id) @mouseleave=irisAddStop($event,item.id)>
                      </div>
                  </div>
                  <div class="direction-list">
                      <div class="direction-item">
-                         <img :src="leftUpUrl" alt="" @mousedown=leftUpStart($event,item.id) @mouseup=leftUpStop($event,item.id)>
-                         <img :src="upUrl" alt="" @mousedown=upStart($event,item.id) @mouseup=upStop($event,item.id)>
-                         <img :src="rightUpUrl" alt="" @mousedown=rightUpStart($event,item.id) @mouseup=rightUpStop($event,item.id)>
+                         <img :src="leftUpUrl" alt="" @mousedown=leftUpStart($event,item.id) @mouseup=leftUpStop($event,item.id) @mouseleave=leftUpStop($event,item.id)>
+                         <img :src="upUrl" alt="" @mousedown=upStart($event,item.id) @mouseup=upStop($event,item.id) @mouseleave=upStop($event,item.id) >
+                         <img :src="rightUpUrl" alt="" @mousedown=rightUpStart($event,item.id) @mouseup=rightUpStop($event,item.id) @mouseleave=rightUpStop($event,item.id) >
                      </div>
                      <div class="direction-item">
-                         <img :src="leftUrl" alt="" @mousedown=leftStart($event,item.id) @mouseup=leftStop($event,item.id)>
-                         <img :src="rightUrl" alt="" @mousedown=rightStart($event,item.id) @mouseup=rightStop($event,item.id)>
+                         <img :src="leftUrl" alt="" @mousedown=leftStart($event,item.id) @mouseup=leftStop($event,item.id) @mouseleave=leftStop($event,item.id)>
+                         <img :src="rightUrl" alt="" @mousedown=rightStart($event,item.id) @mouseup=rightStop($event,item.id) @mouseleave=rightStop($event,item.id)>
                      </div>
                      <div class="direction-item">
                          <img :src="leftDownUrl" alt="" @mousedown=leftDownStart($event,item.id)
-                              @mouseup=leftDownStop($event,item.id)>
-                         <img :src="downUrl" alt="" @mousedown=downStart($event,item.id) @mouseup=downStop($event,item.id)>
+                              @mouseup=leftDownStop($event,item.id) @mouseleave=leftDownStop($event,item.id)>
+                         <img :src="downUrl" alt="" @mousedown=downStart($event,item.id) @mouseup=downStop($event,item.id) @mouseleave=downStop($event,item.id)>
                          <img :src="rightDownUrl" alt="" @mousedown=rightDownStart($event,item.id)
-                              @mouseup=rightDownStop($event,item.id)>
+                              @mouseup=rightDownStop($event,item.id) @mouseleave=rightDownStop($event,item.id)>
                      </div>
                  </div>
             </div>
@@ -535,7 +535,7 @@ export default {
     video::-webkit-media-controls-enclosure{ 
         display: none;
     }
-    .operation-list{
+    .operation-list {
             position: absolute;
             right: 200px;
             bottom: 20px;
@@ -545,6 +545,10 @@ export default {
             .operation-item{
                 img{
                     width: 32px;
+                    -webkit-user-select: none;
+                    -ms-user-select: none;
+                    -webkit-user-drag: none;
+                    user-select: none;
                 }
                 span{
                     padding: 3px 6px;
@@ -567,6 +571,10 @@ export default {
                 justify-content: space-between;
                 img{
                     width: 32px;
+                    -webkit-user-select: none;
+                    -ms-user-select: none;
+                    -webkit-user-drag: none;
+                    user-select: none;
                 }
             }
         }

src/views/realTimeMonitoring/model.vue

@@ -15,39 +15,39 @@
        </div>
        <div class="operation-list">
            <div class="operation-item">
-               <img :src="zoomSubUrl" alt="" @mousedown="zoomDecStart" @mouseup="zoomDecStop">
+               <img :src="zoomSubUrl" alt="" @mousedown="zoomDecStart" @mouseup="zoomDecStop" @mousemove="zoomDecStop">
                <span>变倍</span>
-               <img :src="zoomAddUrl" alt="" @mousedown="zoomAddStart" @mouseup="zoomAddStop">
+               <img :src="zoomAddUrl" alt="" @mousedown="zoomAddStart" @mouseup="zoomAddStop" @mousemove="zoomAddStop">
            </div>
            <div class="operation-item">
-               <img :src="focusSubUrl" alt="" @mousedown="focusDecStart" @mouseup="focusDecStop">
+               <img :src="focusSubUrl" alt="" @mousedown="focusDecStart" @mouseup="focusDecStop" @mousemove="focusDecStop">
                <span>变焦</span>
-               <img :src="focusAddUrl" alt="" @mousedown="focusAddStart" @mouseup="focusAddStop">
+               <img :src="focusAddUrl" alt="" @mousedown="focusAddStart" @mouseup="focusAddStop" @mousemove="focusAddStop">
            </div>
            <div class="operation-item">
-               <img :src="irisSubUrl" alt="" @mousedown="irisDecStart" @mouseup="irisDecStop">
+               <img :src="irisSubUrl" alt="" @mousedown="irisDecStart" @mouseup="irisDecStop" @mousemove="irisDecStop">
                <span>光圈</span>
-               <img :src="irisAddUrl" alt="" @mousedown="irisAddStart" @mouseup="irisAddStop">
+               <img :src="irisAddUrl" alt="" @mousedown="irisAddStart" @mouseup="irisAddStop" @mousemove="irisAddStop">
            </div>
        </div>
        <div class="direction-list">
            <div class="direction-item">
-               <img :src="leftUpUrl" alt="" @mousedown="leftUpStart" @mouseup="leftUpStop">
-               <img :src="upUrl" alt="" @mousedown="upStart" @mouseup="upStop">
-               <img :src="rightUpUrl" alt="" @mousedown="rightUpStart" @mouseup="rightUpStop">
+               <img :src="leftUpUrl" alt="" @mousedown="leftUpStart" @mouseup="leftUpStop" @mousemove="leftUpStop">
+               <img :src="upUrl" alt="" @mousedown="upStart" @mouseup="upStop" @mousemove="upStop">
+               <img :src="rightUpUrl" alt="" @mousedown="rightUpStart" @mouseup="rightUpStop" @mousemove="rightUpStop">
            </div>
            <div class="direction-item">
-               <img :src="leftUrl" alt="" @mousedown="leftStart" @mouseup="leftStop">
-               <img :src="rightUrl" alt="" @mousedown="rightStart" @mouseup="rightStop">
-           </div>
+               <img :src="leftUrl" ondragstart="return false;"  @mousedown="leftStart" @mouseup="leftStop" @mousemove="leftStop">
+               <img :src="rightUrl" ondragstart="return false;" @mousedown="rightStart" @mouseup="rightStop" @mousemove="rightStop">
+           </div> 
            <div class="direction-item">
-               <img :src="leftDownUrl" alt="" @mousedown="leftDownStart" @mouseup="leftDownStop">
-               <img :src="downUrl" alt="" @mousedown="downStart" @mouseup="downStop">
-               <img :src="rightDownUrl" alt="" @mousedown="rightDownStart" @mouseup="rightDownStop">
+               <img :src="leftDownUrl" alt="" @mousedown="leftDownStart" @mouseup="leftDownStop" @mousemove="leftDownStop">
+               <img :src="downUrl" alt="" @mousedown="downStart" @mouseup="downStop" @mousemove="downStop">
+               <img :src="rightDownUrl" alt="" @mousedown="rightDownStart" @mouseup="rightDownStop" @mousemove="rightDownStop">
            </div>
        </div>
    </div>
-</template>
+</template>   
 <script>
 export default {
     data() {
@@ -486,6 +486,10 @@ export default {
 
                 img {
                     width: 42px;
+                    -webkit-user-select: none;
+                    -ms-user-select: none;
+                    -webkit-user-drag: none;
+                    user-select: none;
                 }
             }
         }

src/views/roadwayManage/index.vue

@@ -2,10 +2,10 @@
     <div>
         <div class="button-box">
             <a-button type="primary" class="open" @click="confirmLight('open')">
-                打开光源
+                打开全部光源
             </a-button>
             <a-button type="primary" class="close" @click="confirmLight('close')">
-                关闭光源
+                关闭全部光源
             </a-button>
             <a-button type="primary" @click="showModel('add','')">
                 新增巷道
@@ -55,6 +55,14 @@
             </template>
           </span>
           <span slot="action" slot-scope="text, record">
+              <a @click="openOneLight(record.id)">
+            打开光源
+          </a>
+          <a-divider type="vertical"/>
+          <a @click="closeOneLight(record.id)">
+            关闭光源
+          </a>
+          <a-divider type="vertical"/>
           <a @click="showModel('edit',record)">
             编辑
           </a>
@@ -240,13 +248,39 @@ export default {
                         return new Promise((resolve, reject) => {
                             that.closeLight();
                             setTimeout(resolve, 1000);
+                            this.$message.success('已关闭光源');
                         }).catch(() => console.log('Oops errors!'));  
                     },
                     cancelText: '取消',
                 });
             }
         },
-       
+        openOneLight(streetId){
+            console.log("openOneLight"+streetId)
+            this.$axios.get('/street/lightSource/open/' + streetId, {
+                
+            }).then(res => {
+                if(res.code==200){
+                    this.$message.success('已打开光源');
+                }
+               
+            }).catch(err => {
+
+            })
+        },
+        closeOneLight(streetId){
+            console.log("closeOneLight"+streetId)
+            this.$axios.get('/street/lightSource/close/' + streetId, {
+                
+            }).then(res => {
+                if(res.code==200){
+                    this.$message.success('已关闭光源');
+                }
+               
+            }).catch(err => {
+
+            })
+        },
         openLight(){
             console.log("openLight")
             this.$api.httpApi.openLight().then(res => {

src/views/roadwayManage/model.vue

@@ -107,12 +107,12 @@
                         </a-form-item>
                     </div>
                     <div class="across-layout" v-if="leftType =='1'">
-                        <a-form-item label="内货架号" :label-col="formItemAcrossLayout.labelCol">
+                        <a-form-item label="浅货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
                                 v-decorator="['leftInsideShelveId', { rules: [{ required: true, message: '请输入内货架号!' }] }]"
                             />
                         </a-form-item>
-                        <a-form-item label="外货架号" :label-col="formItemAcrossLayout.labelCol">
+                        <a-form-item label="深货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
                                 v-decorator="['leftOutsideShelveId', { rules: [{ required: true, message: '请输入外货架号!' }] }]"
                             />
@@ -174,12 +174,12 @@
                         </a-form-item>
                     </div>
                     <div class="across-layout" v-if="rightType =='1'">
-                        <a-form-item label="内货架号" :label-col="formItemAcrossLayout.labelCol">
+                        <a-form-item label="浅货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
                                 v-decorator="['rightInsideShelveId', { rules: [{ required: true, message: '请输入内货架号!' }] }]"
                             />
                         </a-form-item>
-                        <a-form-item label="外货架号" :label-col="formItemAcrossLayout.labelCol">
+                        <a-form-item label="深货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
                                 v-decorator="['rightOutsideShelveId', { rules: [{ required: true, message: '请输入外货架号!' }] }]"
                             />

src/views/stockLog/index.vue

@@ -13,7 +13,7 @@
         <!--左货架DOM-->
         <div class="center-box">
             <span class="shelf-number">
-                左货架号: {{leftShelveId.shelveId}}
+                右货架
             </span>
 
             <a-radio-group v-model="size" style="margin:10px 0" @change="getStockRowColumn"
@@ -37,7 +37,7 @@
         <!--单伸类型右货架DOM-->
         <div class="center-box">
             <span class="shelf-number">
-                右货架号: {{rightShelveId.shelveId}}
+                左货架
             </span>
 
             <a-radio-group v-model="size2" style="margin:10px 0" @change="getStockRowColumn"

vue.config.js

@@ -32,21 +32,21 @@ module.exports = {
                 }
             },
             '/api/pic': {
-                target: 'http://127.0.0.1:9007/api/pic',
+                target: 'http://192.168.77.91:9007/api/pic',
                 logLevel:'debug',
                 pathRewrite:{
                     '/api/pic':''
                 }
             },
             '/api/mp4': {
-                target: 'http://127.0.0.1:9007/api/mp4',
+                target: 'http://192.168.77.91:9007/api/mp4',
                 logLevel:'debug',
                 pathRewrite:{
                     '/api/mp4':''
                 }
             },
             '/api': {
-                target: 'http://127.0.0.1:8099',
+                target: 'http://192.168.77.91:8099',
                 // target: 'http://115.236.65.98:13001/monitor',
                 // target: 'http://127.0.0.1:9007',
                 logLevel:'debug',   //控制台终端打印代理前的真实地址