Merge branch 'master' into dev

@@ -41,8 +41,8 @@
                 html += `<div style="font-size: 14px;line-height: 24px >
                 <span style="display:inline-block;"></span>
                 ${params.name}
-                <span style="color:blue;font-weight:700;font-size: 18px">${params.value}</span>
-                个`;
+                <br/><span style="color:blue;font-weight:700;font-size: 18px">${params.value}</span>
+                平方米`;
                 return html;
               },
               extraCssText:

 <?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"); }
-</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
+</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

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-03-24 17:10:02
+ * @LastEditTime: 2023-03-30 10:39:40
 -->
 <template>
   <div v-if="!item.hidden">
@@ -68,11 +68,10 @@ export default {
           return true
         }
       })
-
       // When there is only one child router, the child router is displayed by default
-      // if (showingChildren.length === 1) {
-      //   return true
-      // }
+      if (showingChildren.length >= 1 && (showingChildren[0].path == 'ywjr' || showingChildren[0].path == "sbbwcx" || showingChildren[0].path == "dbrzcx")) {
+        return true
+      }
 
       // Show parent if there are no child router to display
       if (showingChildren.length === 0) {

@@ -77,7 +77,7 @@ export const asyncRoutes = [
         path: 'sbbwcx',
         component: () => import('@/views/sthj/sbbwcx/index'),
         name: 'sbbwcx',
-        meta: { title: '上报报文', icon: 'zsgl' }
+        meta: { title: '数据上报', icon: 'zsgl' }
       },
       {
         path: 'dbrzcx',

@@ -21,9 +21,11 @@
     transition: 0s width ease-in-out, 0s padding-left ease-in-out,
       0s padding-right ease-in-out;
   }
+
   .el-scrollbar {
     height: 100%;
   }
+
   .scrollbar-wrapper {
     overflow-x: hidden !important;
     margin-right: 0 !important;
@@ -64,7 +66,6 @@
 
   // 有子级
   .el-submenu__title {
-    padding-left: 10px !important;
     @include font_color("menuText");
     background-color: transparent !important;
 
@@ -106,6 +107,7 @@
   .el-submenu__title.is-active {
     @include background_color("submenuBg");
     @include font_color("submenuColor");
+    border-right: 5px solid #36CEB6;
 
     .svg-icon {
       color: #1ea6f8 !important;
@@ -319,6 +321,7 @@
 .el-submenu.is-active .el-submenu__title {
   @include background_color("submenuBg");
   @include font_color("submenuColor");
+  border-right: 5px solid #36CEB6;
 }
 
 .el-submenu.is-active .el-submenu__title:hover {
@@ -334,6 +337,15 @@
   align-items: center;
 }
 
+.sidebar-container .submenu-title-noDropdown>i,
+.sidebar-container .el-submenu__title>i {
+  color: #6D7278 !important;
+}
+
+.el-submenu.is-active .el-submenu__title>i {
+  color: #FFFFFF !important;
+}
+
 .el-submenu__title span {
   white-space: normal;
   word-break: break-all;

@@ -111,7 +111,7 @@ export default {
             let code = this.BASE_API.CODE;
             localStorage.setItem("token", `Bearer ${res.content}`);
             const { result: getMenuData } = (await getMenuInfo(code)) || [];
-            let path1 = JSON.parse(getMenuData[0].metadata)?.path + '/' + JSON.parse(getMenuData[0].children[0].metadata)?.path
+            let path1 = JSON.parse(getMenuData[1].metadata)?.path + '/' + JSON.parse(getMenuData[1].children[0].metadata)?.path
             //登录成功后需判断有无重定向，没有重定向则跳转首页
             const accessRoutes = await this.$store.dispatch(
               "permission/generateRoutes",

@@ -37,7 +37,7 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200"
+      <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="BASE_API.calcHeight"
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
         row-key="dictid">
       </lb-table>