diff --git a/src/style/order.scss b/src/style/order.scss
new file mode 100644
index 0000000..4645d69
--- /dev/null
+++ b/src/style/order.scss
@@ -0,0 +1,14 @@
+.orderMain{
+	.cardBox{
+		margin-bottom: 10px;
+		.headerView{
+			display: flex;justify-content: space-between;
+		}
+		.title{
+			margin-bottom: 10px;
+		}
+		.cardBody{
+			display: flex;flex-direction: column;
+		}
+	}
+}
diff --git a/src/style/style.scss b/src/style/style.scss
index c2eb288..70945ee 100644
--- a/src/style/style.scss
+++ b/src/style/style.scss
@@ -6,3 +6,4 @@
 @import 'home.scss';
 @import 'user.scss';
 @import 'docs.scss';
+@import "order.scss";
diff --git a/src/utils/request.js b/src/utils/request.js
index 5cbf460..b4832ee 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -33,8 +33,6 @@ let MessageBox_401_show = false
 // HTTP response 拦截器
 axios.interceptors.response.use(
 	(response) => {
-		// const contentDisposition = response.headers['Content-Disposition'];
-		// console.log(response,677)
 		const token = response.headers.authorization;
 		if (token) {
 			let reToken = token.replace(/Bearer /g, "");
@@ -81,41 +79,6 @@ axios.interceptors.response.use(
 
 	},
 	(error) => {
-		// if (error.response) {
-		// 	if (error.response.status == 404) {
-		// 		ElNotification.error({
-		// 			title: '请求错误',
-		// 			message: "Status:404，正在请求不存在的服务器记录！"
-		// 		});
-		// 	} else if (error.response.status == 500) {
-		// 		ElNotification.error({
-		// 			title: '请求错误',
-		// 			message: error.response.data.message || "Status:500，服务器发生错误！"
-		// 		});
-		// 	} else if (error.response.status == 401) {
-		// 		if(!MessageBox_401_show){
-		// 			MessageBox_401_show = true
-		// 			ElMessageBox.confirm('当前用户已被登出或无权限访问当前资源，请尝试重新登录后再操作。', '无权限访问', {
-		// 				type: 'error',
-		// 				closeOnClickModal: false,
-		// 				center: true,
-		// 				confirmButtonText: '重新登录',
-		// 				beforeClose: (action, instance, done) => {
-		// 					MessageBox_401_show = false
-		// 					done()
-		// 				}
-		// 			}).then(() => {
-		// 				router.replace({path: '/login'});
-		// 			}).catch(() => {})
-		// 		}
-		// 	} else {
-		// 		ElNotification.error({
-		// 			title: '请求错误',
-		// 			message: error.message || `Status:${error.response.status}，未知错误！`
-		// 		});
-		// 	}
-		// }
-
 		ElNotification.error({
 			title: '请求错误',
 			message: "请求服务器无响应！"
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 5ce8cfb..930b071 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -7,10 +7,10 @@
 			<el-input v-model="form.password" prefix-icon="el-icon-lock" clearable show-password :placeholder="$t('login.PWPlaceholder')"></el-input>
 		</el-form-item>
 		<el-form-item style="margin-bottom: 10px;">
-			<el-col :span="12">
-				<el-checkbox :label="$t('login.rememberMe')" v-model="form.autologin"></el-checkbox>
-			</el-col>
-			<el-col :span="12" class="login-forgot">
+<!--			<el-col :span="12">-->
+<!--				<el-checkbox :label="$t('login.rememberMe')" v-model="form.autologin"></el-checkbox>-->
+<!--			</el-col>-->
+			<el-col :span="24" class="login-forgot">
 				<router-link to="/reset_password">{{ $t('login.forgetPassword') }}？</router-link>
 			</el-col>
 		</el-form-item>
diff --git a/src/views/order/create-order.vue b/src/views/order/create-order.vue
index 872714a..a3a3c0f 100644
--- a/src/views/order/create-order.vue
+++ b/src/views/order/create-order.vue
@@ -2,24 +2,24 @@
 	<el-container>
 		<el-main>
 			<el-scrollbar>
-				<el-form :size="size">
+				<el-form :size="size" label-width="100px" :model="form">
 					<div class="boxMain">
 						<div class="title">工作时间</div>
 						<div class="boxCom">
-							<el-row :gutter="24">
-								<el-col :span="8">
+							<el-row>
+								<el-col :span="8" :lg="6">
 									<el-form-item label="创建时间">
-										<el-date-picker type="date" placeholder="创建时间"></el-date-picker>
+										<el-date-picker class="input" type="date" placeholder="请选择创建时间"></el-date-picker>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="PE确认时间">
-										<el-date-picker type="date" placeholder="创建时间"></el-date-picker>
+										<el-date-picker class="input" type="date" placeholder="请选择PE确认时间"></el-date-picker>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="过保时间">
-										<el-date-picker type="date" placeholder="创建时间"></el-date-picker>
+										<el-date-picker class="input" type="date" placeholder="请选择过保时间"></el-date-picker>
 									</el-form-item>
 								</el-col>
 							</el-row>
@@ -28,15 +28,15 @@
 					<div class="boxMain">
 						<div class="title">维保单号</div>
 						<div class="boxCom">
-							<el-row :gutter="24">
-								<el-col :span="8">
+							<el-row>
+								<el-col :span="8" :lg="6">
 									<el-form-item label="维修单ID">
-										<el-input type="text" placeholder="请输入维修单ID"></el-input>
+										<el-input class="input" type="text" placeholder="请输入维修单ID"></el-input>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="维修单号">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-input class="input" type="text" placeholder="请输入维修单号"></el-input>
 									</el-form-item>
 								</el-col>
 							</el-row>
@@ -45,37 +45,46 @@
 					<div class="boxMain">
 						<div class="title">维保工单信息</div>
 						<div class="boxCom">
-							<el-row :gutter="24">
-								<el-col :span="8">
+							<el-row>
+								<el-col :span="8" :lg="6">
 									<el-form-item label="维修单等级">
-										<el-input type="text" placeholder="请输入维修单ID"></el-input>
+										<el-input class="input" type="text" placeholder="请输入维修等级"></el-input>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="故障类型">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-select class="input" placeholder="请选择故障类型">
+											<el-option></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="故障内容">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-input class="input" type="text" placeholder="请输入维修单号"></el-input>
 									</el-form-item>
 								</el-col>
 							</el-row>
-							<el-row :gutter="24">
-								<el-col :span="8">
+							<el-row>
+								<el-col :span="8" :lg="6">
 									<el-form-item label="当前状态">
-										<el-input type="text" placeholder="请输入维修单ID"></el-input>
+										<el-select class="input" placeholder="请选择当前状态">
+											<el-option></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="维保等级">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-select class="input" placeholder="请选择维保等级">
+											<el-option></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="是否关机">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-select class="input" placeholder="请选择是否关机">
+											<el-option label="是" :value="1"></el-option>
+											<el-option label="否" :value="0"></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
 							</el-row>
@@ -84,49 +93,94 @@
 					<div class="boxMain">
 						<div class="title">维保工单信息</div>
 						<div class="boxCom">
-							<el-row :gutter="24">
-								<el-col :span="8">
+							<el-row>
+								<el-col :span="8" :lg="6">
 									<el-form-item label="机房城市">
-										<el-input type="text" placeholder="请输入维修单ID"></el-input>
+										<el-select class="input" placeholder="请选择机房城市">
+											<el-option></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="园区">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-select class="input" placeholder="请选择园区">
+											<el-option></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
 							</el-row>
-							<el-row :gutter="24">
-								<el-col :span="8">
+							<el-row>
+								<el-col :span="8" :lg="6">
 									<el-form-item label="机房/IDC">
-										<el-input type="text" placeholder="请输入维修单ID"></el-input>
+										<el-input class="input" type="text" placeholder="请输入机房/IDC"></el-input>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="机架位">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-input class="input" type="text" placeholder="请输入机架位"></el-input>
 									</el-form-item>
 								</el-col>
 							</el-row>
-							<el-row :gutter="24">
-								<el-col :span="8">
+							<el-row>
+								<el-col :span="8" :lg="6">
 									<el-form-item label="整机SN/Se">
-										<el-input type="text" placeholder="请输入维修单ID"></el-input>
+										<el-select class="input" placeholder="请选择整机SN/Se">
+											<el-option></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="整体厂商">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-input class="input" type="text" placeholder="请输入整体厂商"></el-input>
 									</el-form-item>
 								</el-col>
-								<el-col :span="8">
+								<el-col :span="8" :lg="6">
 									<el-form-item label="整体型号">
-										<el-input type="text" placeholder="请输入维修单号"></el-input>
+										<el-input class="input" type="text" placeholder="请输入整体型号"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<el-form-item label="部件SN/Sp">
+										<el-select class="input" placeholder="请选择部件SN/Se">
+											<el-option></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<el-form-item label="部件厂商">
+										<el-input class="input" type="text" placeholder="请输入部件厂商"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<el-form-item label="部件型号">
+										<el-input class="input" type="text" placeholder="请输入部件型号"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<el-form-item label="部件PN/Sp">
+										<el-input class="input" type="text" placeholder="请输入部件SN/Sp"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<el-form-item label="SLA截止时间">
+										<el-date-picker class="input" type="date" placeholder="请选择SLA截止时间"></el-date-picker>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<el-form-item label="剩余BD数">
+										<el-input class="input" type="text" placeholder="请输入剩余BD数"></el-input>
 									</el-form-item>
 								</el-col>
 							</el-row>
 						</div>
 					</div>
+					<div class="btnBox">
+						<el-button type="primary">保 存</el-button>
+					</div>
 				</el-form>
 			</el-scrollbar>
 		</el-main>
@@ -138,7 +192,29 @@ export default {
 	name: "create-order",
 	data(){
 		return{
-			size:"small"
+			size:"small",
+			form:{
+				maintenance_level: "234", // 维修等级
+				fault_type: "234", // 故障类型
+				fault_description: "234", // 故障描述
+				requires_shutdown: "234", // 是否需要关机
+				city: "234", // 机房城市
+				park_name: "234", // 园区名称
+				data_center_name: "234", // 机房/IDC名称
+				rack_position: "234", // 机架位置
+				device_sn: "234", // 整机SN
+				device_manufacturer: "234", // 整机厂商
+				device_model: "234", // 整机型号
+				component_serial_no: "234", // 部件序列号
+				component_manufacturer: "234", // 部件厂商
+				component_model: "234", // 部件型号
+				component_pn: "234", // 部件零件PN号
+				sla_expiration: "234", // SLA到期时间
+				bd_backup_count: "234", // 剩余BD数
+				pe_confirmation_time: "234", // PE确认时间
+				warranty_end_date: "234", // 保修期结束
+				maintenance_plan: "234" // 维保等级：1-铜牌；常量维护项
+			}
 		}
 	},
 	mounted() {
@@ -151,5 +227,26 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
+.boxMain{
+	border-bottom: 1px solid #f2f2f2;
+	padding: 10px 0 5px 0;
+	.title{
+		margin-bottom: 10px;
+	}
+	.boxCom{
+		.el-row{
+			.el-col{
+				padding: 0 10px;
+				::v-deep .input{
+					width: 100%;
+				}
+			}
+		}
+	}
+}
+.btnBox{
+	margin-top: 15px;
+	text-align: right;
+	padding: 0 10px;
+}
 </style>
diff --git a/src/views/order/order-info.vue b/src/views/order/order-info.vue
index 665b05d..0e7f98c 100644
--- a/src/views/order/order-info.vue
+++ b/src/views/order/order-info.vue
@@ -1,5 +1,158 @@
 <template>
-	<div></div>
+	<el-container>
+		<el-main class="orderMain">
+			<el-scrollbar>
+				<div class="cardBox">
+					<div class="headerView">
+						<div class="title">工单时间</div>
+						<div class="status">
+							<span class="name">当前状态：</span>
+							<span class="text">待审核</span>
+						</div>
+					</div>
+					<div class="cardBody">
+						<el-row>
+							<el-col :span="8" :lg="6">
+								<span class="label">创建时间：</span>
+								<span class="text">2024-03-27</span>
+							</el-col>
+							<el-col :span="8" :lg="6">
+								<span class="label">PE确认时间：</span>
+								<span class="text">2024-03-27</span>
+							</el-col>
+							<el-col :span="8" :lg="6">
+								<span class="label">过保时间：</span>
+								<span class="text">2024-03-27</span>
+							</el-col>
+						</el-row>
+					</div>
+				</div>
+				<div class="cardBox footerCard">
+					<div class="cardItem">
+						<div class="title">流程进度</div>
+						<div class="cardBody">
+							<el-steps style="" :active="2" align-center>
+								<el-step title="Step 1" description="Some description" />
+								<el-step title="Step 2" description="Some description" />
+								<el-step title="Step 3" description="Some description" />
+							</el-steps>
+						</div>
+					</div>
+					<div class="cardItem">
+						<div class="title">维保单号</div>
+						<div class="cardBody">
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<span class="label">维修单ID：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">维修单号：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+							</el-row>
+						</div>
+					</div>
+					<div class="cardItem">
+						<div class="title">维保工单信息</div>
+						<div class="cardBody">
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<span class="label">维修等级：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">故障类型：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">故障内容：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<span class="label">维保等级：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">是否关机：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+							</el-row>
+						</div>
+					</div>
+					<div class="cardItem">
+						<div class="title">部件信息</div>
+						<div class="cardBody">
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<span class="label">机房城市：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">园区：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<span class="label">机房：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">机架位：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<span class="label">整机SN：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">整机厂商：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">整机型号：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<span class="label">部件SN/Sp：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">部件厂商：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">部件型号：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="8" :lg="6">
+									<span class="label">部件PN/Sp：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">SLA截止时间：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+								<el-col :span="8" :lg="6">
+									<span class="label">剩余BD数：</span>
+									<span class="text">2024-03-27</span>
+								</el-col>
+							</el-row>
+						</div>
+					</div>
+				</div>
+			</el-scrollbar>
+		</el-main>
+	</el-container>
 </template>
 
 <script>
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index bb6dba6..0fee3dc 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -190,10 +190,7 @@ export default {
 		},
 		//查看
 		table_show(row){
-			this.dialog.show = true
-			this.$nextTick(() => {
-				this.$refs.showDialog.open('show').setData(row);
-			})
+			eventBus.$emit('tagClose','/order/order-info',{id:row.id});
 		},
 		//删除
 		async table_del(row){