From 189ec3fe9344dfdc4c3d13b154b482d201e2d413 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 28 四月 2023 15:06:53 +0800
Subject: [PATCH] 1.提交
---
src/views/jcsz/jsqd.vue | 32 ++++++++-------
src/views/kb/ckgl.vue | 4 +-
src/layout/components/Sidebar/index.vue | 10 +++++
src/store/modules/permission.js | 1
src/router/index.js | 28 ++++++++++++++
src/icons/svg/zhkb.svg | 1
6 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/src/icons/svg/zhkb.svg b/src/icons/svg/zhkb.svg
new file mode 100644
index 0000000..39c2f8e
--- /dev/null
+++ b/src/icons/svg/zhkb.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1682562180452" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2688" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M128 256a42.666667 42.666667 0 0 1 42.666667-42.666667h682.666666a42.666667 42.666667 0 0 1 42.666667 42.666667v469.333333a42.666667 42.666667 0 0 1-42.666667 42.666667H170.666667a42.666667 42.666667 0 0 1-42.666667-42.666667V256z m85.333333 42.666667v384h597.333334V298.666667H213.333333z" fill="#157b7e" p-id="2689"></path><path d="M485.802667 712.981333a42.666667 42.666667 0 0 1 52.394666 0l225.664 175.530667-52.373333 67.370667L512 800.725333l-199.466667 155.157334-52.416-67.370667 225.706667-175.530667zM554.666667 85.333333v170.666667h-85.333334V85.333333h85.333334zM448 256v106.666667a64 64 0 1 0 128 0v-106.666667h85.333333v106.666667a149.333333 149.333333 0 1 1-298.666666 0v-106.666667h85.333333z" fill="#157b7e" p-id="2690"></path></svg>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index a9f4534..b7254be 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -83,6 +83,16 @@
if (meta.activeMenu) {
return meta.activeMenu
}
+
+ if (path.indexOf('kanbanManager') !== -1) { // 褰撶偣鍑绘櫤鎱х湅鏉跨殑鏃跺��
+ const url = this.$router.resolve({
+ path
+ // query: { id: 123 }
+ })
+ const t = url.href.split('/')
+ window.open('#/' + t[2], '_blank')
+ }
+
return path
},
showLogo() {
diff --git a/src/router/index.js b/src/router/index.js
index 50f14d9..9a1dd5b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -651,6 +651,34 @@
meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
}
]
+ },
+
+ {
+ path: '/kanbanManager',
+ component: Layout,
+ redirect: '/kanbanManager/zhkb',
+ name: '鏅烘収鐪嬫澘',
+ code: '2023',
+ meta: { title: '鏅烘収鐪嬫澘', icon: 'zhkb' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'jgcj',
+ name: 'ZHKBCancel',
+ component: () => import('@/views/kb/jgcj'),
+ meta: { title: '缁煎悎鐪嬫澘', icon: '', keepAlive: true }
+ }, {
+ path: 'zpcj',
+ name: 'cgddCancel',
+ component: () => import('@/views/kb/zpcj'),
+ meta: { title: '閲囪喘璁㈠崟', icon: '', keepAlive: true }
+ }, {
+ path: 'ckgl',
+ name: 'ckglCancel',
+ component: () => import('@/views/kb/ckgl'),
+ meta: { title: '浠撳簱绠＄悊', icon: '', keepAlive: true }
+ }
+ ]
}
// {
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 7a14504..13f545d 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -109,6 +109,7 @@
return i
}
})
+ newRoutes.push({ path: '*', redirect: '/404', hidden: true })
} else {
newRoutes = getAsyncRoutes(asyncRoutes, menu)
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 0813aea..a536a38 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -452,7 +452,7 @@
</el-button>
</div>
<el-table
- ref="multipleTable"
+ ref="multipleTableRef"
:data="dialogFormUserTable"
border
:row-class-name="tableRowClassName"
@@ -1056,7 +1056,7 @@
},
/* 鍏宠仈鐢ㄦ埛妯″潡*/
- async userClick(row) {
+ userClick(row) {
if (row.role_code === 'S001') {
return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
}
@@ -1070,29 +1070,31 @@
this.userForm.roleName = row.role_name
this.dialogFormUser.rolecode = row.role_code
- const res = await this.getRoleAssociationUser()
- if (res.code === '200') {
- setTimeout(() => {
- loading.close()
- this.userDialogVisible = true
- this.$nextTick(() => {
- this.$refs.multipleTable.doLayout()
+ this.getRoleAssociationUser().then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+
+ this.$nextTick(() => {
+ this.$refs.multipleTableRef.doLayout()
+ })
})
- }, 1000)
- } else {
- loading.close()
- }
+ } else {
+ loading.close()
+ }
+ })
},
// 鑾峰彇瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛
async getRoleAssociationUser() {
const res = await RoleAssociationUser(this.dialogFormUser)
this.dialogFormUserTable = res.data
this.dialogFormUserTableLength = res.count
+ this.userDialogVisible = true
this.$nextTick(() => {
this.dialogFormUserTable.forEach((item, index) => {
if (item.flag === 'Y') {
- this.$refs.multipleTable.toggleRowSelection(this.dialogFormUserTable[index], true)
+ this.$refs.multipleTableRef.toggleRowSelection(this.dialogFormUserTable[index], true)
}
})
})
@@ -1139,7 +1141,7 @@
this.dialogFormUser.orgcode = ''
this.dialogFormUser.isrole = ''
this.$refs.dialogCascaderUser.checkedValue = ''
- this.$refs.multipleTable.clearSelection()
+ this.$refs.multipleTableRef.clearSelection()
},
// 鍏宠仈鐢ㄦ埛瀵硅瘽妗嗗叧闂�
userDialogVisibleCancel() {
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 5657808..2aa7c9d 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -411,13 +411,13 @@
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
// this.number1 = this.tableDataTop.length
- if (this.tableDataTop.length > 9) {
+ if (this.tableDataTop.length > 10) {
clearInterval(this.tableTopTask)
this.getWareHouseTopLeftData()
}
})
}
- }, this.tableDataTop.length <= 9 ? 1000 * 3 : 100)
+ }, this.tableDataTop.length <= 10 ? 1000 * 3 : 100)
})
},
// 鑾峰彇宸︿笅table鏁版嵁
--
Gitblit v1.9.3