diff --git a/src/api/parBasicData.js b/src/api/parBasicData.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d4ff384f11ccc1cc1ecd71898bb765733c65f47
--- /dev/null
+++ b/src/api/parBasicData.js
@@ -0,0 +1,47 @@
+import { axios } from '@/utils/request'
+const api = {
+  // 根据父节点查询基础数据树
+  basicDataTree: '/par/basicData/tree',
+  // 绩效基础数据
+  basicData: '/par/basicData'
+
+}
+/**
+ * 获取树结构组织信息
+ */
+export function getBasicDataTree (parameter) {
+  return axios({
+    url: api.basicDataTree,
+    method: 'get',
+    params: parameter
+  })
+}
+/**
+ * 新增绩效基础数据
+ */
+export function addBasicData (parameter) {
+  return axios({
+    url: api.basicData,
+    method: 'post',
+    data: parameter
+  })
+}
+/**
+ * 修改绩效基础数据
+ */
+export function updateBasicData (parameter) {
+  return axios({
+    url: api.basicData,
+    method: 'put',
+    data: parameter
+  })
+}
+/**
+ * 删除绩效基础数据
+ */
+export function delBasicData (parameter) {
+  return axios({
+    url: api.basicData + '/' + parameter,
+    method: 'delete'
+  })
+}
diff --git a/src/config/router.config.js b/src/config/router.config.js
index ca9fa6e96854b4b40050a600987dd7c6078e97f1..aa9e0e0184626af3165ecd923d9c26e6a04f2484 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -125,6 +125,14 @@ export const asyncRouterMap = [
             meta: {
               title: '报销审批'
             }
+          },
+          {
+            path: 'par-basic-data',
+            name: 'ParBasicData',
+            component: () => import(/* webpackChunkName: "parBasicData" */ '@/views/par/basicData/ParBasicData.vue'),
+            meta: {
+              title: '绩效基础数据'
+            }
           }
         ]
       },
diff --git a/src/permission.js b/src/permission.js
index ee70f898286de4434390b7a8b63c6a0873bc79ac..459b6a9d37636dccb3d9624c533ff459c5165139 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -24,7 +24,6 @@ router.beforeEach((to, from, next) => {
       next({ path: '/workplace' })
       NProgress.done()
     } else {
-      // console.log('role',store.getters)
       if (store.getters.roles.length === 0) {
         store
           .dispatch('GetInfo')
@@ -32,7 +31,6 @@ router.beforeEach((to, from, next) => {
             store.dispatch('GenerateRoutes').then(() => {
               // 根据roles权限生成可访问的路由表
               // 动态添加可访问路由表
-              console.log('addRouters',store.getters.addRouters)
               router.addRoutes(store.getters.addRouters)
               const redirect = decodeURIComponent(from.query.redirect || to.path)
               // 重新登录时，不跳转到上一次访问的地址
@@ -71,9 +69,6 @@ router.beforeEach((to, from, next) => {
                   staffInfo.roles = result.roles
                   Vue.ls.set(WECHAT_INFO, staffInfo, 7 * 24 * 60 * 60 * 1000)
                   store.commit('SET_INFO', staffInfo)
-                  // alert('login2')
-                  // alert(JSON.stringify(to))
-                  // alert(JSON.stringify(staffInfo))
                   next({ path: to.fullPath })
                   // eslint-disable-next-line handle-callback-err
                 }).catch(error => {
@@ -109,9 +104,6 @@ router.beforeEach((to, from, next) => {
             staffInfo.roles = result.roles
             Vue.ls.set(WECHAT_INFO, staffInfo, 7 * 24 * 60 * 60 * 1000)
             store.commit('SET_INFO', staffInfo)
-            // alert('login')
-            // alert(JSON.stringify(to))
-            // alert(JSON.stringify(staffInfo))
             next({ path: to.fullPath })
             // eslint-disable-next-line handle-callback-err
           }).catch(error => {
@@ -181,7 +173,11 @@ const action = Vue.directive('action', {
       })
     }
     const actionName = binding.arg
-    getElemets(store.getters.roles.menus)
+    let menus = []
+    store.getters.roles.forEach(item => {
+      menus = menus.concat(item.menus)
+    })
+    getElemets(menus)
     const per = actions.some(item => {
       if (item.code === actionName && item.defaultCheck === true) {
         return true
diff --git a/src/views/par/basicData/ParBasicData.vue b/src/views/par/basicData/ParBasicData.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6736718e6d6f105de907e9821b4886bf9341a249
--- /dev/null
+++ b/src/views/par/basicData/ParBasicData.vue
@@ -0,0 +1,507 @@
+<template>
+  <div>
+    <a-row :gutter="24" >
+      <a-spin :spinning="spinning">
+        <a-col :span="8">
+          <a-card :bordered="true" title="绩效基础数据" :bodyStyle="bodyStyle" :headStyle="headStyle">
+            <!-- extra -->
+            <template v-slot:extra>
+              <!-- 手动创建 -->
+              <a-tooltip title="创建基础数据" v-show="currentitem.level < 4">
+                <a-icon
+                  type="plus-circle"
+                  @click="addBasicData"
+                  theme="twoTone"
+                  :style="{ fontSize: '20px'}"
+                />
+              </a-tooltip>
+            </template>
+            <div>
+              <a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange" />
+              <a-tree
+                @expand="onExpand"
+                :expandedKeys="expandedKeys"
+                :autoExpandParent="autoExpandParent"
+                :treeData="basicDataTree"
+                @select="selectbasicData"
+                ref="basicDataTree"
+              >
+                <template slot="title" slot-scope="{title}">
+                  <span v-if="title.indexOf(searchValue) > -1">
+                    {{ title.substr(0, title.indexOf(searchValue)) }}
+                    <span style="color: #f50">{{ searchValue }}</span>
+                    {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
+                  </span>
+                  <span v-else>{{ title }}</span>
+                </template>
+              </a-tree>
+            </div>
+          </a-card>
+        </a-col>
+        <a-col :span="16" >
+          <a-card :bordered="true" :title="cardname" v-show="formvisable" :bodyStyle="bodyStyle" :headStyle="headStyle">
+            <a-row :gutter="24" >
+              <a-form :form="editForm">
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="上级数据"
+                >
+                  <a-input v-decorator="['parentId']" :disabled="disabled"/>
+                </a-form-item>
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="数据名称"
+                >
+                  <a-input
+                    placeholder="数据名称"
+                    v-decorator="['name',{rules: [{ required: true, message: '请输入数据名称信息' },{ max:60,message:'长度不能超过20个字'}]}]"/>
+                </a-form-item>
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="排序"
+                >
+                  <a-input-number style="width:100%" :min="1" :max="99999" v-decorator="['xh',{rules: [{ required: true, message: '请输入排序信息' }]}]" />
+                </a-form-item>
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="单位类型"
+                  v-if="dwlxShowFlag"
+                >
+                  <a-select
+                    v-decorator="[
+                      'dwlx',
+                      { rules: [{ required: true, message: '请选择单位类型' }] },
+                    ]"
+                    placeholder="请选择单位类型"
+                  >
+                    <a-select-option v-for="d in dwlxList" :value="d.id" :key="d.id">
+                      {{ d.title }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="考评大类"
+                  v-if="itemShowFlag"
+                >
+                  <a-select
+                    v-decorator="[
+                      'kpdl',
+                      { rules: [{ required: true, message: '请选择考评大类' }] },
+                    ]"
+                    placeholder="请选择考评大类"
+                  >
+                    <a-select-option v-for="k in kpdlList" :value="k.id" :key="k.id">
+                      {{ k.title }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="考评分数"
+                  v-if="itemShowFlag"
+                >
+                  <a-input-number style="width:100%" :min="1" :max="999999" v-decorator="['kpfs',{rules: [{ required: true, message: '请输入考评分数' }]}]" />
+                </a-form-item>
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="考评点"
+                  v-if="itemShowFlag"
+                >
+                  <a-textarea :rows="5" v-decorator="['kpd']"/>
+                  <p style="font-size:12px;height: 20px;color: red;">注：每条考评点间使用回车分割</p>
+                </a-form-item>
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="考评标准"
+                  v-if="itemShowFlag"
+                >
+                  <a-textarea :rows="5" v-decorator="['kpbz']"/>
+                  <p style="font-size:12px;height: 20px;color: red;">注：每条考评标准间使用回车分割</p>
+                </a-form-item>
+              </a-form>
+            </a-row>
+            <a-row type="flex" justify="end">
+              <a-col :span="6">
+                <a-button type="primary" @click="saveBasicData" >
+                  保存
+                </a-button>
+                <a-button type="danger" @click="delBasicData" style="margin-left: 8px" >
+                  删除
+                </a-button>
+              </a-col>
+            </a-row>
+          </a-card>
+        </a-col>
+      </a-spin>
+    </a-row>
+  </div>
+</template>
+<script>
+
+import { getBasicDataTree, addBasicData, updateBasicData, delBasicData } from '@/api/parBasicData'
+
+export default {
+  name: 'ParBasicData',
+  data () {
+    return {
+      expandedKeys: [],
+      searchValue: '',
+      autoExpandParent: true,
+      basicDataTree: [],
+      dataList: [],
+      // 当前点击树节点
+      currentitem: '',
+      cardname: '基础数据',
+      // 查询参数
+      queryParam: {},
+      // 响应式布局
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14, offset: 1 }
+      },
+      editForm: this.$form.createForm(this),
+      // 1 新增2 修改
+      type: '',
+      // 右侧form表单默认不显示
+      formvisable: false,
+      disabled: true,
+      parentId: '',
+      spinning: false,
+      bodyStyle: {
+        padding: '12px',
+        height: '600px',
+        overflow: 'auto'
+      },
+      headStyle: {
+        'margin-left': '20px',
+        'margin-right': '20px',
+        'margin-top': '15px'
+      },
+      kpdlList: [
+        { id: '1', title: '基础性工作' },
+        { id: '2', title: '指令性工作' },
+        { id: '3', title: '综合评定' }
+      ],
+      itemShowFlag: false,
+      dwlxList: [
+        { id: '1', title: '机关' },
+        { id: '2', title: '层级单位' }
+      ],
+      dwlxShowFlag: false
+    }
+  },
+  created () {
+    // 获取树形基础数据
+    getBasicDataTree({ 'parentTreeId': 'root' }).then(res => {
+      this.basicDataTree = this.handleVal(res.result.data)
+      generateList(this.basicDataTree)
+    })
+    // 将树型结构信息转成列表形式，用于基础数据搜索
+    const generateList = (data) => {
+      for (let i = 0; i < data.length; i++) {
+        const node = data[i]
+        const key = node.title
+        // 用于树型搜索框添加样式（前台处理需使用递归函数遍历所有子节点，耗用资源，请在后台添加该信息）
+        node.scopedSlots = { title: 'title' }
+        this.dataList.push({ key, title: key })
+        if (node.children) {
+          generateList(node.children, node.key)
+        }
+      }
+    }
+  },
+  methods: {
+    /**
+     * 展开/收起节点时触发
+     */
+    onExpand  (expandedKeys) {
+      // 展开指定树节点
+      this.expandedKeys = expandedKeys
+      // this.autoExpandParent = false
+    },
+    /**
+     * 搜索基础数据
+     */
+    onChange (e) {
+      console.log('e==', e)
+      const value = e.target.value
+      const expandedKeys = this.dataList.map((item) => {
+        if (item.key.indexOf(value) > -1) {
+          return this.getParentKey(item.key, this.basicDataTree) !== undefined ? this.getParentKey(item.key, this.basicDataTree).key : null
+        }
+        return null
+      }).filter((item, i, self) => item && self.indexOf(item) === i)
+      Object.assign(this, {
+        expandedKeys,
+        searchValue: value,
+        autoExpandParent: true
+      })
+    },
+    /**
+     * 获取父节点key
+     */
+    getParentKey (key, tree) {
+      let parentKey
+      for (let i = 0; i < tree.length; i++) {
+        const node = tree[i]
+        if (node.children) {
+          if (node.children.some(item => item.title === key)) {
+            parentKey = node
+          } else if (this.getParentKey(key, node.children)) {
+            parentKey = this.getParentKey(key, node.children)
+          }
+        }
+      }
+      return parentKey
+    },
+    /**
+     * 点击树节点进入编辑模式
+     */
+    selectbasicData (selectedKeys, e) {
+      this.formvisable = true
+      this.currentitem = e.node._props.dataRef
+      const parentNode = this.getParentNode(this.currentitem.key, this.basicDataTree)
+      this.parentId = parentNode === undefined ? '' : parentNode.key
+      this.editForm.getFieldDecorator('kpfs')
+      this.editForm.getFieldDecorator('kpdl')
+      this.editForm.getFieldDecorator('dwlx')
+      this.editForm.setFieldsValue({
+        name: this.currentitem.title,
+        xh: this.currentitem.order,
+        kpfs: this.currentitem.kpfs,
+        kpd: this.currentitem.kpd,
+        kpbz: this.currentitem.kpbz,
+        kpdl: this.currentitem.kpdl,
+        dwlx: this.currentitem.dwlx,
+        parentId: parentNode === undefined ? '' : parentNode.title
+      })
+      this.cardname = '修改基础数据'
+      this.type = '2'
+      this.itemShowFlag = this.currentitem.level === 4
+      this.dwlxShowFlag = this.currentitem.level === 2
+    },
+    /**
+     * 获取父节点 用于点击树节点触发右侧form表单 获取上级基础数据
+     */
+    getParentNode (key, tree) {
+      let parentKey
+      for (let i = 0; i < tree.length; i++) {
+        const node = tree[i]
+        if (node.children) {
+          if (node.children.some(item => item.key === key)) {
+            parentKey = node
+          } else if (this.getParentNode(key, node.children)) {
+            parentKey = this.getParentNode(key, node.children)
+          }
+        }
+      }
+      return parentKey
+    },
+    getNode (key, tree) {
+      let cuurrentNode
+      for (let i = 0; i < tree.length; i++) {
+        const node = tree[i]
+        if (node.children) {
+          if (node.children.some(item => { console.log(item); if (item.key === key) { cuurrentNode = item; return true } else { return false } })) {
+          } else if (this.getNode(key, node.children)) {
+            cuurrentNode = this.getNode(key, node.children)
+          }
+        }
+      }
+      return cuurrentNode
+    },
+    /**
+     * 点击新增按钮进入新增模式
+     */
+    addBasicData () {
+      if (this.currentitem === '') {
+        this.$notification['warning']({
+          message: '请选择一条基础数据',
+          duration: 2
+        })
+        return
+      }
+      this.formvisable = true
+      this.editForm.resetFields()
+      const basicTree = [{ children: this.basicDataTree }]
+      const xh = this.getNode(this.currentitem.key, basicTree).children.length + 1
+      this.editForm.setFieldsValue({
+        parentId: this.currentitem.title,
+        xh: xh
+      })
+      this.type = '1'
+      this.cardname = '新增基础数据'
+      this.itemShowFlag = this.currentitem.level === 3
+      this.dwlxShowFlag = this.currentitem.level === 1
+    },
+    /**
+     * 单条删除基础数据信息
+     */
+    delBasicData () {
+      if (this.currentitem === '') {
+        this.$notification['warning']({
+          message: '请选择一条基础数据',
+          duration: 2
+        })
+        return
+      }
+      const _this = this
+      this.$confirm({
+        title: '警告',
+        content: `确认要删除 ${this.currentitem.title} 的基础数据吗?`,
+        okText: '确认',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk () {
+          _this.spinning = true
+          // 在这里调用删除接口
+          return delBasicData(
+            _this.currentitem.key
+          ).then(
+            res => {
+              if (res.status === 200) {
+                _this.$notification['success']({
+                  message: '删除成功',
+                  duration: 2
+                })
+                _this.formvisable = false
+                _this.refreshTree()
+              } else {
+                _this.$notification['error']({
+                  message: res.message,
+                  duration: 4
+                })
+              }
+            }
+          ).catch(() =>
+            _this.$notification['error']({
+              message: '出现异常，请联系系统管理员',
+              duration: 4
+            })
+          ).finally(() => {
+            _this.spinning = false
+          })
+        },
+        onCancel: () => {
+          _this.$notification['info']({
+            message: '取消删除操作',
+            duration: 4
+          })
+        }
+      })
+    },
+    /**
+     * 基础数据增删改后强制刷新树
+     */
+    refreshTree () {
+      getBasicDataTree({ 'parentTreeId': 'root' }).then(res => {
+        this.basicDataTree = this.handleVal(res.result.data)
+      })
+    },
+    /**
+     * 保存基础数据表单信息
+     */
+    saveBasicData () {
+      const _this = this
+      this.editForm.validateFields((err, values) => {
+        if (!err) {
+          this.spinning = true
+          if (this.type === '1') {
+            values.parentId = this.currentitem.key
+            values.parLevel = this.currentitem.level
+            // 在这里调用新增接口
+            return addBasicData(
+              values
+            ).then(
+              res => {
+                if (res.status === 200) {
+                  _this.$notification['success']({
+                    message: '保存成功',
+                    duration: 2
+                  })
+                  _this.formvisable = false
+                  _this.refreshTree()
+                } else {
+                  _this.$notification['error']({
+                    message: res.message,
+                    duration: 4
+                  })
+                }
+              }
+            ).catch(() =>
+              _this.$notification['error']({
+                message: '出现异常，请联系系统管理员',
+                duration: 4
+              })
+            ).finally(() => {
+              _this.spinning = false
+            })
+          } else {
+            values.parentId = this.parentId
+            values.id = this.currentitem.key
+            const parentNodeTree = this.getParentNode(this.currentitem.key, this.basicDataTree)
+            values.pathCode = parentNodeTree.pathCode
+            values.pathName = parentNodeTree.pathName
+            // 在这里调用修改接口
+            return updateBasicData(
+              values
+            ).then(
+              res => {
+                if (res.status === 200) {
+                  _this.$notification['success']({
+                    message: '保存成功',
+                    duration: 2
+                  })
+                  this.formvisable = false
+                  _this.refreshTree()
+                } else {
+                  _this.$notification['error']({
+                    message: res.message,
+                    duration: 4
+                  })
+                }
+              }
+            ).catch(() =>
+              this.$notification['error']({
+                message: '出现异常，请联系系统管理员',
+                duration: 4
+              })
+            ).finally(() => {
+              _this.spinning = false
+            })
+          }
+        }
+      })
+    },
+    /**
+     * 处理后台返回值 替换名字 id=>key label=>title
+     */
+    handleVal (value) {
+      let str = JSON.stringify(value)
+      str = str.replace(/id/g, 'key').replace(/label/g, 'title')
+      return JSON.parse(str)
+    }
+
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+    display:block;                     /*内联对象需加*/
+    word-break:keep-all;           /* 不换行 */
+    white-space:nowrap;          /* 不换行 */
+}
+</style>