From fdd4e1ebf9dfcddec7984f071219c2dee0a0e4a6 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期二, 08 七月 2025 18:25:02 +0800
Subject: [PATCH] 1
---
src/config/website.js | 4 +-
src/page/login/index.vue | 3 +
src/views/wel/index.vue | 110 ++++++++++++++++++++++++++++++++++++++----------------
3 files changed, 81 insertions(+), 36 deletions(-)
diff --git a/src/config/website.js b/src/config/website.js
index 18e51dd..5d24cc2 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -2,7 +2,7 @@
* @Author: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
* @Date: 2025-06-11 10:04:08
* @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
- * @LastEditTime: 2025-07-07 17:46:08
+ * @LastEditTime: 2025-07-08 10:49:40
* @FilePath: /dev-optimize-0710-lzhe/Users/test/MDM/mdmweb/src/config/website.js
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -63,7 +63,7 @@
//oauth2閰嶇疆
oauth2: {
// 鏄惁寮�鍚敞鍐屽姛鑳�
- registerMode: true,
+ registerMode: false,
// 浣跨敤鍚庣宸ョ▼ @org.springblade.test.Sm2KeyGenerator 鑾峰彇
publicKey: '04cd1b295876209215161da4620bbdea7ee96654ed8a6306ea6f75acd2715c4cbcac26679f13a027114dc83ef4f743a8d998defbc5cea2a0fd1a39750f684cf093',
// 绗笁鏂圭郴缁熸巿鏉冨湴鍧�
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 0832584..a5fad83 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -18,7 +18,7 @@
<codeLogin v-else-if="activeName === 'code'"></codeLogin>
<thirdLogin v-else-if="activeName === 'third'"></thirdLogin>
<registerLogin v-else-if="activeName === 'register'"></registerLogin>
- <div class="login-menu">
+ <div class="login-menu" v-if="isShowMenu">
<el-link href="#" @click.stop="activeName = 'user'">{{
$t('login.userLogin')
}}</el-link>
@@ -62,6 +62,7 @@
},
data() {
return {
+ isShowMenu: false,
website: website,
time: '',
activeName: 'user',
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 5293db3..f62472b 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -18,9 +18,12 @@
@row-update="rowUpdate"
@row-click="rowClick"
>
+ <template #menu-left>
+ <el-button :size="size" type="primary" @click="showAdd()">鏂板鑺傜偣</el-button>
+ </template>
<template #name="{ row }">
<span>{{row.name}}</span>
- <el-button :size="size" text icon="el-icon-setting" type="primary" placeholder="淇敼" @click="showEdit(row)" title="淇敼"></el-button>
+ <el-button :size="size" text v-if="row.nodeType != 70" icon="el-icon-setting" type="primary" placeholder="淇敼" @click="showEdit(row)" title="淇敼"></el-button>
<el-button :size="size" text icon="el-icon-delete" type="primary" @click="showDel(row)" placeholder="鍒犻櫎" title="鍒犻櫎"></el-button>
<el-button :size="size" text v-if="row.nodeType < 60" icon="el-icon-document-add" type="primary" @click="showAdd(row)" placeholder="鏂板瀛愮骇" title="鏂板瀛愮骇"></el-button>
<el-button :size="size" text v-if="row.nodeType == 60" icon="el-icon-upload" type="primary" @click="showUpload(row)" placeholder="鏂囦欢涓婁紶" title="鏂囦欢涓婁紶"></el-button>
@@ -28,6 +31,7 @@
<el-button :size="size" text v-if="row.nodeType == 60 && !isSM" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="涓嬪彂" title="涓嬪彂"></el-button>
</template>
</avue-crud>
+ <!-- 鏂板鑺傜偣 -->
<el-dialog :title="modalTitle" append-to-body v-model="modalBox">
<avue-form :option="modalOption" v-model="modalForm" @submit="modalSubmit" @reset-change="modalCancel"/>
</el-dialog>
@@ -38,10 +42,11 @@
<avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
<span v-else-if="tabsType == 'tab2'">鐗堟湰淇℃伅</span>
<template v-else-if="tabsType == 'tab3'">
- <div v-for="item in fileList" v-if="fileList.length > 0" class="fileListStyle">
+ 鏂囦欢鍐呭
+ <!-- <div v-for="item in fileList" v-if="fileList.length > 0" class="fileListStyle">
<span>{{item.name}}</span>
<span class="delFile" @click="delFile(item)">X</span>
- </div>
+ </div> -->
</template>
</basic-container>
</template>
@@ -289,7 +294,7 @@
},
uploadAfter() {
- this.getFile(this.id);
+
},
upgrade(row) { //鍗囩骇
this.loading = true;
@@ -331,7 +336,7 @@
this.tabsForm.nodeTypeName = item.dictValue;
}
})
- if(this.tabsForm.nodeType < 60) {
+ if(this.tabsForm.nodeType < 70) {
this.tabsOption = this.tabsOption1;
}else {
this.tabsOption = this.tabsOption2;
@@ -350,20 +355,22 @@
this.uploadmodalForm = row;
this.uploadmodalBox = true;
},
- getFile(id) {
- var obj = {nodeId: id}
+ getFile(id) { //鏌ョ湅鏂囦欢鍐呭
+ this.loading = true;
axios({
- url: '/blade-mdm/program/ncfile/list-by-node',
+ url: '/blade-mdm/program/ncfile/content',
method: 'get',
- params: obj,
+ params: {id},
}).then(
- resp => {
- this.fileList = resp.data.data;
+ res => {
+ this.loading = true;
+ console.log(res.data,123)
}
);
},
uploadmodalSubmit(row,done) {
this.uploadmodalBox = false;
+ this.addLocalTreeNode(row.parentId); //閲嶆柊鍔犺浇涓嬩竴绾�
done();
},
rowDel(row, index, done) {
@@ -401,15 +408,21 @@
})
},
showAdd (row) { //鏂板瀛愯妭鐐�
- if(row.nodeType == 60) {
- return;
+ if(!row) {
+ this.modalTitle = "鏂板鑺傜偣";
+ this.modalForm.nodeType = "10";
+ this.modalForm.parentId = 0;
+ }else {
+ if(row.nodeType == 60) {
+ return;
+ }
+ this.modalTitle = "鏂板瀛愯妭鐐�";
+ this.selectedColumn.nodeType = String(Number(row.nodeType) + 10);
+ this.selectedColumn.parentId = row.id;
+ this.selectedColumn.name = "";
+ this.selectedColumn.id = "";
+ this.modalForm = this.selectedColumn;
}
- this.modalTitle = "鏂板瀛愯妭鐐�";
- this.selectedColumn.nodeType = String(Number(row.nodeType) + 10);
- this.selectedColumn.parentId = row.id;
- this.selectedColumn.name = "";
- this.selectedColumn.id = "";
- this.modalForm = this.selectedColumn;
this.modalBox = true;
},
modalSubmit(row,done) { //鏂板瀛愯妭鐐逛繚瀛�/淇敼
@@ -433,14 +446,57 @@
this.updateLocalTreeNode(this.modalForm);
}else {
// 濡傛灉鏄柊澧炴搷浣滐紝鍙兘闇�瑕侀噸鏂板姞杞芥暟鎹�
- this.$refs.crud.refreshTable();
+ //this.$refs.crud.refreshTable();
+ //this.onLoad();
+ //鏂板锛屾洿鏂版湰鍦版暟鎹�
+ this.addLocalTreeNode(row.parentId);
}
this.loading = false;
done(row);
}
);
},
- updateLocalTreeNode(nodeData) {
+ addLocalTreeNode(parentId) {
+ this.loading = true;
+ var obj = {parentId: parentId}
+ axios({
+ url: '/blade-mdm/program/node/lazy-list',
+ method: 'get',
+ params: obj,
+ }).then(
+ res => {
+ var children = res.data.data || [];
+ this.updateParentNodeChildren(parentId, children);
+ this.loading = false;
+ }
+ );
+ },
+ updateParentNodeChildren(parentId, newChildren) { //鏂板鐨勬柟娉�
+ const updateTree = (nodes) => {
+ for (let i = 0; i < nodes.length; i++) {
+ if (nodes[i].id === parentId) {
+ // 鏇存柊鑺傜偣鏁版嵁
+ nodes[i].children = [...newChildren];
+ this.data = [...this.data]; // 鏇挎崲椤跺眰寮曠敤
+ return true;
+ }
+ if (Array.isArray(nodes[i].children) && nodes[i].children.length > 0) {
+ if (updateTree(nodes[i].children)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ };
+ updateTree(this.data);
+ // 寮哄埗鍒锋柊
+ this.$nextTick(() => {
+ this.$refs.crud?.refreshTable();
+ //this.$refs.crud.toggleRowExpansion('0', true);
+ console.log(this.data,222)
+ });
+ },
+ updateLocalTreeNode(nodeData) { //淇敼鐨勬柟娉�
const updateNode = (nodes) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].id === nodeData.id) {
@@ -522,18 +578,6 @@
}
}
);
- //鏌ョ湅鍐呭
- // this.loading = true;
- // var obj = {id: "1940982493963415554"}
- // axios({
- // url: '/blade-mdm/program/ncfile/content',
- // method: 'get',
- // params: obj,
- // }).then(
- // res => {
-
- // }
- // );
}
};
</script>
--
Gitblit v1.9.3