From 38e2fda87c28fa7128d971e7afac1b05a06872d6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期日, 31 三月 2024 13:54:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Caching/caching.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/mm/caching/caching.vue b/UI-Project/src/views/Caching/caching.vue
similarity index 97%
rename from UI-Project/src/views/mm/caching/caching.vue
rename to UI-Project/src/views/Caching/caching.vue
index 98c458a..b166446 100644
--- a/UI-Project/src/views/mm/caching/caching.vue
+++ b/UI-Project/src/views/Caching/caching.vue
@@ -13,7 +13,7 @@
long: '1005',
wide: '183.6',
thick: '1991',
- type: '寰呰瘑鍒�',
+ type: '1200',
typea: '1',
},
{
@@ -22,7 +22,7 @@
wide: '183',
thick: '191',
typea: '1',
- type: '寰呰瘑鍒�'
+ type: '1200'
},
{
id: '2',
@@ -30,7 +30,7 @@
wide: '183',
thick: '191',
typea: '1',
- type: '寰呰瘑鍒�'
+ type: '1200'
},
{
id: '2',
@@ -38,7 +38,7 @@
wide: '183',
thick: '191',
typea: '1',
- type: '寰呰瘑鍒�'
+ type: '1200'
},
{
id: '2',
@@ -737,7 +737,7 @@
</div>
<div id="awatch">
- <img src="../../../assets/woshihuancun.png" alt="" style="width: 70%;height: 100%;margin-left: 160px;">
+ <img src="../../assets/woshihuancun.png" alt="" style="width: 60%;height: 90%;margin-left: 260px;margin-top: 20px;">
</div>
</template>
@@ -760,6 +760,7 @@
margin-left: 28%;
}
#awatch{
- height: 450px;
+ height: 460px;
+ /* margin-top: -60px; */
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0