diff --git a/public/favicon.ico b/public/favicon.ico index 583039c..b47a73c 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/login.js b/src/api/login.js index d1bde0f..e6ba982 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -75,3 +75,16 @@ export function getCodeSms() { timeout: 20000 }) } + + +export function getTitleConfig() { + return request({ + url: '/spms/getTitleConfig', + headers: { + isToken: false + }, + method: 'get', + timeout: 20000 + }) +} + diff --git a/src/assets/images/glxplogo.png b/src/assets/images/glxplogo.png index b5b8e2f..385e999 100644 Binary files a/src/assets/images/glxplogo.png and b/src/assets/images/glxplogo.png differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 583039c..385e999 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index d33e525..f396f4b 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -60,7 +60,7 @@ export default { .sidebar-logo-container { position: relative; width: 100%; - height: 100px; + height: 110px; line-height: 50px; background: #2b2f3a; text-align: center; @@ -72,7 +72,7 @@ export default { & .sidebar-logo { width: 100px; - height: 73px; + height: 100px; margin-top: 12px; vertical-align: middle; margin-right: 12px; @@ -94,7 +94,7 @@ export default { &.collapse { .sidebar-logo { width: 44px; - height: 32px; + height: 44px; margin-right: 0px; } } diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 95b582b..582bb58 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -2123,7 +2123,6 @@ export default { type: "warning", }) .then(() => { - debugger; this.updateLoading = true; let query = { uuid: this.editQuery.uuid, diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index ceeae63..54294df 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -405,7 +405,6 @@ export default { }, initBusType() { - debugger let query = { code: this.orderFormData.invCode, }; diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index 790323c..de50d4f 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -564,7 +564,6 @@ export default { uploadHandleError() { }, uploadHandleSuccess(response, file, fileList) { - debugger; if (response.code === 20000) { this.inputQuery.licenseUrl = response.data.name; // this.onSubmit(); diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index cc5a34b..02e3792 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -2,7 +2,9 @@
-

平潭协和医院

+ + +

{{ title }}

医院UDI管理系统

@@ -121,6 +123,7 @@ import Verify from "vue2-verify"; import axios from "axios"; import Cookies from "js-cookie"; import {decrypt, encrypt} from "@/utils/jsencrypt"; +import {getTitleConfig} from "@/api/login"; export default { data() { @@ -157,6 +160,7 @@ export default { showDialog: false, // 显示dialog redirect: null, // 回调地址 hospName: "", + title: "福建省XXX医院" }; }, methods: { @@ -266,6 +270,11 @@ export default { } }); }, + getTitleConfig() { + getTitleConfig().then(res => { + this.title = res.data.title; + }); + }, }, components: { Verify, @@ -281,7 +290,7 @@ export default { axios.get("./config.json").then((res) => { this.hospName = res.data.hosp_name; }); - + this.getTitleConfig(); this.getCookie(); }, }; diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue index e41c02f..170e6e2 100644 --- a/src/views/supplier/company/basicCompanyproductDetail.vue +++ b/src/views/supplier/company/basicCompanyproductDetail.vue @@ -1100,7 +1100,6 @@ export default { type: "warning", }) .then(() => { - debugger this.updateLoading = true; let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid}; syncOnline(query) diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index b75ce5e..36455d0 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -534,7 +534,6 @@ export default { }, onResetintent() { - debugger; this.$router.push({ path: "", }); diff --git a/src/views/system/print/pdfTmpleateManage.vue b/src/views/system/print/pdfTmpleateManage.vue index 7db8666..20620e5 100644 --- a/src/views/system/print/pdfTmpleateManage.vue +++ b/src/views/system/print/pdfTmpleateManage.vue @@ -438,7 +438,6 @@ export default { previewPdf(row) { - debugger let query = {id: row.id,module:row.module}; demoPrint(query).then((response) => { //将pdf文件转换为url。