diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..e1473f9 Binary files /dev/null and b/dist.zip differ diff --git a/logistics.conf b/logistics.conf index 4f2ee1f..7d0287e 100644 --- a/logistics.conf +++ b/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 /{ diff --git a/package-lock.json b/package-lock.json index 879895d..0c28f74 100644 --- a/package-lock.json +++ b/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", diff --git a/public/index.html b/public/index.html index 1b5a0d8..fe2c68b 100644 --- a/public/index.html +++ b/public/index.html @@ -10,12 +10,12 @@ - 垛机视觉系统 + 昆船垛机视觉系统 diff --git a/src/store/modules/styles.js b/src/store/modules/styles.js index 72e25e6..9ae2a4c 100644 --- a/src/store/modules/styles.js +++ b/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)", diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue index d6bab9e..0108628 100644 --- a/src/views/cameraManage/model.vue +++ b/src/views/cameraManage/model.vue @@ -110,40 +110,40 @@
+ @mouseup="zoomDecStop" @mouseleave="zoomDecStop"> 变倍 + @mouseup="zoomAddStop" @mouseleave="zoomAddStop">
+ @mouseup="focusDecStop" @mouseleave="focusDecStop"> 变焦 + @mouseup="focusAddStop" @mouseleave="focusAddStop">
- + 光圈 - +
- - - + + +
- - + +
- + @mouseup="leftDownStop" @mouseleave="leftDownStop"> + + @mouseup="rightDownStop" @mouseleave="rightDownStop">
@@ -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; } } } diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue index 2e5df6f..5e195ca 100644 --- a/src/views/realTimeMonitoring/index.vue +++ b/src/views/realTimeMonitoring/index.vue @@ -20,41 +20,41 @@
- + 变倍 - +
- 变焦 -
- + 光圈 - +
- - - + + +
- - + +
- + @mouseup=leftDownStop($event,item.id) @mouseleave=leftDownStop($event,item.id)> + + @mouseup=rightDownStop($event,item.id) @mouseleave=rightDownStop($event,item.id)>
@@ -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; } } } diff --git a/src/views/realTimeMonitoring/model.vue b/src/views/realTimeMonitoring/model.vue index eeeff5d..d424ddc 100644 --- a/src/views/realTimeMonitoring/model.vue +++ b/src/views/realTimeMonitoring/model.vue @@ -15,39 +15,39 @@
- + 变倍 - +
- + 变焦 - +
- + 光圈 - +
- - - + + +
- - -
+ + +
- - - + + +
- +