From 500f9a1457ac629afaa34a47f1171c1c1ebd0ca7 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 30 Jun 2021 15:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9D=83=E9=99=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/wx-index/cpt-item.vue      |  23 +
 .../customer/customize/CustomerList.vue       |  19 +-
 .../modules/customer/customize/RoleAuth.vue   | 540 ++++++++++++++++++
 .../modules/customer/customize/roleList.vue   |   3 +
 .../modules/productConfig/workRoleAuth.vue    | 123 ++--
 5 files changed, 637 insertions(+), 71 deletions(-)
 create mode 100644 epmet-oper-web/src/views/modules/customer/customize/RoleAuth.vue

diff --git a/epmet-oper-web/src/components/wx-index/cpt-item.vue b/epmet-oper-web/src/components/wx-index/cpt-item.vue
index af23135..93ea869 100644
--- a/epmet-oper-web/src/components/wx-index/cpt-item.vue
+++ b/epmet-oper-web/src/components/wx-index/cpt-item.vue
@@ -76,6 +76,29 @@
         </div>
       </div>
     </div>
+    <!-- 特色文章组件 -->
+    <div class="mw-cpt-cnt_news"
+         v-else-if="item.componentFrontId==='resi-functionList-voice-newsList2'">
+      <div class="d-cpt-wrap">
+        <div class="d-cpt-title">党建声音</div>
+        <div class="list">
+          <div class="item"
+               :key="subindex"
+               v-for="(subitem, subindex) in item.demoData.list">
+            <img v-if="subitem.pic"
+                 :src="subitem.pic">
+            <img v-else
+                 src="@/assets/img/modules/wx-mini/index-set/page/news-pic.png">
+            <div class="d-news-title">{{ subitem.title }}</div>
+            <div class="d-news-info">
+              <img src="@/assets/img/modules/wx-mini/index-set/pavilion.png">
+              <span>来源：{{ subitem.author }}</span>
+              <span class="f-fr">{{ subitem.date }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
 
     <!-- 热点议题组件 -->
     <div class="mw-cpt-cnt_news"
diff --git a/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
index 08bd349..086d65a 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
@@ -58,7 +58,10 @@
                          @click="showFootbar(scope.row.customerId,scope.row.customerName)">FootBar配置</el-button>
               <el-button type="text"
                          size="small"
-                         @click="showLimitConfig(scope.row.customerId,scope.row.customerName)">角色权限</el-button>
+                         @click="showRoleAuth(scope.row.customerId,scope.row.customerName)">角色权限</el-button>
+              <el-button type="text"
+                         size="small"
+                         @click="showLimitConfig(scope.row.customerId,scope.row.customerName)">角色权限2</el-button>
               <el-button type="text"
                          size="small"
                          @click="showMost(scope.row.customerId,scope.row.customerName)">高级配置</el-button>
@@ -93,6 +96,10 @@
                       :tableKeywork="'FootBarCustomize'"
                       @cancleBack="cancleBack"></footbar-list>
       </div>
+      <div v-show="showType==='roleAuth'">
+        <role-auth ref="ref_roleAuth"
+                   @cancleBack="cancleBack"></role-auth>
+      </div>
       <div v-if="showType==='mostedit'">
         <most-list ref="ref_mostlist"
                    @cancleBack="cancleBack"></most-list>
@@ -131,6 +138,7 @@ import MostList from './MostList'
 import RoleList from './roleList'
 import categoryList from './CategoryList'
 import StartPage from './StartPage'
+import RoleAuth from './RoleAuth'
 export default {
   data () {
     return {
@@ -159,7 +167,8 @@ export default {
     FootbarList,
     MostList,
     categoryList,
-    StartPage
+    StartPage,
+    RoleAuth
   },
   activated () {
     if (this.showType === 'footbar') {
@@ -255,6 +264,12 @@ export default {
       // this.$message.warning("当前功能还未开发");
     },
 
+    // 显示权限配置
+    showRoleAuth (customerId, customerName) {
+      this.showType = 'roleAuth'
+      this.$refs['ref_roleAuth'].initData(customerId, customerName)
+    },
+
     // 启动页配置
     showStartPage (customerId, customerName) {
       this.showType = 'startPage'
diff --git a/epmet-oper-web/src/views/modules/customer/customize/RoleAuth.vue b/epmet-oper-web/src/views/modules/customer/customize/RoleAuth.vue
new file mode 100644
index 0000000..40f0b3d
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/customer/customize/RoleAuth.vue
@@ -0,0 +1,540 @@
+<template>
+  <div class="role-container">
+    <el-card class="flex1">
+      <div class="div_btn">
+        <span style="margin-right:20px">{{customerName}}</span>
+        <el-button type="default"
+                   size="mini"
+                   @click="diaCancel">取消返回</el-button>
+
+      </div>
+      <el-tabs v-model="activeName"
+               @tab-click="tabClick"
+               class="el-tabs">
+        <el-tab-pane label="工作端"
+                     name="work">
+          <div class="now-name">
+            上下拖动可改变角色顺序
+            <el-button type="primary"
+                       size="small"
+                       @click="handleSaveSort">保存顺序</el-button>
+          </div>
+          <el-table ref="roleTable"
+                    v-loading="loading1"
+                    :data="roleList"
+                    row-key="roleKey"
+                    border
+                    style="width: 100%">
+            <el-table-column type="index"
+                             header-align="left"
+                             align="left"
+                             width="50"></el-table-column>
+            <el-table-column prop="roleName"
+                             label="角色名称"
+                             header-align="left"
+                             align="left"
+                             width="180">
+              <template slot-scope="scope">
+                <el-input v-if="scope.row.isEdit"
+                          v-model="scope.row.roleName"
+                          clearable>
+                </el-input>
+                <span v-else>{{scope.row.constName}}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column v-if="!funcShow"
+                             prop="roleKey"
+                             header-align="left"
+                             align="left"
+                             label="角色Key"
+                             width="150"></el-table-column> -->
+
+            <el-table-column prop="description"
+                             label="角色职责"
+                             header-align="left"
+                             align="left">
+              <template slot-scope="scope">
+                <p style="text-align:left;margin:3px 0"
+                   v-for="(item,index) in scope.row.descriptionList"
+                   :key="index">{{item}}</p>
+                <!-- <p>{{scope.row.description}}</p> -->
+              </template>
+            </el-table-column>
+            <el-table-column width="450"
+                             label="操作">
+              <template slot-scope="scope">
+
+                <el-button type="primary"
+                           size="mini"
+                           @click="handelDefault(scope.row)">恢复默认</el-button>
+                <el-button type="primary"
+                           size="mini"
+                           @click="handelChangeDuty(scope.row)">修改职责</el-button>
+                <el-button type="primary"
+                           size="mini"
+                           @click="toOperationConfig(scope.row.roleId, scope.row.roleName)">功能权限</el-button>
+
+                <span v-if="scope.row.isEdit"
+                      style="display: inline-block; margin-left: 10px;">
+                  <el-button type="primary"
+                             size="small"
+                             @click="handelChangeName(scope.row)">保存</el-button>
+                  <el-button size="small"
+                             @click="scope.row.isEdit=false">取消</el-button>
+                </span>
+                <el-button v-else
+                           type="primary"
+                           size="mini"
+                           @click="handleChangeName(scope.row)">修改名称</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="居民端"
+                     name="resi">
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+
+    <!-- 角色职责弹出框 -->
+    <el-dialog :visible.sync="dutyShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="角色职责"
+               width="30%"
+               @closed="handleDutyClosed">
+      <div class="div_duty"
+           v-if="dutyShow">
+        <el-input type="textarea"
+                  :rows="8"
+                  v-model="description"></el-input>
+        <div class="div_btn_dia">
+          <el-button type="primary"
+                     size="small"
+                     @click="updateRole()">保存</el-button>
+          <el-button size="small"
+                     @click="dutyShow=false">取消</el-button>
+        </div>
+
+      </div>
+    </el-dialog>
+
+    <!-- 功能配置弹出框 -->
+    <el-dialog :visible.sync="funcShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               width="70%"
+               top="30px"
+               title="功能列表"
+               @closed="handleDialogClosed">
+      <div class="role-flex"
+           v-if="funcShow">
+        <el-card class="flex1">
+          <div class="now-name">当前角色: {{roleName}}</div>
+          <div class="now-name">
+            <el-button type="primary"
+                       size="small"
+                       @click="saveOperations4Role">保存功能</el-button>
+          </div>
+          <el-table v-loading="loading2"
+                    height="580"
+                    ref="opeTable"
+                    :data="opeList"
+                    border
+                    @select="handleSelectionChange">
+            <el-table-column type="selection"
+                             width="55"></el-table-column>
+            <!-- <el-table-column prop="operationKey" label="操作Key"></el-table-column> -->
+            <el-table-column prop="operationName"
+                             label="操作名称"></el-table-column>
+            <!-- <el-table-column prop="brief" label="简介"></el-table-column> -->
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="primary"
+                           size="small"
+                           @click="toScopeConfig(scope.row.operationKey, scope.row.operationName)">范围配置</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+        <el-card v-show="roleShow"
+                 style="width: 250px; margin-left: 10px;">
+          <div class="now-name">当前功能: {{funcName}}</div>
+          <div class="now-name">
+            <el-button type="primary"
+                       size="small"
+                       @click="saveSettings">保存范围</el-button>
+          </div>
+          <div>
+            <el-row :gutter="12">
+              <el-col v-loading="loading3">
+                <el-card shadow="hover">
+                  <el-checkbox-group class="t"
+                                     v-model="checkedScopes"
+                                     @change="roleChange">
+                    <el-checkbox v-for="scope in scopeOptions"
+                                 :label="scope.scopeKey"
+                                 :key="scope.scopeKey">{{scope.scopeName}}</el-checkbox>
+                  </el-checkbox-group>
+                </el-card>
+              </el-col>
+            </el-row>
+          </div>
+        </el-card>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Sortable from 'sortablejs'
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  name: 'RoleList',
+  props: {
+
+  },
+  data () {
+    return {
+      activeName: "work",
+      loading1: false,
+      loading2: false,
+      loading3: false,
+      selRoleId: '',
+
+      //职责弹出框相关
+      dutyShow: false,
+      description: '',
+      roleName: '',
+
+      //功能权限弹出框相关
+      funcShow: false,
+      roleShow: false,
+      roleName: '',
+      funcName: '',
+      roleList: [],
+      opeList: [],
+      roleKey: '',
+      operationKey: '',
+      scopeOptions: [],
+      settingOptions: [],
+      checkedScopes: [],
+      checkedSettings: [],
+      operateSection: [], // 功能选择列表
+      scopeSection: [] // 范围选择列表
+    }
+  },
+  created () {
+
+  },
+  mounted () {
+
+  },
+  beforeDestroy () {
+    let _data = this.$data
+    for (let n in _data) {
+      if (typeof _data[n] === 'boolean') _data[n] = false
+      if (typeof _data[n] === 'string') _data[n] = ''
+      if (typeof _data[n] === 'object') _data[n] = []
+    }
+  },
+  methods: {
+    tabClick () {
+
+    },
+    initData (customerId, customerName) {
+      this.customerId = customerId
+      this.customerName = customerName
+      this.listRolesByCustomerId()
+      this.dragRoleSort()
+    },
+
+    //获取角色列表
+    listRolesByCustomerId () {
+      this.loading1 = true
+
+      this.$http
+        .post('/epmetuser/govstaffrole/rolesbycustomer/' + this.customerId)
+        .then(({ data: res }) => {
+
+          if (res.code === 0) {
+            this.roleList = res.data.map(item => {
+              if (!item.description) {
+                item.description = item.defDescription
+              }
+              if (!item.roleKey) {
+                item.roleKey = item.defRoleKey
+              }
+              if (!item.roleName) {
+                item.roleName = item.defRoleName
+              }
+              return {
+                ...item,
+                constName: item.roleName,
+                isEdit: false,
+                descriptionList: item.description.split("\n")
+              }
+            })
+            console.log('roleList', this.roleList)
+          }
+          setTimeout(() => {
+            this.loading1 = false
+          }, 500)
+        })
+    },
+
+    //关闭角色职责弹出框
+    handleDutyClosed () {
+      this.selRoleId = ''
+      this.description = ''
+      this.roleName = ''
+      this.dutyShow = false
+    },
+
+    //恢复默认
+    handelDefault (row) {
+      this.selRoleId = row.roleId
+      this.description = row.defDescription
+      this.roleName = row.defRoleName
+      this.updateRole()
+    },
+
+    //显示角色职责弹出框
+    handelChangeDuty (row) {
+      this.selRoleId = row.roleId
+      this.description = row.description
+      this.roleName = row.roleName
+      this.dutyShow = true
+    },
+
+    handleChangeName (row) {
+      row.isEdit = true
+    },
+
+    handelChangeName (row) {
+      this.selRoleId = row.roleId
+      this.description = row.description
+      this.roleName = row.roleName
+      this.updateRole()
+    },
+
+    //保存角色名称、职责
+    async updateRole () {
+      console.log(this.description)
+      const url = "/epmetuser/govstaffrole/update-role"
+      const params = {
+        roleId: this.selRoleId,
+        roleName: this.roleName,
+        description: this.description
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.dutyShow = false
+        this.listRolesByCustomerId()
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    //关闭功能配置弹出框
+    handleDialogClosed () {
+      this.roleName = ''
+      this.roleKey = ''
+      this.funcName = ''
+      this.operateSection = []
+      this.scopeSection = []
+      this.funcShow = false
+      this.roleShow = false
+    },
+
+    listOperations4AccessConfig (roleId) {
+      this.roleId = roleId
+      this.loading2 = true
+      this.$http.post('/gov/access/config/roleopes/' + roleId).then((resp) => {
+        this.opeList = resp.data.data
+        this.$nextTick(function() {
+          this.defaultCheck() // 每次更新了数据，触发这个函数即可。
+        })
+        setTimeout(() => {
+          this.loading2 = false
+        }, 500)
+      })
+    },
+    listSettingOptions (operationKey) {
+      let params = {
+        roleId: this.roleId,
+        operationKey: operationKey
+      }
+      console.log('checkedScopes', this.checkedScopes)
+      this.checkedScopes = []
+      this.loading3 = true
+      this.$http
+        .post('/gov/access/config/configoptions', params)
+        .then(resp => {
+          console.log('scopeOptions', resp.data)
+          this.scopeOptions = resp.data.data.scopeOptions
+          resp.data.data.scopeOptions.forEach(item => {
+            if (item.assigned) this.checkedScopes.push(item.scopeKey)
+          })
+          console.log('checkedScopes222', this.checkedScopes)
+          this.settingOptions = resp.data.data.settingOptions
+          setTimeout(() => {
+            this.loading3 = false
+          }, 500)
+        })
+    },
+    defaultCheck () {
+      for (var index in this.opeList) {
+        let role = this.opeList[index]
+        if (role.assigned) {
+          this.$refs.opeTable.toggleRowSelection(role, true)
+        }
+      }
+    },
+    toOperationConfig (roleId, roleName) {
+      this.roleName = roleName
+      this.funcShow = true
+      this.opeList = []
+      this.listOperations4AccessConfig(roleId)
+    },
+    toScopeConfig (operationKey, operationName) {
+      this.roleShow = true
+      this.operationKey = operationKey
+      this.funcName = operationName
+      this.checkedScopes = []
+      this.listSettingOptions(operationKey)
+    },
+    saveOperations4Role (val) {
+      let param = {
+        roleId: this.roleId,
+        opes: val,
+        customerId: this.customerId
+      }
+      this.$http.post('/gov/access/config/saveroleopes', param).then(
+        resp => {
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          })
+          this.listOperations4AccessConfig(this.roleId)
+        }
+      )
+    },
+    saveSettings (val) {
+      let param = {
+        roleId: this.roleId,
+        operationKey: this.operationKey,
+        scopeKeys: val,
+        settingKeys: this.checkedSettings,
+        customerId: this.customerId
+      }
+
+      this.$http.post('/gov/access/config/saveconfig', param).then(
+        resp => {
+          this.$message({
+            type: 'success',
+            message: '保存成功'
+          })
+          this.listSettingOptions(this.operationKey)
+        }
+      )
+    },
+    roleChange (val) {
+      console.log('valooo', val)
+      this.saveSettings(val)
+    },
+    handleSelectionChange (val) {
+      this.saveOperations4Role(val)
+    },
+
+
+
+    dragRoleSort () {
+      const el = this.$refs.roleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+      this.sortTable = Sortable.create(el, {
+        group: 'dragTable',
+        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+        // setData: function(dataTransfer, dragEl) {
+        //   dataTransfer.setData("Text", dragEl.textContent);
+        // },
+        delay: 0,
+        onChange: evt => {
+          // console.log(evt)
+        },
+        onEnd: evt => {
+          const targetRow = this.roleList.splice(evt.oldIndex, 1)[0]
+          this.roleList.splice(evt.newIndex, 0, targetRow)
+        }
+      })
+    },
+    handleSaveSort () {
+      let data = {
+        roleIdList: this.roleList.map(item => {
+          return item.roleId
+        })
+      }
+      this.$http
+        .post('/epmetuser/govstaffrole/save-sortorder', data)
+        .then(({ data: res }) => {
+          console.log('ressss', res)
+          if (res.code === 0 && res.msg === 'success') {
+            this.$message({
+              type: 'success',
+              message: '保存成功'
+            })
+            this.listRolesByCustomerId()
+          } else {
+            this.$message({
+              type: 'error',
+              message: res.msg
+            })
+          }
+        })
+    },
+    // 取消
+    diaCancel () {
+      this.$emit('cancleBack')
+    },
+  }
+}
+</script>
+
+<style scoped>
+.role-container,
+.role-flex {
+  display: flex;
+}
+.flex1 {
+  flex: 1;
+  position: relative;
+}
+.now-name {
+  /* display: flex;
+  justify-content: space-between; */
+  margin-bottom: 10px;
+}
+.aui-wrapper .el-card + .el-card {
+  margin-top: 0;
+}
+.role-container .el-dialog__body {
+  padding: 0 20px 20px;
+}
+.div_duty {
+  height: 300px;
+  position: relative;
+}
+
+.div_btn_dia {
+  position: absolute;
+  bottom: 30px;
+  right: 15px;
+}
+.div_btn {
+  z-index: 10;
+  position: absolute;
+  right: 40px;
+  top: 25px;
+  /* margin: 0 0 20px 0; */
+}
+</style>
diff --git a/epmet-oper-web/src/views/modules/customer/customize/roleList.vue b/epmet-oper-web/src/views/modules/customer/customize/roleList.vue
index d753486..8a73e0d 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/roleList.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/roleList.vue
@@ -278,6 +278,9 @@ export default {
     handleSelectionChange (val) {
       this.saveOperations4Role(val)
     },
+
+
+
     handleChangeName (row) {
       row.isEdit = true
     },
diff --git a/epmet-oper-web/src/views/modules/productConfig/workRoleAuth.vue b/epmet-oper-web/src/views/modules/productConfig/workRoleAuth.vue
index 2c0ae87..04475ec 100644
--- a/epmet-oper-web/src/views/modules/productConfig/workRoleAuth.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/workRoleAuth.vue
@@ -19,14 +19,13 @@
                     border
                     style="width: 100%">
             <el-table-column type="index"
-                             header-align="center"
-                             align="center"
+                             header-align="left"
+                             align="left"
                              width="50"></el-table-column>
-            <!-- <el-table-column prop="roleId" label="角色ID"></el-table-column> -->
             <el-table-column prop="roleName"
                              label="角色名称"
-                             header-align="center"
-                             align="center"
+                             header-align="left"
+                             align="left"
                              width="180">
               <template slot-scope="scope">
                 <el-input v-if="scope.row.isEdit"
@@ -38,17 +37,20 @@
             </el-table-column>
             <el-table-column v-if="!funcShow"
                              prop="roleKey"
-                             header-align="center"
-                             align="center"
+                             header-align="left"
+                             align="left"
                              label="角色Key"
                              width="150"></el-table-column>
 
             <el-table-column prop="description"
                              label="角色职责"
-                             header-align="center"
-                             align="center">
+                             header-align="left"
+                             align="left">
               <template slot-scope="scope">
-                <p>{{scope.row.description}}</p>
+                <p style="text-align:left;margin:3px 0"
+                   v-for="(item,index) in scope.row.descriptionList"
+                   :key="index">{{item}}</p>
+                <!-- <p>{{scope.row.description}}</p> -->
               </template>
             </el-table-column>
             <el-table-column width="450"
@@ -57,7 +59,7 @@
 
                 <el-button type="primary"
                            size="mini"
-                           @click="handelChangeDuty(scope.row.roleId, scope.row.description)">修改职责</el-button>
+                           @click="handelChangeDuty(scope.row)">修改职责</el-button>
                 <el-button type="primary"
                            size="mini"
                            @click="toOperationConfig(scope.row.roleKey, scope.row.roleName)">功能权限</el-button>
@@ -66,7 +68,7 @@
                       style="display: inline-block; margin-left: 10px;">
                   <el-button type="primary"
                              size="small"
-                             @click="handleSaveChange(scope.row)">保存</el-button>
+                             @click="saveName(scope.row)">保存</el-button>
                   <el-button size="small"
                              @click="scope.row.isEdit=false">取消</el-button>
                 </span>
@@ -99,7 +101,7 @@
         <div class="div_btn">
           <el-button type="primary"
                      size="small"
-                     @click="saveDuty()">保存</el-button>
+                     @click="updateRole()">保存</el-button>
           <el-button size="small"
                      @click="dutyShow=false">取消</el-button>
         </div>
@@ -201,6 +203,7 @@ export default {
       //职责弹出框相关
       dutyShow: false,
       description: '',
+      roleName: '',
 
       //功能权限弹出框相关
       funcShow: false,
@@ -220,7 +223,7 @@ export default {
     }
   },
   created () {
-    this.listRolesByCustomerId()
+    this.listRoles()
   },
   mounted () {
     this.dragRoleSort()
@@ -239,7 +242,7 @@ export default {
     },
 
     //获取角色列表
-    listRolesByCustomerId () {
+    listRoles () {
       this.loading1 = true
       this.$http
         .post('/epmetuser/govstaffrole/roletemplates')
@@ -250,7 +253,8 @@ export default {
               return {
                 ...item,
                 constName: item.roleName,
-                isEdit: false
+                isEdit: false,
+                descriptionList: item.description.split("\n")
               }
             })
             console.log('roleList', this.roleList)
@@ -264,39 +268,45 @@ export default {
     //关闭角色职责弹出框
     handleDutyClosed () {
       this.selRoleId = ''
+      this.roleName = ''
       this.description = ''
       this.dutyShow = false
     },
 
     //显示角色职责弹出框
-    handelChangeDuty (roleId, description) {
-      this.selRoleId = roleId
-      this.description = description
+    handelChangeDuty (row) {
+      this.selRoleId = row.id
+      this.description = row.description
+      this.roleName = row.roleName
       this.dutyShow = true
     },
+    handleChangeName (row) {
+      row.isEdit = true
+    },
+    saveName (row) {
+      this.selRoleId = row.id
+      this.description = row.description
+      this.roleName = row.roleName
+      this.updateRole()
+    },
 
-    //保存角色职责
-    async saveDuty () {
+    //保存角色名称、职责
+    async updateRole () {
       console.log(this.description)
-      const url = "/gov/access/govcustomermenu/getcustomerids"
-      // const params = {
-      //   tableId: this.tableId
-      // }
-      // const { data, code, msg } = await requestPost(url, params)
-      // if (code === 0) {
-      //   this.menuList = data
-
-      //   this.menuList.forEach(element => {
-      //     if (this.customerIdList.indexOf(element) > -1) {
-      //       this.menuListShow.push(element)
-      //     }
-      //   });
-
-      //   this.handleCheckedCitiesChange(this.menuListShow)
+      const url = "/epmetuser/govstaffrole/updatedefaultrole"
+      const params = {
+        roleId: this.selRoleId,
+        roleName: this.roleName,
+        description: this.description
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.dutyShow = false
+        this.listRoles()
 
-      // } else {
-      //   this.$message.error(msg)
-      // }
+      } else {
+        this.$message.error(msg)
+      }
     },
     //关闭功能配置弹出框
     handleDialogClosed () {
@@ -426,32 +436,7 @@ export default {
       this.operateSection = val
       // this.saveOperations4Role(val)
     },
-    handleChangeName (row) {
-      row.isEdit = true
-    },
-    handleSaveChange (row) {
-      let data = {
-        roleKey: row.roleKey,
-        roleName: row.roleName
-      }
-      this.$http
-        .post('/epmetuser/govstaffrole/update-role', data)
-        .then(({ data: res }) => {
-          console.log('ressss', res)
-          if (res.code === 0 && res.msg === 'success') {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
-            })
-            this.listRolesByCustomerId(this.customerId)
-          } else {
-            this.$message({
-              type: 'error',
-              message: res.msg
-            })
-          }
-        })
-    },
+
     dragRoleSort () {
       const el = this.$refs.roleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
       this.sortTable = Sortable.create(el, {
@@ -473,11 +458,11 @@ export default {
     handleSaveSort () {
       let data = {
         roleIdList: this.roleList.map(item => {
-          return item.roleKey
+          return item.id
         })
       }
       this.$http
-        .post('/epmetuser/govstaffrole/save-sortorder', data)
+        .post('/epmetuser/govstaffrole/savedefaultsort', data)
         .then(({ data: res }) => {
           console.log('ressss', res)
           if (res.code === 0 && res.msg === 'success') {
@@ -485,7 +470,7 @@ export default {
               type: 'success',
               message: '保存成功'
             })
-            this.listRolesByCustomerId(this.customerId)
+            this.listRoles()
           } else {
             this.$message({
               type: 'error',
@@ -498,7 +483,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 .role-container,
 .role-flex {
   display: flex;