diff --git a/package-lock.json b/package-lock.json index c32d3025..04a86da6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "dayjs": "^1.11.19", "echarts": "^6.0.0", "element-plus": "^2.13.3", + "file-saver": "^2.0.5", "js-cookie": "^3.0.5", "jsbarcode": "^3.12.3", "nprogress": "^0.2.0", @@ -28,13 +29,15 @@ "vue": "^3.5.29", "vue-draggable-plus": "^0.6.1", "vue-i18n": "^11.2.8", - "vue-router": "^5.0.3" + "vue-router": "^5.0.3", + "xlsx": "^0.18.5" }, "devDependencies": { "@tsconfig/node24": "^24.0.4", "@types/js-cookie": "^3.0.6", "@types/node": "^24.11.0", "@types/path-browserify": "^1.0.3", + "@types/qrcode": "^1.5.6", "@types/spark-md5": "^3.0.5", "@types/three": "^0.183.1", "@vitejs/plugin-vue": "^6.0.4", @@ -2062,6 +2065,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/qrcode": { + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.6.tgz", + "integrity": "sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/sortablejs": { "version": "1.15.9", "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.15.9.tgz", @@ -2524,6 +2537,15 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/adler-32": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz", + "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/ajv": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", @@ -3036,6 +3058,19 @@ ], "license": "CC-BY-4.0" }, + "node_modules/cfb": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz", + "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==", + "license": "Apache-2.0", + "dependencies": { + "adler-32": "~1.3.0", + "crc-32": "~1.2.0" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -3183,6 +3218,15 @@ "node": ">=0.8" } }, + "node_modules/codepage": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz", + "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -3303,6 +3347,18 @@ "url": "https://opencollective.com/express" } }, + "node_modules/crc-32": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", + "license": "Apache-2.0", + "bin": { + "crc32": "bin/crc32.njs" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -4579,6 +4635,12 @@ "node": ">=16.0.0" } }, + "node_modules/file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==", + "license": "MIT" + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -4692,6 +4754,15 @@ "node": ">= 6" } }, + "node_modules/frac": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz", + "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -7944,6 +8015,18 @@ "node": ">=0.10.0" } }, + "node_modules/ssf": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz", + "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==", + "license": "Apache-2.0", + "dependencies": { + "frac": "~1.1.2" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", @@ -9441,6 +9524,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/wmf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz", + "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/word": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz", + "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -9517,6 +9618,27 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/xlsx": { + "version": "0.18.5", + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz", + "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==", + "license": "Apache-2.0", + "dependencies": { + "adler-32": "~1.3.0", + "cfb": "~1.2.1", + "codepage": "~1.15.0", + "crc-32": "~1.2.1", + "ssf": "~0.11.2", + "wmf": "~1.0.1", + "word": "~0.3.0" + }, + "bin": { + "xlsx": "bin/xlsx.njs" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/xml-name-validator": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", diff --git a/package.json b/package.json index 54a3f32f..0a48b3ca 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "dayjs": "^1.11.19", "echarts": "^6.0.0", "element-plus": "^2.13.3", + "file-saver": "^2.0.5", "js-cookie": "^3.0.5", "jsbarcode": "^3.12.3", "nprogress": "^0.2.0", @@ -33,13 +34,15 @@ "vue": "^3.5.29", "vue-draggable-plus": "^0.6.1", "vue-i18n": "^11.2.8", - "vue-router": "^5.0.3" + "vue-router": "^5.0.3", + "xlsx": "^0.18.5" }, "devDependencies": { "@tsconfig/node24": "^24.0.4", "@types/js-cookie": "^3.0.6", "@types/node": "^24.11.0", "@types/path-browserify": "^1.0.3", + "@types/qrcode": "^1.5.6", "@types/spark-md5": "^3.0.5", "@types/three": "^0.183.1", "@vitejs/plugin-vue": "^6.0.4", diff --git a/src/api/setting/role.ts b/src/api/setting/role.ts index 069ba173..51a77cbf 100644 --- a/src/api/setting/role.ts +++ b/src/api/setting/role.ts @@ -19,6 +19,21 @@ export function roleList(data: { includeDisabled?: boolean, includeSystem?: bool }) } +export function permissionroleList(data: { role_id?: number, includeDisabled?: boolean, includeSystem?: boolean, employee_id?: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.role.permission', + v, + timestamp: new Date().getTime(), + }, + data + }) +} + + + /** * 新增角色并一次性提交权限集 */ diff --git a/src/layout/component/TaskView/index.vue b/src/layout/component/TaskView/index.vue index 53b98d11..1c398fb8 100644 --- a/src/layout/component/TaskView/index.vue +++ b/src/layout/component/TaskView/index.vue @@ -272,7 +272,7 @@ onMounted(() => { display: flex; justify-content: center; align-items: center; - background: #fff; + background: #d8d7d7; border-bottom: 1px solid #f0f2f5; cursor: pointer; font-size: 14px; @@ -289,7 +289,8 @@ onMounted(() => { height: 35px; width: 100%; background: #f0f2f5; - border-bottom: 1px solid #d8dce5; + padding-top: 2px; + // border-bottom: 1px solid #d8dce5; .tags-view-item { display: inline-block; @@ -340,11 +341,11 @@ onMounted(() => { height: 16px; line-height: 14px; vertical-align: middle; - border-radius: 50%; + // border-radius: 50%; text-align: center; transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); transform-origin: 100% 50%; - margin-left: 5px; + // margin-left: 5px; font-size: 12px; &:hover { @@ -352,6 +353,29 @@ onMounted(() => { color: #fff; } } + + .close-icon { + display: inline-flex; + align-items: center; + justify-content: center; + width: 16px; + height: 16px; + line-height: 16px; + vertical-align: middle; + // border-radius: 50%; + text-align: center; + transition: all 0.18s ease; + transform-origin: 100% 50%; + // margin-left: 5px; + font-size: 12px; + cursor: pointer; + box-sizing: border-box; + + &:hover { + background-color: #c7cedb; + color: #fff; + } + } } } diff --git a/src/views/auth/approve.vue b/src/views/auth/approve.vue index be114c97..80e3a33f 100644 --- a/src/views/auth/approve.vue +++ b/src/views/auth/approve.vue @@ -331,6 +331,22 @@ const auditResultType = computed(() => { }) // 方法 +const flattenRoles = (rawRoles: any[]) => { + const tempMap = new Map() + const buildFlat = (arr: any[]) => { + arr.forEach(item => { + const id = item.role_id || item.id + if (!tempMap.has(id)) { + const { children, ...rest } = item + tempMap.set(id, { ...rest, id, children: [] }) + } + if (item.children && item.children.length) buildFlat(item.children) + }) + } + buildFlat(rawRoles) + return Array.from(tempMap.values()) +} + const getData = async (code: string) => { if (!code) return loading.value = true @@ -338,7 +354,7 @@ const getData = async (code: string) => { const response: any = await getStoreRoles({ code }) if (response.code === 200) { info.value = response.data.info - roles.value = response.data.roles || [] + roles.value = flattenRoles(response.data.roles || []) storeInfo.value = response.data.store || {} } else { ElMessage.error(response.msg || '获取数据失败') diff --git a/src/views/dashboard/components/AppDownload.vue b/src/views/dashboard/components/AppDownload.vue index 64f2ae10..eb3fa34c 100644 --- a/src/views/dashboard/components/AppDownload.vue +++ b/src/views/dashboard/components/AppDownload.vue @@ -19,7 +19,7 @@
获取版本信息失败
- + 下载
@@ -45,14 +45,31 @@ + + + +
+ +
请使用 PDA 或手机扫描
+ +
+
- \ No newline at end of file diff --git a/src/views/system/setting/permission/permission-config.ts b/src/views/system/setting/permission/permission-config.ts new file mode 100644 index 00000000..bbc0dac2 --- /dev/null +++ b/src/views/system/setting/permission/permission-config.ts @@ -0,0 +1,50 @@ +export const permissionRules = { + path: [{ required: true, message: '请输入权限路径', trigger: 'blur' }], + type: [{ required: true, message: '请选择权限类型', trigger: 'change' }] +} + +export const defaultCreateTemp = { + parent_id: undefined as number | undefined, + type: 'web_pages', + path: '', + meta_title: '', + name: '', + sort: 0 +} + +export const defaultUpdateTemp = { + permission_id: undefined as number | undefined, + parent_id: undefined as number | undefined, + type: 'web_pages', + path: '', + name: '', + sort: 0, + status: 1 +} + +export const permissionTypeTagMap: Record = { + web_pages: 'success', + api: '', + pda_pages: 'warning', + btns: 'danger', + block: 'info', + miniprogram_pages: 'primary' +} + +export const permissionTypeNameMap: Record = { + web_pages: 'Web页面', + api: 'API', + pda_pages: 'PDA', + btns: '按钮', + block: '区块', + miniprogram_pages: '小程序' +} + +export const permissionTypeOptions = [ + { label: 'Web页面', value: 'web_pages', fullLabel: 'Web页面 (web_pages)' }, + { label: 'API', value: 'api', fullLabel: 'API接口 (api)' }, + { label: 'PDA页面', value: 'pda_pages', fullLabel: 'PDA页面 (pda_pages)' }, + { label: '按钮', value: 'btns', fullLabel: '按钮 (btns)' }, + { label: '区块', value: 'block', fullLabel: '区块 (block)' }, + { label: '小程序页面', value: 'miniprogram_pages', fullLabel: '小程序页面 (miniprogram_pages)' } +] diff --git a/src/views/system/setting/role/index.vue b/src/views/system/setting/role/index.vue index 89a07fea..ec622bfc 100644 --- a/src/views/system/setting/role/index.vue +++ b/src/views/system/setting/role/index.vue @@ -1,63 +1,84 @@