From caf1587264d5a0846ae57368e042197d1ca15b52 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 23 Aug 2022 16:05:03 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue       |  92 ++++++++-----------
 src/layouts/home/index.vue         |   5 +-
 src/layouts/navbar/index.vue       |  80 ++++++++--------
 src/pages/account/login/index.vue  |  51 +++++------
 src/pages/annex/list/index.vue     |  59 +++++++-----
 src/pages/article/add/index.vue    | 120 ++++++++++++------------
 src/pages/article/list/index.vue   |  74 +++++++++++++--
 src/pages/column/add/index.vue     |  39 ++++++--
 src/pages/column/list/index.vue    |  38 +++++---
 src/pages/page/list/index.vue      |  41 +++++++--
 src/pages/role/list/index.vue      |  79 ++++++++--------
 src/pages/setting/list/info.vue    |   8 +-
 src/pages/site/list/index.vue      |  13 ++-
 src/pages/user/list/index.vue      | 142 ++++++++++-------------------
 src/pages/userGroup/list/index.vue |  16 +++-
 src/router/modules/setting.js      |  12 +--
 src/router/permission.js           |  20 ++--
 src/setting.js                     |  47 +++-------
 src/store/modules/content.js       |   6 +-
 src/styles/common.scss             |  43 +++++----
 20 files changed, 535 insertions(+), 450 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index f17900b..de3cc87 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -2,22 +2,23 @@
   <div class="header">
     <div class="group">
       <img src="@/assets/img/group.png">
-      <!-- <span>站点管理</span> -->
       <breadcrumb v-if="crumbRefresh" ref="breadcrumb" :data="crumbs"></breadcrumb>
     </div>
     <div class="user-tool">
-      <div class="site cp">
-        <img src="@/assets/img/index.png">
-        当前站点首页
-      </div>
-      <el-dropdown class="site-switch cp">
-        <span class="el-dropdown-link">
-          切换站点<i class="el-icon-caret-bottom el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item v-for="(site, i) in sites" :key="i">{{ site.name }}</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+      <template v-if="inContent">
+        <div class="site cp">
+          <img src="@/assets/img/index.png">
+          当前站点首页
+        </div>
+        <el-dropdown class="site-switch cp" @command="siteCommand">
+          <span class="el-dropdown-link">
+            切换站点<i class="el-icon-caret-bottom el-icon--right"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-for="(site, i) in sites" :key="i" :command="site">{{ site.name }}</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </template>
       <img class="cp" src="@/assets/img/notice.png">
       <el-dropdown class="user-wrap" @command="userCommand">
         <div class="user">
@@ -35,14 +36,14 @@
 <script>
 import { mapState, mapMutations, mapActions } from 'vuex'
 import ColumnConst from '@/const/column'
-import Bus from '@/libs/bus'
 import breadcrumb from '@/components/breadcrumb'
 export default {
     data() {
       return {
         sites: ColumnConst.sites,
-        // crumbs: '',
-        crumbRefresh: true
+        crumbRefresh: true,
+        inContent: false, // 是否显示站点切换
+        sitePath: ['/page', '/column', '/article']
       };
     },
     components: {
@@ -59,54 +60,39 @@ export default {
         this.$nextTick(() => {
           this.crumbRefresh = true
         })
+      },
+      '$route'() {
+        this.setContent()
       }
     },
     mounted() {
-      // this.getSystemDetail()
+      this.setContent()
       // this.getUserDetail()
     },
     methods: {
-      ...mapMutations("user", [
-        'SET_SCHOOLID'
-      ]),
       ...mapActions("user", [
         'logout'
       ]),
-      getSystemDetail() { // 获取系统logo
-          this.$get(this.api.logoDetail).then(res => {
-            const { data } = res
-            if (data) {
-              this.setTitle(data.title)
-              this.setLogoUrl(data.logoUrl)
-              this.SET_SCHOOLID(data.schoolId)
-            } else {
-              // 获取schoolId
-              this.$post(this.api.getSchoolIdByToken).then(res => {
-                this.SET_SCHOOLID(res.schoolId)
-              }).catch(res => {})
-            }
-          }).catch(res => {})
+      ...mapMutations('content', [
+        'setSite'
+      ]),
+      // 显示隐藏站点切换
+      setContent() {
+        const { path } = this.$route
+        this.inContent = !!this.sitePath.find(e => path.includes(e))
       },
-      getUserDetail() { // 获取用户详情
-        this.$get(this.api.queryUserInfoDetails).then(res => {
-          let { hrUserInfo } = res.result
-          if (hrUserInfo) {
-            const { userAvatars, userName } = hrUserInfo
-            userAvatars && this.setAvatar(userAvatars)
-            this.setUserName(userName)
-          } else {
-            this.$get(this.api.isClient).then(res => {
-              res.customerName && this.setUserName(res.customerName)
-            }).catch(res => {})
-          }
-        }).catch(res => {})
+      // 站点切换回调
+      siteCommand(e) {
+        this.setSite(e)
+        location.reload()
       },
-      userCommand(command) { // 切换下拉菜单
-          if (command == "person") {
-              this.$router.push("/setting/person");
-          } else {
-              this.logout()
-          }
+      // 用户切换回调
+      userCommand(command) {
+        if (command == 'person') {
+          this.$router.push('/setting')
+        } else {
+          this.logout()
+        }
       },
     }
 };
diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index af9b40f..4f0d9c3 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -9,7 +9,6 @@
                   <router-view class="view"></router-view>
                 </transition>
                 <el-backtop target=".content"></el-backtop>
-                <v-footer ref="footer"></v-footer>
             </div>
         </div>
     </div>
@@ -44,11 +43,11 @@ export default {
     .layout{
         width: calc(100% - 256px);
         .content{
-            height: calc(100vh - 80px);
+            height: calc(100vh - 64px);
             padding: 24px 24px 0;
             overflow: auto;
             .view{
-                min-height: calc(100% - 60px);
+                min-height: 100%;
             }
         }
     }
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 1f985e2..8076222 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -44,25 +44,26 @@
         <img class="logo-icon" src="@/assets/img/logo.png" alt="">
         <ul class="col-nav">
           <li v-for="(item, i) in colNav" :key="i" @click="menuSelect(item.index)">
-            <img :src="require('@/assets/img/' + item.icon + '.png')" alt="">
+            <img width="15" :src="require('@/assets/img/' + item.icon + '.png')" alt="">
           </li>
         </ul>
       </div>
-      <div>
-        <div class="name">粒子研究院中文站点</div>
+      <div class="col-menu">
+        <div class="name">{{ this.$store.state.content.site.name }}</div>
         <el-menu
           v-if="colRefresh"
           :default-active="siteActive"
           background-color="#fff"
           text-color="#333"
           active-text-color="#fff"
+          :collapse-transition="false"
           router
         >
           <template v-for="item in sites">
             <template v-if="item.subs">
               <el-submenu :index="item.index" :key="item.index">
                   <template slot="title">
-                    <img class="icon" :src="require('@/assets/img/' + item.icon + '.png')" alt="">
+                    <img width="14" class="icon" :src="require('@/assets/img/' + item.icon + '.png')" alt="">
                     <span slot="title">{{ item.title }}</span>
                   </template>
                   <template v-for="subItem in item.subs">
@@ -188,7 +189,8 @@ export default {
         const ori = this.collapse
         this.collapse = !!this.sites[0].subs.find(e => path.includes(e.index))
         // 刷新菜单
-        if (!ori && this.collapse) {
+        if (!ori && this.sites[0].subs.find(e => from.path.includes(e.index))) {
+          this.siteActive = '/page'
           this.colRefresh = false
           this.$nextTick(() => {
             this.colRefresh = true
@@ -203,39 +205,39 @@ export default {
       // this.getPer()
     },
     methods: {
-        ...mapActions('user', [
-          'logout'
-        ]),
-        // 菜单选择
-        menuSelect(index) {
-          this.collapse = false
-          if (index.includes('/')) {
-            this.$router.push(index)
-          }
-        },
-        // 获取权限列表
-        getPer() {
-          this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
-            const routes = res.permissionMenu[0].children
-            addRoutes(routes)
-            this.initMenu()
-          }).catch(({ status }) => {
-            status === 500 && this.logout()
-          })
-        },
-        initMenu() {
-          // 如果开启了动态路由，则取store里的路由匹配
-          if (Setting.dynamicRoute) {
-            const { routes } = this
-            const menus = []
-            this.defaultMenus.map(e => {
-              routes.find(n => n.path === e.index) && menus.push(e)
-            });
-            this.menus = menus
-          } else {
-            this.menus = this.defaultMenus
-          }
+      ...mapActions('user', [
+        'logout'
+      ]),
+      // 菜单选择
+      menuSelect(index) {
+        this.collapse = false
+        if (index.includes('/')) {
+          this.$router.push(index)
         }
+      },
+      // 获取权限列表
+      getPer() {
+        this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
+          const routes = res.permissionMenu[0].children
+          addRoutes(routes)
+          this.initMenu()
+        }).catch(({ status }) => {
+          status === 500 && this.logout()
+        })
+      },
+      initMenu() {
+        // 如果开启了动态路由，则取store里的路由匹配
+        if (Setting.dynamicRoute) {
+          const { routes } = this
+          const menus = []
+          this.defaultMenus.map(e => {
+            routes.find(n => n.path === e.index) && menus.push(e)
+          });
+          this.menus = menus
+        } else {
+          this.menus = this.defaultMenus
+        }
+      }
     }
 };
 </script>
@@ -275,6 +277,7 @@ export default {
     display: flex;
     height: 100%;
     background-color: #fff;
+    overflow: hidden;
     .col-wrap {
       width: 64px;
       background-color: #001529;
@@ -296,6 +299,9 @@ export default {
       color: #333;
       line-height: 32px;
     }
+    .col-menu {
+      width: 192px;
+    }
     /deep/.el-submenu__title {
       padding-left: 14px !important;
     }
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 12b0450..4c27ba2 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -62,36 +62,35 @@
 </template>
 
 <script>
-import { mapActions, mapMutations } from "vuex";
-import vFooter from "@/layouts/footer";
-import util from "@/libs/util";
-import Setting from "@/setting";
-
+import { mapActions, mapMutations } from 'vuex'
+import vFooter from '@/layouts/footer'
+import util from '@/libs/util'
+import Setting from '@/setting'
 export default {
     data: function() {
-        return {
-            activeName: "1",
-            loginForm: {
-                username: "",
-                password: "",
-                captcha: "", // 验证码
-            },
-            loginRules: {
-                username: [{ required: true, message: "请输入账号", trigger: "blur" }],
-                password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-                captcha: [{ required: true, message: "请输入验证码", trigger: "blur" }]
-            },
-            verificationIMG: "",
-            phoneVisible: false, // 绑定手机号对话框
-            phone: "",
-            phoneCode: "",
-            phoneDisabled: false,
-            phoneTimer: null,
-            phoneBtnText: "发送验证码"
-        };
+      return {
+        activeName: "1",
+        loginForm: {
+            username: "",
+            password: "",
+            captcha: "", // 验证码
+        },
+        loginRules: {
+            username: [{ required: true, message: "请输入账号", trigger: "blur" }],
+            password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+            captcha: [{ required: true, message: "请输入验证码", trigger: "blur" }]
+        },
+        verificationIMG: "",
+        phoneVisible: false, // 绑定手机号对话框
+        phone: "",
+        phoneCode: "",
+        phoneDisabled: false,
+        phoneTimer: null,
+        phoneBtnText: "发送验证码"
+      };
     },
     components: {
-        vFooter
+      vFooter
     },
     created() {
         this.getVerImg();
diff --git a/src/pages/annex/list/index.vue b/src/pages/annex/list/index.vue
index 6a6f8e0..ba11407 100644
--- a/src/pages/annex/list/index.vue
+++ b/src/pages/annex/list/index.vue
@@ -29,8 +29,15 @@
     </div>
     <div class="tool">
       <div class="search-wrap">
-        <el-input placeholder="请输入文章名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
-        <el-button type="primary" @click="initData">查询</el-button>
+        <el-select v-model="field" @change="initData">
+          <el-option
+            v-for="(item, i) in keywords"
+            :key="i"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+        <el-input class="keyword" placeholder="请输入文章名称" v-model.trim="keyword" clearable></el-input>
       </div>
       <div class="actions">
         <el-button @click="batchDel">删除</el-button>
@@ -38,7 +45,7 @@
     </div>
 
     <el-table ref="table" :data="list" class="table" header-align="center" @selection-change="handleSelectionChange" row-key="id">
-      <el-table-column type="selection" width="50" :reserve-selection="true"></el-table-column>
+      <el-table-column type="selection" width="50" align="center" :reserve-selection="true" :selectable="row => !row.quote"></el-table-column>
       <el-table-column type="index" width="60" label="ID"></el-table-column>
       <el-table-column prop="site" label="站点名称" min-width="180"></el-table-column>
       <el-table-column prop="type" label="文件类型" min-width="100"></el-table-column>
@@ -58,7 +65,7 @@
       </el-table-column>
       <el-table-column label="操作" width="170">
         <template slot-scope="scope">
-          <el-button type="text" :disabled="scope.row.quote" @click="del(scope.row)">删除</el-button>
+          <el-button type="text" :disabled="scope.row.quote !== ''" @click="del(scope.row)">删除</el-button>
           <el-button type="text" @click="download(scope.row, 'edit')">下载</el-button>
         </template>
       </el-table-column>
@@ -90,6 +97,21 @@ export default {
               name: '文档'
             }
           ],
+          field: 'fileName',
+          keywords: [
+            {
+              id: 'fileName',
+              name: '文件名称'
+            },
+            {
+              id: 'uploader',
+              name: '上传人'
+            },
+            {
+              id: 'quote',
+              name: '文章名称'
+            }
+          ],
           keyword: '',
           form: {
             site: '',
@@ -102,6 +124,14 @@ export default {
           multipleSelection: [],
         };
     },
+    watch: {
+      keyword: function(val) {
+        clearTimeout(this.searchTimer)
+        this.searchTimer = setTimeout(() => {
+          this.initData()
+        }, 500)
+      }
+    },
     mounted() {
       this.$store.commit('user/SET_CRUMBS', [
         {
@@ -116,7 +146,9 @@ export default {
         this.$post(this.api.listByPage, {
           page: this.page,
           limit: this.pageSize,
-          quote: this.keyword,
+          quote: this.field === 'quote' ? this.keyword : '',
+          fileName: this.field === 'fileName' ? this.keyword : '',
+          uploader: this.field === 'uploader' ? this.keyword : '',
           site: form.site,
           type: form.type === '不限' ? '' : form.type
         }).then(({ data }) => {
@@ -174,20 +206,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.styles {
-  display: inline-flex;
-  li {
-    margin-right: 20px;
-    text-align: center;
-    &:hover .review {
-      border-color: #2962FF;
-    }
-  }
-  .review {
-    padding: 18px;
-    margin-bottom: 10px;
-    border: 1px solid #DCDEE0;
-    border-radius: 2px;
-  }
-}
+
 </style>
\ No newline at end of file
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index bc4c3b8..eae0031 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -60,58 +60,54 @@
           clearable
         ></el-input>
       </el-form-item>
-      <div class="item-line">
-        <el-form-item prop="titleImg" label="标题图">
-          <el-upload
-            class="avatar-uploader"
-            accept=".jpg,.png,.jpeg,.gif"
-            :before-upload="beforeUpload"
-            :on-remove="handleRemove"
-            :on-error="uploadError"
-            :on-success="uploadSuccess"
-            :limit="1"
-            :on-exceed="handleExceed"
-            :show-file-list="false"
-            :action="this.api.upload"
-            :data="{
-              quote: form.title,
-              site: '粒子研究院中文站点',
-              uploader: userName
-            }"
-          >
-            <img v-if="form.titleImg" :src="form.titleImg" class="avatar">
-            <div class="uploader-default" v-else>
-              <img class="plus" src="@/assets/img/plus.png" alt="">
-              <p>点击上传</p>
-            </div>
-          </el-upload>
-        </el-form-item>
-        <el-form-item prop="bannerImg" label="banner图" style="flex: 1;">
-          <el-upload
-            class="avatar-uploader avatar-uploader-lg"
-            accept=".jpg,.png,.jpeg,.gif"
-            :before-upload="beforeUpload"
-            :on-remove="handleRemove"
-            :on-error="uploadError"
-            :on-success="uploadSuccessBanner"
-            :limit="1"
-            :on-exceed="handleExceed"
-            :show-file-list="false"
-            :action="this.api.upload"
-            :data="{
-              quote: form.title,
-              site: '粒子研究院中文站点',
-              uploader: userName
-            }"
-          >
-            <img v-if="form.bannerImg" :src="form.bannerImg" class="avatar">
-            <div class="uploader-default" v-else>
-              <img class="plus" src="@/assets/img/plus.png" alt="">
-              <p>点击上传</p>
-            </div>
-          </el-upload>
-        </el-form-item>
-      </div>
+      <el-form-item prop="titleImg" label="封面图">
+        <el-upload
+          class="avatar-uploader"
+          accept=".jpg,.png,.jpeg,.gif"
+          :before-upload="beforeUpload"
+          :on-error="uploadError"
+          :on-success="uploadSuccess"
+          :limit="1"
+          :on-exceed="handleExceed"
+          :show-file-list="false"
+          :action="this.api.upload"
+          :data="{
+            quote: form.title,
+            site: '粒子研究院中文站点',
+            uploader: userName
+          }"
+        >
+          <img v-if="form.titleImg" :src="form.titleImg" class="avatar">
+          <div class="uploader-default" v-else>
+            <img class="plus" src="@/assets/img/plus.png" alt="">
+            <p>点击上传</p>
+          </div>
+        </el-upload>
+      </el-form-item>
+      <el-form-item prop="bannerImg" label="Banner图" style="flex: 1;">
+        <el-upload
+          class="avatar-uploader avatar-uploader-lg"
+          accept=".jpg,.png,.jpeg,.gif"
+          :before-upload="beforeUpload"
+          :on-error="uploadError"
+          :on-success="uploadSuccessBanner"
+          :limit="1"
+          :on-exceed="handleExceed"
+          :show-file-list="false"
+          :action="this.api.upload"
+          :data="{
+            quote: form.title,
+            site: '粒子研究院中文站点',
+            uploader: userName
+          }"
+        >
+          <img v-if="form.bannerImg" :src="form.bannerImg" class="avatar">
+          <div class="uploader-default" v-else>
+            <img class="plus" src="@/assets/img/plus.png" alt="">
+            <p>点击上传</p>
+          </div>
+        </el-upload>
+      </el-form-item>
       <el-form-item class="lg" prop="articleTemplate" label="独立文章模板">
         <el-tooltip effect="dark" content="支持导入其它数据用于实验，总上传的文件大小不可以超过10M" placement="bottom">
           <img class="info" src="@/assets/img/ques.png" alt="">
@@ -227,7 +223,7 @@ import VueUeditorWrap from 'vue-ueditor-wrap'
 export default {
     data() {
         return {
-          siteId: this.$store.state.content.siteId,
+          siteId: this.$store.state.content.site.id,
           headers: {},
           nameRepeat: false,
           types: ColumnConst.types,
@@ -241,7 +237,7 @@ export default {
           },
           links: [],
           form: {
-            siteId: this.$store.state.content.siteId,
+            siteId: this.$store.state.content.site.id,
             id: this.$route.query.id || '',
             founderId: +this.$store.state.user.userId,
             editorId: +this.$store.state.user.userId,
@@ -263,21 +259,22 @@ export default {
           },
           rules: {
             title: [
-              { required: true }
+              { required: true, message: '请输入标题', trigger: 'blur' }
             ],
             columnId: [
-              { required: true }
+              { required: true, message: '请选择所属栏目', trigger: 'change' }
             ],
             releaseTime: [
-              { required: true }
+              { required: true, message: '请选择发布日期', trigger: 'change' }
             ],
             mainBody: [
-              { required: true }
+              { required: true, message: '请输入正文', trigger: 'blur' }
             ],
           },
           editorConfig: {
             UEDITOR_HOME_URL: '/UEditor/',
-            serverUrl: 'http://192.168.31.137:10000/iasf/sysFiles/upload' // 上传接口
+            initialFrameHeight: 200,
+            serverUrl: 'http://192.168.31.137:10000/iasf/sysFiles/upload/' // 上传接口
           },
           submiting: false, // 新增编辑防抖标识
           updateTime: 0
@@ -395,7 +392,7 @@ export default {
         this.form.columnBanner = ''
       },
       uploadSuccess(res) {
-        this.form.columnBanner = res.data.url
+        this.form.titleImg = res.data.url
       },
       uploadSuccessBanner(res) {
         this.form.bannerImg = res.data.url
@@ -413,7 +410,7 @@ export default {
         const { form } = this
         if (!form.title) return util.errorMsg('请填写标题')
         if (this.nameRepeat) return util.errorMsg('该标题已重复!')
-        if (!form.releaseTime) return util.errorMsg('请选择发布日期')
+        if (!form.releaseTime && isRelease) return util.errorMsg('请选择发布日期')
         if (typeof form.fatherId	=== 'object') form.fatherId	= form.fatherId[form.fatherId.length - 1]
         if (form.articleTemplate === 3 && form.connectionType !== 2) {
           const { links } = this
@@ -421,7 +418,6 @@ export default {
           if (!links.length && form.connectionType === 3) return util.errorMsg('请选择栏目')
           form.linkAddress = links.join()
         }
-        console.log(44, this.links)
         form.isRelease = isRelease
         this.submiting = true
         if (form.id) {
diff --git a/src/pages/article/list/index.vue b/src/pages/article/list/index.vue
index 06ee821..4a181a8 100644
--- a/src/pages/article/list/index.vue
+++ b/src/pages/article/list/index.vue
@@ -1,16 +1,23 @@
 <template>
   <div class="flex page">
-    <div style="width: 218px">
+    <div style="width: 218px;border-right: 1px solid #EBEDF0">
       <p class="page-name mb">全部栏目</p>
       <div style="height: 504px;overflow: auto">
-        <el-tree ref="column" :data="columns" :props="defaultProps" node-key="id" @node-click="getData"></el-tree>
+        <el-tree ref="column" :data="columns" highlight-current :expand-on-click-node="false" default-expand-all :props="defaultProps" node-key="id" @node-click="getData"></el-tree>
       </div>
     </div>
-    <div class="flex-1">
+    <div class="flex-1 p-l-20">
       <div class="tool">
         <div class="search-wrap">
-          <el-input placeholder="请输入文章标题" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
-          <el-button type="primary" @click="initData">查询</el-button>
+          <!-- <el-select v-model="field" @change="initData">
+            <el-option
+              v-for="(item, i) in keywords"
+              :key="i"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select> -->
+          <el-input placeholder="请输入文章标题" v-model.trim="keyword" clearable></el-input>
         </div>
         <div class="actions">
           <el-dropdown class="setting" trigger="click" :hide-on-click="false">
@@ -35,13 +42,17 @@
         <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
         <el-table-column v-if="settings[1].show" prop="title" label="标题" align="center" min-width="100"></el-table-column>
         <el-table-column v-if="settings[2].show" prop="columnName" label="栏目" align="center" min-width="100"></el-table-column>
-        <el-table-column v-if="settings[3].show" prop="releaseTime" label="发布日期" align="center" min-width="100"></el-table-column>
-        <el-table-column v-if="settings[4].show" prop="workNumber" label="状态" align="center" min-width="100">
+        <el-table-column v-if="settings[3].show" prop="founderName" label="录入人" align="center" min-width="80"></el-table-column>
+        <el-table-column v-if="settings[4].show" prop="editorName" label="修改人" align="center" min-width="80"></el-table-column>
+        <el-table-column v-if="settings[5].show" prop="updateTime" label="修改日期" align="center" min-width="110"></el-table-column>
+        <el-table-column v-if="settings[6].show" prop="releaseTime" label="发布日期" align="center" min-width="110"></el-table-column>
+        <el-table-column v-if="settings[7].show" prop="totalBrowsing" label="总浏览" align="center" min-width="80"></el-table-column>
+        <el-table-column v-if="settings[8].show" prop="workNumber" label="状态" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.isRelease ? '已发布' : '草稿' }}
           </template>
         </el-table-column>
-        <el-table-column v-if="settings[5].show" label="操作" align="center" width="300">
+        <el-table-column v-if="settings[9].show" label="操作" align="center" width="300">
           <template slot-scope="scope">
             <el-button v-auth type="text" @click="resetPassword(scope.row)">预览</el-button>
             <el-button v-auth type="text" @click="edit(scope.row)">编辑</el-button>
@@ -66,6 +77,25 @@ export default {
           value: 'id',
           label: 'columnName'
         },
+        field: 'title',
+        keywords: [
+          {
+            id: 'title',
+            name: '标题'
+          },
+          {
+            id: 'founderName',
+            name: '录入人'
+          },
+          {
+            id: 'columnName',
+            name: '栏目'
+          },
+          {
+            id: 'editorName',
+            name: '修改人'
+          }
+        ],
         keyword: '',
         list: [],
         page: 1,
@@ -86,10 +116,26 @@ export default {
             name: '栏目',
             show: true
           },
+          {
+            name: '录入人',
+            show: false
+          },
+          {
+            name: '修改人',
+            show: false
+          },
+          {
+            name: '修改日期',
+            show: false
+          },
           {
             name: '发布日期',
             show: true
           },
+          {
+            name: '总浏览',
+            show: false
+          },
           {
             name: '状态',
             show: true
@@ -101,6 +147,14 @@ export default {
         ]
       };
     },
+    watch: {
+      keyword: function(val) {
+        clearTimeout(this.searchTimer)
+        this.searchTimer = setTimeout(() => {
+          this.initData()
+        }, 500)
+      }
+    },
     mounted() {
       this.$store.commit('user/SET_CRUMBS', [
         {
@@ -121,7 +175,7 @@ export default {
       // 栏目树形
       getColumn() {
         this.$post(this.api.listWithTree, {
-          siteId: this.$store.state.content.siteId,
+          siteId: this.$store.state.content.site.id,
           columnName: '',
           templateId: '',
           typeId	: '',
@@ -136,7 +190,7 @@ export default {
       // 文章列表
       getData() {
         this.$post(this.api.queryArticle, {
-          siteId: this.$store.state.content.siteId,
+          siteId: this.$store.state.content.site.id,
           columnIds: [this.$refs.column.getCurrentKey()],
           pageNum: this.page,
           pageSize: this.pageSize,
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index f6fdb67..948c771 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="page">
     <p class="page-name mb">新增栏目</p>
-    <el-form class="input-form model" label-width="120px">
+    <el-form :model="form" :rules="rules" class="input-form model" label-width="120px">
       <div class="item-line">
         <el-form-item prop="columnName" label="栏目名称">
           <el-input
@@ -218,9 +218,7 @@
       </el-form-item>
     </el-form>
     <div class="btns">
-      <el-button type="primary" @click="submit(1)">发布</el-button>
-      <el-button @click="preview">预览</el-button>
-      <el-button v-if="!isEdit" @click="submit(0)">保存草稿</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
       <el-button @click="$router.back()">取消</el-button>
     </div>
   </div>
@@ -232,7 +230,7 @@ import { mapState } from 'vuex'
 export default {
     data() {
         return {
-          siteId: this.$store.state.content.siteId,
+          siteId: this.$store.state.content.site.id,
           isEdit: this.$route.query.type === 'edit',
           nameRepeat: false,
           types: ColumnConst.types,
@@ -246,7 +244,7 @@ export default {
           },
           links: [],
           form: {
-            siteId: this.$store.state.content.siteId,
+            siteId: this.$store.state.content.site.id,
             id: this.$route.query.id || '',
             founderId: +this.$store.state.user.userId,
             editorId: +this.$store.state.user.userId,
@@ -268,6 +266,29 @@ export default {
             sort: 1,
             isOpen: 1
           },
+          rules: {
+            columnName: [
+              { required: true, message: '请输入栏目名称', trigger: 'blur' }
+            ],
+            typeId: [
+              { required: true, message: '请选择栏目类型', trigger: 'change' }
+            ],
+            pageSize: [
+              { required: true, message: '请输入分页条数', trigger: 'blur' }
+            ],
+            templateId: [
+              { required: true, message: '请输入栏目名称', trigger: 'blur' }
+            ],
+            listStyleId: [
+              { required: true, message: '请选择栏目模板', trigger: 'change' }
+            ],
+            detailStyle: [
+              { required: true, message: '请选择详情样式', trigger: 'change' }
+            ],
+            connectionType: [
+              { required: true, message: '请选择连接类型', trigger: 'blur' }
+            ],
+          },
           submiting: false, // 新增编辑防抖标识
           updateTime: 0
         };
@@ -384,7 +405,7 @@ export default {
 
       },
       // 提交
-      submit(status) {
+      submit() {
         if (this.submiting) return false
         const { form } = this
         if (!form.columnName) return util.errorMsg('请填写栏目名称')
@@ -397,7 +418,6 @@ export default {
           if (!links.length && form.connectionType === 3) return util.errorMsg('请选择栏目')
           form.linkAddress = links.join()
         }
-        form.status = status
         this.submiting = true
         if (this.isEdit) {
           delete form.children
@@ -506,4 +526,7 @@ $upload-lg-height: 102px;
     border-radius: 2px;
   }
 }
+/deep/.input-form .auto .el-input {
+  width: 119px;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/column/list/index.vue b/src/pages/column/list/index.vue
index 5a93f46..5b74622 100644
--- a/src/pages/column/list/index.vue
+++ b/src/pages/column/list/index.vue
@@ -2,8 +2,7 @@
   <div class="page">
     <div class="tool">
       <div class="search-wrap">
-        <el-input placeholder="请输入栏目名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
-        <el-button type="primary" @click="initData">查询</el-button>
+        <el-input placeholder="请输入栏目名称" v-model.trim="keyword" clearable></el-input>
       </div>
       <div class="actions">
         <el-dropdown class="setting" trigger="click" :hide-on-click="false">
@@ -26,27 +25,28 @@
       </div>
     </div>
 
-    <el-table v-loading="listLoading" ref="table" :data="list" class="table" header-align="center" @selection-change="handleSelectionChange" row-key="id">
+    <el-table v-loading="listLoading" ref="table" :data="list" default-expand-all class="table" header-align="center" @selection-change="handleSelectionChange" row-key="id">
       <el-table-column v-if="settings[0].show" type="selection" width="50" :reserve-selection="true"></el-table-column>
-      <el-table-column prop="columnName" label="名称"></el-table-column>
-      <el-table-column v-if="settings[1].show" prop="typeId" label="栏目类型">
+      <el-table-column prop="columnName" label="名称" min-width="140"></el-table-column>
+      <el-table-column v-if="settings[1].show" prop="typeId" label="栏目类型" min-width="100">
         <template slot-scope="scope">
           {{ types.find(e => e.id == scope.row.typeId) && types.find(e => e.id == scope.row.typeId).name }}
         </template>
       </el-table-column>
-      <el-table-column v-if="settings[2].show" prop="templateId" label="栏目模板"></el-table-column>
-      <el-table-column v-if="settings[3].show" prop="listStyleId" label="列表/长页样式"></el-table-column>
-      <el-table-column v-if="settings[4].show" prop="detailStyle" label="详情样式"></el-table-column>
-      <el-table-column v-if="settings[5].show" prop="menuVisible" label="导航菜单">
+      <el-table-column v-if="settings[2].show" prop="templateId" label="栏目模板" min-width="100"></el-table-column>
+      <el-table-column v-if="settings[3].show" prop="listStyleId" label="列表/长页样式" min-width="100"></el-table-column>
+      <el-table-column v-if="settings[4].show" prop="detailStyle" label="详情样式" min-width="100"></el-table-column>
+      <el-table-column v-if="settings[5].show" prop="menuVisible" label="导航菜单" min-width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.menuVisible"
             :active-value="0"
-            :inactive-value="1">
+            :inactive-value="1"
+            @change="switchOff($event, scope.row, scope.$index)">
           </el-switch>
         </template>
       </el-table-column>
-      <el-table-column v-if="settings[6].show" prop="id" label="ID"></el-table-column>
+      <el-table-column v-if="settings[6].show" prop="id" label="ID" min-width="80"></el-table-column>
       <el-table-column v-if="settings[7].show" label="操作" width="170">
         <template slot-scope="scope">
           <el-button type="text" @click="edit(scope.row, 'add')">新增下级</el-button>
@@ -118,7 +118,7 @@ export default {
             }
           ],
           form: {
-
+            typeId: 1
           },
           originSettings: [],
           settings: [
@@ -157,6 +157,14 @@ export default {
           ]
         };
     },
+    watch: {
+      keyword: function(val) {
+        clearTimeout(this.searchTimer)
+        this.searchTimer = setTimeout(() => {
+          this.initData()
+        }, 500)
+      }
+    },
     mounted() {
       this.$store.commit('user/SET_CRUMBS', [
         {
@@ -176,7 +184,7 @@ export default {
     methods: {
       getData() {
         this.$post(this.api.listWithTree, {
-          siteId: this.$store.state.content.siteId,
+          siteId: this.$store.state.content.site.id,
           columnName: this.keyword,
           templateId: '',
           typeId	: '',
@@ -212,6 +220,10 @@ export default {
           }).catch(res => {})
         }).catch(() => {})
       },
+      // 禁用启用
+      switchOff(val, row) {
+        this.$post(this.api.updateColumn, row).then(res => {}).catch((res) => {})
+      },
       // 批量删除
       batchDel() {
         const list = this.multipleSelection
diff --git a/src/pages/page/list/index.vue b/src/pages/page/list/index.vue
index 39d947c..9f5eafd 100644
--- a/src/pages/page/list/index.vue
+++ b/src/pages/page/list/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="page">
     <div class="tool">
-      <p class="page-name">长页栏目列表</p>
+      <p class="page-name">企业网站管理后台</p>
       <div style="display: inline-flex;align-items: center;">
         <el-dropdown class="setting" trigger="click" :hide-on-click="false">
           <el-tooltip placement="top">
@@ -17,8 +17,15 @@
           </el-dropdown-menu>
         </el-dropdown>
         <div class="search-wrap">
-          <el-input placeholder="请输入栏目或模板名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
-          <el-button type="primary" @click="initData">查询</el-button>
+          <el-select v-model="field" @change="initData">
+            <el-option
+              v-for="(item, i) in keywords"
+              :key="i"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <el-input class="keyword" placeholder="请输入栏目或模板名称" v-model.trim="keyword" clearable></el-input>
         </div>
       </div>
     </div>
@@ -57,6 +64,17 @@
 export default {
     data() {
       return {
+        field: 'programName',
+        keywords: [
+          {
+            id: 'programName',
+            name: '栏目名称'
+          },
+          {
+            id: 'templateName',
+            name: '模板名称'
+          }
+        ],
         keyword: '',
         page: +this.$route.query.page || 1,
         pageSize: 10,
@@ -95,6 +113,14 @@ export default {
         ]
       };
     },
+    watch: {
+      keyword: function(val) {
+        clearTimeout(this.searchTimer)
+        this.searchTimer = setTimeout(() => {
+          this.initData()
+        }, 500)
+      }
+    },
     mounted() {
       this.$store.commit('user/SET_CRUMBS', [
         {
@@ -115,10 +141,11 @@ export default {
       // 列表
       getData() {
         this.$post(this.api.longPageColumnList, {
-          siteId: this.$store.state.content.siteId,
+          siteId: this.$store.state.content.site.id,
           pageNum: this.page,
           pageSize: this.pageSize,
-          title: this.keyword
+          programName: this.field === 'programName' ? this.keyword : '',
+          templateName: this.field === 'templateName' ? this.keyword : ''
         }).then(({ data }) => {
           const list = data.records
           list.map(e => {
@@ -144,10 +171,10 @@ export default {
         this.getData()
       },
       add() {
-        this.$router.push("add");
+        this.$router.push('add')
       },
       edit(row) {
-        this.$router.push(`add?id=${row.id}`);
+        this.$router.push(`add?id=${row.id}`)
       }
     }
 };
diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue
index 38a01a5..97c6e12 100644
--- a/src/pages/role/list/index.vue
+++ b/src/pages/role/list/index.vue
@@ -2,8 +2,7 @@
   <div class="page">
     <div class="tool">
       <div class="search-wrap">
-        <el-input placeholder="请输入角色名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
-        <el-button type="primary" @click="initData">查询</el-button>
+        <el-input placeholder="请输入角色名称" v-model.trim="keyword" clearable></el-input>
       </div>
       <div class="actions">
         <el-button type="primary" @click="addRole">新增</el-button>
@@ -88,6 +87,14 @@ export default {
             roleNameReapeat: false // 角色名称是否重复
         };
     },
+    watch: {
+      keyword: function(val) {
+        clearTimeout(this.searchTimer)
+        this.searchTimer = setTimeout(() => {
+          this.initData()
+        }, 500)
+      }
+    },
     mounted() {
       this.$store.commit('user/SET_CRUMBS', [
         {
@@ -166,22 +173,19 @@ export default {
         },
         // 获取权限菜单
         getPer(row) {
-            if (!this.permissions.length) {
-                this.$get(this.api.perTree).then(({ data }) => {
-                    this.permissions = data[0].children
-                    if (row) {
-                        this.getDetail(row);
-                    }
-                }).catch(res => {
-                });
-            }
+          if (!this.permissions.length) {
+            this.$get(this.api.perTree).then(({ data }) => {
+              this.permissions = data
+              row && this.getDetail(row)
+            }).catch(res => {})
+          }
         },
         addRole() {
-            this.isAdd = true;
-            this.getPer();
-            this.checkedIds = [];
-            this.permissions.length && this.$refs.per.setCheckedNodes([]);
-            this.roleVisible = true;
+          this.isAdd = true
+          this.getPer()
+          this.checkedIds = []
+          this.permissions.length && this.$refs.per.setCheckedNodes([])
+          this.roleVisible = true
         },
         // 查询详情
         async getDetail(row) {
@@ -190,42 +194,45 @@ export default {
             this.form.name = role.name
             this.form.description = role.description
             this.form.id = role.id
-            this.$refs.per.setCheckedKeys(data.permissionList)
+            const list = data.permissionList
+            list[0] === '1' && list.shift() // 1为顶级菜单，需要去掉，不然子级会全部选中，新增的时候一定要带这个1，不然会查不出权限
+            this.$refs.per.setCheckedKeys(list)
           }).catch(err => {})
         },
         showRole(row) {
-            this.isDetail = true;
-            this.isAdd = false;
-            this.getPer(row);
-            this.roleVisible = true;
+          this.isDetail = true
+          this.isAdd = false
+          this.getPer(row)
+          this.roleVisible = true
         },
         editRole(row) {
-            this.isAdd = false;
-            this.getPer(row);
-            this.roleVisible = true;
+          this.isAdd = false
+          this.getPer(row)
+          this.roleVisible = true
         },
         async saveData() {
           const { form } = this
-          if (!form.name) return util.warningMsg("请填写角色名称");
-          if (!form.description) return util.warningMsg("请填写角色描述");
+          if (!form.name) return util.warningMsg("请填写角色名称")
+          if (!form.description) return util.warningMsg("请填写角色描述")
           const checked = this.$refs.per.getCheckedKeys()
-          if (!checked.length) return util.warningMsg("请选择角色权限");
+          if (!checked.length) return util.warningMsg("请选择角色权限")
+          checked[0] !== '1' && checked.unshift('1')
           let data = {
             ...form,
             permissions: checked
-          };
+          }
           if (form.id) {
             this.$put(this.api.role, data).then(res => {
-              util.successMsg("修改成功");
-              this.getData();
-              this.roleVisible = false;
-            }).catch(res => {});
+              util.successMsg("修改成功")
+              this.getData()
+              this.roleVisible = false
+            }).catch(res => {})
           } else {
             this.$post(this.api.role, data).then(res => {
-              util.successMsg("新增成功");
-              this.getData();
-              this.roleVisible = false;
-            }).catch(res => {});
+              util.successMsg("新增成功")
+              this.getData()
+              this.roleVisible = false
+            }).catch(res => {})
           }
         }
     }
diff --git a/src/pages/setting/list/info.vue b/src/pages/setting/list/info.vue
index 127cd42..cde37ad 100644
--- a/src/pages/setting/list/info.vue
+++ b/src/pages/setting/list/info.vue
@@ -2,7 +2,7 @@
         <div>
             <div class="scroll" v-loading="loading">
                 <div class="page">
-                    <h6 class="l-title"><img src="@/assets/img/info1.png" alt=""> 用户信息</h6>
+                    <!-- <h6 class="l-title"><img src="@/assets/img/info1.png" alt=""> 用户信息</h6> -->
                     <div class="page-content">
                         <ul class="list">
                             <div class="line info">
@@ -83,7 +83,7 @@
                         </ul>
                     </div>
                     <div class="arc-action flex j-between a-center">
-                        <h6 class="l-title"><img src="@/assets/img/info2.png" alt=""> 个人档案</h6>
+                        <!-- <h6 class="l-title"><img src="@/assets/img/info2.png" alt=""> 个人档案</h6> -->
                         <el-button type="text" icon="el-icon-plus" style="margin-left: 16px" @click="addArch">新增</el-button>
                     </div>
                     <div class="page-content">
@@ -132,7 +132,7 @@
                                     </li>
                                 </div>
                             </ul>
-                            <img class="del" src="@/assets/img/trash.png" alt="" v-if="index" @click="delArchive(index)">
+                            <!-- <img class="del" src="@/assets/img/trash.png" alt="" v-if="index" @click="delArchive(index)"> -->
                         </div>
                         <div class="fold" v-if="archivesList.length > 1">
                             <span :class="{active: showArch}" @click="showArch = !showArch">
@@ -143,7 +143,7 @@
                     </div>
                 </div>
                 <div class="page">
-                    <h6 class="l-title"><img src="@/assets/img/info3.png" alt=""> 账号信息</h6>
+                    <!-- <h6 class="l-title"><img src="@/assets/img/info3.png" alt=""> 账号信息</h6> -->
                     <div class="page-content">
                         <ul class="list">
                             <div class="line info imp">
diff --git a/src/pages/site/list/index.vue b/src/pages/site/list/index.vue
index b1beee2..405aaa7 100644
--- a/src/pages/site/list/index.vue
+++ b/src/pages/site/list/index.vue
@@ -4,7 +4,6 @@
       <p class="page-name">站点列表</p>
       <div class="search-wrap">
         <el-input placeholder="请输入站点名称" v-model.trim="keyword" clearable @keyup.enter.native="getData"></el-input>
-        <el-button type="primary" @click="getData">查询</el-button>
       </div>
     </div>
 
@@ -42,6 +41,14 @@ export default {
         list: ColumnConst.sites
       };
     },
+    // watch: {
+    //   keyword: function(val) {
+    //     clearTimeout(this.searchTimer)
+    //     this.searchTimer = setTimeout(() => {
+    //       this.initData()
+    //     }, 500)
+    //   }
+    // },
     mounted() {
       this.$store.commit('user/SET_CRUMBS', [
         {
@@ -51,7 +58,7 @@ export default {
     },
     methods: {
       ...mapMutations('content', [
-        'setSiteId'
+        'setSite'
       ]),
       getData() {
 
@@ -65,7 +72,7 @@ export default {
       },
       // 内容管理
       content(row) {
-        this.setSiteId(row.id)
+        this.setSite(row)
         this.$router.push(`/page`)
       },
     }
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index 48e2430..54812d3 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -3,7 +3,7 @@
     <div class="page" style="width: 320px">
       <div class="m-b-20">
         <p class="page-name mb">后台员工账号</p>
-        <el-radio-group v-model="studentType" @change="changeType">
+        <el-radio-group v-model="staffType" @change="changeType">
           <div class="m-b-20">
             <el-radio :label="1">所有员工</el-radio>
           </div>
@@ -20,7 +20,7 @@
         </div>
 
         <div style="height: 504px;overflow: auto">
-          <el-tree class="org" ref="orgs" :data="orgs" :props="defaultProps" default-expand-all node-key="id" @node-click="handleNodeClick">
+          <el-tree class="org" ref="orgs" :data="orgs" :props="defaultProps" highlight-current :expand-on-click-node="false" default-expand-all node-key="id" @node-click="handleNodeClick">
             <span class="node-wrap" slot-scope="{ node, data }">
               <div class="left">
                 <img src="@/assets/img/node.png" alt="">
@@ -76,8 +76,7 @@
     <div class="page list-wrap">
       <div class="tool">
         <div class="search-wrap">
-          <el-input placeholder="请输入员工姓名" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
-          <el-button type="primary" @click="initData">查询</el-button>
+          <el-input placeholder="请输入员工姓名/账号" v-model.trim="keyword" clearable></el-input>
         </div>
         <div class="actions">
           <el-dropdown class="setting" trigger="click" :hide-on-click="false">
@@ -123,7 +122,7 @@
         <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
       </div>
 
-      <el-dialog :title="isDetail ? '查看' : (form.accountId ? '编辑' : '新增') + '员工'" :visible.sync="staffVisible" width="500px" class="dialog" :close-on-click-modal="false" @close="closeStaff">
+      <el-dialog :title="isDetail ? '查看' : (form.id ? '编辑' : '新增') + '员工'" :visible.sync="staffVisible" width="500px" class="dialog" :close-on-click-modal="false" @close="closeStaff">
         <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="isDetail" style='margin-right: 60px;'>
             <el-form-item prop="jobNumber" label="工号">
                 <el-input v-model.trim="form.jobNumber" placeholder="请输入工号"></el-input>
@@ -139,7 +138,7 @@
                   <template v-for="item in roleIds">
                     <!-- 不显示超管 -->
                     <el-option
-                      v-if="item.roleName !== '超级管理员'"
+                      v-if="item.name !== '超级管理员'"
                       :key="item.id"
                       :label="item.name"
                       :value="item.id">
@@ -242,39 +241,13 @@ export default {
             }
           }
         }
-        const phonePass = (rule, value, callback) => {
-          if (value) {
-            const pattern = /^1[3456789]\d{9}$/
-            if(pattern.test(value)){
-              // this.phoneChange()
-              callback()
-            }else{
-              callback(new Error('请输入正确手机号格式'))
-            }
-          } else {
-            callback()
-          }
-        }
-        const emailPass = (rule, value, callback) => {
-          if (value) {
-            const pattern = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/
-            if(pattern.test(value)){
-              // this.emailChange()
-              callback()
-            }else{
-              callback(new Error('请输入正确邮箱格式'))
-            }
-          } else {
-            callback()
-          }
-        }
         return {
           orgs: [],
           defaultProps: {
             label: 'name'
           },
           orgListDia: [],
-          studentType: 1, //类型:必填一个(1.所有员工 2.未加入班级员工)
+          staffType: 1, //类型:必填一个(1.所有员工 2.未加入班级员工)
           orgVisible: false, // 员工组织架对话框
           orgForm: {
             id: '',
@@ -291,6 +264,7 @@ export default {
           treeResolve: [],
           isDetail: false,
           keyword: '',
+          searchTimer: null,
           originSettings: [],
           settings: [
             {
@@ -343,7 +317,7 @@ export default {
             phone: '',
             jobNumber: '',
             email: '',
-            groupId: '',
+            groupId: 1,
             roleIds: [],
             deptArchitectureId: []
           },
@@ -365,11 +339,8 @@ export default {
               roleIds: [
                 { required: true, message: "请选择授权角色", trigger: "change" }
               ],
-              phone: [
-                { validator: phonePass, trigger: 'blur' }
-              ],
-              email: [
-                { validator: emailPass, trigger: 'blur' }
+              groupId: [
+                { required: true, message: "请选择用户组", trigger: "change" }
               ]
           },
           list: [],
@@ -392,6 +363,7 @@ export default {
             value: 'id',
             isLeaf: 'leaf'
           },
+          archId: [],
 
           importVisible: false,
           uploadList: [],
@@ -420,9 +392,15 @@ export default {
       this.originForm = JSON.parse(JSON.stringify(this.form))
     },
     watch: {
-        filterText(val) {
-            this.$refs.classTree.filter(val);
-        }
+      keyword: function(val) {
+        clearTimeout(this.searchTimer)
+        this.searchTimer = setTimeout(() => {
+          this.initData()
+        }, 500)
+      },
+      filterText(val) {
+        this.$refs.classTree.filter(val);
+      }
     },
     methods: {
       // 获取组织树形
@@ -533,7 +511,7 @@ export default {
       // 点击树节点查询列表数据
       handleNodeClick(data) {
         this.$refs.table.clearSelection()
-        this.studentType = null
+        this.staffType = null
         this.getStaff()
       },
       // 关闭组织新增编辑弹框
@@ -549,7 +527,7 @@ export default {
       // 员工列表
       getStaff() {
         this.$post(this.api.users, {
-          type: this.studentType || 1,
+          type: this.staffType || 1,
           deptArchitectureId: this.$refs.orgs.getCurrentKey() || '',
           keyWord: this.keyword,
           pageNum: this.page,
@@ -602,7 +580,7 @@ export default {
       },
       // 重置密码
       resetPassword(row) {
-        this.$confirm(`确定重置密码？`, "提示", { type: "warning" }).then(() => {
+        this.$confirm(`确定重置密码？重置后密码为111aaa。`, "提示", { type: "warning" }).then(() => {
           this.$get(`${this.api.resetPwd}?userId=${row.id}`).then(res => {
             util.successMsg("重置成功")
           }).catch(res => {})
@@ -610,36 +588,40 @@ export default {
       },
       // 添加员工
       addStaff() {
+        if (!this.staffType) {
+          this.archId = []
+          this.handleArchId(this.orgs, [this.$refs.orgs.getCurrentKey()])
+          this.form.deptArchitectureId = this.archId
+        }
         this.staffVisible = true
         this.$nextTick(() => {
           this.$refs.form.clearValidate()
         })
       },
+      // 处理部门id
+      handleArchId(list, ids, pid = []) {
+        list.map(e => {
+          // 把部门id分割成二维数组，[[1, 2], [3, 4]]，每个层级的id都要放进去，后端返回的是最后一级的id，无法回显
+          if (ids.includes(e.id)) {
+            this.archId.push([...pid, e.id])
+          } else {
+            e.children && this.handleArchId(e.children, ids, [...pid, e.id])
+          }
+        })
+      },
       // 编辑/查看
       queryStaff(row, isDetail) {
-        const archId = []
-        // 处理部门id
-        const handleArchId = (list, ids, pid = []) => {
-          list.map(e => {
-            // 把部门id分割成二维数组，[[1, 2], [3, 4]]，每个层级的id都要放进去，后端返回的是最后一级的id，无法回显
-            if (ids.includes(e.id)) {
-              archId.push([...pid, e.id])
-            } else {
-              e.children && handleArchId(e.children, ids, [...pid, e.id])
-            }
-          })
-        }
         this.isDetail = isDetail
         this.staffVisible = true
         this.$get(`${this.api.user}/${row.id}`).then(({ data }) => {
           const { deptArchitectureId, roleId } = data
           if (roleId) {
-            const roleIds = roleId.split(',')
+            const ids = roleId.split(',')
             const list = this.roleIds
-            if (roleIds.length) {
+            if (ids.length) {
               let has = false // 是否在角色列表里有已选择的角色，全部都被删除了，则提示
-              for (const i in roleIds) {
-                if (list.find(n => n.id === roleIds[i])) {
+              for (const i in ids) {
+                if (list.find(n => n.id === ids[i])) {
                   has = true
                   break
                 }
@@ -648,14 +630,16 @@ export default {
                 util.warningMsg('角色被删请重新选择')
                 data.roleIds = []
               } else {
-                data.roleIds = roleIds
+                data.roleIds = ids
               }
             }
           }
           if (deptArchitectureId) {
-            handleArchId(this.orgs, deptArchitectureId.split(','))
-            data.deptArchitectureId = archId
+            this.archId = []
+            this.handleArchId(this.orgs, deptArchitectureId.split(','))
+            data.deptArchitectureId = this.archId
           }
+          data.groupId = +data.groupId
           this.form = data
           this.originAccount = data.username
           this.originWorkNumber = data.jobNumber
@@ -705,32 +689,6 @@ export default {
           })
         }
       },
-      // 手机号判重
-      phoneChange() {
-        const form = this.form
-        const { phone } = form
-        if (phone) {
-          const { accountId } = form
-          this.$post(`${this.api.checkEmailOrPhone}?phone=${phone}${accountId ? `&accountId=${accountId}` : ''}`).then(res => {
-            this.phoneRepeat = false
-          }).catch(err => {
-            this.phoneRepeat = true
-          })
-        }
-      },
-      // 邮箱判重
-      emailChange() {
-        const form = this.form
-        const { email } = form
-        if (email) {
-          const { accountId } = form
-          this.$post(`${this.api.checkEmailOrPhone}?email=${email}${accountId ? `&accountId=${accountId}` : ''}`).then(res => {
-            this.emailRepeat = false
-          }).catch(err => {
-            this.emailRepeat = true
-          })
-        }
-      },
       // 提交新增/编辑员工
       submitStaff() {
         this.$refs.form.validate((valid) => {
@@ -775,7 +733,7 @@ export default {
       // 关闭新增员工对话框
       closeStaff() {
         this.form = {
-          accountId: '',
+          id: '',
           realName: '',
           username: '',
           phone: '',
@@ -836,7 +794,7 @@ export default {
       },
       uploadSure() {
         this.importVisible = false
-        this.studentType = 1
+        this.staffType = 1
         this.keyword = ''
         this.$refs.orgs.setCurrentKey(null)
         this.getOrg()
diff --git a/src/pages/userGroup/list/index.vue b/src/pages/userGroup/list/index.vue
index 7caf80f..7772ed6 100644
--- a/src/pages/userGroup/list/index.vue
+++ b/src/pages/userGroup/list/index.vue
@@ -2,8 +2,7 @@
   <div class="page">
     <div class="tool">
       <div class="search-wrap">
-        <el-input placeholder="请输入用户组名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
-        <el-button type="primary" @click="initData">查询</el-button>
+        <el-input placeholder="请输入用户组名称" v-model.trim="keyword" clearable></el-input>
       </div>
       <div class="actions">
         <el-button type="primary" @click="add" >新增</el-button>
@@ -31,7 +30,7 @@
         <el-form-item prop="groupName" label="名称">
           <el-input v-model="form.groupName" placeholder="请输入名称"></el-input>
         </el-form-item>
-        <el-form-item label="描述">
+        <el-form-item prop="description" label="描述">
           <el-input v-model="form.description" placeholder="请输入描述" type="textarea" rows="5"></el-input>
         </el-form-item>
       </el-form>
@@ -62,11 +61,22 @@ export default {
           rules: {
             groupName: [
               { required: true, message: "请输入名称", trigger: "blur" }
+            ],
+            description: [
+              { required: true, message: "请输入描述", trigger: "blur" }
             ]
           },
           formVisible: false
         };
     },
+    watch: {
+      keyword: function(val) {
+        clearTimeout(this.searchTimer)
+        this.searchTimer = setTimeout(() => {
+          this.initData()
+        }, 500)
+      }
+    },
     mounted() {
       this.$store.commit('user/SET_CRUMBS', [
         {
diff --git a/src/router/modules/setting.js b/src/router/modules/setting.js
index 2a4aa6e..22be52f 100644
--- a/src/router/modules/setting.js
+++ b/src/router/modules/setting.js
@@ -13,11 +13,11 @@ export default {
     meta,
     component: BasicLayout,
     children: [
-        // {
-        //     name: `${pre}person`,
-        //     path: `person`,
-        //     component: () => import("@/pages/setting/list"),
-        //     meta: { title: "个人中心" }
-        // }
+        {
+            name: `${pre}person`,
+            path: `person`,
+            component: () => import("@/pages/setting/list"),
+            meta: { title: "个人中心" }
+        }
     ]
 };
\ No newline at end of file
diff --git a/src/router/permission.js b/src/router/permission.js
index c7197a6..f68ddf8 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -1,14 +1,14 @@
-import router from "./index";
-import Setting from "@/setting";
-import util from "@/libs/util";
+import router from './index'
+import Setting from '@/setting'
+import util from '@/libs/util'
 
 const whiteList = Setting.whiteList // 白名单
 router.beforeEach((to, from, next) => {
-    document.title = Setting.titleSuffix;
-    const role = util.local.get(Setting.tokenKey);
-    if (!role && !whiteList.includes(to.path)) {
-        next('/login')
-    } else {
-        next()
-    }
+  document.title = Setting.titleSuffix
+  const role = util.local.get(Setting.tokenKey)
+  if (!role && !whiteList.includes(to.path)) {
+    next('/login')
+  } else {
+    next()
+  }
 });
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index 8515033..828991b 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -3,47 +3,29 @@
  * */
 const url = location.host;
 const isDev = process.env.NODE_ENV === "development"; // 开发环境
-const isPro = url.includes("occupationlab.com"); //是否职站生产
-const isTest = url.includes('121.37.12.51'); //是否中台测试服
-
-let bankPath = `${location.origin}/banksystem` // 银行系统地址
-let jumpPath = `${location.origin}/judgmentPoint`
+const isPro = url.includes("occupationlab.com"); //是否生产
 let host = `${location.origin}/`
-let uploadURL = `http://121.37.12.51/`
-
-if (isPro) {
-    // 职站生产
-    uploadURL = `https://www.huorantech.cn/`
-    bankPath = `https://www.huorantech.cn/banksystem`
-    jumpPath = `https://www.huorantech.cn/judgmentPoint/`
-} else if (isDev) {
-    jumpPath = "http://192.168.31.125:8087/";
-    bankPath = `http://192.168.31.125:8093`
-    host = "http://121.37.12.51/"; // 中台测试服
-    // host = "http://192.168.31.151:10000/"; // 榕
-    host = 'http://192.168.31.137:10000/'; // 赓
+if (isDev) {
+    // host = 'http://121.37.12.51/' // 中台测试服
+    // host = 'http://192.168.31.151:10000/' // 榕
+    host = 'http://192.168.31.137:10000/' // 赓
 }
 
 const Setting = {
     /**
      * 基础配置
      * */
-    platformId: 1, // 平台标识，1职站，2数据平台，3中台
-    platformType: 0, // 平台端区分：0->教师端 1->学生端 2->无端
     titleSuffix: '粒子研究院', // 网页标题的后缀
     routerMode: "hash", // 路由模式，可选值为 history 或 hash
     showProgressBar: true, // 页面切换时，是否显示模拟的进度条
     apiBaseURL: host, // 接口请求地址
-    jumpPath, // 判分点系统前缀
     autoLogoutTime: 3600000, // 长时间未操作，自动退出登录时间
     projectData: "sta_data", // 新增项目跳转判分点数据存储cookie的key
     modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒
     errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
     cookiesExpires: 1, // Cookies 默认保存时间，单位：天
     tokenExpires: 1296000000, // token在localStorage的时间(毫秒)
-    bankPath,
     isDev,
-    isTest,
     isPro,
     /**
      * 路由白名单
@@ -52,11 +34,11 @@ const Setting = {
     /**
      * localStorage里保存的token的key
      */
-    tokenKey: "oc_server_token",
+    tokenKey: "IASF_server_token",
     /**
      * localStorage里保存的vuex的key
      */
-    storeKey: "oc_server_store",
+    storeKey: "IASF_server_store",
     /**
      * 默认密码
      */
@@ -65,10 +47,10 @@ const Setting = {
      * 多语言配置
      * */
     i18n: {
-        // 默认语言
-        default: "zh",
-        // 是否根据用户电脑配置自动设置语言（仅第一次有效）
-        auto: false
+      // 默认语言
+      default: "zh",
+      // 是否根据用户电脑配置自动设置语言（仅第一次有效）
+      auto: false
     },
     /**
      * 布局配置
@@ -80,12 +62,7 @@ const Setting = {
     // 相同路由，不同参数间进行切换，是否强力更新
     sameRouteForceUpdate: false,
     // 是否使用动态路由(即角色权限,开启了的话就会取后端返回的权限树来显示头部导肮和页面按钮)
-    dynamicRoute: false,
-    // 文件上传
-    upload: {
-        apiURL: uploadURL,
-        maxSize: 30
-    }
+    dynamicRoute: false
 };
 
 export default Setting;
diff --git a/src/store/modules/content.js b/src/store/modules/content.js
index 201b6db..fb54eef 100644
--- a/src/store/modules/content.js
+++ b/src/store/modules/content.js
@@ -4,11 +4,11 @@
  export default {
   namespaced: true,
   state: {
-    siteId: ''
+    site: {}
   },
   mutations: {
-    setSiteId: (state, siteId) => {
-      state.siteId = siteId
+    setSite: (state, site) => {
+      state.site = site
     }
   },
   actions: {
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 388e7ae..72fce65 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -33,6 +33,18 @@
     border-radius: 2px;
   }
 }
+.search-wrap {
+  display: flex;
+  .el-select {
+    width: 140px;
+  }
+  .keyword .el-input__inner {
+    border-left: 0;
+  }
+  .el-input__inner {
+    border-radius: 0;
+  }
+}
 .page {
   position: relative;
   padding: 16px 20px;
@@ -83,15 +95,6 @@
     }
   }
 }
-.search-wrap {
-  display: flex;
-  .el-input__inner {
-    border-right: 0;
-  }
-  .el-button {
-    border-radius: 0;
-  }
-}
 .actions, .btns, .el-dialog__footer {
   .el-button {
     width: 80px;
@@ -117,7 +120,9 @@
   }
   .item-line {
     display: flex;
-    justify-content: space-between;
+    .el-form-item:not(:last-child) {
+      margin-right: 200px;
+    }
   }
   .line {
     margin-bottom: 24px;
@@ -168,27 +173,30 @@
     background-color: $--color-primary !important;
   }
 }
-
 .el-table {
   border-bottom: 0;
-  .cell {
-    font-size: 12px;
-    color: #333;
-    line-height: 35px;
+  td {
+    padding: 5px 0;
+    .cell {
+      font-size: 12px;
+      color: #333;
+      font-family: PingFangSC-Regular, PingFang SC;
+    }
   }
   th {
     background: #F7F7F7 !important;
     .cell {
+      line-height: 26px;
       color: #323232;
       font-size: 12px;
-      font-weight: normal;
+      font-weight: 500;
+      font-family: PingFangSC-Medium, PingFang SC;
     }
   }
 }
 .el-table th.is-leaf, .el-table td {
   border-bottom-color: #EBEDF0;
 }
-
 .tabs {
   display: flex;
   align-items: center;
@@ -224,7 +232,6 @@
     }
   }
 }
-
 .el-message {
   padding: 11px 20px;
   top:1.2rem!important;