This commit is contained in:
王丹 2024-09-19 15:26:06 +08:00
parent f28f389b17
commit a8721b3039
9 changed files with 137 additions and 96 deletions

View File

@ -15,13 +15,14 @@
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom" "navigationStyle": "custom"
// "navigationBarBackgroundColor": "#39ac4f"
} }
}, { }, {
"path": "pages/index-list", "path": "pages/index-list",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#39ac4f" // "navigationBarBackgroundColor": "#39ac4f"
"navigationStyle": "custom"
} }
}, },
{ {

View File

@ -1,32 +1,27 @@
<template> <template>
<!-- <u-navbar :safeAreaInsetTop="false" bgColor="#39ac4f" :autoBack="false" :leftIconSize="0"> <!-- <u-navbar :safeAreaInsetTop="false" bgColor="#39ac4f" :autoBack="false" :leftIconSize="0">
</u-navbar> --> </u-navbar> -->
<uni-nav-bar backgroundColor="#39ac4f" :border="false"></uni-nav-bar> <!-- <uni-nav-bar backgroundColor="#39ac4f" :border="false"></uni-nav-bar> -->
<uni-nav-bar :statusBar="true" :fixed="false" backgroundColor="#39ac4f" :border="false" color="#fff">
<block v-slot:left>
<view @click="openLand">选择地块</view>
</block>
<view>西安设备测试</view>
<block v-slot:right>
<view class="fixed">
<view align="right" class="iconfont icon-liebiao icon" @click="toList"></view>
<view align="right" class="iconfont icon-scan icon" @click="toQRCode"></view>
</view>
</block>
</uni-nav-bar>
<custom-select-land ref="refLand" :data="landList" @select=""></custom-select-land> <custom-select-land ref="refLand" :data="landList" @select=""></custom-select-land>
<view class="content"> <view class="content">
<view class="header-section"> <view class="header-section">
<view class="title">
<u-row>
<u-col span="3">
<view @click="openLand">选择地块</view>
</u-col>
<u-col span="6" align="center">
<text>西安设备测试</text>
</u-col>
<u-col span="3">
<view class="fixed">
<view align="right" class="iconfont icon-liebiao icon" @click="toList"></view>
<view align="right" class="iconfont icon-scan icon" @click="toQRCode"></view>
</view>
</u-col>
</u-row>
</view>
<u-row justify="space-between" gutter="10"> <u-row justify="space-between" gutter="10">
<u-col span="9"> <u-col span="8">
<u-search shape="square" :animation="true" :showAction="false"></u-search> <u-search shape="square" :animation="true" :showAction="false"></u-search>
</u-col> </u-col>
<u-col span="3"> <u-col span="4">
<view class="demo-layout bg-purple-light"> <view class="demo-layout bg-purple-light">
<u-checkbox-group placement="row"> <u-checkbox-group placement="row">
<u-checkbox :checked="false" label="工作(256)" labelColor="#ffffff"></u-checkbox> <u-checkbox :checked="false" label="工作(256)" labelColor="#ffffff"></u-checkbox>
@ -83,7 +78,7 @@
<view>E0000104</view> <view>E0000104</view>
</view> </view>
</u-col> </u-col>
<u-col span="4"> <u-col span="4" style="align-items: center;">
<view class="fixed"> <view class="fixed">
<view class="signal"> <view class="signal">
<view class="bar"></view> <view class="bar"></view>
@ -96,6 +91,11 @@
</view> </view>
</view> </view>
<text>(12)</text> <text>(12)</text>
<view class="battery-container">
<text>60</text>
<view class="battery-level battery-level-60">
</view>
</view>
</view> </view>
</u-col> </u-col>
<u-col span="5"> <u-col span="5">
@ -112,7 +112,7 @@
<view>E0000104</view> <view>E0000104</view>
</view> </view>
</u-col> </u-col>
<u-col span="4"> <u-col span="4" style="align-items: center;">
<view class="fixed"> <view class="fixed">
<view class="signal"> <view class="signal">
<view class="bar green"></view> <view class="bar green"></view>
@ -178,10 +178,10 @@
<view class="card-grey"> <view class="card-grey">
<view class="card-title"> <view class="card-title">
<u-row> <u-row>
<u-col span="3"> <u-col span="2">
<view><text class="font-green"></text>1-1</view> <view><text class="font-green"></text>1-1</view>
</u-col> </u-col>
<u-col span="4"> <u-col span="5">
<view class="fixed"> <view class="fixed">
<view class="battery-container"> <view class="battery-container">
<text>60</text> <text>60</text>
@ -202,17 +202,55 @@
</u-row> </u-row>
</view> </view>
<view class="control"> <view class="control">
<view class="buttons"> <u-row>
<u-button size="small" plain="true" text="大小尺寸"></u-button> <u-col span="3" style=" align-items: flex-end;">
</view> <view class="buttons">
<view class="valve"> <view class="btn fixed active">
<view class=""></view> <text></text>
<view class=""> <text>0.00</text>
<image src="../static/images/valves/valve3.png"></image> <view class="iconfont icon-suoding icon"></view>
</view> </view>
<view class=""></view>
</view> </view>
<view class="buttons"></view> </u-col>
<u-col span="6">
<view class="valve">
<view>
<view class="btn fixed">
<text>全开</text>
</view>
</view>
<view class="btn-img">
<view class="text">
<view>-99.63</view>
<view>-99.63</view>
<view>离线</view>
<view>-99.63</view>
<view>-99.63</view>
</view>
<image src="../static/images/valves/valve3.png" mode="widthFix">
</image>
</view>
<view>
<view class="btn fixed">
<text>全关</text>
</view>
</view>
</view>
</u-col>
<u-col span="3">
<view class="buttons">
<view class="btn fixed">
<text></text>
<text>0.00</text>
<view class="iconfont icon-suoding icon"></view>
</view>
</view>
</u-col>
</u-row>
</view> </view>
</view> </view>
</view> </view>
@ -278,24 +316,31 @@
display: none; display: none;
} }
// nav
::v-deep.uni-navbar__header-container {
align-items: center;
justify-content: center;
&>view {
font-size: 36rpx;
}
}
::v-deep.uni-navbar__header-btns-left {
font-size: 30rpx;
}
::v-deep.uni-navbar__header-btns-right .icon {
font-size: 44rpx;
margin-left: 10px;
}
.header-section { .header-section {
padding: 0px 10px 102px 10px; padding: 0px 10px 102px 10px;
background-color: #39ac4f; background-color: #39ac4f;
color: white; color: white;
border-radius: 0 0 30px 30px; border-radius: 0 0 30px 30px;
.title {
padding: 0px 0 15px 0;
text {
font-size: 36rpx;
}
.icon {
font-size: 44rpx;
margin-left: 20px;
}
}
::v-deep.u-search__content, ::v-deep.u-search__content,
::v-deep.u-search__content__input { ::v-deep.u-search__content__input {
@ -387,14 +432,11 @@
.u-row { .u-row {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
} }
.u-button { .u-button {
margin: 0 0 0 10px; margin: 0 0 0 5px;
} }
.jz-title { .jz-title {
@ -406,7 +448,6 @@
} }
text { text {
font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
} }
} }
@ -416,7 +457,6 @@
color: #999999; color: #999999;
.text { .text {
font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
} }
@ -496,7 +536,7 @@
// //
.battery-container { .battery-container {
margin: 0 10px; margin: 0 0 0 10px;
position: relative; position: relative;
width: 31px; width: 31px;
height: 16px; height: 16px;

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

@ -24,21 +24,24 @@
.u-button--square { .u-button--square {
border-radius: 5px !important; border-radius: 5px !important;
} }
.u-button--normal {
height: 28px !important;
}
.u-button--small { .u-button--small {
height: 25px !important; height: 25px !important;
} }
.u-button--success {
.u-button--success[data-v-5ce41ee6] {
background-color: #39ac4f !important; background-color: #39ac4f !important;
border-color: #39ac4f !important; border-color: #39ac4f !important;
} }
.u-button--plain{
background-color: transparent !important;
}
/* 卡片线 */
.u-collapse > .u-line{border: none !important;}
/* 列表 */ /* 列表 */
.u-collapse-item { .u-collapse-item > .u-line {
&>.u-line {
border-bottom: none !important; border-bottom: none !important;
}
} }
/* fixed */ /* fixed */
@ -47,7 +50,10 @@
align-items: center; align-items: center;
flex-direction: row; flex-direction: row;
} }
/* 按钮 */
.btn{ color: #39ac4f;padding: 0 5px; border: 1px solid #39ac4f; width: fit-content;height: 28px; border-radius: 5px;}
.btn text{margin-right:2px;}
.btn.active{background-color: #39ac4f;color: #fff;}
/* 字体颜色 */ /* 字体颜色 */
.font-red { .font-red {
color: #e60012; color: #e60012;
@ -70,35 +76,25 @@
box-shadow: 0 1px 9px rgb(209, 209, 209, 0.5); box-shadow: 0 1px 9px rgb(209, 209, 209, 0.5);
} }
.card-grey { .card-grey {background-color: #f3f3f3;
background-color: #f3f3f3; box-shadow: none;
} }
.card-grey { .card-grey .card-title {
.card-title { padding: 10px;
padding: 10px; border-bottom: 1px solid #dedede;
border-bottom: 1px solid #c7c7c7;
.icon {
color: #39ac4f;
}
.u-row {
margin-bottom: 0 !important;
}
}
.control {
display: flex;
justify-content: space-between;
align-items: center;
.buttons {
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-around;
align-items: center;
}
}
} }
.card-grey .card-title .icon {
color: #39ac4f;
}
.card-grey .card-title .u-row {
margin-bottom: 0 !important;
}
/* 首页阀门 */
.control {
padding: 10px;
}
.valve > view{display: flex;justify-content: center;}
.valve .btn-img{margin: 5px; position: relative;}