From e0a7b6146f74f1680231ff9c508990220a166d97 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 01 四月 2024 09:49:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/UnLoadGlass.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/sd/customer/Customer.vue b/UI-Project/src/views/UnLoadGlass/UnLoadGlass.vue
similarity index 75%
rename from UI-Project/src/views/sd/customer/Customer.vue
rename to UI-Project/src/views/UnLoadGlass/UnLoadGlass.vue
index bb247e9..823a521 100644
--- a/UI-Project/src/views/sd/customer/Customer.vue
+++ b/UI-Project/src/views/UnLoadGlass/UnLoadGlass.vue
@@ -10,13 +10,13 @@
<template>
<div id="main-div">
- <div id="div-title">
+ <!-- <div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
- <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/customer/selectCustomer' }">瀹㈡埛棣栭〉</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/customer/CreateCustomer' }">鏂板</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/UnLoadGlass/loadmachinerack' }">涓嬬墖绠＄悊</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/UnLoadGlass/loadmachinerack' }">涓嬬墖淇℃伅</el-breadcrumb-item>
<el-breadcrumb-item v-show="false" :to="{ path: '/main/product/test1' }">娴嬭瘯</el-breadcrumb-item>
</el-breadcrumb>
- </div>
+ </div> -->
<div id="main-body">
<router-view />
@@ -37,14 +37,14 @@
margin-top: -5px;
margin-left: 1rem;
}
-#searchButton1{
+/* #searchButton1{
//margin-left: 10rem;
-}
+} */
/*main-body鏍峰紡*/
#main-body{
width: 100%;
height: 95%;
- margin-top: 1%;
+ /* margin-top: 1%; */
}
#select{
margin-left:0.5rem;
--
Gitblit v1.8.0