From 766e7666f7c8d5bc5399c94d98a4eeb8e1bac382 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 19 Jun 2025 09:34:28 +0800
Subject: [PATCH] css
---
common/style/layout.css | 43 ++++++++++++++++---
common/style/reset.css | 78 +++++++++++++++++++++++++++++++++++
pages/modules/callmanage.vue | 58 +++++++-------------------
pages/modules/pointmanage.vue | 36 +---------------
pages/modules/taskmanage.vue | 6 +--
pages/modules/zlmanage.vue | 8 ++--
utils/getData2.js | 14 +++----
7 files changed, 144 insertions(+), 99 deletions(-)
diff --git a/common/style/layout.css b/common/style/layout.css
index 573a683..6801471 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -107,7 +107,7 @@ uni-button:after {
.zd_content {
width: 100%;
height: auto;
- padding: 92rpx 15rpx 82rpx 14rpx;
+ padding: 92rpx 15rpx 116rpx 14rpx;
}
.zd_wrapper {
width: 100%;
@@ -251,18 +251,19 @@ uni-button:after {
}
/** 提交栏 **/
+.filter_bar {
+ position: fixed;
+ bottom: 116rpx;
+ background: linear-gradient(46deg, #f9edc7, #fee29e);
+}
.submit-bar {
- display: flex;
- flex-wrap: wrap;
- justify-content: space-evenly;
- align-items: center;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
z-index: 200;
background-color: #fff;
- padding-top: 10rpx;
+ padding: 14rpx;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
}
.submit-button {
@@ -282,6 +283,36 @@ uni-button:after {
border: 1px solid #c9c9c9;
color: #fff;
}
+.button-default {
+ font-size: 34rpx;
+ line-height: 88rpx;
+ color: #ff6a00;
+ text-align: center;
+ letter-spacing: 4rpx;
+ padding: 0;
+ background-color: #fff;
+ border: 2rpx solid #ff6a00;
+ border-radius: 10rpx;
+}
+.button-primary {
+ display: grid;
+ place-items: center; /* 垂直和水平居中 */
+ font-size: 34rpx;
+ line-height: 34rpx;
+ height: 88rpx;
+ color: #fff;
+ text-align: center;
+ letter-spacing: 4rpx;
+ padding: 0;
+ background-color: #ff6a00;
+ border: 2rpx solid #ff6a00;
+ border-radius: 10rpx;
+}
+.button-info, .submit-button[disabled] {
+ background-color: #c9c9c9;
+ border: 2rpx solid #c9c9c9;
+ color: #fff;
+}
/** 下拉框 */
.uni-select__selector {
diff --git a/common/style/reset.css b/common/style/reset.css
index 8355389..2ca9103 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -40,4 +40,82 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+}
+.zd-row {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.zd-col-24 {
+ width: 100%;
+}
+.zd-col-23 {
+ width: 95.83333%
+}
+.zd-col-22 {
+ width: 91.66667%
+}
+.zd-col-21 {
+ width: 87.5%
+}
+.zd-col-20 {
+ width: 83.33333%
+}
+.zd-col-19 {
+ width: 79.16667%
+}
+.zd-col-18 {
+ width: 75%
+}
+.zd-col-17 {
+ width: 70.83333%
+}
+.zd-col-16 {
+ width: 66.66667%
+}
+.zd-col-15 {
+ width: 62.5%
+}
+.zd-col-14 {
+ width: 58.33333%
+}
+.zd-col-13 {
+ width: 54.16667%
+}
+.zd-col-12 {
+ width: 50%;
+}
+.zd-col-11 {
+ width: 45.83333%
+}
+.zd-col-10 {
+ width: 41.66667%
+}
+.zd-col-9 {
+ width: 37.5%
+}
+.zd-col-8 {
+ width: 33.33333%
+}
+.zd-col-7 {
+ width: 29.16667%
+}
+.zd-col-6 {
+ width: 25%
+}
+.zd-col-5 {
+ width: 20.83333%
+}
+.zd-col-4 {
+ width: 16.66667%
+}
+.zd-col-3 {
+ width: 12.5%
+}
+.zd-col-2 {
+ width: 8.33333%
+}
+.zd-col-1 {
+ width: 4.16667%
}
\ No newline at end of file
diff --git a/pages/modules/callmanage.vue b/pages/modules/callmanage.vue
index 0f9187d..18e9dd4 100644
--- a/pages/modules/callmanage.vue
+++ b/pages/modules/callmanage.vue
@@ -24,19 +24,15 @@
-
-
- 起始点
- {{sObj.device_name}}
-
-
- 目标点
- {{nObj.device_name}}
-
-
-
-
-
+
+ 起始点
+ {{sObj.device_name}}
+ 目标点
+ {{nObj.device_name}}
+
+
+
+
@@ -156,12 +152,7 @@
.zd_wrapper
padding 0 7rpx
.zd_content
- padding-bottom 152rpx
-.locate_block
- width 100%
-.locate_name
- position relative
- _wh(100%,48rpx)
+ padding-bottom 196rpx
.open_icon
position absolute
right 0
@@ -199,33 +190,12 @@
_fj(center)
overflow hidden
_font(28rpx,28rpx,#303133,500, center)
-.submit-bar
- justify-content space-between
- padding 10rpx
-.dot_item
- width 35%
- background-color #e5e5e5
- _fj(center,,column)
.p1
- _wh(100%, 52rpx)
- _font(30rpx,52rpx,,,center)
- border-bottom 1rpx solid #fff
- overflow hidden
+ _font(30rpx,80rpx,#855d15,700,center)
.p2
- _wh(100%, 80rpx)
- _fj(center)
- padding 0 5rpx
- _font(30rpx,40rpx,,,center)
- overflow hidden
- word-break break-all
-.btn_block
- _fj(,,column)
- align-content: flex-end
-.submit-button
- line-height 56rpx
- margin 0
- &:nth-child(1)
- margin-bottom 10rpx
+ _font(30rpx,55rpx,#fff,,center)
+ background: linear-gradient(46deg, #ef8900, #eb6600);
+ border-radius: 24rpx;
.state-wrap
_wh(100%, 60rpx)
margin-bottom 10rpx
diff --git a/pages/modules/pointmanage.vue b/pages/modules/pointmanage.vue
index bb84763..28a6182 100644
--- a/pages/modules/pointmanage.vue
+++ b/pages/modules/pointmanage.vue
@@ -161,7 +161,7 @@
.zd_wrapper
padding 0 7rpx
.zd_content
- padding-bottom 152rpx
+ padding-bottom 15rpx
.locate_block
width 100%
.locate_name
@@ -204,40 +204,6 @@
_fj(center)
overflow hidden
_font(28rpx,28rpx,#303133,500, center)
-.title_2
- _wh(100%, 40%)
- _fj(center)
- overflow hidden
- _font(24rpx,24rpx,#303133,500, center)
- opacity .69
- white-space: nowrap
-.submit-bar
- justify-content space-between
- padding 10rpx
-.dot_item
- width 35%
- background-color #e5e5e5
- _fj(center,,column)
-.p1
- _wh(100%, 52rpx)
- _font(30rpx,52rpx,,,center)
- border-bottom 1rpx solid #fff
- overflow hidden
-.p2
- _wh(100%, 80rpx)
- _fj(center)
- padding 0 5rpx
- _font(30rpx,40rpx,,,center)
- overflow hidden
- word-break break-all
-.btn_block
- _fj(,,column)
- align-content: flex-end
-.submit-button
- line-height 56rpx
- margin 0
- &:nth-child(1)
- margin-bottom 10rpx
.state-wrap
_wh(100%, 60rpx)
margin-bottom 10rpx
diff --git a/pages/modules/taskmanage.vue b/pages/modules/taskmanage.vue
index 76df826..583239f 100644
--- a/pages/modules/taskmanage.vue
+++ b/pages/modules/taskmanage.vue
@@ -33,9 +33,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/zlmanage.vue b/pages/modules/zlmanage.vue
index 4b9047a..c758368 100644
--- a/pages/modules/zlmanage.vue
+++ b/pages/modules/zlmanage.vue
@@ -37,10 +37,10 @@
-
-
-
-
+
+
+
+
diff --git a/utils/getData2.js b/utils/getData2.js
index bc39702..0c883de 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -59,27 +59,27 @@ export const queryPointByArea = (code) => request({
// let res = {
// result: [{
// device_code: '1',
-// device_name: 'JLDFJLLJ',
+// device_name: 'JLDFJLLJ1',
// source_device: 'FAL3LAA01',
// status: '1'
// }, {
// device_code: '12',
-// device_name: 'JLDFJLLJ'
+// device_name: 'JLDFJLLJ2'
// }, {
// device_code: '13',
-// device_name: 'JLDFJLLJ'
+// device_name: 'JLDFJLLJ3'
// }, {
// device_code: '14',
-// device_name: 'JLDFJLLJ'
+// device_name: 'JLDFJLLJ4'
// }, {
// device_code: '15',
-// device_name: 'JLDFJLLJ'
+// device_name: 'JLDFJLLJ5'
// }, {
// device_code: '16',
-// device_name: 'JLDFJLLJ'
+// device_name: 'JLDFJLLJ6'
// }, {
// device_code: '17',
-// device_name: 'JLDFJLLJ'
+// device_name: 'JLDFJLLJ7'
// }]
// }
// return res