diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 53ad9a8de..8e82adae1 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -31,6 +31,10 @@
                            @click="roleAdd"
                            v-btn-permission="'93e75b6ec0b2b6b0b40d2b11adeba88a'"
                            size="mini">配置角色资源</el-button>
+                <el-button type="primary"
+                           class="common-button-primary add-button"
+                           @click="roleAddData"
+                           size="mini">配置数据权限</el-button>
             </div>
             <div class="content">
                 <el-table
@@ -102,6 +106,31 @@
                 <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialog">确定</el-button>
             </div>
         </el-dialog>
+        <el-dialog
+                title="系统菜单"
+                :visible.sync="modalflag"
+                :wrapperClosable="false"
+                @close="closeDialogData"
+                size="800px">
+            <div class="myDialog">
+                <el-tree
+                        v-if="modalflag"
+                        node-key="id"
+                        class="filter-tree"
+                        :data="treeData3"
+                        :props="defaultProps3"
+                        :default-checked-keys="nodeList2"
+                        default-expand-all
+                        show-checkbox
+                        check-strictly
+                        ref="tree3">
+                </el-tree>
+            </div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData">取消</el-button>
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData">确定</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -110,6 +139,13 @@ export default {
   name: 'role-manage',
   data () {
     return {
+        treeData3: [],
+        defaultProps3: {
+            children: 'children',
+            label: 'name'
+        },
+        nodeList2: [],
+        modalflag: false,
         sideClose: false, // 边栏收展状态
         filterText: '',
         treeData: [],
@@ -131,6 +167,37 @@ export default {
     }
   },
   methods: {
+      getTree3 () {
+          this.$http.get('sarResource/ts-resource', {}, {}, res=> {
+              if (res.ok) {
+                  this.treeData3 = res.data
+              }
+          })
+      },
+      confirmDialogData () {
+          this.$http.postData('sarRole/role/resource', {
+              resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()),
+              roleId: this.id
+          }, {}, res=> {
+              if (res.ok) {
+                  this.$message.success('设置权限成功')
+                  this.modalflag = false
+              }
+          })
+      },
+      closeDialogData () {
+          this.modalflag = false
+      },
+      roleAddData () {
+          this.$http.get('sarRole/role/resource', {
+              roleId: this.id
+          }, {}, res=> {
+              if (res.ok) {
+                  this.nodeList2 = res.data
+                  this.modalflag = true
+              }
+          })
+      },
       closeDialog () {
           this.modalshowflag = false
       },
@@ -205,6 +272,7 @@ export default {
   mounted () {
       this.getTree()
       this.getTree2()
+      this.getTree3()
   }
 }
 </script>
diff --git a/src/pages/home1/components/navMenu/index.vue b/src/pages/home1/components/navMenu/index.vue
index f7aa3702f..71aa3396f 100644
--- a/src/pages/home1/components/navMenu/index.vue
+++ b/src/pages/home1/components/navMenu/index.vue
@@ -1,71 +1,72 @@
 <!-- 右侧导航 -->
 <template>
-  <div class="nav-menu">
-    <div class="lattice">
-      <div class="menu-wrap">
-        <enter-card  label="高级检索" path="/advancedSearch" style="margin-left:0px;"></enter-card>
-        <enter-card  label="个人中心" path="/collection"></enter-card>
-        <enter-card  label="统计图表" path="/"></enter-card>
-      </div>
-     <div class="menu-wrap">
-       <enter-card  label="国内法规" path="/domesticStandardsAndRegulations" style="margin-left:0px;"></enter-card>
-       <enter-card  label="国外法规" path="/foreignStandardsAndRegulations"></enter-card>
-       <enter-card  label="标准清单" path="/accessStandardsAndRegulations"></enter-card>
-     </div>
-      <div class="menu-wrap">
-        <enter-card  label="国内外政策" path="/" style="margin-left:0px;"></enter-card>
-        <enter-card  label="企业标准" path="/"></enter-card>
-        <enter-card  label="标准预警" path="/standardWarning"></enter-card>
-      </div>
+    <div class="nav-menu">
+        <div class="lattice">
+            <div class="menu-wrap">
+                <enter-card  label="高级检索" path="/advancedSearch"></enter-card>
+                <enter-card  label="个人中心" path="/collection"></enter-card>
+                <enter-card  label="统计图表" path="/"></enter-card>
+                <enter-card  label="国内法规" path="/domesticStandardsAndRegulations"></enter-card>
+                <enter-card  label="国外法规" path="/foreignStandardsAndRegulations"></enter-card>
+                <enter-card  label="标准清单" path="/accessStandardsAndRegulations"></enter-card>
+                <enter-card  label="国内外政策" path="/"></enter-card>
+                <enter-card  label="企业标准" path="/"></enter-card>
+                <enter-card  label="标准预警" path="/standardWarning"></enter-card>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
-import EnterCard from '@/pages/home/components/EnterCard'
-export default {
-  name: 'NavMenu',
-  components: {EnterCard},
-  mixins: [],
-  data() {
-    return {
+    import EnterCard from '@/pages/home/components/EnterCard'
+    export default {
+        name: 'NavMenu',
+        components: {EnterCard},
+        mixins: [],
+        data() {
+            return {
+            }
+        },
+        computed: {},
+        watch: {},
+        mounted() {},
+        methods: {
+            toPage() {
+                this.$router.push(this.path)
+            }
+        },
     }
-  },
-  computed: {},
-  watch: {},
-  mounted() {},
-  methods: {
-    toPage() {
-      this.$router.push(this.path)
-    }
-  },
-}
 </script>
 
 <style lang="less" scoped>
-.nav-menu {
-  margin-bottom: 10px;
-  .lattice {
-    .menu-wrap {
-      display: flex;
-      color: #ffffff;
-      margin-bottom: 10px;
-      text-align: center;
-      &:last-child {
-        margin-bottom: 0;
-      }
-      .menu-item {
-        flex: 1;
-        line-height: 88px;
-        text-align: center;
-        margin-right: 10px;
-        background: rgba(182, 213, 255, 0.22);
-        &:last-child {
-          margin-right: 0;
+    .nav-menu {
+        .lattice {
+            .menu-wrap {
+                display: flex;
+                flex-wrap: wrap;
+                justify-content:space-between;
+                color: #ffffff;
+                margin-bottom: 10px;
+                text-align: center;
+                &:last-child {
+                    margin-bottom: 0;
+                }
+                .wx-card {
+                    width: 32%;
+                    margin: 0 0 10px 0;
+                }
+                .menu-item {
+                    flex: 1;
+                    line-height: 88px;
+                    text-align: center;
+                    margin-right: 10px;
+                    background: rgba(182, 213, 255, 0.22);
+                    &:last-child {
+                        margin-right: 0;
+                    }
+                }
+            }
         }
-      }
     }
-  }
-}
 </style>