样式修复

feasure
lld 2026-03-11 03:20:07 +08:00
parent 87015949a4
commit 9b29f5e7fb
6 changed files with 78 additions and 37 deletions

View File

@ -4108,7 +4108,6 @@ movable-view.indexBar-item::before {
.cu-draw-box { .cu-draw-box {
width: 632rpx; width: 632rpx;
box-shadow: -6px 8px 81px 0px rgb(255, 192, 203, 0.73), 0px 0px 24px 0px #ffffff inset;
border-radius: 30rpx; border-radius: 30rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 9rpx; padding: 9rpx;
@ -4118,7 +4117,6 @@ movable-view.indexBar-item::before {
.cu-draw-b_box { .cu-draw-b_box {
width: 614rpx; width: 614rpx;
border-radius: 30rpx; border-radius: 30rpx;
box-shadow: 0px 0px 10px 0px rgb(255, 192, 203, 0.53), 0px 0px 27px 0px #ffffff inset;
box-sizing: border-box; box-sizing: border-box;
padding: 19rpx 15rpx; padding: 19rpx 15rpx;
} }
@ -4190,7 +4188,6 @@ movable-view.indexBar-item::before {
content: ''; content: '';
width: 280rpx; width: 280rpx;
height: 280rpx; height: 280rpx;
background: rgb(48, 124, 237, 0.79);
border-radius: 50%; border-radius: 50%;
top: 50%; top: 50%;
left: 50%; left: 50%;

View File

@ -64,7 +64,11 @@
{ {
"path": "control/index", "path": "control/index",
"style": { "style": {
"navigationBarTitleText": "控制中心" "navigationBarTitleText": "控制中心",
"usingComponents": {
"auto-page": "/pages/home/control/automatic",
"manual-page": "/pages/home/control/manual"
}
} }
} }
// , // ,

View File

@ -52,6 +52,7 @@
<swiper class="swiper" :disable-touch="true" :current="current" :acceleration="true" <swiper class="swiper" :disable-touch="true" :current="current" :acceleration="true"
@change="change" :style="{ height: swiperHeight + 'rpx' }"> @change="change" :style="{ height: swiperHeight + 'rpx' }">
<swiper-item v-for="(roller, key) in filmRollerList" <swiper-item v-for="(roller, key) in filmRollerList"
@touchmove.stop
:key="key"> :key="key">
<view > <view >
<view class="param-setting"> <view class="param-setting">
@ -79,11 +80,11 @@
</view> </view>
<view class="message__middle" @click="changeTime('startTime',index)"> <view class="message__middle" @click="changeTime('startTime',index)">
<view class="message__name">运行时间开始</view> <view class="message__name">运行时间开始</view>
<view class="message__content tn-text-ellipsis">{{ item.startTime }}</view> <view class="message__content tn-text-ellipsis">{{ item.startTime || '请选择时间' }}</view>
</view> </view>
<view class="message__middle" @click="changeTime('endTime',index)"> <view class="message__middle" @click="changeTime('endTime',index)">
<view class="message__name">运行时间终止</view> <view class="message__name">运行时间终止</view>
<view class="message__content tn-text-ellipsis">{{ item.endTime }}</view> <view class="message__content tn-text-ellipsis">{{ item.endTime || '请选择时间' }}</view>
</view> </view>
<!-- <tn-button backgroundColor="#01BEFF" :plain="true" class="message__right" width="150rpx" height="100rpx"--> <!-- <tn-button backgroundColor="#01BEFF" :plain="true" class="message__right" width="150rpx" height="100rpx"-->
<!-- :fontSize="40" shape="icon" margin="10rpx 10rpx">--> <!-- :fontSize="40" shape="icon" margin="10rpx 10rpx">-->
@ -109,11 +110,9 @@
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</view> </view>
<view class="copy-term" v-if="termList[key]['terms'].length > 0"> <view class="copy-term" @click="copyTerm"
<tn-button @click="copyTerm" v-if="termList[key]['terms'].length > 0">
:shadow="true" width="100%" height="100rpx" 一键同步卷膜所有配置
backgroundColor="#01BEFF" fontColor="#FFFFFF"
margin="10rpx 0">一键同步卷膜所有配置</tn-button>
</view> </view>
<view class="add-term"> <view class="add-term">
<uni-icons color="var(--cyan)" type="plus" size="40" @click="addTerm"/> <uni-icons color="var(--cyan)" type="plus" size="40" @click="addTerm"/>
@ -292,6 +291,9 @@ import { checkTimeConflict } from "../../../utils/agri"
import {getAgriTerm, saveAgriTerm} from "../../../api/control/autoTerm"; import {getAgriTerm, saveAgriTerm} from "../../../api/control/autoTerm";
export default { export default {
options: {
styleIsolation: 'shared'
},
dicts: ['sys_data_map'], dicts: ['sys_data_map'],
name: "manual", name: "manual",
props: { props: {
@ -845,10 +847,10 @@ export default {
const index = this.current + 1 const index = this.current + 1
this.termList[this.current]['terms'].push({ this.termList[this.current]['terms'].push({
id: generateUniqueId(), id: generateUniqueId(),
startTime: '请选择时间', startTime: null,
endTime: '请选择时间', endTime: null,
temp: '选择', temp: 0,
vent: '选择', vent: 0,
imei: this.value, imei: this.value,
roller: `jm${index}` roller: `jm${index}`
}); });
@ -941,7 +943,7 @@ export default {
min: 0, min: 0,
max: 40, max: 40,
unit: '℃', unit: '℃',
value: fillerTerm.temp==='选择'?0:fillerTerm.temp, value: fillerTerm.temp,
mode: tag mode: tag
} }
} else if (tag === 'vent') { } else if (tag === 'vent') {
@ -950,7 +952,7 @@ export default {
min: 0, min: 0,
max: 100, max: 100,
unit: 'cm', unit: 'cm',
value: fillerTerm.vent==='选择'?0:fillerTerm.vent, value: fillerTerm.vent,
mode: tag mode: tag
} }
} }
@ -1029,11 +1031,11 @@ export default {
}, },
{ {
tip: '温度控制适宜温度填写不完整,请填写后重新尝试!', tip: '温度控制适宜温度填写不完整,请填写后重新尝试!',
validate: (rollerParam, term) => term.some(item => !(item.temp && item.temp!=='选择')) validate: (rollerParam, term) => term.some(item => !(item.temp && item.temp>0))
}, },
{ {
tip: '温度控制风口开合大小填写不完整,请填写后重新尝试!', tip: '温度控制风口开合大小填写不完整,请填写后重新尝试!',
validate: (rollerParam, term) => term.some(item => !(item.vent && item.vent!=='选择')) validate: (rollerParam, term) => term.some(item => !(item.vent && item.vent>0))
} }
]; ];
@ -1047,10 +1049,11 @@ export default {
'参数设置失败,请下拉刷新后重试!', '参数设置失败,请下拉刷新后重试!',
false, null, 'none', 3000) false, null, 'none', 3000)
return; return;
} else if (rule.validate(rollerParam, term)) {
rollerList.push(filmRoller);
showTips = rule.tip;
} }
// else if (rule.validate(rollerParam, term)) {
// rollerList.push(filmRoller);
// showTips = rule.tip;
// }
} }
if (rollerList.length>0) { if (rollerList.length>0) {
this.$tn.message.toast(`${rollerList.join("")}${showTips}`); this.$tn.message.toast(`${rollerList.join("")}${showTips}`);
@ -1103,10 +1106,6 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/tuniao-ui/index.scss';
@import "@/colorui/main.css";
@import "@/colorui/icon.css";
/* 2列栅格布局 */ /* 2列栅格布局 */
.card-grid { .card-grid {
@ -1342,7 +1341,17 @@ export default {
//background-color: #fff; //background-color: #fff;
} }
.copy-term { .copy-term {
margin: 0 10rpx; margin: 10rpx;
padding: 0 17px;
font-size: 16px;
height: 100rpx;
color: rgb(255, 255, 255);
background-color: rgb(1, 190, 255);
box-shadow: rgba(1, 190, 255, 0.063) 3px 3px 4px;
border-radius: 10rpx;
justify-content: center;
align-items: center;
display: flex;
} }
.param-setting { .param-setting {
display: flex; display: flex;
@ -1377,6 +1386,13 @@ export default {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
text-align: center; text-align: center;
/* #ifdef MP-WEIXIN */
box-shadow: 8rpx 5rpx 10rpx #D9D9D9 !important;
//border: 2rpx solid #D9D9D9;
margin-bottom: 20rpx;
background: #F8F7F8;
border-radius: 12rpx;
/* #endif */
} }
.message__left { .message__left {
flex:3; flex:3;
@ -1440,4 +1456,11 @@ export default {
text-align: right !important; text-align: right !important;
font-size: 28rpx; font-size: 28rpx;
} }
/deep/ .uni-easyinput__content-input {
text-align: right !important;
}
/deep/ .uni-swipe_button {
height: 140rpx;
border-radius: 10rpx;
}
</style> </style>

View File

@ -7,7 +7,7 @@
<custom-refresher :status="refresherStatus" /> <custom-refresher :status="refresherStatus" />
</template> </template>
<view class="card shadow shadow-lg bg-white "> <view class="card shadow shadow-lg bg-white ">
<uni-section :title="`当前大棚:【${selectedText}】`" :subTitle="imei" titleFontSize="20px" type="line" > <uni-section :title="`当前大棚:【${selectedText}】`" :subTitle="imei" titleFontSize="16px" type="line" >
<template v-slot:right> <template v-slot:right>
<view class="switch-row"> <view class="switch-row">
<text class="modal-text">手动</text> <text class="modal-text">手动</text>
@ -82,6 +82,9 @@ import {findDtuDataByInfo} from "../../../api/system/data";
import {getAgriByImei} from "../../../api/system/assets/limit"; import {getAgriByImei} from "../../../api/system/assets/limit";
export default { export default {
options: {
styleIsolation: 'shared'
},
dicts: ['sys_data_map'], dicts: ['sys_data_map'],
components: { components: {
ZPaging, ZPaging,
@ -546,10 +549,13 @@ export default {
}, },
}; };
</script> </script>
<!-- 仅保留这个无 scoped style 块引入样式 -->
<style lang="scss">
@import '@/tuniao-ui/index.scss';
@import '@/colorui/main.css';
@import '@/colorui/icon.css';
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/tuniao-ui/index.scss';
@import "@/colorui/main.css";
@import "@/colorui/icon.css";
/deep/ .z-paging-content-fixed { /deep/ .z-paging-content-fixed {
padding: 20rpx !important; padding: 20rpx !important;

View File

@ -120,6 +120,9 @@ import store from "../../../store";
import {addRemark, updateRemark} from "../../../api/system/assets/remark"; import {addRemark, updateRemark} from "../../../api/system/assets/remark";
export default { export default {
options: {
styleIsolation: 'shared'
},
dicts: ['sys_data_map'], dicts: ['sys_data_map'],
name: "manual", name: "manual",
props: { props: {
@ -524,12 +527,8 @@ export default {
} }
}; };
</script> </script>
<style scoped>
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
/* 2列栅格布局 */ /* 2列栅格布局 */
.card-grid { .card-grid {
display: grid; display: grid;

View File

@ -31,10 +31,10 @@
<view class="iconfont icon-friendfill text-pink icon"></view> <view class="iconfont icon-friendfill text-pink icon"></view>
<text class="text">交流群</text> <text class="text">交流群</text>
</view> </view>
<view class="action-item" @click="handleBuilding"> <button class="action-item contact-btn" open-type="contact">
<view class="iconfont icon-service text-blue icon"></view> <view class="iconfont icon-service text-blue icon"></view>
<text class="text">在线客服</text> <text class="text">在线客服</text>
</view> </button>
<view class="action-item" @click="handleBuilding"> <view class="action-item" @click="handleBuilding">
<view class="iconfont icon-community text-mauve icon"></view> <view class="iconfont icon-community text-mauve icon"></view>
<text class="text">反馈社区</text> <text class="text">反馈社区</text>
@ -205,7 +205,19 @@
margin: 8px 0px; margin: 8px 0px;
} }
} }
.contact-btn {
background: transparent;
line-height: 40rpx;
margin-top: 10rpx;
}
} }
} }
::v-deep .action-item.contact-btn::after {
border: none !important;
height: 100% !important;
width: 100% !important;
/* 或者写成 border: 0 !important; */
}
} }
</style> </style>