diff --git a/pages/home/control/automatic.vue b/pages/home/control/automatic.vue
index 4294848..8d016d3 100644
--- a/pages/home/control/automatic.vue
+++ b/pages/home/control/automatic.vue
@@ -39,12 +39,66 @@
+
+
+
+
+ 参考温度：{{ result }}
+
+
+
+ 参数设置弹窗
+
+
+
+
+
+
+
+
+
+
+ 运行时间开始
+ {{ item.startTime }}
+
+
+ 运行时间终止
+ {{ item.endTime }}
+
+
+
+
+ 温度
+ {{ item.temp }}℃
+
+
+ 风口
+ {{ item.vent }}%
+
+
+
+
+
+
+
+ 添加条件
+
+
+
+
+
@@ -172,6 +226,7 @@ export default {
// 优化：声明响应式变量 connected
connected: false,
imei: '',
+ current: 0,
// 新增：限位时间配置
limitTimes: {
jbkLimit: 0,
@@ -185,11 +240,47 @@ export default {
jm3kLimit: 0,
jm3gLimit: 0
},
- filmRollerList:['卷膜1',"卷膜2","卷膜3"]
+ filmRollerList:["卷膜1", "卷膜2", "卷膜3"],
+ tempList: [
+ {
+ value: '1',
+ label: '温度1'
+ },
+ {
+ value: '2',
+ label: '温度2'
+ },
+ {
+ value: '3',
+ label: '温度3'
+ },
+ {
+ value: '4',
+ label: '温度4'
+ }
+ ],
+ showSelect:false,
+ result: "请选择",
+ condition:["jm1", "jm2", "jm3"],
+ conditionList: {
+ "jm1": [],
+ "jm2": [],
+ "jm3": [],
+ }
};
},
methods: {
+ change(e) {
+ this.current =e.detail.current
+ },
+ switchTab(e) {
+ this.current=e.index
+ },
+ confirmTemp(event) {
+ this.result = event[0]['label']
+ console.info(`选择温度：${event[0]['label']}`)
+ },
refresh() {
this.showFlag = !((store.getters && store.getters.name !== 'admin') && this.$auth.hasRole("test"))
this.getAgriByImei();
@@ -404,6 +495,14 @@ export default {
}
})
},
+ addTerm() {
+ this.conditionList[this.condition[this.current]].push({
+ startTime: '请选择时间',
+ endTime: '请选择时间',
+ temp: '选择',
+ vent: '选择'
+ })
+ }
}
};
@@ -626,5 +725,73 @@ export default {
.film-roller {
padding: 20rpx;
}
+.swiper {
+ box-sizing: border-box;
+ border: 2rpx solid rgb(248, 241, 241);
+ border-top: 0;
+ //height: 800rpx;
+ border-bottom-left-radius: 10rpx;
+ border-bottom-right-radius: 10rpx;
+ box-shadow: 8rpx 5rpx 10rpx rgb(233, 231, 239);
+ padding-top: 10rpx;
+}
+.add-term {
+ display: flex;
+ align-items: center; /* 垂直居中 */
+ gap: 4px; /* 图标和文字之间的间距 */
+ justify-content: center; /* 内部元素水平居中（可选） */
+ //padding: 10px 20px;
+ font-size: 40rpx;
+ color: #42b3ff;
+ margin-top: 30rpx;
+ //border: 1px solid var(--cyan);
+ //border-radius: 8px;
+ //background-color: #fff;
+}
+.param-setting {
+ display: flex;
+ align-items: center;
+ .param-dialog {
+ margin-left: auto; /* 自动填充左侧空间，将按钮推到最右侧 */
+ }
+}
+.condition-content {
+ margin: 20rpx;
+}
+
+
+.tn-list-cell {
+ box-shadow: 8rpx 5rpx 10rpx #D9D9D9;
+ //border: 2rpx solid #D9D9D9;
+ margin-bottom: 20rpx;
+}
+.message {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
+.message__left {
+ flex:1;
+}
+.message__middle {
+ text-align: center;
+ flex: 4;
+}
+.message__right {
+ flex: 2;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ border: 1px solid #D9D9D9;
+}
+.message__name {
+ font-size: 24rpx;
+ color: #838383;
+ margin-bottom: 8rpx;
+}
+.message__content {
+ font-size: 26rpx;
+}
\ No newline at end of file
diff --git a/pages/home/control/index.vue b/pages/home/control/index.vue
index 15e2d5e..aefcc3d 100644
--- a/pages/home/control/index.vue
+++ b/pages/home/control/index.vue
@@ -567,7 +567,6 @@ export default {
.card {
border-radius: 20rpx;
overflow: hidden;
- height: calc(100vh - var(--window-top, 0px) - 100rpx);
}
.switch-row {
display: flex;