修改国际化

imcs-ui/src/lang/zh/runCenter.js

@@ -108,11 +108,11 @@ export default {
 			chaOrder: '插单'
 		},
 		// 列表搜索表单名称
-		searchForm: {
+		searchForm: {			
 			customName: '客户名称',
 			orderNo: '订单编号',
 			deliveryTime: '交货期',
-			setCurrent: '设置当前管理的产线',
+			setCurrent: '设置产线运行模式',
 			setModel: '设置产线运行模式',
 			config: '产线运行配置',
 			updownConfig: '上下料工人配置',
@@ -308,6 +308,7 @@ export default {
 			product: '产品',
 			setCurrent: '设置当前管理产线为',
 			setModel: '产线模式',
+			areaName: '产线名称',
 			panseMenu: '暂停订单操作',
 			failOptions:'不合格品操作',
 			productConfig: '排产调度池',

imcs-ui/src/views/zuihou/machiningClient/touchScreen/Index.vue

@@ -40,7 +40,7 @@
 		      			</el-button>
 				  </span> 
 				  <span :span="2" style="margin-right: 5%; float:right;">
-                       <el-button plain type="primary" icon="el-icon-view" size="medium" >
+                       <el-button plain type="primary" icon="el-icon-view" size="medium" @click="navigator">
 		         			我的班表
 		      			</el-button>
 				  </span>	  
@@ -48,7 +48,7 @@
 
 			<el-tabs style="text-align: left;margin-top:25px;">
   				<el-tab-pane label="未完成">
-    				<span class="tabTitle" slot="label"><el-badge :value="taskCount" class="item"><i class="el-icon-date"></i> 未完成</el-badge> </span>					
+    				<span class="tabTitle" slot="label"><el-badge :value="taskCount" class="badge"><i class="el-icon-date"></i> 未完成</el-badge> </span>					
                     	<el-col :span="(index==0)? 12:8" :gutter="24" v-for="(item, index) in taskData.slice(0,3)" :key="item.id" :offset="(index==0)?0:1"  v-show="(item.status==0)?true:false"  :style="(index==0)?'zoom:1;min-width:300px;':'zoom:0.6;min-width:180px;'">
                               <el-card :gutter="24" class="box-card" style="margin:5px;" >
                                     <div class="card_content">
@@ -91,7 +91,9 @@
 						</el-col>				 					
   				</el-tab-pane>
   				 <el-tab-pane label="已完成">
-                    <span class="tabTitle" slot="label"><i class="el-icon-date"></i> 已完成</span>
+                    <span class="tabTitle" slot="label">						  
+						 <i class="el-icon-date"></i> 已完成						  
+					</span>
 				    <el-table
       					:data="finishData"
 						stripe  
@@ -223,6 +225,9 @@ export default {
 			this.finishData.push(item)
 			this.taskData.shift()
 
+		},
+		navigator(){
+			this.$router.push("/classScheduleMgr/classScheduleMgr")
 		}	
   	}
 }
@@ -296,4 +301,14 @@ export default {
 	.el-form-item {
 		margin-bottom: 0;
 	}
+	
+	.tabTitle >>> .el-badge {
+		position: relative;
+        display: inline-block;
+		vertical-align: baseline;
+	} 
+	.badge {
+	   margin-top: 10px;
+  	   margin-right: 20px;	
+	}
 </style>