diff --git a/src/assets/systemImg/dangjianyinling.png b/src/assets/systemImg/dangjianyinling.png new file mode 100644 index 0000000..29bfec3 Binary files /dev/null and b/src/assets/systemImg/dangjianyinling.png differ diff --git a/src/assets/systemImg/deyu.png b/src/assets/systemImg/deyu.png new file mode 100644 index 0000000..8d6b568 Binary files /dev/null and b/src/assets/systemImg/deyu.png differ diff --git a/src/assets/systemImg/jiaoxue.png b/src/assets/systemImg/jiaoxue.png new file mode 100644 index 0000000..0e97d48 Binary files /dev/null and b/src/assets/systemImg/jiaoxue.png differ diff --git a/src/assets/systemImg/tuwen.png b/src/assets/systemImg/tuwen.png new file mode 100644 index 0000000..3fbaf43 Binary files /dev/null and b/src/assets/systemImg/tuwen.png differ diff --git a/src/assets/systemImg/xingzhengguanli.png b/src/assets/systemImg/xingzhengguanli.png new file mode 100644 index 0000000..1e99168 Binary files /dev/null and b/src/assets/systemImg/xingzhengguanli.png differ diff --git a/src/assets/systemImg/yunxingshuju.png b/src/assets/systemImg/yunxingshuju.png new file mode 100644 index 0000000..c46ec17 Binary files /dev/null and b/src/assets/systemImg/yunxingshuju.png differ diff --git a/src/views/screenAdaptation/common/imgPreview.vue b/src/views/screenAdaptation/common/imgPreview.vue new file mode 100644 index 0000000..2da1a81 --- /dev/null +++ b/src/views/screenAdaptation/common/imgPreview.vue @@ -0,0 +1,54 @@ + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js index 9d806f8..b5e68bc 100644 --- a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js +++ b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js @@ -98,7 +98,7 @@ export const systemConfigData = [ export const systemCenterConfig = [ { - id:'party-building', + id:'dangjianyinling', title:'党建引领', menus:[ { @@ -128,7 +128,7 @@ export const systemCenterConfig = [ ] }, { - id:"admin", + id:"xingzhengguanli", title:'行政管理', menus:[ { @@ -158,7 +158,7 @@ export const systemCenterConfig = [ ] }, { - id:"operationData", + id:"yunxingshuju", title:'运行数据', menus:[ { @@ -196,7 +196,7 @@ export const systemCenterConfig = [ ] }, { - id:"teaching", + id:"jiaoxue", title:'教学管理', menus:[ { @@ -226,7 +226,7 @@ export const systemCenterConfig = [ ] }, { - id:"moralEducation", + id:"deyu", title:'德育管理', menus:[ { @@ -384,7 +384,7 @@ export const systemCenterConfig = [ ] }, { - id:'imgText', + id:'tuwen', title:'图文管理', menus:[ { diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue index 15afdf5..5c02301 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue @@ -173,10 +173,38 @@ }, } }, - mounted(){ + mounted() { + // console.log(this.$refs.mySwiper.$swiper.$wrapperEl.style); + this.$refs.mySwiper.$swiper.$wrapperEl[0].style["transition-timing-function"] = "linear"; //css中修改linear不生效,则在mounted中更改 + }, + methods: { + stopSwiper() { + // 存放鼠标悬浮时的transform属性 + this.nextTransForm = this.$refs.mySwiper.$swiper.$wrapperEl[0].style.transform; + // 轮播图原本应移动到的位置 + let nextTransPosition = -1 * parseInt(this.nextTransForm.split("px")[0].split("translate3d(")[1]); + // // 鼠标悬浮时时轮播图位置 + let nowTransPosition = -1 * parseInt(window.getComputedStyle(this.$refs.mySwiper.$swiper.$wrapperEl[0], false)["transform"].split("1, ")[2].split(",")[0]); + + // 存放鼠标悬浮时轮播图的真实transform属性(非行内属性) + let nowTransForm = window.getComputedStyle(this.$refs.mySwiper.$swiper.$wrapperEl[0], false)["transform"]; + + // 计算轮播图从暂停位置移动到原本应到的位置所用的时间(150是我自定义的每个slide的宽度) + this.nextTime = 4000 * ((nextTransPosition - nowTransPosition) / 150); + // 改变行内transform属性 + this.$refs.mySwiper.$swiper.$wrapperEl[0].style.transform = nowTransForm; + this.$refs.mySwiper.$swiper.$wrapperEl[0].style.transitionDuration = "0ms"; + + this.$refs.mySwiper.$swiper.autoplay.stop(); + }, + startSwiper() { + // 恢复原样 + this.$refs.mySwiper.$swiper.$wrapperEl[0].style.transform = this.nextTransForm; + this.$refs.mySwiper.$swiper.$wrapperEl[0].style.transitionDuration = this.nextTime + "ms"; + this.$refs.mySwiper.$swiper.autoplay.start(); + } }, - methods: {}, components: { CommonBox, VueSeamlessScroll, diff --git a/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue b/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue index 0a229a5..fc66783 100644 --- a/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue +++ b/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue @@ -4,29 +4,35 @@ - + + - + + - + + - + + - + + - + +
@@ -44,6 +50,7 @@
+ diff --git a/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue b/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue index 85e0287..13708a4 100644 --- a/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue +++ b/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue @@ -80,6 +80,7 @@ .party-center-team-help-style { width: 605px !important; height: 400px !important; + .teamBoost { width: 100%; height: 100%;