yrik 4 жил өмнө
parent
commit
736d740bde

+ 56 - 71
ruoyi-ui/src/views/system/table/index.vue

@@ -1,36 +1,38 @@
 <template>
   <div class="table_total">
     <div class="table_header">
-      <!-- <p>单表</p>
-      <el-divider></el-divider> -->
+      <p>单表</p>
+      <el-divider></el-divider>
       <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-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>
-        </el-form-item>
-      </el-form>
+
     </div>
-    <!-- 内容 -->
+    <!-- 内容 -->    
     <div class="table_nav">
-      <!-- <el-collapse v-model="activeNames" @change="handleChange">
+      <el-collapse v-model="activeNames" @change="handleChange">
         <el-collapse-item :title="title" :name="index" v-for="(item,index) in 4" :key="index">
           <el-form :model="queryParams" ref="queryForm" :inline="true">
             <el-row :gutter="0">
-              <el-col :span="6" v-for="(item,index) in 12" :key="index">
-                <el-form-item :label="labletit" prop="dictName">
-                  <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-                </el-form-item>
+              <el-col :span="24"  :key="index">
+                  <dynamic-form :config="queryParams" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList" :key='index' />
               </el-col>
+              <!-- <el-col :span="6" v-for="(item,index) in 12" :key="index">
+                  <el-form-item :label="labletit" prop="dictName">
+                   <el-input
+                       v-model="queryParams.dictName"
+                       placeholder="请输入字典名称"
+                       clearable
+                       size="small"
+                       @keyup.enter.native="handleQuery"
+                  />
+                 </el-form-item>
+              </el-col> -->
             </el-row>
           </el-form>
         </el-collapse-item>
 
-      </el-collapse> -->
+      </el-collapse>
     </div>
 
   </div>
@@ -110,10 +112,6 @@
             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)
             }
           })
@@ -128,22 +126,17 @@
 </script>
 
 
-<style lang="scss">
-  .table_header {
-    .el-divider--horizontal {
+<style  lang="scss">
+  .table_header{
+    .el-divider--horizontal{
       margin-top: 16px;
     }
-    .table_headerBtun{
-      margin-bottom: 20px;
-    }
   }
-
-  .table_nav {
-    .el-collapse-item__wrap {
+  .table_nav{
+    .el-collapse-item__wrap{
       border-bottom: 0;
     }
-
-    .el-collapse-item__header {
+    .el-collapse-item__header{
       border-bottom: 0;
       font-size: 15px;
       font-family: PingFang SC;
@@ -151,12 +144,10 @@
       color: #3C8DBC;
       line-height: 36px;
     }
-
-    .el-form-item__content {
-      width: 55%;
-    }
-
-    .el-collapse {
+    // .el-form-item__content{
+    //   width: 55%;
+    // }
+    .el-collapse{
       border-top: 0;
     }
   }
@@ -165,30 +156,26 @@
 
 
 <style scoped lang="scss">
-  .app-main {
-    // background-color: #eef0ff !important;
+  .app-main{
+     // background-color: #eef0ff !important;
   }
-
-  .table_total {
-    background-color: #eef0ff;
-    min-height: calc(100vh - 94px);
-    padding: 20px;
-
-    // 头部
-    .table_header {
-      background-color: #fff;
-      border-radius: 6px;
-      padding: 23px 23px 0px;
-      margin-bottom: 20px;
-
-      p {
-        font-size: 15px;
-        font-weight: bold;
-        color: #3C8DBC;
-        line-height: 36px;
-      }
-
-      p::before {
+  .table_total{
+     background-color: #eef0ff;
+     height: 100%;
+     padding: 20px;
+     // 头部
+     .table_header{
+        background-color: #fff;
+        border-radius: 6px;
+        padding: 23px;
+        margin-bottom: 20px;
+      p{
+         font-size: 15px;
+         font-weight: bold;
+         color: #3C8DBC;
+         line-height: 36px;
+        }
+      p::before{
         content: "";
         display: block;
         width: 18px;
@@ -197,17 +184,15 @@
         border-radius: 3px;
 
       }
-    }
-
-    // 内容
-    .table_nav {
-      background-color: #fff;
-      border-radius: 6px;
-      padding: 23px;
-    }
+     }
+     // 内容
+     .table_nav{
+       background-color: #fff;
+       border-radius: 6px;
+       padding: 23px;
+     }
   }
-
-  p {
+  p{
     margin: 0;
 
   }