zzyuan
/
gz-att-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试bug修改

This commit is contained in:
zzyuan 2024-10-30 15:58:51 +08:00
parent b1dd43dbac
commit 8a76f43cea
10 changed files with 93 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/system/userInfo.js
View File

@ -46,6 +46,19 @@ export function resetPwd(data) {
})
}
// 用户密码修改
export function updateUserPwd(oldPassword, newPassword) {
const data = {
oldPassword,
newPassword
}
return request({
url: '/system/user/profile/updatePwd',
method: 'put',
params: data
})
}
// 删除用户
export function delUser(data) {
return request({

4
src/layout/components/Navbar.vue
View File

@ -32,9 +32,9 @@
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown">
<!-- <router-link to="/user/profile">
<router-link to="/user/profile">
<el-dropdown-item>个人中心</el-dropdown-item>
</router-link> -->
</router-link>
<el-dropdown-item @click.native="setting = true">
<span>布局设置</span>
</el-dropdown-item>

16
src/router/index.js
View File

@ -65,14 +65,14 @@ export const constantRoutes = [
path: '',
component: Layout,
redirect: 'index',
children: [
{
path: 'index',
component: () => import('@/views/dashboard'),
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
}
]
// children: [
// {
// path: 'index',
// component: () => import('@/views/dashboard'),
// name: 'Index',
// meta: { title: '首页', icon: 'dashboard', affix: true }
// }
// ]
},
{
path: '/user',

10
src/views/process/outExam/index.vue
View File

@ -156,9 +156,9 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="24" v-if="form.examineOpinion">
<el-form-item label="审批意见：" prop="examineOpinion">
<el-input type="textarea" v-model="form.examineOpinion" maxlength="100" :readonly="isView"></el-input>
<el-input type="textarea" v-model="form.examineOpinion" maxlength="100" :readonly="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -233,9 +233,9 @@ export default {
form: {},
// 表单校验
rules: {
examineOpinion: [
{ required: true, message: "审批意见不能为空", trigger: "blur" }
],
// examineOpinion: [
// { required: true, message: "审批意见不能为空", trigger: "blur" }
// ],
}
};
},

10
src/views/process/restExam/index.vue
View File

@ -158,9 +158,9 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="24" v-if="form.examineOpinion">
<el-form-item label="审批意见：" prop="examineOpinion">
<el-input type="textarea" v-model="form.examineOpinion" maxlength="100" :readonly="isView"></el-input>
<el-input type="textarea" v-model="form.examineOpinion" maxlength="100" :readonly="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -235,9 +235,9 @@ export default {
form: {},
// 表单校验
rules: {
examineOpinion: [
{ required: true, message: "审批意见不能为空", trigger: "blur" }
],
// examineOpinion: [
// { required: true, message: "审批意见不能为空", trigger: "blur" }
// ],
}
};
},

40
src/views/setting/devices/index.vue
View File

@ -36,7 +36,7 @@
v-hasPermi="['att:machine:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -45,7 +45,7 @@
@click="handleExport"
>导出</el-button>
</el-col>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -126,7 +126,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="端口号" prop="port">
<el-input v-model="form.port" placeholder="请输入端口号" maxlength="20"/>
<el-input v-model="form.port" placeholder="请输入端口号" maxlength="10"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -203,12 +203,30 @@
form: {},
// 表单校验
rules: {
// dictName: [
// { required: true, message: "名称不能为空", trigger: "blur" }
// ],
// dictType: [
// { required: true, message: "类型不能为空", trigger: "blur" }
// ]
machineName: [
{ required: true, message: "名称不能为空", trigger: "blur" }
],
model: [
{ required: true, message: "型号不能为空", trigger: "blur" }
],
machineCode: [
{ required: true, message: "设备编码不能为空", trigger: "blur" }
],
ip: [
{ required: true, message: "IP地址不能为空", trigger: "blur" }
],
port: [
{ required: true, message: "端口号不能为空", trigger: "change" },
{
pattern: /^[0-9]*$/,
message: "请输入正确的端口号",
trigger: "change"
}
],
attAddress: [
{ required: true, message: "考勤地址不能为空", trigger: "blur" }
]
}
};
},
@ -309,9 +327,7 @@
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
},
}

45
src/views/system/user/profile/index.vue
View File

@ -7,9 +7,9 @@
<span>个人信息</span>
</div>
<div>
<div class="text-center">
<!-- <div class="text-center">
<userAvatar />
</div>
</div> -->
<ul class="list-group list-group-striped">
<li class="list-group-item">
<svg-icon icon-class="user" />用户名称
@ -17,24 +17,24 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="phone" />手机号码
<div class="pull-right">{{ user.phonenumber }}</div>
<div class="pull-right">{{ user.phone }}</div>
</li>
<li class="list-group-item">
<!-- <li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱
<div class="pull-right">{{ user.email }}</div>
</li>
</li> -->
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
<div class="pull-right">{{ user.orgName }} </div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色
<div class="pull-right">{{ roleGroup }}</div>
<div class="pull-right">{{ user.postName }}</div>
</li>
<li class="list-group-item">
<!-- <li class="list-group-item">
<svg-icon icon-class="date" />创建日期
<div class="pull-right">{{ user.createTime }}</div>
</li>
</li> -->
</ul>
</div>
</el-card>
@ -45,9 +45,9 @@
<span>基本资料</span>
</div>
<el-tabs v-model="activeTab">
<el-tab-pane label="基本资料" name="userinfo">
<!-- <el-tab-pane label="基本资料" name="userinfo">
<userInfo :user="user" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="修改密码" name="resetPwd">
<resetPwd />
</el-tab-pane>
@ -62,6 +62,8 @@
import userAvatar from "./userAvatar";
import userInfo from "./userInfo";
import resetPwd from "./resetPwd";
import { getUserById } from "@/api/system/userInfo";
import { getUserProfile } from "@/api/system/user";
export default {
@ -69,10 +71,11 @@ export default {
components: { userAvatar, userInfo, resetPwd },
data() {
return {
userInfo:this.$store.state.user,
user: {},
roleGroup: {},
postGroup: {},
activeTab: "userinfo"
activeTab: "resetPwd"
};
},
created() {
@ -80,11 +83,19 @@ export default {
},
methods: {
getUser() {
getUserProfile().then(response => {
this.user = response.data;
this.roleGroup = response.roleGroup;
this.postGroup = response.postGroup;
});
console.log(this.userInfo)
let param={
userId:this.userInfo.id
}
getUserById(param).then(response => {
this.user = response.data[0];
console.log(this.user)
});
// getUserProfile().then(response => {
// this.user = response.data;
// this.roleGroup = response.roleGroup;
// this.postGroup = response.postGroup;
// });
}
}
};

2
src/views/system/user/profile/resetPwd.vue
View File

@ -17,7 +17,7 @@
</template>
<script>
import { updateUserPwd } from "@/api/system/user";
import { updateUserPwd } from "@/api/system/userInfo";
export default {
data() {

4
src/views/system/userInfo/index.vue
View File

@ -47,7 +47,7 @@
<el-table-column label="人员角色" align="center" prop="roleName" :show-overflow-tooltip="true" />
<el-table-column label="身份证号" align="center" prop="idNumber" :show-overflow-tooltip="true" />
<el-table-column label="手机号(登录名称)" align="center" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" width="300">
<template slot-scope="scope">
<el-button
size="mini"
@ -64,7 +64,7 @@
<el-button
size="mini"
type="warning"
v-hasPermi="[' system:user:pwd']"
v-hasPermi="['system:user:pwd']"
@click="handleResetPwd(scope.row)"
>重置密码</el-button>
</template>

2
vue.config.js
View File

@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.0.137:8100`,
target: `http://192.168.0.14:8100`,
// target: `http://192.168.0.14:8001`,
changeOrigin: true,
pathRewrite: {