diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 603509b..af54882 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -26,6 +26,9 @@
布局设置
+
+ 下载插件
+
退出登录
@@ -52,6 +55,7 @@ import useAppStore from '@/store/modules/app'
import useUserStore from '@/store/modules/user'
import useSettingsStore from '@/store/modules/settings'
import { listhospital } from '@/api/regional/dict/hospital'
+import { downloadPrintSetup } from '@/utils/printHelper'
const appStore = useAppStore()
const userStore = useUserStore()
const settingsStore = useSettingsStore()
@@ -67,6 +71,10 @@ function handleCommand(command: string): void {
case "setLayout":
setLayout()
break
+ case "downExe":
+ // 下载插件exe
+ downloadPrintSetup()
+ break
case "logout":
logout()
break
@@ -75,6 +83,7 @@ function handleCommand(command: string): void {
}
}
+
function logout(): void {
ElMessageBox.confirm('确定注销并退出系统吗?', '提示', {
confirmButtonText: '确定',
diff --git a/src/utils/printHelper.ts b/src/utils/printHelper.ts
index 889729b..32f3b91 100644
--- a/src/utils/printHelper.ts
+++ b/src/utils/printHelper.ts
@@ -46,4 +46,5 @@ export const showPrintServiceError = async (msg: string) => {
//触发打印服务安装包下载
export const downloadPrintSetup = () => {
Download.name('lisprintsetup.exe', false)
+ Download.name('Gprinter_12.4.0.exe', false)
}
\ No newline at end of file
diff --git a/src/views/liswork/Issueorder/index.vue b/src/views/liswork/Issueorder/index.vue
index f6a4919..6cef3e9 100644
--- a/src/views/liswork/Issueorder/index.vue
+++ b/src/views/liswork/Issueorder/index.vue
@@ -11,9 +11,9 @@
- 保存
新增
- 打印
+ 保存
+ 打印条码
作废
diff --git a/src/views/regional/statistics/overview/css/index.css b/src/views/regional/statistics/overview/css/index.css
index ec7581f..983a1af 100644
--- a/src/views/regional/statistics/overview/css/index.css
+++ b/src/views/regional/statistics/overview/css/index.css
@@ -216,7 +216,7 @@
align-items: center;
color: #fff;
font-size: 0.9375rem;
- height: 2.8125rem;
+ height: 2.5rem;
}
.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn .liIn_left {
diff --git a/src/views/regional/statistics/overview/index.vue b/src/views/regional/statistics/overview/index.vue
index 5c7143d..4a7e805 100644
--- a/src/views/regional/statistics/overview/index.vue
+++ b/src/views/regional/statistics/overview/index.vue
@@ -126,7 +126,7 @@
import * as echarts from 'echarts';
import { Vue3SeamlessScroll } from 'vue3-seamless-scroll'
import { getallcount } from '@/api/regional'
-
+import { comDict } from "@/utils/dict";
const sourceMonth = ref([
{ name: '区域机构', num: 0, unit: '家', pre: 'jgs' },
{ name: '检验人数', num: 0, unit: '人', pre: 'rs' },
@@ -141,12 +141,7 @@ const sourceYear = ref([
])
-const dayCounts = ref([
- { dict_name: '检验申请', sl: 0, percent: '0%' },
- { dict_name: '标本送检', sl: 0, percent: '0%' },
- { dict_name: '上机检测', sl: 0, percent: '0%' },
- { dict_name: '结果审核', sl: 0, percent: '0%' },
-])
+const dayCounts = ref([])
const listData: any = ref([])
@@ -397,7 +392,6 @@ const handleResize = () => {
echarts3Instance.resize();
}
}
-
const getDataInfo = () => {
getallcount().then((res) => {
// 更新当月累计数据
@@ -413,7 +407,7 @@ const getDataInfo = () => {
// 当日送检样本情况
dayCounts.value.forEach(element => {
res.data.regStatStatus.forEach((item: any) => {
- if (element.dict_name === item.dict_name) {
+ if (element.dict_name == item.dict_name) {
element.sl = item.sl
element.percent = item.percent
}
@@ -425,7 +419,18 @@ const getDataInfo = () => {
}
onMounted(() => {
- getDataInfo()
+ comDict('ZT').then((res) => {
+ dayCounts.value = res.ZT.value.map((item: any) => {
+ return {
+ dict_name: item.label,
+ sl: 0,
+ percent: '0%'
+ }
+ })
+ getDataInfo()
+ })
+
+
window.addEventListener('resize', handleResize);
})