diff --git a/public/template/001/styles/index.scss b/public/template/001/styles/index.scss index 0cf65bd..4135622 100644 --- a/public/template/001/styles/index.scss +++ b/public/template/001/styles/index.scss @@ -59,8 +59,8 @@ html { } #app { - height: 100%; - background: #203673f7; //临时 + // height: 100%; + // background: #203673f7; //临时 } *, *:before, @@ -154,7 +154,9 @@ a:hover { .font-size-16 { font-size: 16px; } - +.font-size-18 { + font-size: 18px; +} .font-weight-bold { font-weight: bold; } @@ -175,6 +177,9 @@ a:hover { .color-white { color: #fff; } +.color-black { + color: #000000; +} .color-success { color: #5CB959; } @@ -200,7 +205,9 @@ a:hover { // } //main-container全局样式 .app-main { - min-height: 100% + position: relative; + width: 100%; + min-height: 100%; } .app-container { diff --git a/public/template/001/styles/sidebar.scss b/public/template/001/styles/sidebar.scss index 2fdbd59..593506b 100644 --- a/public/template/001/styles/sidebar.scss +++ b/public/template/001/styles/sidebar.scss @@ -11,22 +11,23 @@ margin-left: 180px; } .main-content { - width: 1200px; + // width: 1200px; margin: 0 auto; } .header-content { - width: 100%; + width: 1200px; + margin: 0 auto; height: 100%; - padding: 0 20px; - background: rgba(255,255,255,.1); + // padding: 0 20px; + // background: rgba(255,255,255,.1); } // 顶边栏 .header-sidebar-container { width: 100%; // height: 60px; - position: fixed; + position: relative; // background-color: #DF3434; - color: #fff; + color: #404040; top: 0; left: 0; font-size: 18px; @@ -136,7 +137,7 @@ li { &:hover { color: #DF3434; - background-color: #FFE8E6 !important; + background-color: #fff !important; } } } @@ -144,7 +145,7 @@ border-left: 3px solid #DF3434; color: #DF3434; border-bottom:0; - background-color: #FFE8E6 !important; + background-color: #fff !important; } } .openSidebar { @@ -214,18 +215,41 @@ .el-menu--horizontal { // width: 100% !important; // left: 0 !important; - - background-color: #F7F7F7; + background: transparent; .el-menu--popup { + transform: translateY(-20px); + background: #FFFFFF !important; + text-align: center; + border: 1px solid #DFDFDF; + box-shadow: 0px 5px 6px 0px rgba(0, 0, 0, 0.5); + border-radius: 7px; + padding: 10px 10px; min-width: 120px; + &::before { + content: " "; + position: absolute; + width: 15px; + height: 15px; + top: -8px; + transform: translateX(-50%) rotate(45deg); + left: 50%; + background: #fff; + border-top: 1px solid #DFDFDF; + border-left: 1px solid #DFDFDF; + + } .is-active { // border-bottom: 2px solid #fff; - background-color: rgba(255,232,230,1) !important; + font-weight: 600; + background-color: #fff !important; } .el-menu-item { - color: #000 !important; + color: #333333 !important; &:hover { - background-color: rgba(255,232,230,1) !important; + color:#1A5C7D !important; + font-weight: 600; + font-size: 16px; + background-color: #fff !important; } } } diff --git a/public/template/001/styles/variables.scss b/public/template/001/styles/variables.scss index ca14b05..b3a01d4 100644 --- a/public/template/001/styles/variables.scss +++ b/public/template/001/styles/variables.scss @@ -1,8 +1,8 @@ //sidebar -$menuText:#fff; +$menuText:#1A1A1A; $menuText2:#212121; -$menuActiveText:#fff; -$menuActiveText2:rgb(217, 52, 223); +$menuActiveText:#4b4bce; +$menuActiveText2:#4b4bce; $subMenuActiveText:#4b4bce; //https://github.com/ElemeFE/element/issues/12951 $menuBg:rgba(0,0,0,0); diff --git a/src/assets/home/1/chengyuan.png b/src/assets/home/1/chengyuan.png new file mode 100644 index 0000000..abeb752 Binary files /dev/null and b/src/assets/home/1/chengyuan.png differ diff --git a/src/assets/home/1/data-platform-s.png b/src/assets/home/1/data-platform-s.png new file mode 100644 index 0000000..512bc40 Binary files /dev/null and b/src/assets/home/1/data-platform-s.png differ diff --git a/src/assets/home/1/ewm.png b/src/assets/home/1/ewm.png new file mode 100644 index 0000000..7d13b73 Binary files /dev/null and b/src/assets/home/1/ewm.png differ diff --git a/src/assets/home/1/fuwupingtai.png b/src/assets/home/1/fuwupingtai.png new file mode 100644 index 0000000..8fc4b06 Binary files /dev/null and b/src/assets/home/1/fuwupingtai.png differ diff --git a/src/assets/home/1/gengduo.png b/src/assets/home/1/gengduo.png new file mode 100644 index 0000000..7e10419 Binary files /dev/null and b/src/assets/home/1/gengduo.png differ diff --git a/src/assets/home/1/gongyehulianwangzhuanqu.png b/src/assets/home/1/gongyehulianwangzhuanqu.png new file mode 100644 index 0000000..1b20ee9 Binary files /dev/null and b/src/assets/home/1/gongyehulianwangzhuanqu.png differ diff --git a/src/assets/home/1/jiaru.png b/src/assets/home/1/jiaru.png new file mode 100644 index 0000000..b2acc1e Binary files /dev/null and b/src/assets/home/1/jiaru.png differ diff --git a/src/assets/home/1/pinggu.png b/src/assets/home/1/pinggu.png new file mode 100644 index 0000000..7703a4f Binary files /dev/null and b/src/assets/home/1/pinggu.png differ diff --git a/src/assets/home/1/tt.png b/src/assets/home/1/tt.png new file mode 100644 index 0000000..18a0073 Binary files /dev/null and b/src/assets/home/1/tt.png differ diff --git a/src/assets/home/1/x.png b/src/assets/home/1/x.png new file mode 100644 index 0000000..5079a42 Binary files /dev/null and b/src/assets/home/1/x.png differ diff --git a/src/assets/home/1/zhangcheng.png b/src/assets/home/1/zhangcheng.png new file mode 100644 index 0000000..6e2f1e8 Binary files /dev/null and b/src/assets/home/1/zhangcheng.png differ diff --git a/src/assets/home/1/ziyuanchi.png b/src/assets/home/1/ziyuanchi.png new file mode 100644 index 0000000..54450c6 Binary files /dev/null and b/src/assets/home/1/ziyuanchi.png differ diff --git a/src/assets/home/1/zuzhijiagou.png b/src/assets/home/1/zuzhijiagou.png new file mode 100644 index 0000000..8fc4b06 Binary files /dev/null and b/src/assets/home/1/zuzhijiagou.png differ diff --git a/src/assets/home/1/底1.png b/src/assets/home/1/底1.png new file mode 100644 index 0000000..bd96e37 Binary files /dev/null and b/src/assets/home/1/底1.png differ diff --git a/src/assets/home/1/搜索 拷贝 2.png b/src/assets/home/1/搜索 拷贝 2.png new file mode 100644 index 0000000..55f904c Binary files /dev/null and b/src/assets/home/1/搜索 拷贝 2.png differ diff --git a/src/assets/home/data-platform-s.png b/src/assets/home/data-platform-s.png new file mode 100644 index 0000000..512bc40 Binary files /dev/null and b/src/assets/home/data-platform-s.png differ diff --git a/src/assets/home/ewm.png b/src/assets/home/ewm.png new file mode 100644 index 0000000..7d13b73 Binary files /dev/null and b/src/assets/home/ewm.png differ diff --git a/src/assets/home/forum-bg.jpg b/src/assets/home/forum-bg.jpg new file mode 100644 index 0000000..5926322 Binary files /dev/null and b/src/assets/home/forum-bg.jpg differ diff --git a/src/assets/home/fruit01.jpg b/src/assets/home/fruit01.jpg new file mode 100644 index 0000000..8cb9a60 Binary files /dev/null and b/src/assets/home/fruit01.jpg differ diff --git a/src/assets/home/fruit02.jpg b/src/assets/home/fruit02.jpg new file mode 100644 index 0000000..4304776 Binary files /dev/null and b/src/assets/home/fruit02.jpg differ diff --git a/src/assets/home/fruit03.jpg b/src/assets/home/fruit03.jpg new file mode 100644 index 0000000..0a39b67 Binary files /dev/null and b/src/assets/home/fruit03.jpg differ diff --git a/src/assets/home/fruit04.jpg b/src/assets/home/fruit04.jpg new file mode 100644 index 0000000..35c2d2b Binary files /dev/null and b/src/assets/home/fruit04.jpg differ diff --git a/src/assets/home/fuwupingtai.png b/src/assets/home/fuwupingtai.png new file mode 100644 index 0000000..8fc4b06 Binary files /dev/null and b/src/assets/home/fuwupingtai.png differ diff --git a/src/assets/home/gengduo.png b/src/assets/home/gengduo.png new file mode 100644 index 0000000..7e10419 Binary files /dev/null and b/src/assets/home/gengduo.png differ diff --git a/src/assets/home/gongyehulianwangzhuanqu.png b/src/assets/home/gongyehulianwangzhuanqu.png new file mode 100644 index 0000000..1b20ee9 Binary files /dev/null and b/src/assets/home/gongyehulianwangzhuanqu.png differ diff --git a/src/assets/home/meeting-bg.jpg b/src/assets/home/meeting-bg.jpg new file mode 100644 index 0000000..0894af1 Binary files /dev/null and b/src/assets/home/meeting-bg.jpg differ diff --git a/src/assets/home/pinggu.png b/src/assets/home/pinggu.png new file mode 100644 index 0000000..7703a4f Binary files /dev/null and b/src/assets/home/pinggu.png differ diff --git a/src/assets/home/tt.png b/src/assets/home/tt.png new file mode 100644 index 0000000..18a0073 Binary files /dev/null and b/src/assets/home/tt.png differ diff --git a/src/assets/home/ziyuanchi.png b/src/assets/home/ziyuanchi.png new file mode 100644 index 0000000..54450c6 Binary files /dev/null and b/src/assets/home/ziyuanchi.png differ diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 60cd82d..748e8c4 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,61 +1,163 @@ @@ -71,7 +173,7 @@ export default { ], noticeList:[ //通知列表 {sendtime:'2020-05-10',title:'工业和信息化部办公厅关于推动工业互联网加快发展',content:'各省、自治区、直辖市及计划单列市、新疆生产建设兵团工业和信息化主 管部门,各省、自治区、直辖市通信管理局,中国电信集团有限公司。'}, - {sendtime:'2020-05-09',title:'工业和信息化部办公厅关于公布2019年工业互联网试',content:'各省、自治区、直辖市及计划单列市工业和信息化主管部门,各省、自治区 、直辖市通信管理局,各有关单位。'}, + {sendtime:'2020-05-09',title:'工业和信息化部办公厅关于公布2019年工业互联网试2019年工业互联网试',content:'各省、自治区、直辖市及计划单列市工业和信息化主管部门,各省、自治区 、直辖市通信管理局,各有关单位。'}, {sendtime:'2020-05-08',title:'北京市经济和信息化局关于开展2020年工信部工业互',content:'各有关单位:根据工信部及我局工作安排,现将2020年工信部工业互联网 创新发展工程项目(以下简称“项目”)有关工作通知如下。'}, {sendtime:'2020-05-07',title:'江门市工业和信息化局转发关于组织推进 “5G+工业”',content:'各市(含定州、辛集市)工业和信息化局、通信发展管理办公室,中国联通 河北分公司、中国电信河北分公司、中国移动河北分公司、河北广电网络。'}, {sendtime:'2020-05-08',title:'关于进一步加快工业互联网发展的通知',content:'各省、自治区、直辖市及计划单列市工业和信息化主管部门,各省、自治区 、直辖市通信管理局,各有关单位。'}, @@ -83,28 +185,46 @@ export default { } \ No newline at end of file diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index 1670aad..aef55a9 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -28,7 +28,7 @@ export default { position: relative; height: 100%; width: 100%; - padding-top: 82px; + // padding-top: 82px; min-width: 1200px; &.mobile.openSidebar { position: fixed; diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue index 372ed38..7dad29f 100644 --- a/src/views/layout/components/AppMain.vue +++ b/src/views/layout/components/AppMain.vue @@ -19,11 +19,11 @@ export default { } diff --git a/src/views/layout/components/header.vue b/src/views/layout/components/header.vue index a5d6fde..e226b54 100644 --- a/src/views/layout/components/header.vue +++ b/src/views/layout/components/header.vue @@ -1,5 +1,9 @@ + -
- - -
- - - 加入联盟 - - -
-
-
+