From b709ce063990d8a98e466d1293f47f6b7168db9b Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Fri, 17 Apr 2026 17:11:48 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/menu.js | 130 ++++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/pages/index/menu.js b/pages/index/menu.js
index 6239177..adc0575 100644
--- a/pages/index/menu.js
+++ b/pages/index/menu.js
@@ -220,71 +220,71 @@ const menus = {
             ],
 
         },
-        // {
-        //     title: '安环管理',
-        //     children: [
-        //         {
-        //             key: "spotCheck",
-        //             title: "安全点检",
-        //             url: "../safe/spotCheck",
-        //             bgColor: '',
-        //             limit: 'RB2315',
-        //             icon: {
-        //                 size: 20,
-        //                 color: '#00b7ee',
-        //                 type: ''
-        //             }
-        //         },
-        //         {
-        //             key: "inspection",
-        //             title: "安全巡检",
-        //             url: "../safe/inspection",
-        //             bgColor: '',
-        //             limit: 'RB2316',
-        //             icon: {
-        //                 size: 20,
-        //                 color: '#00b7ee',
-        //                 type: ''
-        //             }
-        //         },
-        //         {
-        //             key: "waterInspection",
-        //             title: "废水巡检",
-        //             url: "../sanitation/waterInspection",
-        //             bgColor: '',
-        //             limit: 'RB2318',
-        //             icon: {
-        //                 size: 20,
-        //                 color: '#00b7ee',
-        //                 type: ''
-        //             }
-        //         },
-        //         {
-        //             key: "gasInspection",
-        //             title: "废气巡检",
-        //             url: "../sanitation/gasInspection",
-        //             bgColor: '',
-        //             limit: 'RB2319',
-        //             icon: {
-        //                 size: 20,
-        //                 color: '#00b7ee',
-        //                 type: ''
-        //             }
-        //         },
-        //         {
-        //             key: "bsTower",
-        //             title: "酸雾塔",
-        //             url: "../sanitation/bsTower",
-        //             bgColor: '',
-        //             limit: 'RB2319',
-        //             icon: {
-        //                 size: 20,
-        //                 color: '#00b7ee',
-        //                 type: ''
-        //             }
-        //         },
-        //     ]
-        // },
+        {
+            title: '安环管理',
+            children: [
+                {
+                    key: "spotCheck",
+                    title: "安全点检",
+                    url: "../safe/spotCheck",
+                    bgColor: '',
+                    limit: 'RB2315',
+                    icon: {
+                        size: 20,
+                        color: '#00b7ee',
+                        type: ''
+                    }
+                },
+                {
+                    key: "inspection",
+                    title: "安全巡检",
+                    url: "../safe/inspection",
+                    bgColor: '',
+                    limit: 'RB2316',
+                    icon: {
+                        size: 20,
+                        color: '#00b7ee',
+                        type: ''
+                    }
+                },
+                {
+                    key: "waterInspection",
+                    title: "废水巡检",
+                    url: "../sanitation/waterInspection",
+                    bgColor: '',
+                    limit: 'RB2318',
+                    icon: {
+                        size: 20,
+                        color: '#00b7ee',
+                        type: ''
+                    }
+                },
+                {
+                    key: "gasInspection",
+                    title: "废气巡检",
+                    url: "../sanitation/gasInspection",
+                    bgColor: '',
+                    limit: 'RB2319',
+                    icon: {
+                        size: 20,
+                        color: '#00b7ee',
+                        type: ''
+                    }
+                },
+                {
+                    key: "bsTower",
+                    title: "酸雾塔",
+                    url: "../sanitation/bsTower",
+                    bgColor: '',
+                    limit: 'RB2319',
+                    icon: {
+                        size: 20,
+                        color: '#00b7ee',
+                        type: ''
+                    }
+                },
+            ]
+        },
         {
             title: '物流配送',
             children: [

From 9ea88ab0fee4fb6aee731977de624a8046a2997e Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Tue, 21 Apr 2026 13:40:01 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plan/workReport.vue | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pages/plan/workReport.vue b/pages/plan/workReport.vue
index 21b9715..b0c73f7 100644
--- a/pages/plan/workReport.vue
+++ b/pages/plan/workReport.vue
@@ -244,6 +244,33 @@ export default {
       twoInputFcous: true,
     };
   },
+  // 新增 watch 监听
+  watch: {
+    // 监听报废数量的变化
+    'formData.scrapQty'(newVal) {
+      // 确保有总数量数据，且报废数量是有效数字
+      if (this.tableObj.notWorkQty !== undefined && this.tableObj.notWorkQty !== null) {
+        const totalQty = Number(this.tableObj.notWorkQty);
+        const scrap = Number(newVal);
+        
+        // 如果报废数量是有效数字
+        if (!isNaN(scrap)) {
+          // 计算剩余可合格数量：总数量 - 报废数量
+          let remainingQty = totalQty - scrap;
+          
+          // 防止出现负数，最小为0
+          if (remainingQty < 0) {
+            remainingQty = 0;
+            // 可选：如果报废超过总数，可以提示用户或强制修正报废数量
+            // uni.showToast({ title: '报废数量不能超过总数量', icon: 'none' });
+          }
+          
+          // 更新合格数量
+          this.formData.workQty = remainingQty;
+        }
+      }
+    }
+  },
   methods: {},
   onNavigationBarButtonTap(btn) {
     this.$refs.ifrm.topMenuClick(btn);

From 5af91a028ab8cbe188a361591b910fa7d472488d Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Thu, 23 Apr 2026 16:11:51 +0800
Subject: [PATCH 3/9] =?UTF-8?q?PDA-=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E9=85=B8=E9=9B=BE=E5=A1=94-=E9=A1=B5=E9=9D=A2=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/safe.js                  |  55 +++++
 api/sanitation.js            |  38 +++
 pages/sanitation/bsTower.vue | 438 +++++++++++++++++------------------
 3 files changed, 311 insertions(+), 220 deletions(-)
 create mode 100644 api/safe.js
 create mode 100644 api/sanitation.js

diff --git a/api/safe.js b/api/safe.js
new file mode 100644
index 0000000..5ecd34b
--- /dev/null
+++ b/api/safe.js
@@ -0,0 +1,55 @@
+import http from '@/http/api.js'
+// 安全点检-根据设备编码查询点检项@param {string} code 设备编码
+const getSpotCheckByCode = (code) => {
+  return http.request({
+    url: `/blade-desk/pdaLoad/getSpotCheckByEcCode/${code}`,
+    method: 'GET'
+  })
+}
+// 安全点检-提交点检数据 @param {object} data 提交参数 { sscList: [...] }
+const saveSpotCheck = (data) => {
+  return http.request({
+    url: '/blade-desk/pdaSave/saveBySpotCheck',
+    method: 'POST',
+    data
+  })
+}
+// 安全巡检-根据编码查询巡检点 @param {String} code 巡检点编码
+const getInspectionByCode = (code) => {
+  return http.request({
+    url: `/blade-desk/pdaLoad/getInspectionByEcCode/${code}`,
+    method: 'GET'
+  })
+}
+// 安全巡检-提交巡检数据 @param {object} data 提交参数 { icList: [...] }
+const saveInspection = (data) => {
+  return http.request({
+    url: '/blade-desk/pdaSave/saveByInspection',
+    method: 'POST',
+    data
+  })
+}
+// 设备报修-根据设备编码查询设备信息@param {string} deviceCode 设备编码
+const getEcByDeviceCode = (deviceCode) => {
+  return http.request({
+    url: '/blade-desk/pdaLoad/getEcByDeviceCode',
+    method: 'POST',
+    data: { deviceCode }
+  })
+}
+// 设备报修-提交设备报修 @param {object} data 报修数据
+const saveEqRepair = (data) => {
+  return http.request({
+    url: '/blade-desk/pdaSave/saveEqRepair',
+    method: 'POST',
+    data
+  })
+}
+export default {
+  getInspectionByCode,
+  saveInspection,
+  getSpotCheckByCode,
+  saveSpotCheck,
+  getEcByDeviceCode,
+  saveEqRepair
+}
\ No newline at end of file
diff --git a/api/sanitation.js b/api/sanitation.js
new file mode 100644
index 0000000..2af5ae7
--- /dev/null
+++ b/api/sanitation.js
@@ -0,0 +1,38 @@
+import http from '@/http/api.js'
+// 废水/废气巡检-根据巡检点编码查询任务
+const getInspectionBySan = (params) => {
+    return http.request({
+        url: '/blade-desk/pdaLoad/getInspectionBySan',
+        method: 'POST',
+        data: params
+    })
+}
+// 废水/废气巡检-提交巡检结果
+const savePatrolIns = (data) => {
+    return http.request({
+        url: '/blade-desk/pdaSave/savePatrolIns',
+        method: 'POST',
+        data
+    })
+}
+// 酸雾塔加药接口-根据设备编码查询加药记录 @param {string} code 设备编码
+const epDosingRecByCode = (code) => {
+    return http.request({
+        url: `/blade-desk/pdaLoad/epDosingRecByCode/${code}`,
+        method: 'GET'
+    })
+}
+// 酸雾塔加药接口-提交加药记录 @param {object} data 加药数据
+const saveEpDosingRec = (data) => {
+    return http.request({
+        url: '/blade-desk/pdaSave/saveEpDosingRec',
+        method: 'POST',
+        data
+    })
+}
+export default {
+    getInspectionBySan,
+    savePatrolIns,
+    epDosingRecByCode,
+    saveEpDosingRec
+}
\ No newline at end of file
diff --git a/pages/sanitation/bsTower.vue b/pages/sanitation/bsTower.vue
index 8082807..12d0254 100644
--- a/pages/sanitation/bsTower.vue
+++ b/pages/sanitation/bsTower.vue
@@ -1,34 +1,38 @@
 <template>
-    <ifrm ref="ifrm">
-        <!-- 酸雾塔-->
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><input type="text" v-model="epDosingRecCode" @confirm="epDosingRecConfirm"
-                    class="uni-input-border" placeholder="编码" /></uni-forms-item>
-        </uni-forms>
-        <t-table>
-            <t-tr>
-                <t-td>编码</t-td>
-                <t-td>{{ epDosingRec.bsTower.btCode }}</t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>名称</t-td>
-                <t-td>{{ epDosingRec.device }}</t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>药品名称</t-td>
-                <t-td>{{ epDosingRec.drug }}</t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>剂量</t-td>
-                <t-td><input type="number" v-model="epDosingRec.dose"></t-td>
-            </t-tr>
-        </t-table>
-        <view style="font-size: 36rpx;">备注：</view>
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><uni-easyinput type="textarea" autoHeight v-model="epDosingRec.memo"
-                    placeholder="请输入内容"></uni-easyinput></uni-forms-item>
-        </uni-forms>
-        <!-- <view class="photoTitleSize">{{uploader.length}}/9</view>
+	<ifrm ref="ifrm">
+		<!-- 酸雾塔-->
+		<uni-forms ref="form" err-show-type="toast">
+			<uni-forms-item>
+				<input type="text" v-model="code" @confirm="epDosingRecConfirm" class="uni-input-border"
+					placeholder="编码" />
+			</uni-forms-item>
+		</uni-forms>
+		<t-table>
+			<t-tr>
+				<t-td>编码</t-td>
+				<t-td>{{ epDosingRec.btCode }}</t-td>
+			</t-tr>
+			<t-tr>
+				<t-td>名称</t-td>
+				<t-td>{{ epDosingRec.device }}</t-td>
+			</t-tr>
+			<t-tr>
+				<t-td>药品名称</t-td>
+				<t-td>{{ epDosingRec.drug }}</t-td>
+			</t-tr>
+			<t-tr>
+				<t-td>剂量</t-td>
+				<t-td><input type="number" v-model="epDosingRec.dose" /></t-td>
+			</t-tr>
+		</t-table>
+		<view style="font-size: 36rpx">备注：</view>
+		<uni-forms ref="form" err-show-type="toast">
+			<uni-forms-item>
+				<uni-easyinput type="textarea" autoHeight v-model="epDosingRec.memo" placeholder="请输入备注">
+				</uni-easyinput>
+			</uni-forms-item>
+		</uni-forms>
+		<!-- <view class="photoTitleSize">{{uploader.length}}/9</view>
         <view class="showImage">
             <view v-for="(item, i) in uploader" :key="i" class="showImage-for">
                 <view class="view-image">
@@ -42,209 +46,203 @@
                 <image src="../../static/images/photo.png" @click="chooseImage()"></image>
             </view>
         </view> -->
-        <!-- :disabled="!(Object.keys(epDosingRec).length > 2)" -->
-        <view class="buttonBox"><button class="button" :disabled="!(Object.keys(this.epDosingRec.bsTower).length > 0)"
-                type="primary" @click="submitClick">提交</button></view>
-    </ifrm>
+		<!-- :disabled="!(Object.keys(epDosingRec).length > 2)" -->
+		<view class="buttonBox">
+			<button class="button" :disabled="!(Object.keys(this.epDosingRec).length > 0)" type="primary"
+				@click="submitClick">
+				提交
+			</button>
+		</view>
+	</ifrm>
 </template>
 
 <script>
-    import ifrm from '@/pages/index/ifrm';
-    import tTable from '@/components/t-table/t-table.vue';
-    import tTh from '@/components/t-table/t-th.vue';
-    import tTr from '@/components/t-table/t-tr.vue';
-    import tTd from '@/components/t-table/t-td.vue';
-    import scan from '../../mixin/scan.js';
-    export default {
-        mixins: [scan],
-        components: {
-            ifrm,
-            tTable,
-            tTh,
-            tTr,
-            tTd
-        },
-        data() {
-            return {
-                epDosingRecCode: '',
-                epDosingRec: {
-                    bsTower: {}
-                },
-                uploader: []
-            };
-        },
-        methods: {
+	import ifrm from "@/pages/index/ifrm";
+	import tTable from "@/components/t-table/t-table.vue";
+	import tTh from "@/components/t-table/t-th.vue";
+	import tTr from "@/components/t-table/t-tr.vue";
+	import tTd from "@/components/t-table/t-td.vue";
+	import scan from "../../mixin/scan.js";
+	export default {
+		mixins: [scan],
+		components: {
+			ifrm,
+			tTable,
+			tTh,
+			tTr,
+			tTd,
+		},
+		data() {
+			return {
+				code: "",
+				epDosingRec: {},
+				uploader: [],
+			};
+		},
+		methods: {
+			chooseImage: async function() {
+				if (!this.epDosingRec.dorId) {
+					return uni.showToast({
+						title: "请先查询巡检点",
+						icon: "none",
+					});
+				}
+				uni.chooseImage({
+					// sourceType: ['album','camera'], //album 从相册选图，camera 使用相机，默认二者都有
+					// sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					count: 9,
+					success: (res) => {
+						uni.showLoading({
+							title: "上传中，请稍候",
+						});
+						var tempFilePaths = res.tempFilePaths;
+						for (var i = 0; i < tempFilePaths.length; i++) {
+							const file = res.tempFiles[i];
+							this.$uploadUtil
+								.upload(
+									file, {
+										theId: this.epDosingRec.dorId,
+										theTag: "EpDosingRec",
+										subTag: "appDoc",
+									},
+									tempFilePaths[i]
+								)
+								.then((upId) => {
+									uni.hideLoading();
+									//展示图片
+									this.uploader.push({
+										upId: upId,
+										imageUrl: file.path,
+									});
+								});
+						}
+					},
+					complete() {
+						uni.hideLoading();
+					},
+				});
+			},
+			previewImage: function(index) {
+				var imags = [];
+				this.uploader.forEach((item) => {
+					imags.push(item.imageUrl);
+				});
+				uni.previewImage({
+					current: index,
+					urls: imags,
+				});
+			},
 
-            chooseImage: async function() {
-                if (!this.epDosingRec.dorId) {
-                    return uni.showToast({
-                        title: '请先查询巡检点',
-                        icon: 'none'
-                    });
-                }
-                uni.chooseImage({
-                    // sourceType: ['album','camera'], //album 从相册选图，camera 使用相机，默认二者都有
-                    // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-                    count: 9,
-                    success: (res) => {
-                        uni.showLoading({
-                            title: '上传中，请稍候'
-                        });
-                        var tempFilePaths = res.tempFilePaths;
-                        for (var i = 0; i < tempFilePaths.length; i++) {
-                            const file = res.tempFiles[i];
-                            this.$uploadUtil.upload(file, {
-                                theId: this.epDosingRec.dorId,
-                                theTag: 'EpDosingRec',
-                                subTag: 'appDoc'
-                            }, tempFilePaths[i]).then((upId) => {
-                                uni.hideLoading();
-                                //展示图片
-                                this.uploader.push({
-                                    upId: upId,
-                                    imageUrl: file.path
-                                });
-                            })
+			removeScene(item, i) {
+				//删除现场图片
+				this.uploader.splice(i, 1);
+				// //删除附件记录
+				this.$uploadUtil.asyncDelete(item.upId).then((data) => {
+					uni.showToast({
+						title: "删除成功",
+						icon: "none",
+					});
+				});
+				// this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
+			},
 
-                        }
-                    },
-                    complete() {
-                        uni.hideLoading();
-                    }
-                })
-            },
-            previewImage: function(index) {
-                var imags = [];
-                this.uploader.forEach(item => {
-                    imags.push(item.imageUrl);
-                })
-                uni.previewImage({
-                    current: index,
-                    urls: imags
-                })
-            },
-
-            removeScene(item, i) {
-                //删除现场图片
-                this.uploader.splice(i, 1);
-                // //删除附件记录
-                this.$uploadUtil.asyncDelete(item.upId).then((data) => {
-                    uni.showToast({
-                        title: '删除成功',
-                        icon: 'none'
-                    });
-                })
-                // this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
-            },
-
-            getBarCode(code) {
-                this.getData(code);
-            },
-            epDosingRecConfirm(e) {
-                this.getBarCode(e.target.value);
-            },
-            getData(code) {
-                this.epDosingRecValue = code;
-                this.$ajax.request({
-                    url: 'pdaLoad/epDosingRecByCode/' + code,
-                    method: 'GET',
-                    success: data => {
-                        if (data == null) {
-                            return uni.showToast({
-                                icon: "none",
-                                title: '此酸雾塔置暂无任务'
-                            });
-                        }
-                        this.epDosingRecValue = '';
-                        this.epDosingRec = data;
-                        uni.showToast({
-                            title: '数据获取成功'
-                        });
-                    }
-                });
-            },
-            submitClick() {
-                this.$ajax.request({
-                    url: 'pdaSave/saveEpDosingRec',
-                    method: 'POST',
-                    data: this.epDosingRec,
-                    success: data => {
-                        uni.showToast({
-                            title: '保存成功'
-                        });
-                        this.deviceRepairValue = '';
-                        this.epDosingRec = {
-                            bsTower: {},
-                            dose: null,
-                            memo: ''
-                        };
-                        this.uploader = []
-                    }
-                });
-            }
-        },
-        onNavigationBarButtonTap(btn) {
-            this.$refs.ifrm.topMenuClick(btn);
-        },
-        onShow() {}
-    };
+			getBarCode(code) {
+				this.getData(code);
+			},
+			epDosingRecConfirm(e) {
+				this.getBarCode(e.target.value);
+			},
+			getData(code) {
+				this.epDosingRecValue = code;
+				this.$u.api.epDosingRecByCode(code).then((res) => {
+					if (res.data == null) {
+						return uni.showToast({
+							icon: "none",
+							title: "此酸雾塔置暂无任务",
+						});
+					}
+					this.epDosingRecValue = "";
+					this.epDosingRec = res.data;
+					uni.showToast({
+						title: "数据获取成功",
+					});
+				});
+			},
+			submitClick() {
+				this.$u.api.saveEpDosingRec(this.epDosingRec).then((data) => {
+					uni.showToast({
+						title: "保存成功",
+					});
+					this.epDosingRecValue = "";
+					this.epDosingRec = {
+						dose: null,
+						memo: "",
+					};
+					this.uploader = [];
+				});
+			},
+		},
+		onNavigationBarButtonTap(btn) {
+			this.$refs.ifrm.topMenuClick(btn);
+		},
+		onShow() {},
+	};
 </script>
 
 <style scoped lang="less">
-    .uni-forms-item {
-        margin-bottom: 6px !important;
-    }
-
-    .photoTitleSize {
-        color: #a1a1a1;
-        text-align: right;
-        margin-right: 30rpx;
-        margin-top: -30rpx;
-    }
+	.uni-forms-item {
+		margin-bottom: 6px !important;
+	}
 
-    .showImage {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        flex-wrap: wrap;
-        margin-left: -20rpx;
+	.photoTitleSize {
+		color: #a1a1a1;
+		text-align: right;
+		margin-right: 30rpx;
+		margin-top: -30rpx;
+	}
 
-        .showImage-for {
+	.showImage {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+		margin-left: -20rpx;
 
-            display: flex;
-            flex-direction: column;
-            width: 200rpx;
-            margin-left: 30rpx;
-            height: 260rpx;
+		.showImage-for {
+			display: flex;
+			flex-direction: column;
+			width: 200rpx;
+			margin-left: 30rpx;
+			height: 260rpx;
 
-            .view-icon {
-                display: flex;
-                flex-direction: row;
-                justify-content: center;
-                margin-top: -10rpx;
-            }
+			.view-icon {
+				display: flex;
+				flex-direction: row;
+				justify-content: center;
+				margin-top: -10rpx;
+			}
 
-            image {
-                border-width: 2rpx;
-                border-color: rgb(229, 229, 229);
-                border-style: solid;
-                border-radius: 20rpx;
-                width: 190rpx;
-                height: 190rpx;
-            }
-        }
-    }
+			image {
+				border-width: 2rpx;
+				border-color: rgb(229, 229, 229);
+				border-style: solid;
+				border-radius: 20rpx;
+				width: 190rpx;
+				height: 190rpx;
+			}
+		}
+	}
 
-    .view-center {
-        margin: 0rpx 25rpx;
+	.view-center {
+		margin: 0rpx 25rpx;
 
-        image {
-            border-width: 2rpx;
-            border-color: rgb(229, 229, 229);
-            border-style: solid;
-            border-radius: 20rpx;
-            width: 190rpx;
-            height: 190rpx;
-        }
-    }
+		image {
+			border-width: 2rpx;
+			border-color: rgb(229, 229, 229);
+			border-style: solid;
+			border-radius: 20rpx;
+			width: 190rpx;
+			height: 190rpx;
+		}
+	}
 </style>
\ No newline at end of file

From af61d53211e44cb8e72f41630e4eaa5cb1cc2aaa Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Thu, 23 Apr 2026 19:22:26 +0800
Subject: [PATCH 4/9] =?UTF-8?q?PDA-=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B7=A1=E6=A3=80-=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/safe/inspection.vue | 409 +++++++++++++++++++-------------------
 1 file changed, 199 insertions(+), 210 deletions(-)

diff --git a/pages/safe/inspection.vue b/pages/safe/inspection.vue
index a91e223..44bdf3d 100644
--- a/pages/safe/inspection.vue
+++ b/pages/safe/inspection.vue
@@ -1,231 +1,220 @@
 <template>
-    <ifrm ref="ifrm">
-        <!-- 安全巡检-->
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><input type="text" v-model="patrolRegisterValue" @confirm="patrolRegisterConfirm"
-                    class="uni-input-border" placeholder="巡检点编码" /></uni-forms-item>
-        </uni-forms>
+  <view>
+    <!-- 安全巡检-->
+    <uni-forms ref="form" err-show-type="toast">
+      <uni-forms-item>
+        <input type="text" v-model="insNum" @confirm="insConfirm" class="uni-input-border" placeholder="巡检点编码" />
+      </uni-forms-item>
+    </uni-forms>
+    <uni-table border stripe emptyText="暂无更多数据" class="table">
+      <uni-tr>
+        <uni-th align="center">巡检点编码</uni-th>
+        <uni-th align="center">巡检点位置</uni-th>
+      </uni-tr>
+      <uni-tr v-for="(item, index) in insList" :key="index">
+        <uni-td align="center">{{ item.insNum }}</uni-td>
+        <uni-td align="center">{{ item.insSite }}</uni-td>
+      </uni-tr>
+    </uni-table>
 
-        <uni-table border stripe emptyText="暂无更多数据" class="table">
-            <uni-tr>
-                <uni-th align="center">巡检点编码</uni-th>
-                <uni-th align="center">巡检点位置</uni-th>
-            </uni-tr>
-            <uni-tr v-for="(item, index) in patrolRegisterList" :key="index">
-                <uni-td align="center">{{ item.patrolRegister }}</uni-td>
-                <uni-td align="center">{{ item.insSpot }}</uni-td>
-            </uni-tr>
-        </uni-table>
+    <view style="font-size: 36rpx; margin: 20rpx 0">巡检备注：</view>
+    <uni-forms ref="form" err-show-type="toast">
+      <uni-forms-item>
+        <uni-easyinput type="textarea" autoHeight v-model="memo" placeholder="请输入内容" />
+      </uni-forms-item>
+    </uni-forms>
 
-        <view style="font-size: 36rpx;">巡检备注：</view>
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><uni-easyinput type="textarea" autoHeight v-model="parMemo"
-                    placeholder="请输入内容"></uni-easyinput></uni-forms-item>
-        </uni-forms>
-        <view class="photoTitleSize">{{uploader.length}}/9</view>
-        <view class="showImage">
-            <view v-for="(item, i) in uploader" :key="i" class="showImage-for">
-                <view class="view-image">
-                    <image :src="item.imageUrl" @tap="previewImage(i)" />
-                </view>
-                <view class="view-icon">
-                    <uni-icons type='trash' size="14" color='gray' @click="removeScene(item, i)"></uni-icons>
-                </view>
-            </view>
-            <view class="view-center" v-if="uploader.length < 9">
-                <image src="../../static/images/photo.png" @click="chooseImage()"></image>
-            </view>
+    <view class="photoTitleSize">{{ uploader.length }}/9</view>
+    <view class="showImage">
+      <view v-for="(item, i) in uploader" :key="i" class="showImage-for">
+        <view class="view-image">
+          <image :src="item.imageUrl" @tap="previewImage(i)" mode="widthFix" />
         </view>
-        <view class="buttonBox"><button class="button" type="primary" :disabled="!(patrolRegisterList.length > 0)"
-                @click="submitClick">提交</button></view>
-    </ifrm>
+        <view class="view-icon">
+          <uni-icons type="trash" size="14" color="gray" @click="removeScene(item, i)"></uni-icons>
+        </view>
+      </view>
+
+      <view class="view-center" v-if="uploader.length < 9">
+        <image src="../../static/images/photo.png" @click="chooseImage"></image>
+      </view>
+    </view>
+
+    <view class="buttonBox">
+      <button class="button" type="primary" :disabled="!(insList.length > 0)" @click="submitClick">
+        提交
+      </button>
+    </view>
+  </view>
 </template>
 
 <script>
-    import ifrm from '@/pages/index/ifrm';
-    import scan from '../../mixin/scan.js';
-    export default {
-        mixins: [scan],
-        components: {
-            ifrm
-        },
-        data() {
-            return {
-                patrolRegisterValue: '',
-                patrolRegisterList: [],
-                uploader: [],
-                parMemo: ''
-            };
-        },
-        methods: {
-            getBarCode(code) {
-                this.getData(code);
-            },
-            patrolRegisterConfirm(e) {
-                this.getBarCode(e.target.value);
-            },
-            getData(code) {
-                if (!code) return;
-                this.patrolRegisterValue = code;
-                this.$ajax.request({
-                    url: 'pdaLoad/getInspectionByEcCode/' + code,
-                    method: 'GET',
-                    success: data => {
-                        console.log(data);
-                        this.patrolRegisterValue = '';
-                        this.patrolRegisterList = data;
-                        uni.showToast({
-                            title: '数据获取成功'
-                        });
-                    }
-                });
-            },
-            submitClick() {
-                let piList = [];
-                this.patrolRegisterList.forEach(item => {
-                    piList.push({
-                        piId: item.piId
-                    });
-
-                });
-                this.$ajax.request({
-                    url: 'pdaSave/saveByInspection',
-                    method: 'POST',
-                    data: {
-                        piList,
-                        parMemo: this.parMemo
-                    },
-                    success: data => {
-                        uni.showToast({
-                            title: '巡检成功'
-                        });
-                        this.patrolRegisterValue = '';
-                        this.patrolRegisterList = [];
-                        this.uploader = []
-                    }
+import scan from "../../mixin/scan.js";
+import {
+  options
+} from '@/http/config.js';
+export default {
+  mixins: [scan],
+  data() {
+    return {
+      insNum: "",
+      insList: [],
+      uploader: [], // 存放 { imageUrl, upId }
+      memo: "",
+      uploadCount: 0, // 上传计数
+    };
+  },
+  methods: {
+    getBarCode(code) {
+      this.getData(code);
+    },
+    insConfirm(e) {
+      this.getBarCode(e.target.value);
+    },
+    getData(code) {
+      if (!code) return;
+      this.insNum = code;
+      this.$u.api.getInspectionByCode(code).then((res) => {
+        this.insNum = "";
+        this.insList = res.data;
+        uni.showToast({ title: "数据获取成功" });
+      });
+    },
+    submitClick() {
+      this.$u.api
+        .saveInspection({
+          code: this.insList.map((item) => item.insNum).join(","),
+          memo: this.memo,
+          // 取出所有上传成功的文件
+          path: this.uploader.map((item) => item.imageUrl),
+        })
+        .then((data) => {
+          uni.showToast({ title: "巡检成功" });
+          // 清空表单
+          this.insList = [];
+          this.memo = "";
+          this.uploader = [];
+        });
+    },
+    chooseImage: async function () {
+      if (this.insList.length == 0) {
+        return uni.showToast({
+          title: '请先查询巡检点',
+          icon: 'none'
+        });
+      }
+      uni.chooseImage({
+        count: 9,
+        // sizeType: ['compressed'],
+        // sourceType: ['album', 'camera'],
+        success: (res) => {
+          uni.showLoading({
+            title: '上传中，请稍候'
+          });
+          res.tempFilePaths.forEach(filePath => {
+            uni.uploadFile({
+              url: options.baseURL + '/blade-resource/oss/endpoint/put-file-attach',
+              filePath: filePath,
+              name: 'file',
+              header: {
+                'token': 'bearer ' + uni.getStorageSync('accessToken'),
+                'Blade-Auth': 'bearer ' + uni.getStorageSync('accessToken'),
+                'Blade-Requested-With': 'BladeHttpRequest'
+              },
+              success: (uploadRes) => {
+                uni.hideLoading();
+                uni.showToast({ title: '上传成功' });
+                this.uploader.push({
+                  upId: JSON.parse(uploadRes.data).data.attachId,
+                  imageUrl: JSON.parse(uploadRes.data).data.link
                 });
-            },
-            chooseImage: async function() {
-                if (this.patrolRegisterList.length == 0) {
-                    return uni.showToast({
-                        title: '请先查询巡检点',
-                        icon: 'none'
-                    });
-                }
-                uni.chooseImage({
-                    // sourceType: ['album','camera'], //album 从相册选图，camera 使用相机，默认二者都有
-                    // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-                    count: 9,
-                    success: (res) => {
-                        uni.showLoading({
-                            title: '上传中，请稍候'
-                        });
-                        var tempFilePaths = res.tempFilePaths;
-                        for (var i = 0; i < tempFilePaths.length; i++) {
-                            const file = res.tempFiles[i];
-                            this.$uploadUtil.upload(file, {
-                                theId: this.patrolRegisterList[0].piId,
-                                theTag: 'SafePatrolInspection',
-                                subTag: 'appDoc'
-                            }, tempFilePaths[i]).then((upId) => {
-                                uni.hideLoading();
-                                //展示图片
-                                this.uploader.push({
-                                    upId: upId,
-                                    imageUrl: file.path
-                                });
-                            })
-
-                        }
-                    },
-                    complete() {
-                        uni.hideLoading();
-                    }
-                })
-            },
-            previewImage: function(index) {
-                var imags = [];
-                this.uploader.forEach(item => {
-                    imags.push(item.imageUrl);
-                })
-                uni.previewImage({
-                    current: index,
-                    urls: imags
-                })
-            },
-
-            removeScene(item, i) {
-                //删除现场图片
-                this.uploader.splice(i, 1);
-                // //删除附件记录
-                this.$uploadUtil.asyncDelete(item.upId).then((data) => {
-                    uni.showToast({
-                        title: '删除成功',
-                        icon: 'none'
-                    });
-                })
-                // this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
-            },
+              },
+              fail: (err) => {
+                console.error('❌ 上传失败', err);
+                uni.showToast({ title: '上传失败', icon: 'none' });
+              }
+            });
+          });
         },
+      });
+    },
+    // 预览图片
+    previewImage(index) {
+      const urls = this.uploader.map((item) => item.imageUrl);
+      uni.previewImage({ current: index, urls });
+    },
 
-        onNavigationBarButtonTap(btn) {
-            this.$refs.ifrm.topMenuClick(btn);
-        },
-        onShow() {}
-    };
+    // 删除图片
+    removeScene(item, index) {
+      // 先删本地列表
+      this.uploader.splice(index, 1);
+      uni.showToast({ title: "删除成功", icon: "none" });
+    },
+  },
+
+  onNavigationBarButtonTap(btn) {
+    this.$refs.ifrm.topMenuClick(btn);
+  },
+  onShow() { },
+};
 </script>
 
 <style scoped lang="less">
-    .photoTitleSize {
-        color: #a1a1a1;
-        text-align: right;
-        margin-right: 30rpx;
-        margin-top: -30rpx;
-    }
+.photoTitleSize {
+  color: #a1a1a1;
+  text-align: right;
+  margin-right: 30rpx;
+  margin-top: 20rpx;
+}
 
-    .showImage {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        flex-wrap: wrap;
-        margin-left: -20rpx;
+.showImage {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+  margin-left: -20rpx;
 
-        .showImage-for {
+  .showImage-for {
+    display: flex;
+    flex-direction: column;
+    width: 200rpx;
+    margin-left: 30rpx;
+    height: 260rpx;
 
-            display: flex;
-            flex-direction: column;
-            width: 200rpx;
-            margin-left: 30rpx;
-            height: 260rpx;
-
-            .view-icon {
-                display: flex;
-                flex-direction: row;
-                justify-content: center;
-                margin-top: -10rpx;
-            }
+    .view-icon {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      margin-top: -10rpx;
+    }
 
-            image {
-                border-width: 2rpx;
-                border-color: rgb(229, 229, 229);
-                border-style: solid;
-                border-radius: 20rpx;
-                width: 190rpx;
-                height: 190rpx;
-            }
-        }
+    image {
+      border-width: 2rpx;
+      border-color: rgb(229, 229, 229);
+      border-style: solid;
+      border-radius: 20rpx;
+      width: 190rpx;
+      height: 190rpx;
     }
+  }
+}
 
-    .view-center {
-        margin: 0rpx 25rpx;
+.view-center {
+  margin: 0rpx 25rpx;
 
-        image {
-            border-width: 2rpx;
-            border-color: rgb(229, 229, 229);
-            border-style: solid;
-            border-radius: 20rpx;
-            width: 190rpx;
-            height: 190rpx;
-        }
-    }
+  image {
+    border-width: 2rpx;
+    border-color: rgb(229, 229, 229);
+    border-style: solid;
+    border-radius: 20rpx;
+    width: 190rpx;
+    height: 190rpx;
+  }
+}
+
+.buttonBox {
+  margin-top: 30rpx;
+  display: flex;
+  justify-content: center;
+}
 </style>
\ No newline at end of file

From 06b88868559fa9d889727229ab13aac931c0f37d Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Thu, 23 Apr 2026 19:23:07 +0800
Subject: [PATCH 5/9] =?UTF-8?q?PDA-=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=82=B9=E6=A3=80-=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/safe/spotCheck.vue | 241 +++++++++++++++++++++------------------
 1 file changed, 129 insertions(+), 112 deletions(-)

diff --git a/pages/safe/spotCheck.vue b/pages/safe/spotCheck.vue
index 7a64749..af2724d 100644
--- a/pages/safe/spotCheck.vue
+++ b/pages/safe/spotCheck.vue
@@ -1,120 +1,137 @@
 <template>
-    <ifrm ref="ifrm">
-        <!-- 安全点检 -->
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><input type="text" v-model="facilityValue" @confirm="facilityConfirm"
-                    class="uni-input-border" placeholder="设备编码" /></uni-forms-item>
-        </uni-forms>
-        <checkbox-group @change="checkboxChange">
-            <uni-table border stripe emptyText="暂无更多数据" class="table">
-                <uni-tr>
-                    <uni-th align="center" width="60"></uni-th>
-                    <uni-th align="center">检验项</uni-th>
-                    <uni-th align="center">检验条件</uni-th>
-                    <uni-th align="center">检验结果</uni-th>
-                    <uni-th align="center">描述</uni-th>
-                </uni-tr>
-                <uni-tr v-for="(item, index) in facilityData" :key="index">
-                    <uni-td align="center">
-                        <checkbox :value="item" :checked="item.checked" />
-                    </uni-td>
-                    <uni-td align="center">{{ item.checkItem }}</uni-td>
-                    <uni-td align="center">{{ item.checkCon }}</uni-td>
-                    <uni-td align="center" class="tableRequired">
-                        <picker @change="bindPickerChange($event, index)" :value="item.facilityIndex" :range="array">
-                            <view class="uni-input">{{ array[item.facilityIndex] }}</view>
-                        </picker>
-                    </uni-td>
-                    <uni-td align="center" width="200"><textarea style="width: 260rpx;" auto-height
-                            v-model="item.describe" /></uni-td>
-                </uni-tr>
-            </uni-table>
-        </checkbox-group>
-        <view class="buttonBox"><button class="button" type="primary" :disabled="!(facilitySeceteArr.length > 0)"
-                @click="submitClick">提交</button></view>
-    </ifrm>
+  <ifrm ref="ifrm">
+    <!-- 安全点检 -->
+    <uni-forms ref="form" err-show-type="toast">
+      <uni-forms-item>
+        <input
+          type="text"
+          v-model="facilityValue"
+          @confirm="facilityConfirm"
+          class="uni-input-border"
+          placeholder="设备编码"
+        />
+      </uni-forms-item>
+    </uni-forms>
+    <checkbox-group @change="checkboxChange">
+      <uni-table border stripe emptyText="暂无更多数据" class="table">
+        <uni-tr>
+          <uni-th align="center" width="60"></uni-th>
+          <uni-th align="center">检验项</uni-th>
+          <uni-th align="center">检验条件</uni-th>
+          <uni-th align="center">检验结果</uni-th>
+          <uni-th align="center">描述</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in facilityData" :key="index">
+          <uni-td align="center">
+            <checkbox :value="item" :checked="item.checked" />
+          </uni-td>
+          <uni-td align="center">{{ item.checkItem }}</uni-td>
+          <uni-td align="center">{{ item.checkCon }}</uni-td>
+          <uni-td align="center" class="tableRequired">
+            <picker
+              @change="bindPickerChange($event, index)"
+              :value="item.facilityIndex"
+              :range="array"
+            >
+              <view class="uni-input">{{ array[item.facilityIndex] }}</view>
+            </picker>
+          </uni-td>
+          <uni-td align="center" width="200">
+            <textarea
+              style="width: 260rpx"
+              auto-height
+              v-model="item.describe"
+            />
+          </uni-td>
+        </uni-tr>
+      </uni-table>
+    </checkbox-group>
+    <view class="buttonBox">
+      <button
+        class="button"
+        type="primary"
+        :disabled="!(facilitySeceteArr.length > 0)"
+        @click="submitClick"
+      >
+        提交
+      </button>
+    </view>
+  </ifrm>
 </template>
 
 <script>
-    import ifrm from '@/pages/index/ifrm';
-    import scan from '../../mixin/scan.js';
-    export default {
-        mixins: [scan],
-        components: {
-            ifrm
-        },
-        data() {
-            return {
-                facilityValue: '',
-                array: ['正常', '关机', '异常'],
-                facilityData: [],
-                facilitySeceteArr: []
-            };
-        },
-        methods: {
-            checkboxChange(e) {
-                this.facilitySeceteArr = e.detail.value;
-            },
-            bindPickerChange: function(e, index) {
-                this.facilityData[index].facilityIndex = e.target.value;
-            },
-            getBarCode(code) {
-                this.getData(code);
-            },
-            facilityConfirm(e) {
-                this.getBarCode(e.target.value);
-            },
-            getData(code) {
-                if (!code) return;
-                this.facilityValue = code;
-                this.$ajax.request({
-                    url: 'pdaLoad/getSpotCheckByEcCode/' + code,
-                    method: 'GET',
-                    success: data => {
-                        this.facilityValue = '';
-                        this.facilityData = [];
-                        data.forEach(item => {
-                            this.facilityData.push({
-                                ...item,
-                                facilityIndex: 0
-                            });
-                        });
-                        uni.showToast({
-                            title: '数据获取成功'
-                        });
-                    }
-                });
-            },
-            submitClick() {
-                let arr = [];
-                this.facilitySeceteArr.forEach(item => {
-                    arr.push({
-                        sscId: item.sscId,
-                        checkResult: item.facilityIndex,
-                        describe: item.describe
-                    });
-                });
-                this.$ajax.request({
-                    url: 'pdaSave/saveBySpotCheck',
-                    method: 'POST',
-                    data: {
-                        sscList: arr
-                    },
-                    success: data => {
-                        uni.showToast({
-                            title: '点检成功'
-                        });
-                        this.facilityValue = '';
-                        this.facilityData = [];
-                    }
-                });
-            }
-        },
-        onNavigationBarButtonTap(btn) {
-            this.$refs.ifrm.topMenuClick(btn);
-        },
-        onShow() {}
+import ifrm from "@/pages/index/ifrm";
+import scan from "../../mixin/scan.js";
+export default {
+  mixins: [scan],
+  components: {
+    ifrm,
+  },
+  data() {
+    return {
+      facilityValue: "",
+      array: ["正常", "关机", "异常"],
+      facilityData: [],
+      facilitySeceteArr: [],
     };
+  },
+  methods: {
+    checkboxChange(e) {
+      this.facilitySeceteArr = e.detail.value;
+    },
+    bindPickerChange: function (e, index) {
+      this.facilityData[index].facilityIndex = e.target.value;
+    },
+    getBarCode(code) {
+      this.getData(code);
+    },
+    facilityConfirm(e) {
+      this.getBarCode(e.target.value);
+    },
+    getData(code) {
+      if (!code) return;
+      this.facilityValue = code;
+      this.$u.api.getSpotCheckByCode(code).then((data) => {
+        this.facilityValue = "";
+        this.facilityData = [];
+        data.forEach((item) => {
+          this.facilityData.push({
+            ...item,
+            facilityIndex: 0,
+          });
+        });
+        uni.showToast({
+          title: "数据获取成功",
+        });
+      });
+    },
+    submitClick() {
+      let arr = [];
+      this.facilitySeceteArr.forEach((item) => {
+        arr.push({
+          sscId: item.sscId,
+          checkResult: item.facilityIndex,
+          describe: item.describe,
+        });
+      });
+      this.$u.api
+        .saveSpotCheck({
+          sscList: arr,
+        })
+        .then((data) => {
+          uni.showToast({
+            title: "点检成功",
+          });
+          this.facilityValue = "";
+          this.facilityData = [];
+        });
+    },
+  },
+  onNavigationBarButtonTap(btn) {
+    this.$refs.ifrm.topMenuClick(btn);
+  },
+  onShow() {},
+};
 </script>
 
 <style scoped></style>
\ No newline at end of file

From 2b16285384473cff0a623550c76b9d7b7d50c20b Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Thu, 23 Apr 2026 19:23:47 +0800
Subject: [PATCH 6/9] =?UTF-8?q?PDA-=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=BA=9F=E6=B0=B4/=E5=BA=9F=E6=B0=94=E5=B7=A1=E6=A3=80-?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/sanitation/gasInspection.vue   | 477 +++++++++++++-------------
 pages/sanitation/waterInspection.vue | 496 ++++++++++++++-------------
 2 files changed, 515 insertions(+), 458 deletions(-)

diff --git a/pages/sanitation/gasInspection.vue b/pages/sanitation/gasInspection.vue
index 47ef92f..712811b 100644
--- a/pages/sanitation/gasInspection.vue
+++ b/pages/sanitation/gasInspection.vue
@@ -1,249 +1,268 @@
 <template>
-    <ifrm ref="ifrm">
-        <!-- 安全巡检-->
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><input type="text" v-model="deviceRepairValue" @confirm="deviceRepairConfirm"
-                    class="uni-input-border" placeholder="巡检点编码" /></uni-forms-item>
-        </uni-forms>
-        <t-table>
-            <t-tr>
-                <t-td>巡检点编码</t-td>
-                <t-td>{{ deviceRepairObj.epInspectionPoint.patrolRegister }}</t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>巡检点位置</t-td>
-                <t-td>{{ deviceRepairObj.epInspectionPoint.insSpot }}</t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>状态</t-td>
-                <t-td>{{ deviceRepairObj.taskStatusText }}</t-td>
-            </t-tr>
-        </t-table>
-        <view style="font-size: 36rpx;">巡检备注：</view>
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><uni-easyinput type="textarea" autoHeight v-model="deviceRepairObj.parMemo"
-                    placeholder="请输入内容"></uni-easyinput></uni-forms-item>
-        </uni-forms>
-        <view class="photoTitleSize">{{uploader.length}}/9</view>
-        <view class="showImage">
-            <view v-for="(item, i) in uploader" :key="i" class="showImage-for">
-                <view class="view-image">
-                    <image :src="item.imageUrl" @tap="previewImage(i)" />
-                </view>
-                <view class="view-icon">
-                    <uni-icons type='trash' size="14" color='gray' @click="removeScene(item, i)"></uni-icons>
-                </view>
-            </view>
-            <view class="view-center" v-if="uploader.length < 9">
-                <image src="../../static/images/photo.png" @click="chooseImage()"></image>
-            </view>
+  <ifrm ref="ifrm">
+    <!-- 安全巡检-->
+    <uni-forms ref="form" err-show-type="toast">
+      <uni-forms-item>
+        <input type="text" v-model="code" @confirm="deviceRepairConfirm" class="uni-input-border" placeholder="巡检点编码" />
+      </uni-forms-item>
+    </uni-forms>
+    <t-table>
+      <t-tr>
+        <t-td>巡检点编码</t-td>
+        <t-td>{{ deviceRepairObj.epInspectionPoint.insNum }}</t-td>
+      </t-tr>
+      <t-tr>
+        <t-td>巡检点位置</t-td>
+        <t-td>{{ deviceRepairObj.epInspectionPoint.insSite }}</t-td>
+      </t-tr>
+      <t-tr>
+        <t-td>状态</t-td>
+        <t-td>
+          {{
+            deviceRepairObj.epInspectionPoint.taskStatus == 1
+              ? "待检"
+              : deviceRepairObj.epInspectionPoint.taskStatus == 2
+                ? "未检"
+                : deviceRepairObj.epInspectionPoint.taskStatus == 3
+                  ? "已检"
+                  : ""
+          }}
+        </t-td>
+      </t-tr>
+    </t-table>
+    <view style="font-size: 36rpx">巡检备注：</view>
+    <uni-forms ref="form" err-show-type="toast">
+      <uni-forms-item>
+        <uni-easyinput type="textarea" autoHeight v-model="deviceRepairObj.epInspectionPoint.parMemo"
+          placeholder="请输入内容">
+        </uni-easyinput>
+      </uni-forms-item>
+    </uni-forms>
+    <view class="photoTitleSize">{{ uploader.length }}/9</view>
+    <view class="showImage">
+      <view v-for="(item, i) in uploader" :key="i" class="showImage-for">
+        <view class="view-image">
+          <image :src="item.imageUrl" @tap="previewImage(i)" />
         </view>
-        <view class="buttonBox"><button class="button" type="primary"
-                :disabled="!(Object.keys(deviceRepairObj).length > 2)" @click="submitClick">提交</button></view>
-    </ifrm>
+        <view class="view-icon">
+          <uni-icons type="trash" size="14" color="gray" @click="removeScene(item, i)" />
+        </view>
+      </view>
+      <view class="view-center" v-if="uploader.length < 9">
+        <image src="../../static/images/photo.png" @click="chooseImage()" />
+      </view>
+    </view>
+    <view class="buttonBox">
+      <button class="button" type="primary" :disabled="!(Object.keys(deviceRepairObj.epInspectionPoint).length > 2)"
+        @click="submitClick">
+        提交
+      </button>
+    </view>
+  </ifrm>
 </template>
-
 <script>
-    import ifrm from '@/pages/index/ifrm';
-    import tTable from '@/components/t-table/t-table.vue';
-    import tTh from '@/components/t-table/t-th.vue';
-    import tTr from '@/components/t-table/t-tr.vue';
-    import tTd from '@/components/t-table/t-td.vue';
-    import scan from '../../mixin/scan.js';
-    export default {
-        mixins: [scan],
-        components: {
-            ifrm,
-            tTable,
-            tTh,
-            tTr,
-            tTd
+import ifrm from "@/pages/index/ifrm";
+import tTable from "@/components/t-table/t-table.vue";
+import tTh from "@/components/t-table/t-th.vue";
+import tTr from "@/components/t-table/t-tr.vue";
+import tTd from "@/components/t-table/t-td.vue";
+import scan from "../../mixin/scan.js";
+import {
+  options
+} from '@/http/config.js';
+export default {
+  mixins: [scan],
+  components: {
+    ifrm,
+    tTable,
+    tTh,
+    tTr,
+    tTd,
+  },
+  data() {
+    return {
+      code: "",
+      deviceRepairObj: {
+        epInspectionPoint: {
+          parMemo: "",
         },
-        data() {
-            return {
-                deviceRepairValue: '',
-                deviceRepairObj: {
-                    epInspectionPoint: {},
-                    parMemo: ''
-                },
-                uploader: []
-            };
+      },
+      uploader: [],
+    };
+  },
+  methods: {
+    chooseImage: async function () {
+      if (!this.deviceRepairObj.epInspectionPoint.epcId) {
+        return uni.showToast({
+          title: '请先查询巡检点',
+          icon: 'none'
+        });
+      }
+      uni.chooseImage({
+        count: 9,
+        // sizeType: ['compressed'],
+        // sourceType: ['album', 'camera'],
+        success: (res) => {
+          uni.showLoading({
+            title: '上传中，请稍候'
+          });
+          res.tempFilePaths.forEach(filePath => {
+            uni.uploadFile({
+              url: options.baseURL + '/blade-resource/oss/endpoint/put-file-attach',
+              filePath: filePath,
+              name: 'file',
+              header: {
+                'token': 'bearer ' + uni.getStorageSync('accessToken'),
+                'Blade-Auth': 'bearer ' + uni.getStorageSync('accessToken'),
+                'Blade-Requested-With': 'BladeHttpRequest'
+              },
+              success: (uploadRes) => {
+                uni.hideLoading();
+                uni.showToast({ title: '上传成功' });
+                this.uploader.push({
+                  upId: JSON.parse(uploadRes.data).data.attachId,
+                  imageUrl: JSON.parse(uploadRes.data).data.link
+                });
+              },
+              fail: (err) => {
+                console.error('❌ 上传失败', err);
+                uni.showToast({ title: '上传失败', icon: 'none' });
+              }
+            });
+          });
         },
-        methods: {
+      });
+    },
+    previewImage: function (index) {
+      var imags = [];
+      this.uploader.forEach((item) => {
+        imags.push(item.imageUrl);
+      });
+      uni.previewImage({
+        current: index,
+        urls: imags,
+      });
+    },
 
-            chooseImage: async function() {
-                if (!this.deviceRepairObj.epiId) {
-                    return uni.showToast({
-                        title: '请先查询巡检点',
-                        icon: 'none'
-                    });
-                }
-                uni.chooseImage({
-                    // sourceType: ['album','camera'], //album 从相册选图，camera 使用相机，默认二者都有
-                    // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-                    count: 9,
-                    success: (res) => {
-                        uni.showLoading({
-                            title: '上传中，请稍候'
-                        });
-                        var tempFilePaths = res.tempFilePaths;
-                        for (var i = 0; i < tempFilePaths.length; i++) {
-                            const file = res.tempFiles[i];
-                            this.$uploadUtil.upload(file, {
-                                theId: this.deviceRepairObj.epiId,
-                                theTag: 'EpPatrolInspection',
-                                subTag: 'appDoc'
-                            }, tempFilePaths[i]).then((upId) => {
-                                uni.hideLoading();
-                                //展示图片
-                                this.uploader.push({
-                                    upId: upId,
-                                    imageUrl: file.path
-                                });
-                            })
+    removeScene(item, i) {
+      //删除现场图片
+      this.uploader.splice(i, 1);
+      // //删除附件记录
+      this.$uploadUtil.asyncDelete(item.upId).then((data) => {
+        uni.showToast({
+          title: "删除成功",
+          icon: "none",
+        });
+      });
+      // this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
+    },
 
-                        }
-                    },
-                    complete() {
-                        uni.hideLoading();
-                    }
-                })
-            },
-            previewImage: function(index) {
-                var imags = [];
-                this.uploader.forEach(item => {
-                    imags.push(item.imageUrl);
-                })
-                uni.previewImage({
-                    current: index,
-                    urls: imags
-                })
-            },
-
-            removeScene(item, i) {
-                //删除现场图片
-                this.uploader.splice(i, 1);
-                // //删除附件记录
-                this.$uploadUtil.asyncDelete(item.upId).then((data) => {
-                    uni.showToast({
-                        title: '删除成功',
-                        icon: 'none'
-                    });
-                })
-                // this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
-            },
-
-            getBarCode(code) {
-                this.getData(code);
-            },
-            deviceRepairConfirm(e) {
-                this.getBarCode(e.target.value);
-            },
-            getData(code) {
-                this.deviceRepairValue = code;
-                this.$ajax.request({
-                    url: 'pdaLoad/getInspectionBySan',
-                    method: 'POST',
-                    data: {
-                        code: code,
-                        eipType: 2
-                    },
-                    success: data => {
-                        if (data == null) {
-                            return uni.showToast({
-                                icon: "none",
-                                title: '此巡检位置暂无任务'
-                            });
-                        }
-                        this.deviceRepairValue = '';
-                        this.deviceRepairObj = data;
-                        uni.showToast({
-                            title: '数据获取成功'
-                        });
-                    }
-                });
-            },
-            submitClick() {
-                this.$ajax.request({
-                    url: 'pdaSave/savePatrolIns',
-                    method: 'POST',
-                    data: this.deviceRepairObj,
-                    success: data => {
-                        uni.showToast({
-                            title: '保存成功'
-                        });
-                        this.deviceRepairValue = '';
-                        this.deviceRepairObj = {
-                            epInspectionPoint: {},
-                            parMemo: ''
-                        };
-                        this.uploader = []
-                    }
-                });
-            }
-        },
-        onNavigationBarButtonTap(btn) {
-            this.$refs.ifrm.topMenuClick(btn);
-        },
-        onShow() {}
-    };
+    getBarCode(code) {
+      this.getData(code);
+    },
+    deviceRepairConfirm(e) {
+      this.getBarCode(e.target.value);
+    },
+    getData(code) {
+      this.code = code;
+      this.$u.api
+        .getInspectionBySan({
+          code: code,
+          eipType: 2,
+        })
+        .then((res) => {
+          if (res.data == null) {
+            return uni.showToast({
+              icon: "none",
+              title: "此巡检位置暂无任务",
+            });
+          }
+          this.code = "";
+          this.deviceRepairObj.epInspectionPoint = res.data;
+          uni.showToast({
+            title: "数据获取成功",
+          });
+        });
+    },
+    submitClick() {
+      this.$u.api
+        .savePatrolIns({
+          ...this.deviceRepairObj.epInspectionPoint,
+          path: this.uploader.map((item) => item.imageUrl).join(','),
+        })
+        .then((data) => {
+          uni.showToast({
+            title: "保存成功",
+          });
+          this.code = "";
+          this.deviceRepairObj = {
+            epInspectionPoint: {},
+          };
+          this.uploader = [];
+        });
+    },
+  },
+  onNavigationBarButtonTap(btn) {
+    this.$refs.ifrm.topMenuClick(btn);
+  },
+  onShow() { },
+};
 </script>
 
 <style scoped lang="less">
-    .uni-forms-item {
-        margin-bottom: 6px !important;
-    }
+.uni-forms-item {
+  margin-bottom: 6px !important;
+}
 
-    .photoTitleSize {
-        color: #a1a1a1;
-        text-align: right;
-        margin-right: 30rpx;
-        margin-top: -30rpx;
-    }
-
-    .showImage {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        flex-wrap: wrap;
-        margin-left: -20rpx;
+.photoTitleSize {
+  color: #a1a1a1;
+  text-align: right;
+  margin-right: 30rpx;
+  margin-top: -30rpx;
+}
 
-        .showImage-for {
+.showImage {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+  margin-left: -20rpx;
 
-            display: flex;
-            flex-direction: column;
-            width: 200rpx;
-            margin-left: 30rpx;
-            height: 260rpx;
+  .showImage-for {
+    display: flex;
+    flex-direction: column;
+    width: 200rpx;
+    margin-left: 30rpx;
+    height: 260rpx;
 
-            .view-icon {
-                display: flex;
-                flex-direction: row;
-                justify-content: center;
-                margin-top: -10rpx;
-            }
+    .view-icon {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      margin-top: -10rpx;
+    }
 
-            image {
-                border-width: 2rpx;
-                border-color: rgb(229, 229, 229);
-                border-style: solid;
-                border-radius: 20rpx;
-                width: 190rpx;
-                height: 190rpx;
-            }
-        }
+    image {
+      border-width: 2rpx;
+      border-color: rgb(229, 229, 229);
+      border-style: solid;
+      border-radius: 20rpx;
+      width: 190rpx;
+      height: 190rpx;
     }
+  }
+}
 
-    .view-center {
-        margin: 0rpx 25rpx;
+.view-center {
+  margin: 0rpx 25rpx;
 
-        image {
-            border-width: 2rpx;
-            border-color: rgb(229, 229, 229);
-            border-style: solid;
-            border-radius: 20rpx;
-            width: 190rpx;
-            height: 190rpx;
-        }
-    }
+  image {
+    border-width: 2rpx;
+    border-color: rgb(229, 229, 229);
+    border-style: solid;
+    border-radius: 20rpx;
+    width: 190rpx;
+    height: 190rpx;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/sanitation/waterInspection.vue b/pages/sanitation/waterInspection.vue
index 921d257..3d51cbc 100644
--- a/pages/sanitation/waterInspection.vue
+++ b/pages/sanitation/waterInspection.vue
@@ -1,249 +1,287 @@
 <template>
-    <ifrm ref="ifrm">
-        <!-- 安全巡检-->
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><input type="text" v-model="deviceRepairValue" @confirm="deviceRepairConfirm"
-                    class="uni-input-border" placeholder="巡检点编码" /></uni-forms-item>
-        </uni-forms>
-        <t-table>
-            <t-tr>
-                <t-td>巡检点编码</t-td>
-                <t-td>{{ deviceRepairObj.epInspectionPoint.patrolRegister }}</t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>巡检点位置</t-td>
-                <t-td>{{ deviceRepairObj.epInspectionPoint.insSpot }}</t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>状态</t-td>
-                <t-td>{{ deviceRepairObj.taskStatusText }}</t-td>
-            </t-tr>
-        </t-table>
-        <view style="font-size: 36rpx;">巡检备注：</view>
-        <uni-forms ref="form" err-show-type="toast">
-            <uni-forms-item><uni-easyinput type="textarea" autoHeight v-model="deviceRepairObj.parMemo"
-                    placeholder="请输入内容"></uni-easyinput></uni-forms-item>
-        </uni-forms>
-        <view class="photoTitleSize">{{uploader.length}}/9</view>
-        <view class="showImage">
-            <view v-for="(item, i) in uploader" :key="i" class="showImage-for">
-                <view class="view-image">
-                    <image :src="item.imageUrl" @tap="previewImage(i)" />
-                </view>
-                <view class="view-icon">
-                    <uni-icons type='trash' size="14" color='gray' @click="removeScene(item, i)"></uni-icons>
-                </view>
-            </view>
-            <view class="view-center" v-if="uploader.length < 9">
-                <image src="../../static/images/photo.png" @click="chooseImage()"></image>
-            </view>
+  <ifrm ref="ifrm">
+    <!-- 安全巡检-->
+    <uni-forms ref="form" err-show-type="toast">
+      <uni-forms-item>
+        <input
+          type="text"
+          v-model="code"
+          @confirm="deviceRepairConfirm"
+          class="uni-input-border"
+          placeholder="巡检点编码"
+        />
+      </uni-forms-item>
+    </uni-forms>
+    <t-table>
+      <t-tr>
+        <t-td>巡检点编码</t-td>
+        <t-td>{{ deviceRepairObj.epInspectionPoint.insNum }}</t-td>
+      </t-tr>
+      <t-tr>
+        <t-td>巡检点位置</t-td>
+        <t-td>{{ deviceRepairObj.epInspectionPoint.insSite }}</t-td>
+      </t-tr>
+      <t-tr>
+        <t-td>状态</t-td>
+        <t-td>
+          {{
+            deviceRepairObj.epInspectionPoint.taskStatus == 1
+              ? "待检"
+              : deviceRepairObj.epInspectionPoint.taskStatus == 2
+              ? "未检"
+              : deviceRepairObj.epInspectionPoint.taskStatus == 3
+              ? "已检"
+              : ""
+          }}
+        </t-td>
+      </t-tr>
+    </t-table>
+    <view style="font-size: 36rpx">巡检备注：</view>
+    <uni-forms ref="form" err-show-type="toast">
+      <uni-forms-item>
+        <uni-easyinput
+          type="textarea"
+          autoHeight
+          v-model="deviceRepairObj.epInspectionPoint.parMemo"
+          placeholder="请输入内容"
+        >
+        </uni-easyinput>
+      </uni-forms-item>
+    </uni-forms>
+    <view class="photoTitleSize">{{ uploader.length }}/9</view>
+    <view class="showImage">
+      <view v-for="(item, i) in uploader" :key="i" class="showImage-for">
+        <view class="view-image">
+          <image :src="item.imageUrl" @tap="previewImage(i)" />
         </view>
-        <view class="buttonBox"><button class="button" type="primary"
-                :disabled="!(Object.keys(deviceRepairObj).length > 2)" @click="submitClick">提交</button></view>
-    </ifrm>
+        <view class="view-icon">
+          <uni-icons
+            type="trash"
+            size="14"
+            color="gray"
+            @click="removeScene(item, i)"
+          />
+        </view>
+      </view>
+      <view class="view-center" v-if="uploader.length < 9">
+        <image src="../../static/images/photo.png" @click="chooseImage()" />
+      </view>
+    </view>
+    <view class="buttonBox">
+      <button
+        class="button"
+        type="primary"
+        :disabled="!(Object.keys(deviceRepairObj.epInspectionPoint).length > 2)"
+        @click="submitClick"
+      >
+        提交
+      </button>
+    </view>
+  </ifrm>
 </template>
-
 <script>
-    import ifrm from '@/pages/index/ifrm';
-    import tTable from '@/components/t-table/t-table.vue';
-    import tTh from '@/components/t-table/t-th.vue';
-    import tTr from '@/components/t-table/t-tr.vue';
-    import tTd from '@/components/t-table/t-td.vue';
-    import scan from '../../mixin/scan.js';
-    export default {
-        mixins: [scan],
-        components: {
-            ifrm,
-            tTable,
-            tTh,
-            tTr,
-            tTd
+import ifrm from "@/pages/index/ifrm";
+import tTable from "@/components/t-table/t-table.vue";
+import tTh from "@/components/t-table/t-th.vue";
+import tTr from "@/components/t-table/t-tr.vue";
+import tTd from "@/components/t-table/t-td.vue";
+import scan from "../../mixin/scan.js";
+import { options } from "@/http/config.js";
+export default {
+  mixins: [scan],
+  components: {
+    ifrm,
+    tTable,
+    tTh,
+    tTr,
+    tTd,
+  },
+  data() {
+    return {
+      code: "",
+      deviceRepairObj: {
+        epInspectionPoint: {
+          parMemo: "",
         },
-        data() {
-            return {
-                deviceRepairValue: '',
-                deviceRepairObj: {
-                    epInspectionPoint: {},
-                    parMemo: ''
-                },
-                uploader: []
-            };
+      },
+      uploader: [],
+    };
+  },
+  methods: {
+    chooseImage: async function () {
+      if (!this.deviceRepairObj.epInspectionPoint.epcId) {
+        return uni.showToast({
+          title: "请先查询巡检点",
+          icon: "none",
+        });
+      }
+      uni.chooseImage({
+        count: 9,
+        // sizeType: ['compressed'],
+        // sourceType: ['album', 'camera'],
+        success: (res) => {
+          uni.showLoading({
+            title: "上传中，请稍候",
+          });
+          res.tempFilePaths.forEach((filePath) => {
+            uni.uploadFile({
+              url:
+                options.baseURL +
+                "/blade-resource/oss/endpoint/put-file-attach",
+              filePath: filePath,
+              name: "file",
+              header: {
+                token: "bearer " + uni.getStorageSync("accessToken"),
+                "Blade-Auth": "bearer " + uni.getStorageSync("accessToken"),
+                "Blade-Requested-With": "BladeHttpRequest",
+              },
+              success: (uploadRes) => {
+                uni.hideLoading();
+                uni.showToast({ title: "上传成功" });
+                this.uploader.push({
+                  upId: JSON.parse(uploadRes.data).data.attachId,
+                  imageUrl: JSON.parse(uploadRes.data).data.link,
+                });
+              },
+              fail: (err) => {
+                console.error("❌ 上传失败", err);
+                uni.showToast({ title: "上传失败", icon: "none" });
+              },
+            });
+          });
         },
-        methods: {
+      });
+    },
+    previewImage: function (index) {
+      var imags = [];
+      this.uploader.forEach((item) => {
+        imags.push(item.imageUrl);
+      });
+      uni.previewImage({
+        current: index,
+        urls: imags,
+      });
+    },
 
-            chooseImage: async function() {
-                if (!this.deviceRepairObj.epiId) {
-                    return uni.showToast({
-                        title: '请先查询巡检点',
-                        icon: 'none'
-                    });
-                }
-                uni.chooseImage({
-                    // sourceType: ['album','camera'], //album 从相册选图，camera 使用相机，默认二者都有
-                    // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-                    count: 9,
-                    success: (res) => {
-                        uni.showLoading({
-                            title: '上传中，请稍候'
-                        });
-                        var tempFilePaths = res.tempFilePaths;
-                        for (var i = 0; i < tempFilePaths.length; i++) {
-                            const file = res.tempFiles[i];
-                            this.$uploadUtil.upload(file, {
-                                theId: this.deviceRepairObj.epiId,
-                                theTag: 'EpPatrolInspection',
-                                subTag: 'appDoc'
-                            }, tempFilePaths[i]).then((upId) => {
-                                uni.hideLoading();
-                                //展示图片
-                                this.uploader.push({
-                                    upId: upId,
-                                    imageUrl: file.path
-                                });
-                            })
+    removeScene(item, i) {
+      //删除现场图片
+      this.uploader.splice(i, 1);
+      // //删除附件记录
+      this.$uploadUtil.asyncDelete(item.upId).then((data) => {
+        uni.showToast({
+          title: "删除成功",
+          icon: "none",
+        });
+      });
+      // this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
+    },
 
-                        }
-                    },
-                    complete() {
-                        uni.hideLoading();
-                    }
-                })
-            },
-            previewImage: function(index) {
-                var imags = [];
-                this.uploader.forEach(item => {
-                    imags.push(item.imageUrl);
-                })
-                uni.previewImage({
-                    current: index,
-                    urls: imags
-                })
-            },
-
-            removeScene(item, i) {
-                //删除现场图片
-                this.uploader.splice(i, 1);
-                // //删除附件记录
-                this.$uploadUtil.asyncDelete(item.upId).then((data) => {
-                    uni.showToast({
-                        title: '删除成功',
-                        icon: 'none'
-                    });
-                })
-                // this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
-            },
-
-            getBarCode(code) {
-                this.getData(code);
-            },
-            deviceRepairConfirm(e) {
-                this.getBarCode(e.target.value);
-            },
-            getData(code) {
-                this.deviceRepairValue = code;
-                this.$ajax.request({
-                    url: 'pdaLoad/getInspectionBySan',
-                    method: 'POST',
-                    data: {
-                        code: code,
-                        eipType: 1
-                    },
-                    success: data => {
-                        if (data == null) {
-                            return uni.showToast({
-                                icon: "none",
-                                title: '此巡检位置暂无任务'
-                            });
-                        }
-                        this.deviceRepairValue = '';
-                        this.deviceRepairObj = data;
-                        uni.showToast({
-                            title: '数据获取成功'
-                        });
-                    }
-                });
-            },
-            submitClick() {
-                this.$ajax.request({
-                    url: 'pdaSave/savePatrolIns',
-                    method: 'POST',
-                    data: this.deviceRepairObj,
-                    success: data => {
-                        uni.showToast({
-                            title: '保存成功'
-                        });
-                        this.deviceRepairValue = '';
-                        this.deviceRepairObj = {
-                            epInspectionPoint: {},
-                            parMemo: ''
-                        };
-                        this.uploader = []
-                    }
-                });
-            }
-        },
-        onNavigationBarButtonTap(btn) {
-            this.$refs.ifrm.topMenuClick(btn);
-        },
-        onShow() {}
-    };
+    getBarCode(code) {
+      this.getData(code);
+    },
+    deviceRepairConfirm(e) {
+      this.getBarCode(e.target.value);
+    },
+    getData(code) {
+      this.code = code;
+      this.$u.api
+        .getInspectionBySan({
+          code: code,
+          eipType: 1,
+        })
+        .then((res) => {
+          if (res.data == null) {
+            return uni.showToast({
+              icon: "none",
+              title: "此巡检位置暂无任务",
+            });
+          }
+          this.code = "";
+          this.deviceRepairObj.epInspectionPoint = res.data;
+          uni.showToast({
+            title: "数据获取成功",
+          });
+        });
+    },
+    submitClick() {
+      this.$u.api
+        .savePatrolIns({
+          ...this.deviceRepairObj.epInspectionPoint,
+          path: this.uploader.map((item) => item.imageUrl).join(","),
+        })
+        .then((data) => {
+          uni.showToast({
+            title: "保存成功",
+          });
+          this.code = "";
+          this.deviceRepairObj = {
+            epInspectionPoint: {},
+          };
+          this.uploader = [];
+        });
+    },
+  },
+  onNavigationBarButtonTap(btn) {
+    this.$refs.ifrm.topMenuClick(btn);
+  },
+  onShow() {},
+};
 </script>
 
 <style scoped lang="less">
-    .uni-forms-item {
-        margin-bottom: 6px !important;
-    }
+.uni-forms-item {
+  margin-bottom: 6px !important;
+}
 
-    .photoTitleSize {
-        color: #a1a1a1;
-        text-align: right;
-        margin-right: 30rpx;
-        margin-top: -30rpx;
-    }
-
-    .showImage {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        flex-wrap: wrap;
-        margin-left: -20rpx;
+.photoTitleSize {
+  color: #a1a1a1;
+  text-align: right;
+  margin-right: 30rpx;
+  margin-top: -30rpx;
+}
 
-        .showImage-for {
+.showImage {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+  margin-left: -20rpx;
 
-            display: flex;
-            flex-direction: column;
-            width: 200rpx;
-            margin-left: 30rpx;
-            height: 260rpx;
+  .showImage-for {
+    display: flex;
+    flex-direction: column;
+    width: 200rpx;
+    margin-left: 30rpx;
+    height: 260rpx;
 
-            .view-icon {
-                display: flex;
-                flex-direction: row;
-                justify-content: center;
-                margin-top: -10rpx;
-            }
+    .view-icon {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      margin-top: -10rpx;
+    }
 
-            image {
-                border-width: 2rpx;
-                border-color: rgb(229, 229, 229);
-                border-style: solid;
-                border-radius: 20rpx;
-                width: 190rpx;
-                height: 190rpx;
-            }
-        }
+    image {
+      border-width: 2rpx;
+      border-color: rgb(229, 229, 229);
+      border-style: solid;
+      border-radius: 20rpx;
+      width: 190rpx;
+      height: 190rpx;
     }
+  }
+}
 
-    .view-center {
-        margin: 0rpx 25rpx;
+.view-center {
+  margin: 0rpx 25rpx;
 
-        image {
-            border-width: 2rpx;
-            border-color: rgb(229, 229, 229);
-            border-style: solid;
-            border-radius: 20rpx;
-            width: 190rpx;
-            height: 190rpx;
-        }
-    }
+  image {
+    border-width: 2rpx;
+    border-color: rgb(229, 229, 229);
+    border-style: solid;
+    border-radius: 20rpx;
+    width: 190rpx;
+    height: 190rpx;
+  }
+}
 </style>
\ No newline at end of file

From 06f8759ca1accdd783264045255ccfcf06b022ff Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Sat, 25 Apr 2026 17:16:28 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E9=87=8D=E6=96=B0=E4=B9=A6=E5=86=99=E5=90=8E=E7=BD=AE?=
 =?UTF-8?q?=E7=A9=BA=E5=BA=95=E9=83=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/safe/inspection.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/safe/inspection.vue b/pages/safe/inspection.vue
index 44bdf3d..a8ee5e1 100644
--- a/pages/safe/inspection.vue
+++ b/pages/safe/inspection.vue
@@ -69,6 +69,7 @@ export default {
       this.getData(code);
     },
     insConfirm(e) {
+		this.insList = []
       this.getBarCode(e.target.value);
     },
     getData(code) {
@@ -112,6 +113,8 @@ export default {
             title: '上传中，请稍候'
           });
           res.tempFilePaths.forEach(filePath => {
+			  console.log('file-----------',filePath)
+			  console.log('options.baseURL------',options.baseURL)
             uni.uploadFile({
               url: options.baseURL + '/blade-resource/oss/endpoint/put-file-attach',
               filePath: filePath,

From a1179be30f5ff796f32dcdbbc55497bb62e4db66 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 11:59:22 +0800
Subject: [PATCH 8/9] =?UTF-8?q?PDA-=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B7=A1=E6=A3=80-=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/safe/inspection.vue | 102 ++++++++++++++++++++++----------------
 1 file changed, 60 insertions(+), 42 deletions(-)

diff --git a/pages/safe/inspection.vue b/pages/safe/inspection.vue
index a8ee5e1..3baf385 100644
--- a/pages/safe/inspection.vue
+++ b/pages/safe/inspection.vue
@@ -1,9 +1,15 @@
 <template>
-  <view>
+  <ifrm ref="ifrm">
     <!-- 安全巡检-->
     <uni-forms ref="form" err-show-type="toast">
       <uni-forms-item>
-        <input type="text" v-model="insNum" @confirm="insConfirm" class="uni-input-border" placeholder="巡检点编码" />
+        <input
+          type="text"
+          v-model="insNum"
+          @confirm="insConfirm"
+          class="uni-input-border"
+          placeholder="巡检点编码"
+        />
       </uni-forms-item>
     </uni-forms>
     <uni-table border stripe emptyText="暂无更多数据" class="table">
@@ -17,51 +23,67 @@
       </uni-tr>
     </uni-table>
 
-    <view style="font-size: 36rpx; margin: 20rpx 0">巡检备注：</view>
+    <view style="font-size: 36rpx">巡检备注：</view>
     <uni-forms ref="form" err-show-type="toast">
       <uni-forms-item>
-        <uni-easyinput type="textarea" autoHeight v-model="memo" placeholder="请输入内容" />
+        <uni-easyinput
+          type="textarea"
+          autoHeight
+          v-model="memo"
+          placeholder="请输入内容"
+        />
       </uni-forms-item>
     </uni-forms>
-
     <view class="photoTitleSize">{{ uploader.length }}/9</view>
     <view class="showImage">
       <view v-for="(item, i) in uploader" :key="i" class="showImage-for">
         <view class="view-image">
-          <image :src="item.imageUrl" @tap="previewImage(i)" mode="widthFix" />
+          <image :src="item.imageUrl" @tap="previewImage(i)" />
         </view>
         <view class="view-icon">
-          <uni-icons type="trash" size="14" color="gray" @click="removeScene(item, i)"></uni-icons>
+          <uni-icons
+            type="trash"
+            size="14"
+            color="gray"
+            @click="removeScene(item, i)"
+          ></uni-icons>
         </view>
       </view>
-
       <view class="view-center" v-if="uploader.length < 9">
-        <image src="../../static/images/photo.png" @click="chooseImage"></image>
+        <image
+          src="../../static/images/photo.png"
+          @click="chooseImage()"
+        ></image>
       </view>
     </view>
-
     <view class="buttonBox">
-      <button class="button" type="primary" :disabled="!(insList.length > 0)" @click="submitClick">
+      <button
+        class="button"
+        type="primary"
+        :disabled="!(insList.length > 0)"
+        @click="submitClick"
+      >
         提交
       </button>
     </view>
-  </view>
+  </ifrm>
 </template>
 
 <script>
+import ifrm from "@/pages/index/ifrm";
 import scan from "../../mixin/scan.js";
-import {
-  options
-} from '@/http/config.js';
+import { options } from "@/http/config.js";
 export default {
   mixins: [scan],
+  components: {
+    ifrm,
+  },
   data() {
     return {
       insNum: "",
       insList: [],
-      uploader: [], // 存放 { imageUrl, upId }
+      uploader: [],
       memo: "",
-      uploadCount: 0, // 上传计数
     };
   },
   methods: {
@@ -69,7 +91,7 @@ export default {
       this.getData(code);
     },
     insConfirm(e) {
-		this.insList = []
+      this.insList = [];
       this.getBarCode(e.target.value);
     },
     getData(code) {
@@ -100,8 +122,8 @@ export default {
     chooseImage: async function () {
       if (this.insList.length == 0) {
         return uni.showToast({
-          title: '请先查询巡检点',
-          icon: 'none'
+          title: "请先查询巡检点",
+          icon: "none",
         });
       }
       uni.chooseImage({
@@ -110,32 +132,34 @@ export default {
         // sourceType: ['album', 'camera'],
         success: (res) => {
           uni.showLoading({
-            title: '上传中，请稍候'
+            title: "上传中，请稍候",
           });
-          res.tempFilePaths.forEach(filePath => {
-			  console.log('file-----------',filePath)
-			  console.log('options.baseURL------',options.baseURL)
+          res.tempFilePaths.forEach((filePath) => {
+            console.log("file-----------", filePath);
+            console.log("options.baseURL------", options.baseURL);
             uni.uploadFile({
-              url: options.baseURL + '/blade-resource/oss/endpoint/put-file-attach',
+              url:
+                options.baseURL +
+                "/blade-resource/oss/endpoint/put-file-attach",
               filePath: filePath,
-              name: 'file',
+              name: "file",
               header: {
-                'token': 'bearer ' + uni.getStorageSync('accessToken'),
-                'Blade-Auth': 'bearer ' + uni.getStorageSync('accessToken'),
-                'Blade-Requested-With': 'BladeHttpRequest'
+                token: "bearer " + uni.getStorageSync("accessToken"),
+                "Blade-Auth": "bearer " + uni.getStorageSync("accessToken"),
+                "Blade-Requested-With": "BladeHttpRequest",
               },
               success: (uploadRes) => {
                 uni.hideLoading();
-                uni.showToast({ title: '上传成功' });
+                uni.showToast({ title: "上传成功" });
                 this.uploader.push({
                   upId: JSON.parse(uploadRes.data).data.attachId,
-                  imageUrl: JSON.parse(uploadRes.data).data.link
+                  imageUrl: JSON.parse(uploadRes.data).data.link,
                 });
               },
               fail: (err) => {
-                console.error('❌ 上传失败', err);
-                uni.showToast({ title: '上传失败', icon: 'none' });
-              }
+                console.error("❌ 上传失败", err);
+                uni.showToast({ title: "上传失败", icon: "none" });
+              },
             });
           });
         },
@@ -158,7 +182,7 @@ export default {
   onNavigationBarButtonTap(btn) {
     this.$refs.ifrm.topMenuClick(btn);
   },
-  onShow() { },
+  onShow() {},
 };
 </script>
 
@@ -167,7 +191,7 @@ export default {
   color: #a1a1a1;
   text-align: right;
   margin-right: 30rpx;
-  margin-top: 20rpx;
+  margin-top: -30rpx;
 }
 
 .showImage {
@@ -214,10 +238,4 @@ export default {
     height: 190rpx;
   }
 }
-
-.buttonBox {
-  margin-top: 30rpx;
-  display: flex;
-  justify-content: center;
-}
 </style>
\ No newline at end of file

From ad5a620d1b8524de89198a381a5e7af7e8b704c7 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Mon, 27 Apr 2026 13:38:06 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/menu.js                  | 24 ++++++++++++------------
 pages/safe/inspection.vue            |  4 +++-
 pages/sanitation/gasInspection.vue   |  4 +++-
 pages/sanitation/waterInspection.vue |  4 +++-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pages/index/menu.js b/pages/index/menu.js
index adc0575..7f69e61 100644
--- a/pages/index/menu.js
+++ b/pages/index/menu.js
@@ -223,18 +223,18 @@ const menus = {
         {
             title: '安环管理',
             children: [
-                {
-                    key: "spotCheck",
-                    title: "安全点检",
-                    url: "../safe/spotCheck",
-                    bgColor: '',
-                    limit: 'RB2315',
-                    icon: {
-                        size: 20,
-                        color: '#00b7ee',
-                        type: ''
-                    }
-                },
+                // {
+                //     key: "spotCheck",
+                //     title: "安全点检",
+                //     url: "../safe/spotCheck",
+                //     bgColor: '',
+                //     limit: 'RB2315',
+                //     icon: {
+                //         size: 20,
+                //         color: '#00b7ee',
+                //         type: ''
+                //     }
+                // },
                 {
                     key: "inspection",
                     title: "安全巡检",
diff --git a/pages/safe/inspection.vue b/pages/safe/inspection.vue
index 3baf385..9b68716 100644
--- a/pages/safe/inspection.vue
+++ b/pages/safe/inspection.vue
@@ -137,9 +137,11 @@ export default {
           res.tempFilePaths.forEach((filePath) => {
             console.log("file-----------", filePath);
             console.log("options.baseURL------", options.baseURL);
+             const server_config = uni.getStorageSync("server-config")
+console.log(999999,server_config)
             uni.uploadFile({
               url:
-                options.baseURL +
+                server_config.rootUrl +
                 "/blade-resource/oss/endpoint/put-file-attach",
               filePath: filePath,
               name: "file",
diff --git a/pages/sanitation/gasInspection.vue b/pages/sanitation/gasInspection.vue
index 712811b..6a12a87 100644
--- a/pages/sanitation/gasInspection.vue
+++ b/pages/sanitation/gasInspection.vue
@@ -98,6 +98,8 @@ export default {
           icon: 'none'
         });
       }
+      const server_config = uni.getStorageSync("server-config")
+console.log(999999,server_config)
       uni.chooseImage({
         count: 9,
         // sizeType: ['compressed'],
@@ -108,7 +110,7 @@ export default {
           });
           res.tempFilePaths.forEach(filePath => {
             uni.uploadFile({
-              url: options.baseURL + '/blade-resource/oss/endpoint/put-file-attach',
+              url: server_config.rootUrl + '/blade-resource/oss/endpoint/put-file-attach',
               filePath: filePath,
               name: 'file',
               header: {
diff --git a/pages/sanitation/waterInspection.vue b/pages/sanitation/waterInspection.vue
index 3d51cbc..276cdbb 100644
--- a/pages/sanitation/waterInspection.vue
+++ b/pages/sanitation/waterInspection.vue
@@ -123,10 +123,12 @@ export default {
           uni.showLoading({
             title: "上传中，请稍候",
           });
+          const server_config = uni.getStorageSync("server-config")
+console.log(999999,server_config)
           res.tempFilePaths.forEach((filePath) => {
             uni.uploadFile({
               url:
-                options.baseURL +
+                server_config.rootUrl +
                 "/blade-resource/oss/endpoint/put-file-attach",
               filePath: filePath,
               name: "file",