diff --git a/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/menuRight.vue b/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/menuRight.vue
index cb931c6..3669ace 100644
--- a/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/menuRight.vue
+++ b/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/menuRight.vue
@@ -11,7 +11,7 @@
-
+
@@ -60,8 +60,9 @@
},
methods: {
getHref(){
- let href = window.location.href
- href = window.location.href.slice(window.location.href.indexOf('#') + 1)
+ let href = this.$route.path;
+ //let href = window.location.href
+ //href = window.location.href.slice(window.location.href.indexOf('#') + 1)
if (href === '/partyCenter/party') {
this.SlideBgImg = partyBuildSlideBgImg
this.isDefault = false
diff --git a/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/threeDimensionalSchoolModel.vue b/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/threeDimensionalSchoolModel.vue
index c26d8da..ddc6e87 100644
--- a/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/threeDimensionalSchoolModel.vue
+++ b/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/threeDimensionalSchoolModel.vue
@@ -15,7 +15,7 @@
-
+
@@ -46,6 +46,16 @@
}
},
mounted(){
+// let _this = this;
+// document.addEventListener('click', function (e) {
+// let menuDiv = document.getElementById("navigationMenuId");
+// let path = _this.composedPath(e);
+// if (!path.includes(menuDiv)) {
+// if (_this.$refs.navigationMenu) {
+// _this.$refs.navigationMenu.hiddenMenuFlag();
+// }
+// }
+// });
this.cancelLoading();
},
methods:{
@@ -54,6 +64,20 @@
this.loading = false
}, 1000)
},
+ composedPath:function (e) {
+ // 存在则直接return
+ if (e.path) { return e.path }
+ // 不存在则遍历target节点
+ let target = e.target
+ e.path = []
+ while (target.parentNode !== null) {
+ e.path.push(target)
+ target = target.parentNode
+ }
+ // 最后补上document和window
+ e.path.push(document, window)
+ return e.path
+ }
},
components:{
BorderBox12,
diff --git a/src/views/screenAdaptation/pages/index.vue b/src/views/screenAdaptation/pages/index.vue
index f950892..9361d85 100644
--- a/src/views/screenAdaptation/pages/index.vue
+++ b/src/views/screenAdaptation/pages/index.vue
@@ -89,7 +89,7 @@
break;
case 4:
//网页
- window.location.href = "https://www.edusoa.com/dsideal_yy/pro_integration/reactProject/smartCampusIntegratePlatformDS/wyms/YP-ZHDP/wyms-ds.html";
+ window.location.href = "https://www.edusoa.com/dsideal_yy/pro_integration/reactProject/ypSchoolPlatform/wyms/YP-ZHDP/wyms-ds.html";
break;
default:
break;
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/principalMailbox.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/principalMailbox.vue
index c641d57..ecba0ec 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/principalMailbox.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/principalMailbox.vue
@@ -52,8 +52,6 @@
today_total: 0,
reply_total: 0,
total: 0,
-
-
}
},
components: {
@@ -92,9 +90,9 @@
if (result[0].data.result != '') {
let res = result[0].data.result
res = JSON.parse(res)[0]
- this.reply_total = res.reply_total
- this.today_total = res.today_total
- this.total = res.total
+ this.reply_total = res.reply_total?res.reply_total:0;
+ this.today_total = res.today_total?res.today_total:0;
+ this.total = res.total?res.total:0;
}
//console.log('res', res)//res是一个对象
}
diff --git a/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue b/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue
index ab2fd6f..be85bbf 100644
--- a/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue
+++ b/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue
@@ -266,6 +266,9 @@
flex-direction: column;
margin-top: 15px;
overflow: hidden;
+ /*/deep/ .ant-list-empty-text {*/
+ /*color: white;*/
+ /*}*/
}
.ant-list-items {
diff --git a/src/views/screenAdaptation/pages/secondPages/secondPageBox.vue b/src/views/screenAdaptation/pages/secondPages/secondPageBox.vue
index 41fef9d..44a11bb 100644
--- a/src/views/screenAdaptation/pages/secondPages/secondPageBox.vue
+++ b/src/views/screenAdaptation/pages/secondPages/secondPageBox.vue
@@ -31,7 +31,8 @@
let _this = this;
document.addEventListener('click', function (e) {
let menuDiv = document.getElementById("navigationMenuId");
- if (!e.path.includes(menuDiv)) {
+ let path = _this.composedPath(e);
+ if (!path.includes(menuDiv)) {
if (_this.$refs.navigationMenu) {
_this.$refs.navigationMenu.hiddenMenuFlag();
}
@@ -72,6 +73,20 @@
},
modelChange: function (path) {
this.$router.replace({path: path});
+ },
+ composedPath:function (e) {
+ // 存在则直接return
+ if (e.path) { return e.path }
+ // 不存在则遍历target节点
+ let target = e.target
+ e.path = []
+ while (target.parentNode !== null) {
+ e.path.push(target)
+ target = target.parentNode
+ }
+ // 最后补上document和window
+ e.path.push(document, window)
+ return e.path
}
},
components: {
diff --git a/src/views/screenAdaptation/pages/teachingAdmin/index.vue b/src/views/screenAdaptation/pages/teachingAdmin/index.vue
index 71827b6..98c0bd9 100644
--- a/src/views/screenAdaptation/pages/teachingAdmin/index.vue
+++ b/src/views/screenAdaptation/pages/teachingAdmin/index.vue
@@ -3,7 +3,7 @@
-->