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

修改农情、首部

Browse Source
This commit is contained in:
jsy_zjg 2024-12-20 10:50:22 +08:00
parent c174d6c0cd
commit 2d4583ff25
11 changed files with 37 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pages.json
View File

@ -36,17 +36,20 @@
}, {
"path": "pages/head/fertilizerapplicator/detail",
"style": {
"navigationBarTitleText": "施肥机"
"navigationBarTitleText": "施肥机",
"navigationStyle": "custom"
}
}, {
"path": "pages/head/fertilizerapplicator/detailkl",
"style": {
"navigationBarTitleText": "施肥机"
"navigationBarTitleText": "施肥机",
"navigationStyle": "custom"
}
}, {
"path": "pages/head/headdevice/detail",
"style": {
"navigationBarTitleText": "首部"
"navigationBarTitleText": "首部",
"navigationStyle": "custom"
}
}, {
"path": "pages/mine/index",
@ -175,35 +178,35 @@
"path": "pages/fourmonitor/index",
"style": {
"navigationBarTitleText": "农情",
"enablePullDownRefresh": false
"navigationStyle": "custom"
}
},
{
"path": "pages/fourmonitor/weatherstation",
"style": {
"navigationBarTitleText": "气象站",
"enablePullDownRefresh": false
"navigationStyle": "custom"
}
},
{
"path": "pages/fourmonitor/pest",
"style": {
"navigationBarTitleText": "虫情",
"enablePullDownRefresh": false
"navigationStyle": "custom"
}
},
{
"path": "pages/fourmonitor/spore",
"style": {
"navigationBarTitleText": "孢子",
"enablePullDownRefresh": false
"navigationStyle": "custom"
}
},
{
"path": "pages/fourmonitor/camera",
"style": {
"navigationBarTitleText": "摄像头",
"enablePullDownRefresh": false
"navigationStyle": "custom"
}
}, {
"path": "pages/popup/index-popup",

1
pages/fourmonitor/camera.vue
View File

@ -1,4 +1,5 @@
<template>
<custom-nav-bar :left="true" title="气象站"></custom-nav-bar>
<view class="content">
<view class="preview" id="video-container"></view>
<view>

1
pages/fourmonitor/index.vue
View File

@ -1,4 +1,5 @@
<template>
<custom-nav-bar :left="true" title="农情"></custom-nav-bar>
<view class="index-container">
<z-paging ref="paging" use-virtual-list @query="queryList" bg-color="#F3F3F3" :loading-more-enabled="false">
<template #cell="{item}">

72
pages/fourmonitor/pest.vue
View File

@ -1,4 +1,12 @@
<template>
<custom-nav-bar :left="true" title="虫情">
<!-- <template v-slot:right>
<view class="fixed">
<view align="right" class="iconfont icon-jia icon" v-hasPermi="['system:permission:add']"
@click="onAdd"></view>
</view>
</template> -->
</custom-nav-bar>
<view class="page">
<uni-row style="height: 40px;margin-left: 10px;">
<uni-col :span="12">
@ -126,7 +134,7 @@
<view class="text1">摄像头</view>
</uni-col></uni-row>
<uni-row class="col2"><uni-col :span="24"><u-button text="拍照" type="info"
@click="controlHeadSwitch(item,0,'car')" style="height: ;"></u-button></uni-col></uni-row>
@click="controlHeadSwitch(item,0,'car')"></u-button></uni-col></uni-row>
</uni-col>
</uni-row>
<uni-row class="rowheadstyle"> <uni-col :span="24" v-if="itemProperty.aal!=null">
@ -411,7 +419,7 @@
}
.but1 {
width: 130;
width: 240px;
}
.demo-uni-col {
@ -489,66 +497,6 @@
}
}
.dialog-body {
height: calc(100% - 35px);
overflow: hidden;
position: relative;
background-color: #f7f7f7;
//扫码的弹窗
.scancode-device-info {
height: 100%;
padding: 0 20px;
overflow-x: hidden;
overflow-y: auto;
display: flex;
flex-direction: column;
justify-content: space-evenly;
&>view {
width: 100%;
line-height: 40px;
font-size: 18px;
color: gray;
.label {
display: inline-block;
width: 30%;
color: black;
margin-right: 2px;
white-space: nowrap;
}
}
}
}
.control-panel {
height: 100px;
display: flex;
align-items: center;
flex-wrap: nowrap;
justify-content: space-evenly;
&>view {
padding: 6px 10px;
color: #007acc;
font-size: 14px;
border: 1px solid #ccc;
border-radius: 4px;
}
}
.logs-data-box {
width: 90vw;
height: calc(90vh - 35px);
.logs-container {
width: 100%;
height: calc(100% - 40px);
overflow-x: hidden;
overflow-y: auto;
}
}
.logs-item {
margin: 4px 10px;

1
pages/fourmonitor/spore.vue
View File

@ -1,4 +1,5 @@
<template>
<custom-nav-bar :left="true" title="孢子"></custom-nav-bar>
<view class="page">
<uni-row style="height: 40px;margin-left: 10px;">
<uni-col :span="12">

1
pages/fourmonitor/weatherstation.vue
View File

@ -1,4 +1,5 @@
<template>
<custom-nav-bar :left="true" title="气象站"></custom-nav-bar>
<view class="page">
<uni-row style="height: 30px;">
<uni-col :span="24" >

1
pages/head/fertilizerapplicator/detail.vue
View File

@ -1,4 +1,5 @@
<template>
<custom-nav-bar :left="true" title="施肥机"></custom-nav-bar>
<view>
<uni-row style="margin-bottom: 3px;background-color:cadetblue;height: 34px;">
<uni-col :span="2">

1
pages/head/fertilizerapplicator/detailkl.vue
View File

@ -1,4 +1,5 @@
<template>
<custom-nav-bar :left="true" title="施肥机"></custom-nav-bar>
<view>
<uni-row style="margin-bottom: 3px;background-color:cadetblue;height: 34px;">
<uni-col :span="2">

1
pages/head/headdevice/detail.vue
View File

@ -1,4 +1,5 @@
<template>
<custom-nav-bar :left="true" title="首部"></custom-nav-bar>
<view>
<uni-row style="background-color:cadetblue;height: 40px;">
<uni-col :span="2">

10
pages/head/index.vue
View File

@ -1,10 +1,10 @@
<template>
<custom-nav-bar :left="false" leftText="" @leftClick="" title="首部">
<template v-slot:left>
<view @click="$refs.landRef.open()">地块</view>
</template>
</custom-nav-bar>
<view class="index-container">
<custom-nav-bar :left="false" leftText="" @leftClick="" title="首部">
<template v-slot:left>
<view @click="$refs.landRef.open()">地块</view>
</template>
</custom-nav-bar>
<z-paging ref="paging" use-virtual-list @query="queryList" bg-color="#F3F3F3" :loading-more-enabled="false">
<template #cell="{item}">
<view class="item-container" @click="onClickItem(item)">

14
pages/mine/index.vue
View File

@ -78,13 +78,7 @@
<view>我的权益</view>
</view>
</view>
<!-- <view class="list-cell list-cell-arrow" @click="toPage('video')">
<view class="menu-item-box">
<view class="iconfont icon-user menu-icon"></view>
<view>视频</view>
</view>
</view> -->
<view class="list-cell list-cell-arrow" @click="toPage('help')">
<!-- <view class="list-cell list-cell-arrow" @click="toPage('help')">
<view class="menu-item-box">
<view class="iconfont icon-help menu-icon"></view>
<view>常见问题</view>
@ -95,13 +89,13 @@
<view class="iconfont icon-aixin menu-icon"></view>
<view>关于我们</view>
</view>
</view>
<view class="list-cell list-cell-arrow" @click="toPage('setting')">
</view> -->
<!-- <view class="list-cell list-cell-arrow" @click="toPage('setting')">
<view class="menu-item-box">
<view class="iconfont icon-setting menu-icon"></view>
<view>应用设置</view>
</view>
</view>
</view> -->
</view>
<view class="menu-list">
<view class="list-cell list-cell-arrow" style="border-radius: 10px;" @click="toPage('setting')">