diff --git a/App.vue b/App.vue
index cd005d6..d407fa3 100644
--- a/App.vue
+++ b/App.vue
@@ -5,10 +5,11 @@
export default {
onLaunch() {
console.log('App Launch');
-
+
},
onShow() {
+
console.log('App Show');
if (uni.getStorageSync('userInfo')) {
// 重置重连计数，确保立即重连
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index c788754..730b6a5 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -69,7 +69,7 @@
- 行政
+ 后勤
@@ -713,7 +713,7 @@
.weight-time {
font-weight: 800;
font-size: 70rpx;
- margin-bottom: 0rpx;
+ margin-top: 2vw;
position: relative;
margin-left: -50rpx;
}
@@ -729,6 +729,7 @@
font-size: 35rpx;
margin-right: 10rpx;
font-weight: 600;
+ margin-top: 2vw;
}
.server-bgc {
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index ec73b70..ed0e2a4 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -51,8 +51,8 @@
height: 3.8vw;
}
.logomain{
- width: 6.5vw;
- height: 6.5vw;
+ width: 6vw;
+ height: 6vw;
}
.cont{
width: 6vw;
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 61506af..9d515b3 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -630,13 +630,14 @@
.weight-time {
font-weight: 800;
font-size: 70rpx;
- margin-bottom: 0rpx;
+ margin-top: 30rpx;
position: relative;
margin-left: -50rpx;
}
.big-img {
margin-top: 40rpx;
+ margin-bottom: 40rpx;
width: 450rpx;
height: 450rpx;
z-index: 10;
diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue
index 5950bd5..24c5c5f 100644
--- a/pages/login/newanimationpage.vue
+++ b/pages/login/newanimationpage.vue
@@ -61,6 +61,12 @@
+
+ {{ fontnumber }}
+
+
+
+
@@ -85,7 +91,8 @@
:loop="true" />
-
+
@@ -257,6 +264,14 @@
const leftMenuArray = ref([])
const exitshow = ref(false);
const morerule = ref(false)
+ const fontnumber = ref(uni.getStorageSync('orgListName'))
+ const fontSize = computed(() => {
+ const len = (fontnumber.value || '').length
+ if (len === 10) return '1.3vw' // 恰好10字
+ if (len < 10) return '1.4vw' // 少于10字
+ if (len <= 15) return '1.2vw' // 11~15字
+ return '1.1vw' // 超过15字
+ })
// 生命周期钩子
onShow(() => {
zyupgrade.value?.check_update();
@@ -268,15 +283,15 @@
const filteredMenu = (index : number) => {
return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
}
- const ondoorarray =
- genPaths(
- '/static/index/warehouse/newindexhome/',
- 'gate',
- 5, // 张数
- 'png',
- 0, // 起始索引为 1
- false // 不补零
- )
+ const ondoorarray =
+ genPaths(
+ '/static/index/warehouse/newindexhome/',
+ 'gate',
+ 5, // 张数
+ 'png',
+ 0, // 起始索引为 1
+ false // 不补零
+ )
const doorarray =
genPaths(
'/static/index/warehouse/newindexhome/',
@@ -500,7 +515,7 @@
return `${base}/${prefix}${idx}.${ext}`
})
}
-
+
// // 当前坐标（px）
// const x = ref(77)
// const y = ref(60)
@@ -796,13 +811,42 @@
.unit {
width: 53vw;
height: 53vw;
- // background-color: red;
position: fixed;
top: -4vw;
left: 30vw;
z-index: 2;
}
+ .unit-text {
+ position: fixed;
+ bottom: 28.5vw;
+ left: 18vw;
+ z-index: 12;
+ display: inline-block;
+ transform-origin: left top;
+ /* 关键：左上角 */
+ transform: skewX(29deg) rotate(35deg) scaleY(1.2);
+ letter-spacing: -2px;
+ /* 负值 = 缩小 */
+ font-size: 1.2vw;
+ color: #0089FE;
+ }
+ .unit-image{
+ position: fixed;
+ bottom: 29.3vw;
+ left: 15.5vw;
+ z-index: 12;
+ display: inline-block;
+ transform-origin: left top;
+ /* 关键：左上角 */
+ transform: skewX(29deg) rotate(35deg) scaleY(1.2);
+ letter-spacing: -2px;
+ width: 2vw;
+ height: 2vw;
+ /* 负值 = 缩小 */
+
+ color: #0089FE;
+ }
.office {
width: 50vw;
height: 50vw;
@@ -863,20 +907,23 @@
width: 50%;
height: 50%;
}
- .door{
+
+ .door {
width: 17vw;
height: 16vw;
position: fixed;
bottom: 0vw;
left: 0vw;
}
- .ondoor{
+
+ .ondoor {
width: 5vw;
height: 6vw;
position: fixed;
bottom: -0.5vw;
left: 9vw;
}
+
// .tp {
// image {
// width: 100%;
diff --git a/static/index/warehouse/newindexhome/reception.png b/static/index/warehouse/newindexhome/reception.png
index d0734a0..c68aa1d 100644
Binary files a/static/index/warehouse/newindexhome/reception.png and b/static/index/warehouse/newindexhome/reception.png differ
diff --git a/static/red.png b/static/red.png
new file mode 100644
index 0000000..0be01d5
Binary files /dev/null and b/static/red.png differ
diff --git a/static/shouye/logo2.png b/static/shouye/logo2.png
index cfc035f..b2ca3ff 100644
Binary files a/static/shouye/logo2.png and b/static/shouye/logo2.png differ