From df48216098748d6d66856237d1833f8d8eb068bc Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 22 八月 2023 14:58:50 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/stores/counter.js | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/screen_standard/src/stores/counter.js b/screen_standard/src/stores/counter.js
index 69cea87..c8dfe27 100644
--- a/screen_standard/src/stores/counter.js
+++ b/screen_standard/src/stores/counter.js
@@ -4,10 +4,6 @@
export const useCounterStore = defineStore('enterprise', {
state: () => {
- // 678
-<<<<<<< HEAD
- return { companyId: '', departId: '' };
-=======
return {
companyId: '8',
departId: '132',
@@ -17,7 +13,6 @@
prouserNum: 0, // 浠婃棩鐢熶骇浜烘暟
unqualifiedRate: 0 // 浠婃棩涓嶈壇鍝佺巼
};
->>>>>>> 8eebd3b823c2e477f949b7f06b6e972ec09327df
},
actions: {
--
Gitblit v1.9.3