From 31b8ae27a1d60ac82044e2995e3ac90219b45f70 Mon Sep 17 00:00:00 2001 From: hyt <958868763@qq.com> Date: Mon, 8 Apr 2024 16:32:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=A0=91=E7=82=B9=E5=87=BB=E9=97=AE=E9=A2=98=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=BA=94=E7=94=A8=E8=AE=BE=E7=BD=AE=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=B2=A1=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/applicationList/applicationAdd.vue | 10 ++- src/views/applicationList/index.vue | 10 ++- src/views/applicationList/settingMenu.vue | 10 ++- .../userJurisdiction/rightDialog.vue | 67 ++++++++++++++++--- 4 files changed, 82 insertions(+), 15 deletions(-) diff --git a/src/views/applicationList/applicationAdd.vue b/src/views/applicationList/applicationAdd.vue index 70f3a16..a36a381 100644 --- a/src/views/applicationList/applicationAdd.vue +++ b/src/views/applicationList/applicationAdd.vue @@ -20,7 +20,7 @@
- +
@@ -136,6 +136,9 @@ export default { }; }, methods: { + handleImageError(row) { + row.imgUrl = require('./images/1.png') + }, // 状态改变 async appStatusChange(val, row) { const res = await getApiModuleApi({ @@ -322,10 +325,13 @@ export default { flex: 0.25; width: 29px; height: 29px; + display: flex; + justify-content: center; + align-items: center; img { width: 100%; - height: 100%; + // height: 100%; } } diff --git a/src/views/applicationList/settingMenu.vue b/src/views/applicationList/settingMenu.vue index ffef840..00e0c59 100644 --- a/src/views/applicationList/settingMenu.vue +++ b/src/views/applicationList/settingMenu.vue @@ -16,10 +16,10 @@ -->
{{ name }}
@@ -62,6 +62,9 @@ export default { }; }, methods: { + handleImageError(row) { + this.imgUrl = require('./images/1.png') + }, flashActive(val) { this.menuActived = val }, @@ -137,6 +140,9 @@ export default { > .img { width: 64px; height: 64px; + display: flex; + justify-content: center; + align-items: center; } .appName { diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/rightDialog.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/rightDialog.vue index dfafb77..b88c2c7 100644 --- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/rightDialog.vue +++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/rightDialog.vue @@ -180,7 +180,56 @@ export default { }) }, handleSelectionChange(val, row) { - row.check = !row.check + this.multipleSelection = val + let data = this.treeToArray([row]) + this.childNode = !row.check + console.log(this.childNode,'this.childNode') + if (data.length > 1) { + console.log(data,'data') + data.forEach((el, index) => { + el.check = this.childNode + this.$refs.multipleTable.toggleRowSelection(el, this.childNode) + }) + let ids = data[0].id + let arr = this.treeFindPath( + this.menuDatas, + (data) => data.id == ids, + 'id' + ) + arr = arr.splice(0, arr.length - 1) + let dataList = [] + let allList = this.treeToArray(this.menuDatas) + allList.forEach((el, index) => { + if (arr.includes(el.id)) { + dataList.push(el) + } + }) + dataList.forEach((el, index) => { + el.check = true + this.$refs.multipleTable.toggleRowSelection(el, true) + }) + } else { + let ids = data[0].id + let arr = this.treeFindPath( + this.menuDatas, + (data) => data.id == ids, + 'id' + ) + console.log(arr,'arr') + // arr = arr.splice(0, arr.length - 1) + let dataList = [] + let allList = this.treeToArray(this.menuDatas) + allList.forEach((el, index) => { + if (arr.includes(el.id)) { + dataList.push(el) + } + }) + console.log(dataList,'dataList') + dataList.forEach((el, index) => { + el.check = this.childNode + this.$refs.multipleTable.toggleRowSelection(el, this.childNode ) + }) + } }, // 默认选中 exhibitList(menu, homeList, id) { @@ -239,13 +288,13 @@ export default { } this.homeListHandle(params.sysPopedomHomeEntities) this.menuListHandle(this.menuDatas, params.sysPopedomMenuEntities, params.sysPopedomOperateEntities) - const res = await authApi("sysUserService","","saveJurisdiction","",params) - if(res.status == '200'){ - this.handleDialogClose(); + const res = await authApi('sysUserService', '', 'saveJurisdiction', '', params) + if (res.status == '200') { + this.handleDialogClose() this.$message({ - message: "保存成功", - type: "success", - }); + message: '保存成功', + type: 'success' + }) } }, //处理首页拖拽 @@ -265,7 +314,7 @@ export default { }) } if (item.children.length) { - this.menuListHandle(item.children, result,btnResult) + this.menuListHandle(item.children, result, btnResult) } if (item.buttonList.length) { this.btnListHandle(item.buttonList, btnResult, item.id) @@ -276,7 +325,7 @@ export default { btnListHandle(list, btnResult, menuId) { list.forEach(item => { if (item.check) { - console.log(btnResult,'btnResult') + console.log(btnResult, 'btnResult') btnResult.push({ menuId, operate: item.id From c3da071985d13e7f6337e1f487a1551322eb9169 Mon Sep 17 00:00:00 2001 From: hyt <958868763@qq.com> Date: Wed, 10 Apr 2024 09:47:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E7=94=A8=E9=97=AE=E9=A2=98=E3=80=81=E9=9D=A2?= =?UTF-8?q?=E5=8C=85=E5=B1=91=E4=B8=BB=E5=8A=A8=E5=88=A0=E9=99=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/baseLayout/index.vue | 750 +++++++++--------- src/components/base/baseNewLayout/index.vue | 705 ++++++++++++++++ src/layout/components/AppMain.vue | 2 +- src/layout/components/Navbar.vue | 13 +- src/layout/components/TagsView/index.vue | 4 +- src/layout/index.vue | 322 ++++---- src/views/intergrationOptionScene/index.vue | 4 +- .../intergrationOptionScene/sceneAdd.vue | 2 + src/views/intergrationTask/taskAdd.vue | 2 + src/views/systemInit/index.vue | 1 + .../buttonManagement/index.vue | 2 +- .../menuManagement/index.vue | 2 +- .../roleJurisdiction/index.vue | 2 +- .../roleJurisdiction/jurisdictionSetting.vue | 2 +- .../userJurisdiction/index.vue | 2 +- .../userJurisdiction/jurisdictionSetting.vue | 2 +- .../systemSettings/organization/index.vue | 2 +- .../userSettings/PersonnelSettings/index.vue | 2 +- .../userSettings/roleSettings/index.vue | 2 +- .../userSettings/userInformation/index.vue | 2 +- 20 files changed, 1255 insertions(+), 570 deletions(-) create mode 100644 src/components/base/baseNewLayout/index.vue diff --git a/src/components/base/baseLayout/index.vue b/src/components/base/baseLayout/index.vue index 59d8bc4..78b16bb 100644 --- a/src/components/base/baseLayout/index.vue +++ b/src/components/base/baseLayout/index.vue @@ -5,219 +5,142 @@ --> @@ -225,6 +148,7 @@ diff --git a/src/components/base/baseNewLayout/index.vue b/src/components/base/baseNewLayout/index.vue new file mode 100644 index 0000000..ff7e2db --- /dev/null +++ b/src/components/base/baseNewLayout/index.vue @@ -0,0 +1,705 @@ + + + + + + diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index dcd4434..377a04a 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -35,7 +35,7 @@ export default { diff --git a/src/views/intergrationOptionScene/index.vue b/src/views/intergrationOptionScene/index.vue index 400c787..1254fd1 100644 --- a/src/views/intergrationOptionScene/index.vue +++ b/src/views/intergrationOptionScene/index.vue @@ -304,7 +304,7 @@ export default { this.searchForm = {}; }, newPage() { - this.$router.push({ name: "sceneAdd" }); + this.$router.push({ path: "/add" }); }, homeHandleNodeClick(data) { this.pageModel.pageIndex = 1; @@ -419,4 +419,4 @@ export default { margin-top: 10px; } } - \ No newline at end of file + diff --git a/src/views/intergrationOptionScene/sceneAdd.vue b/src/views/intergrationOptionScene/sceneAdd.vue index 08d68eb..b729a08 100644 --- a/src/views/intergrationOptionScene/sceneAdd.vue +++ b/src/views/intergrationOptionScene/sceneAdd.vue @@ -901,6 +901,8 @@ export default { type: "success", message: "保存成功！", }); + //面包屑删除 + this.$store.dispatch("tagsView/delView", this.$route); this.$router.back(); } } catch (error) { diff --git a/src/views/intergrationTask/taskAdd.vue b/src/views/intergrationTask/taskAdd.vue index 43c0514..b536dce 100644 --- a/src/views/intergrationTask/taskAdd.vue +++ b/src/views/intergrationTask/taskAdd.vue @@ -757,6 +757,8 @@ export default { message: "保存成功！", }); this.$router.back(); + //面包屑删除 + this.$store.dispatch("tagsView/delView", this.$route); } } else { obj["id"] = this.$route.query.id; diff --git a/src/views/systemInit/index.vue b/src/views/systemInit/index.vue index 114bfd4..cabb4b4 100644 --- a/src/views/systemInit/index.vue +++ b/src/views/systemInit/index.vue @@ -123,6 +123,7 @@ export default { }, methods: { baseLogin() { + if (this.loginForm.baseLoginCode == configKey.baseLoginCode && this.loginForm.baseLoginPwd == configKey.baseLoginPwd) { this.loginType = true this.dialogVisible = false diff --git a/src/views/systemMaintenance/buttonManagement/index.vue b/src/views/systemMaintenance/buttonManagement/index.vue index b051ef6..c753507 100644 --- a/src/views/systemMaintenance/buttonManagement/index.vue +++ b/src/views/systemMaintenance/buttonManagement/index.vue @@ -45,7 +45,7 @@