Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
58b19e73 by renchao@pashanhoo.com
Options

Merge branch 'master' into dev

2 parents fd6bcf17 8244914a
Inline Side-by-side
Showing 7 changed files with 23 additions and 12 deletions
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
41 html += `<div style="font-size: 14px;line-height: 24px > 41 html += `<div style="font-size: 14px;line-height: 24px >
42 <span style="display:inline-block;"></span> 42 <span style="display:inline-block;"></span>
43 ${params.name} 43 ${params.name}
44 <span style="color:blue;font-weight:700;font-size: 18px">${params.value}</span> 44 <br/><span style="color:blue;font-weight:700;font-size: 18px">${params.value}</span>
45 个`; 45 平方米`;
46 return html; 46 return html;
47 }, 47 },
48 extraCssText: 48 extraCssText:
......
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660118748190" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2584" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); } 1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660118748190" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2584" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
2 </style></defs><path d="M938.666667 98.773333c16.128 0 29.226667 13.098667 29.226666 29.226667v528.64A114.56 114.56 0 0 1 853.333333 771.2h-334.208v68.437333h228.693334a29.226667 29.226667 0 0 1 4.352 58.154667l-4.309334 0.341333H236.928a29.226667 29.226667 0 0 1-4.309333-58.154666l4.266666-0.298667 223.786667-0.042667v-68.437333h-356.266667a29.226667 29.226667 0 0 1-28.928-24.917333l-0.298666-4.266667V213.333333a114.56 114.56 0 0 1 114.56-114.56z m-29.269334 58.453334H189.738667c-30.976 0-56.106667 25.130667-56.106667 56.106666v499.413334H853.333333c29.013333 0 52.906667-22.058667 55.808-50.346667l0.298667-5.76-0.042667-499.413333zM640 292.565333a146.304 146.304 0 0 1 122.026667 226.986667l51.029333 50.986667a29.269333 29.269333 0 0 1-37.717333 44.458666l-3.626667-3.072-51.029333-51.029333A146.304 146.304 0 1 1 640 292.522667z m-271.573333 210.773334a29.226667 29.226667 0 0 1 4.352 58.154666l-4.352 0.298667H273.066667a29.226667 29.226667 0 0 1-4.309334-58.112l4.309334-0.341333h95.36zM640 351.146667a87.765333 87.765333 0 1 0 0 175.530666 87.765333 87.765333 0 0 0 0-175.530666z m-189.226667-71.125334a29.226667 29.226667 0 0 1 4.266667 58.154667l-4.266667 0.298667H273.066667a29.226667 29.226667 0 0 1-4.309334-58.154667l4.309334-0.298667h177.706666z" fill="#ffffff" p-id="2585"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
2 </style></defs><path d="M938.666667 98.773333c16.128 0 29.226667 13.098667 29.226666 29.226667v528.64A114.56 114.56 0 0 1 853.333333 771.2h-334.208v68.437333h228.693334a29.226667 29.226667 0 0 1 4.352 58.154667l-4.309334 0.341333H236.928a29.226667 29.226667 0 0 1-4.309333-58.154666l4.266666-0.298667 223.786667-0.042667v-68.437333h-356.266667a29.226667 29.226667 0 0 1-28.928-24.917333l-0.298666-4.266667V213.333333a114.56 114.56 0 0 1 114.56-114.56z m-29.269334 58.453334H189.738667c-30.976 0-56.106667 25.130667-56.106667 56.106666v499.413334H853.333333c29.013333 0 52.906667-22.058667 55.808-50.346667l0.298667-5.76-0.042667-499.413333zM640 292.565333a146.304 146.304 0 0 1 122.026667 226.986667l51.029333 50.986667a29.269333 29.269333 0 0 1-37.717333 44.458666l-3.626667-3.072-51.029333-51.029333A146.304 146.304 0 1 1 640 292.522667z m-271.573333 210.773334a29.226667 29.226667 0 0 1 4.352 58.154666l-4.352 0.298667H273.066667a29.226667 29.226667 0 0 1-4.309334-58.112l4.309334-0.341333h95.36zM640 351.146667a87.765333 87.765333 0 1 0 0 175.530666 87.765333 87.765333 0 0 0 0-175.530666z m-189.226667-71.125334a29.226667 29.226667 0 0 1 4.266667 58.154667l-4.266667 0.298667H273.066667a29.226667 29.226667 0 0 1-4.309334-58.154667l4.309334-0.298667h177.706666z" p-id="2585"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-24 17:10:02 4 * @LastEditTime: 2023-03-30 10:39:40
5 --> 5 -->
6 <template> 6 <template>
7 <div v-if="!item.hidden"> 7 <div v-if="!item.hidden">
...@@ -68,11 +68,10 @@ export default { ...@@ -68,11 +68,10 @@ export default {
68 return true 68 return true
69 } 69 }
70 }) 70 })
71
72 // When there is only one child router, the child router is displayed by default 71 // When there is only one child router, the child router is displayed by default
73 // if (showingChildren.length === 1) { 72 if (showingChildren.length >= 1 && (showingChildren[0].path == 'ywjr' || showingChildren[0].path == "sbbwcx" || showingChildren[0].path == "dbrzcx")) {
74 // return true 73 return true
75 // } 74 }
76 75
77 // Show parent if there are no child router to display 76 // Show parent if there are no child router to display
78 if (showingChildren.length === 0) { 77 if (showingChildren.length === 0) {
......
...@@ -77,7 +77,7 @@ export const asyncRoutes = [ ...@@ -77,7 +77,7 @@ export const asyncRoutes = [
77 path: 'sbbwcx', 77 path: 'sbbwcx',
78 component: () => import('@/views/sthj/sbbwcx/index'), 78 component: () => import('@/views/sthj/sbbwcx/index'),
79 name: 'sbbwcx', 79 name: 'sbbwcx',
80 meta: { title: '上报报文', icon: 'zsgl' } 80 meta: { title: '数据上报', icon: 'zsgl' }
81 }, 81 },
82 { 82 {
83 path: 'dbrzcx', 83 path: 'dbrzcx',
......
...@@ -21,9 +21,11 @@ ...@@ -21,9 +21,11 @@
21 transition: 0s width ease-in-out, 0s padding-left ease-in-out, 21 transition: 0s width ease-in-out, 0s padding-left ease-in-out,
22 0s padding-right ease-in-out; 22 0s padding-right ease-in-out;
23 } 23 }
24
24 .el-scrollbar { 25 .el-scrollbar {
25 height: 100%; 26 height: 100%;
26 } 27 }
28
27 .scrollbar-wrapper { 29 .scrollbar-wrapper {
28 overflow-x: hidden !important; 30 overflow-x: hidden !important;
29 margin-right: 0 !important; 31 margin-right: 0 !important;
...@@ -64,7 +66,6 @@ ...@@ -64,7 +66,6 @@
64 66
65 // 有子级 67 // 有子级
66 .el-submenu__title { 68 .el-submenu__title {
67 padding-left: 10px !important;
68 @include font_color("menuText"); 69 @include font_color("menuText");
69 background-color: transparent !important; 70 background-color: transparent !important;
70 71
...@@ -106,6 +107,7 @@ ...@@ -106,6 +107,7 @@
106 .el-submenu__title.is-active { 107 .el-submenu__title.is-active {
107 @include background_color("submenuBg"); 108 @include background_color("submenuBg");
108 @include font_color("submenuColor"); 109 @include font_color("submenuColor");
110 border-right: 5px solid #36CEB6;
109 111
110 .svg-icon { 112 .svg-icon {
111 color: #1ea6f8 !important; 113 color: #1ea6f8 !important;
...@@ -319,6 +321,7 @@ ...@@ -319,6 +321,7 @@
319 .el-submenu.is-active .el-submenu__title { 321 .el-submenu.is-active .el-submenu__title {
320 @include background_color("submenuBg"); 322 @include background_color("submenuBg");
321 @include font_color("submenuColor"); 323 @include font_color("submenuColor");
324 border-right: 5px solid #36CEB6;
322 } 325 }
323 326
324 .el-submenu.is-active .el-submenu__title:hover { 327 .el-submenu.is-active .el-submenu__title:hover {
...@@ -334,6 +337,15 @@ ...@@ -334,6 +337,15 @@
334 align-items: center; 337 align-items: center;
335 } 338 }
336 339
340 .sidebar-container .submenu-title-noDropdown>i,
341 .sidebar-container .el-submenu__title>i {
342 color: #6D7278 !important;
343 }
344
345 .el-submenu.is-active .el-submenu__title>i {
346 color: #FFFFFF !important;
347 }
348
337 .el-submenu__title span { 349 .el-submenu__title span {
338 white-space: normal; 350 white-space: normal;
339 word-break: break-all; 351 word-break: break-all;
......
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
111 let code = this.BASE_API.CODE; 111 let code = this.BASE_API.CODE;
112 localStorage.setItem("token", `Bearer ${res.content}`); 112 localStorage.setItem("token", `Bearer ${res.content}`);
113 const { result: getMenuData } = (await getMenuInfo(code)) || []; 113 const { result: getMenuData } = (await getMenuInfo(code)) || [];
114 let path1 = JSON.parse(getMenuData[0].metadata)?.path + '/' + JSON.parse(getMenuData[0].children[0].metadata)?.path 114 let path1 = JSON.parse(getMenuData[1].metadata)?.path + '/' + JSON.parse(getMenuData[1].children[0].metadata)?.path
115 //登录成功后需判断有无重定向，没有重定向则跳转首页 115 //登录成功后需判断有无重定向，没有重定向则跳转首页
116 const accessRoutes = await this.$store.dispatch( 116 const accessRoutes = await this.$store.dispatch(
117 "permission/generateRoutes", 117 "permission/generateRoutes",
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 </el-form> 37 </el-form>
38 </div> 38 </div>
39 <div class="from-clues-content"> 39 <div class="from-clues-content">
40 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200" 40 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="BASE_API.calcHeight"
41 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" 41 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
42 row-key="dictid"> 42 row-key="dictid">
43 </lb-table> 43 </lb-table>
......