change style

src/assets/css/index.css

@@ -2,30 +2,6 @@
 .clear {
     clear: both;
 }
-.nb-toparea {
-    width: 100%;
-    height: 46px;
-    margin-bottom: 10px;
-    position: relative;
-}
-
-.nb-toparea button,
-.nb-toparea>.el-select {
-    position: absolute;
-}
-
-.nb-toparea__leftbtn0 {
-    left: 20px;
-}
-
-.nb-toparea__leftbtn1 {
-    left: 170px;
-}
-
-.nb-toparea__leftbtn2 {
-    left: 320px;
-}
-
 
 /*未匹配列名、异常数据diglog middle*/
 .el-dialog .el-dialog__middle {
@@ -52,7 +28,7 @@
 }
 
 .nb-table--bgc {
-    border: 3px outset #ccc;
+    border: 2px outset #3ae6b2;
 }
 
 .nb-table--border,
@@ -62,84 +38,28 @@
 
 
 
-/* 绿色按钮 */
-.topbtn {
-    outline: none;
-    border: none;
-    background: url("../images/btn0.png") no-repeat center;
-    background-size: 100% 100%;
-    border-radius: 4px;
-    color: #fff;
-    width: 120px;
-    height: 46px;
-    text-align: center;
-    line-height: 41px;
-    cursor: pointer;
-    position: relative;
-}
 
-/* 蓝色按钮 */
-.top_bluebtn,
-.top_blueselect .el-input--suffix .el-input__inner {
-    outline: none;
-    font-size: 14px;
-    border: none;
-    background: url("../images/btn1.png") no-repeat center;
-    background-size: 100% 100%;
-    color: #fff;
-    width: 120px;
-    height: 46px;
-    line-height: 41px;
-    cursor: pointer;
-    position: relative;
-}
 .case-inselect .el-input__inner {
     background-color: #032d58;
     border: 1px solid #409eff;
     color: #fff;
 }
 
-.fullscreen {
-    position: fixed !important;
-    top: 0;
-    bottom: 0;
-    right: 0;
-    width: 100% !important;
-    height: 100% !important;
-    left: 0;
-    z-index: 10;
-    background-color: #032d58;
-}
-
-.fullscreen .mapwrapper {
-    width: 100% !important;
-    height: 100% !important;
-    overflow: hidden;
-    margin: 0px !important;
-    -webkit-box-shadow: 2px 2px 5px #e6e6e6;
-}
-
-
 /********** ElementUI  公用样式 调整 *********/
 /***  elementUI  ***/
 .el-form {
     padding: 10px 0px 8px;
 }
-
 /* 账单清洗导入dialog 导入文件列表ul */
 
 .el-upload-list {
     max-height: 300px;
     overflow-y: auto;
 }
-
-
 /* button */
-
 .el-button.is-circle {
     padding: 0;
 }
-
 .el-form--inline .el-form-item {
     margin-right: 0px;
     margin-left: 10px;
@@ -286,6 +206,7 @@
 .el-table__expanded-cell,
 .el-table__header-wrapper {
     background-color: #104072;
+    background: transparent;
 }
 
 .el-table__empty-text {
@@ -357,6 +278,7 @@
 .el-table__body-wrapper,
 .el-table__body tr.hover-row>td {
     background-color: #032d58;
+    background:transparent;
 }
 
 .el-table td,
@@ -480,8 +402,9 @@
 }
 
 .el-dialog {
-    border: 3px outset #ccc;
+    border: 3px outset #3ae6b2;
     background-color: #032d58;
+    padding:5px;
 }
 
 .el-dialog .el-dialog__header {

src/modules/Header.vue

@@ -49,7 +49,7 @@
         line-height: 47px;
         opacity: 0.9;
         background-color: #0a1e48;
-        background-image: linear-gradient(#0a1e48, #144b80, #0a1e48); 
+        background-image: linear-gradient(#0a1e48, #091826, #0a1e48);
         border-bottom: 3px solid #144b80;
         border-top: 3px solid #144b80;
 

src/modules/Home.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="home-wrapper">
-        <v-head></v-head>
+        <!-- <v-head></v-head> -->
         <v-sidebar :default-openeds="defaultOpeneds"></v-sidebar>
 
         <div class="cm-title">

src/modules/Sidebar.vue

@@ -10,7 +10,6 @@
                 <el-menu-item v-for="jtem in item.children" :key="jtem.pathTitle" :index="jtem.pathUrl">
                     {{jtem.pathTitle}}</el-menu-item>
             </el-submenu>
-
         </el-menu>
     </div>
 </template>

src/modules/createmodel/alipay/components/ResultTable.vue

@@ -1,38 +1,28 @@
 <template>
     <div class="left-wrapper" style="background-color: #032d58;">
         <div class="nb-table nb-table--bgc cmright1">
-            
             <file-name></file-name>
             <search-sort></search-sort>
-
-            <el-collapse v-model="collapseName">
-                <el-collapse-item title="操作" name="1">
-                    <br>
-                    <div class="nb-toparea" >
-                        <button class="topbtn nb-toparea__leftbtn0" @click="oneKeyGenerate()">一键生成</button>
-                        <button class="topbtn nb-toparea__leftbtn1" @click="exportFile()">导出</button>
-                        <button class="top_bluebtn nb-toparea__leftbtn4" @click="openSettings()">搜索排序</button>
-                    </div>
-                    <br>
-                </el-collapse-item>
-                <el-collapse-item title="结果" name="2">
-                    <el-table :data="fileContent.result" 
-                        border size="mini" :height="tableHeight" tooltip-effect="dark"
-                        :key="currentFileName" style="width: 100%"
-                        ref="alipayTable" highlight-current-row>
-                        <template v-for="(key, value) in fileContent.header">
-                            <el-table-column 
-                                :prop="value" 
-                                :label="key" 
-                                :min-width="150" 
-                                :show-overflow-tooltip="true" 
-                                :key="value">
-                            </el-table-column> 
-                        </template>
-                    </el-table>
-                    <pagination :dataList="fileContent" :upParam="beforePayload" @loadMethod="loadSearchSortData"></pagination>
-                </el-collapse-item>
-            </el-collapse>
+            <div class="excel-btns">
+                <el-button type="primary" size="mini"  @click="oneKeyGenerate()">一键生成</el-button>
+                <el-button type="primary" size="mini"  @click="exportFile()">导出</el-button>
+                <el-button type="success" size="mini"  @click="openSettings()">搜索排序</el-button>
+            </div>
+            <el-table :data="fileContent.result" 
+                border size="mini" :height="tableHeight" tooltip-effect="dark"
+                :key="currentFileName" style="width: 100%"
+                ref="alipayTable" highlight-current-row>
+                <template v-for="(key, value) in fileContent.header">
+                    <el-table-column 
+                        :prop="value" 
+                        :label="key" 
+                        :min-width="150" 
+                        :show-overflow-tooltip="true" 
+                        :key="value">
+                    </el-table-column> 
+                </template>
+            </el-table>
+            <pagination :dataList="fileContent" :upParam="beforePayload" @loadMethod="loadSearchSortData"></pagination>
         </div>
     </div>
 </template>
@@ -178,33 +168,10 @@
     }
 </style>
 <style scoped>
-
-    .nb-toparea__leftbtn0 {
-        width: 150px;
-    }
-    .topbtn-width{
-        width: 90px;
-        margin-right: 10px;
-    }
-    .nb-toparea__leftbtn1 {
-        width: 150px;
-        left: 200px;
-    }
-    .nb-toparea__leftbtn2 {
-        width: 150px;
-        left: 380px;
-    }
-    .nb-toparea__leftbtn3 {
-        width: 150px;
-        left: 560px;
-    }
-    .nb-toparea__leftbtn4 {
-        width: 150px;
-        left: 740px;
-    }
-    .nb-toparea__leftbtn5 {
-        width: 150px;
-        left: 920px;
+    .excel-btns{
+        border: 2px outset wheat;
+        padding: 5px 2px;
+        text-align: left;
     }
     .cmright1{
         position: relative;

src/modules/createmodel/alipay/components/SearchSort.vue

@@ -4,7 +4,7 @@
         append-to-body
         :modal="drawerModel"
         :visible.sync="isOpenSS"
-        direction="rtl"
+        direction="ttb"
         class="search-sort-drawer"
         size="500">
 
@@ -31,7 +31,7 @@
             <el-divider></el-divider>
             <el-descriptions title="搜索字段" :column="1" size="small" border>
                 <template slot="extra">
-                    <button class="topbtn topbtn-width" @click="searchSort(1)">搜索</button>
+                    <el-button type="primary" size="mini"  @click="searchSort(1)">搜索</el-button>
                 </template>
                 <el-descriptions-item  v-for="(item, index) in searchList" :key="item.key">
                     <template slot="label">
@@ -42,7 +42,7 @@
                 </el-descriptions-item>
             </el-descriptions>
         </el-card>
-        <br>
+
         <el-card>
             <div slot="header" class="clearfix" style="font-size:16px;">
                 <span>排序</span>
@@ -63,7 +63,7 @@
             <el-divider></el-divider>
             <el-descriptions title="排序字段" :column="1" size="small" border>
                 <template slot="extra">
-                    <button class="topbtn topbtn-width" @click="searchSort(2)">排序</button>
+                    <el-button type="primary" size="mini"  @click="searchSort(2)">排序</el-button>
                 </template>
                 <el-descriptions-item  v-for="(item, index) in sortList" :key="item.key">
                     <template slot="label">

src/modules/createmodel/components/FileTable.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="left-wrapper">
-        <div class="nb-table nb-table--bgc" style="height: calc(100vh - 150px);">
+        <div class="nb-table nb-table--bgc" style="height: calc(100vh - 150px);border-right: none;">
             <el-tabs v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane label="原始文件" name="first">1</el-tab-pane>
                 <el-tab-pane label="生成文件" name="second">2</el-tab-pane>
@@ -10,13 +10,7 @@
                 tooltip-effect="dark" ref="fileListsTable" @row-click="loadTableHeader"  style="width: 100%">
                 <el-table-column prop="count" label="序号" width="50"></el-table-column>
                 <el-table-column prop="filename" label="文件名称" :show-overflow-tooltip="true" min-width="120"></el-table-column>
-                <el-table-column prop="generatedStr" label="类型" min-width="50">
-                    <template slot-scope="scope">
-                        <el-tag effect="dark" size="mini" :type="scope.row.generatedStr === '生成' ? 'primary' : 'success'" disable-transitions>
-                            {{scope.row.generatedStr}}
-                        </el-tag>
-                    </template>
-                </el-table-column>
+                <el-table-column prop="generatedStr" label="类型" min-width="50"> </el-table-column>
             </el-table>
             <pagination :dataList="fileLists" :simple="true" :upParam="beforePayload" @loadMethod="loadFLTable"></pagination>
                     

src/modules/createmodel/file/components/ResultTable.vue

@@ -1,12 +1,7 @@
 <template>
     <div class="left-wrapper">
-        <div class="nb-toparea">
-            <button class="topbtn nb-toparea__leftbtn0" @click="openImport('A')" style="width:160px;">
-                导 入 动 态 数 据
-            </button>
-            <!-- <button class="topbtn nb-toparea__rightbtn0" @click="createmodel()" style="width:260px;">
-                分 析 创 建 案 例 模 型 =》》
-            </button> -->
+        <div style="text-align:left;padding:5px 0;">
+            <el-button type="primary" size="small"  @click="openImport('A')">导 入 动 态 数 据</el-button>
         </div>
         <div class="nb-table nb-table--bgc">
             <el-table 
@@ -18,8 +13,6 @@
                 tooltip-effect="dark" 
                 ref="fileListsTable" 
                 style="width: 100%">
-                    <!-- <el-table-column type="selection"  :reserve-selection="true"  width="50"></el-table-column> -->
-                    <!-- <el-table-column prop="id" class-name="id-key" label="" width="0"></el-table-column> -->
                     <el-table-column prop="count" label="序号" width="80"></el-table-column>
                     <el-table-column prop="filename" label="文件名称" :show-overflow-tooltip="true" min-width="120">
                     </el-table-column>
@@ -27,15 +20,7 @@
                     </el-table-column>
                     <el-table-column prop="uploadDate" label="创建时间" :show-overflow-tooltip="true" min-width="120">
                     </el-table-column>
-                    <el-table-column prop="generatedStr" label="类型" min-width="80">
-                        <template slot-scope="scope">
-                            <el-tag effect="dark" size="mini" 
-                            :type="scope.row.generatedStr === '生成' ? 'primary' : 'success'" 
-                            disable-transitions>
-                                {{scope.row.generatedStr}}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
+                    <el-table-column prop="generatedStr" label="类型" min-width="80"></el-table-column>
                     <el-table-column prop="filename" label="操作" min-width="170">
                         <template slot-scope="scope">
                             <el-button @click="deleteLeftFile(scope.row)" type="success" round size="mini">删除</el-button>

src/modules/createmodel/group/Group.vue

@@ -1,12 +1,7 @@
 <template>
     <div class="left-wrapper">
-        <div class="nb-toparea">
-            <button class="topbtn nb-toparea__leftbtn0" @click="showAddGroup()" style="width:160px;">
-                创 建 分 组
-            </button>
-            <!-- <button class="topbtn nb-toparea__leftbtn1" @click="showAddGroup()" style="width:180px;">
-                批 量 导 入 分 组 
-            </button> -->
+        <div style="text-align:left;padding:5px 0;">
+            <el-button type="primary" size="small"  @click="showAddGroup()">创 建 分 组</el-button>
         </div>
         <div class="nb-table nb-table--bgc">
             <el-table element-loading-text="数据加载中" element-loading-spinner="el-icon-loading"