Compare commits

..

No commits in common. "a9e84d60b0d8de37467bcdc541582fb3bb013eb9" and "da8e74d35d42ca5a56e4e4b829f3a075756fbb25" have entirely different histories.

3 changed files with 37 additions and 55 deletions

View File

@ -167,12 +167,6 @@
window.parent.loadFin() window.parent.loadFin()
} }
// loadding() // loadding()
// 根据仓位号搜索位置
function wareHouse(val){
console.log('仓位号位置' + val);
unityInstanceA.SendMessage("Manager","Unity_LocateWarehouseNo",val+'')
}
</script> </script>
</body> </body>

View File

@ -15,8 +15,8 @@
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" > <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" >
</el-option> </el-option>
</el-select> </el-select>
<el-input placeholder="请输入" v-model="input3" @keyup.native="searchHouse()"> <el-input placeholder="请输入" v-model="input3">
<i slot="suffix" class="el-input__icon el-icon-search" @click="searchHouse()" ></i> <i slot="suffix" class="el-input__icon el-icon-search"></i>
</el-input> </el-input>
<ul> <ul>
@ -59,7 +59,7 @@
<el-dropdown-item @click="selectHomeN($event)">C03</el-dropdown-item> --> <el-dropdown-item @click="selectHomeN($event)">C03</el-dropdown-item> -->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<img v-else :src="i==index ? s.selectImg : s.img" alt="" /> <img v-else :src="s.num % 2 != 0 ? s.selectImg : s.img" alt="" />
</li> </li>
</ul> </ul>
</header> </header>
@ -133,17 +133,6 @@ export default {
// this.load() // this.load()
}, },
methods: { methods: {
// unity
searchHouse(){
console.log(1111);
if (this.value == "仓位号") {
this.$refs.dome.contentWindow.wareHouse(this.input3)
} else if (this.value == "物料编码") {
// this.$refs.dome.contentWindow.shelvesList(input3)
} else if (this.value == "物料批次") {
// this.$refs.dome.contentWindow.shelvesList(input3)
}
},
load(){ load(){
this.loadShow = false this.loadShow = false
}, },
@ -162,33 +151,33 @@ export default {
handleBtn(e, i) { handleBtn(e, i) {
console.log(this.$refs.drop1); console.log(this.$refs.drop1);
this.navLiState = !this.navLiState this.navLiState = !this.navLiState
if (this.index == i && this.navLiState) { // if (this.index == i && this.navLiState) {
this.index = null // this.index = null
if (i == 1) { // if (i == 1) {
this.state = !this.state; // this.state = !this.state;
// console.log(this.state); // // console.log(this.state);
this.$refs.dome.contentWindow.updateScene(this.state); // this.$refs.dome.contentWindow.updateScene(this.state);
} else if (i == 3) { // } else if (i == 3) {
this.$refs.dome.contentWindow.outHome(); // this.$refs.dome.contentWindow.outHome();
} else if (i == 4) { // } else if (i == 4) {
this.transport = !this.transport; // this.transport = !this.transport;
this.$refs.dome.contentWindow.transport(this.transport); // this.$refs.dome.contentWindow.transport(this.transport);
} else if (i == 5) { // } else if (i == 5) {
this.hide = !this.hide; // this.hide = !this.hide;
this.$refs.dome.contentWindow.hide(this.hide); // this.$refs.dome.contentWindow.hide(this.hide);
} // }
return // return
} // }
// this.liImgs[i].num++ this.liImgs[i].num++
this.index = i this.index = i
// //
this.state = false // this.state = false
this.transport = false // this.transport = false
this.hide = false // this.hide = false
this.$refs.dome.contentWindow.updateScene(false); // this.$refs.dome.contentWindow.updateScene(false);
// this.$refs.dome.contentWindow.outHome(); // // this.$refs.dome.contentWindow.outHome();
this.$refs.dome.contentWindow.transport(false); // this.$refs.dome.contentWindow.transport(false);
this.$refs.dome.contentWindow.hide(false); // this.$refs.dome.contentWindow.hide(false);
if (i == 1) { if (i == 1) {
this.state = !this.state; this.state = !this.state;
// console.log(this.state); // console.log(this.state);
@ -209,7 +198,13 @@ export default {
watch: { watch: {
value: { value: {
handler(newVal, oldVal) { handler(newVal, oldVal) {
if (newVal == "仓位号") {
// this.$refs.dome.contentWindow.shelvesList(input3)
} else if (newVal == "物料编码") {
// this.$refs.dome.contentWindow.shelvesList(input3)
} else if (newVal == "物料批次") {
// this.$refs.dome.contentWindow.shelvesList(input3)
}
}, },
}, },
}, },
@ -245,9 +240,6 @@ export default {
margin: 0 5px; margin: 0 5px;
box-shadow: 0 0 10px #5d8cad; box-shadow: 0 0 10px #5d8cad;
border-radius: 4px; border-radius: 4px;
.el-input__suffix{
cursor: pointer;
}
} }
</style> </style>
<style lang="less" > <style lang="less" >

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="aside" @click="downClose()"> <div class="aside" >
<div class="aside-box"> <div class="aside-box">
<div class="left-item"> <div class="left-item">
<div class="logo"> <div class="logo">
@ -142,11 +142,7 @@ export default {
created() {}, created() {},
computed: {}, computed: {},
methods: { methods: {
downClose(){
if(this.$parent.index==0||this.$parent.index==0){
this.$parent.index= null
}
},
// //
updateImg(i, event) { updateImg(i, event) {
// //