From b826ed55c3d0265dc7db50c933819b20e2e66cc8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 12:08:57 +0800
Subject: [PATCH] 登录修改密码优化
---
src/views/login.vue | 7 ++-----
src/components/RightToolbar/index.vue | 18 +++++++++---------
src/views/system/unit/index.vue | 13 ++++++++++---
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 8a1b609..35563f4 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -115,7 +115,9 @@
}
},
created() {
- this.getDyColumn()
+ if (this.$route.path.concat("equipment")) {
+ this.getDyColumn()
+ }
if (this.showColumnsType == 'transfer') {
// 鏄鹃殣鍒楀垵濮嬮粯璁ら殣钘忓垪
for (let item in this.columns) {
@@ -127,15 +129,13 @@
},
methods: {
getDyColumn() {
- if (this.$route.path.concat("equipment")) {
- // 鏌ヨ鍔ㄦ�佸垪
- let params = {
- tableName: 't_monitor'
- }
- getDynamicColumnList(params).then(res => {
- this.dynamicColumnList = res.data
- })
+ // 鏌ヨ鍔ㄦ�佸垪
+ let params = {
+ tableName: 't_monitor'
}
+ getDynamicColumnList(params).then(res => {
+ this.dynamicColumnList = res.data
+ })
},
addDynamicColumn() {
this.showDynamicColumn = true
diff --git a/src/views/login.vue b/src/views/login.vue
index 79d950a..3231e9f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -49,13 +49,10 @@
</el-form-item>
</el-form>
</div>
- <el-dialog title="涓轰簡鎮ㄧ殑璐﹀彿瀹夊叏,棣栨鐧婚檰璇蜂慨鏀瑰瘑鐮�" :visible.sync="loginInfo.firstLogin == 0">
+ <el-dialog title="涓轰簡鎮ㄧ殑璐﹀彿瀹夊叏,棣栨鐧婚檰璇蜂慨鏀瑰瘑鐮�" :modal="false" width="500px" :visible.sync="loginInfo.firstLogin == 0">
<el-form>
<el-form-item label="鏂板瘑鐮�">
- <el-input v-model="newPassword" autocomplete="off"></el-input>
- </el-form-item>
- <el-form-item label="璇风‘璁ゅ瘑鐮�">
- <el-input v-model="confirmPassword" autocomplete="off"></el-input>
+ <el-input v-model="newPassword" show-password autocomplete="off"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
diff --git a/src/views/system/unit/index.vue b/src/views/system/unit/index.vue
index 98a4c99..15d508e 100644
--- a/src/views/system/unit/index.vue
+++ b/src/views/system/unit/index.vue
@@ -129,7 +129,10 @@
<el-input v-model="form.unitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" />
</el-form-item>
<el-form-item label="鍗曚綅璐﹀彿" prop="unitAdminAccount">
- <el-input v-model="form.unitAdminAccount" placeholder="璇疯緭鍏ュ崟浣嶇鐞嗗憳璐﹀彿" :disabled="account" />
+ <el-input v-model="form.unitAdminAccount" placeholder="璇疯緭鍏ュ崟浣嶈处鍙�" :disabled="account" />
+ </el-form-item>
+ <el-form-item label="璐﹀彿瀵嗙爜" prop="password">
+ <el-input v-model="form.password" placeholder="璇疯緭鍏ュ崟浣嶈处鍙峰瘑鐮�" :disabled="account" />
</el-form-item>
<el-form-item label="鍗曚綅鑱旂郴浜�" prop="unitContact">
<el-input v-model="form.unitContact" placeholder="璇疯緭鍏ュ崟浣嶈仈绯讳汉" />
@@ -204,8 +207,11 @@
{ required: true, message: "鍗曚綅鑱旂郴浜虹數璇濅笉鑳戒负绌�", trigger: "blur" }
],
unitAdminAccount: [
- { required: true, message: "鍗曚綅绠＄悊鍛樿处鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ { required: true, message: "鍗曚綅璐﹀彿涓嶈兘涓虹┖", trigger: "blur" }
],
+ password: [
+ { required: true, message: "鍗曚綅璐﹀彿瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }
+ ]
}
};
},
@@ -257,7 +263,8 @@
remark: null,
createTime: null,
updateTime: null,
- deleted: null
+ deleted: null,
+ password: null,
};
this.resetForm("form");
},
--
Gitblit v1.8.0