zy-asrs.git - Gitblit

			@@ -16,49 +16,29 @@
			<style>
			.pointContainer {
			display: flex;
			justify-content: flex-start;
			margin-top: 1px;
			justify-content: center;
			/margin-top: 1px;/
			}

			/.pointBox {/
			/* background: #bababa;*/
			/* width: 40px;*/
			/* height: 40px;*/
			/* margin-right: 1px;*/
			/* display: flex;*/
			/* justify-content: center;*/
			/* align-items: center;*/
			/* font-size: 14px;*/
			/* user-select: none;*/
			/* color: #fff;*/
			/}/

			.pointBox {
			background: #fffef9;
			width: 35px;
			height: 35px;
			margin-right: 1px;
			background: #bababa;
			width: 40px;
			height: 40px;
			/margin-right: 1px;/
			display: flex;
			justify-content: center;
			align-items: center;
			font-size: 14px;
			user-select: none;
			color: #fff;
			/transform: perspective(130px) rotateX(30deg) translateZ(-20px);/
			box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
			/border-radius: 50% 20% / 10% 40%;/
			}

			.pointBox:hover{
			/background: #20a162;/
			/background: #55bb8a;/
			background: #945833;
			/background: #20894d;/
			background: #00ff7f;
			}

			.pointBoxEmpty {
			/background: #12a182;/
			background: #57c3c2;
			background: #c2c934;
			}

			.pointBoxOut {
			@@ -70,19 +50,19 @@
			}

			.pointBoxInYy {
			background: #e2c027;
			background: #fa736f;
			}

			.pointBoxGreen {
			background: #945833;
			background: #00ff7f;
			}

			.pointBoxBlue {
			background: #89BCEF;
			background: #55aaff;
			}

			.pointBoxRed {
			background: #ee4866;
			background: #ff0000;
			}

			.pointBoxStart {
			@@ -102,16 +82,15 @@
			}

			.pointBoxDefault {
			background: #ffffff;
			background: #86779d;
			}

			.pointBoxSelected {
			/background: #945833 !important;/
			background: #20894d !important;
			background: #00ff7f !important;
			}

			.pointBoxSearch {
			background: #8076a3;
			background: #9900ff;
			}

			.crnLine{
			@@ -121,29 +100,6 @@
			background: #000;
			position: relative;
			}

			/.crnBox{/
			/* width: 120px;*/
			/* height: 40px;*/
			/* background: url("../../static/image/Crane_manual.png") no-repeat;*/
			/* position: absolute;*/
			/* top: -25px;*/
			/* left: -120px;*/
			/* transition:left 2s;*/
			/* cursor: pointer;*/
			/}/

			/.carBox{/
			/* width: 40px;*/
			/* height: 40px;*/
			/* background: url("../../static/image/ste/car.png") no-repeat;*/
			/* background-size: 100% 100%;*/
			/* position: absolute;*/
			/* top: 0;*/
			/* left: 0;*/
			/* transition:left 2s;*/
			/* cursor: pointer;*/
			/}/

			.popBox {
			position: absolute;
			@@ -217,7 +173,7 @@

			/滑动卡片start/
			.hoverCard {
			width: 152px;
			width: 150px;
			height: 224px;
			border-radius: 20px;
			background: #f5f5f5;
			@@ -424,55 +380,59 @@
			</style>
			</head>
			<body>
			<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: nowrap; " @click="bgClick()">
			<div style="flex: 3;overflow: auto; " :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
			<div style="width: 100%;overflow: auto;">
			<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
			<div style="flex: 18;display: flex;justify-content: center;" :style="{zoom:showScale/100.0,marginTop:(showScale)*2 + 'px'}">
			<div style="margin-top: 10px;">
			<div class="pointContainer" v-for="(x,index) in map" :key="index">
			<div v-if="index != 0 && (index != map.length-1)" v-for="(y,idx) in x" :key="idx">
			<div v-if="idx != 0 && (idx != map[index].length-1)">
			<div v-if="map[index][idx].value < 0" class="pointBox"></div>
			<div v-if="map[index][idx].value < 0" style="visibility: hidden;" class="pointBox"></div>

			<!--库位-->
			<div v-else-if="map[index][idx].value == 0" @contextmenu.prevent="rightEvent(index,idx,$event)">
			<div v-if="map[index][idx].locSts == 'O'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
			<div v-else-if="map[index][idx].locSts == 'F'" @click.left.stop="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
			<div v-else-if="map[index][idx].locSts == 'F'" @click.left="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
			<div v-else-if="map[index][idx].locSts == 'D'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
			<div v-else-if="map[index][idx].locSts == 'P'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
			<div v-else-if="map[index][idx].locSts == 'R'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOutYy">{{ map[index][idx].locSts }}</div>
			<div v-else-if="map[index][idx].locSts == 'S'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
			<div v-else-if="map[index][idx].locSts == 'S'" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
			<div v-else class="pointBox pointBoxDefault" :class="{'pointBoxSearch':map[index][idx].searchStatus}">{{ map[index][idx].locSts }}</div>
			</div>

			<!--堆垛机-->
			<div v-else-if="map[index][idx].value == 3">
			<div v-if="idx == 1" class="crnLine" :style="{width:pointContainerWidth + 'px'}">
			<!-- <div v-if="index == 2" @contextmenu.prevent="clickCrnBox($event,1)" :style="{left:crnList[0].left + 'px'}" class="crnBox" id="crnBox1"></div>-->
			<!-- <div v-else @contextmenu.prevent="clickCrnBox($event,2)" :style="{left:crnList[1].left + 'px'}" class="crnBox" id="crnBox2"></div>-->
			<div v-if="idx == 1" class="crnLine" style="width: 100vh">
			</div>
			</div>

			<div v-else-if="map[index][idx].value == 4" class="pointBox pointBoxStation"
			@contextmenu.prevent="rightEvent(index,idx,$event)"></div>
			<!--站点-->
			<div v-else-if="map[index][idx].value == 4" class="pointBox pointBoxStation" style="visibility: hidden;"></div>
			<div v-else-if="map[index][idx].value == 5" class="pointBox chargeStation"
			@contextmenu.prevent="rightEvent(index,idx,$event)"></div>
			<div v-else-if="map[index][idx].value == 9" class="pointBox pointBoxRed"
			@contextmenu.prevent="rightEvent(index,idx,$event)"></div>
			<div v-else-if="map[index][idx].value == 10" class="pointBox pointBoxRed" style="visibility: hidden"
			@contextmenu.prevent="rightEvent(index,idx,$event)">
			<!--穿梭车轨道-->
			</div>

			</div>
			</div>

			<div style="width: 40px; display: flex;justify-content: flex-end;align-items: center;">
			<div style="width: 40px;display: flex;justify-content: center;align-items: center;">
			{{ getRealRowByX(index) }}
			</div>

			</div>
			</div>

			<div>
			<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 1" :style="{background: currentLev==1?'red':''}">1F</button></div>
			<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 2" :style="{background: currentLev==2?'red':''}">2F</button></div>
			<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 3" :style="{background: currentLev==3?'red':''}">3F</button></div>
			<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 4" :style="{background: currentLev==4?'red':''}">4F</button></div>
			<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 5" :style="{background: currentLev==5?'red':''}">5F</button></div>
			<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 6" :style="{background: currentLev==6?'red':''}">6F</button></div>
			<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 7" :style="{background: currentLev==7?'red':''}">7F</button></div>
			</div>
			</div>
			<div style="padding: 20px;flex: 1;margin-top: -70px;">
			<div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2100 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -10px;'">
			<el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
			<div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
			<div class="hoverCard" style="width: 100%;">
			@@ -481,7 +441,7 @@
			<div style="width: 100%;margin-bottom: 20px;">
			<div style="display: flex;justify-content: space-between;">
			<div><input v-model="searchMatnr" placeholder="物料号" type="text" class="search-input"></div>
			<div style="margin-left: 20px"><input v-model="searchOrderNo" placeholder="订单号" type="text" class="search-input"></div>
			<div><input v-model="searchOrderNo" placeholder="订单号" type="text" class="search-input"></div>
			</div>
			<div style="display: flex;justify-content: space-between;margin-top: 10px;">
			<div><input style="width: 110px;" v-model="searchMaktx" placeholder="物料名称" type="text" class="search-input"></div>
			@@ -490,14 +450,14 @@
			</div>
			<button style="width: 100%;margin-top: 10px;" @click="searchLoc" class="layui-btn layui-btn-sm">搜索</button>
			</div>
			<!-- <div>-->
			<!-- <button @click="locToLoc2" class="layui-btn layui-btn-sm">侧边移库</button>-->
			<!-- </div>-->
			<div>
			<button @click="init" class="layui-btn layui-btn-sm">刷新</button>
			</div>
			<div style="margin-left: 10px;">
			<button @click="resetSearch" class="layui-btn layui-btn-sm">重置</button>
			</div>
			<div style="margin-left: 10px;">
			<button @click="locToLoc2" class="layui-btn layui-btn-sm">侧边移库</button>
			</div>
			<div v-if="!locOutStatus" style="margin-left: 10px;">
			<button @click="locOutStatus = true" class="layui-btn layui-btn-sm">出库选择</button>
			@@ -518,55 +478,6 @@
			</div>
			</div>
			<button class="card-button">功能区</button>
			</div>



			<div class="hoverCard">
			<div class="card-details">
			<p class="text-title" style="text-align: center;">库位层 {{currentLev}}</p>
			<div class="text-body" style="display: flex;">
			<div class="floorSelect">
			<label for="01">1F</label>
			<input id="01" type="radio" name="r" v-model="currentLev" value="1" checked="">
			<label for="02">2F</label>
			<input id="02" type="radio" v-model="currentLev" name="r" value="2">
			<label for="03">3F</label>
			<input id="03" type="radio" v-model="currentLev" name="r" value="3">
			<label for="04">4F</label>
			<input id="04" type="radio" v-model="currentLev" name="r" value="4">
			<label for="05">5F</label>
			<input id="05" type="radio" v-model="currentLev" name="r" value="5">
			<label for="06">6F</label>
			<input id="06" type="radio" v-model="currentLev" name="r" value="6">
			<label for="07">7F</label>
			<input id="07" type="radio" v-model="currentLev" name="r" value="7">
			</div>
			</div>
			</div>
			<button class="card-button">楼层 {{currentLev}}F</button>
			</div>

			<div class="hoverCard">
			<div class="card-details">
			<p class="text-title" style="text-align: center;">库区 {{areaName}}</p>
			<div class="text-body" style="display: flex;">
			<div class="floorSelect">
			<label for="area01">A区</label>
			<input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
			<label for="area03">B区</label>
			<input id="area03" type="radio" v-model="area" name="r" value="3">
			<label for="area04">C区</label>
			<input id="area04" type="radio" v-model="area" name="r" value="4">
			<label for="area05">D区</label>
			<input id="area05" type="radio" v-model="area" name="r" value="5">
			<label for="area06">E区</label>
			<input id="area06" type="radio" v-model="area" name="r" value="6">

			</div>
			</div>
			</div>
			<button class="card-button">库区 {{areaName}}</button>
			</div>

			<div class="hoverCard">
			@@ -597,12 +508,31 @@
			<div style="font-size: 10px;">选择结果</div><div class="pointBox pointBoxSelected"></div>
			</div>
			<div style="flex: 1;margin-top: 10px;">
			<div style="font-size: 10px;text-align: center">其他</div><div class="pointBox pointBoxDefault"></div>
			<div style="font-size: 10px;">其他</div><div class="pointBox pointBoxDefault">其他</div>
			</div>
			</div>
			</div>
			<button class="card-button">库位状态</button>
			</div>

			<!-- <div class="hoverCard">-->
			<!-- <div class="card-details">-->
			<!-- <p class="text-title" style="text-align: center;">楼层 {{currentLev}}F</p>-->
			<!-- <div class="text-body" style="display: flex;">-->
			<!-- <div class="floorSelect">-->
			<!-- <label for="01">1F</label>-->
			<!-- <input id="01" type="radio" name="r" v-model="currentLev" value="1" checked="">-->
			<!-- <label for="02">2F</label>-->
			<!-- <input id="02" type="radio" v-model="currentLev" name="r" value="2">-->
			<!-- <label for="03">3F</label>-->
			<!-- <input id="03" type="radio" v-model="currentLev" name="r" value="3">-->
			<!-- <label for="04">4F</label>-->
			<!-- <input id="04" type="radio" v-model="currentLev" name="r" value="4">-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- <button class="card-button">楼层 {{currentLev}}F</button>-->
			<!-- </div>-->

			</div>
			</div>
			@@ -631,11 +561,11 @@
			<div style="margin-top: 5px;">
			<button class="layui-btn layui-btn-sm" @click="openLocDetail(map[mapI][mapJ].locNo)">库位详情</button>
			</div>
			<!-- <div style="margin-top: 5px;">-->
			<!-- <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">库位移转</button>-->
			<!-- <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">库位移转</button>-->
			<!-- <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>库位移转</button>-->
			<!-- </div>-->
			<!-- <div style="margin-top: 5px;">-->
			<!-- <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">库位移转</button>-->
			<!-- <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">库位移转</button>-->
			<!-- <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>库位移转</button>-->
			<!-- </div>-->
			</div>
			</div>
			</div>
			@@ -689,8 +619,6 @@
			rightBoxLeft: "0px",
			pointContainerWidth: 0,
			currentLev: 1,
			area:1,
			areaName:"立库",
			crnList: null,
			crnBox: false,
			crnBoxTop: "0px",
			@@ -704,7 +632,7 @@
			searchLocNo: "",
			outSite: null,
			outSites: null,
			showScale: 85, //控制地图显示大小比例
			showScale: 45, //控制地图显示大小比例
			showScaleMarks: {//比例滑动条显示标记
			0: "0%",
			50: {
			@@ -716,17 +644,11 @@
			100: "100%",
			},
			locStsList: [],//库位状态列表
			y: 1
			},
			created(){
			this.init()

			this.getOutSite()

			// setInterval((that) => {
			// //定时获取堆垛机数据
			// that.getCrnData()
			// },1000,this)
			// this.getOutSite()
			},
			watch: {
			map: {
			@@ -747,47 +669,13 @@
			this.searchLoc()
			}
			}
			},
			area: {
			deep: true,
			handler(val) {
			if (val == 1){
			this.areaName = "A区"

			}else if (val == 3){
			this.areaName = "B区"
			}
			else if (val == 4){
			this.areaName = "C区"
			}
			else if (val == 5){
			this.areaName = "D区"
			}
			else if (val == 6){
			this.areaName = "E区"
			}


			this.init()
			if (this.searchMatnr != ""
			\|\| this.searchOrderNo != ""
			\|\| this.searchSpecs != ""
			\|\| this.searchMaktx != ""
			\|\| this.searchLocNo != "") {
			this.searchLoc()
			}
			}
			}
			},
			methods: {
			init(){
			let that = this
			$.ajax({
			url: baseUrl + "/map/getData/auth",
			data:{
			lev : this.currentLev,
			area : this.area
			},
			url: baseUrl + "/map/getData/" + this.currentLev + "/auth",
			headers: {'token': localStorage.getItem('token')},
			method: "get",
			success: (data) => {
			@@ -820,7 +708,7 @@
			val.searchStatus = false//搜索标记
			data2.push(val)
			})
			this.pointContainerWidth = item.length * (35+1)
			this.pointContainerWidth = item.length * (40+1)
			data.push(data2)
			})
			this.map = data
			@@ -830,26 +718,10 @@
			//获取真实库位行号，通过坐标x
			let data = this.map
			let rowData = data[x]


			for (var i = 1; i < rowData.length; i++) {

			if (this.area == 1){
			if (rowData[i].locNo != undefined) {
			let locNo = rowData[i].locNo;
			return "#" + parseInt(locNo.substr(0, 2));
			}
			}else if (this.area == 6){
			if (rowData[i].locNo != undefined) {
			let locNo = rowData[i].locNo;
			return "#" + parseInt(locNo.substr(7, 2));
			}
			}
			else {
			if (rowData[i].locNo != undefined) {
			let locNo = rowData[i].locNo;
			return "#" + parseInt(locNo.substr(7, 2));
			}
			if (rowData[i].locNo != undefined) {
			let locNo = rowData[i].locNo;
			return "#" + parseInt(locNo.substr(0, 2));
			}
			}

			@@ -1028,111 +900,6 @@
			}
			})

			// let result = true;//最终结果
			// //检测库位是否缺少选择导致不完整
			// bayList.forEach((item,index) => {
			// //搜索当前巷道有效在库list
			// //上半部分，巷道
			// let topList = []
			// for (var i = 8; i >= 3; i--) {
			// let obj = {
			// x: i,
			// y: index,
			// status: false,
			// locNo: map[i][index].locNo
			// }
			//
			// if (map[i][index].locSts == 'F') {
			// //在库状态，存入巷道在库list
			// topList.push(obj)
			// }
			// }
			//
			// //下半部分，巷道
			// let bottomList = []
			// for (var i = 9; i < 14; i++) {
			// let obj = {
			// x: i,
			// y: index,
			// status: false,
			// locNo: map[i][index].locNo
			// }
			//
			// if (map[i][index].locSts == 'F') {
			// //在库状态，存入巷道在库list
			// bottomList.push(obj)
			// }
			// }
			//
			// // if (topList.length == 0 && bottomList.length == 0) {
			// // result = false;
			// // }
			//
			// for (var i = 0; i < item.length; i++) {
			// if (item[i].x > 8) {
			// //下半部分数据
			// let index = this.searchDataIndex(item[i],bottomList)
			// // console.log(item[i],bottomList,index)
			// if (index == -1) {
			// continue
			// }
			// bottomList[index].status = true
			// }else {
			// //上半部分数据
			// let index = this.searchDataIndex(item[i],topList)
			// // console.log(item[i],topList,index)
			// if (index == -1) {
			// continue
			// }
			// topList[index].status = true
			// }
			//
			// }
			//
			// let tmp1 = []
			// let tmp2 = []
			// for (var i = item.length - 1; i >= 0; i--) {
			// if (item[i].x < 9) {
			// tmp1.push(item[i]);
			// }
			// }
			// for (var i = 0; i < item.length; i++) {
			// if (item[i].x > 8) {
			// tmp2.push(item[i]);
			// }
			// }
			//
			// if (tmp1.length > 0) {
			// //判断上半部分出库是否选择完整
			// let topIndex = this.searchDataIndex(tmp1[0],topList);
			// if (topIndex != -1) {
			// for (var i = topIndex; i < topList.length; i++) {
			// if (topList[i].status != true) {
			// result = false;
			// }
			// }
			// }
			// }
			//
			// if (tmp2.length > 0) {
			// //判断下半部分出库是否选择完整
			// let bottomIndex = this.searchDataIndex(tmp2[0],bottomList)
			// if (bottomIndex != -1) {
			// for (var i = bottomIndex; i < bottomList.length; i++) {
			// if (bottomList[i].status != true) {
			// result = false;
			// }
			// }
			// console.log(tmp2[0],bottomList,bottomIndex)
			// }
			// }
			// })
			//
			// if (!result) {
			// $layui.layer.msg("出库路径选择有误");
			// return;
			// }

			//准备出库
			if (this.outSite == null) {
			$layui.layer.msg("请选择出库站点");
			@@ -1281,25 +1048,7 @@

			})
			})
			// data.forEach((item,index) => {
			// let locNo = item.locNo
			// let y = parseInt(locNo.substr(2,3))
			// let x = parseInt(locNo.substr(0,2))
			// console.log(x)
			// // if ( (x+2) %5 === 0 ) {
			// // x = 5*item.crnNo-2;
			// // }else
			// if(x<17){
			// if (x % 4 == 0 \|\| (x+1) % 4 == 0){
			// x = item.crnNo+x
			// }else {
			// x = item.crnNo+x-1
			// }
			// }
			// console.log(x)
			//
			// tmp[x][y].searchStatus = true//搜索标记
			// })

			data.forEach((item,i) => {
			let locNo = item.locNo
			tmp.forEach((item,index) => {