From 5c5712ee7cc9065b8257681c7ec5d92534166aac Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 08 十一月 2022 18:49:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/systemSetting/baseSetting/user/components/main/index.vue   | 1031 ++++++++++++++++++++++------------------
 src/views/operate/fivepack/shop/components/updateUser/index.vue      |    6 
 src/views/systemSetting/baseSetting/user/components/myView/index.vue |  426 ++++++++++-------
 src/views/operate/log/index.vue                                      |    8 
 src/components/filePictrue/index.vue                                 |    2 
 5 files changed, 820 insertions(+), 653 deletions(-)

diff --git a/src/components/filePictrue/index.vue b/src/components/filePictrue/index.vue
index 8260292..9ab2534 100644
--- a/src/components/filePictrue/index.vue
+++ b/src/components/filePictrue/index.vue
@@ -103,7 +103,7 @@
     .my-demo {
         position: relative;
         height: 159px;
-        padding: 10px;
+        margin: 10px;
     }
 
     .tip {
diff --git a/src/views/operate/fivepack/shop/components/updateUser/index.vue b/src/views/operate/fivepack/shop/components/updateUser/index.vue
index cd071e1..3c5eae5 100644
--- a/src/views/operate/fivepack/shop/components/updateUser/index.vue
+++ b/src/views/operate/fivepack/shop/components/updateUser/index.vue
@@ -23,9 +23,9 @@
                         <el-input v-model="store.owner" placeholder="璇峰~鍐欏簵閾鸿礋璐d汉鍚嶅瓧"></el-input>
                     </el-form-item>
                     <!-- 搴楅摵鎻忚堪 -->
-                    <el-form-item class="optionItem" label="搴楅摵鎻忚堪:" prop="storeDesc">
+                    <el-form-item class="optionItem" label="搴楅摵鎻忚堪:" prop="description">
                         <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" maxlength="300" show-word-limit
-                            v-model="store.storeDesc" placeholder="杈撳叆搴楅摵鎻忚堪"></el-input>
+                            v-model="store.description" placeholder="杈撳叆搴楅摵鎻忚堪"></el-input>
                         <!-- <el-input type="textarea" v-model="user.storedesc" placeholder="杈撳叆閮ㄩ棬鎻忚堪"></el-input> -->
                     </el-form-item>
                     <!-- 鑱旂郴鏂瑰紡 -->
@@ -129,7 +129,7 @@
                 storeName: [
                     { required: true, trigger: "blur", validator: validateMail },
                 ],
-                storeDesc: [
+                description: [
                     { required: false, trigger: "blur", validator: validateDesc },
                 ],
             },
diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue
index 1e2d8fc..651590c 100644
--- a/src/views/operate/log/index.vue
+++ b/src/views/operate/log/index.vue
@@ -81,7 +81,7 @@
             prop="createTime"
             label="鏃ュ織鏃堕棿"
             min-width="10"
-            :sort-orders="['descending','ascending']"
+            :sort-orders="['descending', 'ascending']"
             sortable="custom"
           >
             <template slot-scope="scope">
@@ -147,7 +147,7 @@
   </div>
 </template>
 <script>
-import {getNowDate} from '@/utils/helper'
+import { getNowDate } from "@/utils/helper";
 import helper from "@/utils/mydate";
 import { parseTime } from "@/utils/index";
 import { createNamespacedHelpers } from "vuex";
@@ -209,7 +209,7 @@
         id: "",
         operationType: operationType === "鍏ㄩ儴" ? "" : operationType,
         portEquipment: "",
-        size: pageSize,
+        size: 50000,
         startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
         sort: mysort,
       });
@@ -223,7 +223,7 @@
       const href = window.URL.createObjectURL(blob);
       downloadElement.href = href;
       // // 涓嬭浇鍚庢枃浠跺悕
-      downloadElement.download = fileName + '鏃ュ織鏁版嵁.xlsx';
+      downloadElement.download = fileName + "鏃ュ織鏁版嵁.xlsx";
       document.body.appendChild(downloadElement);
       // 鐐瑰嚮涓嬭浇
       downloadElement.click();
diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue
index 4ccec1b..7909708 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -1,508 +1,601 @@
 <template>
-    <main>
-        <div class="mainContent">
-            <!-- 鏁版嵁灞曠ず -->
-            <el-table ref="multipleTable"
-                :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','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="10">
-                </el-table-column>
-                <el-table-column prop="username" label="鎵�灞炲鍚�" min-width="8">
-                </el-table-column>
-                <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
-                </el-table-column>
-                <el-table-column prop="note" label="鎵�灞炶鑹�" min-width="8">
-                    <template slot-scope="scope">
-                        <span>{{filterRole(scope.row.roles)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="departName" label="鎵�灞為儴闂�" min-width="8">
-                </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="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>
-                        </div>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <!-- 鏌ョ湅椤甸潰 -->
-            <el-dialog :visible.sync="dialogView" width="45%" v-if="dialogView"
-                title="鏌ョ湅鐢ㄦ埛淇℃伅">
-                <MyView :userInfo=userInfo></MyView>
-            </el-dialog>
-            <!-- 淇敼椤甸潰 -->
-            <el-dialog :visible.sync="dialogUpdate" width="45%" 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 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>
+  <main>
+    <div class="mainContent">
+      <!-- 鏁版嵁灞曠ず -->
+      <el-table
+        ref="multipleTable"
+        :header-cell-style="{
+          background: '#06122c',
+          'font-size': '12px',
+          color: '#4b9bb7',
+          '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
+            >
+            </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
+              >
             </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 鏌ョ湅椤甸潰 -->
+      <el-dialog
+        :visible.sync="dialogView"
+        width="45%"
+        v-if="dialogView"
+        title="鏌ョ湅鐢ㄦ埛淇℃伅"
+      >
+        <MyView :userInfo="userInfo"></MyView>
+      </el-dialog>
+      <!-- 淇敼椤甸潰 -->
+      <el-dialog
+        :visible.sync="dialogUpdate"
+        width="45%"
+        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
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+                :disabled="item.disabled"
+              >
+              </el-option>
+            </el-select>
+          </div>
         </div>
-    </main>
+        <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>
 </template>
 <script>
-import helper from '@/utils/mydate'
-import updateUser from '../updateUser';
-import MyPwd from '../password'
-import MyView from '../myView'
+import helper from "@/utils/mydate";
+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: []
+  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: "鎮ㄨ繕娌¢�変腑浠讳綍鏁版嵁",
+        });
+      }
     },
-    created() {
-        this.getUserList();
+    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;
+      }
     },
-    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;
+    // 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
+    mulDelte(idArr) {
+      console.log(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.myIdx = this.preMyIdx;
-                this.$message({
-                    type: 'warning',
-                    message: '鎮ㄨ繕娌¢�変腑浠讳綍鏁版嵁',
-                })
+              this.$message({
+                type: "error",
+                message: res.message,
+              });
             }
-        },
-        tableChange(list) {
-            this.tempList = [];
-            list.forEach(item => {
-                this.tempList.push(item.id);
-            })
-            if (list.length === this.tableData.length) {
-                this.all = true;
+            console.log(res);
+          });
+        })
+        .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.all = false
+              this.$message({
+                type: "error",
+                message: res.message,
+              });
             }
-        },
-        // 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
-        mulDelte(idArr) {
-            console.log(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
-                                })
-                            }
-                            console.log(res);
-                        })
-                })
-                .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
-                                })
-                            }
-                            console.log(res);
-                        })
-                })
-                .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 => {
-                    console.log(res);
-                    this.$message({
-                        message: res.message,
-                        type: 'success'
-                    })
-                    this.getUserList();
-                })
-            }).catch(_ => { })
-        },
-        closeDialog({ flag }) {
-            this.dialogUpdate = flag;
+            console.log(res);
+          });
+        })
+        .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) => {
+            console.log(res);
+            this.$message({
+              message: res.message,
+              type: "success",
+            });
             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 = 1 : status = 0;
-            this.$axios.post(`sccg/admin/updateStatus/` + id + '?status=' + status).then(res => {
-                console.log(res);
-            })
-        },
-        // 鑾峰彇鐢ㄦ埛鍒楄〃
-        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;
-                    }
-                }
-            })
-            return str;
+          });
+        })
+        .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;
     },
-    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
+    // 淇敼鐢ㄦ埛鐘舵��
+    handleChangeStatus(obj) {
+      let { id, status } = obj;
+      status == true ? (status = 1) : (status = 0);
+      this.$axios
+        .post(`sccg/admin/updateStatus/` + id + "?status=" + status)
+        .then((res) => {
+          console.log(res);
+        });
+    },
+    // 鑾峰彇鐢ㄦ埛鍒楄〃
+    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;
+          }
         }
-    }
-}
+      });
+      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: 1pox solid #fff;
+  background-color: #09152f;
+  margin-top: 20px;
+  padding-bottom: 50px;
+  border: 1pox solid #fff;
 
-    .mainTitle {
-        line-height:60px;
-    }
+  .mainTitle {
+    line-height: 60px;
+  }
 
-    .tools {
-        display : flex;
-        justify-content: space-between;
+  .tools {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+
+    .funs {
+      display: flex;
+      .funs-sp {
+        border: 1px solid #17324c;
+      }
+      .funsItem {
+        line-height: 28px;
+        display: flex;
         align-items: center;
-        padding: 0 20px;
+        border-radius: 4px;
+        font-size: 12px;
+        margin-left: 10px;
 
-        .funs {
-            display: flex;
-            .funs-sp{
-                border: 1px solid #17324c;
-            }
-            .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;
-                }
-
-                &::v-deep .el-input__inner {
-                    border: none;
-                    background-color: #09152f;
-                }
-
-                &:hover {
-                    border: 1px solid #4b9bb7;
-                }
-
-                &:hover .el-checkbox {
-                    color: #4b9bb7;
-                }
-            }
-
+        .el-checkbox {
+          width: 80px;
+          padding: 0 10px;
         }
 
-        .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;
-                }
-            }
+        .el-select {
+          width: 120px;
         }
+
+        &::v-deep .el-input__inner {
+          border: none;
+          background-color: #09152f;
+        }
+
+        &:hover {
+          border: 1px solid #4b9bb7;
+        }
+
+        &:hover .el-checkbox {
+          color: #4b9bb7;
+        }
+      }
     }
 
-    .el-table {
-        color: #4b9bb7;
-        font-size: 10px;
-        .operation {
-            display: flex;
-            font-size: 10px;
-            .line {
-                padding: 0 1px;
-            }
+    .pagination {
+      margin-top: 50px;
+      display: flex;
+      line-height: 50px;
+      justify-content: center;
 
-            span:hover {
-                cursor: pointer;
-            }
+      .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 .switchStyle .el-switch__label {
-    //     position: absolute;
-    //     display: none;
-    //     color: #fff;
-    // }
+  }
 
-    // &::v-deep .el-switch__core {
-    //     background-color: rgba(166, 166, 166, 1);
-    // }
+  .el-table {
+    color: #4b9bb7;
+    font-size: 10px;
+    .operation {
+      display: flex;
+      font-size: 10px;
+      .line {
+        padding: 0 1px;
+      }
 
-    // &::v-deep .switchStyle .el-switch__label--left {
-    //     z-index: 9;
-    //     left: 20px;
-    // }
+      span:hover {
+        cursor: pointer;
+      }
+    }
+  }
+  // &::v-deep .switchStyle .el-switch__label {
+  //     position: absolute;
+  //     display: none;
+  //     color: #fff;
+  // }
 
-    // &::v-deep .switchStyle .el-switch__label--right {
-    //     z-index: 9;
-    //     left: 4px;
-    // }
+  // &::v-deep .el-switch__core {
+  //     background-color: rgba(166, 166, 166, 1);
+  // }
 
-    // &::v-deep .switchStyle .el-switch__label.is-active {
-    //     display: block;
-    // }
+  // &::v-deep .switchStyle .el-switch__label--left {
+  //     z-index: 9;
+  //     left: 20px;
+  // }
 
-    // &::v-deep .switchStyle.el-switch .el-switch__core,
-    // &::v-deep .el-switch .el-switch__label {
-    //     width: 56px !important;
-    // }
+  // &::v-deep .switchStyle .el-switch__label--right {
+  //     z-index: 9;
+  //     left: 4px;
+  // }
+
+  // &::v-deep .switchStyle .el-switch__label.is-active {
+  //     display: block;
+  // }
+
+  // &::v-deep .switchStyle.el-switch .el-switch__core,
+  // &::v-deep .el-switch .el-switch__label {
+  //     width: 56px !important;
+  // }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/systemSetting/baseSetting/user/components/myView/index.vue b/src/views/systemSetting/baseSetting/user/components/myView/index.vue
index 8608360..c69a1e2 100644
--- a/src/views/systemSetting/baseSetting/user/components/myView/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/myView/index.vue
@@ -1,202 +1,276 @@
 <template>
-    <div class="updateUser">
-        <main>
-            <div class="mainContent">
-                <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
-                    label-position="right">
-                    <!-- 鐢ㄦ埛鍚嶇О -->
-                    <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="username">
-                        <el-input v-model="user.username" placeholder="濉啓鐢ㄦ埛鍚嶇О" disabled></el-input>
-                    </el-form-item>
-                    <!-- 鐢ㄦ埛瀵嗙爜 -->
-                    <el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password">
-                        <el-input v-model="user.password" type="password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" disabled>
-                        </el-input>
-                    </el-form-item>
-                    <!-- 鎵�灞炵敤鎴峰鍚� -->
-                    <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="nickName">
-                        <el-input v-model="user.nickName" placeholder="璇峰~鍐欑敤鎴峰鍚�" disabled></el-input>
-                    </el-form-item>
-                    <!-- 鎬у埆 -->
-                    <el-form-item class="optionItem" label="鎬у埆:" prop="sex">
-                        <el-radio-group v-model="user.sex" disabled>
-                            <el-radio :label="1">鐢�</el-radio>
-                            <el-radio :label="0">濂�</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <!-- 鏄惁鍏氬憳 -->
-                    <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
-                        <el-radio-group v-model="user.isDy" disabled>
-                            <el-radio :label="1">鏄�</el-radio>
-                            <el-radio :label="0">鍚�</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <!-- 鎵�灞炴墜鏈哄彿鐮� -->
-                    <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile">
-                        <el-input v-model="user.mobile" placeholder="璇峰~鍐欐墜鏈哄彿鐮�" disabled></el-input>
-                    </el-form-item>
-                    <!-- 閭鍦板潃 -->
-                    <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
-                        <el-input v-model="user.email" placeholder="璇峰~鍐欓偖绠卞湴鍧�" disabled></el-input>
-                    </el-form-item>
-                    <!-- 閫夋嫨瑙掕壊 -->
-                    <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
-                        <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags
-                        disabled>
-                            <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 鐢ㄦ埛绫诲瀷 -->
-                    <el-form-item class="optionItem" label="鐢ㄦ埛绫诲瀷:" prop="userType">
-                        <el-select v-model="user.userType" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷" disabled>
-                            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 鎵�灞為儴闂� -->
-                    <el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="departmentId">
-                        <el-input  v-model="user.departName"></el-input>
-                    </el-form-item>
-                    <!-- 褰撳墠鑱屽姟 -->
-                    <el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="jobTitle">
-                        <el-input v-model="user.jobTitle" placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�" disabled></el-input>
-                    </el-form-item>
-                    <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
-                    <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
-                        <el-input v-model="user.mac" placeholder="璇峰~鍐欐墍灞瀖ac鍦板潃" disabled></el-input>
-                    </el-form-item>
-                    <!-- 濉啓鎵�灞瀒p鍦板潃 -->
-                    <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
-                        <el-input v-model="user.ip" placeholder="璇峰~鍐欐墍灞瀒p鍦板潃" disabled></el-input>
-                    </el-form-item>
-                </el-form>
-            </div>
-        </main>
-    </div>
+  <div class="updateUser">
+    <main>
+      <div class="mainContent">
+        <el-form
+          ref="user"
+          label-width="140px"
+          autoComplete="on"
+          :model="user"
+          :rules="createUserRules"
+          label-position="right"
+        >
+          <!-- 鐢ㄦ埛鍚嶇О -->
+          <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="username">
+            <el-input
+              v-model="user.username"
+              placeholder="濉啓鐢ㄦ埛鍚嶇О"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <!-- 鐢ㄦ埛瀵嗙爜 -->
+          <el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password">
+            <el-input
+              v-model="user.password"
+              type="password"
+              placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"
+              disabled
+            >
+            </el-input>
+          </el-form-item>
+          <!-- 鎵�灞炵敤鎴峰鍚� -->
+          <el-form-item
+            class="optionItem"
+            label="鎵�灞炵敤鎴峰鍚�:"
+            prop="nickName"
+          >
+            <el-input
+              v-model="user.nickName"
+              placeholder="璇峰~鍐欑敤鎴峰鍚�"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <!-- 鎬у埆 -->
+          <el-form-item class="optionItem" label="鎬у埆:" prop="sex">
+            <el-radio-group v-model="user.sex" disabled>
+              <el-radio :label="1">鐢�</el-radio>
+              <el-radio :label="0">濂�</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- 鏄惁鍏氬憳 -->
+          <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
+            <el-radio-group v-model="user.isDy" disabled>
+              <el-radio :label="1">鏄�</el-radio>
+              <el-radio :label="0">鍚�</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- 鎵�灞炴墜鏈哄彿鐮� -->
+          <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile">
+            <el-input
+              v-model="user.mobile"
+              placeholder="璇峰~鍐欐墜鏈哄彿鐮�"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <!-- 閭鍦板潃 -->
+          <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
+            <el-input
+              v-model="user.email"
+              placeholder="璇峰~鍐欓偖绠卞湴鍧�"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <!-- 閫夋嫨瑙掕壊 -->
+          <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
+            <el-select
+              v-model="user.role"
+              placeholder="璇烽�夋嫨鎵�灞炶鑹�"
+              multiple
+              collapse-tags
+              disabled
+            >
+              <el-option
+                v-for="item in roleList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 鐢ㄦ埛绫诲瀷 -->
+          <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>
+          <!-- 鎵�灞為儴闂� -->
+          <el-form-item
+            class="optionItem"
+            label="鎵�灞為儴闂�:"
+            prop="departmentId"
+          >
+            <el-input v-model="user.departName"></el-input>
+          </el-form-item>
+          <!-- 褰撳墠鑱屽姟 -->
+          <el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="jobTitle">
+            <el-input
+              v-model="user.jobTitle"
+              placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
+          <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
+            <el-input
+              v-model="user.mac"
+              placeholder="璇峰~鍐欐墍灞瀖ac鍦板潃"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <!-- 濉啓鎵�灞瀒p鍦板潃 -->
+          <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
+            <el-input
+              v-model="user.ip"
+              placeholder="璇峰~鍐欐墍灞瀒p鍦板潃"
+              disabled
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+    </main>
+  </div>
 </template>
 <script>
+import { getTypeList } from "@/utils/helper";
 export default {
-    data() {
-        return {
-            user: {
-            },
-            createUserRules: {
-            },
-            roleList: [
-               
-            ],
-            typeList: [],
-            departList: [],
+  data() {
+    return {
+      user: {},
+      createUserRules: {},
+      roleList: [],
+      typeList: [],
+      departList: [],
+    };
+  },
+  created() {
+    const that = this;
+    this.user = JSON.parse(JSON.stringify(that.userInfo));
+    this.user.departName = "";
+    if (this.user.depart.length > 0) {
+      this.user.depart.forEach((item, index) => {
+        if (item !== null) {
+          if (index < this.user.depart.length - 1) {
+            this.user.departName += item.departName + ",";
+          } else {
+            this.user.departName += item.departName;
+          }
         }
+      });
+    } else {
+      this.user.departName = "鏆傛棤鎵�灞為儴闂�";
+    }
+    // 鑾峰彇鎵�鏈夎鑹插垪琛�
+    this.getRoleList();
+    // 鑾峰彇褰撳墠鐢ㄦ埛瑙掕壊鍒楄〃
+    this.getUserRole(this.user.id);
+    // 鑾峰彇鍏ㄩ儴閮ㄩ棬鍒楄〃
+    this.$axios.get("/sccg/depart/tree").then((res) => {
+      this.departList = res.data;
+    });
+
+    // 鑾峰彇鐢ㄦ埛绫诲瀷
+    getTypeList(1, "07").then((data) => {
+      this.typeList = data;
+    });
+  },
+  methods: {
+    // 鑾峰彇瑙掕壊鍒楄〃
+    getRoleList() {
+      this.$axios({
+        method: "get",
+        url: "sccg/role/listAll",
+      }).then((res) => {
+        this.roleList = res.data;
+      });
     },
-    created() {
-        const that = this;
-        this.user = JSON.parse(JSON.stringify(that.userInfo));
-        this.user.departName  = this.user.departName ? this.user.departName : '鏆傛棤鎵�灞為儴闂�'
-        // 鑾峰彇鎵�鏈夎鑹插垪琛�
-        this.getRoleList();
-        // 鑾峰彇褰撳墠鐢ㄦ埛瑙掕壊鍒楄〃
-        this.getUserRole(this.user.id)
-        // 鑾峰彇鍏ㄩ儴閮ㄩ棬鍒楄〃
-        this.$axios.get('/sccg/depart/tree').then(res => {
-            this.departList = res.data;
-        })
+    // 鑾峰彇鐢ㄦ埛鐨勮鑹插垪琛�
+    getUserRole(id) {
+      this.$axios({
+        method: "get",
+        url: `sccg/admin/role/${id}`,
+      }).then((res) => {
+        const arr = [];
+        res.data.forEach((item) => {
+          arr.push(item.id);
+        });
+        this.user.role = arr;
+      });
     },
-    methods: {
-        // 鑾峰彇瑙掕壊鍒楄〃
-        getRoleList() {
-            this.$axios({
-                method: 'get',
-                url: 'sccg/role/listAll',
-            })
-                .then(res => {
-                    this.roleList = res.data;
-                })
-        },
-        // 鑾峰彇鐢ㄦ埛鐨勮鑹插垪琛�
-        getUserRole(id) {
-            this.$axios({
-                method: 'get',
-                url: `sccg/admin/role/${id}`
-            })
-                .then(res => {
-                    const arr = [];
-                    res.data.forEach(item => {
-                        arr.push(item.id);
-                    })
-                    this.user.role = arr;
-                })
-        },
-    },
-    props: ['userInfo']
-}
+  },
+  props: ["userInfo"],
+};
 </script>
 <style lang="scss" scoped>
 .updateUser {
-    border-radius: 1px;
+  border-radius: 1px;
+  background-color: #09152f;
+
+  :deep(.el-tag) {
     background-color: #09152f;
+  }
 
-    :deep(.el-tag) {
-        background-color: #09152f;
-    }
+  .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
+    background-color: #09152f;
+    color: #4b9bb7;
+  }
 
-    .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
-        background-color: #09152f;
-        color: #4b9bb7;
-    }
+  main {
+    text-align: left;
+    padding: 0 55px;
+    background-color: #09152f;
+    padding-bottom: 50px;
 
-    main {
-        text-align: left;
-        padding: 0 55px;
-        background-color: #09152f;
-        padding-bottom: 50px;
+    .mainContent {
+      display: flex;
+      justify-content: center;
+      padding-top: 50px;
 
-        .mainContent {
-            display: flex;
-            justify-content: center;
-            padding-top: 50px;
+      .el-form-item__content {
+        width: 400px;
 
-            .el-form-item__content {
-                width: 400px;
-
-                .el-select {
-                    width: 100%;
-                }
-            }
-
-            .optionHandleSp {
-                display: flex;
-
-                .areaNumber,
-                .moreNumber {
-                    flex: 1;
-                }
-
-                .telNumber {
-                    flex: 2;
-                }
-            }
-
-            .optionBtn {
-                display: flex;
-                margin-top: 20px;
-
-                .btn {
-                    padding: 12px 50px;
-                }
-            }
-
+        .el-select {
+          width: 100%;
         }
+      }
+
+      .optionHandleSp {
+        display: flex;
+
+        .areaNumber,
+        .moreNumber {
+          flex: 1;
+        }
+
+        .telNumber {
+          flex: 2;
+        }
+      }
+
+      .optionBtn {
+        display: flex;
+        margin-top: 20px;
+
+        .btn {
+          padding: 12px 50px;
+        }
+      }
     }
+  }
 }
 
 .updateUser::v-deep .el-form-item__label {
-    color: #4b9bb7;
+  color: #4b9bb7;
 }
 
 .updateUser::v-deep .el-input__inner {
-    background-color: #09152f;
-    border: 1px solid #17324c;
+  background-color: #09152f;
+  border: 1px solid #17324c;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0