This commit is contained in:
王丹 2025-01-09 18:29:36 +08:00
parent bea8430045
commit 7e90c2e9b3
12 changed files with 648 additions and 11 deletions

View File

@ -25,7 +25,32 @@
}, {
"path": "pages/irrigation/index",
"style": {
"navigationBarTitleText": "轮灌"
"navigationBarTitleText": "轮灌",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/add/scheme",
"style": {
"navigationBarTitleText": "轮灌方案",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/details/taskdetails",
"style": {
"navigationBarTitleText": "任务详情",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/details/irrigationdetails",
"style": {
"navigationBarTitleText": "轮灌详情",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/rotationrecord",
"style": {
"navigationBarTitleText": "轮灌履历",
"navigationStyle": "custom"
}
}, {
"path": "pages/head/index",

View File

@ -990,8 +990,7 @@
}
.card {
margin: 0 0 10px;
::v-deep.uni-collapse {
padding: 0 10px;
border-radius: 10px;

View File

@ -0,0 +1,14 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="true" leftText="" @leftClick="" title="新增方案"></custom-nav-bar>
</template>
</custom-nav-bar>
</template>
<script>
</script>
<style>
</style>

View File

@ -0,0 +1,100 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="true" leftText="" @leftClick="" title="轮灌详情"></custom-nav-bar>
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false" :open="true">
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">轮灌组1</view>
</view>
<view class="title-r">
<uni-tag class="bg-green" :circle="true" text="轮灌中" />
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list" @click="rotationrecord" >
<view class="left">
<view><text>应浇灌时长</text><text>1:12:22</text></view>
<view><text>实际浇灌时长</text><text>1:12:11</text></view>
<view><text>开阀时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>关阀时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
</view>
<view class="right">
<view class="iconfont icon-you">
</view>
</view>
</view>
<view class="card-font">
<view>异常设备1</view>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false" >
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">轮灌组1</view>
</view>
<view class="title-r">
<uni-tag class="bg-red" :circle="true" text="轮灌中" />
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list" @click="" >
<view class="left">
<view><text>应浇灌时长</text><text>1:12:22</text></view>
<view><text>实际浇灌时长</text><text>1:12:11</text></view>
<view><text>开阀时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>关阀时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
</view>
<view class="right">
<view class="iconfont icon-you">
</view>
</view>
</view>
<view class="card-font">
<view>异常设备1</view>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
</template>
<script>
export default {
methods: {
//
rotationrecord() {
uni.navigateTo({
url: '/pages/irrigation/rotationrecord'
});
}
},
};
</script>
<style lang="scss" scoped>
.txt-list .left text:first-child {
width: 100px;
}
.card-font{color: #e60012;}
</style>

View File

@ -0,0 +1,90 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="true" leftText="" @leftClick="" title="任务详情"></custom-nav-bar>
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false" :open="true">
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">任务名称006</view>
</view>
<view class="title-r">
<uni-tag class="bg-green" :circle="true" text="轮灌中" />
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list" @click="irrigationdetails">
<view class="left">
<view><text>轮灌方案</text><text>全设备</text></view>
<view><text>起始组</text><text>外部程曦</text></view>
<view><text>开始时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>结束时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>是否调压</text><text></text></view>
</view>
<view class="right">
<view class="iconfont icon-you">
</view>
</view>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
<view class="flex-btn">
<uni-grid :column="4" :showBorder="false" :square="false">
<uni-grid-item>
<view class="iconfont icon-zz"></view>
<text class="text">终止</text>
</uni-grid-item>
<uni-grid-item>
<view class="iconfont icon-zanting"></view>
<text class="text">暂停</text>
</uni-grid-item>
<uni-grid-item>
<view class="iconfont icon-jixu"></view>
<text class="text">继续</text>
</uni-grid-item>
<uni-grid-item @click="irrigationdetails">
<view class="iconfont icon-xiangqing"></view>
<text class="text">详情</text>
</uni-grid-item>
</uni-grid>
</view>
</template>
<script>
export default {
methods: {
//
irrigationdetails() {
uni.navigateTo({
url: '/pages/irrigation/details/irrigationdetails'
});
}
},
};
</script>
<style lang="scss" scoped>
.flex-btn {width: 90%;
position: fixed;
bottom: 10px;
left: 5%;
background-color: #fff;
border-radius: 10px;
box-shadow: 0 1px 9px rgb(209, 209, 209, 0.5);
text-align: center;
padding: 10px 0;
}
.uni-grid-item__box .iconfont{color: #39ac4f;font-size: 2.3rem;}
</style>

View File

@ -1,8 +1,236 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="false" leftText="" @leftClick="" title="轮灌">
<template v-slot:right>
<view class="fixed">
<view align="right" class="iconfont icon-jia1 icon"></view>
</view>
</template>
</custom-nav-bar>
<!-- 选项卡 -->
<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
activeColor="#39ac4f"></uni-segmented-control>
<view class="content">
<view v-show="current === 0">
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false" :open="true">
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">任务名称006</view>
</view>
<view class="title-r">
<uni-tag class="bg-green" :circle="true" text="轮灌中" />
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list" @click="taskdetails" >
<view class="left">
<view><text>轮灌方案</text><text>全设备</text></view>
<view><text>起始值</text><text>外部程曦</text></view>
<view><text>开始时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>结束时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>是否调压</text><text></text></view>
</view>
<view class="right">
<view class="iconfont icon-you">
</view>
</view>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false">
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">任务名称006</view>
</view>
<view class="title-r">
<uni-tag class="bg-orange" :circle="true" text="暂停" />
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list">
<view class="left">
<view><text>轮灌方案</text><text>全设备</text></view>
<view><text>起始值</text><text>外部程曦</text></view>
<view><text>开始时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>结束时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>是否调压</text><text></text></view>
</view>
<view class="right">
<view class="iconfont icon-you">
</view>
</view>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false">
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">任务名称006</view>
</view>
<view class="title-r">
<uni-tag class="bg-red" :circle="true" text="终止" />
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list">
<view class="left">
<view><text>轮灌方案</text><text>全设备</text></view>
<view><text>起始组</text><text>外部程曦</text></view>
<view><text>开始时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>结束时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>是否调压</text><text></text></view>
</view>
<view class="right">
<view class="iconfont icon-you">
</view>
</view>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
</view>
<view v-show="current === 1">
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false" :open="true">
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">方案名称006</view>
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list">
<view class="left">
<view><text>轮灌组数量</text><text>5</text></view>
<view><text>压力</text><text>0.2</text></view>
</view>
<view class="left">
<view><text>总时长</text><text>10</text></view>
</view>
<view class="right">
<view class="iconfont icon-you">
</view>
</view>
</view>
<view class="card-font">
<u-button type="success" size="mini" text="启用" />
<u-button type="success" size="mini" text="编辑" />
<u-button type="success" size="mini" text="禁用" />
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false">
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">方案名称006</view>
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list">
<view class="left">
<view><text>轮灌组数量</text><text>5</text></view>
<view><text>压力</text><text>0.2</text></view>
</view>
<view class="left">
<view><text>总时长</text><text>10</text></view>
</view>
<view class="right">
<view class="iconfont icon-you">
</view>
</view>
</view>
<view class="card-font">
<u-button class="bg-red" type="success" size="mini" text="禁用" />
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
items: ['轮灌详情', '轮灌方案'],
current: 0
};
},
methods: {
onClickItem(e) {
if (this.current != e.currentIndex) {
this.current = e.currentIndex;
}
},
//
taskdetails() {
uni.navigateTo({
url: '/pages/irrigation/details/taskdetails'
});
}
},
};
</script>
<style>
<style lang="scss" scoped>
//
.segmented-control {
background-color: #fff;
}
.segmented-control__item--text {
font-weight: bold;
}
::v-deep .segmented-control__text {
font-size: 16px;
}
</style>

View File

@ -0,0 +1,41 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="true" leftText="" @leftClick="" title="轮灌履历"></custom-nav-bar>
<view class="card">
<uni-collapse>
<uni-collapse-item title-border="none" :border="false" :show-arrow="false" :open="true">
<template v-slot:title>
<view class="cards-title">
<view>
<view class="text">2-1</view>
<uni-tag class="bg-green" :circle="true" text="①开" />
</view>
<view class="title-r">
<view>F0003001</view>
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list" @click="rotationrecord" >
<view class="left">
<view><text>开阀时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>关阀时间</text><text>2025-01-05&nbsp;&nbsp;10:11</text></view>
<view><text>运行时长</text><text>1:12:22</text></view>
</view>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
</template>
<script>
</script>
<style lang="scss" scoped>
.title-r{font-weight: bold;}
</style>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -14,6 +14,20 @@
/>
<missing-glyph />
<glyph glyph-name="zanting" unicode="&#58985;" d="M512 805.875C279.96875 805.875 90.125 616.03125 90.125 384s189.84375-421.875 421.875-421.875 421.875 189.84375 421.875 421.875S744.03125 805.875 512 805.875zM464.539063 209.976563c0-15.820313-15.820313-26.367188-36.914063-26.367188-21.09375 0-36.914063 10.546875-36.914063 26.367188L390.710938 558.023438c0 15.820313 15.820313 26.367188 36.914062 26.367187 21.09375 0 36.914063-10.546875 36.914063-26.367188L464.539063 209.976563zM638.5625 209.976563c0-15.820313-15.820313-26.367188-36.914063-26.367188-21.09375 0-36.914063 10.546875-36.914062 26.367188L564.734375 558.023438c0 15.820313 15.820313 26.367188 36.914063 26.367187 21.09375 0 36.914063-10.546875 36.914062-26.367188L638.5625 209.976563z" horiz-adv-x="1024" />
<glyph glyph-name="xiangqing" unicode="&#58954;" d="M346.855654 8.905126M512 817.162813c-239.257373 0-433.217388-193.960015-433.217388-433.217388s193.960015-433.217388 433.217388-433.217388c239.257373 0 433.108238 193.960015 433.108238 433.217388S751.257373 817.162813 512 817.162813zM706.942367 167.391306L317.057633 167.391306 317.057633 600.608694l389.884734 0L706.942367 167.391306zM382.002038 492.331634l259.886773 0 0-43.332654-259.886773 0 0 43.332654ZM382.002038 405.666326l259.886773 0 0-43.332653-259.886773 0 0 43.332653ZM382.002038 319.00102l259.886773 0 0-43.332654-259.886773 0 0 43.332654Z" horiz-adv-x="1024" />
<glyph glyph-name="zz" unicode="&#59296;" d="M92 384A420 420 0 1 0 932 384a420 420 0 0 0-840 0zM743 549l-66 66-396-396 66-66 396 396z" horiz-adv-x="1024" />
<glyph glyph-name="xq" unicode="&#58930;" d="M512 805.875C745.01 805.875 933.875 617.01 933.875 384S745.01-37.875 512-37.875 90.125 150.99 90.125 384 278.99 805.875 512 805.875zM360.125 299.625v-33.75a16.875 16.875 0 0 0 0 33.75z m0-67.5a67.5 67.5 0 0 1 67.5-67.5h236.25a67.5 67.5 0 0 1 67.5 67.5V535.875a67.5 67.5 0 0 1-67.5 67.5h-236.25a67.5 67.5 0 0 1-67.5-67.5 50.625 50.625 0 0 1 0-101.25 50.625 50.625 0 0 1 0-101.25 50.625 50.625 0 0 1 0-101.25z m0 168.75v-33.75a16.875 16.875 0 0 0 0 33.75z m0 67.5a16.875 16.875 0 0 0 0 33.75v-33.75z m84.375 33.75h202.5a16.875 16.875 0 0 0 0-33.75h-202.5a16.875 16.875 0 0 0 0 33.75z m0-101.25h202.5a16.875 16.875 0 0 0 0-33.75h-202.5a16.875 16.875 0 0 0 0 33.75z m0-101.25h202.5a16.875 16.875 0 0 0 0-33.75h-202.5a16.875 16.875 0 0 0 0 33.75z" horiz-adv-x="1024" />
<glyph glyph-name="jixu" unicode="&#59136;" d="M512 805.875C279.002656 805.875 90.125 616.997344 90.125 384s188.877656-421.875 421.875-421.875c232.993125 0 421.875 188.877656 421.875 421.875S744.997344 805.875 512 805.875zM393.955156 243.473438c0-21.389063-17.82-38.740781-39.787031-38.740782-21.979688 0-39.787031 17.3475-39.787031 38.740782V524.535c0 21.376406 17.807344 38.723906 39.787031 38.723906 21.967031 0 39.787031-17.343281 39.787031-38.723906v-281.061562z m365.263594 127.081406l-252.871875-159.814688a15.824531 15.824531 0 0 0-24.240938 13.365V543.831563a15.795 15.795 0 0 0 24.245157 13.343906l252.859218-159.869531a15.849844 15.849844 0 0 0 0.008438-26.751094z" horiz-adv-x="1024" />
<glyph glyph-name="weibd" unicode="&#59101;" d="M349.35752 482.35752l68.14248-68.14336-184.82168-184.82168A99.51416 99.51416 0 1 1 373.46416 88.608398l40.17832 40.178321 68.14336-68.14336-40.17832-40.17832a195.943359 195.943359 0 0 0-277.07168 277.07168l184.82168 184.821679z m340.26416-197.87168l-68.20752 68.14248 184.82168 184.886719a99.51416 99.51416 0 1 1-140.78584 140.720801l-40.11416-40.17832-68.20752 68.14248 40.1792 40.24248a195.943359 195.943359 0 1 0 277.0708-277.13496l-184.693359-184.82168z m-306.19336 458.22832l92.57168 27 196.71416-771.42832-92.57168-27-196.71416 771.42832z" horiz-adv-x="1024" />
<glyph glyph-name="wbd" unicode="&#59244;" d="M473.28125 109.78125H362.375C212.5625 109.78125 90.96875 231.28125 90.96875 381.1875s121.5 271.40625 271.40625 271.40625v-136.875C288.21875 515.71875 227.9375 455.34375 227.9375 381.1875s60.28125-134.53125 134.4375-134.53125h110.8125v-136.875zM705.40625 109.78125v136.875c38.4375 0 54.1875 15.75 63.46875 29.53125 15.5625 22.875 24.1875 60.1875 24.1875 105 0 74.15625-60.375 134.53125-134.53125 134.53125H616.0625v136.875h42.46875c149.8125 0.09375 271.3125-121.3125 271.3125-271.125v-0.28125c0-74.15625-16.125-135.375-47.90625-182.0625-19.40625-28.40625-44.15625-50.625-73.59375-65.8125-30.1875-15.5625-64.875-23.53125-102.9375-23.53125zM794.84375-32.34375c-21.84375 0-42.375 10.3125-55.21875 27.9375L224.375 697.6875c-22.40625 30.46875-15.75 73.3125 14.71875 95.625s73.3125 15.75 95.625-14.71875l515.15625-702c22.40625-30.46875 15.84375-73.3125-14.625-95.625-11.71875-8.625-25.875-13.3125-40.40625-13.3125z" horiz-adv-x="1024" />
<glyph glyph-name="dingwei" unicode="&#59648;" d="M960 416h-65.6C879.2 602.4 730.4 751.2 544 766.4V832h-64v-65.6C293.6 751.2 144.8 602.4 129.6 416H64v-64h65.6c15.2-186.4 164-335.2 350.4-350.4v-65.6h64v65.6c186.4 15.2 335.2 164 350.4 350.4h65.6v64z m-448-352c-176.8 0-320 143.2-320 320s143.2 320 320 320 320-143.2 320-320-143.2-320-320-320z m128 320c0-70.4-57.6-128-128-128s-128 57.6-128 128 57.6 128 128 128 128-57.6 128-128z" horiz-adv-x="1024" />
<glyph glyph-name="jia1" unicode="&#58957;" d="M441.6875 454.3125H160.613282A70.382813 70.382813 0 0 1 90.125 384c0-39.09375 31.570313-70.3125 70.488282-70.3125H441.6875v-281.074218c0-38.953125 31.464844-70.488282 70.3125-70.488282 39.09375 0 70.3125 31.570313 70.3125 70.488282V313.6875h281.074218A70.382813 70.382813 0 0 1 933.875 384c0 39.09375-31.570313 70.3125-70.488282 70.3125H582.3125V735.386718A70.382813 70.382813 0 0 1 512 805.875c-39.09375 0-70.3125-31.570313-70.3125-70.488282V454.3125z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

View File

@ -16,23 +16,35 @@
background-color: #39ac4f !important;
}
.uni-tag {
font-weight: normal !important;
font-size: 0.6rem !important;
border: none !important;
}
/* 按钮 */
.u-button {
width: fit-content !important;
}
.u-button--square {
border-radius: 5px !important;
}
.u-button--large {width: 100% !important;
.u-button--large {
width: 100% !important;
height: 38px !important;
}
.u-button--normal {
height: 28px !important;
}
.u-button--small {
height: 25px !important;
}
.u-button--success {
background-color: #39ac4f !important;
border-color: #39ac4f !important;
@ -68,6 +80,7 @@
background-color: #39ac4f;
color: #fff;
}
.btn.activeing {
background-color: #39ac4f;
color: #fff;
@ -86,7 +99,31 @@
color: #39ac4f;
}
/* 背景颜色 */
.bg-red {
border-color: #d43030 !important;
background-color: #d43030 !important;
}
.bg-orange {
background-color: #e58626 !important;
}
.bg-green {
background-color: #39ac4f !important;
}
/* 卡片 */
.card .uni-collapse,
.card .uni-list,
.card .uni-list-item {
background-color: transparent !important;
}
::v-deep .card .uni-collapse-item__wrap {
border-radius: 0 0 10px 10px;
}
.card,
.card-grey {
margin-bottom: 10px;
@ -94,7 +131,7 @@
border-radius: 10px;
box-shadow: 0 1px 9px rgb(209, 209, 209, 0.5);
}
.card{margin: 10px 10px 5px;}
.card-grey {
background-color: #f3f3f3;
box-shadow: none;
@ -113,3 +150,64 @@
margin-bottom: 0 !important;
}
.cards-title {
padding: 10px;
border-bottom: 1px solid #dedede;
display: flex;
justify-content: space-between;
}
.cards-title view {
display: flex;
align-items: center;
}
.cards-title view .text {
margin-right: 10px;
color: #39ac4f;
font-weight: bold;
}
.cards-title .title-r .uni-tag {
margin-left: 5px;
}
.cards-content {
padding: 10px;
}
.txt-list {
display: flex;
justify-content: space-between;
}
.txt-list .left {
color: #666;
line-height: 24px;
}
.txt-list .left text:first-child {
width: 80px;
display: inline-block;
}
.txt-list .right {
align-content: center;
height: inherit;
}
.right .iconfont {
color: #bbb;
}
.card-font {
height: auto;
overflow: hidden;
margin: 10px 0 0 0;
}
.card-font uni-button {
display: inline-flex;
float: right;
margin-left: 10px;
}