Merge branch 'master' of https://git.lgzn.space/luoshiwen/Storehouse
This commit is contained in:
commit
07359c4c26
74
src/App.vue
74
src/App.vue
|
@ -20,8 +20,8 @@
|
|||
</el-input>
|
||||
|
||||
<ul>
|
||||
<li v-for="(s, i) in liImgs" class="nav-li" :key="i" @click="handleBtn(i)">
|
||||
<el-dropdown trigger="click" placement="bottom" v-if="i == 0" :hide-on-click="false">
|
||||
<li v-for="(s, i) in liImgs" class="nav-li" :key="i" @click="handleBtn($event, i)">
|
||||
<el-dropdown trigger="click" placement="bottom" v-if="i == 0" :hide-on-click="false" ref="drop1">
|
||||
<span class="downPull"><img :src="i==index ? s.selectImg : s.img" alt="" /></span>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<ul class="menuContent">
|
||||
|
@ -39,7 +39,8 @@
|
|||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
|
||||
<el-dropdown trigger="click" placement="bottom" v-else-if="i == 2" :hide-on-click="true">
|
||||
<el-dropdown trigger="click" placement="bottom" v-else-if="i == 2" :hide-on-click="true"
|
||||
>
|
||||
<span class="downPull"><img :src="i==index ? s.selectImg : s.img" alt="" /></span>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<ul class="menuContent">
|
||||
|
@ -58,7 +59,7 @@
|
|||
<el-dropdown-item @click="selectHomeN($event)">C03</el-dropdown-item> -->
|
||||
</el-dropdown-menu>
|
||||
</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>
|
||||
</ul>
|
||||
</header>
|
||||
|
@ -80,12 +81,12 @@ export default {
|
|||
heatList: [20, 40, 200, 100],
|
||||
fullscreenLoading: true,
|
||||
liImgs: [
|
||||
{ img: require("@/assets/images/1.png"), selectImg: require('@/assets/images/select_1.png') },
|
||||
{ img: require("@/assets/images/2.png"), selectImg: require('@/assets/images/select_2.png') },
|
||||
{ img: require("@/assets/images/3.png"), selectImg: require('@/assets/images/select_3.png') },
|
||||
{ img: require("@/assets/images/4.png"), selectImg: require('@/assets/images/select_4.png') },
|
||||
{ img: require("@/assets/images/5.png"), selectImg: require('@/assets/images/select_5.png') },
|
||||
{ img: require("@/assets/images/6.png"), selectImg: require('@/assets/images/select_6.png') },
|
||||
{ img: require("@/assets/images/1.png"), selectImg: require('@/assets/images/select_1.png'), num: 0 },
|
||||
{ img: require("@/assets/images/2.png"), selectImg: require('@/assets/images/select_2.png'), num: 0 },
|
||||
{ img: require("@/assets/images/3.png"), selectImg: require('@/assets/images/select_3.png'), num: 0 },
|
||||
{ img: require("@/assets/images/4.png"), selectImg: require('@/assets/images/select_4.png'), num: 0 },
|
||||
{ img: require("@/assets/images/5.png"), selectImg: require('@/assets/images/select_5.png'), num: 0 },
|
||||
{ img: require("@/assets/images/6.png"), selectImg: require('@/assets/images/select_6.png'), num: 0 },
|
||||
],
|
||||
options: [
|
||||
{
|
||||
|
@ -125,6 +126,7 @@ export default {
|
|||
// window.parent.shelvesList = this.shelfHanlder
|
||||
},
|
||||
methods: {
|
||||
|
||||
shelfHanlder(e) {
|
||||
// console.log();
|
||||
// e.currentTarget.parentElement.parentElement.style.display = "none";
|
||||
|
@ -137,34 +139,36 @@ export default {
|
|||
console.log(e.currentTarget.innerHTML, "库房的定位");
|
||||
this.$refs.dome.contentWindow.selectHome(e.currentTarget.innerHTML);
|
||||
},
|
||||
handleBtn(i) {
|
||||
handleBtn(e, i) {
|
||||
console.log(this.$refs.drop1);
|
||||
this.navLiState = !this.navLiState
|
||||
if (this.index == i && this.navLiState) {
|
||||
this.index = null
|
||||
if (i == 1) {
|
||||
this.state = !this.state;
|
||||
// console.log(this.state);
|
||||
this.$refs.dome.contentWindow.updateScene(this.state);
|
||||
} else if (i == 3) {
|
||||
this.$refs.dome.contentWindow.outHome();
|
||||
} else if (i == 4) {
|
||||
this.transport = !this.transport;
|
||||
this.$refs.dome.contentWindow.transport(this.transport);
|
||||
} else if (i == 5) {
|
||||
this.hide = !this.hide;
|
||||
this.$refs.dome.contentWindow.hide(this.hide);
|
||||
}
|
||||
return
|
||||
}
|
||||
// if (this.index == i && this.navLiState) {
|
||||
// this.index = null
|
||||
// if (i == 1) {
|
||||
// this.state = !this.state;
|
||||
// // console.log(this.state);
|
||||
// this.$refs.dome.contentWindow.updateScene(this.state);
|
||||
// } else if (i == 3) {
|
||||
// this.$refs.dome.contentWindow.outHome();
|
||||
// } else if (i == 4) {
|
||||
// this.transport = !this.transport;
|
||||
// this.$refs.dome.contentWindow.transport(this.transport);
|
||||
// } else if (i == 5) {
|
||||
// this.hide = !this.hide;
|
||||
// this.$refs.dome.contentWindow.hide(this.hide);
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
this.liImgs[i].num++
|
||||
this.index = i
|
||||
// 还原初始值
|
||||
this.state = false
|
||||
this.transport = false
|
||||
this.hide = false
|
||||
this.$refs.dome.contentWindow.updateScene(false);
|
||||
// this.$refs.dome.contentWindow.outHome();
|
||||
this.$refs.dome.contentWindow.transport(false);
|
||||
this.$refs.dome.contentWindow.hide(false);
|
||||
// this.state = false
|
||||
// this.transport = false
|
||||
// this.hide = false
|
||||
// this.$refs.dome.contentWindow.updateScene(false);
|
||||
// // this.$refs.dome.contentWindow.outHome();
|
||||
// this.$refs.dome.contentWindow.transport(false);
|
||||
// this.$refs.dome.contentWindow.hide(false);
|
||||
if (i == 1) {
|
||||
this.state = !this.state;
|
||||
// console.log(this.state);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div class="aside" @click="stopHandle()">
|
||||
<div class="aside" >
|
||||
<div class="aside-box">
|
||||
<div class="left-item">
|
||||
<div class="logo">
|
||||
|
@ -142,12 +142,7 @@ export default {
|
|||
created() {},
|
||||
computed: {},
|
||||
methods: {
|
||||
stopHandle(){
|
||||
// console.log(this.$parent,'父组件');
|
||||
if(this.$parent.index==0||this.$parent.index==2){
|
||||
this.$parent.index=null
|
||||
}
|
||||
},
|
||||
|
||||
// 切图
|
||||
updateImg(i, event) {
|
||||
// 当页面显示出来时 再次点击隐藏
|
||||
|
|
Loading…
Reference in New Issue