From b428ae6eda845cb6df44660a4f39f555bd9220b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Wed, 22 May 2024 09:29:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AA=97=E5=8F=A3=E6=8B=89=E5=8A=A8=202.?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=97=8B=E8=BD=AC=203.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E6=89=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 5 + package.json | 1 + src/main.js | 57 +++++++- src/views/checkManage/Subsection.vue | 2 - src/views/checkManage/checkOperation.vue | 63 ++++++--- src/views/checkManage/index.vue | 173 +++++++++++++++-------- src/views/historyCheck/index.vue | 69 ++++++++- src/views/historyMonitoring/index.vue | 5 +- 8 files changed, 292 insertions(+), 83 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4233dec..7c6d1c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5598,6 +5598,11 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", "dev": true }, + "draggable": { + "version": "4.2.0", + "resolved": "https://registry.npmmirror.com/draggable/-/draggable-4.2.0.tgz", + "integrity": "sha512-mu0FSsNY1Sb2q3EuAi3IBI6oVMV8l74y6xxYmloHq2/PJjOJEfpZCLGShzNUQKAF7JMfxA6ejxoGPyw5x6v8Ow==" + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", diff --git a/package.json b/package.json index 2e8b6dc..7925835 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "axios": "^0.19.2", "bootstrap": "^5.1.3", "core-js": "^3.6.5", + "draggable": "^4.2.0", "echarts": "^5.4.3", "echarts-gl": "^2.0.9", "element-ui": "^2.15.6", diff --git a/src/main.js b/src/main.js index 2593855..0782159 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,51 @@ import Vue from 'vue' + + + +Vue.directive('drag', { + bind(el, binding, vnode) { + let dialogHeader = el.querySelector('.ant-modal-header') + let dialog = el.querySelector('.ant-modal') + + dialogHeader.style.cursor = 'move' + + dialogHeader.onmousedown = (e) => { + let scale = e.scale || 1; // 或者 e.webkitScale 对于旧版Webkit浏览器 + + let startX = dialog.offsetLeft; + let disX = e.clientX - dialog.offsetLeft * scale; + let disY = e.clientY - dialog.offsetTop * scale; + + + + + + document.onmousemove = (lo) => { + + console.log(dialog.style.left); + let left = lo.clientX - disX - startX + + let top = lo.clientY / scale - disY + + console.log("aaaa"); + + + dialog.style.left = left + 'px' + console.log(dialog.style.left); + dialog.style.top = top + 'px' + + } + + + document.onmouseup = (e) => { + dialog.style.willChange = 'auto'; // 恢复默认值 + document.onmousemove = null + document.onmouseup = null + } + } + } +}) + import App from './App.vue' import router from './router' import store from './store' @@ -13,7 +60,7 @@ Vue.prototype.$utils = utils Vue.prototype.$api = api // import axios from 'axios' // Vue.prototype.$axios = axios -import {HappyScroll} from 'vue-happy-scroll' +import { HappyScroll } from 'vue-happy-scroll' //自定义组件名 Vue.component('happy-scroll', HappyScroll) // 引入css @@ -22,7 +69,13 @@ import 'vue-happy-scroll/docs/happy-scroll.css' // 图片预览插件 viewer import 'viewerjs/dist/viewer.css' import viewer from 'v-viewer' -Vue.use(viewer) +// main.js +Vue.use(viewer, { + defaultOptions: { + // 其他配置... + initialRotate: 90, // 初始旋转角度 + }, +}) new Vue({ diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 21521d9..e708aaf 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -253,8 +253,6 @@ export default { columnTabs: columnTab } }).then(res => { - console.log(this.status.column) - console.log(this.status.row) if(res.code == 200){ if(res.data.stocks){ for(let a of res.data.stocks){ diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 79749e1..a342df9 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -49,7 +49,7 @@ -
  • +
  • -
    +
    -
    +

    盘点图

    @@ -136,14 +136,23 @@ @click="getOveroperationPic()" > - +
    + + + + +
    随行图像 @@ -175,7 +184,7 @@ export default { upUrl: "", checkObj: {}, row: 1, - pcd:'15555', + pcd: "15555", column: 1, streetName: "", visible: false, @@ -185,8 +194,16 @@ export default { modelData: {}, index: 0, imgUrl: "", - categorys: ["3","2"], + categorys: ["3", "2"], params: [ + { + label: "上位个数", + key: "wmsCount", + }, + { + label: "上位品规", + key: "wmsCategory", + }, { label: "盘点任务号", key: "checkNum", @@ -244,8 +261,8 @@ export default { pointCloud, }, methods: { - handleChangeVlue(value){ - this.checkObj.category = value + handleChangeVlue(value) { + this.checkObj.category = value; }, get3D() { this.visible = true; @@ -261,7 +278,6 @@ export default { }, //获取复核页面的核对信息 getStockInfo(row, column) { - this.$api.httpApi .getStockInfo({ data: { @@ -388,7 +404,7 @@ export default { this.streetName = res.data.streetName; var pic = this.checkObj.checkPic; this.checkPics = pic.toString().split(";"); - + console.log(this.checkPics); this.$forceUpdate(); } else { @@ -406,17 +422,17 @@ export default { /* For demo */ .carousel-wrapper { - overflow: hidden; - width: 100%; - display: flex; + overflow: hidden; + width: 100%; + display: flex; } .ant-carousel .slick-list { - margin: 0 -8px; + margin: 0 -8px; } .ant-carousel .slick-slide { - padding: 0 8px; + padding: 0 8px; } .checkOperation { @@ -540,6 +556,15 @@ export default { height: auto; } +img { + transform: rotate(270deg); +} + +.parent { + display: flex; + justify-content: center; /* 水平居中 */ + align-items: center; /* 垂直居中 */ +} .carousel-box { text-align: center; background: #364d79; diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index 7d640b5..79c2dc6 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -1,14 +1,17 @@