From be218b70f5e5bdd7eedc0a5983be64f5f7d6e8c7 Mon Sep 17 00:00:00 2001
From: chris <510148846@qq.com>
Date: Tue, 20 Jan 2026 09:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9F=A5=E8=AF=86=E7=A7=91?=
 =?UTF-8?q?=E6=99=AEtab=E9=A1=B5=EF=BC=8C=E5=B0=86tab=E9=A1=B5=E4=B9=8B?=
 =?UTF-8?q?=E5=A4=96=E7=9A=84=E9=A1=B5=E9=9D=A2=E7=A7=BB=E5=88=B0page-sub?=
 =?UTF-8?q?=E4=B8=AD,=E7=A7=BB=E9=99=A4husky?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 -
 pnpm-lock.yaml                                |  10 -
 src/api/deviceData/index.ts                   |  93 +++++++
 src/api/knowledge/index.ts                    |  27 ++
 src/api/orchard/index.ts                      |  30 +++
 src/api/pest/warning.ts                       |  21 ++
 src/api/user/index.ts                         |  17 ++
 .../changePassword/changePassword.vue         |  75 ++++++
 src/pages-sub/feedback/feedback.vue           |  37 +++
 .../pest/components/lineChart.vue             |   6 +-
 .../pest/components/pieChart.vue              |   7 +-
 src/{pages => pages-sub}/pest/config.js       |   0
 src/{pages => pages-sub}/pest/pest.vue        |  65 ++++-
 .../soil/components/lineChart.vue             |   0
 src/{pages => pages-sub}/soil/soil.vue        |   2 +-
 .../waringSetting/warningSetting.vue          |  60 +++++
 src/pages-sub/warning/warning.vue             | 154 +++++++++++
 .../weather/components/lineChart.vue          |   0
 src/{pages => pages-sub}/weather/weather.vue  |   0
 src/pages/ai/ai.vue                           |  12 +-
 src/pages/index/components/monitor.vue        |   6 +-
 src/pages/index/index.vue                     |  41 ++-
 src/pages/knowledge/knowledge.vue             | 239 ++++++++++++++++++
 src/pages/me/me.vue                           |  25 +-
 src/pages/warning/warning.vue                 | 131 ----------
 src/tabbar/config.ts                          |   9 +
 src/utils/date.ts                             |  25 ++
 uno.config.ts                                 |   4 +-
 28 files changed, 928 insertions(+), 169 deletions(-)
 create mode 100644 src/api/deviceData/index.ts
 create mode 100644 src/api/knowledge/index.ts
 create mode 100644 src/api/orchard/index.ts
 create mode 100644 src/api/pest/warning.ts
 create mode 100644 src/api/user/index.ts
 create mode 100644 src/pages-sub/changePassword/changePassword.vue
 create mode 100644 src/pages-sub/feedback/feedback.vue
 rename src/{pages => pages-sub}/pest/components/lineChart.vue (97%)
 rename src/{pages => pages-sub}/pest/components/pieChart.vue (96%)
 rename src/{pages => pages-sub}/pest/config.js (100%)
 rename src/{pages => pages-sub}/pest/pest.vue (57%)
 rename src/{pages => pages-sub}/soil/components/lineChart.vue (100%)
 rename src/{pages => pages-sub}/soil/soil.vue (99%)
 create mode 100644 src/pages-sub/waringSetting/warningSetting.vue
 create mode 100644 src/pages-sub/warning/warning.vue
 rename src/{pages => pages-sub}/weather/components/lineChart.vue (100%)
 rename src/{pages => pages-sub}/weather/weather.vue (100%)
 create mode 100644 src/pages/knowledge/knowledge.vue
 delete mode 100644 src/pages/warning/warning.vue
 create mode 100644 src/utils/date.ts

diff --git a/package.json b/package.json
index 6c20724..34d5538 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,6 @@
     "cross-env": "^10.0.0",
     "eslint": "^9.31.0",
     "eslint-plugin-format": "^1.0.1",
-    "husky": "^9.1.7",
     "lint-staged": "^15.2.10",
     "miniprogram-api-typings": "^4.1.0",
     "openapi-ts-request": "^1.6.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6ca081a..c07a657 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -199,9 +199,6 @@ importers:
       eslint-plugin-format:
         specifier: ^1.0.1
         version: 1.0.1(eslint@9.34.0(jiti@2.6.1))
-      husky:
-        specifier: ^9.1.7
-        version: 9.1.7
       lint-staged:
         specifier: ^15.2.10
         version: 15.5.2
@@ -3963,11 +3960,6 @@ packages:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
     engines: {node: '>=16.17.0'}
 
-  husky@9.1.7:
-    resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==}
-    engines: {node: '>=18'}
-    hasBin: true
-
   iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -11311,8 +11303,6 @@ snapshots:
 
   human-signals@5.0.0: {}
 
-  husky@9.1.7: {}
-
   iconv-lite@0.4.24:
     dependencies:
       safer-buffer: 2.1.2
diff --git a/src/api/deviceData/index.ts b/src/api/deviceData/index.ts
new file mode 100644
index 0000000..5012cf8
--- /dev/null
+++ b/src/api/deviceData/index.ts
@@ -0,0 +1,93 @@
+/*
+ * @Author: chris
+ * @Date: 2025-11-10 10:21:14
+ * @LastEditors: chris
+ * @LastEditTime: 2025-11-17 10:26:02
+ */
+import { http } from '@/http/http'
+
+export interface IDeviceDataQuery {
+  deptId: string
+  page: number
+  pageSize: number
+  type: number
+  deviceId: string
+  beginTime: string
+  endTime: string
+}
+
+export interface IDeviceDataItem {
+  id: string
+  deptId: string
+  deviceNo: string
+  model: string
+  type: number
+  data: string
+  createTime: string
+}
+
+// 查询设备数据列表
+export async function listDeviceData(query: IDeviceDataQuery) {
+  return await http.get<IDeviceDataItem>('/business/device-data/list', query)
+}
+
+// 导出设备数据
+export function exportDeviceData(query) {
+  return http.post('/business/device-data/export', query, { responseType: 'blob' })
+}
+
+// 查询设备数据统计分析数据
+export function getDeviceDataAnalysis(params) {
+  return http.get('/business/device-data/analysis', params)
+}
+
+// export function listDeviceData(query) {
+//   return request({
+//     url: "/business/device-data/list",
+//     method: "get",
+//     params: query,
+//   });
+// }
+
+// 查询设备数据详细
+// export function getDeviceData(id) {
+//   return request({
+//     url: "/business/device-data/" + id,
+//     method: "get",
+//   });
+// }
+
+// // 查询设备数据统计分析数据
+// export function getDeviceDataAnalysis(params) {
+//   return request({
+//     url: "/business/device-data/analysis",
+//     method: "get",
+//     params,
+//   });
+// }
+
+// // 新增设备数据
+// export function addDeviceData(data) {
+//   return request({
+//     url: "/business/device-data",
+//     method: "post",
+//     data,
+//   });
+// }
+
+// // 修改设备数据
+// export function updateDeviceData(data) {
+//   return request({
+//     url: "/business/device-data",
+//     method: "put",
+//     data,
+//   });
+// }
+
+// // 删除设备数据
+// export function delDeviceData(id) {
+//   return request({
+//     url: "/business/device-data/" + id,
+//     method: "delete",
+//   });
+// }
diff --git a/src/api/knowledge/index.ts b/src/api/knowledge/index.ts
new file mode 100644
index 0000000..f641a8d
--- /dev/null
+++ b/src/api/knowledge/index.ts
@@ -0,0 +1,27 @@
+/*
+ * @Author: chris
+ * @Date: 2026-01-19 16:49:53
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 16:59:22
+ */
+import { http } from '@/http/http'
+
+export interface IKnowledgeListQuery {
+  deptId: number
+  content?: string
+  pageNum: number
+  pageSize: number
+}
+
+export interface IKnowledge {
+  id: number
+  title: string
+  content: string
+  createTime: string
+  updateTime: string
+}
+
+// 获取知识列表
+export async function getKnowledgeList(query: IKnowledgeListQuery) {
+  return await http.get<IKnowledge[]>('/business/article/list', query)
+}
diff --git a/src/api/orchard/index.ts b/src/api/orchard/index.ts
new file mode 100644
index 0000000..a1c4d2e
--- /dev/null
+++ b/src/api/orchard/index.ts
@@ -0,0 +1,30 @@
+/*
+ * @Author: chris
+ * @Date: 2026-01-19 15:55:45
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 16:30:25
+ */
+import { http } from '@/http/http'
+
+export interface IOrchardInfo {
+  deptId: number
+  deptName: string
+  email: string
+  leader: string
+  parentId: number
+  parentName: string
+  phone: string
+  plantingArea: string
+  plantingNum: string
+  remark: string
+  status: string
+  terrain: string
+  updateBy: string
+  updateTime: string
+  variety: string
+}
+
+// 获取果园信息
+export async function getOrchardInfo(orchardId: string) {
+  return await http.get<IOrchardInfo>(`/system/dept/${orchardId}`)
+}
diff --git a/src/api/pest/warning.ts b/src/api/pest/warning.ts
new file mode 100644
index 0000000..e77f5ed
--- /dev/null
+++ b/src/api/pest/warning.ts
@@ -0,0 +1,21 @@
+import { http } from '@/http/http'
+
+export interface IWarningQuery {
+  deptId: number
+  beginTime?: string
+  endTime?: string
+  pageNum: number
+  pageSize: number
+}
+
+export interface IWarning {
+  id: number
+  deptId: number
+  notifyContent: string
+  createTime: string
+}
+
+// 获取预警列表
+export async function getWarningList(query: IWarningQuery) {
+  return await http.get<IWarning[]>(`/business/notify-log/list`, query)
+}
diff --git a/src/api/user/index.ts b/src/api/user/index.ts
new file mode 100644
index 0000000..b55d327
--- /dev/null
+++ b/src/api/user/index.ts
@@ -0,0 +1,17 @@
+/*
+ * @Author: chris
+ * @Date: 2025-11-10 10:21:14
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 15:43:07
+ */
+import { http } from '@/http/http'
+
+export interface IResetPassword {
+  userId: string
+  password: string
+}
+
+// 重置用户密码
+export async function resetPassword(query: IResetPassword) {
+  return await http.put<IResetPassword>('/system/user/resetPwd', query)
+}
diff --git a/src/pages-sub/changePassword/changePassword.vue b/src/pages-sub/changePassword/changePassword.vue
new file mode 100644
index 0000000..0661c13
--- /dev/null
+++ b/src/pages-sub/changePassword/changePassword.vue
@@ -0,0 +1,75 @@
+<!--
+ * @Author: chris
+ * @Date: 2026-01-06 17:17:48
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 15:52:08
+-->
+<template>
+  <view class="changePassword-page">
+    <wd-form ref="form" :model="model">
+      <wd-cell-group border>
+        <!-- <wd-input
+          v-model="form.oldPwd"
+          label="旧密码"
+          label-width="100px"
+          prop="oldPwd"
+          show-password
+          clearable
+          placeholder="请输入旧密码"
+          :rules="[{ required: true, message: '请填写密码' }]"
+        /> -->
+        <wd-input
+          v-model="form.newPwd"
+          label="新密码"
+          label-width="100px"
+          prop="newPwd"
+          show-password
+          clearable
+          placeholder="请输入新密码"
+          :rules="[{ required: true, message: '请填写密码' }]"
+        />
+      </wd-cell-group>
+      <view class="footer">
+        <wd-button type="primary" size="large" block @click="handleSubmit">
+          提交
+        </wd-button>
+      </view>
+    </wd-form>
+  </view>
+</template>
+
+<script setup>
+import { resetPassword } from '@/api/user'
+
+const form = ref({
+  // oldPwd: '',
+  newPwd: '',
+})
+
+function handleSubmit() {
+  // form.value.oldPwd = form.value.oldPwd.trim()
+  resetPassword({
+    userId: uni.getStorageSync('userId'),
+    password: form.value.newPwd,
+  }).then((res) => {
+    if (res.code === 200) {
+      uni.showToast({
+        title: '密码重置成功',
+        icon: 'success',
+      })
+      uni.navigateBack()
+    }
+    form.value.newPwd = form.value.newPwd.trim()
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.changePassword-page {
+  padding: 20rpx;
+
+  .footer {
+    margin-top: 40rpx;
+  }
+}
+</style>
diff --git a/src/pages-sub/feedback/feedback.vue b/src/pages-sub/feedback/feedback.vue
new file mode 100644
index 0000000..c2a3795
--- /dev/null
+++ b/src/pages-sub/feedback/feedback.vue
@@ -0,0 +1,37 @@
+<!--
+ * @Author: chris
+ * @Date: 2026-01-06 17:43:28
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 15:30:16
+-->
+<script setup>
+const content = ref('')
+
+function submitFeedback() {
+
+}
+</script>
+
+<template>
+  <view class="feedback-container">
+    <wd-form ref="form" :model="model">
+      <wd-textarea v-model="content" placeholder="请填写反馈内容" />
+      <view class="footer">
+        <wd-button type="primary" size="large" block @click="submitFeedback">
+          提交反馈
+        </wd-button>
+      </view>
+    </wd-form>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.feedback-container {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  height: 100vh;
+}
+.footer {
+  margin-top: 40rpx;
+}
+</style>
diff --git a/src/pages/pest/components/lineChart.vue b/src/pages-sub/pest/components/lineChart.vue
similarity index 97%
rename from src/pages/pest/components/lineChart.vue
rename to src/pages-sub/pest/components/lineChart.vue
index 142d720..a1ccb9d 100644
--- a/src/pages/pest/components/lineChart.vue
+++ b/src/pages-sub/pest/components/lineChart.vue
@@ -2,7 +2,7 @@
  * @Author: chris
  * @Date: 2025-10-21 11:42:40
  * @LastEditors: chris
- * @LastEditTime: 2025-10-22 10:26:02
+ * @LastEditTime: 2025-11-17 10:17:04
 -->
 <script setup name="line-chart">
 import LEchart from '@/uni_modules/lime-echart_1.0.5/components/l-echart/l-echart.vue'
@@ -24,6 +24,10 @@ const props = defineProps({
 const lineChartRef = ref(null)
 let lineChart = null
 
+watch(() => props.chartData, () => {
+  refreshChart()
+})
+
 onMounted(async () => {
   nextTick(async () => {
     await initChart()
diff --git a/src/pages/pest/components/pieChart.vue b/src/pages-sub/pest/components/pieChart.vue
similarity index 96%
rename from src/pages/pest/components/pieChart.vue
rename to src/pages-sub/pest/components/pieChart.vue
index 567a3b0..c78c3dc 100644
--- a/src/pages/pest/components/pieChart.vue
+++ b/src/pages-sub/pest/components/pieChart.vue
@@ -2,7 +2,7 @@
  * @Author: chris
  * @Date: 2025-10-21 11:42:40
  * @LastEditors: chris
- * @LastEditTime: 2025-10-22 10:26:22
+ * @LastEditTime: 2025-11-17 10:19:34
 -->
 <script setup name="pie-chart">
 import LEchart from '@/uni_modules/lime-echart_1.0.5/components/l-echart/l-echart.vue'
@@ -52,9 +52,14 @@ const props = defineProps({
 const pieChartRef = ref(null)
 let pieChart = null
 
+watch(() => props.chartData, () => {
+  refreshChart()
+})
+
 onMounted(async () => {
   await initChart()
 })
+
 async function initChart() {
   if (!pieChartRef.value)
     return
diff --git a/src/pages/pest/config.js b/src/pages-sub/pest/config.js
similarity index 100%
rename from src/pages/pest/config.js
rename to src/pages-sub/pest/config.js
diff --git a/src/pages/pest/pest.vue b/src/pages-sub/pest/pest.vue
similarity index 57%
rename from src/pages/pest/pest.vue
rename to src/pages-sub/pest/pest.vue
index fd31e10..2f12343 100644
--- a/src/pages/pest/pest.vue
+++ b/src/pages-sub/pest/pest.vue
@@ -2,9 +2,13 @@
  * @Author: chris
  * @Date: 2025-10-17 11:52:06
  * @LastEditors: chris
- * @LastEditTime: 2025-10-22 14:16:01
+ * @LastEditTime: 2025-11-17 10:50:12
 -->
 <script setup>
+import { useToast } from 'wot-design-uni'
+
+import { getDeviceDataAnalysis } from '@/api/deviceData/index'
+
 const echarts = require('../../uni_modules/lime-echart_1.0.5/static/echarts.min2.js')
 
 import LineChart from './components/lineChart.vue'
@@ -16,9 +20,15 @@ definePage({
   },
 })
 
+const toast = useToast()
 const { proxy } = getCurrentInstance()
 const query = uni.createSelectorQuery().in(proxy)
 
+const orchardId = ref(0)
+const daysRange = getDateRange(7)
+const lineChartData = ref({})
+const pieChartData = ref({})
+
 const chartSize = ref({
   lineChart: {
     width: 0,
@@ -33,8 +43,57 @@ const chartSize = ref({
 onMounted(async () => {
   // await getChartCanvasSize('lineChart')
   // await getChartCanvasSize('pieChart')
+  const res = await getPestAnalysisData()
+  const { lineRes, pieRes } = formatData(res.rows)
+  lineChartData.value = createChartData(lineRes, 'line')
+  pieChartData.value = createChartData(pieRes, 'pie')
 })
 
+async function getPestAnalysisData() {
+  try {
+    return await getDeviceDataAnalysis({
+      beginTime: daysRange[0],
+      endTime: daysRange[1],
+      type: 1,
+      deptId: orchardId.value,
+    })
+  }
+  catch (error) {
+    toast.error(`获取虫情数据失败: ${error.message || '未知错误'}`)
+    console.error('Failed to get soil analysis data:', error)
+    return error
+  }
+}
+
+function formatData(data = []) {
+  const lineRes = {}
+  const pieRes = {}
+  data.forEach((item) => {
+    const date = item.createTime.split(' ')[0].replace(/-/g, '/')
+    lineRes[item.name] ? lineRes[item.name].push(item) : (lineRes[item.name] = [item])
+    pieRes[date] ? pieRes[date].push(item) : (pieRes[date] = [item])
+  })
+  return {
+    lineRes,
+    pieRes,
+  }
+}
+
+function createChartData(data, type) {
+  const keys = Object.keys(data)
+  const values = []
+  keys.forEach((key) => {
+    values.push(data[key].reduce((pre, cur) => cur + (pre.value || 0), 0))
+  })
+  return type === 'line' ? { dates: keys, values } : { names: keys, values }
+}
+
+function getDateRange(num) {
+  const nowDate = new Date().toLocaleString().replace(/\//g, '-')
+  const preDate = new Date(+new Date(nowDate) - num * 24 * 60 * 60 * 1000).toLocaleString().replace(/\//g, '-')
+  return [preDate, nowDate]
+}
+
 async function getCanvasSize(id) {
   return new Promise((resolve, reject) => {
     query.select(`#${id}`).boundingClientRect((info) => {
@@ -72,7 +131,7 @@ async function getChartCanvasSize(id) {
         近7天虫害趋势
       </view> -->
       <!-- <l-echart id="lineChart" ref="lineChartRef" class="chart" /> -->
-      <line-chart id="lineChart" :echarts="echarts" />
+      <line-chart id="lineChart" :echarts="echarts" :chart-data="lineChartData" />
     </wd-card>
 
     <!-- 饼图区域 -->
@@ -80,7 +139,7 @@ async function getChartCanvasSize(id) {
       <!-- <view class="chart-title">
         虫害类型分布
       </view> -->
-      <pie-chart id="pieChart" :echarts="echarts" />
+      <pie-chart id="pieChart" :echarts="echarts" :chart-data="pieChartData" />
     </wd-card>
   </view>
 </template>
diff --git a/src/pages/soil/components/lineChart.vue b/src/pages-sub/soil/components/lineChart.vue
similarity index 100%
rename from src/pages/soil/components/lineChart.vue
rename to src/pages-sub/soil/components/lineChart.vue
diff --git a/src/pages/soil/soil.vue b/src/pages-sub/soil/soil.vue
similarity index 99%
rename from src/pages/soil/soil.vue
rename to src/pages-sub/soil/soil.vue
index 0f439fe..c11b169 100644
--- a/src/pages/soil/soil.vue
+++ b/src/pages-sub/soil/soil.vue
@@ -2,7 +2,7 @@
  * @Author: chris
  * @Date: 2025-10-22 10:46:12
  * @LastEditors: chris
- * @LastEditTime: 2025-10-22 15:29:18
+ * @LastEditTime: 2025-11-17 16:53:08
 -->
 <script setup lang="ts">
 // 导入组件和库
diff --git a/src/pages-sub/waringSetting/warningSetting.vue b/src/pages-sub/waringSetting/warningSetting.vue
new file mode 100644
index 0000000..8dc527f
--- /dev/null
+++ b/src/pages-sub/waringSetting/warningSetting.vue
@@ -0,0 +1,60 @@
+<!--
+ * @Author: chris
+ * @Date: 2026-01-19 17:59:19
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 18:18:52
+-->
+<script setup>
+definePage({
+  style: {
+    navigationBarTitleText: '预警推送设置',
+  },
+})
+
+const pushPlatform = ref('')
+const pushTemplate = ref('')
+
+const platformTypes = [
+  {
+    label: '公众号',
+    value: 'wechat',
+  },
+  {
+    label: '短信',
+    value: 'sms',
+  },
+]
+
+const templateTypes = [
+  {
+    label: '模板1',
+    value: 'template1',
+  },
+  {
+    label: '模板2',
+    value: 'template2',
+  },
+]
+
+function handleChange(item, type) {
+  if (type === 'platform') {
+    pushPlatform.value = item.value
+  }
+  else if (type === 'template') {
+    pushTemplate.value = item.value
+  }
+}
+</script>
+
+<template>
+  <view class="warning-setting">
+    <wd-select-picker v-model="pushPlatform" value-key="value" label-key="label" label="推送平台" type="radio" :columns="platformTypes" @change="handleChange($event, 'platform')" />
+    <wd-select-picker v-model="pushTemplate" value-key="value" label-key="label" label="推送模板" type="radio" :columns="templateTypes" @change="handleChange($event, 'template')" />
+  </view>
+</template>
+
+<style scoped lang="scss">
+.warning-setting {
+  @apply bg-[#f8f8f8] h-[100vh] py-[20rpx];
+}
+</style>
diff --git a/src/pages-sub/warning/warning.vue b/src/pages-sub/warning/warning.vue
new file mode 100644
index 0000000..a40a3d0
--- /dev/null
+++ b/src/pages-sub/warning/warning.vue
@@ -0,0 +1,154 @@
+<!--
+ * @Author: chris
+ * @Date: 2025-10-23 16:55:09
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 17:52:20
+-->
+<script setup lang="ts">
+// import type { IWarning, IWarningListQuery } from '@/api/warning'
+import type { IWarning, IWarningQuery } from '@/api/pest/warning'
+import { getWarningList } from '@/api/pest/warning'
+import { formatDate } from '@/utils/date'
+
+definePage({
+  style: {
+    navigationBarTitleText: '预警信息',
+  },
+})
+
+const queryParams = ref<IWarningQuery>({
+  deptId: 0,
+  beginTime: '',
+  endTime: '',
+  pageSize: 10,
+  pageNum: 1,
+})
+
+const isLoading = ref<boolean>(false)
+const dateRange = ref<number[]>([null, null])
+const warningList = ref<IWarning[]>([{
+  id: 1,
+  deptId: 1,
+  notifyContent: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
+  createTime: '2026-01-19 17:46:57',
+}, {
+  id: 2,
+  deptId: 1,
+  notifyContent: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
+  createTime: '2026-01-19 17:46:57',
+}, {
+  id: 3,
+  deptId: 1,
+  notifyContent: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
+  createTime: '2026-01-19 17:46:57',
+}, {
+  id: 4,
+  deptId: 1,
+  notifyContent: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
+  createTime: '2026-01-19 17:46:57',
+}, {
+  id: 5,
+  deptId: 1,
+  notifyContent: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
+  createTime: '2026-01-19 17:46:57',
+}, {
+  id: 6,
+  deptId: 1,
+  notifyContent: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
+  createTime: '2026-01-19 17:46:57',
+}, {
+  id: 7,
+  deptId: 1,
+  notifyContent: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
+  createTime: '2026-01-19 17:46:57',
+}])
+
+async function loadData() {
+  isLoading.value = true
+  try {
+    const res = await getWarningList(queryParams.value)
+    warningList.value = res || []
+  }
+  finally {
+    isLoading.value = false
+  }
+}
+
+function handleConfirm(value: number[]) {
+  console.log(value)
+  queryParams.value.beginTime = formatDate(dateRange.value[0]).split(' ')[0]
+  queryParams.value.endTime = formatDate(dateRange.value[1]).split(' ')[0]
+  console.log('handleConfirm', queryParams.value)
+}
+
+function handleSubmit(value: number[]) {
+  console.log(value)
+  queryParams.value.pageNum = 1
+  loadData()
+}
+
+function handleScrollLower() {
+  console.log('scroll lower')
+}
+</script>
+
+<template>
+  <view class="warning-page">
+    <wd-drop-menu>
+      <wd-drop-menu-item title="筛选">
+        <view class="filter-container">
+          <wd-calendar v-model="dateRange" type="daterange" @confirm="handleConfirm" />
+          <wd-button class="submit-btn" type="primary" block @click="handleSubmit">
+            查询
+          </wd-button>
+        </view>
+      </wd-drop-menu-item>
+    </wd-drop-menu>
+    <scroll-view scroll-y @scrolltolower="handleScrollLower">
+      <view class="warning-list">
+        <wd-card v-for="(item, index) in warningList" :key="index" class="warning-item">
+          <view class="warning-content">
+            <wd-text :text="item.notifyContent" />
+            <view class="warning-time">
+              <wd-text size="12px" :text="item.createTime" />
+            </view>
+          </view>
+        </wd-card>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.warning-page {
+  @apply bg-[#f5f5f5];
+}
+
+.filter-container {
+  @apply p-20px;
+
+  .submit-btn {
+    @apply mt-30px;
+  }
+}
+
+scroll-view {
+  @apply h-[calc(100vh-48px)];
+}
+
+.warning-list {
+  @apply py-15px;
+}
+
+.warning-content {
+  @apply py-10px;
+}
+
+.warning-time {
+  @apply mt-20px text-right;
+
+  > .wd-text {
+    @apply py-2px px-6px bg-[#f5f5f5] rounded-8px;
+  }
+}
+</style>
diff --git a/src/pages/weather/components/lineChart.vue b/src/pages-sub/weather/components/lineChart.vue
similarity index 100%
rename from src/pages/weather/components/lineChart.vue
rename to src/pages-sub/weather/components/lineChart.vue
diff --git a/src/pages/weather/weather.vue b/src/pages-sub/weather/weather.vue
similarity index 100%
rename from src/pages/weather/weather.vue
rename to src/pages-sub/weather/weather.vue
diff --git a/src/pages/ai/ai.vue b/src/pages/ai/ai.vue
index 88ed12a..1b3b459 100644
--- a/src/pages/ai/ai.vue
+++ b/src/pages/ai/ai.vue
@@ -2,11 +2,9 @@
  * @Author: chris
  * @Date: 2025-11-03 09:54:47
  * @LastEditors: chris
- * @LastEditTime: 2025-11-05 10:23:37
+ * @LastEditTime: 2025-11-05 10:33:42
 -->
 <script setup lang="ts">
-import { nextTick, onMounted, ref } from 'vue'
-
 // 聊天消息类型定义
 interface Message {
   id: number
@@ -25,7 +23,7 @@ const query = uni.createSelectorQuery().in(proxy)
 const messages = ref<Message[]>([])
 const inputMessage = ref('')
 const isTyping = ref(false)
-const chatContainerRef = ref<HTMLElement>(null)
+const chatContainerRef = ref<HTMLElement | null>(null)
 const scrollTop = ref(0)
 
 // 系统提示信息
@@ -142,12 +140,6 @@ function sendImg() {
         icon: 'none',
       })
       // #endif
-      // #ifdef MP-ALIPAY
-      my.showToast({
-        content: '选择图片失败',
-        type: 'none',
-      })
-      // #endif
     },
   })
   // #endif
diff --git a/src/pages/index/components/monitor.vue b/src/pages/index/components/monitor.vue
index fbb4f99..41eae77 100644
--- a/src/pages/index/components/monitor.vue
+++ b/src/pages/index/components/monitor.vue
@@ -11,21 +11,21 @@ const modules = [
     title: '虫情监控',
     icon: bug,
     desc: '实时监测果园病虫害情况',
-    route: '/pages/pest/pest',
+    route: '/pages-sub/pest/pest',
   },
   {
     id: 'soil',
     title: '土壤墒情',
     icon: turangshuishi,
     desc: '监测土壤湿度、养分等数据',
-    route: '/pages/soil/soil',
+    route: '/pages-sub/soil/soil',
   },
   {
     id: 'weather',
     title: '气象监测',
     icon: tianqiyujing,
     desc: '温度、湿度、光照等数据',
-    route: '/pages/weather/weather',
+    route: '/pages-sub/weather/weather',
   },
   {
     id: 'drone',
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 1a1029c..b99ba95 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -2,9 +2,11 @@
  * @Author: chris
  * @Date: 2025-09-15 09:51:59
  * @LastEditors: chris
- * @LastEditTime: 2025-10-29 14:13:34
+ * @LastEditTime: 2026-01-19 16:43:21
 -->
 <script setup>
+import { getOrchardInfo } from '@/api/orchard'
+import { getWarningList } from '@/api/pest/warning'
 import BasicInfo from './components/basicInfo.vue'
 import Monitor from './components/monitor.vue'
 import Title from './components/title.vue'
@@ -16,11 +18,40 @@ definePage({
   },
 })
 
+const loading = ref(false)
+const orchardInfo = ref(null)
+const orchardId = '105'
+const warningList = ref([])
+
+getBaseInfo()
+getWarningListData()
+
+// 获取果园基本信息
+function getBaseInfo() {
+  loading.value = true
+  return getOrchardInfo(orchardId).then((res) => {
+    orchardInfo.value = res.data
+  }).finally(() => {
+    loading.value = false
+  })
+}
+
+// 获取虫情预警列表
+function getWarningListData() {
+  return getWarningList({
+    deptId: orchardInfo.value?.deptId,
+    pageNum: 1,
+    pageSize: 5,
+  }).then((res) => {
+    warningList.value = res.data
+  })
+}
+
 // 处理更多预警点击事件
 function handleMoreWarning() {
   uni.navigateTo({
-    // url: '/pages/warning/warning',
-    url: '/pages/auth/auth',
+    url: '/pages-sub/warning/warning',
+    // url: '/pages/auth/auth',
   })
 }
 </script>
@@ -34,9 +65,8 @@ function handleMoreWarning() {
         <view class="title-accent" />
       </view>
     </view>
-
     <!-- 首页内容区域 -->
-    <view class="home-content">
+    <view v-if="!loading" class="home-content">
       <!-- 基本信息区域 -->
       <Title title="基本信息" />
       <basic-info />
@@ -51,6 +81,7 @@ function handleMoreWarning() {
       </Title>
       <Warning />
     </view>
+    <wd-loading v-else />
   </view>
 </template>
 
diff --git a/src/pages/knowledge/knowledge.vue b/src/pages/knowledge/knowledge.vue
new file mode 100644
index 0000000..12273f3
--- /dev/null
+++ b/src/pages/knowledge/knowledge.vue
@@ -0,0 +1,239 @@
+<!--
+ * @Author: chris
+ * @Date: 2025-12-02 09:43:34
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 17:07:21
+-->
+<script setup lang="ts">
+import type { IKnowledge, IKnowledgeListQuery } from '@/api/knowledge'
+import { getKnowledgeList } from '@/api/knowledge'
+
+// 状态管理
+const searchQuery = ref<string>('')
+const queryParams = ref<IKnowledgeListQuery>({
+  deptId: 0,
+  content: '',
+  pageNum: 1,
+  pageSize: 10,
+})
+const pestList = ref<IKnowledge[]>([])
+const isLoading = ref(false)
+
+// 加载数据
+async function loadData() {
+  isLoading.value = true
+  try {
+    const res = await getKnowledgeList(queryParams.value)
+    pestList.value = res || []
+  }
+  finally {
+    isLoading.value = false
+  }
+}
+
+// 处理搜索
+function handleSearch() {
+  queryParams.value.content = searchQuery.value
+  loadData()
+}
+
+// 跳转到详情页
+function navigateToDetail(id: number) {
+  uni.navigateTo({
+    url: '/pages-sub/pest/detail',
+    query: { id },
+  })
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+  loadData()
+})
+</script>
+
+<template>
+  <scroll-view scroll-y class="pest-knowledge-page">
+    <!-- 搜索框 -->
+    <view class="search-container">
+      <view class="search-box">
+        <uni-icons name="search" size="20" color="#999" class="search-icon" />
+        <input
+          v-model="searchQuery"
+          type="text"
+          placeholder="搜索虫害知识..."
+          class="search-input"
+          @input="handleSearch"
+        >
+      </view>
+    </view>
+
+    <!-- 知识列表 -->
+    <view class="knowledge-list">
+      <uni-load-more
+        v-if="isLoading"
+        status="loading"
+        class="loading-indicator"
+      />
+
+      <!-- 列表为空提示 -->
+      <view v-else-if="pestList.length === 0" class="empty-state">
+        <uni-icons name="warning-empty" size="60" color="#ccc" />
+        <text class="empty-text">暂无相关知识</text>
+      </view>
+
+      <!-- 列表项 -->
+      <view
+        v-for="item in pestList"
+        v-else
+        :key="item.id"
+        class="knowledge-item"
+        @click="navigateToDetail(item.id)"
+      >
+        <view class="item-image">
+          <image :src="item.imageUrl" mode="aspectFill" />
+        </view>
+        <view class="item-content">
+          <text class="item-title">{{ item.title }}</text>
+          <text class="item-description">{{ item.content }}</text>
+          <view class="item-meta">
+            <text class="item-date">{{ item.createTime }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </scroll-view>
+</template>
+
+<style scoped lang="scss">
+.pest-knowledge-page {
+  height: calc(100vh - 50px - var(--safe-area-inset-bottom));
+  background-color: #f8f8f8;
+}
+
+/* 搜索框 */
+.search-container {
+  padding: 12px 20px;
+  background-color: #fff;
+  margin-bottom: 20px;
+}
+
+.search-box {
+  display: flex;
+  align-items: center;
+  background-color: #f5f5f5;
+  border-radius: 20px;
+  padding: 0 16px;
+}
+
+.search-icon {
+  margin-right: 8px;
+}
+
+.search-input {
+  flex: 1;
+  height: 40px;
+  font-size: 15px;
+  color: #333;
+}
+
+.search-input::placeholder {
+  color: #999;
+}
+
+/* 知识列表 */
+.knowledge-list {
+  padding: 20px;
+}
+
+.loading-indicator {
+  padding: 20px 0;
+}
+
+/* 空状态 */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60px 0;
+}
+
+.empty-text {
+  margin-top: 12px;
+  font-size: 14px;
+  color: #999;
+}
+
+/* 列表项 */
+.knowledge-item {
+  display: flex;
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+  transition:
+    transform 0.2s,
+    box-shadow 0.2s;
+
+  + .knowledge-item {
+    margin-top: 12px;
+  }
+}
+
+.knowledge-item:active {
+  transform: scale(0.98);
+}
+
+.item-image {
+  width: 100px;
+  height: 100px;
+  margin-right: 16px;
+  flex-shrink: 0;
+}
+
+.item-image image {
+  width: 100%;
+  height: 100%;
+  border-radius: 8px;
+}
+
+.item-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.item-title {
+  font-size: 16px;
+  font-weight: 500;
+  color: #333;
+  margin-bottom: 8px;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+.item-description {
+  font-size: 13px;
+  color: #666;
+  margin-bottom: 12px;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  line-height: 1.4;
+}
+
+.item-meta {
+  display: flex;
+  align-items: center;
+  font-size: 11px;
+  color: #999;
+}
+
+.item-date {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/pages/me/me.vue b/src/pages/me/me.vue
index 957a3a6..8ffd807 100644
--- a/src/pages/me/me.vue
+++ b/src/pages/me/me.vue
@@ -73,6 +73,27 @@ function handleLogout() {
     },
   })
 }
+
+// 推送设置
+function handlePushSetting() {
+  uni.navigateTo({
+    url: '/pages-sub/waringSetting/warningSetting',
+  })
+}
+
+// 修改密码
+function handleChangePassword() {
+  uni.navigateTo({
+    url: '/pages-sub/changePassword/changePassword',
+  })
+}
+
+// 意见反馈
+function handleFeedback() {
+  uni.navigateTo({
+    url: '/pages-sub/feedback/feedback',
+  })
+}
 </script>
 
 <template>
@@ -104,7 +125,9 @@ function handleLogout() {
     <wd-card>
       <wd-cell-group :border="true">
         <wd-cell title="我的果园" value="***果园" />
-        <wd-cell title="推送设置" is-link />
+        <wd-cell title="推送设置" is-link @click="handlePushSetting" />
+        <wd-cell title="意见反馈" is-link @click="handleFeedback" />
+        <wd-cell title="修改密码" is-link @click="handleChangePassword" />
       </wd-cell-group>
     </wd-card>
 
diff --git a/src/pages/warning/warning.vue b/src/pages/warning/warning.vue
deleted file mode 100644
index f76edf2..0000000
--- a/src/pages/warning/warning.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<!--
- * @Author: chris
- * @Date: 2025-10-23 16:55:09
- * @LastEditors: chris
- * @LastEditTime: 2025-10-24 10:13:44
--->
-<script setup lang="ts">
-interface Form {
-  beginTime: string
-  endTime: string
-  pageSize: number
-  pageNum: number
-}
-
-interface Warning {
-  title: string
-  time: string
-}
-
-definePage({
-  style: {
-    navigationBarTitleText: '预警信息',
-  },
-})
-
-const form = ref<Form>({
-  beginTime: '',
-  endTime: '',
-  pageSize: 10,
-  pageNum: 1,
-})
-
-const dateRange = ref<number[]>([null, null])
-const warningList = ref<Warning[]>([{
-  title: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
-  time: '2小时前',
-}, {
-  title: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
-  time: '2小时前',
-}, {
-  title: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
-  time: '2小时前',
-}, {
-  title: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
-  time: '2小时前',
-}, {
-  title: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
-  time: '2小时前',
-}, {
-  title: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
-  time: '2小时前',
-}, {
-  title: '监测到果园东区荔枝蒂蛀虫密度异常增高，预计48小时内可能大规模爆发可能大规模爆发可能大规模爆发123123123123',
-  time: '2小时前',
-}])
-
-function handleConfirm(value: number[]) {
-  console.log(value)
-  form.value.beginTime = dateRange.value[0] as any
-  form.value.endTime = dateRange.value[1] as any
-}
-
-function handleSubmit(value: number[]) {
-  console.log(value)
-}
-
-function handleScrollLower() {
-  console.log('scroll lower')
-}
-</script>
-
-<template>
-  <view class="warning-page">
-    <wd-drop-menu>
-      <wd-drop-menu-item title="筛选">
-        <view class="filter-container">
-          <wd-calendar v-model="dateRange" type="daterange" @confirm="handleConfirm" />
-          <wd-button class="submit-btn" type="primary" block @click="handleSubmit">
-            查询
-          </wd-button>
-        </view>
-      </wd-drop-menu-item>
-    </wd-drop-menu>
-    <scroll-view scroll-y @scrolltolower="handleScrollLower">
-      <view class="warning-list">
-        <wd-card v-for="(item, index) in warningList" :key="index" class="warning-item">
-          <view class="warning-content">
-            <wd-text :text="item.title" />
-            <view class="warning-time">
-              <wd-text size="12px" :text="item.time" />
-            </view>
-          </view>
-        </wd-card>
-      </view>
-    </scroll-view>
-  </view>
-</template>
-
-<style lang="scss" scoped>
-.warning-page {
-  @apply bg-[#f5f5f5];
-}
-
-.filter-container {
-  @apply p-20px;
-
-  .submit-btn {
-    @apply mt-30px;
-  }
-}
-
-scroll-view {
-  @apply h-[calc(100vh-48px)];
-}
-
-.warning-list {
-  @apply py-15px;
-}
-
-.warning-content {
-  @apply py-10px;
-}
-
-.warning-time {
-  @apply mt-20px text-right;
-
-  > .wd-text {
-    @apply py-2px px-6px bg-[#f5f5f5] rounded-8px;
-  }
-}
-</style>
diff --git a/src/tabbar/config.ts b/src/tabbar/config.ts
index aa781bd..adcfd25 100644
--- a/src/tabbar/config.ts
+++ b/src/tabbar/config.ts
@@ -74,6 +74,15 @@ export const customTabbarList: CustomTabBarItem[] = [
     icon: 'i-carbon-ai',
     // badge: 10,
   },
+  {
+    pagePath: 'pages/knowledge/knowledge',
+    text: '知识',
+    // 1）在fg-tabbar.vue页面上引入一下并注释掉（见tabbar/index.vue代码第2行）
+    // 2）配置到 unocss.config.ts 的 safelist 中
+    iconType: 'unocss',
+    icon: 'i-carbon-ibm-watson-knowledge-studio',
+    // badge: 10,
+  },
   {
     pagePath: 'pages/me/me',
     text: '我的',
diff --git a/src/utils/date.ts b/src/utils/date.ts
new file mode 100644
index 0000000..a2cb5bb
--- /dev/null
+++ b/src/utils/date.ts
@@ -0,0 +1,25 @@
+/*
+ * @Author: chris
+ * @Date: 2026-01-19 17:35:18
+ * @LastEditors: chris
+ * @LastEditTime: 2026-01-19 17:38:51
+ */
+export function formatDate(cellValue: string | number): string {
+  if (cellValue == null || cellValue === '')
+    return ''
+  const date = new Date(cellValue)
+  const year = date.getFullYear()
+  const month
+    = date.getMonth() + 1 < 10
+      ? `0${date.getMonth() + 1}`
+      : date.getMonth() + 1
+  const day = date.getDate() < 10 ? `0${date.getDate()}` : date.getDate()
+  const hours = date.getHours() < 10 ? `0${date.getHours()}` : date.getHours()
+  const minutes
+    = date.getMinutes() < 10 ? `0${date.getMinutes()}` : date.getMinutes()
+  const seconds
+    = date.getSeconds() < 10 ? `0${date.getSeconds()}` : date.getSeconds()
+  return (
+    `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+  )
+}
diff --git a/uno.config.ts b/uno.config.ts
index a142ad6..2009b0c 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -2,7 +2,7 @@
  * @Author: chris
  * @Date: 2025-10-20 10:45:46
  * @LastEditors: chris
- * @LastEditTime: 2025-11-03 10:14:17
+ * @LastEditTime: 2025-12-02 10:12:29
  */
 import type {
   Preset,
@@ -57,7 +57,7 @@ export default defineConfig({
     },
   ],
   // 动态图标需要在这里配置，或者写在vue页面中注释掉
-  safelist: ['i-carbon-code', 'i-carbon-home', 'i-carbon-user', 'i-carbon-ai'],
+  safelist: ['i-carbon-home', 'i-carbon-user', 'i-carbon-ai', 'i-carbon-ibm-watson-knowledge-studio'],
   rules: [
     [
       'p-safe',