JSY/jsy-app
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://8.140.50.127:3000/JSY/jsy-app

Browse Source
This commit is contained in:
Iruka 2025-01-13 12:19:12 +08:00
commit abdf986d91
9 changed files with 479 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pages.json
View File

@ -34,6 +34,12 @@
"navigationBarTitleText": "轮灌方案",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/add/addtask",
"style": {
"navigationBarTitleText": "轮灌任务",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/details/taskdetails",
"style": {
@ -46,6 +52,18 @@
"navigationBarTitleText": "轮灌详情",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/irrigationgroup",
"style": {
"navigationBarTitleText": "轮灌组列表",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/config",
"style": {
"navigationBarTitleText": "轮灌组配置",
"navigationStyle": "custom"
}
}, {
"path": "pages/irrigation/rotationrecord",
"style": {

77
pages/irrigation/add/addtask.vue Normal file
View File

@ -0,0 +1,77 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="true" leftText="" @leftClick="" title="新增任务"></custom-nav-bar>
<uni-forms ref="baseForm" :modelValue="baseFormData">
<uni-forms-item label="任务名称" required>
<uni-easyinput v-model="baseFormData.name" placeholder="请输入任务名称" />
</uni-forms-item>
<uni-forms-item label="轮灌方案" required>
<view class="select" @click="openPopup">
<view>请选择轮灌方案</view>
</view>
</uni-forms-item>
<uni-forms-item label="起始组" required>
<view class="select" @click="openPopup">
<view>请选择起始组</view>
</view>
</uni-forms-item>
<uni-forms-item label="自动调压" required>
<uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" />
</uni-forms-item>
<view class="form-btn">
<u-button type="success" size="large" text="立即执行" @click="" />
<u-button size="large" text="取消" @click="" />
</view>
</uni-forms>
<!-- 底部弹出框 -->
<uni-popup ref="popup" type="bottom">
<view class="popup-content">
<text>这是底部弹出框的内容。</text>
</view>
</uni-popup>
</template>
<script>
export default {
data() {
return {
// 基础表单数据
baseFormData: {
sex: 2,
},
// 单选数据源
sexs: [{
text: '是',
value: 0
}, {
text: '否',
value: 1
}],
}
},
methods: {
openPopup() {
this.$refs.popup.open();
},
closePopup() {
this.$refs.popup.close();
}
}
}
</script>
<style lang="scss" scoped>
body{background-color: #fff;}
.popup-content {
padding: 20px;
background-color: #fff;
text-align: center;
}
</style>

60
pages/irrigation/add/scheme.vue
View File

@ -1,14 +1,64 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="true" leftText="" @leftClick="" title="新增方案"></custom-nav-bar>
</template>
</custom-nav-bar>
<uni-forms ref="baseForm" :modelValue="baseFormData">
<uni-forms-item label="任务名称" required>
<uni-easyinput v-model="baseFormData.name" placeholder="请输入任务名称" />
</uni-forms-item>
<uni-forms-item label="总时长" required>
<uni-easyinput v-model="baseFormData.name" placeholder="请输入总时长" />
</uni-forms-item>
<uni-forms-item label="轮灌组" required>
<uni-easyinput v-model="baseFormData.name" placeholder="请输入轮灌组数量" />
</uni-forms-item>
<uni-forms-item label="自动调压" required>
<view style="display: flex;gap: 10px;">
<uni-easyinput v-model="baseFormData.name" placeholder="最小压" />
<uni-easyinput v-model="baseFormData.name" placeholder="最大压" />
</view>
</uni-forms-item>
<view class="form-btn">
<u-button type="success" size="large" text="下一步" @click="" />
<u-button size="large" text="取消" @click="" />
</view>
</uni-forms>
<!-- 底部弹出框 -->
<uni-popup ref="popup" type="bottom">
<view class="popup-content">
<text>这是底部弹出框的内容。</text>
</view>
</uni-popup>
</template>
<script>
export default {
data() {
return {
// 基础表单数据
baseFormData: {
},
}
},
methods: {
openPopup() {
this.$refs.popup.open();
},
closePopup() {
this.$refs.popup.close();
}
}
}
</script>
<style>
<style lang="scss" scoped>
body{background-color: #fff;}
.popup-content {
padding: 20px;
background-color: #fff;
text-align: center;
}
</style>

150
pages/irrigation/config.vue Normal file
View File

@ -0,0 +1,150 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="true" leftText="" @leftClick="" title="轮灌组配置"></custom-nav-bar>
<view class="text-intel">
<view>
<span class="text">轮灌组：1</span>
</view>
<view>
<span>时长：12:12:12</span>
</view>
<view>
<span>已选：2</span>
</view>
</view>
<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="iconfont icon-nongtian icon"></view>
<view class="text" style="color: #333;">
分组1
</view>
</view>
</view>
</template>
<view class="content">
<uni-forms ref="baseForm" :modelValue="baseFormData">
<view class="cards-content">
<view class="greybar-box">
<view class="title">
<view>出水口：<span>1-1</span></view>
<view>阀门：三通阀</view>
</view>
<view class="check-box">
<uni-forms-item>
<uni-data-checkbox v-model="baseFormData.hobby" multiple :localdata="hobbys" />
</uni-forms-item>
</view>
</view>
<view class="greybar-box">
<view class="title">
<view>出水口：<span>1-2</span></view>
<view>阀门：多通阀</view>
</view>
<view class="check-box">
<uni-forms-item>
<uni-data-checkbox v-model="baseFormData.hobby" multiple :localdata="hobby" />
</uni-forms-item>
</view>
</view><view class="greybar-box">
<view class="title">
<view>出水口：<span>1-3</span></view>
<view>阀门：多通阀</view>
</view>
<view class="check-box">
<uni-forms-item>
<uni-data-checkbox v-model="baseFormData.hobby" multiple :localdata="hobby" />
</uni-forms-item>
</view>
</view><view class="greybar-box">
<view class="title">
<view>出水口：<span>1-3</span></view>
<view>阀门：多通阀</view>
</view>
<view class="no-data"><view class="iconfont icon-wbd"></view>未绑定阀门</view>
</view>
</view>
</uni-forms>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
<view class="bottom-btn">
<u-button type="success" size="large" text="下一组" @click="" />
</view>
</template>
<script>
export default {
data() {
return {
// 基础表单数据
baseFormData: {
hobby: [4],
},
// 三通阀
hobbys: [{
text: '①开',
value: 0
}, {
text: '②开',
value: 1
}, {
text: '全开',
value: 2
}],
// 多通阀
hobby: [{
text: '①开',
value: 0
}, {
text: '②开',
value: 1
}, {
text: '③开',
value: 2
}, {
text: '④开',
value: 3
}],
}
},
}
</script>
<style lang="scss" scoped>
uni-app,
uni-page,
uni-page-wrapper,
uni-page-body {
padding-bottom: 38px !important;
}
// 表单
.uni-forms-item {
margin-bottom: 0;
}
::v-deep .uni-data-checklist .checklist-group {
padding: 10px;
}
::v-deep .uni-data-checklist .checklist-group .checklist-box {
flex: 1;
}
::v-deep .uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checklist-text {
color: #39ac4f;
}
::v-deep .uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checkbox__inner {
border-color: #39ac4f;
background-color: #39ac4f;
}
</style>

2
pages/irrigation/details/irrigationdetails.vue
View File

@ -79,8 +79,6 @@
methods: {
// 页面跳转
rotationrecord() {
uni.navigateTo({

2
pages/irrigation/details/taskdetails.vue
View File

@ -60,10 +60,8 @@
<script>
export default {
methods: {
// 页面跳转
irrigationdetails() {
uni.navigateTo({

18
pages/irrigation/index.vue
View File

@ -4,7 +4,7 @@
<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 align="right" class="iconfont icon-jia1 icon" @click="add"></view>
</view>
</template>
</custom-nav-bar>
@ -28,7 +28,7 @@
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list" @click="taskdetails" >
<view class="txt-list" @click="taskdetails">
<view class="left">
<view><text>轮灌方案：</text><text>全设备</text></view>
<view><text>起始值：</text><text>外部程曦</text></view>
@ -127,7 +127,7 @@
</template>
<view class="content">
<view class="cards-content">
<view class="txt-list">
<view class="txt-list" @click="irrigationgroup">
<view class="left">
<view><text>轮灌组数量：</text><text>5</text></view>
<view><text>压力：</text><text>0.2</text></view>
@ -212,6 +212,16 @@
uni.navigateTo({
url: '/pages/irrigation/details/taskdetails'
});
},
irrigationgroup() {
uni.navigateTo({
url: '/pages/irrigation/irrigationgroup'
});
},
add() {
uni.navigateTo({
url: '/pages/irrigation/add/addtask'
});
}
},
@ -231,6 +241,4 @@
::v-deep .segmented-control__text {
font-size: 16px;
}
</style>

100
pages/irrigation/irrigationgroup.vue Normal file
View File

@ -0,0 +1,100 @@
<template>
<!-- 顶部导航栏 -->
<custom-nav-bar :left="true" leftText="" @leftClick="" title="轮灌组列表"></custom-nav-bar>
<view class="text-intel">
<view>
<span>轮灌组：</span>
<span class="font-green">2个</span>
</view>
<view>
<span>总时长：</span>
<span class="font-green">12:12:12</span>
</view>
</view>
<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>
<uni-forms>
<uni-forms-item label="时长：">
<uni-easyinput placeholder="1:00:00" />
</uni-forms-item>
</uni-forms>
</view>
<view>已选：3</view>
</view>
<view class="title-r">
<u-button type="success" size="mini" text="编辑" />
<u-button class="bg-red" type="success" size="mini" text="删除" />
</view>
</view>
</template>
<view class="content">
<view class="cards-content">
<view class="greybar">
<view>出水口：<span>1-1</span></view>
<view>三通<span>①开</span></view>
</view>
<view class="greybar">
<view>出水口：<span>1-1</span></view>
<view>三通<span>①开</span></view>
</view>
<view class="greybar">
<view>出水口：<span>1-1</span></view>
<view>三通<span>①开</span></view>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
<view class="bottom-btn">
<u-button type="success" size="large" text="新增" @click="config" />
</view>
</template>
<script>
export default {
methods: {
// 页面跳转
config() {
uni.navigateTo({
url: '/pages/irrigation/config'
});
}
},
};
</script>
<style lang="scss" scoped>
uni-app,
uni-page,
uni-page-wrapper,
uni-page-body {
padding-bottom: 38px !important;
}
.uni-forms-item {
margin-right: 10px;
margin-bottom: 0;
}
::v-deep .uni-forms-item__label {
width: auto !important;
font-size: 0.8rem;
height: inherit;
padding: 0;
}
::v-deep .uni-easyinput__content-input {
height: 20px;
width: 50px;
padding-left: 5px !important;
}
</style>

85
static/scss/app.css
View File

@ -1,3 +1,23 @@
/* 表单 */
.uni-forms{background-color: #fff !important;padding: 10px !important;}
.uni-forms-item {
margin-bottom: 10px !important;
}
.uni-forms-item__label{min-width: 80px !important;}
.uni-forms-item__content{align-content: center !important;}
/* 表单复选 */
.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checklist-text {
color: #39ac4f !important;
}
.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checkbox__inner {
border-color: #39ac4f !important;
background-color: #39ac4f !important;
}
/* 表单单选 */
.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .radio__inner{border-color: #39ac4f !important;}
.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .radio__inner .radio__inner-icon{background-color: #39ac4f !important;}
/* 徽标数 */
.u-badge {
border-radius: 5px !important;
@ -23,15 +43,6 @@
}
/* 按钮 */
.u-button {
width: fit-content !important;
}
.u-button--square {
border-radius: 5px !important;
}
.u-button--large {
width: 100% !important;
height: 38px !important;
@ -44,12 +55,16 @@
.u-button--small {
height: 25px !important;
}
.u-button--mini {min-width: 38px !important;
width: fit-content !important;
}
.u-button--success {
background-color: #39ac4f !important;
border-color: #39ac4f !important;
}
.u-button--square {
border-radius: 5px !important;
}
.u-button--plain {
background-color: transparent !important;
}
@ -85,7 +100,7 @@
background-color: #39ac4f;
color: #fff;
}
.bottom-btn{position: fixed;bottom: 0;width: 100%;}
/* 字体颜色 */
.font-red {
color: #e60012;
@ -161,21 +176,22 @@
display: flex;
align-items: center;
}
.cards-title view .text {
.cards-title view view{font-size:0.8rem ;}
.cards-title view .text {font-size: 0.875rem;
margin-right: 10px;
color: #39ac4f;
font-weight: bold;
}
.cards-title .title-r .uni-tag {
.cards-title .title-r .uni-tag
, .cards-title .title-r .u-button{
margin-left: 5px;
}
.cards-title .icon{color: #39ac4f; font-size: 1.3rem;margin-right: 10px;}
.cards-content {
padding: 10px;
}
/* 文字列表 */
.txt-list {
display: flex;
justify-content: space-between;
@ -199,7 +215,20 @@
.right .iconfont {
color: #bbb;
}
/* 灰色条 */
.greybar{
display: grid;
grid-template-columns: repeat(2, 1fr);
grid-template-rows: auto;
background-color: #f3f3f3;padding: 10px;border-radius: 4px;margin-bottom: 10px;}
.greybar:last-child,.greybar-box:last-child{margin-bottom: 0;}
.greybar view>span,.greybar-box .title span{color: #39ac4f;margin-left: 6px;font-weight: bold;font-size: 0.9rem;}
.greybar-box{background-color: #f3f3f3;margin-bottom: 10px;}
.greybar-box .title{padding: 10px;border-bottom: 1px solid #c7c7c7;display: grid;
grid-template-columns: repeat(2, 1fr);}
.greybar>view:first-child,.greybar-box .title>view:first-child span{color: #00baad;}
.greybar-box .no-data{display: flex;align-items: center;justify-content: center;padding:20px 10px;color: #a6a6a6;font-size: 16px;}
.greybar-box .no-data .iconfont{font-size: 24px;margin-right: 10px;}
.card-font {
height: auto;
overflow: hidden;
@ -210,4 +239,22 @@
display: inline-flex;
float: right;
margin-left: 10px;
}
}
/* 展示信息 */
.text-intel{width: 100%;background-color: #fff;padding: 10px;display: flex;font-size: 14px;}
.text-intel >view{display:flex;align-items: center;margin-right: 20px;}
.text-intel >view .text{font-size: 0.875rem;
color: #39ac4f;
font-weight: bold;}
/* 表单按钮 */
.form-btn{display: flex; gap: 10px;margin-top: 50px;}
/* 表单下拉框 */
.select{display: flex;
box-sizing: border-box;
flex-direction: row;
align-items: center;
border: 1px solid #dcdfe6;
border-radius: 4px;padding-left: 10px; line-height: 1;
font-size: 14px;
height: 35px; color: #999;}