diff --git a/src/components/header.js b/src/components/header.js index 7b8325d..9abb8f1 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -48,7 +48,10 @@ Vue.component("screen-header", { 11~25℃ - + + + + `, props: { @@ -77,6 +80,7 @@ Vue.component("screen-header", { selDept:'', localStorage1: JSON.parse(localStorage.getItem("data1")), localStorage2: JSON.parse(localStorage.getItem("data2")), + isFullScreen:false } }, mounted(){ @@ -94,6 +98,13 @@ Vue.component("screen-header", { }, methods: { + toggleFullScreen(){ + let el=document.body; + this.$toggleFullScreen(el); + setTimeout(()=>{ + this.isFullScreen=document.fullscreenElement==el; + },400); + }, init(){ try{ this.localStorage1=JSON.parse(localStorage.getItem("data1")) diff --git a/src/pages/init.js b/src/pages/init.js index d0a2476..d0cb36c 100644 --- a/src/pages/init.js +++ b/src/pages/init.js @@ -12,6 +12,22 @@ Vue.prototype.$bus=new Vue(); Vue.prototype.$apiPath="/jhapi" Vue.prototype.$dt=dayjs; Vue.prototype.$tryToJson=tryToJson +Vue.prototype.$toggleFullScreen=(el)=>{ + if(document.fullscreenElement==el){ + let screen = document.cancelFullScreen || document.webkitCancelFullScreen || document.mozCancelFullScreen || document.exitFullScreen + if (typeof screen != "undefined" && screen) { + screen.call(document); + return; + } + + }else{ + let screen = el.requestFullScreen || el.webkitRequestFullScreen || el.mozRequestFullScreen || el.msRequestFullScreen + if (typeof screen != "undefined" && screen) { + screen.call(el); + return; + } + } +} window.jhcaches={}; /* Api.project.getInfo().then(d=>{ diff --git a/src/pages/progress/indexDlg3.vue b/src/pages/progress/indexDlg3.vue index 0b9e877..9a6b1b2 100644 --- a/src/pages/progress/indexDlg3.vue +++ b/src/pages/progress/indexDlg3.vue @@ -1,5 +1,5 @@ - + 项目形象进度 @@ -48,6 +48,10 @@ fill="#fff" p-id="3687"> + + + + - - - + + + @@ -82,8 +86,8 @@ 暂无图片 - + 计划节点 @@ -156,7 +160,8 @@ export default { scheduleInfo: {}, localStorage2: {}, showSel2: false, - prjs: [] + prjs: [], + isFullScreen:false }; }, @@ -169,10 +174,17 @@ export default { // this.$api.project.getProgressProjects().then(d => { // this.prjs = d.data || []; // window.jhcaches.progressProjects = this.prjs; - // }); + // }); }, methods: { + toggleFullScreen(){ + let el=this.$el.querySelector(".popup-project-introduction-min"); + this.$toggleFullScreen(el); + setTimeout(()=>{ + this.isFullScreen=document.fullscreenElement==el; + },400); + }, findItem() { let tmps = this.prjs.filter(d => d.projectName == this.dept2); if (tmps.length > 0) { @@ -266,6 +278,11 @@ export default { line-height: 64px; } } + .prj-info-list{ + .info-left-right{ + align-items: baseline !important; + } + } } } @@ -279,6 +296,11 @@ export default { line-height: 48px; } } + .prj-info-list{ + .info-left-right{ + align-items: baseline !important; + } + } } } @@ -346,6 +368,15 @@ export default { line-height: 30px; } } + .main-content{ + height: 782px; + &.is-fullscreen{ + height: calc(100vh - 80px); + } + .el-carousel{ + width:100%; + } + } } .head-title-select { diff --git a/vue.config.js b/vue.config.js index 7b5d4ae..4a0ad91 100644 --- a/vue.config.js +++ b/vue.config.js @@ -16,8 +16,8 @@ module.exports = defineConfig({ } }, '/jhapi':{ - //target: `http://62.234.3.186/jhapi/`, - target: `http://127.0.0.1:8090/jhapi/`, + target: `http://62.234.3.186/jhapi/`, + //target: `http://127.0.0.1:8090/jhapi/`, changeOrigin: true, pathRewrite: { '^/jhapi':'/'