diff --git a/pages/home/control/automatic.vue b/pages/home/control/automatic.vue index ac07a8c..f46fff1 100644 --- a/pages/home/control/automatic.vue +++ b/pages/home/control/automatic.vue @@ -40,7 +40,7 @@ @@ -108,7 +108,7 @@ - + @@ -143,9 +143,9 @@ - {{ `【${selectedText} - 自动化】参数设置` }} + {{ `【${selectedText} - ${filmRollerList[current]}】风口校准`}} - 当前时间: + 计算风口总长: {{ currentCardTime > 0 ? `${currentCardTime} 秒` : '未设置' }} @@ -354,7 +354,7 @@ export default { } } ], - swiperHeight: 800, // 用于动态设置 swiper 高度 + swiperHeight: 720, // 用于动态设置 swiper 高度 timeParams: { year: false, month: false, @@ -607,7 +607,7 @@ export default { }, // 获取窗口高度 getSwiperHeight() { - this.swiperHeight = 800; + this.swiperHeight = 720; var length = this.termList[this.term[this.current]].length-4; if (length>0) { this.swiperHeight = this.swiperHeight + 160*length ; @@ -872,7 +872,7 @@ export default { } .modal-label { - width: 160rpx; + width: 180rpx; color: #666; } @@ -1043,4 +1043,7 @@ export default { font-size: 27rpx; color: #020e15; } +/deep/ .uni-slider-handle-wrapper { + height: 10rpx !important; +} \ No newline at end of file diff --git a/pages/home/control/index.vue b/pages/home/control/index.vue index 660f697..e7af8cb 100644 --- a/pages/home/control/index.vue +++ b/pages/home/control/index.vue @@ -43,6 +43,7 @@ :liveData="liveData" :show="show" :status="status" + :fontStyle="fontStyle" :limitTimes="limitTimes" :dtu_remark="dtu_remark" :selectedText="selectedText" @@ -101,6 +102,7 @@ export default { // 优化:声明响应式变量 connected connected: false, dtu_remark:{}, + fontStyle: '', liveData: { temp1: '数据加载中...', temp2: '数据加载中...', diff --git a/pages/home/control/manual.vue b/pages/home/control/manual.vue index d65db39..1da266f 100644 --- a/pages/home/control/manual.vue +++ b/pages/home/control/manual.vue @@ -17,7 +17,7 @@ > {{ liveData[item.key] }} - + {{ dtu_remark[item.key] }} {{ item.label }} @@ -188,6 +188,10 @@ export default { type: String, default: null }, + fontStyle: { + type: String, + default: '' + }, }, watch: { value: { @@ -209,7 +213,6 @@ export default { }, data() { return { - fontStyle: '', sensorCards: { temp: [ {label: '温度1', key: 'temp1'}, @@ -250,6 +253,7 @@ export default { imei: '', // 优化:温湿度卡片配置(固定顺序:温度1→2→3→4,湿度1→2→3→4) sensorCard:{}, + dataType: ["temp", "humi"] }; },