From 8cb05c2a9091f67a50e78db8ecd83a601dcf0ed6 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Tue, 10 May 2022 16:44:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=202022-05-10=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/print/print.js | 7 + src/utils/httpRequest.js | 2 +- src/views/main-navbar.vue | 30 ++- src/views/modules/common/print-list.vue | 118 +++++++++++ src/views/modules/common/user-print-list.vue | 200 +++++++++++++++++++ 5 files changed, 351 insertions(+), 6 deletions(-) create mode 100644 src/api/print/print.js create mode 100644 src/views/modules/common/print-list.vue create mode 100644 src/views/modules/common/user-print-list.vue diff --git a/src/api/print/print.js b/src/api/print/print.js new file mode 100644 index 0000000..8123931 --- /dev/null +++ b/src/api/print/print.js @@ -0,0 +1,7 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 获取用户打印机 +export const getUserLabelPrintList = data => createAPI(`/sysUserPrinter/getUserPrint/${data.userName}`,'get') + +// 保存用户打印机 +export const saveUserLabelPrint = data => createAPI('/sysUserPrinter/saveUserLabelPrint','post',data) diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js index 7609904..bde06a6 100644 --- a/src/utils/httpRequest.js +++ b/src/utils/httpRequest.js @@ -26,7 +26,7 @@ http.interceptors.request.use(config => { }) /** - * 响应拦截 + * 响应拦截 可自定义统一返回结果 */ http.interceptors.response.use(response => { if (response.data && response.data.code === 401) { // 401, token失效 diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 8c9702c..f0ec648 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -37,6 +37,7 @@ {{ pageLanguage.cssSetting }} + {{ pageLanguage.printSetting }} @@ -55,8 +56,10 @@ - + + + @@ -65,6 +68,7 @@ import UpdateLanguage from './main-navbar-update-language' import {clearLoginInfo} from '@/utils' import FileListView from './modules/common/file-list-view' + import UserPrintList from './modules/common/user-print-list' import { searchFunctionButtonList, saveButtonList, @@ -76,6 +80,7 @@ updatePassowrdVisible: false, updateLanguageVisible: false, helpFileVisible:false, + printListVisible:false, message: this.$t('language.name'), languageList: [], pageLanguage: { @@ -86,7 +91,8 @@ userSetting: '用户设置', updatePassword: '修改密码', updateDefaultLanguage: '修改默认语言', - cssSetting: '主提设置' + cssSetting: '主提设置', + printSetting: '打印设置', }, // 导出 end pageLanguageList: [ @@ -152,6 +158,13 @@ objectId: 'cssSetting', objectType: "label", tableId: "systemInformation" + }, + { + functionId: "systemInformation", + languageValue: '打印设置', + objectId: 'printSetting', + objectType: "label", + tableId: "systemInformation" } ], @@ -160,7 +173,8 @@ components: { UpdatePassword, UpdateLanguage, - FileListView + FileListView, + UserPrintList }, computed: { navbarLayoutType: { @@ -194,6 +208,13 @@ }, methods: { + // 打印机列表 + printList(){ + this.printListVisible = true; + this.$nextTick(() => { + this.$refs.userPrintList.init() + }) + }, // 帮助文档列表 helpFileList(){ let fileMappingDto = { @@ -223,9 +244,8 @@ objectType: 'label' } searchFunctionButtonList(queryButton).then(({data}) => { - if (JSON.stringify(data.data) != '{}') { + if (data.code === 0) { this.pageLanguage = data.data - } else { saveButtonList(this.pageLanguageList).then(({data}) => { this.getFunctionButtonList() diff --git a/src/views/modules/common/print-list.vue b/src/views/modules/common/print-list.vue new file mode 100644 index 0000000..7128c85 --- /dev/null +++ b/src/views/modules/common/print-list.vue @@ -0,0 +1,118 @@ + + + diff --git a/src/views/modules/common/user-print-list.vue b/src/views/modules/common/user-print-list.vue new file mode 100644 index 0000000..b3db153 --- /dev/null +++ b/src/views/modules/common/user-print-list.vue @@ -0,0 +1,200 @@ + + +