From cb57bc6b4abf45dbb0605c94359c63e3b31b4b87 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 10 九月 2024 15:55:57 +0800
Subject: [PATCH] 优化报告生成、修改电路下单传参
---
src/view/index.vue | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index 7a4697f..d8bc62c 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);
}
@@ -357,11 +357,11 @@
<el-col :span="24">
<el-card :body-style="{padding: '6px'}">
<ul>
- <li @click="removeTab(activeIndex)" v-show="menuId!=0"><i class="el-icon-close"></i>鍏抽棴</li>
- <li @click="allDel"><i class="el-icon-delete"></i>鍏抽棴鎵�鏈�</li>
- <li @click="rightDel(activeIndex)"><i class="el-icon-d-arrow-right"></i>鍏抽棴鍙充晶椤电</li>
+ <li @click="removeTab(activeIndex)" v-show="menuId!=0" style="text-align: left;"><i class="el-icon-close"></i>鍏抽棴</li>
+ <li @click="allDel" style="text-align: left;"><i class="el-icon-delete"></i>鍏抽棴鎵�鏈�</li>
+ <li @click="rightDel(activeIndex)" style="text-align: left;"><i class="el-icon-d-arrow-right"></i>鍏抽棴鍙充晶椤电</li>
<el-divider></el-divider>
- <li @click="refreshTable"><i class="el-icon-refresh"></i>鍒锋柊</li>
+ <li @click="refreshTable" style="text-align: left;"><i class="el-icon-refresh"></i>鍒锋柊</li>
</ul>
</el-card>
</el-col>
@@ -394,6 +394,7 @@
</span>
</el-dialog>
<notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
+ <timer></timer>
</div>
</template>
@@ -411,9 +412,10 @@
import menus from '../../static/js/menu.js'
import nullFace from '../view/404.vue'
import notice from './notice.vue'
+ import timer from './timer.vue';
comObj['nullFace'] = nullFace
export default {
- components: {...comObj,notice},
+ components: {...comObj,notice,timer},
data() {
return {
userName: "value",
@@ -435,6 +437,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;
@@ -600,13 +611,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