Sfoglia il codice sorgente

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/qhsxKx-admin-html into deploy

zhangdan 4 anni fa
parent
commit
5b9f6bb75a

+ 54 - 0
src/api/card-voucher-role.js

@@ -0,0 +1,54 @@
+import { axios } from '@/utils/request'
+
+// 分页查询角色
+export const getPowerRoleList = params => {
+  const url = `role/queryLike/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST'
+  })
+}
+// 保存角色
+export const saveRolePower = params => {
+  return axios({
+    url: 'role/save',
+    data: params,
+    method: 'POST'
+  })
+}
+// flag 0:禁用 1:启用  启禁用角色
+export const updateEnableStatus = params => {
+  return axios({
+    url: `role/enable/${params.id}/${params.flag}`,
+    data: {},
+    method: 'get'
+  })
+}
+// 删除角色
+export const delectRolePower = params => {
+  return axios({
+    url: `role/delete/${params.id}`,
+    data: {},
+    method: 'get'
+  })
+}
+// 查询可用所有菜单
+export const getMenuList = params => {
+  const url = `role/findAllMenu/${params.id}`
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}
+// 保存角色菜单关系
+export const addMenuPower = params => {
+  const url = `role/saveRoleMenu`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 53 - 0
src/api/card-voucher-user.js

@@ -0,0 +1,53 @@
+import { axios } from '@/utils/request'
+
+// 重置密码
+export const resetPSD = params => {
+  return axios({
+    url: 'user/resetPwd',
+    data: params,
+    method: 'POST'
+  })
+}
+// 启用禁用
+export const updateEnableStatus = params => {
+  return axios({
+    url: `user/enable/${params.id}/${params.flag}`,
+    data: {},
+    method: 'get'
+  })
+}
+// 分页查询用户
+export const getPowerUserList = params => {
+  const url = `user/queryLike/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST'
+  })
+}
+// 删除用户接口
+export const delectUserPower = params => {
+  return axios({
+    url: `user/delete/${params.id}`,
+    data: {},
+    method: 'get'
+  })
+}
+// 查询所有角色
+export const getRoleList = params => {
+  return axios({
+    url: 'role/findAll',
+    data: params,
+    method: 'POST'
+  })
+}
+// 保存用户
+export const saveUserPower = params => {
+  return axios({
+    url: 'user/save',
+    data: params,
+    method: 'POST'
+  })
+}

+ 1 - 3
src/views/CardVoucherAuth/role/menuModal.vue

@@ -2,7 +2,6 @@
   <div>
     <a-modal class="modalBox" :title="roleName" v-model="isshow" @cancle="cancel">
       <a-form class="form-box" style="max-height: 600px;" :form="form" @submit="handleSubmit">
-
         <a-tree
           checkable
           @check="onCheck"
@@ -12,7 +11,6 @@
           v-model="checkedKeys"
           :treeData="treeData"
         />
-
       </a-form>
       <a-form-item :wrapper-col="{ offset: 15 }">
         <a-button type="primary" @click="handleSubmit()">
@@ -28,7 +26,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { addMenuPower } from '@/api/power-role.js'
+import { addMenuPower } from '@/api/card-voucher-role.js'
 export default {
   name: 'RoleModal',
   components: {

+ 1 - 1
src/views/CardVoucherAuth/role/roleList.vue

@@ -54,7 +54,7 @@
 import { STable, VSelect } from '@/components'
 import roleModal from './roleModal.vue'
 import menuModal from './menuModal.vue'
-import { getPowerRoleList, updateEnableStatus, delectRolePower, getMenuList } from '@/api/power-role.js'
+import { getPowerRoleList, updateEnableStatus, delectRolePower, getMenuList } from '@/api/card-voucher-role.js'
 export default {
   name: 'RoleList',
   components: {

+ 1 - 1
src/views/CardVoucherAuth/role/roleModal.vue

@@ -56,7 +56,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { saveRolePower } from '@/api/power-role.js'
+import { saveRolePower } from '@/api/card-voucher-role.js'
 export default {
   name: 'RoleModal',
   components: {

+ 1 - 1
src/views/CardVoucherAuth/user/userList.vue

@@ -63,7 +63,7 @@
 <script>
 import { STable, VSelect } from '@/components'
 import userModal from './userModal.vue'
-import { resetPSD, updateEnableStatus, getPowerUserList, delectUserPower } from '@/api/power-user.js'
+import { resetPSD, updateEnableStatus, getPowerUserList, delectUserPower } from '@/api/card-voucher-user.js'
 export default {
   name: 'UserList',
   components: {

+ 1 - 1
src/views/CardVoucherAuth/user/userModal.vue

@@ -116,7 +116,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { getRoleList, saveUserPower } from '@/api/power-user.js'
+import { getRoleList, saveUserPower } from '@/api/card-voucher-user.js'
 export default {
   name: 'UserModal',
   components: {

+ 0 - 74
src/views/power/menu/menu.vue

@@ -13,7 +13,6 @@
           <a-icon type="info-circle" style="color: #1890FF;margin-right: 10px;" />
           <span>当前选择:<span style="color: #40a9ff;font-weight: 600;">{{ selectedMenu }}</span><span v-if="selectedKeys.length" class="imgSize" @click="cancelSel">取消选择</span></span>
         </a-row>
-
         <a-row :gutter="24" >
           <a-input-search placeholder="输入搜索菜单名搜索" style="width: 100%" @change="onChange" />
           <a-tree
@@ -60,33 +59,6 @@
                 rules: [{ required: true, message: '请输入名称!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多20个字符'}] }]"
             />
           </a-form-item>
-          <!-- 路由英文名 -->
-          <!-- <a-form-item v-if="!formData.type||formData.type=='0'" label="路由英文名" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入路由英文名"
-              v-decorator="['formData.routeName', {
-                initialValue: formData.routeName,
-                rules: [{ required: true, message: '请输入路由英文名!' }] }]"
-            />
-          </a-form-item> -->
-          <!-- 路径 -->
-          <!-- <a-form-item v-if="!formData.type||formData.type=='0'" label="路径" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入路径"
-              v-decorator="['formData.routePath', {
-                initialValue: formData.routePath,
-                rules: [{ required: true, message: '请输入路径!' }] }]"
-            />
-          </a-form-item> -->
-          <!-- 请求路径 -->
-          <!-- <a-form-item v-if="formData.type==1" label="请求路径" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入请求路径"
-              v-decorator="['formData.urlPath', {
-                initialValue: formData.urlPath,
-                rules: [{ required: true, message: '请输入请求路径!' }] }]"
-            />
-          </a-form-item> -->
           <!-- 前端权限编码 -->
           <a-form-item label="前端权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-input
@@ -111,35 +83,6 @@
               ]"
             />
           </a-form-item>
-          <!-- 图标 -->
-          <!-- <a-form-item v-if="!formData.type ||formData.type=='0' " label="图标" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入图标名称"
-              v-decorator="['formData.icon', {
-                initialValue: formData.icon,
-                rules: [] }]"
-            />
-          </a-form-item> -->
-          <!-- 前端组件 -->
-          <!-- <a-form-item v-if="!formData.type ||formData.type=='0'" label="前端组件" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入前端组件路径"
-              v-decorator="['formData.componentPath', {
-                initialValue: formData.componentPath,
-                rules: [{ required: true, message: '请输入前端组件路径!' }] }]"
-            />
-          </a-form-item> -->
-
-          <!-- 第三方链接 -->
-          <!-- <a-form-item v-if="!formData.type ||formData.type=='0'" label="第三方链接" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入第三方链接地址"
-              v-decorator="['formData.urlPath', {
-                initialValue: formData.urlPath,
-                rules: [] }]"
-            />
-          </a-form-item> -->
-
           <!-- 排序值 -->
           <a-form-item label="排序值" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-input
@@ -165,7 +108,6 @@
               <a-radio :value="0">否</a-radio>
             </a-radio-group>
           </a-form-item>
-
           <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
             <a-button type="primary" @click="handleSubmit()">
               保存
@@ -231,18 +173,15 @@ export default {
   },
   methods: {
     onExpand (expandedKeys) {
-      // console.log('onExpand', expandedKeys)
       this.expandedKeys = expandedKeys
       this.autoExpandParent = false
     },
-
     onSelect (selectedKeys, info) {
       console.log('onSelect', info)
       this.selectedKeys = selectedKeys
       if (info.selected) {
         const data = info.selectedNodes[0].data.props
         const isLeaf = data.dataRef.children
-        // this.formData = Object.assign({}, this.formData, info.selectedNodes[0].data.props)
         this.formData = {
           id: data.id,
           name: data.name,
@@ -258,7 +197,6 @@ export default {
           status: data.status,
           isLeaf: !(isLeaf && isLeaf.length)
         }
-
         this.selectedMenu = this.formData.name
         this.formData.status = Number(this.formData.status)
       } else {
@@ -273,7 +211,6 @@ export default {
         this.dataList.push({ key, title: key })
         node.scopedSlots = { title: 'title' }
         node.slots = { icon: node.type == '0' ? 'file' : 'pushpin' }
-
         if (node.children) {
           this.generateList(node.children)
         }
@@ -312,10 +249,8 @@ export default {
     // 获取菜单树列表
     getMenuList () {
       getMenuList().then(res => {
-        console.log(res, 'res1111111')
         if (res.status == 200) {
           this.treeData = res.data
-          console.log(this.treeData, 'this.treeData')
         }
       })
     },
@@ -391,7 +326,6 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log(values.formData, ' formData.type222222222')
           saveMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {
@@ -409,8 +343,6 @@ export default {
       this.clear()
     }
 
-  },
-  mounted () {
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'menu' })
@@ -419,9 +351,6 @@ export default {
     next(vm => {
       vm.getMenuList()
     })
-  },
-  watch: {
-
   }
 }
 </script>
@@ -431,7 +360,6 @@ export default {
     width: 6px;
     height: 6px ;
   }
-
   .menu-box::-webkit-scrollbar-thumb{
     width: 6px;
     height: 6px ;
@@ -439,7 +367,6 @@ export default {
     -webkit-box-shadow: inset 0 0 2px #d1d1d1;
     background: #e4e4e4;
   }
-
   .textCount{
     border: 1px solid #91d5ff;
     background-color: #e6f7ff;
@@ -453,5 +380,4 @@ export default {
     margin-left: 10px;
     font-size: 14px;
   }
-
 </style>