From c8800cb212f45892a07c18d4f8052c56cc59b5e1 Mon Sep 17 00:00:00 2001
From: luoshiwen <1140456899@qq.com>
Date: Wed, 12 Apr 2023 11:08:46 +0800
Subject: [PATCH] 4.12
---
src/App.vue | 80 ++++++++++++++++++++++++---------------------
src/views/index.vue | 9 ++---
2 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index d495d15..7b7687c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,7 +12,7 @@
多云
-
+
@@ -20,9 +20,9 @@
@@ -75,12 +76,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: [
{
@@ -120,6 +121,7 @@ export default {
// window.parent.shelvesList = this.shelfHanlder
},
methods: {
+
shelfHanlder(e) {
// console.log();
// e.currentTarget.parentElement.parentElement.style.display = "none";
@@ -132,34 +134,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);
diff --git a/src/views/index.vue b/src/views/index.vue
index 381314b..e87ff6f 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -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) {
// 当页面显示出来时 再次点击隐藏