页面更新

ruoyi-ui/src/components/SignNumArr/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="sign_box">
-    <div class="sign_item" v-for="item in this.sidebarRouters.filter(res => {
+    <div class="sign_item" :class="{active: activeMenu.includes((item.path||item.redirect))}" v-for="item in this.sidebarRouters.filter(res => {
           return res.hidden == false || res.redirect == 'index'
         })"
       @click="tabBtn(item)">
-      <img src="@/assets/images/pic_tabbg@2x.png" draggable="false" v-show="activeMenu.includes((item.path||item.redirect))"
-        alt="" class="img">
+     <!-- <img src="@/assets/images/pic_tabbg@2x.png" draggable="false" v-show="activeMenu.includes((item.path||item.redirect))"
+        alt="" class="img"> -->
       <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       <item v-if="!item.meta" :icon="item.meta && item.meta.icon" :title="'首页'" />
     </div>
@@ -84,17 +84,19 @@
 <style lang="scss" scoped>
   .sign_box {
     // padding-left: 12px;
+    width: calc(100% - 160px);
+    overflow-x: scroll;
+     white-space: nowrap;
 
     .sign_item {
       cursor: pointer;
       float: left;
-      display: flex;
-      height: 60px;
-      justify-content: center;
-      align-items: center;
+      display: inline-table;
+      height: 50px;
+      text-align: center;
+      line-height: 50px;
       position: relative;
-      width: 153px;
-      padding-top: 10px;
+      width: 143px;
       box-sizing: border-box;
       color: #fff;
 
@@ -109,8 +111,8 @@
       .icon {
         position: relative;
         z-index: 1;
-        width: 20px;
-        height: 20px;
+        width: 16px;
+        height: 16px;
         margin-right: 8px;
       }
 
@@ -118,7 +120,7 @@
         position: relative;
         z-index: 1;
         color: #fff !important;
-        font-size: 17px !important;
+        font-size: 16px !important;
       }
 
       svg {
@@ -129,4 +131,7 @@
       }
     }
   }
+  .active{
+    background-color: #367FA8!important;
+  }
 </style>

ruoyi-ui/src/layout/components/Navbar.vue

@@ -109,7 +109,7 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 60px;
+  height: 50px;
   overflow: hidden;
   position: relative;
   background-color: #3C8DBC;

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -56,8 +56,8 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 60px;
-  line-height: 60px;
+  height: 50px;
+  line-height: 50px;
   background-color: #3C8DBC;
   text-align: center;
   overflow: hidden;

ruoyi-ui/src/views/system/surface/index.vue

@@ -6,8 +6,8 @@
       <div class="table_headerBtun" v-if="queryData.buttonList">
         <el-button type="primary" plain v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
       </div>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-        <dynamic-form :config="queryParams" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList" :key='index'/>
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+        <dynamic-form :config="queryParams" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList" :key='index' />
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -105,6 +105,19 @@
         }).then(res => {
           let data = res.data
           this.queryData = data
+          console.log( this.queryData.queryList)
+          this.queryData.queryList.filter(route => {
+            if(route.htmlType == 'checkbox'){
+              route.sysDictDatatwo = []
+              route.sysDictDatatwo.push(route.columnName)
+              // route.sysDictData.filter(router=>{
+              //  route.sysDictDatatwo.push(router.dictLabel)
+              //  console.log( route.sysDictDatatwo)
+              // })
+              console.log(route.sysDictDatatwo,846)
+            }
+          })
+          console.log(this.queryData.queryList)
         })
       },
       handleChange(val) {