From 58faef5c48c7491fe14e2a3ec0a0db4dba8967a6 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 23 七月 2024 17:23:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/view/index.vue | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index 2d2d851..38dc5a4 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -225,8 +225,8 @@
.component_view {
height: calc(100vh - 84px);
- width: calc(100% - 52px);
- padding: 0 26px;
+ width: calc(100% - 40px);
+ padding: 0 20px;
background: rgb(245, 247, 251);
}
@@ -393,7 +393,7 @@
<el-button type="primary" @click="handleEdit">纭� 瀹�</el-button>
</span>
</el-dialog>
- <notice ref="notice" />
+ <notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
</div>
</template>
@@ -435,6 +435,15 @@
},
created() {
this.menu = menus.menu
+ if (this.PROJECT !== '瑁呭鐢电紗') { // 妫�娴嬩腑蹇冩殏鏃�'鍘熸潗鏂欐楠屼笅鍗�'鍔熻兘
+ const index = this.menu.findIndex(item => item.v === '涓氬姟绠＄悊')
+ if (index > -1) {
+ const index2 = this.menu[index].c.findIndex(obj => obj.v === '鍘熸潗鏂欐楠屼笅鍗�')
+ if (index2 > -1) {
+ this.menu[index].c.splice(index2, 1)
+ }
+ }
+ }
},
mounted() {
this.userName = JSON.parse(localStorage.getItem("user")).name;
@@ -462,6 +471,7 @@
}
this.getPower()
this.timer&&clearInterval(this.timer);
+ this.checkForUnreadData()
this.timer = setInterval(()=>{
this.checkForUnreadData()
},30000)
@@ -599,13 +609,21 @@
this.editVisible = true;
},
handleEdit(){
+ const reg2 =
+ /^(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\d)(?=.*?[~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?])[a-zA-Z\d~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?]*$/;
if (!this.query.oldPassword) {
this.$message.error('璇峰～鍐欐棫瀵嗙爜')
return
+ }else if (!reg2.test(this.query.oldPassword)) {
+ this.$message.error('瀵嗙爜蹇呴』鍖呮嫭鏁板瓧銆佸ぇ灏忓啓瀛楁瘝浠ュ強鐗规畩瀛楃')
+ return
}
if (!this.query.newPassWord) {
this.$message.error('璇峰～鍐欐棫瀵嗙爜')
return
+ }else if (!reg2.test(this.query.newPassWord)) {
+ this.$message.error('瀵嗙爜蹇呴』鍖呮嫭鏁板瓧銆佸ぇ灏忓啓瀛楁瘝浠ュ強鐗规畩瀛楃')
+ return
}
this.$axios.post(this.$api.user.upUserPassword, {...this.query}).then(res => {
if (res.code == 201) {
--
Gitblit v1.9.3