Explorar o código

员工管理修改完成

1
mo %!s(int64=3) %!d(string=hai) anos
pai
achega
4b28600aae

+ 1 - 0
src/components/Pagination/index.vue

@@ -3,6 +3,7 @@
        class="pagination-container">
        class="pagination-container">
     <!-- :background="background" -->
     <!-- :background="background" -->
     <el-pagination :current-page.sync="currentPage"
     <el-pagination :current-page.sync="currentPage"
+    size="mini"
                    :page-size.sync="pageSize"
                    :page-size.sync="pageSize"
                    :layout="layout"
                    :layout="layout"
                    :page-sizes="pageSizes"
                    :page-sizes="pageSizes"

+ 7 - 4
src/components/select-all/index.vue

@@ -10,6 +10,7 @@
     >
     >
       <div class="showDev"></div>
       <div class="showDev"></div>
     </el-tooltip>
     </el-tooltip>
+
     <div class="select-all">
     <div class="select-all">
       <el-select
       <el-select
         multiple
         multiple
@@ -24,7 +25,7 @@
       >
       >
         <slot />
         <slot />
       </el-select>
       </el-select>
-      <el-button @click="selectAll" class="btn" v-bind="{ ...$attrs }">
+      <el-button @click="selectAll" class="btn" v-bind="{ ...$attrs, ...$props }">
         全选
         全选
       </el-button>
       </el-button>
     </div>
     </div>
@@ -109,6 +110,8 @@ export default {
 
 
 .select-all {
 .select-all {
   display: flex;
   display: flex;
+  flex-direction: row;
+  align-items: center;
   .select {
   .select {
     flex: 1;
     flex: 1;
     /deep/ .el-input__inner {
     /deep/ .el-input__inner {
@@ -118,16 +121,16 @@ export default {
 }
 }
 .btn {
 .btn {
   width: 50px;
   width: 50px;
-  padding: 0 10px;
+  // padding: 0 10px;
   border-left: none;
   border-left: none;
   border-radius: 0 4px 4px 0;
   border-radius: 0 4px 4px 0;
-  height: 40px;
+  // height: 100%;
 }
 }
 .item {
 .item {
   width: 100%;
   width: 100%;
   position: absolute;
   position: absolute;
   z-index: 1000;
   z-index: 1000;
-  height: 40px;
+  // height: 40px;
   .showDev {
   .showDev {
     width: 100%;
     width: 100%;
   }
   }

+ 1 - 1
src/views/categroyManager/insideSetting/modals/handover.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <div v-loading="loading">
+  <div >
     <el-form ref="form" inline :model="form" v-if="!isEmpty">
     <el-form ref="form" inline :model="form" v-if="!isEmpty">
       <template v-for="(item, key) in form">
       <template v-for="(item, key) in form">
         <select-user
         <select-user

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 742 - 519
src/views/categroyManager/insideSetting/staffManager.vue


+ 2 - 2
vue.config.js

@@ -16,10 +16,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000
 // http://47.99.212.176:8000
 // //  https://online.dayaedu.com
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'https://online.dayaedu.com' //线上
-let target = 'http://192.168.3.227:8000' // 何国威
+// let target = 'http://192.168.3.227:8000' // 何国威
 // let target = 'http://192.168.3.124:8000' //邹璇
 // let target = 'http://192.168.3.124:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
 // let target = 'http://192.168.3.112:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134:8000' // 乔
 // let target = 'http://192.168.3.134:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 // All configuration item explanations can be find in https://cli.vuejs.org/config/

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio