zmj
/
TraceabilityAPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面修改

This commit is contained in:
lxz 2024-01-03 19:11:45 +08:00
parent af5e75d9c1
commit 90a4064041
33 changed files with 221 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
App.vue
View File

@ -1,8 +1,20 @@
<script> <script>
export default { export default {
onLaunch: function() { onLaunch: function() {
// uni.connectSocket({
// url: 'ws://60.204.152.17:8765'
// });
// uni.onSocketOpen(function(res) {
// console.log('WebSocket连接已打开！');
// uni.sendSocketMessage({
// data: "你好,靓仔2"
// });
// });
// uni.onSocketError(function(res) {
// console.log('WebSocket连接打开失败，请检查！');
// });
}, },
onShow: function() { onShow: function() {

13
components/plant/landInfo.vue
View File

@ -33,18 +33,19 @@
{{info.master_phone}} {{info.master_phone}}
</view> </view>
</view> </view>
<view class="info-li" v-if="isDetail" style="background-image: url('/static/main/index/pin_pai.png');">
种植种类
<view class="info-value">
{{info.breed}}
</view>
</view>
<view class="info-li" v-if="isDetail" style="background-image: url('/static/main/index/dqzz.png');"> <view class="info-li" v-if="isDetail" style="background-image: url('/static/main/index/dqzz.png');">
种植品种 种植品种
<view class="info-value"> <view class="info-value">
{{info.kind}} {{info.kind}}
</view> </view>
</view> </view>
<view class="info-li" v-if="isDetail" style="background-image: url('/static/main/index/pin_pai.png');">
种植品牌
<view class="info-value">
{{info.breed}}
</view>
</view>
</view> </view>
</view> </view>

6
config/app.js
View File

@ -1,14 +1,14 @@
let BASE_URL let BASE_URL
import store from "@/store/index.js" import store from "@/store/index.js"
// 环境 // 环境
let env = "dev" // let env = "dev"
// let env = "prod" let env = "prod"
let HTTP_REQUEST_URL let HTTP_REQUEST_URL
let HEADER let HEADER
if (env == 'dev') { if (env == 'dev') {
BASE_URL = 'http://192.168.1.15:8082/' BASE_URL = 'http://ceshi-suyuan.lihaink.cn/'
} else if (env = 'prod') { } else if (env = 'prod') {
BASE_URL = 'https://suyuan.lihaink.cn/' BASE_URL = 'https://suyuan.lihaink.cn/'
} }

1
index.html
View File

@ -19,7 +19,6 @@
<div id="app"><!--app-html--></div> <div id="app"><!--app-html--></div>
<script type="module" src="/main.js"></script> <script type="module" src="/main.js"></script>
<script> <script>
console.log(mqtt)
</script> </script>
</body> </body>
</html> </html>

60
pages.json
View File

@ -14,8 +14,8 @@
"style": { "style": {
"navigationBarTitleText": "地块", "navigationBarTitleText": "地块",
"navigationStyle": "custom", "navigationStyle": "custom",
"enablePullDownRefresh": false, "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black"
} }
}, { }, {
@ -40,8 +40,8 @@
"style": { "style": {
"navigationBarTitleText": "种植详情", "navigationBarTitleText": "种植详情",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -49,8 +49,8 @@
"style": { "style": {
"navigationBarTitleText": "添加收获信息", "navigationBarTitleText": "添加收获信息",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -58,8 +58,8 @@
"style": { "style": {
"navigationBarTitleText": "添加虫害防治信息", "navigationBarTitleText": "添加虫害防治信息",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -67,8 +67,8 @@
"style": { "style": {
"navigationBarTitleText": "添加灌溉信息", "navigationBarTitleText": "添加灌溉信息",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -76,8 +76,8 @@
"style": { "style": {
"navigationBarTitleText": "添加除草信息", "navigationBarTitleText": "添加除草信息",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -85,8 +85,8 @@
"style": { "style": {
"navigationBarTitleText": "添加施肥信息", "navigationBarTitleText": "添加施肥信息",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -94,8 +94,8 @@
"style": { "style": {
"navigationBarTitleText": "添加种植信息", "navigationBarTitleText": "添加种植信息",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -104,8 +104,8 @@
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTitleText": "苗情监测", "navigationBarTitleText": "苗情监测",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -114,8 +114,8 @@
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTitleText": "苗情监测", "navigationBarTitleText": "苗情监测",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -123,8 +123,8 @@
"style": { "style": {
"navigationBarTitleText": "添加土地信息", "navigationBarTitleText": "添加土地信息",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -132,8 +132,8 @@
"style": { "style": {
"navigationBarTitleText": "选择位置", "navigationBarTitleText": "选择位置",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -150,16 +150,16 @@
"style": { "style": {
"navigationBarTitleText": "溯源结果", "navigationBarTitleText": "溯源结果",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, { }, {
"path": "pages/husbandryForm/detail", "path": "pages/husbandryForm/detail",
"style": { "style": {
"navigationBarTitleText": "操作详情", "navigationBarTitleText": "操作详情",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {
@ -167,8 +167,8 @@
"style": { "style": {
"navigationBarTitleText": "密码修改", "navigationBarTitleText": "密码修改",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#35D190",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "white"
} }
}, },
{ {

8
pages/Login/login.vue
View File

@ -82,7 +82,7 @@
placeholder="请输入验证码" border="surround" v-model="formData.code"></u-input> placeholder="请输入验证码" border="surround" v-model="formData.code"></u-input>
<view class="get-code" :style="{color: countDown?'grey':''}" @click="getCode"><text <view class="get-code" :style="{color: countDown?'#ADADAD':''}" @click="getCode"><text
class="lineY"></text> class="lineY"></text>
获取验证码 <text v-if='countDown'>{{countDown}}s</text> </view> 获取验证码 <text v-if='countDown'>{{countDown}}s</text> </view>
</view> </view>
@ -196,10 +196,12 @@
} }
.input-card { .input-card {
width: 700rpx; width: 680rpx;
margin: 0 auto;
box-sizing: border-box; box-sizing: border-box;
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
box-shadow: 0.5rpx 0.5rpx 200rpx 0.5rpx rgba(0, 0, 0, 0.1);
.card-head { .card-head {
background-color: #fff; background-color: #fff;
@ -409,7 +411,7 @@
account: "", account: "",
password: "", password: "",
code: '', code: '',
scene: "1", scene: "2",
terminal: '' terminal: ''
}) })

2
pages/Login/resgier.vue
View File

@ -40,7 +40,7 @@
placeholder="请输入验证码" border="surround" v-model="formData.verify_code"></u-input> placeholder="请输入验证码" border="surround" v-model="formData.verify_code"></u-input>
<view class="get-code" :style="{color: countDown?'grey':''}" @click="getCode"><text <view class="get-code" :style="{color: countDown?'#ADADAD':''}" @click="getCode"><text
class="lineY"></text> class="lineY"></text>
获取验证码 <text v-if='countDown'>{{countDown}}s</text> </view> 获取验证码 <text v-if='countDown'>{{countDown}}s</text> </view>
</view> </view>

22
pages/addLand/addLand.vue
View File

@ -43,11 +43,15 @@
suffix-icon-style="color: #b6b6b6;" border="none" v-model="county_name" readonly suffix-icon-style="color: #b6b6b6;" border="none" v-model="county_name" readonly
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</up-form-item> </up-form-item>
<up-form-item label="土地详细地址" prop="town_code" style="position: relative;" borderBottom required> <up-form-item label="土地详细地址" prop="town_code" style="position: relative;width: 93%;" borderBottom
<up-input input-align="right" placeholder="请输入土地详细地址" suffixIcon="map" required>
suffix-icon-style="color: #b6b6b6;" border="none" v-model="data.formData.address"> <up-input input-align="right" placeholder="请输入土地详细地址" style="width: 80%;" border="none"
v-model="data.formData.address">
</up-input> </up-input>
<view style="position: absolute;right: 0;width: 50rpx; height: 100%; " @click="location"> <view style="position: absolute;right: -50rpx;width: 50rpx; height: 100%;" @click="location">
<u--image src='/static/main/index/dw.png'
style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);"
width="25.06rpx" height="32rpx"></u--image>
</view> </view>
</up-form-item> </up-form-item>
</view> </view>
@ -59,7 +63,7 @@
<view class="code-img1"> <view class="code-img1">
<view class="" v-if="pic.length>0" <view class="" v-if="pic.length>0"
style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;"> style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;">
<view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;"> <view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;" :key="i">
<view class=""> <view class="">
<u-icon name="close" size="15" style="margin-left:120.85rpx;" <u-icon name="close" size="15" style="margin-left:120.85rpx;"
@click="delimg(i)"></u-icon> @click="delimg(i)"></u-icon>
@ -72,8 +76,8 @@
<view class="code-img"> <view class="code-img">
<view class="" @click="updateImgFn"> <view class="" @click="updateImgFn">
<view class="carime-icon"> <view class="carime-icon">
<u-image src="/static/img/DJSC.png" width="91.12rpx" height="91.12rpx"></u-image> <u-image src="/static/main/index/upload.png" width="82rpx" height="68rpx"></u-image>
<view class=""> <view class="" style="font-weight: 500;margin-top: 20rpx;">
点击上传图片 点击上传图片
</view> </view>
</view> </view>
@ -566,8 +570,10 @@
.code-img { .code-img {
background-color: #F4F4F4; background-color: #F4F4F4;
height: 350.47rpx; height: 340.47rpx;
position: relative; position: relative;
width: 680rpx;
margin: 0 auto;
.carime-icon { .carime-icon {
position: absolute; position: absolute;

4
pages/husbandryForm/Pest.vue
View File

@ -70,8 +70,8 @@
<view class="code-img" v-if="mode=='add'"> <view class="code-img" v-if="mode=='add'">
<view class="" @click="updateImgFn"> <view class="" @click="updateImgFn">
<view class="carime-icon"> <view class="carime-icon">
<u-image src="/static/img/DJSC.png" width="91.12rpx" height="91.12rpx"></u-image> <u-image src="/static/main/index/upload.png" width="82rpx" height="68rpx"></u-image>
<view class=""> <view class="" style="font-weight: 500;margin-top: 20rpx;">
点击上传图片 点击上传图片
</view> </view>
</view> </view>

4
pages/husbandryForm/fertilize.vue
View File

@ -72,8 +72,8 @@
<view class="code-img" v-if="mode=='add'"> <view class="code-img" v-if="mode=='add'">
<view class="" @click="updateImgFn"> <view class="" @click="updateImgFn">
<view class="carime-icon"> <view class="carime-icon">
<u-image src="/static/img/DJSC.png" width="91.12rpx" height="91.12rpx"></u-image> <u-image src="/static/main/index/upload.png" width="82rpx" height="68rpx"></u-image>
<view class=""> <view class="" style="font-weight: 500;margin-top: 20rpx;">
点击上传图片 点击上传图片
</view> </view>
</view> </view>

4
pages/husbandryForm/harvest.vue
View File

@ -45,8 +45,8 @@
<view class="code-img" v-if="mode=='add'"> <view class="code-img" v-if="mode=='add'">
<view class="" @click="updateImgFn"> <view class="" @click="updateImgFn">
<view class="carime-icon"> <view class="carime-icon">
<u-image src="/static/img/DJSC.png" width="91.12rpx" height="91.12rpx"></u-image> <u-image src="/static/main/index/upload.png" width="82rpx" height="68rpx"></u-image>
<view class=""> <view class="" style="font-weight: 500;margin-top: 20rpx;">
点击上传图片 点击上传图片
</view> </view>
</view> </view>

4
pages/husbandryForm/irrigate.vue
View File

@ -65,8 +65,8 @@
<view class="code-img" v-if="mode=='add'"> <view class="code-img" v-if="mode=='add'">
<view class="" @click="updateImgFn"> <view class="" @click="updateImgFn">
<view class="carime-icon"> <view class="carime-icon">
<u-image src="/static/img/DJSC.png" width="91.12rpx" height="91.12rpx"></u-image> <u-image src="/static/main/index/upload.png" width="82rpx" height="68rpx"></u-image>
<view class=""> <view class="" style="font-weight: 500;margin-top: 20rpx;">
点击上传图片 点击上传图片
</view> </view>
</view> </view>

6
pages/husbandryForm/sow.vue
View File

@ -48,8 +48,8 @@
<view class="code-img"> <view class="code-img">
<view class="" @click="updateImgFn"> <view class="" @click="updateImgFn">
<view class="carime-icon"> <view class="carime-icon">
<u-image src="/static/img/DJSC.png" width="91.12rpx" height="91.12rpx"></u-image> <u-image src="/static/main/index/upload.png" width="82rpx" height="68rpx"></u-image>
<view class=""> <view class="" style="font-weight: 500;margin-top: 20rpx;">
点击上传图片 点击上传图片
</view> </view>
</view> </view>
@ -75,7 +75,7 @@
@confirm="dateConfirmfn" :formatter="formatter" @cancel="show=false"></u-datetime-picker> @confirm="dateConfirmfn" :formatter="formatter" @cancel="show=false"></u-datetime-picker>
</view> </view>
<u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button> <u-button class="btn" v-if="mode=='add'" style="font-size: 32rpx;" @click="addFn">添加</u-button>
</view> </view>
</view> </view>

4
pages/husbandryForm/weeding.vue
View File

@ -73,8 +73,8 @@
<view class="code-img" v-if="mode=='add'"> <view class="code-img" v-if="mode=='add'">
<view class="" @click="updateImgFn"> <view class="" @click="updateImgFn">
<view class="carime-icon"> <view class="carime-icon">
<u-image src="/static/img/DJSC.png" width="91.12rpx" height="91.12rpx"></u-image> <u-image src="/static/main/index/upload.png" width="82rpx" height="68rpx"></u-image>
<view class=""> <view class="" style="font-weight: 500;margin-top: 20rpx;">
点击上传图片 点击上传图片
</view> </view>
</view> </view>

72
pages/index/massif.vue
View File

@ -90,7 +90,8 @@
苗情检测视频 苗情检测视频
</view> </view>
<view class="" style="font-size: 20rpx;color: #ACACAC;display: flex;align-items: center;"> <view class="" style="font-size: 20rpx;color: #ACACAC;display: flex;align-items: center;">
<u-icon name="clock" style="margin-right: 5rpx;" color="#ACACAC"></u-icon> <!-- <u-icon name="clock" style="margin-right: 5rpx;" color="#ACACAC"></u-icon> -->
<u--image :src="u('sj')" width='18rpx' height="18rpx" style="margin-right:5rpx"></u--image>
刷新时间：{{getNowTimeFn()}} 刷新时间：{{getNowTimeFn()}}
</view> </view>
@ -122,7 +123,7 @@
{{item.name}} {{item.name}}
</view> </view>
<view class="" :style=" {color: item.status==0?'#73DFB2':'red'}" <view class="" :style=" {color: item.status==0?'#73DFB2':'red'}"
style="font-size: 28rpx;margin-top: 10rpx;"> style="font-size: 28rpx;margin-top: 10rpx;font-weight: bold;">
{{ item.num?item.num+item.unit:'--' }} {{ item.num?item.num+item.unit:'--' }}
</view> </view>
<view class="" style="display: flex;color:red" v-if="item.status>0"> <view class="" style="display: flex;color:red" v-if="item.status>0">
@ -150,7 +151,7 @@
{{item.name}} {{item.name}}
</view> </view>
<view class="" :style=" {color: item.status==0?'#73DFB2':'red'}" <view class="" :style=" {color: item.status==0?'#73DFB2':'red'}"
style="font-size: 28rpx;margin-top: 10rpx;"> style="font-size: 28rpx;margin-top: 10rpx;font-weight: bold;">
<text v-if="item.num==0">{{item.num+item.unit}}</text> <text v-if="item.num==0">{{item.num+item.unit}}</text>
<text v-else>{{ item.num?item.num+item.unit:'--' }}</text> <text v-else>{{ item.num?item.num+item.unit:'--' }}</text>
</view> </view>
@ -289,7 +290,8 @@
import { import {
onLoad, onLoad,
onShow, onShow,
onHide onHide,
onPullDownRefresh
} from "@dcloudio/uni-app" } from "@dcloudio/uni-app"
import Myindex from '@/components/return/index.vue'; import Myindex from '@/components/return/index.vue';
@ -392,7 +394,7 @@
} }
}) })
const userInfo = ref("")
const dataobj = reactive({}) const dataobj = reactive({})
const tdId = ref('') const tdId = ref('')
const palntId = ref('') const palntId = ref('')
@ -416,7 +418,7 @@
} }
const goLive = () => { const goLive = () => {
uni.navigateTo({ uni.navigateTo({
url: '/pages/live/live?url=' + video_url.value url: `/pages/live/live?url=${video_url.value }&user=${userInfo.value.master_phone}&device=${userInfo.value.device_id} `
}) })
} }
const show = ref(false) const show = ref(false)
@ -454,14 +456,14 @@
}, { }, {
icon: "WD1", icon: "WD1",
name: "温度", name: "环境温度",
num: 0, num: 0,
unit: "℃", unit: "℃",
status: 0, status: 0,
}, { }, {
icon: "SD", icon: "SD",
name: "湿度", name: "环境湿度",
num: 0, num: 0,
unit: "%RH", unit: "%RH",
status: 0, status: 0,
@ -506,6 +508,7 @@
return `/static/main/index/${icon}.png` return `/static/main/index/${icon}.png`
} }
const video_url = ref() const video_url = ref()
let scoketData = ""
//列表获取 //列表获取
const getlist = () => { const getlist = () => {
lindexist({ lindexist({
@ -513,18 +516,12 @@
}).then((res) => { }).then((res) => {
if (res.code == 1) { if (res.code == 1) {
userInfo.value = res.data
scoketData = {
username: userInfo.value.master_phone,
device: 'lihai_lot_walnutpi_dev_' + userInfo.value.device_id
}
video_url.value = res.data.video_url video_url.value = res.data.video_url
// if (res.data.user_id == 23) {
// video_url.value =
// 'http://rtsp.lihaink.cn/live/lihai_lot_walnutpi_dev_4.live.mp4?secret=YwDtp2llj80HA19JhMXL4Po99nsMAyNT'
// }
// video_url=res.data.
threshold = res.data?.monitor?.threshold || "" threshold = res.data?.monitor?.threshold || ""
if (Object.keys(res.data).length > 0) { if (Object.keys(res.data).length > 0) {
getlist3(res.data.id) getlist3(res.data.id)
@ -594,6 +591,11 @@
}).then((res) => { }).then((res) => {
if (res.code == 1) { if (res.code == 1) {
tdId.value = res.data[0]?.id || '' tdId.value = res.data[0]?.id || ''
getlist() getlist()
if (res.data.length > 0) { if (res.data.length > 0) {
@ -655,9 +657,6 @@
showModal.value = false showModal.value = false
equipmentId.value = '' equipmentId.value = ''
} }
//绑定产品 //绑定产品
const biproduct = () => { const biproduct = () => {
if (equipmentId.value) { if (equipmentId.value) {
@ -737,6 +736,35 @@
const u = (name) => { const u = (name) => {
return `/static/main/index/${name}.png` return `/static/main/index/${name}.png`
} }
setTimeout(() => {
uni.connectSocket({
url: 'ws://60.204.152.17:8765'
});
uni.onSocketOpen(function(res) {
console.log(scoketData);
uni.sendSocketMessage({
data: JSON.stringify(scoketData)
});
});
uni.onSocketError(function(res) {
console.log('WebSocket连接打开失败，请检查！');
});
uni.onSocketClose(function(res) {
console.log('WebSocket 已关闭！');
});
}, 5000)
onPullDownRefresh(() => {
getlist1()
getlist2()
uni.stopPullDownRefresh()
})
</script> </script>
<style lang="scss"> <style lang="scss">
page { page {

27
pages/index/personal.vue
View File

@ -27,8 +27,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="content"> <view class="content" style="position: relative;">
<view class="card" style="border-radius: 10rpx;"> <view class="card"
style="border-radius: 10rpx;position: absolute;left:50%;transform: translateX(-50%);top: -100rpx;">
<view class="card-li" v-for="(item,index) in cardLiList" :key="index" @click="navto(item.nav)"> <view class="card-li" v-for="(item,index) in cardLiList" :key="index" @click="navto(item.nav)">
<view class="" style="display: flex;align-items: center;"> <view class="" style="display: flex;align-items: center;">
<view class="" style="margin-right: 20rpx;"> <view class="" style="margin-right: 20rpx;">
@ -43,12 +44,10 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view class="out-btn"> <view class="out-btn">
<up-button @click="loginOutFn" type="primary" customStyle="border:none;height:90rpx;border-radius: 500rpx;" <up-button @click="loginOutFn" type="primary" customStyle="border:none;height:90rpx;border-radius: 500rpx;"
color="#EC6857" text="退出登录" v-if="Object.keys(userinfo).length>0"></up-button> color="#EC6857" text="退出登录" v-if="Object.keys(userinfo).length>0"></up-button>
</view>
</view> </view>
<MyTabbar></MyTabbar> <MyTabbar></MyTabbar>
</template> </template>
@ -136,19 +135,18 @@
.head { .head {
height: 25vh; height: 25vh;
background-color: $theme-main-color;
color: white; color: white;
padding-top: 30rpx; padding-top: 30rpx;
position: relative; position: relative;
border-radius: 0 0 50rpx 50rpx;
// background-color: red;
position: relative; position: relative;
background-image: url('/static/main/index/wo.png');
background-size: 100% 100%;
.head-con { .head-con {
display: flex; display: flex;
align-items: center; align-items: center;
position: absolute; position: absolute;
bottom: 100rpx // margin-top: 150rpx; bottom: 120rpx // margin-top: 150rpx;
} }
.head-li { .head-li {
@ -189,17 +187,14 @@
} }
} }
}
.out-btn { .out-btn {
width: 693.93rpx; width: 693.93rpx;
position: absolute; position: absolute;
bottom: 100rpx; bottom: 140rpx;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
// border-radius: 500rpx;
// background-color: red;
// margin: auto;
}
} }
</style> </style>

38
pages/landDetail/index.vue
View File

@ -13,8 +13,7 @@
</view> </view>
<view class="video" style="position: relative;"> <view class="video" style="position: relative;">
<u--image src="https://ceshi-worker-task.lihaink.cn/uploads/images/20231223/20231223092144475437017.png" <u--image src="https://ceshi-worker-task.lihaink.cn/uploads/images/20231223/20231223092144475437017.png"
width="100%" height="300rpx" @click="goLive" v-if="videoUrl"></u--image> width="100%" height="500rpx" @click="goLive" v-if="videoUrl"></u--image>
<!-- <u--image src="/static/main/index/k.png" width="100%" height="510rpx" v-else></u--image> -->
<u--image :src="u('K')" v-else width="100%" height="510rpx"></u--image> <u--image :src="u('K')" v-else width="100%" height="510rpx"></u--image>
<view class="" <view class=""
style="width: 100%;height: 100%;background-color: rgba(0, 0, 0, .5);position: absolute;top: 1px;" style="width: 100%;height: 100%;background-color: rgba(0, 0, 0, .5);position: absolute;top: 1px;"
@ -59,8 +58,8 @@
width="200rpx" height="200rpx"></u--image> width="200rpx" height="200rpx"></u--image>
</view> </view>
<u--image src="/static/main/index/xyj.png" class="next" width="38rpx" <u--image @click="navtoForm(item,i)" src="/static/main/index/xyj.png" class="next"
height="38rpx"></u--image> width="38rpx" height="38rpx"></u--image>
<view class="right" style="color: #7B7B7B;" @click="navtoForm(item,i)"> <view class="right" style="color: #7B7B7B;" @click="navtoForm(item,i)">
<view class=""> <view class="">
@ -96,13 +95,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="coneng-detail" v-else> <view class="coneng-detail" v-else>
<view class=""> <view class="">
<image src="@/static/img/zw.png" mode="aspectFit"></image> <image src="@/static/img/zw.png" mode="aspectFit"></image>
@ -111,12 +104,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -125,6 +113,9 @@
<script setup> <script setup>
import landInfo from "@/components/plant/landInfo.vue" import landInfo from "@/components/plant/landInfo.vue"
import {
lindexist,
} from '@/api/api.js'
import { import {
ref, ref,
reactive reactive
@ -143,7 +134,7 @@
const goLive = () => { const goLive = () => {
uni.navigateTo({ uni.navigateTo({
url: '/pages/live/live?url=' + videoUrl.value url: `/pages/live/live?url=${videoUrl.value }&user=${userInfo.value.master_phone}&device=${userInfo.value.device_id} `
}) })
} }
const list = reactive([{ const list = reactive([{
@ -199,12 +190,25 @@
route: "/pages/husbandryForm/harvest" route: "/pages/husbandryForm/harvest"
}] }]
]); ]);
const userInfo = ref("")
onLoad((option) => { onLoad((option) => {
typeID.value = option.id; typeID.value = option.id;
lindexist({
land_id: option.id
}).then(res => {
userInfo.value = res.data
videoUrl.value = res.data.video_url
console.log(videoUrl.value, 25545)
// console.log(userInfo.value)
})
}); });
// const goLive = () => {
// }
onShow(() => { onShow(() => {
getlist(); getlist();

86
pages/live/live.nvue
View File

@ -1,19 +1,25 @@
<template> <template>
<view class="container"> <view class="container">
<u-loading-page :loading="loading" loading-text="视频加载中,请稍后..."></u-loading-page>
<view class="" :style="{opacity:loading?'0':'1'}">
<view :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;z-inde:-1;'"> <view :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;z-inde:-1;'">
<view class="root"> <view class="root">
<video ref="videoPlayer" <video ref="videoPlayer" @fullscreenchange='fullscreenchange' :src="url" :object-fit="object_fit"
src="http://rtsp.lihaink.cn/live/lihai_lot_walnutpi_dev_2.live.flv?secret=ywdtp2llj80ha19jhmxl4po99nsmaynt" :autoplay="true" @play='playVedio'
:object-fit="object_fit" :autoplay="true"
:style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'" id="video"></video> :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'" id="video"></video>
</view> </view>
</view> </view>
</view> </view>
</view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
loading: true,
rtmpSources: [], rtmpSources: [],
currentIndex: 0, currentIndex: 0,
room: {}, room: {},
@ -24,7 +30,9 @@
}, },
object_fit: 'contain', //视频样式默认包含🌟 object_fit: 'contain', //视频样式默认包含🌟
windowWidth: '', windowWidth: '',
url: "" url: "",
flag: 0,
option: ""
} }
}, },
@ -34,29 +42,24 @@
} }
}, },
onLoad(option) { onLoad(option) {
uni.$emit('push', { this.option = option
msg: '页面更新' console.log(option)
})
uni.request({ uni.request({
url: 'http://192.168.1.27:8001/video/13433212473/lihai_lot_walnutpi_dev_3', //仅为示例，并非真实接口地址。 url: `https://iot.lihaink.cn/start/video/${option.user}/lihai_lot_walnutpi_dev_${option.device}`, //仅为示例，并非真实接口地址。
headers: {
'Referrer-Policy': 'unsafe-url'
},
success: (res) => { success: (res) => {
console.log(54545); // console.log(
// `https://iot.lihaink.cn/video/${option.user}/lihai_lot_walnutpi_dev_${option.device}`
// );
console.log('res为:');
console.log(res)
// this.text = 'request success'; // this.text = 'request success';
} }
}); });
// uni.request({
// url: 'https://iot.lihaink.cn/push_stream',
// data: {
// text: 'uni.request'
// },
// success: (res) => {
// console.log(res.data);
// this.text = 'request success';
// }
// });
this.url = option.url this.url = option.url
this.platform = uni.getSystemInfoSync().platform this.platform = uni.getSystemInfoSync().platform
@ -68,27 +71,19 @@
}, },
onUnload() { onUnload() {
console.log("页面关闭") uni.request({
url: `https://iot.lihaink.cn/stop/video/${this.option.user}/lihai_lot_walnutpi_dev_${this.option.device}`, //仅为示例，并非真实接口地址。
success: (res) => {
// console.log(
// `https://iot.lihaink.cn/stop/video/${this.option.user}/lihai_lot_walnutpi_dev_${this.option.device}`
// )
console.log('res为:');
console.log(res)
// this.text = 'request success';
}
});
uni.$emit('close', {
msg: '页面更新'
})
setTimeout(() => {
// uni.request({
// url: 'https://iot.lihaink.cn/close_stream', //仅为示例，并非真实接口地址。
// data: {
// text: 'uni.request'
// },
// success() {
// },
// fail: (res) => {
// console.log(res.data);
// }
// });
}, )
}, },
mounted() { mounted() {
@ -99,10 +94,17 @@
}, },
methods: { methods: {
fullscreenchange() {
this.flag += 1
if (this.flag == 2) {
uni.navigateBack()
}
console.log("推出")
},
playVedio() { playVedio() {
uni.createVideoContext('video', this).requestFullScreen(); uni.createVideoContext('video', this).requestFullScreen();
screen.orientation.lock('landscape'); screen.orientation.lock('landscape');
loading = false
}, },
playCurrent() { playCurrent() {
console.log(this.$refs.videoPlayer) console.log(this.$refs.videoPlayer)
@ -142,5 +144,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// div{
// opacity: ;
// }
</style> </style>

BIN
static/main/index/login_ad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
static/main/index/sj.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 454 B

BIN
static/main/index/upload.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/main/index/wo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 151 KiB

BIN
static/main/index/wxz.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
static/tabs-icon/Task-a.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 753 B

BIN
static/tabs-icon/Task.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 892 B

BIN
static/tabs-icon/approval-a.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 514 B

BIN
static/tabs-icon/approval.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 618 B

BIN
static/tabs-icon/home-a.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 645 B

BIN
static/tabs-icon/home.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 779 B

BIN
static/tabs-icon/manager-a.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 911 B

BIN
static/tabs-icon/manager.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/tabs-icon/my-a.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 673 B

BIN
static/tabs-icon/my.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 864 B