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
Show whitespace changes
Inline Side-by-side
Showing with 132 additions and 65 deletions
xichongSys/.gitignore
View file @ 0eec3d24
...@@ -4,7 +4,7 @@ node_modules/ ...@@ -4,7 +4,7 @@ node_modules/
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
/src/utils/global.js
# Editor directories and files # Editor directories and files
.idea .idea
.vscode .vscode
......
xichongSys/src/http/moudules/getlist.js
View file @ 0eec3d24
...@@ -146,6 +146,14 @@ export const listAllBaseInfo = (data) => { ...@@ -146,6 +146,14 @@ export const listAllBaseInfo = (data) => {
params params
}) })
} }
//缴费信息查询
export const listPayInfo = (data) => {
return axios({
url: '/payInfo/getPayInfo',
method: 'post',
data
})
}
//领取人员查询 //领取人员查询
export const getGrantList = (data) => { export const getGrantList = (data) => {
return axios({ return axios({
...@@ -162,6 +170,13 @@ export const selectRoleflowNo = (params) => { ...@@ -162,6 +170,13 @@ export const selectRoleflowNo = (params) => {
params params
}) })
} }
export const updatePassword = (data)=>{
return axios({
url: 'user/updatePassword',
method: 'post',
data
})
}
export const getTown = () => { export const getTown = () => {
return axios({ return axios({
url: '/dept/findTreeByUser', url: '/dept/findTreeByUser',
......
xichongSys/src/utils/global.js
View file @ 0eec3d24
...@@ -5,25 +5,10 @@ ...@@ -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.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 { export default {
baseUrl, baseUrl,
......
xichongSys/src/views/Core/PersonalPanel.vue
View file @ 0eec3d24
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<el-button size="small" icon="fa fa-male"> 个人中心</el-button> <el-button size="small" icon="fa fa-male"> 个人中心</el-button>
</span> </span>
<span class="main-operation-item"> <span class="main-operation-item">
<el-button size="small" icon="fa fa-key"> 修改密码</el-button> <el-button size="small" icon="fa fa-key" @click=openPasswordDialog()> 修改密码</el-button>
</span> </span>
</div> </div>
...@@ -30,11 +30,32 @@ ...@@ -30,11 +30,32 @@
</div> </div>
<!--备份还原界面--> <!--备份还原界面-->
<!-- <backup ref="backupDialog" @afterRestore="afterRestore"></backup> --> <!-- <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> </div>
</el-dialog>
</div>
</template> </template>
<script> <script>
import Cookies from "js-cookie" import Cookies from "js-cookie"
import router from '@/router'
//import Backup from "@/views/Backup/Backup" //import Backup from "@/views/Backup/Backup"
export default { export default {
name: 'PersonalPanel', name: 'PersonalPanel',
...@@ -54,7 +75,14 @@ export default { ...@@ -54,7 +75,14 @@ export default {
}, },
data() { data() {
return { return {
updatePasswordDialogVisible : false,
item :{
newpassword : "",
newpasswordagain : "",
password : ""
} }
}
}, },
methods: { methods: {
// 退出登录 // 退出登录
...@@ -89,10 +117,52 @@ export default { ...@@ -89,10 +117,52 @@ export default {
this.$api.login.logout().then((res) => { this.$api.login.logout().then((res) => {
}).catch(function(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() { mounted() {
} }
}
} }
</script> </script>
......
xichongSys/src/views/Sys/Dept.vue
View file @ 0eec3d24
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findTreeData() this.findTreeData()
}) })
......
xichongSys/src/views/Sys/Dict.vue
View file @ 0eec3d24
...@@ -149,7 +149,7 @@ export default { ...@@ -149,7 +149,7 @@ export default {
if(res.code == 200) { if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' }) this.$message({ message: '操作成功', type: 'success' })
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.editLoading = false this.editLoading = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
......
xichongSys/src/views/Sys/Menu.vue
View file @ 0eec3d24
...@@ -263,7 +263,7 @@ export default { ...@@ -263,7 +263,7 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
} else { } else {
this.$message({ this.$message({
message: "操作失败, " + res.msg, message: "操作失败, " + res.message,
type: "error" type: "error"
}); });
} }
......
xichongSys/src/views/Sys/Role.vue
View file @ 0eec3d24
...@@ -164,7 +164,7 @@ export default { ...@@ -164,7 +164,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findPage(null) this.findPage(null)
}) })
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
if(res.code == 200) { if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' }) this.$message({ message: '操作成功', type: 'success' })
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.authLoading = false this.authLoading = false
}) })
......
xichongSys/src/views/Sys/User.vue
View file @ 0eec3d24
...@@ -68,9 +68,7 @@ ...@@ -68,9 +68,7 @@
:options="list" :options="list"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
style="width:100%" style="width:100%"
clearable clearable></el-cascader>
@change="deptTreeCurrentChangeHandle"
></el-cascader>
<!-- <popup-tree-input <!-- <popup-tree-input
:data="deptData" :data="deptData"
:props="deptTreeProps" :props="deptTreeProps"
...@@ -261,7 +259,7 @@ export default { ...@@ -261,7 +259,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findPage(null) this.findPage(null)
}) })
...@@ -321,7 +319,6 @@ export default { ...@@ -321,7 +319,6 @@ export default {
{prop:"deptName", label:"机构", minWidth:100}, {prop:"deptName", label:"机构", minWidth:100},
{prop:"roleNames", label:"角色", minWidth:80}, {prop:"roleNames", label:"角色", minWidth:80},
{prop:"job", label:"职务", minWidth:80}, {prop:"job", label:"职务", minWidth:80},
{prop:"mobile", label:"手机", minWidth:80}, {prop:"mobile", label:"手机", minWidth:80},
// {prop:"createBy", label:"创建人", minWidth:120}, // {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