Skip to content

X
xichonght
Commit d4640a5c authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'master' into 'mhy' 

Master

See merge request !40
parents abb330f9 0eec3d24
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 69 deletions
xichongSys/.gitignore
View file @ d4640a5c
......@@ -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 @ d4640a5c
......@@ -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,3 +170,18 @@ 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',
method: 'get',
})
}
//
xichongSys/src/utils/global.js
View file @ d4640a5c
......@@ -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.25: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/KtTable.vue
View file @ d4640a5c
......@@ -65,11 +65,11 @@ export default {
},
maxHeight: { // 表格最大高度
type: Number,
default: 420
default: 620
},
height: { // 表格最大高度
type: Number,
default: 250
default: 450
},
showOperation: { // 是否显示操作组件
type: Boolean,
......
xichongSys/src/views/Core/PersonalPanel.vue
View file @ d4640a5c
......@@ -20,7 +20,7 @@
<el-button size="small" icon="fa fa-male"> 个人中心</el-button>
</span>
<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>
</div>
......@@ -30,11 +30,32 @@
</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',
......@@ -54,7 +75,14 @@ export default {
},
data() {
return {
updatePasswordDialogVisible : false,
item :{
newpassword : "",
newpasswordagain : "",
password : ""
}
}
},
methods: {
// 退出登录
......@@ -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>
......
xichongSys/src/views/Core/candode.vue 0 → 100644
View file @ d4640a5c
<template>
<div>
<div class="block">
<el-cascader
:props="{ checkStrictly: true }"
clearable
placeholder="请选择镇村"
v-model="value"
:options="options"
size="mini"
@change="handleChange"></el-cascader>
</div>
</div>
</template>
<script>
export default {
data() {
return {
value: [],
options:[]
};
},
methods: {
handleChange(value) {
this.$emit('childByValue', value)
},
},
created(){
this.$api.getlist.getTown().then((res) => {
this.options=res.data
console.log(res.data)
}).catch((res) => {
})
}
};
</script>
\ No newline at end of file
xichongSys/src/views/Myvue/table.vue
View file @ d4640a5c
......@@ -4,6 +4,7 @@
<div class="idc">
<el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input>
</div>
<Candode v-on:childByValue="childByValue"></Candode>
<div class="ywtyoe">
<el-select v-model="ywtype" placeholder="请选择业务类型" size="mini">
<el-option
......@@ -131,10 +132,16 @@
<script>
import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui';
import Candode from "../Core/candode"
// import baseUrl from "../../globe/globeUrl"
export default {
components:{
Candode
},
data() {
return {
townList:'',
activities: [],
options1: [],
Page:1,
......@@ -146,12 +153,17 @@
}
},
methods: {
childByValue(val){
this.townList=val
},
//搜索
serch(){
var data={
idcard:this.idcard?this.Encrypt(this.idcard):"",
recordType:this.ywtype?parseInt(this.ywtype):""
recordType:this.ywtype?parseInt(this.ywtype):"",
townName: this.townList?this.townList[0]:'',
villageName:this.townList?this.townList[1]:'',
}
this.$api.getlist.getlist(data).then((res) => {
......@@ -231,7 +243,8 @@
res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
res.data.list[i].createtime=d.getFullYear()+"-"+d.getMonth() + 1+"-"+d.getDate()+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
......
xichongSys/src/views/Sys/Dept.vue
View file @ d4640a5c
......@@ -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()
})
......
xichongSys/src/views/Sys/Dict.vue
View file @ d4640a5c
......@@ -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()
......
xichongSys/src/views/Sys/Menu.vue
View file @ d4640a5c
......@@ -263,7 +263,7 @@ export default {
this.dialogVisible = false;
} else {
this.$message({
message: "操作失败, " + res.msg,
message: "操作失败, " + res.message,
type: "error"
});
}
......
xichongSys/src/views/Sys/Role.vue
View file @ d4640a5c
......@@ -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
})
......
xichongSys/src/views/Sys/User.vue
View file @ d4640a5c
......@@ -36,7 +36,7 @@
</table-column-filter-dialog>
</div>
<!--表格内容栏-->
<kt-table :height="350" permsEdit="sys:user:edit" permsDelete="sys:user:delete"
<kt-table :height="550" permsEdit="sys:user:edit" permsDelete="sys:user:delete"
:data="pageResult" :columns="filterColumns"
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
</kt-table>
......@@ -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