日志样式提交

pages/home/control/automatic.vue

@@ -54,7 +54,7 @@
           <swiper-item v-for="(roller, key) in filmRollerList"
                        @touchmove.stop
                        :key="key">
-            <view >
+            <scroll-view class="scroll-v list" enableBackToTop="true" :scroll-y="true">
               <view class="param-setting">
                 <tn-button padding="0 20rpx" :plain="true" margin="10rpx 10rpx" @click="showSelect=true">
                   参考温度：{{ termList[current]['config'].refTemp }}
@@ -118,7 +118,7 @@
                 <uni-icons color="var(--cyan)" type="plus" size="40" @click="addTerm"/>
                 <text @click="addTerm">添加条件</text>
               </view>
-            </view>
+            </scroll-view>
           </swiper-item>
         </swiper>
       </view>
@@ -300,6 +300,22 @@
         <history-data ref="historyDataRef"></history-data>
       </view>
     </uni-popup>
+    <uni-popup ref="logDialog" mode="center">
+      <view class="log-pop-wrap">
+        <view class="log-pop-header">{{ `【${selectedText}-${filmRollerList[current]}】自动化日志` }}</view>
+        <scroll-view class="log-pop-scroll" scroll-y="true">
+          <view class="log-info">
+            <text class="log-info-text">正在建设中，敬请期待~</text>
+          </view>
+          <view class="log-content-item" v-for="item in 100" :key="item">
+            <text>可滚动内容 {{item}}</text>
+          </view>
+        </scroll-view>
+        <view class="log-pop-footer">
+          <button class="log-pop-btn" @click="closeLogDialog">确定</button>
+        </view>
+      </view>
+    </uni-popup>
   </view>
 </template>
 
@@ -307,14 +323,14 @@
 // 优化：抽离魔法值常量
 import UniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.vue"; // 引入弹窗组件
 import mqttUtil from '@/utils/mqtt';
-import {addLimit, updateLimit} from "../../../api/system/assets/limit";
+import {addLimit, updateLimit} from "@/api/system/assets/limit";
 import store from "../../../store";
-import {addRemark, updateRemark} from "../../../api/system/assets/remark";
+import {addRemark, updateRemark} from "@/api/system/assets/remark";
-import {generateUniqueId} from "../../../utils/agri";
+import {generateUniqueId} from "@/utils/agri";
 import UniSection from "../../../components/uni-section/uni-section.vue";
 import UniFormsItem from "../../../uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue";
-import { checkTimeConflict } from "../../../utils/agri"
+import { checkTimeConflict } from "@/utils/agri"
-import {getAgriTerm, saveAgriTerm} from "../../../api/control/autoTerm";
+import {getAgriTerm, saveAgriTerm} from "@/api/control/autoTerm";
 import  HistoryData from "../../data/data.vue";
 
 export default {
@@ -573,19 +589,18 @@ export default {
         ventTotalLen: null
       },
       showTip:false,
-      pattern: {
+      content: [
-        color: '#7A7E83',
+        {
-        backgroundColor: '#fff',
-        selectedColor: '#007AFF',
-        buttonColor: '#007AFF',
-        iconColor: '#fff'
-      },
-      content: [{
-        iconPath: '/static/image.png',
-        selectedIconPath: '/static/image-active.png',
           text: '温度',
-        active: false
+          textSize: 32,
-      }]
+          bgColor: '#FF7043'
+        },
+        {
+          text: '日志',
+          textSize: 32,
+          bgColor: '#24F083',
+        }
+      ]
     };
   },
 
@@ -1140,11 +1155,18 @@ export default {
         this.saveAgriTerm();
       }
     },
-    showData() {
+    showData(e) {
+      if (e.index===0) {
         this.$refs.showHistoryData.open();
         this.$nextTick(() => {
           this.$refs.historyDataRef.getAgriList()
         })
+      } else if (e.index===1) {
+        this.$refs.logDialog.open();
+      }
+    },
+    closeLogDialog() {
+      this.$refs.logDialog.close();
     }
   }
 
@@ -1251,12 +1273,6 @@ export default {
   width: 600rpx;
   background: #fff;
   border-radius: 16rpx;
-  padding: 30rpx 20rpx;
-}
-.popup {
-  width: 700rpx;
-}
-.modal-container_{
   padding: 30rpx 40rpx;
   .uni-forms-item:nth-child(1) {
     margin-bottom: 16rpx;
@@ -1266,6 +1282,9 @@ export default {
     gap: 30rpx;
   }
 }
+.popup {
+  width: 700rpx;
+}
 
 /* 核心样式：让子元素水平排列 */
 .modal-slider {
@@ -1479,4 +1498,60 @@ export default {
   border-radius: 10rpx;
   box-shadow: 8rpx 5rpx 10rpx #D9D9D9 !important
 }
+/* 日志弹窗 全新样式 不冲突 */
+.log-pop-wrap {
+  width: 600rpx;
+  max-height: 80vh;
+  background: #fff;
+  border-radius: 24rpx;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+.log-pop-header {
+  padding: 0 30rpx;
+  height: 88rpx;
+  line-height: 88rpx;
+  text-align: center;
+  font-size: 32rpx;
+  font-weight: bold;
+  background: #fff;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+.log-pop-scroll {
+  flex: 1;
+  padding: 30rpx;
+  max-height: 500rpx;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+.log-info {
+  margin-bottom: 20rpx;
+}
+.log-info-text {
+  font-size: 26rpx;
+  color: #999;
+}
+.log-content-item {
+  padding: 12rpx 0;
+  font-size: 28rpx;
+}
+.log-pop-footer {
+  padding: 20rpx 30rpx;
+  background: #fff;
+  display: flex;
+  justify-content: center;
+  border-top: 1rpx solid #f5f5f5;
+}
+.log-pop-btn {
+  width: 320rpx;
+  height: 72rpx;
+  line-height: 72rpx;
+  font-size: 30rpx;
+  border-radius: 12rpx;
+  background: #007aff;
+  color: #fff;
+  border: none;
+  text-align: center;
+}
 </style>