基础修改
parent
00dd3fe270
commit
20b808adc7
|
|
@ -8,7 +8,7 @@ module.exports = {
|
||||||
// 应用版本
|
// 应用版本
|
||||||
version: "1.2.0",
|
version: "1.2.0",
|
||||||
// 应用logo
|
// 应用logo
|
||||||
logo: "/static/logo.png",
|
logo: "/static/logo200.png",
|
||||||
// 官方网站
|
// 官方网站
|
||||||
site_url: "http://ruoyi.vip",
|
site_url: "http://ruoyi.vip",
|
||||||
// 政策协议
|
// 政策协议
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@
|
||||||
"optimization" : {
|
"optimization" : {
|
||||||
"subPackages" : true
|
"subPackages" : true
|
||||||
},
|
},
|
||||||
|
"lazyCodeLoading" : "requiredComponents",
|
||||||
"networkTimeout" : {
|
"networkTimeout" : {
|
||||||
"request" : 60000,
|
"request" : 60000,
|
||||||
"connectSocket" : 60000
|
"connectSocket" : 60000
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,11 @@
|
||||||
<view class="control-card" @click="handleCardClick(1-status.jbk, 'jbk')">
|
<view class="control-card" @click="handleCardClick(1-status.jbk, 'jbk')">
|
||||||
<view class="card-text">
|
<view class="card-text">
|
||||||
<text class="card-main">卷被开</text>
|
<text class="card-main">卷被开</text>
|
||||||
<text class="card-sub">{{ show.jbk }}</text>
|
<!-- 核心修改:添加限位时间,与暂停/运行同行靠右 -->
|
||||||
|
<view class="card-sub-wrapper">
|
||||||
|
<text class="card-sub" v-if="hide">{{ show.jbk }}</text>
|
||||||
|
<text class="limit-time">运行时间:{{ limitTimes.jbk }} s</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-icon" :class="{ active: status.jbk === 1 }">
|
<view class="card-icon" :class="{ active: status.jbk === 1 }">
|
||||||
<uni-icons :type=" (status.jbk === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
<uni-icons :type=" (status.jbk === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
||||||
|
|
@ -76,7 +80,10 @@
|
||||||
<view class="control-card" @click="handleCardClick(1-status.jbg,'jbg')">
|
<view class="control-card" @click="handleCardClick(1-status.jbg,'jbg')">
|
||||||
<view class="card-text">
|
<view class="card-text">
|
||||||
<text class="card-main">卷被关</text>
|
<text class="card-main">卷被关</text>
|
||||||
<text class="card-sub">{{ show.jbg }}</text>
|
<view class="card-sub-wrapper">
|
||||||
|
<text class="card-sub" v-if="hide">{{ show.jbg }}</text>
|
||||||
|
<text class="limit-time">运行时间:{{ limitTimes.jbg }} s</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-icon" :class="{ active: status.jbg === 1 }">
|
<view class="card-icon" :class="{ active: status.jbg === 1 }">
|
||||||
<uni-icons :type=" (status.jbg === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
<uni-icons :type=" (status.jbg === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
||||||
|
|
@ -87,7 +94,10 @@
|
||||||
<view class="control-card" @click="handleCardClick(1-status.jm1k, 'jm1k')">
|
<view class="control-card" @click="handleCardClick(1-status.jm1k, 'jm1k')">
|
||||||
<view class="card-text">
|
<view class="card-text">
|
||||||
<text class="card-main">卷膜1开</text>
|
<text class="card-main">卷膜1开</text>
|
||||||
<text class="card-sub">{{ show.jm1k }}</text>
|
<view class="card-sub-wrapper">
|
||||||
|
<text class="card-sub" v-if="hide">{{ show.jm1k }}</text>
|
||||||
|
<text class="limit-time">运行时间:{{ limitTimes.jm1k }} s</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-icon" :class="{ active: status.jm1k === 1 }">
|
<view class="card-icon" :class="{ active: status.jm1k === 1 }">
|
||||||
<uni-icons :type="(status.jm1k === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
<uni-icons :type="(status.jm1k === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
||||||
|
|
@ -98,7 +108,10 @@
|
||||||
<view class="control-card" @click="handleCardClick(1-status.jm1g, 'jm1g')">
|
<view class="control-card" @click="handleCardClick(1-status.jm1g, 'jm1g')">
|
||||||
<view class="card-text">
|
<view class="card-text">
|
||||||
<text class="card-main">卷膜1关</text>
|
<text class="card-main">卷膜1关</text>
|
||||||
<text class="card-sub">{{ show.jm1g }}</text>
|
<view class="card-sub-wrapper">
|
||||||
|
<text class="card-sub" v-if="hide">{{ show.jm1g }}</text>
|
||||||
|
<text class="limit-time">运行时间:{{ limitTimes.jm1g }} s</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-icon" :class="{ active: status.jm1g === 1 }">
|
<view class="card-icon" :class="{ active: status.jm1g === 1 }">
|
||||||
<uni-icons :type="(status.jm1g === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
<uni-icons :type="(status.jm1g === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
||||||
|
|
@ -109,7 +122,10 @@
|
||||||
<view class="control-card" @click="handleCardClick(1-status.jm2k, 'jm2k')">
|
<view class="control-card" @click="handleCardClick(1-status.jm2k, 'jm2k')">
|
||||||
<view class="card-text">
|
<view class="card-text">
|
||||||
<text class="card-main">卷膜2开</text>
|
<text class="card-main">卷膜2开</text>
|
||||||
<text class="card-sub">{{ show.jm2k }}</text>
|
<view class="card-sub-wrapper">
|
||||||
|
<text class="card-sub" v-if="hide">{{ show.jm2k }}</text>
|
||||||
|
<text class="limit-time">运行时间:{{ limitTimes.jm2k }} s</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-icon" :class="{ active: status.jm2k === 1 }">
|
<view class="card-icon" :class="{ active: status.jm2k === 1 }">
|
||||||
<uni-icons :type="(status.jm2k === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
<uni-icons :type="(status.jm2k === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
||||||
|
|
@ -120,7 +136,10 @@
|
||||||
<view class="control-card" @click="handleCardClick(1-status.jm2g, 'jm2g')">
|
<view class="control-card" @click="handleCardClick(1-status.jm2g, 'jm2g')">
|
||||||
<view class="card-text">
|
<view class="card-text">
|
||||||
<text class="card-main">卷膜2关</text>
|
<text class="card-main">卷膜2关</text>
|
||||||
<text class="card-sub">{{ show.jm2g }}</text>
|
<view class="card-sub-wrapper">
|
||||||
|
<text class="card-sub" v-if="hide">{{ show.jm2g }}</text>
|
||||||
|
<text class="limit-time">运行时间:{{ limitTimes.jm2g }} s</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-icon" :class="{ active: status.jm2g === 1 }">
|
<view class="card-icon" :class="{ active: status.jm2g === 1 }">
|
||||||
<uni-icons :type="(status.jm2g === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
<uni-icons :type="(status.jm2g === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
||||||
|
|
@ -130,7 +149,10 @@
|
||||||
<view class="control-card" @click="handleCardClick(1-status.jm3k, 'jm3k')">
|
<view class="control-card" @click="handleCardClick(1-status.jm3k, 'jm3k')">
|
||||||
<view class="card-text">
|
<view class="card-text">
|
||||||
<text class="card-main">卷膜3开</text>
|
<text class="card-main">卷膜3开</text>
|
||||||
<text class="card-sub">{{ show.jm3k }}</text>
|
<view class="card-sub-wrapper">
|
||||||
|
<text class="card-sub" v-if="hide">{{ show.jm3k }}</text>
|
||||||
|
<text class="limit-time">运行时间:{{ limitTimes.jm3k }} s</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-icon" :class="{ active: status.jm3k === 1 }">
|
<view class="card-icon" :class="{ active: status.jm3k === 1 }">
|
||||||
<uni-icons :type="(status.jm3k === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
<uni-icons :type="(status.jm3k === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
||||||
|
|
@ -141,7 +163,10 @@
|
||||||
<view class="control-card" @click="handleCardClick(1-status.jm3g, 'jm3g')">
|
<view class="control-card" @click="handleCardClick(1-status.jm3g, 'jm3g')">
|
||||||
<view class="card-text">
|
<view class="card-text">
|
||||||
<text class="card-main">卷膜3关</text>
|
<text class="card-main">卷膜3关</text>
|
||||||
<text class="card-sub">{{ show.jm3g }}</text>
|
<view class="card-sub-wrapper">
|
||||||
|
<text class="card-sub" v-if="hide">{{ show.jm3g }}</text>
|
||||||
|
<text class="limit-time">运行时间:{{ limitTimes.jm3g }} s</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-icon" :class="{ active: status.jm3g === 1 }">
|
<view class="card-icon" :class="{ active: status.jm3g === 1 }">
|
||||||
<uni-icons :type="(status.jm3g === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
<uni-icons :type="(status.jm3g === 1)?'circle':'circle-filled'" size="24" color="#fff"/>
|
||||||
|
|
@ -174,6 +199,7 @@ export default {
|
||||||
subscribeTopic:'/up',
|
subscribeTopic:'/up',
|
||||||
},
|
},
|
||||||
value: 1,
|
value: 1,
|
||||||
|
hide: false,
|
||||||
control: '正在加载中...',
|
control: '正在加载中...',
|
||||||
range: [{
|
range: [{
|
||||||
"value": '864865085016294',
|
"value": '864865085016294',
|
||||||
|
|
@ -212,6 +238,17 @@ export default {
|
||||||
jm3k: "暂停",
|
jm3k: "暂停",
|
||||||
jm3g: "暂停"
|
jm3g: "暂停"
|
||||||
},
|
},
|
||||||
|
// 新增:限位时间配置(你可以根据实际需求修改数值)
|
||||||
|
limitTimes: {
|
||||||
|
jbk: 30,
|
||||||
|
jbg: 25,
|
||||||
|
jm1k: 30,
|
||||||
|
jm1g: 28,
|
||||||
|
jm2k: 30,
|
||||||
|
jm2g: 26,
|
||||||
|
jm3k: 30,
|
||||||
|
jm3g: 29
|
||||||
|
},
|
||||||
deviceType: '',
|
deviceType: '',
|
||||||
status: {
|
status: {
|
||||||
jbk: 0,
|
jbk: 0,
|
||||||
|
|
@ -559,6 +596,23 @@ export default {
|
||||||
color: #999;
|
color: #999;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 保留原有样式,仅修改/新增以下部分 */
|
||||||
|
.card-sub-wrapper {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
gap: 10rpx;
|
||||||
|
/* 新增:给容器加最小宽度,确保所有卡片一致 */
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.limit-time {
|
||||||
|
font-size: 24rpx;
|
||||||
|
color: #999;
|
||||||
|
/* 可选:加固定左边距,确保和暂停的间距统一 */
|
||||||
|
margin-left: 0rpx;
|
||||||
|
}
|
||||||
/* 卡片图标容器 */
|
/* 卡片图标容器 */
|
||||||
.card-icon {
|
.card-icon {
|
||||||
width: 48rpx;
|
width: 48rpx;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<image class="logo" src="@/static/logo.png"></image>
|
<image class="logo" src="@/static/logo200.png"></image>
|
||||||
<view class="text-area">
|
<view class="text-area">
|
||||||
<text class="title">Hello Agri</text>
|
<text class="title">Hello Agri</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Loading…
Reference in New Issue