Skip to content

X
xichonght
Commit 0eec3d24 authored by liucheng's avatar liucheng
Browse files
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !34
parents 47149dc8 bc8b5c35
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 65 deletions
xichongSys/.gitignore
View file @ 0eec3d24
......@@ -4,7 +4,7 @@ node_modules/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
/src/utils/global.js
# Editor directories and files
.idea
.vscode
......
xichongSys/src/http/moudules/getlist.js
View file @ 0eec3d24
......@@ -146,6 +146,14 @@ export const listAllBaseInfo = (data) => {
params
})
}
//缴费信息查询
export const listPayInfo = (data) => {
return axios({
url: '/payInfo/getPayInfo',
method: 'post',
data
})
}
//领取人员查询
export const getGrantList = (data) => {
return axios({
......@@ -162,6 +170,13 @@ export const selectRoleflowNo = (params) => {
params
})
}
export const updatePassword = (data)=>{
return axios({
url: 'user/updatePassword',
method: 'post',
data
})
}
export const getTown = () => {
return axios({
url: '/dept/findTreeByUser',
......@@ -169,4 +184,4 @@ export const selectRoleflowNo = (params) => {
})
}
//
\ No newline at end of file
//
xichongSys/src/utils/global.js
View file @ 0eec3d24
......@@ -5,25 +5,10 @@
*/
// 后台管理系统服务器地址
export const baseUrl2 = 'http://xclc.rensheju.com'
export const baseUrl = 'http://xc.rensheju.com'
//export const baseUrl = 'http://172.16.10.33:9002'
//export const baseUrl = 'http://172.16.10.25:9009'
//export const baseUrl ="http://faceauth.weface.com.cn:98"
//export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
//export const baseUrl = 'http://172.16.10.33:9002'
export const baseUrl = 'http://172.16.10.33:9002'
//export const baseUrl ="http://172.16.10.33:9002"
//export const baseUrl2 = 'http://172.16.10.25:9999'
//export const baseUrl = 'http://172.16.10.25:9002'
//export const baseUrl ="http://172.16.10.33:9002"
export const baseUrl2 = 'http://172.16.10.25:9007'
//export const baseUrl = 'http://172.16.10.33:9002'
//export const baseUrl = 'http://172.16.10.25:9009'
//export const baseUrl ="http://faceauth.weface.com.cn:98"
//export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
// 系统数据备份还原服务器地址
//export const backupBaseUrl = 'http://localhost:8002'
//export const baseUrl = 'http://faceauth.weface.com.cn:98'
//export const baseUrl2 = 'http://172.16.10.163:9002'
export default {
baseUrl,
......
xichongSys/src/views/Core/PersonalPanel.vue
View file @ 0eec3d24
......@@ -3,25 +3,25 @@
<div class="personal-desc" :style="{'background':this.$store.state.app.themeColor}">
<div class="avatar-container">
<img class="avatar" :src="require('@/assets/user.png')" />
</div>
</div>
<div class="name-role">
<span class="sender">{{ user.name }} - {{ user.role }}</span>
</div>
<span class="sender">{{ user.name }} - {{ user.role }}</span>
</div>
<div class="registe-info">
<span class="registe-info">
<li class="fa fa-clock-o"></li>
{{ user.registeInfo }}
</span>
</div>
</div>
</div>
<div class="main-operation">
<span class="main-operation-item">
<el-button size="small" icon="fa fa-male"> 个人中心</el-button>
</span>
</span>
<span class="main-operation-item">
<el-button size="small" icon="fa fa-key"> 修改密码</el-button>
</span>
<el-button size="small" icon="fa fa-key" @click=openPasswordDialog()> 修改密码</el-button>
</span>
</div>
<div class="personal-footer" @click="logout">
......@@ -30,16 +30,37 @@
</div>
<!--备份还原界面-->
<!-- <backup ref="backupDialog" @afterRestore="afterRestore"></backup> -->
<el-dialog :modal-append-to-body='false' title="修改密码" :visible.sync="updatePasswordDialogVisible" width="25%">
<el-form :model="item">
<el-input placeholder="请输入原密码" v-model="item.password" show-password maxlength = 8 minlength = 6 ></el-input>
<div style="margin: 20px 0;">
</div>
<el-input placeholder="请输入新密码 6~8位" v-model="item.newpassword" show-password maxlength = 8 minlength = 6></el-input>
<div style="margin: 20px 0;"/>
<el-input placeholder="再次输入新密码 6~8位" v-model="item.newpasswordagain" show-password maxlength = 8 minlength = 6></el-input>
<div style="margin: 20px 0;"/>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="updatePasswordDialogVisible = false">取 消</el-button>
<el-button type="primary" @click = updatePassword() >确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import Cookies from "js-cookie"
import router from '@/router'
//import Backup from "@/views/Backup/Backup"
export default {
name: 'PersonalPanel',
components:{
},
props: {
user: {
......@@ -54,7 +75,14 @@ export default {
},
data() {
return {
updatePasswordDialogVisible : false,
item :{
newpassword : "",
newpasswordagain : "",
password : ""
}
}
},
methods: {
// 退出登录
......@@ -73,7 +101,7 @@ export default {
.catch(() => {})
},
// 删除cookie
deleteCookie: function(name) {
deleteCookie: function(name) {
Cookies.remove(name)
},
// 打开备份还原界面
......@@ -89,10 +117,52 @@ export default {
this.$api.login.logout().then((res) => {
}).catch(function(res) {
})
}
},
openPasswordDialog:function () {
this.updatePasswordDialogVisible = true;
this.item = {
newpassword: "",
newpasswordagain: "",
password: ""
}
},
updatePassword: function () {
var rex = /^[\w_-]{6,8}$/
if(this.item.password == ''){
this.$message({message: '请输入原密码', type: 'error'})
return;
}
if(this.item.newpassword == ''){
this.$message({message: '请输入新密码 ', type: 'error'})
return;
}
if(!rex.test(this.item.newpassword)){
this.$message({message: '新密码不规范', type: 'error'})
return;
}
if(this.item.newpassword == this.item.password){
this.$message({message: '新旧密码一致', type: 'error'})
return;
}
if(this.item.newpassword != this.item.newpasswordagain){
this.$message({message: '新密码不一致', type: 'error'})
return;
}
this.$api.getlist.updatePassword(this.item).then((res) => {
if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' })
this.updatePasswordDialogVisible = false;
//this.$refs['item'].resetFields()
Cookies.remove("token")
router.push('/login')
}else {
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
});
},
mounted() {
}
}
}
</script>
......@@ -175,4 +245,4 @@ export default {
color: rgb(19, 138, 156);
background: #b1a6a61e;
}
</style>
\ No newline at end of file
</style>
xichongSys/src/views/Sys/Dept.vue
View file @ 0eec3d24
......@@ -20,10 +20,10 @@
<el-table-column
prop="id" header-align="center" align="center" width="80" label="ID">
</el-table-column>
<table-tree-column
<table-tree-column
prop="name" header-align="center" treeKey="id" width="150" label="名称">
</table-tree-column>
<el-table-column
<el-table-column
prop="parentName" header-align="center" align="center" width="120" label="上级机构">
</el-table-column>
<el-table-column
......@@ -45,14 +45,14 @@
</el-table>
<!-- 新增修改界面 -->
<el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()"
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()"
label-width="80px" :size="size" style="text-align:left;">
<el-form-item label="名称" prop="name">
<el-input v-model="dataForm.name" placeholder="名称"></el-input>
</el-form-item>
<el-form-item label="上级机构" prop="parentName">
<popup-tree-input
:data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null?'顶级菜单':dataForm.parentName"
<popup-tree-input
:data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null?'顶级菜单':dataForm.parentName"
:nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange">
</popup-tree-input>
</el-form-item>
......@@ -188,7 +188,7 @@ export default {
this.dialogVisible = false
this.$refs['dataForm'].resetFields()
} else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'})
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
this.findTreeData()
})
......@@ -200,7 +200,7 @@ export default {
dateFormat: function (row, column, cellValue, index){
return format(row[column.property])
}
},
mounted() {
this.findTreeData()
......@@ -210,4 +210,4 @@ export default {
<style scoped>
</style>
\ No newline at end of file
</style>
xichongSys/src/views/Sys/Dict.vue
View file @ 0eec3d24
......@@ -16,7 +16,7 @@
</div>
<!--表格内容栏-->
<kt-table :height="350" permsEdit="sys:dict:edit" permsDelete="sys:dict:delete"
:data="pageResult" :columns="columns"
:data="pageResult" :columns="columns"
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
</kt-table>
<!--新增编辑界面-->
......@@ -149,7 +149,7 @@ export default {
if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' })
} else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'})
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
this.editLoading = false
this.$refs['dataForm'].resetFields()
......@@ -172,4 +172,4 @@ export default {
<style scoped>
</style>
\ No newline at end of file
</style>
xichongSys/src/views/Sys/Menu.vue
View file @ 0eec3d24
......@@ -20,7 +20,7 @@
<el-table-column
prop="id" header-align="center" align="center" width="80" label="ID">
</el-table-column>
<table-tree-column
<table-tree-column
prop="name" header-align="center" treeKey="id" width="150" label="名称">
</table-tree-column>
<el-table-column header-align="center" align="center" label="图标">
......@@ -35,15 +35,15 @@
<el-tag v-else-if="scope.row.type === 2" size="small" type="info">按钮</el-tag>
</template>
</el-table-column>
<el-table-column
<el-table-column
prop="parentName" header-align="center" align="center" width="120" label="上级菜单">
</el-table-column>
<el-table-column
prop="url" header-align="center" align="center" width="150"
prop="url" header-align="center" align="center" width="150"
:show-overflow-tooltip="true" label="菜单URL">
</el-table-column>
<el-table-column
prop="perms" header-align="center" align="center" width="150"
prop="perms" header-align="center" align="center" width="150"
:show-overflow-tooltip="true" label="授权标识">
</el-table-column>
<el-table-column
......@@ -59,7 +59,7 @@
</el-table>
<!-- 新增修改界面 -->
<el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()"
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()"
label-width="80px" :size="size" style="text-align:left;">
<el-form-item label="菜单类型" prop="type">
<el-radio-group v-model="dataForm.type">
......@@ -70,8 +70,8 @@
<el-input v-model="dataForm.name" :placeholder="menuTypeList[dataForm.type] + '名称'"></el-input>
</el-form-item>
<el-form-item label="上级菜单" prop="parentName">
<popup-tree-input
:data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null||dataForm.parentName==''?'顶级菜单':dataForm.parentName"
<popup-tree-input
:data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null||dataForm.parentName==''?'顶级菜单':dataForm.parentName"
:nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange">
</popup-tree-input>
</el-form-item>
......@@ -263,7 +263,7 @@ export default {
this.dialogVisible = false;
} else {
this.$message({
message: "操作失败, " + res.msg,
message: "操作失败, " + res.message,
type: "error"
});
}
......@@ -281,4 +281,4 @@ export default {
</script>
<style scoped>
</style>
\ No newline at end of file
</style>
xichongSys/src/views/Sys/Role.vue
View file @ 0eec3d24
......@@ -32,7 +32,7 @@
<el-form-item label="备注 " prop="remark">
<el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button>
......@@ -53,9 +53,9 @@
<el-checkbox v-model="checkAll" @change="handleCheckAll" :disabled="this.selectRole.id == null"><b>全选</b></el-checkbox>
</div>
<div style="float:right;padding-right:15px;padding-top:4px;padding-bottom:4px;">
<kt-button :label="$t('action.reset')" perms="sys:role:edit" type="primary" @click="resetSelection"
<kt-button :label="$t('action.reset')" perms="sys:role:edit" type="primary" @click="resetSelection"
:disabled="this.selectRole.id == null"/>
<kt-button :label="$t('action.submit')" perms="sys:role:edit" type="primary" @click="submitAuthForm"
<kt-button :label="$t('action.submit')" perms="sys:role:edit" type="primary" @click="submitAuthForm"
:disabled="this.selectRole.id == null" :loading="authLoading"/>
</div>
</div>
......@@ -164,7 +164,7 @@ export default {
this.dialogVisible = false
this.$refs['dataForm'].resetFields()
} else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'})
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
this.findPage(null)
})
......@@ -248,7 +248,7 @@ export default {
if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' })
} else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'})
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
this.authLoading = false
})
......@@ -271,7 +271,7 @@ export default {
       dateFormat: function (row, column, cellValue, index){
           return format(row[column.property])
       }
},
mounted() {
}
......@@ -287,6 +287,6 @@ export default {
text-align: left;
font-size: 16px;
color: rgb(20, 89, 121);
}
</style>
\ No newline at end of file
</style>
xichongSys/src/views/Sys/User.vue
View file @ 0eec3d24
......@@ -68,9 +68,7 @@
:options="list"
:props="{ checkStrictly: true }"
style="width:100%"
clearable
@change="deptTreeCurrentChangeHandle"
></el-cascader>
clearable></el-cascader>
<!-- <popup-tree-input
:data="deptData"
:props="deptTreeProps"
......@@ -261,7 +259,7 @@ export default {
this.dialogVisible = false
this.$refs['dataForm'].resetFields()
} else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'})
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
this.findPage(null)
})
......@@ -321,7 +319,6 @@ export default {
{prop:"deptName", label:"机构", minWidth:100},
{prop:"roleNames", label:"角色", minWidth:80},
{prop:"job", label:"职务", minWidth:80},
{prop:"mobile", label:"手机", minWidth:80},
// {prop:"createBy", label:"创建人", minWidth:120},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment