From 81774cc59c247da160150cb934af472f9f6086a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 28 Mar 2022 05:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmMenu/XmMenuAdd.vue  | 4 ++--
 src/views/xm/core/xmMenu/XmMenuEdit.vue | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 24b09182..ef796386 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -10,7 +10,7 @@
 										<div  class="icon" :style="{backgroundColor: calcMenuLabel.color }">
 											<i :class="calcMenuLabel.icon"></i>
 										</div>  
-										{{calcMenuLabel.label}}名称
+										{{calcMenuLabel.label}}
 									</template>
 									<el-input v-model="addForm.seqNo" title="序号 如 1.1，1.2.3，1.3.2等" style="width:100%;" placeholder="如1.0 ， 1.1 ， 1.1.1等" ></el-input> 
 								</el-form-item>  
@@ -113,7 +113,7 @@
 								<el-radio   v-model="addForm.calcType"  label="2" placeholder="手工填报" :disabled="addForm.ntype==='1'">手工填报</el-radio>
 							</el-form-item> 
 							<el-form-item label="工时进度" prop="mactRate" >
-								<el-progress style="width:60%;" :stroke-width="26" :percentage="addForm.mactRate?addForm.mactRate:0"></el-progress>
+								<el-progress style="width:60%;" :text-inside="true" :stroke-width="15" :percentage="addForm.mactRate?addForm.mactRate:0"></el-progress>
  							</el-form-item> 
 							<el-form-item label="预估工期" prop="budgetHours">
 								<el-input-number :disabled="addForm.calcType!=='2' " style="width:200px;"  v-model="addForm.budgetHours"  :precision="2" :step="8" :min="0" placeholder="预计工期(小时)"></el-input-number> &nbsp;h
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 9d484e31..8213639c 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -9,9 +9,10 @@
 										<div  class="icon" :style="{backgroundColor: calcMenuLabel.color }">
 											<i :class="calcMenuLabel.icon"></i>
 										</div>  
-										{{calcMenuLabel.label}}名称
-									</template>
-									<el-input v-model="editForm.seqNo" title="序号 如 1.1，1.2.3，1.3.2等" style="width:100%;" placeholder="如1.0 ， 1.1 ， 1.1.1等" ></el-input> 
+										{{calcMenuLabel.label}}
+									</template> 
+										<el-input v-model="editForm.seqNo" title="序号 如 1.1，1.2.3，1.3.2等" style="width:100%;" placeholder="如1.0 ， 1.1 ， 1.1.1等" ></el-input> 
+  
 								</el-form-item>  
 							</el-col>
 							<el-col :span="18">
@@ -112,7 +113,7 @@
 								<el-radio   v-model="editForm.calcType"  label="2" placeholder="手工填报" :disabled="editForm.ntype==='1'">手工填报</el-radio>
 							</el-form-item> 
 							<el-form-item label="工时进度" prop="mactRate" >
-								<el-progress style="width:60%;" :stroke-width="26" :percentage="editForm.mactRate?editForm.mactRate:0"></el-progress>
+								<el-progress style="width:60%;" :text-inside="true" :stroke-width="15" :percentage="editForm.mactRate?editForm.mactRate:0"></el-progress>
  							</el-form-item> 
 							<el-form-item label="预估工期" prop="budgetHours">
 								<el-input-number :disabled="editForm.calcType!=='2'  " style="width:200px;"  v-model="editForm.budgetHours"  :precision="2" :step="8" :min="0" placeholder="预计工期(小时)"></el-input-number> &nbsp;h