diff --git a/d3code-ui/src/components/AttachmentSelector/AttachmentItem/index.vue b/d3code-ui/src/components/AttachmentPanel/AttachmentItem/index.vue
similarity index 97%
rename from d3code-ui/src/components/AttachmentSelector/AttachmentItem/index.vue
rename to d3code-ui/src/components/AttachmentPanel/AttachmentItem/index.vue
index b54d9ab231d0684935af8776658ef6b7442d73f4..a44ad6ddc28bec128172dd027fd366c7a934b855 100644
--- a/d3code-ui/src/components/AttachmentSelector/AttachmentItem/index.vue
+++ b/d3code-ui/src/components/AttachmentPanel/AttachmentItem/index.vue
@@ -2,8 +2,8 @@
   <div @click="handleClickItem" :class="checked === true ? 'selected attachment-icon' : 'attachment-icon' ">
     <div class="fileIconAll">
       <el-image
-        v-if="isImage"
-        :src="item.url" style="width: 120px;height: 120px"
+          v-if="isImage"
+          :src="item.url" style="width: 120px;height: 120px"
       >
         <div slot="error" class="image-slot">
           <i class="el-icon-picture-outline"></i>
@@ -98,7 +98,7 @@ export default {
     },
     // 删除文件
     handleDeleteFile() {
-      this.$emit('on-fileDelete', this.index)
+      this.$emit('on-fileDelete', this.item.id)
     },
     // 下载按钮
     handleDownloadFile() {
diff --git a/d3code-ui/src/components/AttachmentPanel/index.vue b/d3code-ui/src/components/AttachmentPanel/index.vue
index a9e7f73264abec0e17916efaa42a8d31c543360c..311eb3f8f5b7d52e6c48702fa82bb13107b1d58d 100644
--- a/d3code-ui/src/components/AttachmentPanel/index.vue
+++ b/d3code-ui/src/components/AttachmentPanel/index.vue
@@ -32,7 +32,7 @@
                            :is-file-checked="checkFileSelected(item)"
                            @checked="handleItemChecked"
                            @unchecked="handleItemUncheck"
-                           @on-fileDelete="handleDeleteFile(index)"
+                           @on-fileDelete="handleDeleteFile"
                            @on-filePreview="handlePreviewFile(item)"
                            @on-lookFile="fileInformation(item)"
           />
@@ -61,9 +61,10 @@
 </template>
 
 <script>
-import AttachmentItem from '../AttachmentSelector/AttachmentItem/index.vue'
+import AttachmentItem from './AttachmentItem/index.vue'
 import { getEnabledEngineConfig } from '../../api/attachment/oss/oss_config'
-import { listAttachment } from '../../api/attachment/attachment'
+import { delAttachment, listAttachment } from '../../api/attachment/attachment'
+import { cleanLogininfor } from '../../api/monitor/logininfor'
 
 export default {
   props: {
@@ -142,6 +143,7 @@ export default {
         this.loading = false
       })
     },
+    // 被选中的附件
     checkFileSelected(item) {
       const index = this.selectedAttachmentList.findIndex((attachment) => {
         return attachment.id === item.id
@@ -153,11 +155,11 @@ export default {
       this.$emit('askFileInformation', item)
     },
     // 删除文件
-    handleDeleteFile(index) {
+    handleDeleteFile(id) {
       this.$modal.confirm('是否确认删除此文件？').then(function() {
         return ''
       }).then(() => {
-        this.attachmentList.splice(index, 1)
+        delAttachment(id)
         this.getList()
         this.$modal.msgSuccess('删除成功')
       }).catch(() => {
diff --git a/d3code-ui/src/components/AttachmentSelector/index.vue b/d3code-ui/src/components/AttachmentSelector/index.vue
index ab8c0126a7c225b7757e58bf567b7ee63b7d7778..022e934c69510d215596182bb8a501ac4c09fd18 100644
--- a/d3code-ui/src/components/AttachmentSelector/index.vue
+++ b/d3code-ui/src/components/AttachmentSelector/index.vue
@@ -2,16 +2,18 @@
   <!--  附件选择器-->
   <div>
     <el-button @click="handleOpenSelector">选择附件</el-button>
+    <!-- 被选中的附件 -->
     <div class="selectedAttachList">
-      <div class="selectedAttachItem" v-for="(item, index) in value"
+      <div class="selectedAttachItem" v-for="(item, index) in selectedAttachmentList"
            :key="index"
       >
         <div class="selectedAttachItemName">{{ item.name }}</div>
         <i class="el-icon-close closed" @click="removeAttachment(index)"></i>
       </div>
     </div>
+
     <el-dialog title="添加附件" :visible.sync="open" width="1000px" append-to-body>
-      <attachment-panel :selected="this.value" v-if="open" :edit="false"
+      <attachment-panel :selected="this.selectedAttachmentList" v-if="open" :edit="false"
                         @selectedFileList="handleSelectedAttachmentList"
       ></attachment-panel>
       <div slot="footer" class="dialog-footer">
@@ -19,6 +21,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
   </div>
 
 </template>
@@ -31,8 +34,7 @@ import AttachmentPanel from '../AttachmentPanel/index.vue'
 export default {
   props: {
     value: {
-      type: Array,
-      default: () => []
+      type: Array || Number
     }
   },
   components: {
@@ -53,7 +55,34 @@ export default {
         storageType: null
       },
       // 被选中的附件按钮
-      selectedAttachmentList: this.value
+      selectedAttachmentList: this.selectedList,
+      // 父组件传下来的selectedList
+      selectedList: []
+    }
+  },
+  watch: {
+    value: {
+      handler: function(n) {
+        // 判断是否是数组，不是则变成数组
+        let isArray = n instanceof Array
+        if (isArray === false) {
+          Array.of(n)
+        }
+        // 判断value是否为空，为空则清空，否则查找ID相同的item
+        if (n.length > 0) {
+          // 过滤出ID相同的item
+          this.selectedList = this.attachmentList.filter(item => {
+            if (n.includes(item.id)) {
+              return item
+            }
+          })
+          console.log(this.selectedList, '----selectedList')
+        } else {
+          this.selectedAttachmentList = []
+        }
+
+      },
+      immediate: true
     }
   },
   methods: {
@@ -73,9 +102,13 @@ export default {
     },
     // 点击确定
     submitForm() {
-      this.value = this.selectedAttachmentList
-      this.$emit('input', this.value)
-      this.$emit('uploadSelectedFile', this.selectedAttachmentList)
+      // this.value = this.selectedAttachmentList
+      let selectedId = []
+      this.selectedAttachmentList.forEach((item, index) => {
+        selectedId.push(item.id)
+      })
+      this.$emit('input', selectedId)
+      // this.$emit('uploadSelectedFile', this.selectedAttachmentList)
       this.open = false
     },
     // 点击取消
@@ -101,6 +134,11 @@ export default {
     // 点击移除选中的某个文附件
     removeAttachment(index) {
       this.selectedAttachmentList.splice(index, 1)
+      let selectedId = []
+      this.selectedAttachmentList.forEach((item, index) => {
+        selectedId.push(item.id)
+      })
+      this.$emit('deleteAttachment', selectedId)
     }
   }
 }
diff --git a/d3code-ui/src/views/attachment/attachment/index.vue b/d3code-ui/src/views/attachment/attachment/index.vue
index 8b9f4ec7d58cedcd4751a82eab682a771435791f..758f94cf739eaae2f9d469241c2ad8e517d31064 100644
--- a/d3code-ui/src/views/attachment/attachment/index.vue
+++ b/d3code-ui/src/views/attachment/attachment/index.vue
@@ -3,12 +3,12 @@
     <!-- 附件面板 -->
     <attachment-panel @askFileInformation="fileInformation" :isEdit="true">
       <el-button
-        type="primary"
-        plain
-        icon="el-icon-plus"
-        size="mini"
-        @click="handleAdd"
-        v-hasPermi="['attachment:attachment:add']"
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['attachment:attachment:add']"
       >新增
       </el-button>
     </attachment-panel>
@@ -17,10 +17,10 @@
 
     <!-- 附件详情信息 -->
     <el-drawer
-      title="我是标题"
-      :visible.sync="drawer"
-      :with-header="false"
-      size="600px"
+        title="我是标题"
+        :visible.sync="drawer"
+        :with-header="false"
+        size="600px"
     >
       <div style="font-size: 18px;padding: 20px 20px 0;font-weight: bold">文件详情</div>
       <el-divider></el-divider>
@@ -127,21 +127,21 @@ export default {
     }
   },
   created() {
-    this.getList()
+    // this.getList()
   },
   methods: {
     /** 查询文件管理列表 */
-    getList() {
-      this.loading = true
-      getEnabledEngineConfig().then(response => {
-        this.ossConfig = response.data
-        return listAttachment(this.queryParams)
-      }).then(response => {
-        this.attachmentList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
+    // getList() {
+    //   this.loading = true
+    //   getEnabledEngineConfig().then(response => {
+    //     this.ossConfig = response.data
+    //     return listAttachment(this.queryParams)
+    //   }).then(response => {
+    //     this.attachmentList = response.rows
+    //     this.total = response.total
+    //     this.loading = false
+    //   })
+    // },
     // 表单重置
     reset() {
       this.form = {
diff --git a/d3code-ui/src/views/system/notice/index.vue b/d3code-ui/src/views/system/notice/index.vue
index 9682a656267b349cbf1a6bc129ab623012c9894a..3850d5b0b10c866655d1156bdff776467947f4c5 100644
--- a/d3code-ui/src/views/system/notice/index.vue
+++ b/d3code-ui/src/views/system/notice/index.vue
@@ -3,27 +3,27 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公告标题" prop="noticeTitle">
         <el-input
-            v-model="queryParams.noticeTitle"
-            placeholder="请输入公告标题"
-            clearable
-            @keyup.enter.native="handleQuery"
+          v-model="queryParams.noticeTitle"
+          placeholder="请输入公告标题"
+          clearable
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="操作人员" prop="createBy">
         <el-input
-            v-model="queryParams.createBy"
-            placeholder="请输入操作人员"
-            clearable
-            @keyup.enter.native="handleQuery"
+          v-model="queryParams.createBy"
+          placeholder="请输入操作人员"
+          clearable
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="类型" prop="noticeType">
         <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
           <el-option
-              v-for="dict in dict.type.sys_notice_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+            v-for="dict in dict.type.sys_notice_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -36,36 +36,36 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['system:notice:add']"
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:notice:add']"
         >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['system:notice:edit']"
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:notice:edit']"
         >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:notice:remove']"
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:notice:remove']"
         >删除
         </el-button>
       </el-col>
@@ -76,10 +76,10 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" align="center" prop="noticeId" width="100"/>
       <el-table-column
-          label="公告标题"
-          align="center"
-          prop="noticeTitle"
-          :show-overflow-tooltip="true"
+        label="公告标题"
+        align="center"
+        prop="noticeTitle"
+        :show-overflow-tooltip="true"
       />
       <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
         <template slot-scope="scope">
@@ -100,19 +100,19 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:notice:edit']"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:notice:edit']"
           >修改
           </el-button>
           <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:notice:remove']"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:notice:remove']"
           >删除
           </el-button>
         </template>
@@ -120,11 +120,11 @@
     </el-table>
 
     <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
     />
 
     <!-- 添加或修改公告对话框 -->
@@ -140,10 +140,10 @@
             <el-form-item label="公告类型" prop="noticeType">
               <el-select v-model="form.noticeType" placeholder="请选择公告类型">
                 <el-option
-                    v-for="dict in dict.type.sys_notice_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
+                  v-for="dict in dict.type.sys_notice_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -152,9 +152,9 @@
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
                 <el-radio
-                    v-for="dict in dict.type.sys_notice_status"
-                    :key="dict.value"
-                    :label="dict.value"
+                  v-for="dict in dict.type.sys_notice_status"
+                  :key="dict.value"
+                  :label="dict.value"
                 >{{ dict.label }}
                 </el-radio>
               </el-radio-group>
@@ -242,6 +242,7 @@ export default {
     cancel() {
       this.open = false
       this.reset()
+      console.log(this.form.attachmentList)
     },
     // 表单重置
     reset() {
diff --git a/d3code-ui/src/views/system/user/index.vue b/d3code-ui/src/views/system/user/index.vue
index a92e2760879eba2b8df07e6fc9bb4e8ad9549a81..fce860e54e922d7676b8b4b306b957e8b59435f2 100644
--- a/d3code-ui/src/views/system/user/index.vue
+++ b/d3code-ui/src/views/system/user/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="4" :xs="24">
+      <el-col :span="4" :xs="24" style="box-shadow: 2px 0 4px rgba(0, 21, 41, 0.35);">
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -29,7 +29,9 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px"
+        >
           <el-form-item label="用户名称" prop="userName">
             <el-input
               v-model="queryParams.userName"
@@ -89,7 +91,8 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
-            >新增</el-button>
+            >新增
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -100,7 +103,8 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:user:edit']"
-            >修改</el-button>
+            >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -111,7 +115,8 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-            >删除</el-button>
+            >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -121,7 +126,8 @@
               size="mini"
               @click="handleImport"
               v-hasPermi="['system:user:import']"
-            >导入</el-button>
+            >导入
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -131,18 +137,27 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['system:user:export']"
-            >导出</el-button>
+            >导出
+            </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+                           :show-overflow-tooltip="true"
+          />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+                           :show-overflow-tooltip="true"
+          />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+                           :show-overflow-tooltip="true"
+          />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
+                           v-if="columns[4].visible" width="120"
+          />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
@@ -171,21 +186,29 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
-              >修改</el-button>
+              >修改
+              </el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+              >删除
+              </el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                           v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
+              >
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                                    v-hasPermi="['system:user:resetPwd']"
+                  >重置密码
+                  </el-dropdown-item>
                   <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                                    v-hasPermi="['system:user:edit']"
+                  >分配角色
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -213,31 +236,33 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
+                        show-password
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -261,7 +286,8 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                >{{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -326,10 +352,14 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport"/>
+            是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                   @click="importTemplate"
+          >下载模板
+          </el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -341,13 +371,22 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {
+  listUser,
+  getUser,
+  delUser,
+  addUser,
+  updateUser,
+  resetUserPwd,
+  changeUserStatus,
+  deptTreeSelect
+} from '@/api/system/user'
+import { getToken } from '@/utils/auth'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: "User",
+  name: 'User',
   dicts: ['sys_normal_disable', 'sys_user_sex'],
   components: { Treeselect },
   data() {
@@ -367,7 +406,7 @@ export default {
       // 用户表格数据
       userList: null,
       // 弹出层标题
-      title: "",
+      title: '',
       // 部门树选项
       deptOptions: undefined,
       // 是否显示弹出层
@@ -385,23 +424,23 @@ export default {
       // 表单参数
       form: {},
       defaultProps: {
-        children: "children",
-        label: "label"
+        children: 'children',
+        label: 'label'
       },
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
-        title: "",
+        title: '',
         // 是否禁用上传
         isUploading: false,
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: { Authorization: 'Bearer ' + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+        url: process.env.VUE_APP_BASE_API + '/system/user/importData'
       },
       // 查询参数
       queryParams: {
@@ -425,88 +464,88 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { required: true, message: '用户名称不能为空', trigger: 'blur' },
           { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: '用户昵称不能为空', trigger: 'blur' }
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { required: true, message: '用户密码不能为空', trigger: 'blur' },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
         email: [
           {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
+            type: 'email',
+            message: '请输入正确的邮箱地址',
+            trigger: ['blur', 'change']
           }
         ],
         phonenumber: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
           }
         ]
       }
-    };
+    }
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
-      this.$refs.tree.filter(val);
+      this.$refs.tree.filter(val)
     }
   },
   created() {
-    this.getList();
-    this.getDeptTree();
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg;
-    });
+    this.getList()
+    this.getDeptTree()
+    this.getConfigKey('sys.user.initPassword').then(response => {
+      this.initPassword = response.msg
+    })
   },
   methods: {
     /** 查询用户列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+          this.userList = response.rows
+          this.total = response.total
+          this.loading = false
         }
-      );
+      )
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
       deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
+        this.deptOptions = response.data
+      })
     },
     // 筛选节点
     filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.handleQuery();
+      this.queryParams.deptId = data.id
+      this.handleQuery()
     },
     // 用户状态修改
     handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
+      let text = row.status === '0' ? '启用' : '停用'
       this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status);
+        return changeUserStatus(row.userId, row.status)
       }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
+        this.$modal.msgSuccess(text + '成功')
       }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
+        row.status = row.status === '0' ? '1' : '0'
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -519,119 +558,121 @@ export default {
         phonenumber: undefined,
         email: undefined,
         sex: undefined,
-        status: "0",
+        status: '0',
         remark: undefined,
         postIds: [],
         roleIds: []
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.queryParams.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
-      this.handleQuery();
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.queryParams.deptId = undefined
+      this.$refs.tree.setCurrentKey(null)
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
+      this.ids = selection.map(item => item.userId)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
     },
     // 更多操作触发
     handleCommand(command, row) {
       switch (command) {
-        case "handleResetPwd":
-          this.handleResetPwd(row);
-          break;
-        case "handleAuthRole":
-          this.handleAuthRole(row);
-          break;
+        case 'handleResetPwd':
+          this.handleResetPwd(row)
+          break
+        case 'handleAuthRole':
+          this.handleAuthRole(row)
+          break
         default:
-          break;
+          break
       }
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      this.reset()
       getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.open = true;
-        this.title = "添加用户";
-        this.form.password = this.initPassword;
-      });
+        this.postOptions = response.posts
+        this.roleOptions = response.roles
+        this.open = true
+        this.title = '添加用户'
+        this.form.password = this.initPassword
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const userId = row.userId || this.ids;
+      this.reset()
+      const userId = row.userId || this.ids
       getUser(userId).then(response => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.open = true;
-        this.title = "修改用户";
-        this.form.password = "";
-      });
+        this.form = response.data
+        this.postOptions = response.posts
+        this.roleOptions = response.roles
+        this.$set(this.form, 'postIds', response.postIds)
+        this.$set(this.form, 'roleIds', response.roleIds)
+        this.open = true
+        this.title = '修改用户'
+        this.form.password = ''
+      })
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
         closeOnClickModal: false,
         inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+        inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
       }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {});
+        resetUserPwd(row.userId, value).then(response => {
+          this.$modal.msgSuccess('修改成功，新密码是：' + value)
+        })
+      }).catch(() => {
+      })
     },
     /** 分配角色操作 */
     handleAuthRole: function(row) {
-      const userId = row.userId;
-      this.$router.push("/system/user-auth/role/" + userId);
+      const userId = row.userId
+      this.$router.push('/system/user-auth/role/' + userId)
     },
     /** 提交按钮 */
     submitForm: function() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids;
+      const userIds = row.userId || this.ids
       this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
+        return delUser(userIds)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -641,30 +682,29 @@ export default {
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
+      this.upload.title = '用户导入'
+      this.upload.open = true
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
+      this.upload.isUploading = true
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.$alert('<div style=\'overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;\'>' + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
+      this.getList()
     },
     // 提交上传文件
     submitFileForm() {
-      this.$refs.upload.submit();
+      this.$refs.upload.submit()
     }
   }
-};
+}
 </script>