diff --git a/yanzhu-bigscreen/public/css/largeScreenStyle.css b/yanzhu-bigscreen/public/css/largeScreenStyle.css index 9b6e3884..bd7526ce 100644 --- a/yanzhu-bigscreen/public/css/largeScreenStyle.css +++ b/yanzhu-bigscreen/public/css/largeScreenStyle.css @@ -57,6 +57,16 @@ body{ .div-header{ background-image: url("../images/banner-top-1k.png"); } + .popup-project-introduction-title{ + height: 40px; + font-size: 18px; + } + .popup-project-introduction-close{ + font-size: 25px; + width: 30px; + height: 30px; + line-height: 28px; + } } @media (min-width: 1921px) and (max-width: 2560px) { @@ -91,6 +101,16 @@ body{ line-height: 30px !important; font-size: 20px; } + .popup-project-introduction-title{ + height: 60px; + font-size: 24px; + } + .popup-project-introduction-close{ + font-size: 28px; + width: 54px; + height: 54px; + line-height: 54px; + } } @@ -126,11 +146,22 @@ body{ line-height: 40px !important; font-size: 26px; } + .popup-project-introduction-title{ + height: 72px; + font-size: 32px; + } + .popup-project-introduction-close{ + font-size: 48px; + width: 60px; + height: 60px; + line-height: 60px; + } } .img-openwin{ position: absolute; top:0px; right: 0px; + z-index: 99; } .main-app { height:calc(100% - 130px); @@ -1668,27 +1699,30 @@ table{ width: 1000px; height: 600px; margin: auto; - background: url("../images/map_sjk_popup_bgd.png") no-repeat center/100% 100%; + background: url("../images/map_sjk_popup_bgd2.png") no-repeat center/100% 100%; transform: translateY(30%); + background: linear-gradient(#010b2d, #097fca9c) left -3px top 0, linear-gradient(#097fca9c, #097fca9c) right 0px bottom -3px, linear-gradient(#010b2d, #097fca9c) right -3px top 0px, linear-gradient(#097fca9c, #097fca9c) left 0px top -3px; + background-repeat: no-repeat; + background-size: 3px 100%, 100% 3px; + border: 1px solid transparent; + backdrop-filter: blur(1px); } .popup-project-introduction-con{ - padding: 12px 10px; + padding: 0px; } .popup-project-introduction-title{ - height: 40px; + background: url("../images/map_popup_title.png") no-repeat left/100% 100%; - font-size: 18px; + display: flex; align-items: center; padding: 0 15px; justify-content: space-between; } .popup-project-introduction-close{ - font-size: 25px; - width: 30px; - height: 30px; + text-align: center; - line-height: 28px; + border-radius: 50%; cursor: pointer; } diff --git a/yanzhu-bigscreen/public/images/map_popup_bgd2.png b/yanzhu-bigscreen/public/images/map_popup_bgd2.png new file mode 100644 index 00000000..82bf34d7 Binary files /dev/null and b/yanzhu-bigscreen/public/images/map_popup_bgd2.png differ diff --git a/yanzhu-bigscreen/src/pages-old/components/MyDialog.vue b/yanzhu-bigscreen/src/components/MyDialog.vue similarity index 100% rename from yanzhu-bigscreen/src/pages-old/components/MyDialog.vue rename to yanzhu-bigscreen/src/components/MyDialog.vue diff --git a/yanzhu-bigscreen/src/views/detail/projectInfoDialog.vue b/yanzhu-bigscreen/src/views/detail/projectInfoDialog.vue new file mode 100644 index 00000000..fe648420 --- /dev/null +++ b/yanzhu-bigscreen/src/views/detail/projectInfoDialog.vue @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/views/init.js b/yanzhu-bigscreen/src/views/init.js index c868359d..b80a099f 100644 --- a/yanzhu-bigscreen/src/views/init.js +++ b/yanzhu-bigscreen/src/views/init.js @@ -12,6 +12,7 @@ import moduleOne13 from '../components/module/module-one-1-3.vue' import moduleOne21 from '../components/module/module-one-2-1.vue' import moduleOne22 from '../components/module/module-one-2-2.vue' import moduleOne23 from '../components/module/module-one-2-3.vue' +import MyDialog from '@/components/MyDialog.vue' //import projectOverviewChart from '../components/project-overview-chart.vue' //import peopleNumber from '../components/people-number.vue' import header from '../components/header.vue' @@ -26,6 +27,7 @@ Vue.component("module-one-1-3",moduleOne13) Vue.component("module-one-2-1",moduleOne21) Vue.component("module-one-2-2",moduleOne22) Vue.component("module-one-2-3",moduleOne23) +Vue.component("MyDialog",MyDialog) Vue.prototype.$bus=new Vue(); //Vue.component("people-number",peopleNumber) //Vue.component("project-overview-chart",projectOverviewChart) diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index 4f7ae17e..02a1289a 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -3,7 +3,7 @@ - +
{{ selProject?.projectName||'' }}
@@ -134,12 +134,16 @@ - +