From 6a12162705bb4f6d31a5b6d26c73016e8e5883bf Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Tue, 10 Mar 2026 23:24:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20H5=E5=A4=9A=E9=A1=B9=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE/=E5=B8=83=E5=B1=80/?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97/=E5=85=BC=E5=AE=B9=E6=80=A7/BASE=5FURL?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 odf-uniapp/components/add-note-dialog.vue     |    1 +
 odf-uniapp/components/port-edit-dialog.vue    | 1011 +++++++++--------
 odf-uniapp/manifest.json                      |   15 +-
 odf-uniapp/pages.json                         |  229 ++--
 odf-uniapp/pages/cable/index.vue              |   38 +-
 odf-uniapp/pages/fault-add/index.vue          |   24 +
 odf-uniapp/pages/home/index.vue               |   42 +-
 odf-uniapp/pages/portal/index.vue             |   12 +-
 odf-uniapp/pages/start/index.vue              |    4 +-
 odf-uniapp/pages/trunk-search/index.vue       |   13 +-
 odf-uniapp/pages/trunk/index.vue              |   13 +-
 odf-uniapp/services/api.js                    |    2 +-
 odf-uniapp/services/trunk.js                  |    4 +-
 odf-uniapp/utils/watermark.js                 |  101 +-
 .../src/components/business/OdfCableForm.vue  |   17 +
 15 files changed, 822 insertions(+), 704 deletions(-)

diff --git a/odf-uniapp/components/add-note-dialog.vue b/odf-uniapp/components/add-note-dialog.vue
index d09b3f7..9edb005 100644
--- a/odf-uniapp/components/add-note-dialog.vue
+++ b/odf-uniapp/components/add-note-dialog.vue
@@ -202,6 +202,7 @@ function onSubmit() {
 
 .scroll-area {
   flex: 1;
+  width: 90%;
   max-height: 60vh;
 }
 
diff --git a/odf-uniapp/components/port-edit-dialog.vue b/odf-uniapp/components/port-edit-dialog.vue
index 4d38cd1..1a33018 100644
--- a/odf-uniapp/components/port-edit-dialog.vue
+++ b/odf-uniapp/components/port-edit-dialog.vue
@@ -1,564 +1,595 @@
 <template>
-  <view v-if="visible" class="port-edit-overlay" @click.self="onOverlayClick">
-    <view class="port-edit-content">
-      <!-- 加载中 -->
-      <view v-if="loading" class="loading-box">
-        <text class="loading-text">loading...</text>
-      </view>
+	<view v-if="visible" class="port-edit-overlay" @click.self="onOverlayClick">
+		<view class="port-edit-content">
+			<!-- 加载中 -->
+			<view v-if="loading" class="loading-box">
+				<text class="loading-text">loading...</text>
+			</view>
 
-      <scroll-view v-else class="scroll-area" scroll-y>
-        <!-- 端口位置和状态 -->
-        <view class="section">
-          <view class="location-row">
-            <text class="location-text">位置:{{ portData.frameName }}{{ portData.name }}</text>
-            <view class="status-badge">
-              <view class="status-dot" :class="portData.status === 1 ? 'dot-green' : 'dot-red'" />
-              <text class="status-label">{{ portData.status === 1 ? '已连接' : '已断开' }}</text>
-            </view>
-          </view>
-        </view>
+			<scroll-view v-else class="scroll-area" scroll-y>
+				<!-- 端口位置和状态 -->
+				<view class="section">
+					<view class="location-row">
+						<text class="location-text">位置:{{ portData.frameName }}{{ portData.name }}</text>
+						<view class="status-badge">
+							<view class="status-dot" :class="portData.status === 1 ? 'dot-green' : 'dot-red'" />
+							<text class="status-label">{{ portData.status === 1 ? '已连接' : '已断开' }}</text>
+						</view>
+					</view>
+				</view>
 
-        <!-- 备注说明 -->
-        <view class="section">
-          <text class="section-title">备注说明</text>
-          <view class="remarks-row">
-            <textarea
-              class="remarks-input"
-              v-model="form.remarks"
-              :maxlength="-1"
-              placeholder="请输入备注说明"
-              :disabled="!store.isPermission"
-              :rows="5"
-            />
-            <view v-if="store.isPermission" class="add-note-btn" @click="showAddNote = true">
-              <text class="add-note-text">添加备注</text>
-            </view>
-          </view>
-        </view>
+				<!-- 备注说明 -->
+				<view class="section">
+					<text class="section-title">备注说明</text>
+					<view class="remarks-row">
+						<view class="textarea-wrap">
+							<textarea class="remarks-input" v-model="form.remarks" :maxlength="-1" placeholder="请输入备注说明"
+								:disabled="!store.isPermission" auto-height />
+						</view>
+						<view v-if="store.isPermission" class="add-note-btn" @click="showAddNote = true">
+							<text class="add-note-text">添加备注</text>
+						</view>
+					</view>
+				</view>
 
-        <!-- 光衰信息 -->
-        <view class="section">
-          <text class="section-title">光衰信息</text>
-          <input
-            class="form-input"
-            v-model="form.opticalAttenuation"
-            placeholder="请输入光衰信息"
-            :disabled="!store.isPermission"
-          />
-        </view>
+				<!-- 光衰信息 -->
+				<view class="section">
+					<text class="section-title">光衰信息</text>
+					<input class="form-input" v-model="form.opticalAttenuation" placeholder="请输入光衰信息"
+						:disabled="!store.isPermission" />
+				</view>
 
-        <!-- 历史障碍记录 -->
-        <view class="section">
-          <text class="section-title">历史障碍记录</text>
-          <view class="fault-list">
-            <view class="fault-item" v-for="(item, index) in form.historyFault" :key="index">
-              <view class="fault-row">
-                <picker
-                  mode="date"
-                  :value="item.faultTime ? item.faultTime.substring(0, 10) : ''"
-                  :disabled="!store.isPermission"
-                  @change="onFaultDateChange($event, index)"
-                >
-                  <view class="date-picker">
-                    <text :class="item.faultTime ? 'date-text' : 'date-placeholder'">
-                      {{ item.faultTime || '选择日期' }}
-                    </text>
-                  </view>
-                </picker>
-                <input
-                  class="fault-reason-input"
-                  v-model="item.faultReason"
-                  placeholder="故障原因"
-                  :disabled="!store.isPermission"
-                />
-                <view v-if="store.isPermission" class="delete-btn" @click="removeFault(index)">
-                  <text class="delete-btn-text">-</text>
-                </view>
-              </view>
-            </view>
-          </view>
-          <view v-if="store.isPermission" class="add-record-link" @click="addFault">
-            <text class="add-record-text">添加新记录</text>
-          </view>
-        </view>
+				<!-- 历史障碍记录 -->
+				<view class="section">
+					<text class="section-title">历史障碍记录</text>
+					<view class="fault-list">
+						<view class="fault-item" v-for="(item, index) in form.historyFault" :key="index">
+							<view class="fault-row">
+								<picker mode="date" :value="item.faultTime ? item.faultTime.substring(0, 10) : ''"
+									:disabled="!store.isPermission" @change="onFaultDateChange($event, index)">
+									<view class="date-picker">
+										<text :class="item.faultTime ? 'date-text' : 'date-placeholder'">
+											{{ item.faultTime || '选择日期' }}
+										</text>
+									</view>
+								</picker>
+								<input class="fault-reason-input" v-model="item.faultReason" placeholder="故障原因"
+									:disabled="!store.isPermission" />
+								<view v-if="store.isPermission" class="delete-btn" @click="removeFault(index)">
+									<text class="delete-btn-text">-</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-if="store.isPermission" class="add-record-link" @click="addFault">
+						<text class="add-record-text">添加新记录</text>
+					</view>
+				</view>
 
-        <!-- 光缆段信息 -->
-        <view class="section">
-          <text class="section-title">光缆段信息</text>
-          <input
-            class="form-input"
-            v-model="form.opticalCableOffRemarks"
-            placeholder="请输入光缆段信息"
-            :disabled="!store.isPermission"
-          />
-        </view>
+				<!-- 光缆段信息 -->
+				<view class="section">
+					<text class="section-title">光缆段信息</text>
+					<input class="form-input" v-model="form.opticalCableOffRemarks" placeholder="请输入光缆段信息"
+						:disabled="!store.isPermission" />
+				</view>
 
-        <!-- 权限控制区域 -->
-        <view v-if="store.isPermission" class="section">
-          <text class="section-title">改变状态</text>
-          <view class="status-toggle-row">
-            <view
-              class="toggle-btn toggle-green"
-              :class="{ 'toggle-active': form.status === 1 }"
-              @click="setStatus(1)"
-            >
-              <text class="toggle-text">连接</text>
-            </view>
-            <view
-              class="toggle-btn toggle-red"
-              :class="{ 'toggle-active': form.status === 0 }"
-              @click="setStatus(0)"
-            >
-              <text class="toggle-text">断开</text>
-            </view>
-          </view>
-          <text class="hint-text">断开后只清空备注说明,其他内容不影响</text>
-        </view>
+				<!-- 权限控制区域 -->
+				<view v-if="store.isPermission" class="section">
+					<text class="section-title">改变状态</text>
+					<view class="status-toggle-row">
+						<view class="toggle-btn toggle-green" :class="{ 'toggle-active': form.status === 1 }"
+							@click="setStatus(1)">
+							<text class="toggle-text">连接</text>
+						</view>
+						<view class="toggle-btn toggle-red" :class="{ 'toggle-active': form.status === 0 }"
+							@click="setStatus(0)">
+							<text class="toggle-text">断开</text>
+						</view>
+					</view>
+					<text class="hint-text">断开后只清空备注说明,其他内容不影响</text>
+				</view>
+			</scroll-view>
 
-        <!-- 底部按钮 -->
-        <view class="btn-row">
-          <template v-if="store.isPermission">
-            <view class="btn btn-cancel" @click="onClose">
-              <text class="btn-text">取消</text>
-            </view>
-            <view class="btn btn-submit" @click="onSubmit">
-              <text class="btn-text-white">提交</text>
-            </view>
-          </template>
-          <template v-else>
-            <view class="btn btn-cancel btn-full" @click="onClose">
-              <text class="btn-text">关闭</text>
-            </view>
-          </template>
-        </view>
-      </scroll-view>
-    </view>
+			<!-- 底部按钮（固定在弹窗底部） -->
+			<view v-if="!loading" class="btn-row">
+				<template v-if="store.isPermission">
+					<view class="btn btn-cancel" @click="onClose">
+						<text class="btn-text">取消</text>
+					</view>
+					<view class="btn btn-submit" @click="onSubmit">
+						<text class="btn-text-white">提交</text>
+					</view>
+				</template>
+				<template v-else>
+					<view class="btn btn-cancel btn-full" @click="onClose">
+						<text class="btn-text">关闭</text>
+					</view>
+				</template>
+			</view>
+		</view>
 
-    <!-- 添加备注弹窗 -->
-    <addNoteDialog
-      :visible="showAddNote"
-      @close="showAddNote = false"
-      @confirm="onNoteConfirm"
-    />
-  </view>
+		<!-- 添加备注弹窗 -->
+		<addNoteDialog :visible="showAddNote" @close="showAddNote = false" @confirm="onNoteConfirm" />
+	</view>
 </template>
 
 <script setup>
-import { ref, reactive, watch } from 'vue'
-import { getPortDetail, savePort } from '@/services/machine'
-import store from '@/store'
-import addNoteDialog from '@/components/add-note-dialog.vue'
+	import {
+		ref,
+		reactive,
+		watch
+	} from 'vue'
+	import {
+		getPortDetail,
+		savePort
+	} from '@/services/machine'
+	import store from '@/store'
+	import addNoteDialog from '@/components/add-note-dialog.vue'
 
-const props = defineProps({
-  visible: { type: Boolean, default: false },
-  portId: { type: [Number, String], default: '' }
-})
+	const props = defineProps({
+		visible: {
+			type: Boolean,
+			default: false
+		},
+		portId: {
+			type: [Number, String],
+			default: ''
+		}
+	})
 
-const emit = defineEmits(['close', 'saved'])
+	const emit = defineEmits(['close', 'saved'])
 
-const loading = ref(false)
-const showAddNote = ref(false)
+	const loading = ref(false)
+	const showAddNote = ref(false)
 
-const portData = reactive({
-  id: '',
-  name: '',
-  frameName: '',
-  status: 0,
-  remarks: '',
-  opticalAttenuation: '',
-  opticalCableOffRemarks: '',
-  historyRemarks: '',
-  historyFault: []
-})
+	const portData = reactive({
+		id: '',
+		name: '',
+		frameName: '',
+		status: 0,
+		remarks: '',
+		opticalAttenuation: '',
+		opticalCableOffRemarks: '',
+		historyRemarks: '',
+		historyFault: []
+	})
 
-const form = reactive({
-  status: 0,
-  remarks: '',
-  opticalAttenuation: '',
-  opticalCableOffRemarks: '',
-  historyRemarks: '',
-  historyFault: []
-})
+	const form = reactive({
+		status: 0,
+		remarks: '',
+		opticalAttenuation: '',
+		opticalCableOffRemarks: '',
+		historyRemarks: '',
+		historyFault: []
+	})
 
-watch(
-  () => props.visible,
-  (val) => {
-    if (val && props.portId) {
-      loadPortDetail()
-    }
-  }
-)
+	watch(
+		() => props.visible,
+		(val) => {
+			if (val && props.portId) {
+				loadPortDetail()
+			}
+		}
+	)
 
-async function loadPortDetail() {
-  loading.value = true
-  try {
-    const res = await getPortDetail(props.portId)
-    if (res.code === 200 && res.data) {
-      const d = res.data
-      Object.assign(portData, {
-        id: d.id,
-        name: d.name || '',
-        frameName: d.frameName || '',
-        status: d.status,
-        remarks: d.remarks || '',
-        opticalAttenuation: d.opticalAttenuation || '',
-        opticalCableOffRemarks: d.opticalCableOffRemarks || '',
-        historyRemarks: d.historyRemarks || '',
-        historyFault: d.historyFault || []
-      })
-      // 初始化表单
-      form.status = d.status
-      form.remarks = d.remarks || ''
-      form.opticalAttenuation = d.opticalAttenuation || ''
-      form.opticalCableOffRemarks = d.opticalCableOffRemarks || ''
-      form.historyRemarks = d.historyRemarks || ''
-      form.historyFault = (d.historyFault || []).map(item => ({
-        faultTime: item.faultTime || '',
-        faultReason: item.faultReason || ''
-      }))
-    }
-  } finally {
-    loading.value = false
-  }
-}
+	async function loadPortDetail() {
+		loading.value = true
+		try {
+			const res = await getPortDetail(props.portId)
+			if (res.code === 200 && res.data) {
+				const d = res.data
+				Object.assign(portData, {
+					id: d.id,
+					name: d.name || '',
+					frameName: d.frameName || '',
+					status: d.status,
+					remarks: d.remarks || '',
+					opticalAttenuation: d.opticalAttenuation || '',
+					opticalCableOffRemarks: d.opticalCableOffRemarks || '',
+					historyRemarks: d.historyRemarks || '',
+					historyFault: d.historyFault || []
+				})
+				// 初始化表单
+				form.status = d.status
+				form.remarks = d.remarks || ''
+				form.opticalAttenuation = d.opticalAttenuation || ''
+				form.opticalCableOffRemarks = d.opticalCableOffRemarks || ''
+				form.historyRemarks = d.historyRemarks || ''
+				form.historyFault = (d.historyFault || []).map(item => ({
+					faultTime: item.faultTime || '',
+					faultReason: item.faultReason || ''
+				}))
+			}
+		} finally {
+			loading.value = false
+		}
+	}
 
-function setStatus(status) {
-  form.status = status
-  if (status === 0) {
-    form.remarks = ''
-  }
-}
+	function setStatus(status) {
+		form.status = status
+		if (status === 0) {
+			form.remarks = ''
+		}
+	}
 
-function addFault() {
-  form.historyFault.push({ faultTime: '', faultReason: '' })
-}
+	function addFault() {
+		form.historyFault.push({
+			faultTime: '',
+			faultReason: ''
+		})
+	}
 
-function removeFault(index) {
-  form.historyFault.splice(index, 1)
-}
+	function removeFault(index) {
+		form.historyFault.splice(index, 1)
+	}
 
-function onFaultDateChange(e, index) {
-  form.historyFault[index].faultTime = e.detail.value
-}
+	function onFaultDateChange(e, index) {
+		form.historyFault[index].faultTime = e.detail.value
+	}
 
-function onNoteConfirm(text) {
-  form.remarks = form.remarks ? form.remarks + '\n' + text : text
-  showAddNote.value = false
-}
+	function onNoteConfirm(text) {
+		form.remarks = form.remarks ? form.remarks + '\n' + text : text
+		showAddNote.value = false
+	}
 
-function onClose() {
-  emit('close')
-}
+	function onClose() {
+		emit('close')
+	}
 
-function onOverlayClick() {
-  // 不做任何操作，防止误触关闭
-}
+	function onOverlayClick() {
+		// 不做任何操作，防止误触关闭
+	}
 
-async function onSubmit() {
-  // 校验历史障碍时间
-  for (let i = 0; i < form.historyFault.length; i++) {
-    if (!form.historyFault[i].faultTime || !form.historyFault[i].faultTime.trim()) {
-      uni.showToast({ title: '请选择障碍发生时间!', icon: 'none' })
-      return
-    }
-  }
+	async function onSubmit() {
+		// 校验历史障碍时间
+		for (let i = 0; i < form.historyFault.length; i++) {
+			if (!form.historyFault[i].faultTime || !form.historyFault[i].faultTime.trim()) {
+				uni.showToast({
+					title: '请选择障碍发生时间!',
+					icon: 'none'
+				})
+				return
+			}
+		}
 
-  try {
-    const res = await savePort({
-      Id: portData.id,
-      Status: form.status,
-      Remarks: form.remarks,
-      OpticalAttenuation: form.opticalAttenuation,
-      HistoryRemarks: form.historyRemarks,
-      HistoryFault: form.historyFault,
-      OpticalCableOffRemarks: form.opticalCableOffRemarks
-    })
-    if (res.code === 200) {
-      uni.showToast({ title: '保存成功', icon: 'success' })
-      emit('close')
-      emit('saved')
-    } else {
-      uni.showToast({ title: res.msg || '保存失败', icon: 'none' })
-    }
-  } catch (e) {
-    uni.showToast({ title: '网络异常', icon: 'none' })
-  }
-}
+		try {
+			const res = await savePort({
+				Id: Number(props.portId),
+				Status: form.status,
+				Remarks: form.remarks,
+				OpticalAttenuation: form.opticalAttenuation,
+				HistoryRemarks: form.historyRemarks,
+				HistoryFault: form.historyFault,
+				OpticalCableOffRemarks: form.opticalCableOffRemarks
+			})
+			if (res.code === 200) {
+				uni.showToast({
+					title: '保存成功',
+					icon: 'success'
+				})
+				emit('close')
+				emit('saved')
+			} else {
+				uni.showToast({
+					title: res.msg || '保存失败',
+					icon: 'none'
+				})
+			}
+		} catch (e) {
+			uni.showToast({
+				title: '网络异常',
+				icon: 'none'
+			})
+		}
+	}
 </script>
 
 <style scoped>
-.port-edit-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+	.port-edit-overlay {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 999;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.port-edit-content {
-  background-color: #fff;
-  border-radius: 16rpx;
-  width: 90%;
-  max-height: 85vh;
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-}
+	.port-edit-content {
+		background-color: #fff;
+		border-radius: 20rpx;
+		width: 90%;
+		max-height: 80vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+	}
 
-.loading-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 80rpx 0;
-}
+	.loading-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 80rpx 0;
+	}
 
-.loading-text {
-  font-size: 28rpx;
-  color: #999;
-}
+	.loading-text {
+		font-size: 28rpx;
+		color: #999;
+	}
 
-.scroll-area {
-  max-height: 85vh;
-  padding: 32rpx;
-}
+	.scroll-area {
+		width: 90%;
+		flex: 1;
+		overflow-y: auto;
+		overflow-x: hidden;
+		padding: 28rpx 28rpx 0;
+	}
 
-.section {
-  margin-bottom: 28rpx;
-}
+	.section {
+		margin-bottom: 24rpx;
+	}
 
-.section-title {
-  font-size: 28rpx;
-  font-weight: 600;
-  color: #333;
-  margin-bottom: 12rpx;
-}
+	.section-title {
+		font-size: 27rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 10rpx;
+		display: block;
+	}
 
-.location-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
+	.location-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 16rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+	}
 
-.location-text {
-  font-size: 30rpx;
-  font-weight: 600;
-  color: #333;
-}
+	.location-text {
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #333;
+		flex-shrink: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 
-.status-badge {
-  display: flex;
-  align-items: center;
-  gap: 8rpx;
-}
+	.status-badge {
+		display: flex;
+		align-items: center;
+		gap: 6rpx;
+		flex-shrink: 0;
+		margin-left: 16rpx;
+	}
 
-.status-dot {
-  width: 18rpx;
-  height: 18rpx;
-  border-radius: 50%;
-}
+	.status-dot {
+		width: 16rpx;
+		height: 16rpx;
+		border-radius: 50%;
+	}
 
-.dot-green {
-  background-color: #4CAF50;
-}
+	.dot-green {
+		background-color: #4CAF50;
+	}
 
-.dot-red {
-  background-color: #F44336;
-}
+	.dot-red {
+		background-color: #F44336;
+	}
 
-.status-label {
-  font-size: 24rpx;
-  color: #666;
-}
+	.status-label {
+		font-size: 24rpx;
+		color: #666;
+	}
 
-.remarks-row {
-  display: flex;
-  flex-direction: column;
-  gap: 12rpx;
-}
+	.remarks-row {
+		display: flex;
+		flex-direction: column;
+		gap: 10rpx;
+	}
 
-.remarks-input {
-  width: 100%;
-  height: 200rpx;
-  border: 1rpx solid #ddd;
-  border-radius: 8rpx;
-  padding: 16rpx;
-  font-size: 26rpx;
-  box-sizing: border-box;
-}
+	.textarea-wrap {
+		width: 100%;
+		overflow: hidden;
+		border: 1rpx solid #e0e0e0;
+		border-radius: 10rpx;
+		background: #fafafa;
+		box-sizing: border-box;
+	}
 
-.add-note-btn {
-  align-self: flex-end;
-  padding: 10rpx 24rpx;
-  background-color: #1A73EC;
-  border-radius: 8rpx;
-}
+	.remarks-input {
+		width: 100%;
+		min-height: 120rpx;
+		padding: 14rpx;
+		font-size: 26rpx;
+		box-sizing: border-box;
+		background: transparent;
+		border: none;
+		word-break: break-all;
+	}
 
-.add-note-text {
-  font-size: 24rpx;
-  color: #fff;
-}
+	.add-note-btn {
+		align-self: flex-end;
+		padding: 8rpx 20rpx;
+		background-color: #1A73EC;
+		border-radius: 8rpx;
+	}
 
-.form-input {
-  width: 100%;
-  height: 72rpx;
-  border: 1rpx solid #ddd;
-  border-radius: 8rpx;
-  padding: 0 16rpx;
-  font-size: 26rpx;
-  box-sizing: border-box;
-}
+	.add-note-text {
+		font-size: 24rpx;
+		color: #fff;
+	}
 
-.fault-list {
-  margin-bottom: 12rpx;
-}
+	.form-input {
+		width: 100%;
+		height: 68rpx;
+		border: 1rpx solid #e0e0e0;
+		border-radius: 10rpx;
+		padding: 0 14rpx;
+		font-size: 26rpx;
+		box-sizing: border-box;
+		background: #fafafa;
+		overflow: hidden;
+	}
 
-.fault-item {
-  margin-bottom: 16rpx;
-}
+	.fault-list {
+		margin-bottom: 8rpx;
+	}
 
-.fault-row {
-  display: flex;
-  align-items: center;
-  gap: 12rpx;
-}
+	.fault-item {
+		margin-bottom: 12rpx;
+	}
 
-.date-picker {
-  flex-shrink: 0;
-  width: 240rpx;
-  height: 72rpx;
-  border: 1rpx solid #ddd;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  padding: 0 16rpx;
-}
+	.fault-row {
+		display: flex;
+		align-items: center;
+		gap: 10rpx;
+		width: 100%;
+		box-sizing: border-box;
+	}
 
-.date-text {
-  font-size: 24rpx;
-  color: #333;
-}
+	.date-picker {
+		flex-shrink: 0;
+		min-width: 0;
+		width: 200rpx;
+		height: 68rpx;
+		border: 1rpx solid #e0e0e0;
+		border-radius: 10rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 12rpx;
+		background: #fafafa;
+		overflow: hidden;
+	}
 
-.date-placeholder {
-  font-size: 24rpx;
-  color: #999;
-}
+	.date-text {
+		font-size: 23rpx;
+		color: #333;
+	}
 
-.fault-reason-input {
-  flex: 1;
-  height: 72rpx;
-  border: 1rpx solid #ddd;
-  border-radius: 8rpx;
-  padding: 0 16rpx;
-  font-size: 26rpx;
-}
+	.date-placeholder {
+		font-size: 23rpx;
+		color: #999;
+	}
 
-.delete-btn {
-  flex-shrink: 0;
-  width: 56rpx;
-  height: 56rpx;
-  border-radius: 50%;
-  background-color: #F44336;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+	.fault-reason-input {
+		flex: 1;
+		min-width: 0;
+		height: 68rpx;
+		border: 1rpx solid #e0e0e0;
+		border-radius: 10rpx;
+		padding: 0 12rpx;
+		font-size: 26rpx;
+		background: #fafafa;
+		box-sizing: border-box;
+	}
 
-.delete-btn-text {
-  font-size: 36rpx;
-  color: #fff;
-  font-weight: 700;
-  line-height: 1;
-}
+	.delete-btn {
+		flex-shrink: 0;
+		width: 48rpx;
+		height: 48rpx;
+		border-radius: 50%;
+		background-color: #F44336;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.add-record-link {
-  padding: 8rpx 0;
-}
+	.delete-btn-text {
+		font-size: 32rpx;
+		color: #fff;
+		font-weight: 700;
+		line-height: 1;
+	}
 
-.add-record-text {
-  font-size: 26rpx;
-  color: #1A73EC;
-}
+	.add-record-link {
+		padding: 4rpx 0;
+	}
 
-.status-toggle-row {
-  display: flex;
-  gap: 20rpx;
-  margin-bottom: 12rpx;
-}
+	.add-record-text {
+		font-size: 25rpx;
+		color: #1A73EC;
+	}
 
-.toggle-btn {
-  flex: 1;
-  height: 72rpx;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  opacity: 0.4;
-}
+	.status-toggle-row {
+		display: flex;
+		gap: 16rpx;
+		margin-bottom: 10rpx;
+	}
 
-.toggle-green {
-  background-color: #4CAF50;
-}
+	.toggle-btn {
+		flex: 1;
+		height: 68rpx;
+		border-radius: 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		opacity: 0.35;
+	}
 
-.toggle-red {
-  background-color: #F44336;
-}
+	.toggle-green {
+		background-color: #4CAF50;
+	}
 
-.toggle-active {
-  opacity: 1;
-}
+	.toggle-red {
+		background-color: #F44336;
+	}
 
-.toggle-text {
-  font-size: 28rpx;
-  color: #fff;
-  font-weight: 600;
-}
+	.toggle-active {
+		opacity: 1;
+	}
 
-.hint-text {
-  font-size: 22rpx;
-  color: #999;
-}
+	.toggle-text {
+		font-size: 28rpx;
+		color: #fff;
+		font-weight: 600;
+	}
 
-.btn-row {
-  display: flex;
-  gap: 20rpx;
-  margin-top: 16rpx;
-  padding-bottom: 16rpx;
-}
+	.hint-text {
+		font-size: 22rpx;
+		color: #999;
+	}
 
-.btn {
-  flex: 1;
-  height: 80rpx;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+	.btn-row {
+		display: flex;
+		gap: 16rpx;
+		padding: 16rpx 28rpx 20rpx;
+		border-top: 1rpx solid #f0f0f0;
+		flex-shrink: 0;
+	}
 
-.btn-cancel {
-  background-color: #f5f5f5;
-  border: 1rpx solid #ddd;
-}
+	.btn {
+		flex: 1;
+		height: 76rpx;
+		border-radius: 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.btn-submit {
-  background-color: #1A73EC;
-}
+	.btn-cancel {
+		background-color: #f5f5f5;
+		border: 1rpx solid #e0e0e0;
+	}
 
-.btn-full {
-  flex: 1;
-}
+	.btn-submit {
+		background-color: #1A73EC;
+	}
 
-.btn-text {
-  font-size: 28rpx;
-  color: #666;
-}
+	.btn-full {
+		flex: 1;
+	}
 
-.btn-text-white {
-  font-size: 28rpx;
-  color: #fff;
-}
-</style>
+	.btn-text {
+		font-size: 28rpx;
+		color: #666;
+	}
+
+	.btn-text-white {
+		font-size: 28rpx;
+		color: #fff;
+	}
+</style>
\ No newline at end of file
diff --git a/odf-uniapp/manifest.json b/odf-uniapp/manifest.json
index 3d5e0f8..1f0a611 100644
--- a/odf-uniapp/manifest.json
+++ b/odf-uniapp/manifest.json
@@ -17,7 +17,11 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Barcode" : {},
+            "Geolocation" : {},
+            "Camera" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -45,7 +49,14 @@
                 "dSYMs" : false
             },
             /* SDK配置 */
-            "sdkConfigs" : {},
+            "sdkConfigs" : {
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "share" : {}
+            },
             "icons" : {
                 "android" : {
                     "hdpi" : ""
diff --git a/odf-uniapp/pages.json b/odf-uniapp/pages.json
index e7df498..81a49e9 100644
--- a/odf-uniapp/pages.json
+++ b/odf-uniapp/pages.json
@@ -1,86 +1,145 @@
 {
-  "pages": [
-    {
-      "path": "pages/start/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/login/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/home/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "", "enablePullDownRefresh": true }
-    },
-    {
-      "path": "pages/region/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/room/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "", "enablePullDownRefresh": true }
-    },
-    {
-      "path": "pages/rack/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "", "enablePullDownRefresh": true }
-    },
-    {
-      "path": "pages/rack-detail/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/search/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/settings/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/change-password/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/portal/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/checkin/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/trunk/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/cable/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/fault-list/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/fault-detail/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/fault-add/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/trunk-search/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    },
-    {
-      "path": "pages/route-plan/index",
-      "style": { "navigationStyle": "custom", "navigationBarTitleText": "" }
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "绥时录",
-    "navigationBarBackgroundColor": "#1A73EC",
-    "backgroundColor": "#F5F5F5"
-  }
-}
+	"pages": [{
+			"path": "pages/start/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/route-plan/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/home/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/region/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/room/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/rack/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/rack-detail/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/search/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/settings/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/change-password/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/portal/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/checkin/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/trunk/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/cable/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/fault-list/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/fault-detail/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/fault-add/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/trunk-search/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "绥时录",
+		"navigationBarBackgroundColor": "#1A73EC",
+		"backgroundColor": "#F5F5F5"
+	}
+}
\ No newline at end of file
diff --git a/odf-uniapp/pages/cable/index.vue b/odf-uniapp/pages/cable/index.vue
index 3dd6d58..f067faf 100644
--- a/odf-uniapp/pages/cable/index.vue
+++ b/odf-uniapp/pages/cable/index.vue
@@ -34,17 +34,21 @@
       </view>
 
       <!-- 光缆列表 -->
-      <scroll-view class="cable-list" scroll-y>
+      <scroll-view class="cable-list" scroll-y v-if="cableList.length > 0">
         <view
           class="cable-card"
           v-for="item in cableList"
           :key="item.id"
           @click="goFaultList(item)"
         >
-          <view class="cable-image" />
           <text class="cable-name">{{ item.cableName }}</text>
         </view>
       </scroll-view>
+
+      <!-- 空状态 -->
+      <view class="empty-state" v-else-if="loaded">
+        <text class="empty-text">暂无光缆数据</text>
+      </view>
     </view>
   </view>
 </template>
@@ -58,12 +62,14 @@ const statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
 const cableList = ref([])
 const deptId = ref('')
 const keyword = ref('')
+const loaded = ref(false)
 
 async function loadCableList() {
   const res = await getCableList(deptId.value)
-  if (res.code === 200) {
-    cableList.value = res.data || []
+  if (res.code === 200 && res.data) {
+    cableList.value = res.data.result || []
   }
+  loaded.value = true
 }
 
 function goBack() {
@@ -189,28 +195,30 @@ onPullDownRefresh(() => {
 
 .cable-card {
   display: flex;
-  flex-direction: column;
   align-items: center;
   margin: 0 24rpx 20rpx;
-  padding: 24rpx;
+  padding: 28rpx 24rpx;
   background-color: #fff;
   border-radius: 12rpx;
   border: 1rpx solid #E8E8E8;
   box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
 }
 
-.cable-image {
-  width: 100%;
-  height: 160rpx;
-  background: #F0F0F0;
-  border-radius: 8rpx;
-  margin-bottom: 16rpx;
-}
-
 .cable-name {
   font-size: 30rpx;
   color: #333;
   font-weight: 500;
-  text-align: center;
+}
+
+.empty-state {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 200rpx 0;
+}
+
+.empty-text {
+  font-size: 28rpx;
+  color: #999;
 }
 </style>
diff --git a/odf-uniapp/pages/fault-add/index.vue b/odf-uniapp/pages/fault-add/index.vue
index f024f1b..2151717 100644
--- a/odf-uniapp/pages/fault-add/index.vue
+++ b/odf-uniapp/pages/fault-add/index.vue
@@ -159,6 +159,24 @@ function takePhoto() {
 }
 
 function getLocation() {
+  // #ifdef H5
+  if (navigator.geolocation) {
+    navigator.geolocation.getCurrentPosition(
+      (pos) => {
+        form.latitude = pos.coords.latitude
+        form.longitude = pos.coords.longitude
+        uni.showToast({ title: '获取成功', icon: 'success' })
+      },
+      () => {
+        uni.showToast({ title: '获取位置失败，请检查浏览器定位权限', icon: 'none' })
+      },
+      { enableHighAccuracy: true, timeout: 10000 }
+    )
+  } else {
+    uni.showToast({ title: '当前浏览器不支持定位', icon: 'none' })
+  }
+  // #endif
+  // #ifndef H5
   uni.getLocation({
     type: 'gcj02',
     success(res) {
@@ -170,6 +188,7 @@ function getLocation() {
       uni.showToast({ title: '获取位置失败', icon: 'none' })
     }
   })
+  // #endif
 }
 
 async function handleSubmit() {
@@ -177,6 +196,10 @@ async function handleSubmit() {
     uni.showToast({ title: '请至少拍摄一张照片', icon: 'none' })
     return
   }
+  if (!cableId.value) {
+    uni.showToast({ title: '所属光缆信息缺失，无法提交', icon: 'none' })
+    return
+  }
 
   if (submitting.value) return
   submitting.value = true
@@ -421,6 +444,7 @@ onLoad((options) => {
   padding: 24rpx;
   background: #fff;
   box-sizing: border-box;
+  z-index: 100;
 }
 
 .submit-btn {
diff --git a/odf-uniapp/pages/home/index.vue b/odf-uniapp/pages/home/index.vue
index f51c12d..c9a1e46 100644
--- a/odf-uniapp/pages/home/index.vue
+++ b/odf-uniapp/pages/home/index.vue
@@ -8,17 +8,25 @@
         <view class="nav-bar-inner">
           <image
             class="nav-icon"
-            src="/static/images/ic_refresh.png"
+            src="/static/images/ic_back.png"
             mode="aspectFit"
-            @click="handleRefresh"
+            @click="goBack"
           />
           <text class="nav-title">公司列表</text>
-          <image
-            class="nav-icon"
-            src="/static/images/ic_set.png"
-            mode="aspectFit"
-            @click="goSettings"
-          />
+          <view class="nav-right">
+            <image
+              class="nav-icon"
+              src="/static/images/ic_refresh.png"
+              mode="aspectFit"
+              @click="handleRefresh"
+            />
+            <image
+              class="nav-icon nav-icon-ml"
+              src="/static/images/ic_set.png"
+              mode="aspectFit"
+              @click="goSettings"
+            />
+          </view>
         </view>
       </view>
 
@@ -90,6 +98,15 @@ function handleRefresh() {
   loadCompanyList()
 }
 
+function goBack() {
+  uni.navigateBack({
+    fail() {
+      // H5下navigateBack失败时（如页面栈只有一层），回到portal
+      uni.reLaunch({ url: '/pages/portal/index' })
+    }
+  })
+}
+
 function goSearch() {
   uni.navigateTo({ url: '/pages/search/index' })
 }
@@ -153,6 +170,15 @@ onPullDownRefresh(() => {
   height: 44rpx;
 }
 
+.nav-right {
+  display: flex;
+  align-items: center;
+}
+
+.nav-icon-ml {
+  margin-left: 24rpx;
+}
+
 .nav-title {
   font-size: 34rpx;
   font-weight: 600;
diff --git a/odf-uniapp/pages/portal/index.vue b/odf-uniapp/pages/portal/index.vue
index d526e85..8ded968 100644
--- a/odf-uniapp/pages/portal/index.vue
+++ b/odf-uniapp/pages/portal/index.vue
@@ -30,7 +30,6 @@
           :key="item.code"
           @click="handleModuleClick(item)"
         >
-          <image class="module-image" :src="item.icon" mode="aspectFit" />
           <text class="module-name">{{ item.name }}</text>
         </view>
       </view>
@@ -136,23 +135,16 @@ onLoad(() => {
 
 .module-card {
   display: flex;
-  flex-direction: column;
   align-items: center;
   justify-content: center;
-  padding: 32rpx;
+  height: 160rpx;
   background-color: #fff;
   border-radius: 12rpx;
   box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
 }
 
-.module-image {
-  width: 120rpx;
-  height: 120rpx;
-  margin-bottom: 16rpx;
-}
-
 .module-name {
-  font-size: 30rpx;
+  font-size: 32rpx;
   color: #333;
   font-weight: 500;
   text-align: center;
diff --git a/odf-uniapp/pages/start/index.vue b/odf-uniapp/pages/start/index.vue
index 30874e9..e40f7d2 100644
--- a/odf-uniapp/pages/start/index.vue
+++ b/odf-uniapp/pages/start/index.vue
@@ -14,10 +14,10 @@ onLoad(() => {
     checkPermission().then((res) => {
       if (res.code === 200) {
         store.isPermission = true
-        uni.reLaunch({ url: '/pages/home/index' })
+        uni.reLaunch({ url: '/pages/portal/index' })
       } else if (res.code === 403) {
         store.isPermission = false
-        uni.reLaunch({ url: '/pages/home/index' })
+        uni.reLaunch({ url: '/pages/portal/index' })
       } else if (res.code === 401) {
         uni.reLaunch({ url: '/pages/login/index' })
       }
diff --git a/odf-uniapp/pages/trunk-search/index.vue b/odf-uniapp/pages/trunk-search/index.vue
index 75c3b93..108182a 100644
--- a/odf-uniapp/pages/trunk-search/index.vue
+++ b/odf-uniapp/pages/trunk-search/index.vue
@@ -28,7 +28,6 @@
             :key="item.id"
             @click="goCableFaultList(item)"
           >
-            <view class="cable-image" />
             <text class="cable-name">{{ item.cableName }}</text>
           </view>
         </view>
@@ -188,29 +187,19 @@ onLoad((options) => {
 /* 光缆卡片 — 复用 cable 页样式 */
 .cable-card {
   display: flex;
-  flex-direction: column;
   align-items: center;
   margin: 0 24rpx 20rpx;
-  padding: 24rpx;
+  padding: 28rpx 24rpx;
   background-color: #fff;
   border-radius: 12rpx;
   border: 1rpx solid #E8E8E8;
   box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
 }
 
-.cable-image {
-  width: 100%;
-  height: 160rpx;
-  background: #F0F0F0;
-  border-radius: 8rpx;
-  margin-bottom: 16rpx;
-}
-
 .cable-name {
   font-size: 30rpx;
   color: #333;
   font-weight: 500;
-  text-align: center;
 }
 
 /* 故障卡片 — 复用 fault-list 页样式 */
diff --git a/odf-uniapp/pages/trunk/index.vue b/odf-uniapp/pages/trunk/index.vue
index 6b0eb29..84e65b8 100644
--- a/odf-uniapp/pages/trunk/index.vue
+++ b/odf-uniapp/pages/trunk/index.vue
@@ -28,7 +28,6 @@
           :key="item.deptId"
           @click="goCable(item)"
         >
-          <view class="company-image" />
           <text class="company-name">{{ item.deptName }}</text>
         </view>
       </scroll-view>
@@ -134,28 +133,18 @@ onPullDownRefresh(() => {
 
 .company-card {
   display: flex;
-  flex-direction: column;
   align-items: center;
   margin: 0 24rpx 20rpx;
-  padding: 24rpx;
+  padding: 28rpx 24rpx;
   background-color: #fff;
   border-radius: 12rpx;
   border: 1rpx solid #E8E8E8;
   box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
 }
 
-.company-image {
-  width: 100%;
-  height: 160rpx;
-  background: #F0F0F0;
-  border-radius: 8rpx;
-  margin-bottom: 16rpx;
-}
-
 .company-name {
   font-size: 30rpx;
   color: #333;
   font-weight: 500;
-  text-align: center;
 }
 </style>
diff --git a/odf-uniapp/services/api.js b/odf-uniapp/services/api.js
index 28868ba..919ed09 100644
--- a/odf-uniapp/services/api.js
+++ b/odf-uniapp/services/api.js
@@ -3,7 +3,7 @@ import store from '@/store'
 
 // const BASE_URL = 'http://49.233.115.141:11082'
 // const BASE_URL = 'http://115.190.188.216:2861'
-const BASE_URL = 'https://api.wux.shhmkjgs.cn'
+export const BASE_URL = 'https://api.wux.shhmkjgs.cn'
 const TIMEOUT = 20000
 
 /**
diff --git a/odf-uniapp/services/trunk.js b/odf-uniapp/services/trunk.js
index 83ab69f..ee72331 100644
--- a/odf-uniapp/services/trunk.js
+++ b/odf-uniapp/services/trunk.js
@@ -1,8 +1,6 @@
-import { get } from './api'
+import { get, BASE_URL } from './api'
 import store from '@/store'
 
-const BASE_URL = 'http://49.233.115.141:11082'
-
 export const getCableList = (deptId) =>
   get('/business/OdfCables/list', { deptId })
 
diff --git a/odf-uniapp/utils/watermark.js b/odf-uniapp/utils/watermark.js
index feb813f..0be68d7 100644
--- a/odf-uniapp/utils/watermark.js
+++ b/odf-uniapp/utils/watermark.js
@@ -2,54 +2,37 @@
  * 在照片左下角叠加水印文字
  * @param {string} imagePath - 原始图片路径
  * @param {string} text - 水印文字（如 "2025/06/15 12:00 张三"）
- * @returns {Promise<string>} 带水印的临时文件路径
+ * @returns {Promise<string>} 带水印的临时文件路径（H5 返回 base64 dataURL）
  */
 export function addWatermark(imagePath, text) {
   return new Promise((resolve, reject) => {
+    // #ifdef APP-PLUS
     uni.getImageInfo({
       src: imagePath,
       success(imgInfo) {
-        const canvasId = 'watermarkCanvas'
         const width = imgInfo.width
         const height = imgInfo.height
-
-        // 使用 OffscreenCanvas（APP-PLUS 和 H5 均支持）
-        // #ifdef APP-PLUS
         const bitmap = new plus.nativeObj.Bitmap('watermark')
         bitmap.load(imagePath, () => {
           const canvas = new plus.nativeObj.View('watermarkView', {
             left: '0px', top: '0px',
             width: width + 'px', height: height + 'px'
           })
-
-          // 绘制原图
           canvas.drawBitmap(bitmap, {}, { left: '0px', top: '0px', width: width + 'px', height: height + 'px' })
-
-          // 水印参数
           const fontSize = Math.max(Math.floor(width * 0.03), 14)
           const padding = Math.floor(fontSize * 0.8)
           const textX = padding
-          const textY = height - padding
-
-          // 绘制半透明背景
           const bgHeight = fontSize + padding * 2
           canvas.drawRect(
             { color: 'rgba(0,0,0,0.4)' },
             { left: '0px', top: (height - bgHeight) + 'px', width: width + 'px', height: bgHeight + 'px' }
           )
-
-          // 绘制水印文字
           canvas.drawText(text, {
             left: textX + 'px',
             top: (height - bgHeight + padding) + 'px',
             width: (width - textX * 2) + 'px',
             height: fontSize + 'px'
-          }, {
-            size: fontSize + 'px',
-            color: '#ffffff'
-          })
-
-          // 导出
+          }, { size: fontSize + 'px', color: '#ffffff' })
           const tempPath = `_doc/watermark_${Date.now()}.jpg`
           canvas.toBitmap(tempPath, {}, () => {
             bitmap.clear()
@@ -58,51 +41,41 @@ export function addWatermark(imagePath, text) {
             bitmap.clear()
             reject(err)
           })
-        }, (err) => {
-          reject(err)
-        })
-        // #endif
-
-        // #ifndef APP-PLUS
-        // H5 / 小程序端使用 Canvas 2D
-        const canvas = uni.createOffscreenCanvas({ type: '2d', width, height })
-        const ctx = canvas.getContext('2d')
-        const img = canvas.createImage()
-
-        img.onload = () => {
-          // 绘制原图
-          ctx.drawImage(img, 0, 0, width, height)
-
-          // 水印参数
-          const fontSize = Math.max(Math.floor(width * 0.03), 14)
-          const padding = Math.floor(fontSize * 0.8)
-
-          // 绘制半透明背景
-          const bgHeight = fontSize + padding * 2
-          ctx.fillStyle = 'rgba(0,0,0,0.4)'
-          ctx.fillRect(0, height - bgHeight, width, bgHeight)
-
-          // 绘制水印文字
-          ctx.fillStyle = '#ffffff'
-          ctx.font = `${fontSize}px sans-serif`
-          ctx.textBaseline = 'middle'
-          ctx.fillText(text, padding, height - bgHeight / 2)
-
-          // 导出为临时文件
-          const tempFilePath = canvas.toDataURL('image/jpeg', 0.9)
-          resolve(tempFilePath)
-        }
-
-        img.onerror = (err) => {
-          reject(err || new Error('图片加载失败'))
-        }
-
-        img.src = imagePath
-        // #endif
+        }, (err) => reject(err))
       },
-      fail(err) {
-        reject(err)
-      }
+      fail: reject
     })
+    // #endif
+
+    // #ifdef H5
+    const img = new Image()
+    img.crossOrigin = 'anonymous'
+    img.onload = () => {
+      const width = img.naturalWidth
+      const height = img.naturalHeight
+      const canvas = document.createElement('canvas')
+      canvas.width = width
+      canvas.height = height
+      const ctx = canvas.getContext('2d')
+      ctx.drawImage(img, 0, 0, width, height)
+      const fontSize = Math.max(Math.floor(width * 0.03), 14)
+      const padding = Math.floor(fontSize * 0.8)
+      const bgHeight = fontSize + padding * 2
+      ctx.fillStyle = 'rgba(0,0,0,0.4)'
+      ctx.fillRect(0, height - bgHeight, width, bgHeight)
+      ctx.fillStyle = '#ffffff'
+      ctx.font = `${fontSize}px sans-serif`
+      ctx.textBaseline = 'middle'
+      ctx.fillText(text, padding, height - bgHeight / 2)
+      resolve(canvas.toDataURL('image/jpeg', 0.9))
+    }
+    img.onerror = (err) => reject(err || new Error('图片加载失败'))
+    img.src = imagePath
+    // #endif
+
+    // #ifdef MP-WEIXIN || MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ
+    // 小程序端：跳过水印，直接返回原图
+    // resolve(imagePath)
+    // #endif
   })
 }
diff --git a/server/ZR.Vue/src/components/business/OdfCableForm.vue b/server/ZR.Vue/src/components/business/OdfCableForm.vue
index e846d74..d03a629 100644
--- a/server/ZR.Vue/src/components/business/OdfCableForm.vue
+++ b/server/ZR.Vue/src/components/business/OdfCableForm.vue
@@ -145,12 +145,29 @@ function loadData() {
   }
 }
 
+// 从部门树中查找部门名称
+function findDeptName(deptId, nodes) {
+  for (const node of nodes) {
+    if (node.id === deptId) return node.label
+    if (node.children && node.children.length > 0) {
+      const found = findDeptName(deptId, node.children)
+      if (found) return found
+    }
+  }
+  return null
+}
+
 // 提交表单
 function submitForm() {
   proxy.$refs['formRef'].validate((valid) => {
     if (valid) {
       submitLoading.value = true
 
+      // 根据选中的 deptId 填充 deptName
+      if (form.value.deptId) {
+        form.value.deptName = findDeptName(form.value.deptId, deptOptions.value) || ''
+      }
+
       if (isEdit.value) {
         updateOdfCables(form.value)
           .then((res) => {