From 8c16c0fdac9d895f8b53a8032f47cddfe8490ff9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 24 九月 2024 17:34:15 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master

---
 src/view/index.vue |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/view/index.vue b/src/view/index.vue
index 38dc5a4..d8bc62c 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -357,11 +357,11 @@
 			<el-col :span="24">
 				<el-card :body-style="{padding: '6px'}">
 					<ul>
-						<li @click="removeTab(activeIndex)" v-show="menuId!=0"><i class="el-icon-close"></i>鍏抽棴</li>
-						<li @click="allDel"><i class="el-icon-delete"></i>鍏抽棴鎵�鏈�</li>
-						<li @click="rightDel(activeIndex)"><i class="el-icon-d-arrow-right"></i>鍏抽棴鍙充晶椤电</li>
+						<li @click="removeTab(activeIndex)" v-show="menuId!=0" style="text-align: left;"><i class="el-icon-close"></i>鍏抽棴</li>
+						<li @click="allDel" style="text-align: left;"><i class="el-icon-delete"></i>鍏抽棴鎵�鏈�</li>
+						<li @click="rightDel(activeIndex)" style="text-align: left;"><i class="el-icon-d-arrow-right"></i>鍏抽棴鍙充晶椤电</li>
 						<el-divider></el-divider>
-						<li @click="refreshTable"><i class="el-icon-refresh"></i>鍒锋柊</li>
+						<li @click="refreshTable" style="text-align: left;"><i class="el-icon-refresh"></i>鍒锋柊</li>
 					</ul>
 				</el-card>
 			</el-col>
@@ -394,6 +394,7 @@
       </span>
     </el-dialog>
     <notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
+    <timer></timer>
 	</div>
 </template>
 
@@ -411,9 +412,10 @@
 	import menus from '../../static/js/menu.js'
 	import nullFace from '../view/404.vue'
   import notice from './notice.vue'
+  import timer from './timer.vue';
 	comObj['nullFace'] = nullFace
 	export default {
-		components: {...comObj,notice},
+		components: {...comObj,notice,timer},
 		data() {
 			return {
 				userName: "value",

--
Gitblit v1.9.3