From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/view/index.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index b9ff928..bf6e4d7 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -348,7 +348,7 @@
</div>
<div class="component_view">
<component class="com_index" v-for="(com, index) in tabs" :is="com.u" :key="com.k" v-show="com.k == tabActive"
- :ref="`com-${com.k}`">
+ :ref="`com-${com.k}`" :param="param">
</component>
</div>
</div>
@@ -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",
@@ -430,11 +432,21 @@
query:{},
newMsg:false,
timer:null,
- menuId: 0
+ menuId: 0,
+ param:null,
};
},
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;
@@ -488,12 +500,33 @@
if (ob.u == "") ob.u = "nullFace"
this.tabs.push(ob);
}
+ if(ob.param){
+ this.param = this.HaveJson(ob.param)
+ this.param.textNum = Math.random(100)
+ }else{
+ this.param = null
+ }
this.$refs['popoverName'].forEach(a=>{
a.doClose()
})
this.saveClick()
},
removeTab(index) {
+ let obj = this.$refs[`com-${this.tabs[index].k}`][0]
+ if(obj.state&&obj.state==1&&this.tabs[index].v=='妫�楠屼换鍔�'&&(obj.version===0||obj.version===1)){
+ this.$confirm('璇风‘璁ゅ綋鍓嶆暟鎹槸鍚﹀叏閮ㄤ繚瀛橈紝鏄惁鍏抽棴褰撳墠椤甸潰锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then( async () => {
+ if(await obj.$refs.Inspection.$refs.CircuitParameters.saveAll()){
+ this.tabs.splice(index, 1);
+ let data = this.tabs[this.tabs.length - 1]
+ this.upTabActive(data.k)
+ }
+ })
+ return
+ }
this.tabs.splice(index, 1);
let data = this.tabs[this.tabs.length - 1]
this.upTabActive(data.k)
@@ -600,13 +633,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