1.窗口拉动

2.图片旋转
3.增加状态查找

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",

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",

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({

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){

src/views/checkManage/checkOperation.vue

@@ -49,7 +49,7 @@
                                     </a-select>
                                 </span>
                             </li>
-                            <li class="img-box-item">
+                            <!-- <li class="img-box-item">
                                 <span class="img-box-title">
                                     个数:
                                 </span>
@@ -63,7 +63,7 @@
                                     />
 
                                 </span>
-                            </li>
+                            </li> -->
                             <li
                                 class="img-box-item"
                                 v-for="item in params"
@@ -83,7 +83,7 @@
                         class="img-box"
                         style="width: 100%;"
                     >
-                    <div class="carousel-wrapper">
+                        <div class="carousel-wrapper">
 
                             <div
                                 v-for="ite in checkPics"
@@ -95,7 +95,7 @@
                                     :src="ite"
                                 >
                             </div>
-                    </div>
+                        </div>
 
                         <p>盘点图</p>
                     </div>
@@ -136,14 +136,23 @@
                     @click="getOveroperationPic()"
                 >
                     <a-modal
-                        width="1005px"
+                        v-drag
+                        width="600px"
                         v-model="visible_pic"
                         title="随行图像"
+                        style="top: 20px;"
                         @ok="overoperationPicStop"
                     >
-                                <img
+                    <div style="height: 700px;"  class="parent">
-                                    style="height:100%; width:100% ;"
+
-                                    :src="checkObj.overoperationPic" >
+
+                        <img
+                        
+                            style="width:700px ;"
+                            :src="checkObj.overoperationPic"
+                        >
+
+                    </div>
                     </a-modal>
 
                     随行图像
@@ -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){
+        handleChangeVlue(value) {
-            this.checkObj.category = 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;
+    overflow: hidden;
-  width: 100%;
+    width: 100%;
-  display: flex;
+    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;

src/views/checkManage/index.vue

@@ -1,14 +1,17 @@
 <template>
     <div class="check-page">
         <div class="button-box">
-            
+
             <a-popconfirm
                 title="是否清空全部盘点"
                 ok-text="是"
                 cancel-text="否"
                 @confirm="allStockClear"
             >
-                <a-button type="primary" class="export-all">
+                <a-button
+                    type="primary"
+                    class="export-all"
+                >
                     盘点清空
                 </a-button>
             </a-popconfirm>
@@ -18,15 +21,26 @@
                 cancel-text="否"
                 @confirm="allStockCheck"
             >
-                <a-button type="primary" class="export-all">
+                <a-button
+                    type="primary"
+                    class="export-all"
+                >
                     全部盘点
                 </a-button>
             </a-popconfirm>
 
-            <a-button type="primary" @click="exportStock" class="export-all">
+            <a-button
+                type="primary"
+                @click="exportStock"
+                class="export-all"
+            >
                 导出巷道盘点数据
             </a-button>
-            <a-button type="primary" @click="exportAllStock" class="export-all">
+            <a-button
+                type="primary"
+                @click="exportAllStock"
+                class="export-all"
+            >
                 导出全部巷道盘点数据
             </a-button>
         </div>
@@ -61,9 +75,18 @@
                 style="width: 200px"
                 v-model="select"
             >
-                <a-select-option v-for="i in data" :key="i.name" :value="i.id">
+                <a-select-option
+                    v-for="i in data"
+                    :key="i.name"
+                    :value="i.id"
+                >
                     {{ i.name }}
-                    <a-icon type="exclamation-circle" theme="filled"  v-if="i.statusCount> 0"  style="color: #f3e73f;  text-align: right;"/>
+                    <a-icon
+                        type="exclamation-circle"
+                        theme="filled"
+                        v-if="i.statusCount> 0"
+                        style="color: #f3e73f;  text-align: right;"
+                    />
                 </a-select-option>
             </a-select>
         </div>
@@ -83,7 +106,11 @@
                 </a-radio-group>
             </div>
 
-            <div class="check-content" v-for="item in data" :key="item.id">
+            <div
+                class="check-content"
+                v-for="item in data"
+                :key="item.id"
+            >
                 <subsection
                     v-if="item.id == select"
                     :total="{ row: item.leftRow, column: item.leftColumn }"
@@ -109,7 +136,11 @@
                 </a-radio-group>
             </div>
 
-            <div class="check-content" v-for="item in data" :key="item.name">
+            <div
+                class="check-content"
+                v-for="item in data"
+                :key="item.name"
+            >
                 <subsection
                     v-if="item.id == select"
                     :total="{ row: item.rightRow, column: item.rightColumn }"
@@ -146,14 +177,13 @@ export default {
             select: "",
             streetId: 0,
             streetDetail: {},
-            streetStockStatusMap:{},
+            streetStockStatusMap: {},
         };
     },
     computed: {},
 
     mounted() {
         this.request();
-        
     },
     created() {},
     activated() {
@@ -169,14 +199,14 @@ export default {
 
     created() {
         this.initWebSocket();
-        
+
         this.timerRequestData = window.setInterval(this.requestData, 10000);
         //设置定时器,注意：只有在 created 生命周期中设置的定时器 才能在beforeDestroy 中销毁
         this.timer = window.setInterval(() => {
             setTimeout(this.pollingFunc(), 0);
         }, 2000);
     },
-    beforeDestroy(){
+    beforeDestroy() {
         clearInterval(this.timerRequestData);
     },
     destroyed() {
@@ -189,10 +219,27 @@ export default {
                 .getAllStreet({})
                 .then((res) => {
                     console.log("update data");
-                    console.log(res)
+                    console.log(res);
                     for (let i = 0; i < res.data.length; i++) {
                         this.$set(this.data, i, res.data[i]);
                     }
+                    console.log(document.cookie);
+                    if (document.cookie.length > 0) {
+                        console.log(document.cookie);
+                        var c_start = document.cookie.indexOf(c_name + "=");
+                        //如果document.cookie对象里面有cookie则查找是否有指定的cookie，如果有则返回指定的cookie值，如果没有则返回空字符串
+                        if (c_start != -1) {
+                            c_start = c_start + c_name.length + 1;
+                            var c_end = document.cookie.indexOf(";", c_start);
+                            if (c_end == -1) c_end = document.cookie.length;
+                            console.log(
+                                document.cookie.substring(c_start, c_end)
+                            );
+                            this.select = Number(
+                                document.cookie.substring(c_start, c_end)
+                            );
+                        }
+                    }
                     //this.select = res.data[0].id;
                     //this.selectName = res.data[0].name;
                     //this.$set(this.select,res.data.list[0].id,0)
@@ -205,13 +252,37 @@ export default {
             this.$api.httpApi
                 .getAllStreet({})
                 .then((res) => {
-                    console.log("update data");
-                    console.log(res)
                     for (let i = 0; i < res.data.length; i++) {
+                        console.log(res);
                         this.$set(this.data, i, res.data[i]);
                     }
+
                     this.select = res.data[0].id;
                     this.selectName = res.data[0].name;
+
+                    if (document.cookie.length > 0) {
+                        var c_name = "streetId";
+                        console.log(document.cookie);
+                        var c_start = document.cookie.indexOf(c_name + "=");
+                        //如果document.cookie对象里面有cookie则查找是否有指定的cookie，如果有则返回指定的cookie值，如果没有则返回空字符串
+                        if (c_start != -1) {
+                            c_start = c_start + c_name.length + 1;
+                            var c_end = document.cookie.indexOf(";", c_start);
+                            if (c_end == -1) c_end = document.cookie.length;
+                            console.log(
+                                document.cookie.substring(c_start, c_end)
+                            );
+                            this.select = Number(
+                                document.cookie.substring(c_start, c_end)
+                            );
+                        }
+                    }
+
+                    for (let i = 0; i < res.data.length; i++) {
+                        if (res.data[i].id == this.select) {
+                            this.selectName = res.data[i].name;
+                        }
+                    }
                     //this.$set(this.select,res.data.list[0].id,0)
                     this.getStreetDetail(this.select);
                 })
@@ -219,10 +290,28 @@ export default {
         },
         //获取巷道列表
         getWsData(e) {
-            console.log(e)
+            console.log(e);
-            console.log(this.wsData)
+            console.log(this.wsData);
-            console.log( e.message.streetName + (e.message.fromDirection == 1 ?"左侧":"右侧") + e.message.fromRow +"行" +e.message.fromColumn + "列" + (e.message.separation1 == 2 ?"外侧货架":"内侧货架")+"发生盘点")
+            console.log(
-            return ( e.message.streetName + (e.message.fromDirection == 1 ?"左侧":"右侧") + e.message.fromRow +"行" +e.message.fromColumn + "列" + (e.message.separation1 == 2 ?"外侧货架":"内侧货架")+"发生盘点")
+                e.message.streetName +
+                    (e.message.fromDirection == 1 ? "左侧" : "右侧") +
+                    e.message.fromRow +
+                    "行" +
+                    e.message.fromColumn +
+                    "列" +
+                    (e.message.separation1 == 2 ? "外侧货架" : "内侧货架") +
+                    "发生盘点"
+            );
+            return (
+                e.message.streetName +
+                (e.message.fromDirection == 1 ? "左侧" : "右侧") +
+                e.message.fromRow +
+                "行" +
+                e.message.fromColumn +
+                "列" +
+                (e.message.separation1 == 2 ? "外侧货架" : "内侧货架") +
+                "发生盘点"
+            );
         },
         //获取巷道详情
         getStreetDetail(id) {
@@ -240,6 +329,14 @@ export default {
         handleChange(value) {
             this.select = value;
 
+            document.cookie = "streetId=" + value + ";";
+
+            for (let i = 0; i < this.data.length; i++) {
+                if (this.data[i].id == this.select) {
+                    this.selectName = this.data[i].name;
+                }
+            }
+            console.log(document.cookie);
             this.getStreetDetail(value);
         },
 
@@ -282,42 +379,6 @@ export default {
                 })
                 .catch((err) => {});
         },
-        // initWebSocket() {
-        //     //初始化weosocket
-        //     const wsuri = "ws://127.0.0.1:8099/ws/111";
-        //     this.websock = new WebSocket(wsuri);
-        //     this.websock.onmessage = this.websocketonmessage;
-        //     this.websock.onopen = this.websocketonopen;
-        //     this.websock.onerror = this.websocketonerror;
-        //     this.websock.onclose = this.websocketclose;
-        // },
-        // websocketonopen() {
-        //     //连接建立之后执行send方法发送数据
-        //     this.websocketsend(JSON.stringify(actions));
-        // },
-        // websocketonerror() {
-        //     //连接建立失败重连
-        //     this.initWebSocket();
-        // },
-        // websocketonmessage(e) {
-        //     console.log("aaaa");
-        //     var el = JSON.parse(e.data)
-        //     console.log(el.type);
-
-        //     if (el.type == "InventoryPush") {
-        //         this.wsData.push(el);
-        //     }
-        //     //数据接收
-        //     const redata = JSON.parse(e.data);
-        // },
-        // websocketsend(Data) {
-        //     //数据发送
-        //     this.websock.send(Data);
-        // },
-        // websocketclose(e) {
-        //     //关闭
-        //     console.log("断开连接", e);
-        // },
     },
     components: {
         Subsection,

src/views/historyCheck/index.vue

@@ -6,7 +6,7 @@
                 :form="queryParam"
             >
                 <a-row :gutter="24">
-                    <a-col :span="4">
+                    <a-col :span="3">
                         <a-form-item label="巷道">
                             <a-select
                                 @change="handleChange"
@@ -98,6 +98,30 @@
                             />
                         </a-form-item>
                     </a-col>
+                    <a-col
+                        :span="3"
+                        style="text-align: left"
+                    >
+                        <a-form-item label="状态">
+                            <a-select style="width: 100px"
+                                v-model="queryParam.status" allowClear
+                                @change="statusChange"
+                            >
+                                <a-select-option :value=0>
+                                    未盘点
+                                </a-select-option>
+                                <a-select-option :value=1>
+                                    盘点异常
+                                </a-select-option>
+                                <a-select-option :value=2>
+                                    盘点正常
+                                </a-select-option>
+                                <a-select-option :value=3>
+                                    人工核对正确
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
                     <a-col :span="4">
                         <a-form-item label="时间">
                             <a-range-picker
@@ -172,13 +196,22 @@
                         style="width:320px;height:90px;"
                     >
 
-                        <viewer :images="text.pic">
+                        <viewer :images="text.pics">
                             <li
                                 v-for="item in  text.pics"
                                 :key="item"
                                 style="float:left"
                             >
-                                <img style="height:90px"  :src="item">
+                                <a-tooltip>
+                                    <template slot="title">
+                                        {{removeAfterLastChar(item, "/")}}
+                                    </template>
+                                    <img
+                                        style="height:90px"
+                                        :src="item"
+                                    >
+                                </a-tooltip>
+
                             </li>
                         </viewer>
                     </happy-scroll>
@@ -290,6 +323,14 @@ export default {
             this.queryParam.leftRight = "";
             this.queryParam.side = "";
         },
+        removeAfterLastChar(str, charToRemove) {
+            let lastIndex = str.lastIndexOf(charToRemove);
+            if (lastIndex !== -1) {
+                return str.substring(0, lastIndex + 1);
+            } else {
+                return str; // 如果找不到指定字符，返回原字符串
+            }
+        },
 
         getPics(val) {
             return val.split(";");
@@ -313,6 +354,25 @@ export default {
                 this.queryParam.side = "";
             }
         },
+        // 左右货架切换
+        statusChange(value) {
+            if (value == 1) {
+                //单伸
+                if (this.streetDetail.leftType == 0) {
+                    this.queryParam.side = "";
+                } else {
+                    this.queryParam.side = 0;
+                }
+            } else if (value == 2) {
+                if (this.streetDetail.rightType == 0) {
+                    this.queryParam.side = "";
+                } else {
+                    this.queryParam.side = 0;
+                }
+            } else {
+                this.queryParam.side = "";
+            }
+        },
         handleSearch() {
             console.log(this.queryParam);
             this.pageNum = 1;
@@ -400,6 +460,9 @@ export default {
     display: flex;
     width: 100%;
 }
+img {
+    transform: rotate(270deg);
+}
 
 .historyImg {
     width: 80px;

src/views/historyMonitoring/index.vue

@@ -37,7 +37,9 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="6" style="text-align: right">
+                        
                         <a-button type="primary" @click="handleSearch">搜索</a-button>
+                        
                         <a-button style="margin-left: 15px" @click="reset">重置</a-button>
                     </a-col>
                 </a-row>
@@ -60,8 +62,9 @@
                 <span v-if="text.pics" style="height:100%;">
                     <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
                         <viewer :images="text.pics">
-                            <img class="historyImg" v-for="(src,index) in text.pics" :src="imgUrl+src"
+    <img class="historyImg" v-for="(src,index) in text.pics" :src="imgUrl+src"
                                 :key="index"/>
+                           
                         </viewer>
                     </happy-scroll>
                 </span>