From abe84ba77a867d4f755199021f9b6e10e3af971b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 七月 2024 16:29:27 +0800
Subject: [PATCH] 合并冲突

---
 src/components/view/b1-inspection-order.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 14d13cc..d23da41 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -156,7 +156,7 @@
 		<div style="width: 100%;height: 100%;" v-if="active == 0">
 			<div>
 				<el-row class="title">
-					<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
+					<el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屼笅鍗�</el-col>
 					<el-col :span="12" style="text-align: right;">
             <el-button size="medium" type="primary" @click="print">鏍囩鎵撳嵃</el-button>
 						<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>

--
Gitblit v1.9.3