diff --git a/public/css/style.css b/public/css/style.css index 5833df8..f43e0ed 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -114,7 +114,7 @@ ul{ #MutiNav .multiUl{ width: 1200px; margin: auto; - height: 50px; + height: 55px; clear: both; display: block; } @@ -328,6 +328,10 @@ blockquote{ background: url(../img/sy_banner.jpg) center; height: 290px; } +.detailHtml{ + background: url(../img/xqy.jpg) center; + height: 290px; +} .contant{ width: 1200px; margin: -134px auto 0 auto; @@ -734,15 +738,16 @@ blockquote{ color: #EE8515; } .h_ldown{ - margin-top: 54px; + margin-top: 64px; } .h_ldown ul li{ - margin-top: 12px; - padding-bottom: 9px; + margin-top: 14px; + padding-bottom: 11px; border-bottom: 1px #ebebeb dashed; } .h_ldown ul li:last-child{ border: 0; + padding: 0; } .h_ldown ul li a{ display: block; @@ -792,8 +797,8 @@ blockquote{ font-size: 15px; } .h_rdown ul li:last-child{ - border: 0; + padding: 0; } .h_rdown ul li:hover h4{ color: #ee8515; @@ -1055,7 +1060,6 @@ blockquote{ border-bottom: 1px #1dcc6a solid; } .er_contl ul li{ - padding: 0 20px; line-height: 60px; border-bottom: 1px #DDDDDD dashed; border-left: 2px #FFFFFF solid; diff --git a/public/img/xqy.jpg b/public/img/xqy.jpg new file mode 100644 index 0000000..a1fd7f0 Binary files /dev/null and b/public/img/xqy.jpg differ diff --git a/src/components/jeecg/JEditor.vue b/src/components/jeecg/JEditor.vue index 7055907..516f684 100644 --- a/src/components/jeecg/JEditor.vue +++ b/src/components/jeecg/JEditor.vue @@ -51,7 +51,16 @@ }, toolbar: { type: [String, Array], - default: 'undo redo | formatselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | lists link unlink image media table | removeformat | fullscreen', + default: ["undo redo save | cut copy paste | forecolor backcolor bold italic underline strikethrough link unlink " + + "openlink anchor | alignleft aligncenter alignright alignjustify alignnone outdent indent | " + + "bullist numlist ", + "styleselect formatselect fontselect fontsizeselect | table tabledelete tablecellprops tablemergecells| blockquote subscript superscript removeformat | ltr rtl " + + "tablesplitcells tableinsertrowbefore tableinsertrowafter tabledeleterow tablerowprops tablecutrow " + + "tablecopyrow tablepasterowbefore tablepasterowafter tableinsertcolbefore tableinsertcolafter tabledeletecol | " + + "image media fullscreen", + "insertdatetime charmap emoticons hr pagebreak template code pastetext print visualblocks visualchars " + + "nonbreaking searchreplace preview kityformula-editor indent2em ", + ], branding:false } }, diff --git a/src/components/menu/index.js b/src/components/menu/index.js index 2710d3b..0fccb8f 100644 --- a/src/components/menu/index.js +++ b/src/components/menu/index.js @@ -8,7 +8,7 @@ export default { props: { menu: { type: Array, - required: true + required: true/* */ }, theme: { type: String, @@ -76,11 +76,13 @@ export default { updateMenu () { const routes = this.$route.matched.concat() const { hidden } = this.$route.meta + let fullPath = '' if (routes.length >= 3 && hidden) { routes.pop() this.selectedKeys = [routes[routes.length - 1].path] } else { - this.selectedKeys = [routes.pop().path] + let route = routes.pop(); + this.selectedKeys = [route.path] } const openKeys = [] if (this.mode === 'inline') { @@ -88,9 +90,20 @@ export default { openKeys.push(item.path) }) } + fullPath = this.$route.fullPath + console.log('this.selectedKeys[0] => ',this.selectedKeys[0],fullPath,routes); //update-begin-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对 - if(!this.selectedKeys || this.selectedKeys[0].indexOf(":")<0){ + if(!this.selectedKeys || this.selectedKeys[0].indexOf(":")<0 || fullPath.indexOf("?") == -1){ this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys) + }else if(fullPath.indexOf("?") != -1) { + if(fullPath.indexOf('/') != -1){ + let pathList = fullPath.split('/'); + if(pathList && pathList.length > 1){ + let newKey = '/'+pathList[1]; + console.log('newKey =>',newKey); + this.collapsed ? (this.cachedOpenKeys = newKey) : (this.openKeys = newKey) + } + } } //update-end-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对 }, diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index e2d9e32..b43cc06 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -6,7 +6,7 @@ :style="{ padding: '0' }">
- + @click="toggle"/> --> Jeecg-Boot @@ -33,11 +33,11 @@ :menu="menus" :theme="theme">
- + @click="toggle"> --> diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index d92eda9..cfbc78a 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -2,11 +2,11 @@
- + - + - + + 欢迎您，{{ nickname() }} - + + 系统设置 - + 密码修改 - + + 清理缓存 diff --git a/src/views/gateway/common/footer.vue b/src/views/gateway/common/footer.vue index 9b3360a..67bc0bd 100644 --- a/src/views/gateway/common/footer.vue +++ b/src/views/gateway/common/footer.vue @@ -75,9 +75,11 @@ export default { }, methods:{ yqljChange(record){ - var url = record.target.value - console.log(url); - window.open(url,"_blank") + var url = record.target.value + console.log(url); + if(url){ + window.open(url,"_blank") + } }, loadData(){ //友情链接 diff --git a/src/views/gateway/common/header.vue b/src/views/gateway/common/header.vue index 277efdd..2fd3d3e 100644 --- a/src/views/gateway/common/header.vue +++ b/src/views/gateway/common/header.vue @@ -3,13 +3,13 @@
-
+
设为首页 | 加入收藏
- +
@@ -310,24 +310,24 @@ export default { }, computed:{ banClass(){ - let r = 'ban'; + let r = 'detailHtml'; switch (this.$route.query.pid) { - case 101: r = 'baner8'; break; - case 102: r = 'baner4'; break; - case 103: r = 'baner'; break; - case 104: r = 'baner5'; break; - case 105: r = 'baner3'; break; - case 106: r = 'baner7'; break; - case 107: r = 'baner6'; break; + case '101': r = 'baner8'; break; + case '102': r = 'baner4'; break; + case '103': r = 'baner'; break; + case '104': r = 'baner5'; break; + case '105': r = 'baner3'; break; + case '106': r = 'baner7'; break; + case '107': r = 'baner6'; break; case 'gybs': r = 'baner2'; break; case 'home': r = 'ban'; break; - case 501: r = 'baner'; break; - case 306: r = 'baner'; break; - case 305: r = 'baner'; break; - case 304: r = 'baner'; break; - case 303: r = 'baner'; break; - case 302: r = 'baner'; break; - case 301: r = 'baner'; break; + case '501': r = 'detailHtml'; break; + case '306': r = 'detailHtml'; break; + case '305': r = 'detailHtml'; break; + case '304': r = 'detailHtml'; break; + case '303': r = 'detailHtml'; break; + case '302': r = 'detailHtml'; break; + case '301': r = 'baner8'; break; default: break; } diff --git a/src/views/gateway/common/main.vue b/src/views/gateway/common/main.vue index bb4d909..8d8d702 100644 --- a/src/views/gateway/common/main.vue +++ b/src/views/gateway/common/main.vue @@ -6,11 +6,16 @@
- + -

{{tt.title}}

-

{{$tfnm(tt,'content',60)}}

+

{{tt.title}}

+

{{$tfnm(tt,'content',60)}}

 + +
+
+
+
@@ -18,31 +23,42 @@
- + +
- {{lbt.title}} + {{lbt.title}}
+
+ {{lbtIndex+1}} +
- 更多> + 更多>
    -
  • 工作动态
    • -
  • 行业要闻
    • +
  • 工作动态
    • +
  • 行业要闻