From 394e444b3d6f20da250f89a5bc72c8ce782d5528 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 23 三月 2023 17:52:03 +0800
Subject: [PATCH] 账号增加时间限制

---
 src/views/systemSetting/baseSetting/user/components/header/index.vue     |    2 
 src/views/systemSetting/baseSetting/user/components/main/index.vue       | 1091 ++++++++++++++-------------
 src/views/layout/components/Header/index.vue                             |    2 
 src/views/systemSetting/baseSetting/user/components/createUser/index.vue | 1259 ++++++++++++++++--------------
 4 files changed, 1,245 insertions(+), 1,109 deletions(-)

diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index 2318040..685859d 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -228,7 +228,7 @@
             break;
           }
         }
-        console.log(that.menuLinkLists)
+        // console.log(that.menuLinkLists)
         // this.menuLinkList = res
 
       });
diff --git a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
index 2009dba..f4ac4fc 100644
--- a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
@@ -1,607 +1,706 @@
 <template>
-  <div class="createUser">
-    <main>
-      <div class="mainContent">
-        <el-form
-          ref="user"
-          label-width="140px"
-          autoComplete="on"
-          :model="user"
-          :rules="createUserRules"
-          label-position="right"
-        >
-          <!-- 鐢ㄦ埛鍚嶇О -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItem"
-                label="鐢ㄦ埛鍚嶇О:"
-                prop="username"
-              >
-                <el-input
-                  v-model="user.username"
-                  placeholder="濉啓鐢ㄦ埛鍚嶇О"
-                  autoComplete="new-username"
+    <div class="createUser">
+        <main>
+            <div class="mainContent">
+                <el-form
+                    ref="user"
+                    label-width="140px"
+                    autoComplete="on"
+                    :model="user"
+                    :rules="createUserRules"
+                    label-position="right"
                 >
-                </el-input>
-              </el-form-item>
+                    <!-- 鐢ㄦ埛鍚嶇О -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="鐢ㄦ埛鍚嶇О:"
+                                prop="username"
+                            >
+                                <el-input
+                                    v-model="user.username"
+                                    placeholder="濉啓鐢ㄦ埛鍚嶇О"
+                                    autoComplete="new-username"
+                                >
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 鐢ㄦ埛瀵嗙爜 -->
+                    <div v-if="!user.id" class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItems"
+                                label="鐢ㄦ埛瀵嗙爜:"
+                                prop="password"
+                            >
+                                <el-input
+                                    v-model="user.password"
+                                    type="password"
+                                    autoComplete="new-password"
+                                    placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"
+                                ></el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                        <!-- 閲嶆柊杈撳叆瀵嗙爜鍗充负淇敼锛屽瘑鐮佹湁鏁堟湡榛樿涓�3涓湀 -->
+                    </div>
+                    <!-- 鎵�灞炵敤鎴峰鍚� -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="鎵�灞炵敤鎴峰鍚�:"
+                                prop="nickName"
+                            >
+                                <el-input
+                                    v-model="user.nickName"
+                                    placeholder="璇峰～鍐欑敤鎴峰鍚�"
+                                ></el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 鎬у埆 -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="鎬у埆:"
+                                prop="sex"
+                            >
+                                <el-radio-group v-model="user.sex">
+                                    <el-radio :label="1">鐢�</el-radio>
+                                    <el-radio :label="0">濂�</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 鏄惁鍏氬憳 -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="鏄惁鍏氬憳:"
+                                prop="isDy"
+                            >
+                                <el-radio-group v-model="user.isDy">
+                                    <el-radio :label="1">鏄�</el-radio>
+                                    <el-radio :label="0">鍚�</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 鎵�灞炴墜鏈哄彿鐮� -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="鎵�灞炴墜鏈哄彿鐮�:"
+                                prop="mobile"
+                            >
+                                <el-input
+                                    v-model="user.mobile"
+                                    maxlength="11"
+                                    placeholder="璇峰～鍐欐墜鏈哄彿鐮�"
+                                ></el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 閭鍦板潃 -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="閭鍦板潃:"
+                                prop="email"
+                            >
+                                <el-input
+                                    v-model="user.email"
+                                    placeholder="璇峰～鍐欓偖绠卞湴鍧�"
+                                ></el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 閫夋嫨瑙掕壊 -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="閫夋嫨瑙掕壊:"
+                                prop="role"
+                            >
+                                <el-select
+                                    v-model="user.role"
+                                    placeholder="璇烽�夋嫨鎵�灞炶鑹�"
+                                    multiple
+                                    collapse-tags
+                                >
+                                    <el-option
+                                        v-for="item in roleList"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id"
+                                    >
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 鐢ㄦ埛绫诲瀷 -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="鐢ㄦ埛绫诲瀷:"
+                                prop="userType"
+                            >
+                                <el-select
+                                    v-model="user.userType"
+                                    placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷"
+                                >
+                                    <el-option
+                                        v-for="item in typeList"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id"
+                                    >
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 搴ф満/鍒嗘満 -->
+                    <div class="user-item sp-item">
+                        <div class="item-left">
+                            <el-form-item label="搴ф満/鍒嗘満:" prop="zjarea">
+                                <el-input
+                                    v-model="user.zjarea"
+                                    placeholder="鐢佃瘽鍖哄彿"
+                                >
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item prop="zjnumber" class="left-px">
+                                <el-input
+                                    v-model="user.zjnumber"
+                                    placeholder="鐢佃瘽鍙风爜"
+                                >
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item prop="zjother" class="left-px">
+                                <el-input
+                                    v-model="user.zjother"
+                                    placeholder="鍒嗘満鍙风爜"
+                                >
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 鎵�灞為儴闂� -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="鎵�灞為儴闂�:"
+                                prop="departmentId"
+                            >
+                                <departTree
+                                    :depart="userDepart"
+                                    @selectDepart="selectDepart"
+                                ></departTree>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 褰撳墠鑱屽姟 -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="褰撳墠鑱屽姟:"
+                                prop="jobTitle"
+                            >
+                                <el-input
+                                    v-model="user.jobTitle"
+                                    placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�"
+                                ></el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="濉啓鎵�灞瀖ac鍦板潃:"
+                                prop="mac"
+                            >
+                                <el-input
+                                    v-model="user.mac"
+                                    placeholder="璇峰～鍐欐墍灞瀖ac鍦板潃"
+                                ></el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <!-- 濉啓鎵�灞瀒p鍦板潃 -->
+                    <div class="user-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="濉啓鎵�灞瀒p鍦板潃:"
+                                prop="ip"
+                            >
+                                <el-input
+                                    v-model="user.ip"
+                                    placeholder="璇峰～鍐欐墍灞瀒p鍦板潃"
+                                ></el-input>
+                            </el-form-item>
+                        </div>
+                        <div class="item-right"></div>
+                    </div>
+                    <div class="user-item sp-item">
+                        <div class="item-left">
+                            <el-form-item
+                                class="optionItem"
+                                label="璐﹀彿鏈夋晥鏈�:"
+                                prop="days"
+                            >
+                                <el-input
+                                    v-model="user.days"
+                                    placeholder="璇峰～鍐欒处鍙锋湁鏁堟湡澶╂暟"
+                                ></el-input>
+                            </el-form-item>
+
+                            <el-form-item class="left-px">
+                                <span
+                                    style="
+                                        margin: 0 20px 0 10px;
+                                        font-size: 18px;
+                                    "
+                                    >澶�</span
+                                >
+                            </el-form-item>
+
+                            <el-form-item class="left-px">
+                                <el-checkbox
+                                    label="闀挎湡"
+                                    v-model="user.dayCheck"
+                                    @change="dayaCheck"
+                                ></el-checkbox>
+                            </el-form-item>
+                        </div>
+                        <!-- <div class="item-left">
+                            <el-form-item label="搴ф満/鍒嗘満:" prop="zjarea">
+                                <el-input
+                                    v-model="user.zjarea"
+                                    placeholder="鐢佃瘽鍖哄彿"
+                                >
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item prop="zjother" class="left-px">
+                                <el-input
+                                    v-model="user.zjother"
+                                    placeholder="鍒嗘満鍙风爜"
+                                >
+                                </el-input>
+                            </el-form-item>
+                        </div> -->
+                        <div class="item-right"></div>
+                    </div>
+                    <el-form-item>
+                        <div class="optionBtn">
+                            <el-button
+                                type="primary"
+                                class="btn submit"
+                                @click.native.prevent="handleUser"
+                                >鎻愪氦
+                            </el-button>
+                            <el-button
+                                class="btn reset"
+                                @click.native.prevent="resetForm"
+                                >閲嶇疆</el-button
+                            >
+                        </div>
+                    </el-form-item>
+                </el-form>
             </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 鐢ㄦ埛瀵嗙爜 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItems"
-                label="鐢ㄦ埛瀵嗙爜:"
-                prop="password"
-              >
-                <el-input
-                  v-model="user.password"
-                  type="password"
-                  autoComplete="new-password"
-                  placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"
-                ></el-input>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-            <!-- 閲嶆柊杈撳叆瀵嗙爜鍗充负淇敼锛屽瘑鐮佹湁鏁堟湡榛樿涓�3涓湀 -->
-          </div>
-          <!-- 鎵�灞炵敤鎴峰鍚� -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItem"
-                label="鎵�灞炵敤鎴峰鍚�:"
-                prop="nickName"
-              >
-                <el-input
-                  v-model="user.nickName"
-                  placeholder="璇峰～鍐欑敤鎴峰鍚�"
-                ></el-input>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 鎬у埆 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item class="optionItem" label="鎬у埆:" prop="sex">
-                <el-radio-group v-model="user.sex">
-                  <el-radio :label="1">鐢�</el-radio>
-                  <el-radio :label="0">濂�</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 鏄惁鍏氬憳 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
-                <el-radio-group v-model="user.isDy">
-                  <el-radio :label="1">鏄�</el-radio>
-                  <el-radio :label="0">鍚�</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 鎵�灞炴墜鏈哄彿鐮� -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItem"
-                label="鎵�灞炴墜鏈哄彿鐮�:"
-                prop="mobile"
-              >
-                <el-input
-                  v-model="user.mobile"
-                  maxlength="11"
-                  placeholder="璇峰～鍐欐墜鏈哄彿鐮�"
-                ></el-input>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 閭鍦板潃 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
-                <el-input
-                  v-model="user.email"
-                  placeholder="璇峰～鍐欓偖绠卞湴鍧�"
-                ></el-input>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 閫夋嫨瑙掕壊 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
-                <el-select
-                  v-model="user.role"
-                  placeholder="璇烽�夋嫨鎵�灞炶鑹�"
-                  multiple
-                  collapse-tags
-                >
-                  <el-option
-                    v-for="item in roleList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 鐢ㄦ埛绫诲瀷 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItem"
-                label="鐢ㄦ埛绫诲瀷:"
-                prop="userType"
-              >
-                <el-select v-model="user.userType" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
-                  <el-option
-                    v-for="item in typeList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 搴ф満/鍒嗘満 -->
-          <div class="user-item sp-item">
-            <div class="item-left">
-              <el-form-item label="搴ф満/鍒嗘満:" prop="zjarea">
-                <el-input v-model="user.zjarea" placeholder="鐢佃瘽鍖哄彿">
-                </el-input>
-              </el-form-item>
-              <el-form-item prop="zjnumber" class="left-px">
-                <el-input v-model="user.zjnumber" placeholder="鐢佃瘽鍙风爜">
-                </el-input>
-              </el-form-item>
-              <el-form-item prop="zjother" class="left-px">
-                <el-input v-model="user.zjother" placeholder="鍒嗘満鍙风爜">
-                </el-input>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 鎵�灞為儴闂� -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItem"
-                label="鎵�灞為儴闂�:"
-                prop="departmentId"
-              >
-                <departTree
-                  :depart="userDepart"
-                  @selectDepart="selectDepart"
-                ></departTree>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 褰撳墠鑱屽姟 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItem"
-                label="褰撳墠鑱屽姟:"
-                prop="jobTitle"
-              >
-                <el-input
-                  v-model="user.jobTitle"
-                  placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�"
-                ></el-input>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItem"
-                label="濉啓鎵�灞瀖ac鍦板潃:"
-                prop="mac"
-              >
-                <el-input
-                  v-model="user.mac"
-                  placeholder="璇峰～鍐欐墍灞瀖ac鍦板潃"
-                ></el-input>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <!-- 濉啓鎵�灞瀒p鍦板潃 -->
-          <div class="user-item">
-            <div class="item-left">
-              <el-form-item
-                class="optionItem"
-                label="濉啓鎵�灞瀒p鍦板潃:"
-                prop="ip"
-              >
-                <el-input
-                  v-model="user.ip"
-                  placeholder="璇峰～鍐欐墍灞瀒p鍦板潃"
-                ></el-input>
-              </el-form-item>
-            </div>
-            <div class="item-right"></div>
-          </div>
-          <el-form-item>
-            <div class="optionBtn">
-              <el-button
-                type="primary"
-                class="btn submit"
-                @click.native.prevent="handleUser"
-                >鎻愪氦
-              </el-button>
-              <el-button class="btn reset" @click.native.prevent="resetForm"
-                >閲嶇疆</el-button
-              >
-            </div>
-          </el-form-item>
-        </el-form>
-      </div>
-    </main>
-  </div>
+        </main>
+    </div>
 </template>
 <script>
 import { getTypeList } from "@/utils/helper";
 import departTree from "@/components/departTree/index.vue";
 export default {
-  components: {
-    departTree,
-  },
-  data() {
-    const validateNickname = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("鎵�灞炲鍚嶄笉鑳戒负绌�"));
-      } else {
-        callback();
-      }
-    };
-    const validatePass = (rule, value, callback) => {
-      //蹇呴』鍖呭惈瀛楁瘝銆佹暟瀛椼�侀暱搴﹀啀6-16浣嶄箣闂�
-      var rep = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$/;
-      if (!rep.test(value)) {
-        callback(
-          new Error(
-            "瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝澶у啓鍜屽瓧姣嶅皬鍐欏拰蹇呴』鍖呭惈鏁板瓧锛屼笉鑳藉寘鍚┖鏍�"
-          )
-        );
-      } else {
-        callback();
-      }
+    components: {
+        departTree,
+    },
+    data() {
+        const validateNickname = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error("鎵�灞炲鍚嶄笉鑳戒负绌�"));
+            } else {
+                callback();
+            }
+        };
+        const validatePass = (rule, value, callback) => {
+            //蹇呴』鍖呭惈瀛楁瘝銆佹暟瀛椼�侀暱搴﹀啀6-16浣嶄箣闂�
+            var rep = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$/;
+            if (!rep.test(value)) {
+                callback(
+                    new Error(
+                        "瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝澶у啓鍜屽瓧姣嶅皬鍐欏拰蹇呴』鍖呭惈鏁板瓧锛屼笉鑳藉寘鍚┖鏍�"
+                    )
+                );
+            } else {
+                callback();
+            }
 
-      // if (!value) {
-      //     callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖"));
-      // } else {
-      //     if (value.length < 6 || value.length > 16){
-      //         callback(new Error("鐢ㄦ埛瀵嗙爜闀垮害涓嶅悎娉�"));
-      //     }else {
-      //         const rep = /^\w+$/;
-      //         if (!rep.test(value)) {
-      //             callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
-      //         } else {
-      //             callback();
-      //         }
-      //     }
-      // }
-    };
-    const validateTruename = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("鐢ㄦ埛濮撳悕涓嶈兘涓虹┖"));
-      } else {
-        callback();
-      }
-    };
-    const validatePhone = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("鎵嬫満鍙风爜涓嶈兘涓虹┖"));
-      } else {
-        const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
-        if (!rep.test(value)) {
-          callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
-        } else {
-          callback();
+            // if (!value) {
+            //     callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖"));
+            // } else {
+            //     if (value.length < 6 || value.length > 16){
+            //         callback(new Error("鐢ㄦ埛瀵嗙爜闀垮害涓嶅悎娉�"));
+            //     }else {
+            //         const rep = /^\w+$/;
+            //         if (!rep.test(value)) {
+            //             callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
+            //         } else {
+            //             callback();
+            //         }
+            //     }
+            // }
+        };
+        const validateTruename = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error("鐢ㄦ埛濮撳悕涓嶈兘涓虹┖"));
+            } else {
+                callback();
+            }
+        };
+        const validatePhone = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error("鎵嬫満鍙风爜涓嶈兘涓虹┖"));
+            } else {
+                const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
+                if (!rep.test(value)) {
+                    callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
+                } else {
+                    callback();
+                }
+            }
+        };
+        const validateMail = (rule, value, callback) => {
+            if (value) {
+                const rep =
+                    /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
+                if (!rep.test(value)) {
+                    callback(new Error("璇疯緭鍏ユ纭殑閭"));
+                } else {
+                    callback();
+                }
+            } else {
+                callback();
+            }
+        };
+        const validateRole = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error("鎵�灞炶鑹蹭笉鑳戒负绌�"));
+            } else {
+                callback();
+            }
+        };
+        const validateType = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖"));
+            } else {
+                callback();
+            }
+        };
+        const validateDepartment = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error("璇烽�夋嫨鐢ㄦ埛閮ㄩ棬"));
+            } else {
+                callback();
+            }
+        };
+        const validateWork = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error("鐢ㄦ埛褰撳墠鑱屽姟涓嶈兘涓虹┖"));
+            } else {
+                callback();
+            }
+        };
+        const validateMac = (rule, value, callback) => {
+            if (value) {
+                callback();
+            } else {
+                callback();
+            }
+        };
+        const validateIp = (rule, value, callback) => {
+            if (value) {
+                callback();
+            } else {
+                callback();
+            }
+        };
+        return {
+            user: {
+                nickName: "",
+                password: "",
+                username: "",
+                sex: 1,
+                isDy: 0,
+                mobile: "",
+                email: "",
+                role: null,
+                userType: null,
+                zjarea: "",
+                zjnumber: "",
+                zjother: "",
+                departmentId: null,
+                jobTitle: null,
+                mac: "",
+                ip: "",
+            },
+            userDepart: {},
+            createUserRules: {
+                nickName: [
+                    { required: true, trigger: "blur", validator: validateNickname },
+                ],
+                password: [
+                    { required: true, trigger: "blur", validator: validatePass },
+                ],
+                username: [
+                    { required: true, trigger: "blur", validator: validateTruename },
+                ],
+                sex: [{ required: true, trigger: "blur" }],
+                isDy: [{ required: true, trigger: "blur" }],
+                mobile: [{ required: true, trigger: "blur", validator: validatePhone }],
+                email: [{ required: true, trigger: "blur", validator: validateMail }],
+                role: [{ required: true, trigger: "change", validator: validateRole }],
+                userType: [
+                    { required: true, trigger: "change", validator: validateType },
+                ],
+                zj: [{ required: false, trigger: "blur" }],
+                departmentId: [
+                    { required: true, trigger: "change", validator: validateDepartment },
+                ],
+                jobTitle: [
+                    { required: true, trigger: "blur", validator: validateWork },
+                ],
+                mac: [{ required: false, trigger: "blur", validator: validateMac }],
+                ip: [{ required: false, trigger: "blur", validator: validateIp }],
+            },
+            roleList: [],
+            typeList: [],
+            departList: [],
+            mylabel: "",
+            defaultProps: {
+                children: "children",
+                label: "departName",
+                disabled: (data, node) => {
+                    if (node.level === 1 && node.childNodes.length !== 0) {
+                        return !data.leaf;
+                    }
+                },
+            },
+        };
+    },
+    created() {
+        // 鑾峰彇瑙掕壊鍒楄〃
+        this.getRoleList();
+        // 鑾峰彇鐢ㄦ埛绫诲瀷
+        this.getUserTypeList();
+        if (this.userInfo) {
+            this.user = this.userInfo
+
+            this.user.role = this.userInfo.roles.map(o => o.id)
+
+            if (this.userInfo.depart && this.userInfo.depart.length > 0) {
+                this.userDepart = this.userInfo.depart[this.userInfo.depart.length - 1]
+                this.user.departmentId = this.userInfo.depart[this.userInfo.depart.length - 1].id
+            }
+            if (!this.userInfo.expirationDate || this.userInfo.expirationDate == '2199-12-31') {
+                this.userInfo.dayCheck = true
+            }
         }
-      }
-    };
-    const validateMail = (rule, value, callback) => {
-      if (value) {
-        const rep =
-          /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
-        if (!rep.test(value)) {
-          callback(new Error("璇疯緭鍏ユ纭殑閭"));
-        } else {
-          callback();
-        }
-      } else {
-        callback();
-      }
-    };
-    const validateRole = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("鎵�灞炶鑹蹭笉鑳戒负绌�"));
-      } else {
-        callback();
-      }
-    };
-    const validateType = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖"));
-      } else {
-        callback();
-      }
-    };
-    const validateDepartment = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("璇烽�夋嫨鐢ㄦ埛閮ㄩ棬"));
-      } else {
-        callback();
-      }
-    };
-    const validateWork = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("鐢ㄦ埛褰撳墠鑱屽姟涓嶈兘涓虹┖"));
-      } else {
-        callback();
-      }
-    };
-    const validateMac = (rule, value, callback) => {
-      if (value) {
-        callback();
-      } else {
-        callback();
-      }
-    };
-    const validateIp = (rule, value, callback) => {
-      if (value) {
-        callback();
-      } else {
-        callback();
-      }
-    };
-    return {
-      user: {
-        nickName: "",
-        password: "",
-        username: "",
-        sex: 1,
-        isDy: 0,
-        mobile: "",
-        email: "",
-        role: null,
-        userType: null,
-        zjarea: "",
-        zjnumber: "",
-        zjother: "",
-        departmentId: null,
-        jobTitle: null,
-        mac: "",
-        ip: "",
-      },      
-      userDepart: {},
-      createUserRules: {
-        nickName: [
-          { required: true, trigger: "blur", validator: validateNickname },
-        ],
-        password: [
-          { required: true, trigger: "blur", validator: validatePass },
-        ],
-        username: [
-          { required: true, trigger: "blur", validator: validateTruename },
-        ],
-        sex: [{ required: true, trigger: "blur" }],
-        isDy: [{ required: true, trigger: "blur" }],
-        mobile: [{ required: true, trigger: "blur", validator: validatePhone }],
-        email: [{ required: true, trigger: "blur", validator: validateMail }],
-        role: [{ required: true, trigger: "change", validator: validateRole }],
-        userType: [
-          { required: true, trigger: "change", validator: validateType },
-        ],
-        zj: [{ required: false, trigger: "blur" }],
-        departmentId: [
-          { required: true, trigger: "change", validator: validateDepartment },
-        ],
-        jobTitle: [
-          { required: true, trigger: "blur", validator: validateWork },
-        ],
-        mac: [{ required: false, trigger: "blur", validator: validateMac }],
-        ip: [{ required: false, trigger: "blur", validator: validateIp }],
-      },
-      roleList: [],
-      typeList: [],
-      departList: [],
-      mylabel: "",
-      defaultProps: {
-        children: "children",
-        label: "departName",
-        disabled: (data, node) => {
-          if (node.level === 1 && node.childNodes.length !== 0) {
-            return !data.leaf;
-          }
-        },
-      },
-    };
-  },
-  created() {
-    // 鑾峰彇瑙掕壊鍒楄〃
-    this.getRoleList();
-    // 鑾峰彇鐢ㄦ埛绫诲瀷
-    this.getUserTypeList();
-  },
-  methods: {
-    // 鎻愪氦娉ㄥ唽
-    handleUser() {
-      this.$refs["user"].validate((valid) => {
-        console.log(valid);
-        if (valid) {
-          const { user } = this;
-          console.log(user);
-          this.$axios
-            .post("sccg/admin/register", {
-              departmentId: user.departmentId,
-              email: user.email,
-              icon: "",
-              isDy: `${user.isDy}`,
-              jobTitle: user.jobTitle,
-              mobile: user.mobile,
-              note: "",
-              roleIds: user.role,
-              // nickName: user.nickName,
-              sex: `${user.sex}`,
-              password: user.password,
-              userType: user.userType,
-              username: user.username,
-              zj: user.zjarea + `${user.zjnumber}` + user.zjother,
-              nickName: user.nickName,
-              // departName:user.departName,
-            })
-            .then((res) => {
-              if (res.code === 200) {
-                console.log(1);
-                this.$message({
-                  type: "success",
-                  message: res.message,
-                });
-                this.$emit("sendDialog", { flag: false });
-              } else if (res.code === 500 && res.message === "鎿嶄綔澶辫触") {
-                this.$message({
-                  type: "warning",
-                  message: "璇ョ敤鎴峰凡娉ㄥ唽",
-                });
-              } else {
-                this.$message({
-                  type: "warning",
-                  message: res.message,
-                });
-              }
+    },
+    methods: {
+        // 鎻愪氦娉ㄥ唽
+        handleUser() {
+            this.$refs["user"].validate((valid) => {
+                if (valid) {
+                    const { user } = this;
+                    console.log(user);
+                    this.$axios
+                        .post("sccg/admin/register", {
+                            id: user.id,
+                            departmentId: user.departmentId,
+                            email: user.email,
+                            icon: "",
+                            isDy: `${user.isDy}`,
+                            jobTitle: user.jobTitle,
+                            mobile: user.mobile,
+                            note: "",
+                            roleIds: user.role,
+                            // nickName: user.nickName,
+                            sex: `${user.sex}`,
+                            password: user.password,
+                            userType: user.userType,
+                            username: user.username,
+                            zj: user.zjarea + `${user.zjnumber}` + user.zjother,
+                            nickName: user.nickName,
+                            days: user.days
+                            // departName:user.departName,
+                        })
+                        .then((res) => {
+                            if (res.code === 200) {
+                                console.log(1);
+                                this.$message({
+                                    type: "success",
+                                    message: res.message,
+                                });
+                                this.$emit("sendDialog", { flag: false });
+                            } else if (res.code === 500 && res.message === "鎿嶄綔澶辫触") {
+                                this.$message({
+                                    type: "warning",
+                                    message: "璇ョ敤鎴峰凡娉ㄥ唽",
+                                });
+                            } else {
+                                this.$message({
+                                    type: "warning",
+                                    message: res.message,
+                                });
+                            }
+                        });
+                } else {
+                    return false;
+                }
             });
-        } else {
-          return false;
-        }
-      });
+        },
+        // 鑾峰彇瑙掕壊鍒楄〃
+        getRoleList() {
+            this.$axios({
+                method: "get",
+                url: "sccg/role/listAll",
+            }).then((res) => {
+                this.roleList = res.data;
+            });
+        },
+        dayaCheck(e) {
+            if (e) {
+                this.user.days = null
+            }
+            this.user.dayCheck = e
+        },
+        // 閲嶇疆琛ㄥ崟
+        resetForm() {
+            this.$refs["user"].resetFields();
+        },
+        // 鑾峰緱閮ㄩ棬鍚嶇О
+        getDepartName(data) {
+            this.departList.forEach((item) => {
+                if (item.id === data) {
+                    this.user.departName = item.departName;
+                }
+            });
+        },
+        // 鑾峰彇鐢ㄦ埛绫诲瀷
+        async getUserTypeList() {
+            this.typeList = await getTypeList(1, "07");
+        },
+        selectDepart(depart) {
+            if (depart) {
+                this.user.departmentId = depart.departId;
+                this.user.departName = depart.departName;
+            }
+        },
     },
-    // 鑾峰彇瑙掕壊鍒楄〃
-    getRoleList() {
-      this.$axios({
-        method: "get",
-        url: "sccg/role/listAll",
-      }).then((res) => {
-        this.roleList = res.data;
-      });
-    },
-    // 閲嶇疆琛ㄥ崟
-    resetForm() {
-      this.$refs["user"].resetFields();
-    },
-    // 鑾峰緱閮ㄩ棬鍚嶇О
-    getDepartName(data) {
-      this.departList.forEach((item) => {
-        if (item.id === data) {
-          this.user.departName = item.departName;
-        }
-      });
-    },
-    // 鑾峰彇鐢ㄦ埛绫诲瀷
-    async getUserTypeList() {
-      this.typeList = await getTypeList(1, "07");
-    },
-    selectDepart(depart) {
-      if (depart) {
-        this.user.departmentId = depart.departId;
-        this.user.departName = depart.departName;
-      }
-    },
-  },
-  props: ["sendDialog"],
+    props: ["sendDialog", "userInfo"],
 };
 </script>
 <style lang="scss" scoped>
 .createUser {
-  border-radius: 1px;
-  // background-color: #09152f;
-
-  main {
-    text-align: left;
-    padding: 0 55px;
+    border-radius: 1px;
     // background-color: #09152f;
-    padding-bottom: 50px;
-    padding-top: 20px;
 
-    .mainContent {
-      display: flex;
-      justify-content: center;
-      margin-top: 50px;
-      width: 100%;
-      // &::v-deep .el-form-item__label {
-      //   color: #4b9bb7;
-      // }
+    main {
+        text-align: left;
+        padding: 0 55px;
+        // background-color: #09152f;
+        padding-bottom: 50px;
+        padding-top: 20px;
 
-      // &::v-deep .el-input__inner {
-      //   background-color: #09152f;
-      //   border: 1px solid #17324c;
-      // }
+        .mainContent {
+            display: flex;
+            justify-content: center;
+            margin-top: 50px;
+            width: 100%;
+            // &::v-deep .el-form-item__label {
+            //   color: #4b9bb7;
+            // }
 
-      .el-form-item__content {
-        width: 400px;
-        .el-select {
-          width: 100%;
+            // &::v-deep .el-input__inner {
+            //   background-color: #09152f;
+            //   border: 1px solid #17324c;
+            // }
+
+            .el-form-item__content {
+                width: 400px;
+                .el-select {
+                    width: 100%;
+                }
+            }
+
+            .sp-item {
+                .item-left {
+                    display: flex;
+                }
+            }
+
+            .user-item {
+                display: flex;
+                justify-content: space-between;
+                .item-left {
+                    width: 500px;
+                }
+                .item-right {
+                    line-height: 40px;
+                    color: #4b9bb7;
+                    font-size: 12px;
+                    // margin-left: 16px;
+                }
+
+                .left-px :deep(.el-form-item__content) {
+                    margin-left: 0px !important;
+                }
+            }
+
+            .optionBtn {
+                display: flex;
+                margin-top: 20px;
+
+                .btn {
+                    padding: 12px 50px;
+                }
+            }
         }
-      }
-
-      .sp-item {
-        .item-left {
-          display: flex;
-        }
-      }
-
-      .user-item {
-        display: flex;
-        justify-content: space-between;
-        .item-left {
-          width: 500px;
-        }
-        .item-right {
-          line-height: 40px;
-          color: #4b9bb7;
-          font-size: 12px;
-          // margin-left: 16px;
-        }
-
-        .left-px :deep(.el-form-item__content) {
-          margin-left: 0px !important;
-        }
-      }
-
-      .optionBtn {
-        display: flex;
-        margin-top: 20px;
-
-        .btn {
-          padding: 12px 50px;
-        }
-      }
     }
-  }
 }
 
 ::v-deep .el-form-item__error {
-  width: 608px;
+    width: 608px;
 }
 </style>
diff --git a/src/views/systemSetting/baseSetting/user/components/header/index.vue b/src/views/systemSetting/baseSetting/user/components/header/index.vue
index 4a6129a..91b8b73 100644
--- a/src/views/systemSetting/baseSetting/user/components/header/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/header/index.vue
@@ -6,7 +6,7 @@
                 <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="search"></el-input>
                 <div class="findBtn">
                     <el-button class="find-Btn" type="primary" @click="setSearch">鏌ヨ</el-button>
-                  <el-upload
+                  <el-upload style="margin-top: -5px;"
                       class="department-margin-left10"
                       action=""
                       ref="uploadFile"
diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue
index dc18c42..edbbfbe 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -1,559 +1,596 @@
 <template>
-  <main>
-    <div class="mainContent">
-      <!-- 鏁版嵁灞曠ず -->
-      <el-table
-        border
-        stripe
-        ref="multipleTable"
-        :header-cell-style="{
-          background: '#F5F5F5',
-          'font-size': '14px',
-          'font-weight': '650',
-          'line-height': '45px',
-        }"
-        :data="tableData"
-        style="width: 100%"
-        :row-class-name="tableRowClassName"
-        @selection-change="tableChange"
-      >
-        <el-table-column type="selection" min-width="5"> </el-table-column>
-        <el-table-column label="鐢ㄦ埛ID" min-width="6">
-          <template slot-scope="scope">{{ scope.row.id }}</template>
-        </el-table-column>
-        <el-table-column prop="nickName" label="鐢ㄦ埛鍚嶇О" min-width="8">
-        </el-table-column>
-        <el-table-column prop="username" label="鎵�灞炲鍚�" min-width="6">
-        </el-table-column>
-        <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
-        </el-table-column>
-        <el-table-column prop="note" label="鎵�灞炶鑹�" min-width="10">
-          <template slot-scope="scope">
-            <span>{{ filterRole(scope.row.roles) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="departName" label="鎵�灞為儴闂�" min-width="10">
-          <template slot-scope="scope">
-            <span>{{ filterDepart(scope.row.depart) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="jobTitle" label="鎵�灞炶亴鍔�" min-width="8">
-        </el-table-column>
-        <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
-          <template slot-scope="scope">
-            <span>{{ changeTime(scope.row) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="status" label="鍚敤" min-width="5">
-          <template slot-scope="scope">
-            <!-- @change="handleChangeStatus(scope.row)" -->
-            <el-switch
-              class="switchStyle"
-              v-model="scope.row.status"
-              active-color="#3fef9a"
-              inactive-color="#000212"
-              disabled
+    <main>
+        <div class="mainContent">
+            <!-- 鏁版嵁灞曠ず -->
+            <el-table
+                border
+                stripe
+                ref="multipleTable"
+                :header-cell-style="{
+                    background: '#F5F5F5',
+                    'font-size': '14px',
+                    'font-weight': '650',
+                    'line-height': '45px'
+                }"
+                :data="tableData"
+                style="width: 100%"
+                :row-class-name="tableRowClassName"
+                @selection-change="tableChange"
             >
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
-          <template slot-scope="scope">
-            <div class="operation">
-              <span @click="handleChangeRole(scope.row, 'role')">淇敼瑙掕壊</span>
-              <span class="line">|</span>
-              <span @click="handleFind(scope.row)">鏌ョ湅</span>
-              <span class="line">|</span>
-              <span @click="handleChangeRole(scope.row, 'password')"
-                >淇敼瀵嗙爜</span
-              >
-              <span class="line">|</span>
-              <span @click="handleDelete(scope.row)">鍒犻櫎</span>
-              <span class="line">|</span>
-              <span @click="handleChangeRole(scope.row, 'depart')"
-                >淇敼閮ㄩ棬</span
-              >
-              <span class="line">|</span>
-              <span @click="handleChangeStatus(scope.row)">{{
-                scope.row.status === true ? "鍋滅敤" : "鍚敤"
-              }}</span>
+                <el-table-column type="selection" min-width="5">
+                </el-table-column>
+                <el-table-column label="鐢ㄦ埛ID" min-width="6">
+                    <template slot-scope="scope">{{ scope.row.id }}</template>
+                </el-table-column>
+                <el-table-column prop="nickName" label="鐢ㄦ埛鍚嶇О" min-width="8">
+                </el-table-column>
+                <el-table-column prop="username" label="鎵�灞炲鍚�" min-width="6">
+                </el-table-column>
+                <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
+                </el-table-column>
+                <el-table-column prop="note" label="鎵�灞炶鑹�" min-width="10">
+                    <template slot-scope="scope">
+                        <span>{{ filterRole(scope.row.roles) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    prop="departName"
+                    label="鎵�灞為儴闂�"
+                    min-width="10"
+                >
+                    <template slot-scope="scope">
+                        <span>{{ filterDepart(scope.row.depart) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="jobTitle" label="鎵�灞炶亴鍔�" min-width="8">
+                </el-table-column>
+                <el-table-column
+                    prop="createTime"
+                    label="鍒涘缓鏃堕棿"
+                    min-width="10"
+                >
+                    <template slot-scope="scope">
+                        <span>{{ changeTime(scope.row) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="status" label="鍚敤" min-width="5">
+                    <template slot-scope="scope">
+                        <!-- @change="handleChangeStatus(scope.row)" -->
+                        <el-switch
+                            class="switchStyle"
+                            v-model="scope.row.status"
+                            active-color="#3fef9a"
+                            inactive-color="#000212"
+                            disabled
+                        >
+                        </el-switch>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
+                    <template slot-scope="scope">
+                        <div class="operation">
+                            <span @click="handleChange(scope.row)">淇敼</span>
+                            <span class="line">|</span>
+                            <span @click="handleFind(scope.row)">鏌ョ湅</span>
+                            <span class="line">|</span>
+                            <span
+                                @click="handleChangeRole(scope.row, 'password')"
+                                >淇敼瀵嗙爜</span
+                            >
+                            <span class="line">|</span>
+                            <span @click="handleDelete(scope.row)">鍒犻櫎</span>
+                            <span class="line">|</span>
+                            <span @click="handleChangeRole(scope.row, 'depart')"
+                                >淇敼閮ㄩ棬</span
+                            >
+                            <span class="line">|</span>
+                            <span @click="handleChangeStatus(scope.row)">{{
+                                scope.row.status === true ? '鍋滅敤' : '鍚敤'
+                            }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!-- 鏌ョ湅椤甸潰 -->
+            <el-dialog
+                :visible.sync="dialogView"
+                width="600px"
+                v-if="dialogView"
+                title="鏌ョ湅鐢ㄦ埛淇℃伅"
+            >
+                <MyView :userInfo="userInfo"></MyView>
+            </el-dialog>
+            <!-- 淇敼椤甸潰 -->
+            <el-dialog
+                :visible.sync="dialogUpdate"
+                width="600px"
+                v-if="dialogUpdate"
+                :title="
+                    updateFlag
+                        ? flag.role
+                            ? '淇敼鐢ㄦ埛瑙掕壊淇℃伅'
+                            : flag.depart
+                            ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅'
+                            : '淇敼鐢ㄦ埛瀵嗙爜'
+                        : ''
+                "
+                :before-close="handleClose"
+            >
+                <updateUser
+                    :updateFlag="updateFlag"
+                    :userInfo="userInfo"
+                    :flag="flag"
+                    @closeDialog="closeDialog"
+                    :getUserList="getUserList"
+                    v-if="!flag.password"
+                />
+                <MyPwd
+                    v-else
+                    :userInfo="userInfo"
+                    @closeDialog="closeDialog"
+                ></MyPwd>
+            </el-dialog>
+
+            <el-dialog
+                :visible.sync="dialogCreate"
+                title="鏂板璐︽埛"
+                width="800px"
+                v-if="dialogCreate"
+                :before-close="handleClose"
+            >
+                <createUser @sendDialog="sendDialog" :userInfo="userInfo" />
+            </el-dialog>
+            <!-- tools -->
+            <div class="tools">
+                <div class="funs">
+                    <div class="funsItem funs-sp">
+                        <el-checkbox v-model="all" @change="selectAll()"
+                            >鍏ㄩ��</el-checkbox
+                        >
+                    </div>
+                    <div class="funsItem funs-sp">
+                        <el-checkbox
+                            v-model="unsame"
+                            @change="disSame(tableData)"
+                            >鍙嶉��</el-checkbox
+                        >
+                    </div>
+                    <div class="funsItem">
+                        <el-select
+                            v-model="myIdx"
+                            placeholder="鎵归噺鎿嶄綔"
+                            @change="selectChange"
+                        >
+                            <el-option
+                                popper-class="funs-select"
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                                :disabled="item.disabled"
+                            >
+                            </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="pagination">
+                    <el-pagination
+                        background
+                        :current-page="currentPage"
+                        layout="prev, pager, next"
+                        :total="totalNum"
+                        :page-size="pageSize"
+                        @current-change="changeCurrentPage"
+                        @prev-click="handlePrev"
+                        @next-click="handleNext"
+                    >
+                    </el-pagination>
+                </div>
             </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 鏌ョ湅椤甸潰 -->
-      <el-dialog
-        :visible.sync="dialogView"
-        width="600px"
-        v-if="dialogView"
-        title="鏌ョ湅鐢ㄦ埛淇℃伅"
-      >
-        <MyView :userInfo="userInfo"></MyView>
-      </el-dialog>
-      <!-- 淇敼椤甸潰 -->
-      <el-dialog
-        :visible.sync="dialogUpdate"
-        width="600px"
-        v-if="dialogUpdate"
-        :title="
-          updateFlag
-            ? flag.role
-              ? '淇敼鐢ㄦ埛瑙掕壊淇℃伅'
-              : flag.depart
-              ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅'
-              : '淇敼鐢ㄦ埛瀵嗙爜'
-            : ''
-        "
-        :before-close="handleClose"
-      >
-        <updateUser
-          :updateFlag="updateFlag"
-          :userInfo="userInfo"
-          :flag="flag"
-          @closeDialog="closeDialog"
-          :getUserList="getUserList"
-          v-if="!flag.password"
-        />
-        <MyPwd v-else :userInfo="userInfo" @closeDialog="closeDialog"></MyPwd>
-      </el-dialog>
-      <!-- tools -->
-      <div class="tools">
-        <div class="funs">
-          <div class="funsItem funs-sp">
-            <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
-          </div>
-          <div class="funsItem funs-sp">
-            <el-checkbox v-model="unsame" @change="disSame(tableData)"
-              >鍙嶉��</el-checkbox
-            >
-          </div>
-          <div class="funsItem">
-            <el-select
-              v-model="myIdx"
-              placeholder="鎵归噺鎿嶄綔"
-              @change="selectChange"
-            >
-              <el-option
-                popper-class="funs-select"
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-                :disabled="item.disabled"
-              >
-              </el-option>
-            </el-select>
-          </div>
         </div>
-        <div class="pagination">
-          <el-pagination
-            background
-            :current-page="currentPage"
-            layout="prev, pager, next"
-            :total="totalNum"
-            :page-size="pageSize"
-            @current-change="changeCurrentPage"
-            @prev-click="handlePrev"
-            @next-click="handleNext"
-          >
-          </el-pagination>
-        </div>
-      </div>
-    </div>
-  </main>
+    </main>
 </template>
 <script>
 import helper from "@/utils/mydate";
+import createUser from "../createUser";
 import updateUser from "../updateUser";
 import MyPwd from "../password";
 import MyView from "../myView";
 export default {
-  components: {
-    updateUser,
-    MyPwd,
-    MyView,
-  },
-  data() {
-    return {
-      tableData: [],
-      search: "",
-      dialogUpdate: false,
-      dialogView: false,
-      updateFlag: false,
-      userInfo: "",
-      totalNum: 0,
-      pageSize: 10,
-      currentPage: 1,
-      renderFlag: false,
-      flag: {
-        role: false,
-        password: false,
-        depart: false,
-      },
-      all: false,
-      unsame: false,
-      myIdx: 0,
-      preMyIdx: 0,
-      options: [
-        {
-          value: 0,
-          label: "鎵归噺鎿嶄綔",
-          disabled: true,
-        },
-        {
-          value: 1,
-          label: "鎵归噺鍚敤",
-        },
-        {
-          value: 2,
-          label: "鎵归噺绂佺敤",
-        },
-        {
-          value: 3,
-          label: "鎵归噺鍒犻櫎",
-        },
-      ],
-      tempList: [],
-    };
-  },
-  created() {
-    this.getUserList();
-  },
-  methods: {
-    async selectChange(list) {
-      console.log(this.tempList);
-      if (this.tempList.length !== 0) {
-        this.preMyIdx = list;
-        if (list === 3) {
-          await this.mulDelte(this.tempList);
-        } else if (list === 2) {
-          await this.mulUpdateStatus(this.tempList, 0);
-        } else {
-          await this.mulUpdateStatus(this.tempList, 1);
-        }
-        this.myIdx = 0;
-      } else {
-        this.myIdx = this.preMyIdx;
-        this.$message({
-          type: "warning",
-          message: "鎮ㄨ繕娌￠�変腑浠讳綍鏁版嵁",
-        });
-      }
+    components: {
+        createUser,
+        updateUser,
+        MyPwd,
+        MyView,
     },
-    tableChange(list) {
-      this.tempList = [];
-      list.forEach((item) => {
-        this.tempList.push(item.id);
-      });
-      if (list.length === this.tableData.length) {
-        this.all = true;
-      } else {
-        this.all = false;
-      }
+    data() {
+        return {
+            tableData: [],
+            search: "",
+            dialogCreate: false,
+            dialogUpdate: false,
+            dialogView: false,
+            updateFlag: false,
+            userInfo: "",
+            totalNum: 0,
+            pageSize: 10,
+            currentPage: 1,
+            renderFlag: false,
+            flag: {
+                role: false,
+                password: false,
+                depart: false,
+            },
+            all: false,
+            unsame: false,
+            myIdx: 0,
+            preMyIdx: 0,
+            options: [
+                {
+                    value: 0,
+                    label: "鎵归噺鎿嶄綔",
+                    disabled: true,
+                },
+                {
+                    value: 1,
+                    label: "鎵归噺鍚敤",
+                },
+                {
+                    value: 2,
+                    label: "鎵归噺绂佺敤",
+                },
+                {
+                    value: 3,
+                    label: "鎵归噺鍒犻櫎",
+                },
+            ],
+            tempList: [],
+        };
     },
-    // 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
-    mulDelte(idArr) {
-      console.log(idArr);
-      this.$confirm("鎮ㄧ‘瀹氳杩涜鎵归噺鍒犻櫎鐢ㄦ埛鍚�?")
-        .then((_) => {
-          this.$axios({
-            method: "post",
-            url: "sccg/admin/deleteBatch?ids=" + idArr,
-          }).then((res) => {
-            if (res.code === 200) {
+    created() {
+        this.getUserList();
+    },
+    methods: {
+        async selectChange(list) {
+            if (this.tempList.length !== 0) {
+                this.preMyIdx = list;
+                if (list === 3) {
+                    await this.mulDelte(this.tempList);
+                } else if (list === 2) {
+                    await this.mulUpdateStatus(this.tempList, 0);
+                } else {
+                    await this.mulUpdateStatus(this.tempList, 1);
+                }
+                this.myIdx = 0;
+            } else {
+                this.myIdx = this.preMyIdx;
+                this.$message({
+                    type: "warning",
+                    message: "鎮ㄨ繕娌￠�変腑浠讳綍鏁版嵁",
+                });
+            }
+        },
+        tableChange(list) {
+            this.tempList = [];
+            list.forEach((item) => {
+                this.tempList.push(item.id);
+            });
+            if (list.length === this.tableData.length) {
+                this.all = true;
+            } else {
+                this.all = false;
+            }
+        },
+        // 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
+        mulDelte(idArr) {
+            this.$confirm("鎮ㄧ‘瀹氳杩涜鎵归噺鍒犻櫎鐢ㄦ埛鍚�?")
+                .then((_) => {
+                    this.$axios({
+                        method: "post",
+                        url: "sccg/admin/deleteBatch?ids=" + idArr,
+                    }).then((res) => {
+                        if (res.code === 200) {
 
-              this.$message({
-                type: "success",
-                message: "鍒犻櫎鐢ㄦ埛淇℃伅鎴愬姛",
-              });
-              this.getUserList();
-            } else {
-              this.$message({
-                type: "error",
-                message: res.message,
-              });
-            }
-          });
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    },
-    // 鎵归噺淇敼璐﹀彿
-    mulUpdateStatus(idArr, flag) {
-      console.log(flag);
-      this.$confirm(
-        flag === 1
-          ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤鐢ㄦ埛鍚�?"
-          : "鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤鐢ㄦ埛鍚�?"
-      )
-        .then((_) => {
-          this.$axios({
-            method: "post",
-            url:
-              "sccg/admin/updateStatusBatch?ids=" + idArr + "&status=" + flag,
-          }).then((res) => {
-            if (res.code === 200) {
-              this.$message({
-                type: "success",
-                message: "鏇存敼鐢ㄦ埛鐘舵�佹垚鍔�",
-              });
-              this.getUserList();
-            } else {
-              this.$message({
-                type: "error",
-                message: res.message,
-              });
-            }
-          });
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    },
-    changeTime({ createTime }) {
-      return helper(createTime);
-    },
-    selectAll() {
-      this.$refs.multipleTable.toggleAllSelection();
-    },
-    disSame(list) {
-      list.forEach((row) => {
-        this.$refs.multipleTable.toggleRowSelection(row);
-      });
-    },
-    // 鍒犻櫎鐢ㄦ埛
-    handleDelete({ id }) {
-      this.$confirm("纭鍒犻櫎锛�")
-        .then((_) => {
-          this.$axios({
-            method: "post",
-            url: "sccg/admin/delete/" + id,
-          }).then((res) => {
-            this.$message({
-              message: res.message,
-              type: "success",
+                            this.$message({
+                                type: "success",
+                                message: "鍒犻櫎鐢ㄦ埛淇℃伅鎴愬姛",
+                            });
+                            this.getUserList();
+                        } else {
+                            this.$message({
+                                type: "error",
+                                message: res.message,
+                            });
+                        }
+                    });
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
+        },
+        // 鎵归噺淇敼璐﹀彿
+        mulUpdateStatus(idArr, flag) {
+            this.$confirm(
+                flag === 1
+                    ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤鐢ㄦ埛鍚�?"
+                    : "鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤鐢ㄦ埛鍚�?"
+            )
+                .then((_) => {
+                    this.$axios({
+                        method: "post",
+                        url:
+                            "sccg/admin/updateStatusBatch?ids=" + idArr + "&status=" + flag,
+                    }).then((res) => {
+                        if (res.code === 200) {
+                            this.$message({
+                                type: "success",
+                                message: "鏇存敼鐢ㄦ埛鐘舵�佹垚鍔�",
+                            });
+                            this.getUserList();
+                        } else {
+                            this.$message({
+                                type: "error",
+                                message: res.message,
+                            });
+                        }
+                    });
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
+        },
+        changeTime({ createTime }) {
+            return helper(createTime);
+        },
+        selectAll() {
+            this.$refs.multipleTable.toggleAllSelection();
+        },
+        disSame(list) {
+            list.forEach((row) => {
+                this.$refs.multipleTable.toggleRowSelection(row);
             });
+        },
+        // 鍒犻櫎鐢ㄦ埛
+        handleDelete({ id }) {
+            this.$confirm("纭鍒犻櫎锛�")
+                .then((_) => {
+                    this.$axios({
+                        method: "post",
+                        url: "sccg/admin/delete/" + id,
+                    }).then((res) => {
+                        this.$message({
+                            message: res.message,
+                            type: "success",
+                        });
+                        this.getUserList();
+                    });
+                })
+                .catch((_) => { });
+        },
+        sendDialog(flag) {
+            this.dialogCreate = flag.flag;
+            this.$emit('setDialog', { flag: true })
+        },
+        closeDialog({ flag }) {
+            this.dialogUpdate = flag;
             this.getUserList();
-          });
-        })
-        .catch((_) => {});
-    },
-    closeDialog({ flag }) {
-      this.dialogUpdate = flag;
-      this.getUserList();
-    },
-    handleClose(done) {
-      if (this.updateFlag) {
-        this.$confirm("纭鍏抽棴锛�")
-          .then((_) => {
-            this.dialogUpdate = false;
-            this.updateFlag = false;
-            done();
-          })
-          .catch((_) => {});
-      } else {
-        done();
-      }
-    },
-    // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
-    changeCurrentPage(page) {
-      this.currentPage = page;
-      this.getUserList();
-    },
-    // 涓婁竴椤电偣鍑讳簨浠�
-    handlePrev(page) {
-      this.currentPage = page;
-      this.getUserList();
-    },
-    // 涓嬩竴椤电偣鍑讳簨浠�
-    handleNext(page) {
-      this.currentPage = page;
-      this.getUserList();
-    },
-    // 淇敼瑙掕壊
-    handleChangeRole(obj, mykey) {
-      this.dialogUpdate = true;
-      this.updateFlag = true;
-      for (let key in this.flag) {
-        if (key == mykey) {
-          this.flag[key] = true;
-        } else {
-          this.flag[key] = false;
-        }
-      }
-      this.userInfo = obj;
-    },
-    // 淇敼鐢ㄦ埛鐘舵��
-    handleChangeStatus(obj) {
-      let { id, status } = obj;
-      status == true ? (status = 0) : (status = 1);
-      this.$axios
-        .post(`sccg/admin/updateStatus/` + id + "?status=" + status)
-        .then((res) => {
-          this.getUserList();
-        });
-    },
-    // 鑾峰彇鐢ㄦ埛鍒楄〃
-    getUserList() {
-      const that = this;
-      const { currentPage, pageSize, search } = this;
-      // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
-      this.$axios
-        .get(
-          `sccg/admin/list?keyword=${search}&current=${currentPage}&pageSize=${pageSize}`
-        )
-        .then((res) => {
-          if (res.code === 200) {
-            res.data.records.forEach((item) => {
-              item.status == 1 ? (item.status = true) : (item.status = false);
+        },
+        handleClose(done) {
+            if (this.updateFlag) {
+                this.$confirm("纭鍏抽棴锛�")
+                    .then((_) => {
+                        this.dialogUpdate = false;
+                        this.updateFlag = false;
+                        done();
+                    })
+                    .catch((_) => { });
+            } else {
+                done();
+            }
+        },
+        // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
+        changeCurrentPage(page) {
+            this.currentPage = page;
+            this.getUserList();
+        },
+        // 涓婁竴椤电偣鍑讳簨浠�
+        handlePrev(page) {
+            this.currentPage = page;
+            this.getUserList();
+        },
+        // 涓嬩竴椤电偣鍑讳簨浠�
+        handleNext(page) {
+            this.currentPage = page;
+            this.getUserList();
+        },
+        // 淇敼瑙掕壊
+        handleChange(obj) {
+            this.dialogCreate = true;
+            this.userInfo = obj;
+        },
+        // 淇敼瑙掕壊
+        handleChangeRole(obj, mykey) {
+            this.dialogUpdate = true;
+            this.updateFlag = true;
+            for (let key in this.flag) {
+                if (key == mykey) {
+                    this.flag[key] = true;
+                } else {
+                    this.flag[key] = false;
+                }
+            }
+            this.userInfo = obj;
+        },
+        // 淇敼鐢ㄦ埛鐘舵��
+        handleChangeStatus(obj) {
+            let { id, status } = obj;
+            status == true ? (status = 0) : (status = 1);
+            this.$axios
+                .post(`sccg/admin/updateStatus/` + id + "?status=" + status)
+                .then((res) => {
+                    this.getUserList();
+                });
+        },
+        // 鑾峰彇鐢ㄦ埛鍒楄〃
+        getUserList() {
+            const that = this;
+            const { currentPage, pageSize, search } = this;
+            // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
+            this.$axios
+                .get(
+                    `sccg/admin/list?keyword=${search}&current=${currentPage}&pageSize=${pageSize}`
+                )
+                .then((res) => {
+                    if (res.code === 200) {
+                        res.data.records.forEach((item) => {
+                            item.status == 1 ? (item.status = true) : (item.status = false);
+                        });
+                        that.totalNum = res.data.total;
+                        that.tableData = res.data.records;
+                        this.renderFlag = true;
+                    }
+                });
+        },
+        // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
+        handleFind(rowData) {
+            this.dialogView = true;
+            this.userInfo = rowData;
+        },
+        // 璁剧疆琛ㄦ牸鏂戦┈绾�
+        tableRowClassName({ row, rowIndex }) {
+            if ((rowIndex + 1) % 2 == 0) {
+                return "warning-row";
+            } else {
+                return "success-row";
+            }
+            return "";
+        },
+        // 澶勭悊鐢ㄦ埛鎵�灞為儴闂�
+        filterRole(arr) {
+            let str = "";
+            if (arr.length === 0) {
+                return;
+            }
+            arr.forEach((item, index) => {
+                if (item !== null) {
+                    if (index < arr.length - 1) {
+                        str += item.name + ",";
+                    } else {
+                        str += item.name;
+                    }
+                }
             });
-            that.totalNum = res.data.total;
-            that.tableData = res.data.records;
-            this.renderFlag = true;
-          }
-        });
+            return str;
+        },
+        // 澶勭悊鐢ㄦ埛鎵�灞為儴闂�
+        filterDepart(arr) {
+            let str = "";
+            if (arr.length === 0) {
+                return;
+            }
+            arr.forEach((item, index) => {
+                if (item !== null) {
+                    if (index < arr.length - 1) {
+                        str += item.departName + ",";
+                    } else {
+                        str += item.departName;
+                    }
+                }
+            });
+            return str;
+        },
     },
-    // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
-    handleFind(rowData) {
-      this.dialogView = true;
-      this.userInfo = rowData;
+    props: ["refresh", "keyword", "resetFresh"],
+    watch: {
+        refresh: {
+            handler(newValue, oldValue) {
+                if (newValue == true) {
+                    this.search = "";
+                    if (this.keyword != "") {
+                        this.search = this.keyword;
+                    }
+                    this.currentPage = 1;
+                    this.getUserList();
+                    this.$emit("resetFresh", { flag: false });
+                }
+            },
+            immediate: true,
+        },
     },
-    // 璁剧疆琛ㄦ牸鏂戦┈绾�
-    tableRowClassName({ row, rowIndex }) {
-      if ((rowIndex + 1) % 2 == 0) {
-        return "warning-row";
-      } else {
-        return "success-row";
-      }
-      return "";
-    },
-    // 澶勭悊鐢ㄦ埛鎵�灞為儴闂�
-    filterRole(arr) {
-      let str = "";
-      if (arr.length === 0) {
-        return;
-      }
-      arr.forEach((item, index) => {
-        if (item !== null) {
-          if (index < arr.length - 1) {
-            str += item.name + ",";
-          } else {
-            str += item.name;
-          }
-        }
-      });
-      return str;
-    },
-    // 澶勭悊鐢ㄦ埛鎵�灞為儴闂�
-    filterDepart(arr) {
-      let str = "";
-      if (arr.length === 0) {
-        return;
-      }
-      arr.forEach((item, index) => {
-        if (item !== null) {
-          if (index < arr.length - 1) {
-            str += item.departName + ",";
-          } else {
-            str += item.departName;
-          }
-        }
-      });
-      return str;
-    },
-  },
-  props: ["refresh", "keyword", "resetFresh"],
-  watch: {
-    refresh: {
-      handler(newValue, oldValue) {
-        if (newValue == true) {
-          this.search = "";
-          if (this.keyword != "") {
-            this.search = this.keyword;
-          }
-          this.currentPage = 1;
-          this.getUserList();
-          this.$emit("resetFresh", { flag: false });
-        }
-      },
-      immediate: true,
-    },
-  },
 };
 </script>
 <style lang="scss" scoped>
 main {
-  // background-color: #09152f;
-  margin-top: 20px;
-  padding-bottom: 50px;
-  //border: 1px solid #fff;
-  .mainTitle {
-    line-height: 60px;
-  }
-  .tools {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0;
-    .funs {
-      display: flex;
-      .funs-sp {
-        border: 1px solid #dcdfe6;
-        background-color: #fff;
-      }
-      .funsItem {
-        line-height: 28px;
+    // background-color: #09152f;
+    margin-top: 20px;
+    padding-bottom: 50px;
+    //border: 1px solid #fff;
+    .mainTitle {
+        line-height: 60px;
+    }
+    .tools {
         display: flex;
+        justify-content: space-between;
         align-items: center;
-        border-radius: 4px;
-        font-size: 12px;
-        margin-left: 10px;
-        .el-checkbox {
-          width: 80px;
-          padding: 0 10px;
-        }
-        .el-select {
-          width: 120px;
+        padding: 0;
+        .funs {
+            display: flex;
+            .funs-sp {
+                border: 1px solid #dcdfe6;
+                background-color: #fff;
+            }
+            .funsItem {
+                line-height: 28px;
+                display: flex;
+                align-items: center;
+                border-radius: 4px;
+                font-size: 12px;
+                margin-left: 10px;
+                .el-checkbox {
+                    width: 80px;
+                    padding: 0 10px;
+                }
+                .el-select {
+                    width: 120px;
 
-          .funs-select {
-            background-color: transparent;
-          }
+                    .funs-select {
+                        background-color: transparent;
+                    }
+                }
+            }
         }
-      }
-    }
-    .pagination {
-      margin-top: 50px;
-      display: flex;
-      line-height: 50px;
-      justify-content: center;
-      .el-pagination {
-        &::v-deep li,
-        &::v-deep .btn-prev,
-        &::v-deep .btn-next {
-          // background-color: #071f39;
-          // color: #4b9bb7;
+        .pagination {
+            margin-top: 50px;
+            display: flex;
+            line-height: 50px;
+            justify-content: center;
+            .el-pagination {
+                &::v-deep li,
+                &::v-deep .btn-prev,
+                &::v-deep .btn-next {
+                    // background-color: #071f39;
+                    // color: #4b9bb7;
+                }
+                &::v-deep .active {
+                    background-color: #409eff;
+                    color: #fff;
+                }
+            }
         }
-        &::v-deep .active {
-          background-color: #409eff;
-          color: #fff;
+    }
+    .el-table {
+        // color: #4b9bb7;
+        // font-size: 10px;
+        .operation {
+            color: var(--operation-color);
+            display: flex;
+            .line {
+                padding: 0 1px;
+            }
+            span:hover {
+                cursor: pointer;
+            }
         }
-      }
     }
-  }
-  .el-table {
-    // color: #4b9bb7;
-    // font-size: 10px;
-    .operation {
-      color: var(--operation-color);
-      display: flex;
-      .line {
-        padding: 0 1px;
-      }
-      span:hover {
-        cursor: pointer;
-      }
-    }
-  }
 }
 </style>

--
Gitblit v1.8.0