Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix

jero-web/src/assets/less/common.less

@@ -38,11 +38,15 @@
 }
 /*列表中有图片的加这个样式 参考用户管理*/
 .anty-img-wrap {
-  height: 25px;
+  height: 20px;
   position: relative;
+  .ant-avatar.ant-avatar-icon {
+    font-size: 14px;
+    line-height: 20px;
+  }
   .ant-avatar{
-    width: 24px;
+    width: 20px;
-    height: 24px;
+    height: 20px;
   }
 }
 .anty-img-wrap > img {
@@ -70,7 +74,7 @@
 
 }
 .table-page-search-wrapper .ant-form-inline .ant-form-item{
-  margin-bottom: 4px;
+  margin-bottom: 12px;
 }
 .ant-card-body .table-operator{
   margin-bottom: 4px !important;

jero-web/src/components/jero/modal/JPopupOnlReport.vue

@@ -33,7 +33,7 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
 
             </span>
           </a-col>

jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue

@@ -25,7 +25,7 @@
             <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
           </a>
           <a-button :style="{marginBottom:'12px'}" type="primary" @click="searchQuery" icon="search">查询</a-button>
-          <a-button :style="{marginBottom:'12px'}" type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          <a-button :style="{marginBottom:'12px'}" type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
         </a-form>
 
         <a-table

jero-web/src/components/layouts/RouteView.vue

@@ -38,7 +38,7 @@ export default {
 </script>
 <style>
   .main{
-    height: calc(100% - 100px);
+    height:100%;
     overflow-y: auto;
     overflow-x: hidden;
 

jero-web/src/components/layouts/UserLayout.vue

@@ -2,19 +2,19 @@
   <div id="userLayout" :class="['user-layout-wrapper',device]">
     <div :class="!mobile ? 'container' : 'container-mobile'">
       <div class="top" id="top" v-if="!mobile">
-        <div class="logo">
+<!--        <div class="logo">-->
-          <img id="logo" src="~@/assets/logo.png" alt="">
+<!--          <img id="logo" src="~@/assets/logo.png" alt="">-->
-        </div>
+<!--        </div>-->
-        <div id="company">
+<!--        <div id="company">-->
-          <span id="c-company">合众未来</span>
+<!--          <span id="c-company">合众未来</span>-->
-          <span id="p-company">HEZHONGWEILAI</span>
+<!--          <span id="p-company">HEZHONGWEILAI</span>-->
-        </div>
+<!--        </div>-->
       </div>
       <div v-if="mobile">
         <span class="top-bg"><img src="~/@assets/mobileBg.png" alt=""></span>
         <span class="btm-bg"><img src="~/@assets/mobileHome.png" alt=""></span>
       </div>
-      <div v-if="mobile" class="mobile">
+      <div v-if="mobile" class="mobile" >
         <div class="logo">
           <img src="~@/assets/logo.png" alt="">
         </div>
@@ -23,9 +23,9 @@
           <span>HEZHONGWEILAI</span>
         </div>
       </div>
-      <div class="illustration" v-if="!mobile">
+<!--      <div class="illustration" v-if="!mobile">-->
-        <img src="@/assets/home.png" alt="">
+<!--        <img src="@/assets/home.png" alt="">-->
-      </div>
+<!--      </div>-->
       <route-view></route-view>
     </div>
   </div>

jero-web/src/components/page/GlobalFooter.vue

@@ -8,9 +8,9 @@
       -->
     </div>
     <div class="copyright">
-      Copyright
+      copyright
       <a-icon type="copyright"/>
-      2022 <span></span>
+       2023 hzwl&syxy design center <span></span>
     </div>
   </div>
 </template>

jero-web/src/components/page/GlobalLayout.vue

@@ -727,7 +727,20 @@ export default {
       }
     }
   }
+  //
+  .resetBtn {
+    margin-left: 12px !important;
+  }
+  //表格的样式
   .ant-table-middle > .ant-table-content > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-body > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-tbody > tr > td {
     padding: 9px 8px !important;
   }
+  .ant-table-tbody .ant-table-row td {
+    padding-top: 9px !important;
+    padding-bottom: 9px  !important;
+  }
+  .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+    padding: 9px 16px !important;
+    overflow-wrap: break-word;
+  }
 </style>

jero-web/src/views/demo/JeroDemoList.vue

@@ -46,7 +46,7 @@
               <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
             </a>
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </a-col>
           </span>
         </a-row>

jero-web/src/views/demo/JeroOrderMainList.vue

@@ -23,7 +23,7 @@
           <a-col :md="6" :sm="24" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/demo/JeroOrderMainListForJEditableTable.vue

@@ -23,7 +23,7 @@
           <a-col :md="6" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/demo/TableExpandeSub.vue

@@ -23,7 +23,7 @@
           <a-col :md="6" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/demo/list/PermissionList.vue

@@ -20,7 +20,7 @@
           <a-col :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px">重置</a-button>
+              <a-button class="resetBtn">重置</a-button>
             </span>
           </a-col>
         </a-row>

jero-web/src/views/demo/list/TableInnerEditList.vue

@@ -54,7 +54,7 @@
                 <a-icon :type="advanced ? 'up' : 'down'" />
               </a>
               <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px">重置</a-button>
+              <a-button class="resetBtn">重置</a-button>
             </span>
           </a-col>
         </a-row>

jero-web/src/views/demo/list/TableList.vue

@@ -54,7 +54,7 @@
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
               <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+              <a-button class="resetBtn" @click="resetSearchForm">重置</a-button>
             </span>
           </a-col>
         </a-row>

jero-web/src/views/demo/tablist/JeroOrderDMainList.vue

@@ -23,7 +23,7 @@
           <a-col :md="6" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/modules/message/SysMessageList.vue

@@ -25,7 +25,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
 <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
 <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
 <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->

jero-web/src/views/modules/message/SysMessageTemplateList.vue

@@ -26,7 +26,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
 <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
 <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
 <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->

jero-web/src/views/modules/oss/OSSFileList.vue

@@ -17,7 +17,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
         </a-row>

jero-web/src/views/system/DataLogList.vue

@@ -16,9 +16,9 @@
           </a-col>
 
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-               <a-col :md="6" :sm="24">
+               <a-col :md="6" :sm="8">
                   <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-                  <a-button type="default" style="margin-left: 8px" icon="reload" @click="searchReset">重置</a-button>
+                  <a-button type="default" class="resetBtn" icon="reload" @click="searchReset">重置</a-button>
                </a-col>
             </span>
         </a-row>

jero-web/src/views/system/DictItemList.vue

@@ -37,7 +37,7 @@
               <a-col :md="7" :sm="24">
               <span style="float: left;" class="table-page-search-submitButtons">
                 <a-button type="primary" @click="searchQuery">搜索</a-button>
-                <a-button type="primary" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" @click="searchReset" class="resetBtn">重置</a-button>
               </span>
               </a-col>
             </a-row>

jero-web/src/views/system/DictList.vue

@@ -18,7 +18,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
         </a-row>

jero-web/src/views/system/PermissionDataRuleList.vue

@@ -28,7 +28,7 @@
             <a-col :md="7" :sm="8">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
               </span>
             </a-col>
           </a-row>

jero-web/src/views/system/QuartzJobList.vue

@@ -24,7 +24,7 @@
           <a-col :md="6" :sm="10" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/system/RoleUserList.vue

@@ -24,7 +24,7 @@
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
                <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </a-col>
           </span>
             </a-row>
@@ -107,7 +107,7 @@
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="9" :sm="24">
              <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">查询</a-button>
-              <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset2" icon="reload" class="resetBtn">重置</a-button>
 
             </a-col>
           </span>

jero-web/src/views/system/SysAnnouncementList.vue

@@ -6,15 +6,15 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
 
-          <a-col :span="6">
+          <a-col :md="6" :sm="8">
             <a-form-item label="标题">
               <a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/system/SysCheckRuleList.vue

@@ -21,7 +21,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
 <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
 <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
 <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->

jero-web/src/views/system/SysDataSourceList.vue

@@ -21,7 +21,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/system/SysFillRuleList.vue

@@ -18,7 +18,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
         </a-row>

jero-web/src/views/system/SysUserOnlineList.vue

@@ -12,7 +12,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -49,7 +49,7 @@
 
         <span slot="action" slot-scope="text, record">
           <a-popconfirm title="强制退出用户？" @confirm="() => handleForce(record)">
-            <a-button type="danger">强退</a-button>
+             <a>强退</a>
           </a-popconfirm>
         </span>
 

jero-web/src/views/system/UserAnnouncementList.vue

@@ -5,21 +5,21 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
 
-          <a-col :span="6">
+          <a-col :md="6" :sm="8">
             <a-form-item label="标题">
               <a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :md="6" :sm="8">
             <a-form-item label="发布人">
               <a-input placeholder="请输入发布人" v-model="queryParam.sender"></a-input>
             </a-form-item>
           </a-col>
 
-          <a-col :span="8" >
+          <a-col :md="6" :sm="8" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/system/UserList.vue

@@ -6,7 +6,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
 
-          <a-col :md="6" :sm="12">
+          <a-col :md="6" :sm="8">
             <a-form-item label="账号">
               <j-input placeholder="输入账号模糊查询" v-model="queryParam.username"></j-input>
             </a-form-item>
@@ -79,7 +79,7 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </span>
           </a-col>
 

jero-web/src/views/system/log/OperatorLogList.vue

@@ -11,7 +11,7 @@
             </a-form-item>
           </a-col>
 
-          <a-col :md="6" :sm="10">
+          <a-col :md="6" :sm="8">
             <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
                 style="width: 210px"
@@ -23,18 +23,17 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :md="5" :sm="8">
+          <a-col :md="6" :sm="8">
             <a-form-item label="操作类型" style="left: 10px">
               <j-dict-select-tag v-model="queryParam.operateType" placeholder="请选择操作类型" dictCode="operate_type"/>
             </a-form-item>
           </a-col>
-
+          <a-col :md="6" :sm="8" >
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="24" >
+                  <a-button type="primary"  @click="searchQuery" icon="search">查询</a-button>
-                <a-button type="primary"  style="left: 10px" @click="searchQuery" icon="search">查询</a-button>
+                  <a-button type="default"  @click="searchReset" icon="reload" class='resetBtn'>重置</a-button>
-                <a-button type="default"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
+            </span>
-            </a-col>
+          </a-col>
-          </span>
 
         </a-row>
       </a-form>

jero-web/src/views/system/modules/AddressListRight.vue

@@ -19,7 +19,7 @@
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
              <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </a-col>
           </span>
         </a-row>

jero-web/src/views/system/modules/DeptUserInfo.vue

@@ -13,17 +13,17 @@
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
              <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
-              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
             </a-col>
           </span>
         </a-row>
       </a-form>
     </div>
     <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin-top: -15px">
+    <div class="table-operator" style="">
       <!--<a-button @click="handleEdit" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
       <a-button @click="handleAddUserDepart" type="default" icon="plus">添加已有用户</a-button>
-      <a-button @click="handleAdd" type="default" icon="plus" style="margin-top: 16px">新建用户</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus" >新建用户</a-button>
 
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
@@ -316,6 +316,6 @@ export default {
 
   .table-page-search-wrapper {
     margin-top: -16px;
-    margin-bottom: 16px;
+    /*margin-bottom: 16px;*/
   }
 </style>

jero-web/src/views/system/modules/SelectUserListModal.vue

@@ -58,7 +58,7 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
 
             </span>
           </a-col>

jero-web/src/views/system/modules/SelectUserModal.vue

@@ -22,7 +22,7 @@
             <a-col :span="8">
                     <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-                      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                      <a-button type="primary" @click="searchReset" icon="reload" class="resetBtn">重置</a-button>
                     </span>
             </a-col>
 

jero-web/src/views/user/Login.vue

@@ -1,8 +1,19 @@
 <template>
   <div class="main">
-    <a-form v-if="!mobile" :form="form" class="user-layout-login" ref="formLogin" id="formLogin">
+    <div class="login-box">
+      <div class="login-left">
+        <div class="logo-image">
+<!--          <img src='@/assets/logo.png' alt=''>-->
+<!--          <img src='@/assets/logo_name.png' alt=''>-->
+        </div>
+      </div>
+    <a-form v-if="!mobile" :form="form" class="user-layout-login login-right" ref="formLogin" id="formLogin">
       <div class="user-box">
-        <span class="title">用户登录</span>
+        <span class="title">账号登录</span>
+        <a-row>
+          <a-col :span="3"></a-col>
+          <label class="lable-font">账号</label>
+        </a-row>
         <a-row>
           <a-col :span="3"></a-col>
           <a-col :span="18">
@@ -12,12 +23,15 @@
                 v-decorator="['username',{initialValue:'', rules: validatorRules.username.rules,validateTrigger: 'blur'}]"
                 type="text"
                 placeholder="请输入帐号">
-                <a-icon slot="prefix" type="user" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
               </a-input>
             </a-form-item>
           </a-col>
           <a-col :span="3"></a-col>
         </a-row>
+        <a-row>
+          <a-col :span="3"></a-col>
+          <label class="lable-font">密码</label>
+        </a-row>
         <a-row>
           <a-col :span="3"></a-col>
           <a-col :span="18">
@@ -31,12 +45,16 @@
               >
               <a-icon title="显示密码" @click="passwordType='text'" slot="suffix" v-if="passwordType==='password'" type="eye" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
                <a-icon title="隐藏密码" @click="passwordType='password'" slot="suffix" v-else type="eye-invisible" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
-                <a-icon slot="prefix" type="lock" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+<!--                <a-icon slot="prefix" type="lock" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>-->
               </a-input>
             </a-form-item>
           </a-col>
           <a-col :span="3"></a-col>
         </a-row>
+        <a-row>
+          <a-col :span="3"></a-col>
+          <label class="lable-font">验证码</label>
+        </a-row>
         <a-row style="margin-bottom: 0;">
           <a-col :span="3"></a-col>
           <a-col :span="12">
@@ -48,7 +66,6 @@
                 @change="inputCodeChange"
                 autocomplete="off"
                 placeholder="请输入验证码">
-                <a-icon slot="prefix" type="safety" :style="{ color: '#B3B7C2',fontSize:'20px'}"/>
               </a-input>
             </a-form-item>
           </a-col>
@@ -62,7 +79,7 @@
           <a-col :span="3"></a-col>
           <a-col :span="7">
             <a-form-item>
-              <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>
+              <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">记住用户名密码</a-checkbox>
             </a-form-item>
           </a-col>
           <a-col :span="6"></a-col>
@@ -94,87 +111,7 @@
         </a-row>
       </div>
     </a-form>
-    <a-form v-if="mobile" :form="form" class="user-layout-login user-layout-login-mobile" ref="formLogin" id="formLogin">
+    </div>
-      <div class="user-box user-box-mobile">
-        <a-row>
-          <a-col :span="24">
-            <a-form-item>
-              <a-input
-                size="large"
-                v-decorator="['username',{initialValue:'', rules: validatorRules.username.rules,validateTrigger: 'blur'}]"
-                type="text"
-                placeholder="请输入帐号">
-                <a-icon slot="prefix" type="user" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="24">
-            <a-form-item>
-              <a-input
-                v-decorator="['password',{initialValue:'', rules: validatorRules.password.rules,validateTrigger: 'blur'}]"
-                size="large"
-                type="password"
-                autocomplete="false"
-                placeholder="请输入密码"
-              >
-                <a-icon slot="prefix" type="lock" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="14">
-            <a-form-item>
-              <a-input
-                v-decorator="['inputCode',validatorRules.inputCode]"
-                size="large"
-                type="text"
-                @change="inputCodeChange"
-                placeholder="请输入验证码">
-                <a-icon slot="prefix" type="safety" :style="{ color: '#B3B7C2',fontSize:'20px'}"/>
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="10" style="text-align: right">
-            <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode" alt=""/>
-            <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode" alt=""/>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="10">
-            <a-form-item>
-              <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>
-            </a-form-item>
-          </a-col>
-          <a-col :span="4"></a-col>
-          <a-col :span="9" style="text-align: right;color: #1891FF;">
-<!--            <a-form-item>-->
-<!--              <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
-<!--                忘记密码-->
-<!--              </router-link>-->
-<!--            </a-form-item>-->
-          </a-col>
-        </a-row>
-        <a-row class="login-btn">
-          <a-col :span="24">
-            <a-form-item>
-              <a-button
-                block
-                size="large"
-                type="primary"
-                htmlType="submit"
-                :loading="loginBtn"
-                @click.stop.prevent="handleSubmit"
-                :disabled="loginBtn">
-                {{ loginBtn ? "登录中" : "登录" }}
-              </a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </div>
-    </a-form>
   </div>
 </template>
 <script>
@@ -426,40 +363,133 @@ function isMobile () {
   }
   .main{
     height: 100%;
-    .user-layout-login{
+    overflow: hidden;
-      z-index: 99;
+    background: url(~@/assets/login-bg.png);
-      width: 24%;
+    background-size: cover;
-      height: 56%;
+    .login-box{
-      padding: 3% 0 3% 0;
+      margin:9% auto;
-      min-width: 332px;
+      width: 62%;
-      min-height: 460px;
+      height: 64%;
-      background: #fff;
+      display: flex;
-      border-radius: 20px;
+
-      position: absolute;
+      .login-right,.login-left{
-      right: 8%;
+        width: 50%;
-      top: 50%;
-      transform: translateY(-50%);
-      .user-box{
-        width: 100%;
         height: 100%;
-        overflow: hidden;
+      }
-        display: flex;
+      .login-right{
-        justify-content: space-between;
+        border-top-right-radius: 2%;
-        flex-direction: column;
+        border-bottom-right-radius: 2%;
-        .title{
+      }
-          display: block;
+      .login-left{
-          color: #1891FF;
+        border-top-left-radius: 2%;
-          font-size: 28px;
+        border-bottom-left-radius: 2%;
-          font-weight: 500;
+        background: url(~@/assets/login-left.png);
-          margin: 0 0 5% 0;
+        background-size: cover;
-          text-align: center;
+        .logo-image{
-        }
+          margin: 15px;
-        .login-btn{
+          display: flex;
-          margin-bottom: 0;
+          &>img{
-          font-size: 10px;
+            margin-right:8px;
+          }
         }
       }
     }
+    @media screen and (min-width: 1370px) {
+      .user-layout-login {
+        background-color: #fff;
+        padding: 5% 3%;
+        .user-box{
+          width: 100%;
+          height: 100%;
+          overflow: hidden;
+          display: flex;
+          overflow-y: auto;
+          //justify-content: space-between;
+          flex-direction: column;
+          .lable-font{
+            font-weight: 500;
+            color:#000;
+          }
+          .title{
+            position:relative;
+            display: block;
+            color: #000;
+            font-size: 28px;
+            font-weight: 500;
+            margin: 0 0 3% 0;
+            text-align: center;
+            //&::after{
+            //  content:'';
+            //  position:absolute;
+            //  bottom: -2px;
+            //  left:calc( 50% - 25px);
+            //  width: 50px;
+            //  height: 3px;
+            //  background-color: #0F6FC4;
+            //}
+          }
+          .login-btn{
+            margin-top: 10px;
+            font-size: 10px;
+          }
+          .ant-row{
+            margin-bottom: 10px;
+          }
+        }
+      }
+
+    }
+    @media screen and (max-width: 1366px) {
+      .user-layout-login {
+        background-color: #fff;
+        padding: 4% 3% 0;
+        .user-box{
+          width: 100%;
+          height: 100%;
+          overflow: hidden;
+          display: flex;
+          //justify-content: space-between;
+          flex-direction: column;
+          .lable-font{
+            font-weight: 700;
+            color:#000;
+          }
+          .title{
+            position:relative;
+            display: block;
+            color: #000;
+            font-size: 20px;
+            font-weight: 500;
+            margin: 0 0 5% 0;
+            text-align: center;
+            &::after{
+              content:'';
+              position:absolute;
+              bottom: -2px;
+              left:calc( 50% - 15px);
+              width: 35px;
+              height: 3px;
+              background-color: #0F6FC4;
+            }
+          }
+          .login-btn{
+            margin-top: 2px;
+            font-size: 10px;
+          }
+          .ant-row{
+            margin-bottom: 3px;
+          }
+        }
+      }
+      .input_height {
+        /deep/ .ant-input{
+
+          height: 30px !important;
+        }
+
+      }
+    }
+
     .user-layout-login-mobile{
       right: 0;
       width: 100%;