From 820b215771734c44399336bd163cbe860e85046e Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 29 Aug 2021 19:16:04 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=AF=A6=E6=83=85=20=E5=88=86=E8=A7=A3=E5=8D=95?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=92=8C=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 139d7920a..ad3d8ac6a 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -467,6 +467,7 @@
                 <el-date-picker
                     v-model="standItemSearch.XCXSSRQ"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="新车实施日期">
                 </el-date-picker>
               </div>
@@ -477,6 +478,7 @@
                 <el-date-picker
                     v-model="standItemSearch.ZCCSSRQ"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="在产车实施日期">
                 </el-date-picker>
               </div>
@@ -2396,6 +2398,9 @@ export default {
       this.standItemSearch.parts = ''
       this.standItemSearch.nameOrRequest = ''
       this.standItemSearch.fileType = ''
+      this.standItemSearch.itemsName=''
+      this.standItemSearch.ZCCSSRQ=''
+      this.standItemSearch.XCXSSRQ=''
       this.selectSarStandItems()
     },
     inputChange() {

From 3a2291bf8f3d88316b777ab8dd50111b60891dd4 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 30 Aug 2021 12:11:55 +0800
Subject: [PATCH 2/6] feat: There is no way the

---
 src/pages/config/pages/attributeCustom/components/stand.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index f36390630..0ea9cfe17 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -261,7 +261,7 @@
         <el-form-item label="所属模块" prop="sarType" class="add-form-item">
           <el-select v-model="displayLocationDialogFormData.sarType" filterable>
             <el-option
-              v-for="item in sarTypeLocationOptions"
+              v-for="item in sarTypeOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value"

From 5b179e16c42761730ae784347e606a3eaad675ac Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 30 Aug 2021 13:32:17 +0800
Subject: [PATCH 3/6] commit

---
 src/components/comHeader/index.vue |   4 +
 src/pages/login/index.vue          | 159 ++++++++++++++++-------------
 2 files changed, 92 insertions(+), 71 deletions(-)

diff --git a/src/components/comHeader/index.vue b/src/components/comHeader/index.vue
index 6a2e0f462..015755d84 100644
--- a/src/components/comHeader/index.vue
+++ b/src/components/comHeader/index.vue
@@ -74,6 +74,10 @@ export default {
           confirmButtonClass: 'common-button-primary',
           roundButton: false
         }).then(() => {
+          this.$http.post('/logout', {}, res => {
+            window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
+          })
+          return
           this.$store.commit('setTypeFlag', 'loginOut')
           this.$http.get('logout', {}, {
             _this: this
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 75a53fcc6..006d47b44 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -55,10 +55,10 @@
             },
             // 点击登录按钮事件
             signin () {
-                // let username = getCookie();
-                // console.log(username);
-                // window.location.href = "http://testsso1.foton.com.cn/logout?service=http://127.0.0.1";
-                // return
+                this.$http.post('/logout', {}, res => {
+                    window.location.href = "http://testsso1.foton.com.cn/logout?service=http://127.0.0.1";
+                })
+                return
                 if (this.username === '') {
                     this.$message.warning('用户名不能为空')
                 } else if (this.password === '') {
@@ -275,7 +275,7 @@
                 })
             },
             /**
-             * @description: 获取菜单
+             * @description: 获取菜单logout
              * @author: chenxiaoxi
              * @date: 2018/11/11 13:42:14
              */
@@ -292,78 +292,95 @@
                     })
                 })
             },
+            loginNew (res) {
+                window.sessionStorage.setItem('go1', '开始第一步'); // del
+                if (res.data.orgId === null || res.data.orgId === '') {
+                    this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
+                    return
+                }
+                window.sessionStorage.setItem('go2', '开始第二步'); // del
+                let Base64 = require('js-base64').Base64
+                window.sessionStorage.setItem('go3', '开始第3步'); // del
+                let userInfoStr = Base64.decode(res.data)
+                window.sessionStorage.setItem('go4', '开始第4步'); // del
+                let userInfo2 = decodeURIComponent(userInfoStr)
+                window.sessionStorage.setItem('go5', '开始第5步'); // del
+                let userInfoObj = JSON.parse(userInfo2)
+                window.sessionStorage.setItem('go6', '开始第6步'); // del
+                userInfoObj.userId = userInfoObj.usid
+                window.sessionStorage.setItem('go7', '开始第7步'); // del
+                window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
+                this.setToken(userInfoObj.token) // vuex存储token
+                let userInfo = {}
+                for (let key in userInfoObj) {
+                    if (key !== 'uname') {
+                        userInfo[key] = userInfoObj[key]
+                    } else {
+                        userInfo.uName = userInfoObj[key]
+                    }
+                }
+                this.setUserInfo(JSON.stringify((userInfo)))
+                // this.resetTime()
+                // 获取用户菜单
+                window.sessionStorage.setItem('userInfo', userInfo); // del
+                this.getMenu().then((menuList) => {
+                    let hasHomeMenu = false
+                    menuList.map((menuItem) => {
+                        if (menuItem.id === 'asdfadf') {
+                            hasHomeMenu = true
+                        }
+                    })
+                    window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
+                    window.sessionStorage.setItem('menuList', menuList); // del
+                    if (hasHomeMenu) {
+                        this.setMenu(JSON.stringify(menuList)).then(res => {
+                            this.$router.push('/home1')
+                        }, e => {
+                            this.$message.warning('未获取到菜单')
+                        })
+                    } else {
+                        alert('无系统权限')
+                        // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code';
+                    }
+                })
+            },
             ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']),
             ...mapActions(['setMenu'])
         },
         computed: {
         },
         mounted () {
-            console.log(document.cookie);
-            let url = window.location.search
-            if (url) {
-                url = url.substr(1);
-                url = url.split('&');
-                let info = [];
-                let obj = {};
-                for (let i = 0,len = url.length; i < len; i++) {
-                    info = url[i].split('=')
-                    obj[info[0]] = decodeURI(info[1]);
-                    url[i] = obj;
-                }
-                let code = url[0].code
-                this.$http.post('login', {
-                    code: code
-                }, res => {
-                    if (res.ok) {
-                        const JSESSIONID = document.cookie
-                        this.setJESSCookie(JSESSIONID)
-                        if (res.data.orgId === null || res.data.orgId === '') {
-                            this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
-                            return
-                        }
-                        // debugger
-                        let Base64 = require('js-base64').Base64
-                        let userInfoStr = Base64.decode(res.data)
-                        let userInfo2 = decodeURIComponent(userInfoStr)
-                        let userInfoObj = JSON.parse(userInfo2)
-                        userInfoObj.userId = userInfoObj.usid
-                        this.setToken(userInfoObj.token) // vuex存储token
-                        let userInfo = {}
-                        for (let key in userInfoObj) {
-                            if (key !== 'uname') {
-                                userInfo[key] = userInfoObj[key]
-                            } else {
-                                userInfo.uName = userInfoObj[key]
-                            }
-                        }
-                        this.setUserInfo(JSON.stringify((userInfo)))
-                        this.resetTime()
-                        // 获取用户菜单
-                        this.getMenu().then((menuList) => {
-                            let hasHomeMenu = false
-                            menuList.map((menuItem) => {
-                                if (menuItem.id === 'asdfadf') {
-                                    hasHomeMenu = true
-                                }
-                            })
-                            if (hasHomeMenu) {
-                                this.setMenu(JSON.stringify(menuList)).then(res => {
-                                    this.$router.push('/home1')
-                                }, e => {
-                                    this.$message.warning('未获取到菜单')
-                                })
-                            } else {
-                                window.location.href = "http://testsso1.foton.com.cn/logout?service=127.0.0.1";
-                            }
-                        })
-                    } else if (res.respCode === 'r0012') {
-                        this.loading = false
-                        this.$message.error(res.message)
-                    } else {
-                        this.loading = false
-                    }
-                })
-            }
+            // let url = window.location.search
+            // let code = ''
+            // if (url) {
+            //     url = url.substr(1);
+            //     url = url.split('&');
+            //     let info = [];
+            //     let obj = {};
+            //     for (let i = 0,len = url.length; i < len; i++) {
+            //         info = url[i].split('=')
+            //         obj[info[0]] = decodeURI(info[1]);
+            //         url[i] = obj;
+            //     }
+            //     code = url[0].code
+            //     window.localStorage.setItem('code', code);
+            // } else if (window.localStorage.getItem('code') && !url) {
+            //     code = window.localStorage.getItem('code');
+            // } else {
+            //     window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
+            // }
+            // if (code) {
+            //     this.$http.post('login', {
+            //         code: code
+            //     }, res => {
+            //         if (res.ok) {
+            //             window.sessionStorage.setItem('go', '开始第0步'); // del
+            //             this.loginNew(res)
+            //         } else {
+            //             window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
+            //         }
+            //     })
+            // }
             if (this.$store.state.laws_urm !== '') {
                 this.isRemember = true
             }

From a708438b6fdf5ff93cf36219037e0123badca9ee Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 30 Aug 2021 13:56:40 +0800
Subject: [PATCH 4/6] commit

---
 src/pages/login/index.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 006d47b44..d7595304a 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -55,10 +55,6 @@
             },
             // 点击登录按钮事件
             signin () {
-                this.$http.post('/logout', {}, res => {
-                    window.location.href = "http://testsso1.foton.com.cn/logout?service=http://127.0.0.1";
-                })
-                return
                 if (this.username === '') {
                     this.$message.warning('用户名不能为空')
                 } else if (this.password === '') {

From 3b36ebdc79f7d2e0e0e7cac8356e4b47a1f45d2c Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 30 Aug 2021 15:25:06 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=A0=87=E5=87=86=E5=8F=B7/?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=92=8C=E5=85=B7=E4=BD=93?=
 =?UTF-8?q?=E7=AB=A0=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/technologyInvolveProject.vue        | 42 +++++++++++++++----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index 53b6bf83e..10d2c6945 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -108,13 +108,27 @@
     >
       <div class="demo-drawer-content">
         <div class="el-drawer-form">
-          <div class="search-area">
-            <div class="left">
+          <div class="search-area-detail">
+            <div class="left" id="detailSearch">
               <el-form :inline="true" :model="sarProStateEO" class="label-input-form">
-                <el-form-item label="项目名称" class="search-item search-item-last">
+                <el-form-item label="标准编号" class="search-item search-item-last">
                   <el-input
-                      v-model="sarProStateEO.productName"
-                      placeholder="根据项目名称查找"
+                      v-model="sarProStateEO.standNumber"
+                      placeholder="根据标准编号查找"
+                      :maxlength="100"
+                      clearable></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" class="search-item search-item-last">
+                  <el-input
+                      v-model="sarProStateEO.standName"
+                      placeholder="根据标准名称查找"
+                      :maxlength="100"
+                      clearable></el-input>
+                </el-form-item>
+                <el-form-item label="具体章条" class="search-item search-item-last">
+                  <el-input
+                      v-model="sarProStateEO.specificItem"
+                      placeholder="根据具体章条查找"
                       :maxlength="100"
                       clearable></el-input>
                 </el-form-item>
@@ -230,7 +244,12 @@ name: "technologyInvolveProject",
       pageSize: this.$store.getters.userInfo.configContent,
       showSarProStateModal: false,
       sarProStateEO: {
-        productName: ''
+        //标准编号
+        standNumber: '',
+        //标准名称
+        standName: '',
+        //具体章条
+        specificItem: '',
       },
       sarProStateTotal: 0,
       sarProStateTotalPage: 1,
@@ -306,11 +325,15 @@ name: "technologyInvolveProject",
       this.showSarProStateModal = true
     }, // 查询项目数据
       clearSearchProState () {
-          this.sarProStateEO.productName = ''
+          this.sarProStateEO.standNumber = ''
+          this.sarProStateEO.standName = ''
+          this.sarProStateEO.specificItem = ''
           this.querySarProStateZero()
       }, // 清空条件查询
       clearSearchPro () {
-          this.sarProStateEO.productName = ''
+          this.sarProStateEO.standNumber = ''
+          this.sarProStateEO.standName = ''
+          this.sarProStateEO.specificItem = ''
           this.showSarProStateModal = false
       }, // 关闭查看事件
       pageProStateChange (page) {
@@ -368,5 +391,8 @@ name: "technologyInvolveProject",
   .search-area .search-item .el-input--suffix .el-input__inner{
     padding-right: 15px;
   }
+  .search-area-detail .el-input__inner{
+    width: 150px;
+  }
 }
 </style>

From ebe387e93261d902ec6669ac04227d72e6fc3124 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 30 Aug 2021 15:32:16 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=EF=BC=8C=E8=BD=A6=E5=BA=93?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue   | 1306 +++++++++--------
 .../pages/details.vue                         |    6 +-
 2 files changed, 710 insertions(+), 602 deletions(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index fb9f602a5..022c01a12 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -1,624 +1,732 @@
 <!-- 配置管理 - 角色管理 -->
 <template>
-    <div class="role-manage v-class" :class="{ 'tree-close': sideClose }">
-        <div class="tree-content" :class="{ 'tree-closed': sideClose }">
-            <div class="tree">
-                <el-input
-                        class="filter-tree-input"
-                        placeholder="输入关键字进行过滤"
-                        v-model="filterText">
-                </el-input>
-                <el-tree
-                        class="filter-tree"
-                        :data="treeData"
-                        :props="defaultProps"
-                        default-expand-all
-                        :expand-on-click-node="false"
-                        highlight-current
-                        :filter-node-method="filterNode"
-                        ref="tree"
-                        @node-click="handleNodeClick">
-                </el-tree>
-            </div>
-            <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
-                <!--切换折叠样式-->
-                <i class="el-icon-arrow-left" v-if="sideClose === false"></i>
-                <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
-            </div>
-        </div>
-        <div class="tree-right">
-            <div class="action-bar">
-                <el-button type="primary"
-                           class="common-button-primary add-button"
-                           @click="roleAdd"
-                           v-btn-permission="'93e75b6ec0b2b6b0b40d2b11adeba88a'"
-                           size="mini">配置角色权限</el-button>
-                <el-button type="primary"
-                           class="common-button-primary add-button"
-                           @click="roleAddData"
-                           v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
-                           size="mini">配置数据权限</el-button>
-                <el-button type="primary"
-                           class="common-button-primary add-button"
-                           @click="RolesAdd(1)"
-                           v-btn-permission="'3e0cee86b3522d4233df8f1f11ab02c7'"
-                           size="mini">新增角色</el-button>
-            </div>
-            <div class="content">
-                <el-table
-                        ref="multipleTable"
-                        :data="data"
-                        tooltip-effect="dark"
-                        border
-                        style="width: 100%; flex: auto;"
-                        class="drag-table"
-                        height="100%"
-                        :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}">
-                    <el-table-column
-                            prop="name"
-                            label="角色名称"
-                            width="170px">
-                    </el-table-column>
-                    <el-table-column
-                            prop="remarks"
-                            label="角色描述">
-                    </el-table-column>
-                    <el-table-column
-                            prop="parent"
-                            label="上级角色"
-                            width="170px">
-                    </el-table-column>
-                    <el-table-column
-                            prop="useFlag"
-                            label="角色状态"
-                            width="170px">
-                        <template slot-scope="scope">
-                            <span>{{ scope.row.useFlag===0?'禁用':'启用' }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                            prop="operator"
-                            label="操作人"
-                            width="140px">
-                    </el-table-column>
-                    <el-table-column
-                            prop="operateTime"
-                            width="160px"
-                            label="操作时间">
-                    </el-table-column>
-                    <el-table-column
-                            label="操作"
-                            width="50px">
-                        <template slot-scope="scope">
-                            <div @click.stop style="display: inline-block">
-                                <el-dropdown trigger="click" @command="handleCommand">
-                                    <i class="iconfont">&#xe61e;</i>
-                                    <el-dropdown-menu slot="dropdown">
-                                        <el-dropdown-item v-btn-permission="'38e362493fd7603dc7fddd1f3ac8971c'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                                        <el-dropdown-item v-btn-permission="'025368d14944c4c4c86da29109b5f383'" :command="[scope.row, '删除']">删除</el-dropdown-item>
-                                    </el-dropdown-menu>
-                                </el-dropdown>
-                            </div>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <loading :loading="Loading">加载中...</loading>
-        </div>
-        <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
-        <el-dialog
-                title="系统菜单"
-                :visible.sync="modalshowflag"
-                :wrapperClosable="false"
-                @close="closeDialog"
-                size="800px">
-            <div class="myDialog">
-                <el-tree
-                        v-if="modalshowflag"
-                        node-key="id"
-                        class="filter-tree"
-                        :data="treeData2"
-                        :props="defaultProps2"
-                        :default-checked-keys="nodeList"
-                        :expand-on-click-node="false"
-                        default-expand-all
-                        highlight-current
-                        show-checkbox
-                        check-strictly
-                        ref="tree2">
-                </el-tree>
-            </div>
-            <div slot="footer">
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialog">取消</el-button>
-                <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
-                        highlight-current
-                        :expand-on-click-node="false"
-                        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>
-        <el-dialog
-                :title="addRoleTitle"
-                :visible.sync="addModel"
-                :wrapperClosable="false"
-                @close="AddRoleCancel"
-                size="800px">
-            <div class="myDialog">
-                <el-form
-                        ref="addForm"
-                        :model="addForm"
-                        :rules="addFormRules"
-                        class="label-input-form"
-                >
-                    <el-form-item label="角色名称" prop="name" label-width="80px" class="add-form-item">
-                        <el-input v-model="addForm.name"
-                                  placeholder="请输入角色名称"
-                                  clearable></el-input>
-                    </el-form-item>
-                    <el-form-item label="上级角色" prop="parentId" label-width="80px" class="add-form-item">
-                        <el-input v-model="addForm.parentId" style="display: none;"
-                                  clearable></el-input>
-                        <el-input v-model="addForm.parent"
-                                  placeholder="请选择上级角色"
-                                  @click.native="SuperiorRole"
-                                  clearable></el-input>
-                    </el-form-item>
-                    <el-form-item label="角色描述" prop="remarks" label-width="80px" class="add-form-item">
-                        <el-input v-model="addForm.remarks"
-                                  placeholder="请输入角色描述"
-                                  clearable></el-input>
-                    </el-form-item>
-                    <el-form-item label="角色状态" prop="useFlag" label-width="80px" class="add-form-item">
-                        <el-select class="bead-input" v-model="addForm.useFlag">
-                            <el-option
-                                    v-for="item in options"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <div slot="footer">
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="AddRoleCancel">取消</el-button>
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="AddRoleOk">确定</el-button>
-            </div>
-        </el-dialog>
-        <el-drawer
-                title="选择上级角色"
-                :visible.sync="SuperiorRoleModel"
-                :wrapperClosable="false"
-                @close="SuperiorRoleCancle"
-                size="800px"
-        >
-            <el-tree
-                    v-if="SuperiorRoleModel"
-                    class="filter-tree1"
-                    :data="treeData"
-                    :props="defaultProps"
-                    style="height: 100%; overflow: auto;"
-                    default-expand-all
-                    check-strictly
-                    node-key="id"
-                    :default-checked-keys="nodeList3"
-                    show-checkbox
-                    highlight-current
-                    @check="drawerCheck"
-                    :expand-on-click-node="false"
-                    ref="tree4">
-            </el-tree>
-            <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button
-                        size="mini"
-                        class="common-button-primary"
-                        icon="el-icon-check"
-                        type="primary"
-                        @click="SuperiorRoleOk"
-                >确定</el-button>
-                <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="SuperiorRoleCancle">取消</el-button>
-            </div>
-        </el-drawer>
+  <div class="role-manage v-class" :class="{ 'tree-close': sideClose }">
+    <div class="tree-content" :class="{ 'tree-closed': sideClose }">
+      <div class="tree">
+        <el-input
+          class="filter-tree-input"
+          placeholder="输入关键字进行过滤"
+          v-model="filterText">
+        </el-input>
+        <el-tree
+          class="filter-tree"
+          :data="treeData"
+          :props="defaultProps"
+          default-expand-all
+          :expand-on-click-node="false"
+          highlight-current
+          :filter-node-method="filterNode"
+          ref="tree"
+          @node-click="handleNodeClick">
+        </el-tree>
+      </div>
+      <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
+        <!--切换折叠样式-->
+        <i class="el-icon-arrow-left" v-if="sideClose === false"></i>
+        <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
+      </div>
     </div>
+    <div class="tree-right">
+      <div class="action-bar">
+        <el-button type="primary"
+                   class="common-button-primary add-button"
+                   @click="roleAdd"
+                   v-btn-permission="'93e75b6ec0b2b6b0b40d2b11adeba88a'"
+                   size="mini">配置角色权限
+        </el-button>
+        <el-button type="primary"
+                   class="common-button-primary add-button"
+                   @click="roleAddData"
+                   v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
+                   size="mini">配置数据权限
+        </el-button>
+        <el-button type="primary"
+                   class="common-button-primary add-button"
+                   @click="RolesAdd(1)"
+                   v-btn-permission="'3e0cee86b3522d4233df8f1f11ab02c7'"
+                   size="mini">新增角色
+        </el-button>
+      </div>
+      <div class="content">
+        <el-table
+          ref="multipleTable"
+          :data="data"
+          tooltip-effect="dark"
+          border
+          style="width: 100%; flex: auto;"
+          class="drag-table"
+          height="100%"
+          :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            prop="name"
+            label="角色名称"
+            width="170px">
+          </el-table-column>
+          <el-table-column
+            prop="remarks"
+            label="角色描述">
+          </el-table-column>
+          <el-table-column
+            prop="parent"
+            label="上级角色"
+            width="170px">
+          </el-table-column>
+          <el-table-column
+            prop="useFlag"
+            label="角色状态"
+            width="170px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.useFlag === 0 ? '禁用' : '启用' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operator"
+            label="操作人"
+            width="140px">
+          </el-table-column>
+          <el-table-column
+            prop="operateTime"
+            width="160px"
+            label="操作时间">
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="50px">
+            <template slot-scope="scope">
+              <div @click.stop style="display: inline-block">
+                <el-dropdown trigger="click" @command="handleCommand">
+                  <i class="iconfont">&#xe61e;</i>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item v-btn-permission="'38e362493fd7603dc7fddd1f3ac8971c'" :command="[scope.row, '编辑']">
+                      编辑
+                    </el-dropdown-item>
+                    <el-dropdown-item v-btn-permission="'025368d14944c4c4c86da29109b5f383'" :command="[scope.row, '删除']">
+                      删除
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <loading :loading="Loading">加载中...</loading>
+    </div>
+    <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
+    <el-dialog
+      title="系统菜单"
+      :visible.sync="modalshowflag"
+      :wrapperClosable="false"
+      @close="closeDialog"
+      size="800px">
+      <div class="myDialog">
+        <el-tree
+          v-if="modalshowflag"
+          node-key="id"
+          class="filter-tree"
+          v-loading="twoLoading"
+          :data="treeData2"
+          :props="defaultProps2"
+          :default-checked-keys="nodeList"
+          :expand-on-click-node="false"
+          default-expand-all
+          highlight-current
+          :show-checkbox="true"
+          :check-strictly="true"
+          @check="nodeClick2"
+          ref="tree2">
+        </el-tree>
+      </div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialog">取消</el-button>
+        <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
+          highlight-current
+          :expand-on-click-node="false"
+          :show-checkbox="true"
+          :check-strictly="true"
+          @check="nodeClick"
+          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>
+    <el-dialog
+      :title="addRoleTitle"
+      :visible.sync="addModel"
+      :wrapperClosable="false"
+      @close="AddRoleCancel"
+      size="800px">
+      <div class="myDialog">
+        <el-form
+          ref="addForm"
+          :model="addForm"
+          :rules="addFormRules"
+          class="label-input-form"
+        >
+          <el-form-item label="角色名称" prop="name" label-width="80px" class="add-form-item">
+            <el-input v-model="addForm.name"
+                      placeholder="请输入角色名称"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="上级角色" prop="parentId" label-width="80px" class="add-form-item">
+            <el-input v-model="addForm.parentId" style="display: none;"
+                      clearable></el-input>
+            <el-input v-model="addForm.parent"
+                      placeholder="请选择上级角色"
+                      @click.native="SuperiorRole"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="角色描述" prop="remarks" label-width="80px" class="add-form-item">
+            <el-input v-model="addForm.remarks"
+                      placeholder="请输入角色描述"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="角色状态" prop="useFlag" label-width="80px" class="add-form-item">
+            <el-select class="bead-input" v-model="addForm.useFlag">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="AddRoleCancel">取消</el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="AddRoleOk">确定
+        </el-button>
+      </div>
+    </el-dialog>
+    <el-drawer
+      title="选择上级角色"
+      :visible.sync="SuperiorRoleModel"
+      :wrapperClosable="false"
+      @close="SuperiorRoleCancle"
+      size="800px"
+    >
+      <el-tree
+        v-if="SuperiorRoleModel"
+        class="filter-tree1"
+        :data="treeData"
+        :props="defaultProps"
+        style="height: 100%; overflow: auto;"
+        default-expand-all
+        check-strictly
+        node-key="id"
+        :default-checked-keys="nodeList3"
+        show-checkbox
+        highlight-current
+        @check="drawerCheck"
+        :expand-on-click-node="false"
+        ref="tree4">
+      </el-tree>
+      <div id="roleFormButton" class="demo-drawer-footer">
+        <el-button
+          size="mini"
+          class="common-button-primary"
+          icon="el-icon-check"
+          type="primary"
+          @click="SuperiorRoleOk"
+        >确定
+        </el-button>
+        <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="SuperiorRoleCancle">取消
+        </el-button>
+      </div>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
 export default {
   name: 'role-manage',
-  data () {
+  data() {
     return {
-        type: '', // 新增/编辑状态
-        addRoleTitle: '',
-        SuperiorRoleData: {},
-        nodeList3: [],
-        SuperiorRoleModel: false,
-        addFormRules: {
-            name: [
-                { required: true, message: '请输入角色名称', trigger: 'blur' },
-                {type: 'string', max: 100, message: '角色名称不能超过100个字符', trigger: 'blur'}
-            ],
-            useFlag: [
-                { required: true, message: '请选择角色状态', trigger: 'change' },
-            ]
+      twoLoading: false,
+      type: '', // 新增/编辑状态
+      addRoleTitle: '',
+      SuperiorRoleData: {},
+      nodeList3: [],
+      SuperiorRoleModel: false,
+      addFormRules: {
+        name: [
+          {required: true, message: '请输入角色名称', trigger: 'blur'},
+          {type: 'string', max: 100, message: '角色名称不能超过100个字符', trigger: 'blur'}
+        ],
+        useFlag: [
+          {required: true, message: '请选择角色状态', trigger: 'change'},
+        ]
+      },
+      addForm: {
+        name: '', // 角色名称
+        parentId: '', // 上级ID
+        remarks: '', // 角色描述
+        parent: '',
+        useFlag: '',
+        id: ''
+      },
+      options: [
+        {
+          value: "0",
+          label: "禁用",
         },
-        addForm: {
-            name: '', // 角色名称
-            parentId: '', // 上级ID
-            remarks: '', // 角色描述
-            parent: '',
-            useFlag: '',
-            id: ''
-        },
-        options: [
-            {
-                value: "0",
-                label: "禁用",
-            },
-            {
-                value: "1",
-                label: "启用",
-            }
-    ],
-        addModel: false,
-        treeData3: [],
-        defaultProps3: {
-            children: 'children',
-            label: 'menuName'
-        },
-        nodeList2: [],
-        modalflag: false,
-        sideClose: false, // 边栏收展状态
-        filterText: '',
-        treeData: [],
-        defaultProps: {
-            children: 'children',
-            label: 'name'
-        },
-        Loading: false,
-        treeLoading: false,
-        id: '',
-        data: [],
-        modalshowflag: false,
-        treeData2: [],
-        defaultProps2: {
-            children: 'children',
-            label: 'menuName'
-        },
-        nodeList: []
+        {
+          value: "1",
+          label: "启用",
+        }
+      ],
+      addModel: false,
+      treeData3: [],
+      defaultProps3: {
+        children: 'children',
+        label: 'menuName'
+      },
+      nodeList2: [],
+      modalflag: false,
+      sideClose: false, // 边栏收展状态
+      filterText: '',
+      treeData: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      Loading: false,
+      treeLoading: false,
+      id: '',
+      data: [],
+      modalshowflag: false,
+      treeData2: [],
+      defaultProps2: {
+        children: 'children',
+        label: 'menuName'
+      },
+      nodeList: []
     }
   },
   methods: {
-      handleCommand (command) {
-          switch (command[1]) {
-              case '编辑':
-                  this.RolesAdd(0, command[0])
-                  break
-              case '删除':
-                  this.deleteRole(command[0])
-                  break
-          }
-      },
-      deleteRole (row) { // 删除角色
-          this.$confirm('此操作将永久删除该角色, 是否继续?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-          }).then(() => {
-              this.$http.delete('sarRole/role', {
-                  roleId: row.id
-              }, {}, res => {
-                  if (res.ok) {
-                      this.$message({
-                          type: 'success',
-                          message: '删除成功!'
-                      });
-                      this.getTree()
-                  }
-              })
-          }).catch(() => {
-              this.$message({
-                  type: 'info',
-                  message: '已取消删除'
-              });
-          });
-      },
-      drawerCheck (data) {
-          var getlist = this.$refs.tree4.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-          if(getlist.length == 1) {
-          }else {
-              this.$refs.tree4.setCheckedKeys([data.id]);
-          }
-          this.SuperiorRoleData = data
-      },
-      SuperiorRoleOk () { // 上级角色确定
-          this.addForm.parentId = this.SuperiorRoleData.id
-          this.addForm.parent = this.SuperiorRoleData.name
-          this.nodeList3 = []
-          this.nodeList3.push(this.addForm.parentId)
-          this.SuperiorRoleModel = false
-      },
-      SuperiorRoleCancle () { // 上级角色取消
-          this.SuperiorRoleModel = false
-      },
-      AddRoleCancel () { // 新增角色取消
-          this.$refs['addForm'].resetFields();
-          this.addModel = false
-      },
-      AddRoleOk () { // 新增角色确定
-          this.$refs['addForm'].validate((valid) => {
-              if (valid) {
-                  if (this.type === 1) { // 新增
-                      this.$http.postData('sarRole/role',this.addForm , {}, res=> {
-                          if (res.ok) {
-                              this.$message.success('新增角色成功')
-                              this.addModel = false
-                              this.getTree()
-                          } else {
-                              this.$message.warning(res.message)
-                              this.addModel = false
-                          }
-                      })
-                  } else { // 编辑
-                      this.$http.putData('sarRole/role',this.addForm , {}, res=> {
-                          if (res.ok) {
-                              this.$message.success('修改角色信息成功')
-                              this.addModel = false
-                              this.getTree()
-                          } else {
-                              this.$message.warning(res.message)
-                              this.addModel = false
-                          }
-                      })
-                  }
-                  this.addModel = false
-              }
-          })
-      },
-      SuperiorRole () { // 点击选择上级角色按钮
-          this.SuperiorRoleModel = true
-      },
-      RolesAdd (type, row) { // 新增/编辑角色按钮
-          this.type = type
-          if (type === 1) {
-              this.addRoleTitle = '新增角色'
-              this.addForm.name = ''
-              this.addForm.remarks = ''
-              this.addForm.parentId = ''
-              this.addForm.parent = ''
-              this.addForm.id = ''
-          } else {
-              this.addRoleTitle = '编辑角色'
-              this.addForm.name = row.name
-              this.addForm.remarks = row.remarks
-              this.addForm.parentId = row.parentId
-              this.addForm.parent = row.parent
-              this.addForm.id = row.id
-              this.nodeList3 = []
-              this.nodeList3.push(this.addForm.parentId)
-          }
-          this.addModel = true
-      },
-      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
-      },
-      confirmDialog () {
-          this.$http.postData('sarRole/role/menu', {
-              menuIds: this.$refs.tree2.getCheckedKeys().concat(this.$refs.tree2.getHalfCheckedKeys()),
-              roleId: this.id
-          }, {}, res=> {
-              if (res.ok) {
-                  this.$message.success('设置权限成功')
-                  this.modalshowflag = false
-              }
-          })
-      },
-      getTree2 () {
-          this.$http.get('lawss/sarMenu', {}, {}, res=> {
-              if (res.ok) {
-                  this.treeData2 = res.data
-              }
-          })
-      },
-      roleAdd () { // 配置角色资源
-          this.$http.get('sarRole/role/menu', {
-              roleId: this.id
-          }, {}, res=> {
-              if (res.ok) {
-                  this.modalshowflag = true
-                  this.nodeList = res.data
-              }
-          })
-      },
-      handleNodeClick (data) {
-          this.id = data.id
-          this.getData()
-      },
-      getData () {
-          this.$http.get('sarRole/role/id', {
-              roleId: this.id
-          },{
-              _this: this,
-              loading: 'Loading'
-          }, res=> {
-              if (res.ok) {
-                  this.data = []
-                  this.data.push(res.data)
-              }
-          })
-      },
-      filterNode(value, data) {
-          if (!value) return true;
-          return data.name.indexOf(value) !== -1;
-      },
-      treeCollapse () {
-          this.sideClose = !this.sideClose
-      },
-      getTree () {
-          this.$http.get('sarRole/role', {}, {
-              _this: this,
-              loading: 'treeLoading'
-          }, res=> {
-              this.treeData = res.data
-              this.id = res.data[0].id
-              this.getData()
-          })
-      },
-  },
-    watch: {
-        filterText(val) {
-            this.$refs.tree.filter(val);
-        }
-    },
-    computed:{
-      newForm() {
-          return JSON.parse(JSON.stringify(this.addForm))
+    handleCommand(command) {
+      switch (command[1]) {
+        case '编辑':
+          this.RolesAdd(0, command[0])
+          break
+        case '删除':
+          this.deleteRole(command[0])
+          break
       }
     },
-    mounted () {
-      this.getTree()
-      this.getTree2()
-      this.getTree3()
+    deleteRole(row) { // 删除角色
+      this.$confirm('此操作将永久删除该角色, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http.delete('sarRole/role', {
+          roleId: row.id
+        }, {}, res => {
+          if (res.ok) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+            this.getTree()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+    drawerCheck(data) {
+      var getlist = this.$refs.tree4.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      if (getlist.length == 1) {
+      } else {
+        this.$refs.tree4.setCheckedKeys([data.id]);
+      }
+      this.SuperiorRoleData = data
+    },
+    SuperiorRoleOk() { // 上级角色确定
+      this.addForm.parentId = this.SuperiorRoleData.id
+      this.addForm.parent = this.SuperiorRoleData.name
+      this.nodeList3 = []
+      this.nodeList3.push(this.addForm.parentId)
+      this.SuperiorRoleModel = false
+    },
+    SuperiorRoleCancle() { // 上级角色取消
+      this.SuperiorRoleModel = false
+    },
+    AddRoleCancel() { // 新增角色取消
+      this.$refs['addForm'].resetFields();
+      this.addModel = false
+    },
+    AddRoleOk() { // 新增角色确定
+      this.$refs['addForm'].validate((valid) => {
+        if (valid) {
+          if (this.type === 1) { // 新增
+            this.$http.postData('sarRole/role', this.addForm, {}, res => {
+              if (res.ok) {
+                this.$message.success('新增角色成功')
+                this.addModel = false
+                this.getTree()
+              } else {
+                this.$message.warning(res.message)
+                this.addModel = false
+              }
+            })
+          } else { // 编辑
+            this.$http.putData('sarRole/role', this.addForm, {}, res => {
+              if (res.ok) {
+                this.$message.success('修改角色信息成功')
+                this.addModel = false
+                this.getTree()
+              } else {
+                this.$message.warning(res.message)
+                this.addModel = false
+              }
+            })
+          }
+          this.addModel = false
+        }
+      })
+    },
+    SuperiorRole() { // 点击选择上级角色按钮
+      this.SuperiorRoleModel = true
+    },
+    RolesAdd(type, row) { // 新增/编辑角色按钮
+      this.type = type
+      if (type === 1) {
+        this.addRoleTitle = '新增角色'
+        this.addForm.name = ''
+        this.addForm.remarks = ''
+        this.addForm.parentId = ''
+        this.addForm.parent = ''
+        this.addForm.id = ''
+      } else {
+        this.addRoleTitle = '编辑角色'
+        this.addForm.name = row.name
+        this.addForm.remarks = row.remarks
+        this.addForm.parentId = row.parentId
+        this.addForm.parent = row.parent
+        this.addForm.id = row.id
+        this.nodeList3 = []
+        this.nodeList3.push(this.addForm.parentId)
+      }
+      this.addModel = true
+    },
+    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
+    },
+    /** 父子节点的级联 */
+    nodeClick(currentObj, treeStatus) {
+      // 用于：父子节点严格互不关联时，父节点勾选变化时通知子节点同步变化，实现单向关联。
+      let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中
+      // 选中
+      if (selected !== -1) {
+        // 子节点只要被选中父节点就被选中
+        this.selectedParent(currentObj)
+        this.selectedParent2(currentObj)
+        // 统一处理子节点为相同的勾选状态
+        this.uniteChildSame(currentObj, true)
+      } else {
+        // 未选中 处理子节点全部未选中
+        if (currentObj.children.length !== 0) {
+          this.uniteChildSame(currentObj, false)
+        }
+      }
+    },
+    // 统一处理子节点为相同的勾选状态
+    uniteChildSame(treeList, isSelected) {
+      // this.$refs.tree3.setChecked(treeList.id, isSelected)
+      this.$refs.tree2.setChecked(treeList.id, isSelected)
+      for (let i = 0; i < treeList.children.length; i++) {
+        this.uniteChildSame(treeList.children[i], isSelected)
+      }
+    },
+    // 统一处理父节点为选中
+    selectedParent(currentObj) {
+      let currentNode = this.$refs.tree3.getNode(currentObj)
+      if (currentNode.parent.key !== undefined) {
+        this.$refs.tree3.setChecked(currentNode.parent, true)
+        this.selectedParent(currentNode.parent)
+      }
+    },
+    nodeClick2(currentObj, treeStatus) {
+      // 用于：父子节点严格互不关联时，父节点勾选变化时通知子节点同步变化，实现单向关联。
+      let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中
+      // 选中
+      if (selected !== -1) {
+        // 子节点只要被选中父节点就被选中
+        this.selectedParent2(currentObj)
+        // 统一处理子节点为相同的勾选状态
+        this.uniteChildSame2(currentObj, true)
+      } else {
+        // 未选中 处理子节点全部未选中
+        if (currentObj.children.length !== 0) {
+          this.uniteChildSame2(currentObj, false)
+        }
+      }
+    },
+    // 统一处理子节点为相同的勾选状态
+    uniteChildSame2(treeList, isSelected) {
+      this.$refs.tree2.setChecked(treeList.id, isSelected)
+      for (let i = 0; i < treeList.children.length; i++) {
+        this.uniteChildSame2(treeList.children[i], isSelected)
+      }
+    },
+    selectedParent2(currentObj) {
+      let currentNode = this.$refs.tree2.getNode(currentObj)
+      if (currentNode.parent.key !== undefined) {
+        this.$refs.tree2.setChecked(currentNode.parent, true)
+        this.selectedParent2(currentNode.parent)
+      }
+    },
+    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
+    },
+    confirmDialog() {
+      this.$http.postData('sarRole/role/menu', {
+        menuIds: this.$refs.tree2.getCheckedKeys().concat(this.$refs.tree2.getHalfCheckedKeys()),
+        roleId: this.id
+      }, {}, res => {
+        if (res.ok) {
+          this.$message.success('设置权限成功')
+          this.modalshowflag = false
+        }
+      })
+    },
+    getTree2() {
+      this.$http.get('lawss/sarMenu', {}, {}, res => {
+        if (res.ok) {
+          this.treeData2 = res.data
+          this.twoLoading = false
+        }
+      })
+    },
+    roleAdd() { // 配置角色资源
+      this.treeTwoLoading = true
+      this.$http.get('sarRole/role/menu', {
+        roleId: this.id,
+      }, {}, res => {
+        if (res.ok) {
+          this.nodeList = res.data
+          this.twoLoading = true
+          this.modalshowflag = true
+          this.getTree2()
+        }
+      })
+    },
+    handleNodeClick(data) {
+      this.id = data.id
+      this.getData()
+    },
+    getData() {
+      this.$http.get('sarRole/role/id', {
+        roleId: this.id
+      }, {
+        _this: this,
+        loading: 'Loading'
+      }, res => {
+        if (res.ok) {
+          this.data = []
+          this.data.push(res.data)
+        }
+      })
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+    treeCollapse() {
+      this.sideClose = !this.sideClose
+    },
+    getTree() {
+      this.$http.get('sarRole/role', {}, {
+        _this: this,
+        loading: 'treeLoading'
+      }, res => {
+        this.treeData = res.data
+        this.id = res.data[0].id
+        this.getData()
+      })
+    },
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  computed: {
+    newForm() {
+      return JSON.parse(JSON.stringify(this.addForm))
+    }
+  },
+  mounted() {
+    this.getTree()
+    this.getTree3()
   }
 }
 </script>
 
 <style lang="less" scoped>
-  @import '~@/assets/styles/mixins';
-  .role-manage {
+@import '~@/assets/styles/mixins';
+
+.role-manage {
+  display: flex;
+  height: 100%;
+
+  /deep/ .el-form-item__content {
+    width: 100%;
+  }
+
+  .filter-tree1 {
+    height: 100%;
+  }
+
+  .tree-close {
+    .tree {
+      left: -200px !important;
+    }
+
+    .tree-right {
+      width: calc(~'100% - 15px') !important;
+    }
+
+    .side-bar-collapse {
+      background: #5596CC !important;
+      color: #FFF;
+    }
+  }
+
+  .tree-closed {
+    width: 15px !important;
+  }
+
+  .tree-content {
+    background: #fff;
+    width: 16%;
+    position: relative;
+
+    .tree {
+      width: 95%;
+      position: absolute;
+      left: 0;
+    }
+
+    .tree-collapse {
+      position: absolute;
+      right: 0;
+    }
+  }
+
+  .tree-right {
+    overflow-y: hidden;
+    padding: 0;
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
+    .content {
+      padding: 0px;
       display: flex;
-      height: 100%;
-      /deep/.el-form-item__content {
-          width: 100%;
-      }
-      .filter-tree1 {
-          height: 100%;
-      }
-      .tree-close{
-          .tree{
-              left: -200px !important;
-          }
-          .tree-right{
-              width: calc(~'100% - 15px') !important;
-          }
-          .side-bar-collapse{
-              background: #5596CC !important;
-              color: #FFF;
-          }
-      }
-      .tree-closed {
-          width: 15px !important;
-      }
-      .tree-content {
-          background: #fff;
-          width: 16%;
-          position: relative;
-          .tree {
-              width: 95%;
-              position: absolute;
-              left: 0;
-          }
-          .tree-collapse {
-              position: absolute;
-              right: 0;
-          }
-      }
-      .tree-right {
-          overflow-y: hidden;
-          padding:0;
-          position: relative;
-          width: 100%;
-          height: 100%;
-          display: flex;
-          flex-direction: column;
-          .content{
-              padding: 0px;
-              display: flex;
-              flex-direction: column;
-              position: relative;
-              flex: auto;
-              //height: calc(~'100% - 105px - 56px');
-          }
-          .pagination{
-              position: static;
-              width: 100% !important;
-              left: 0 !important;
-          }
-      }
+      flex-direction: column;
+      position: relative;
+      flex: auto;
+      //height: calc(~'100% - 105px - 56px');
+    }
+
+    .pagination {
+      position: static;
+      width: 100% !important;
+      left: 0 !important;
+    }
   }
-  .myDialog {
-      /deep/.el-tree {
-          height: 300px;
-          overflow: auto;
-      }
+}
+
+/deep/ .el-dialog {
+  margin-top: 9vh !important;
+  width: 35%;
+}
+.myDialog {
+  /deep/ .el-tree {
+    height: 500px;
+    overflow: auto;
   }
-  /deep/.el-select__tags {
-      overflow-x: hidden;
-  }
-  /deep/.width-all{
-      width: 100%;
-  }
-  .laws-tree{
-      /deep/.clearable {
-          top: 20px;
-      }
-  }
-  .add-form-item {
-      display: flex;
+}
+
+/deep/ .el-select__tags {
+  overflow-x: hidden;
+}
+
+/deep/ .width-all {
+  width: 100%;
+}
+
+.laws-tree {
+  /deep/ .clearable {
+    top: 20px;
   }
+}
+
+.add-form-item {
+  display: flex;
+}
 </style>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index dda9cc87c..0256f9035 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -39,9 +39,9 @@
         </div>
       </el-card>
       <div class="action-bar">
-        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>
-        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除
-        </el-button>
+<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>-->
+<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除-->
+<!--        </el-button>-->
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
                    v-btn-permission="''"