From 67f124067d60fe13c9b5ca4c5bb41443be8fc13e Mon Sep 17 00:00:00 2001
From: wangyx <2838268875@qq.com>
Date: Sun, 20 Jul 2025 14:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E7=94=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/work/index.vue | 10 ++---
 pagesA/sdPage/dfReport.vue  | 79 ++++++++++++++++++++++++++-----------
 2 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/pages/tabBar/work/index.vue b/pages/tabBar/work/index.vue
index f399e2b..27da546 100644
--- a/pages/tabBar/work/index.vue
+++ b/pages/tabBar/work/index.vue
@@ -22,7 +22,7 @@
       </view>
     </view>
 
-    <view class="conItem" style="display: none;">
+    <view class="conItem" >
       <view class="conItem-title">水电</view>
       <view class="conItem-cont">
         <view class="conItem-cont-item" v-for="(item, index) in sdList" :key="index" @click="handelSdClick(item)">
@@ -70,10 +70,10 @@ export default {
         { image: '/static/img/巡查.png', text: '巡检上报' },
         { image: '/static/img/记录.png', text: '巡检记录' },
       ],
-      // sdList: [
-        // { image: '/static/img/水费.png', text: '水量上报' },
-        // { image: '/static/img/电费.png', text: '电量上报' },
-      // ],
+      sdList: [
+        { image: '/static/img/水费.png', text: '水量上报' },
+        { image: '/static/img/电费.png', text: '电量上报' },
+      ],
       // bxList: [
         // { image: '/static/img/上报.png', text: '上报' },
         // { image: '/static/img/处理.png', text: '处理' },
diff --git a/pagesA/sdPage/dfReport.vue b/pagesA/sdPage/dfReport.vue
index 20eff7c..ba1f2be 100644
--- a/pagesA/sdPage/dfReport.vue
+++ b/pagesA/sdPage/dfReport.vue
@@ -51,7 +51,7 @@
               :value="multiIndex"
               :range="multiArray"
             >
-              <view class="uni-input">{{
+              <view class="uni-input">{{multiIndex[0]?'请选择':
                 multiArray[0][multiIndex[0]] +
                 multiArray[1][multiIndex[1]] +
                 multiArray[2][multiIndex[2]]
@@ -115,7 +115,7 @@
             :maxSize="10 * 1024 * 1024"
             @oversize="oversize"
           >
-            <view class="custom-upload-btn">
+            <view class="custom-upload-btn" @click.stop="chooseMedia">
               <view class="icon-box">
                 <image
                   class="camera-icon"
@@ -159,7 +159,7 @@ export default {
       houseOptions: [],
       currentHouse: {},
       multiArray: [[], [], []],
-      multiIndex: [0, 0, 0],
+      multiIndex: [-1, -1, -1],
       form: {
         apartmentId: "",
         apartmentName: "",
@@ -174,17 +174,18 @@ export default {
   watch: {
     "form.apartmentId": {
       handler(newVal, oldVal) {
-        console.log("newVal", newVal);
-        this.form.buildingId = null;
-        this.form.unitId = null;
-        this.form.houseId = null;
-        this.buildingOptions = [];
-        this.unitOptions = [];
-        this.houseOptions = [];
+        if (newVal !== oldVal) {
+          this.form.buildingId = null;
+          this.form.unitId = null;
+          this.form.houseId = null;
+          this.buildingOptions = [];
+          this.unitOptions = [];
+          this.houseOptions = [];
+        }
       },
       deep: true,
       immediate: true,
-      apartmentList:[]
+      apartmentList: [],
     },
   },
   onLoad() {
@@ -208,9 +209,9 @@ export default {
         // const deptInfo = this.deptOptions[0].children.filter(
         //   (item) => item.deptName == "城阳区"
         // )[0];
-        const newArr = this.deptOptions.map(item => ({
+        const newArr = this.deptOptions.map((item) => ({
           name: item.deptName,
-        }))
+        }));
         // this.deptOptions = newArr
         // this.deptOptions = await this.getListByParentId("1", deptInfo.deptId);
         // const array = JSON.parse(JSON.stringify(this.deptOptions));
@@ -222,19 +223,18 @@ export default {
       return new Promise((resolve, reject) => {
         queryDeptDropdownList({ type, id }).then((res) => {
           resolve(res.data);
-          console.log(res.data,'res.data');
-          
+          console.log(res.data, "res.data");
         });
       });
     },
     async onPickerChange(e, type) {
       if (type == "乐业社区") {
         console.log("e", e);
-        
+
         const apartmentInfo = this.deptOptions[e.detail.value];
-        console.log('社区信息',apartmentInfo);
-        console.log('社区信息11',this.deptOptions);
-        
+        console.log("社区信息", apartmentInfo);
+        console.log("社区信息11", this.deptOptions);
+
         this.form.apartmentName = apartmentInfo.deptName;
         this.form.apartmentId = apartmentInfo.deptId;
         // 楼
@@ -243,10 +243,10 @@ export default {
           apartmentInfo.deptId
         );
         this.buildingOptions = buildingArray;
-        console.log('楼信息',buildingArray);
+        console.log("楼信息", buildingArray);
         const buildingNames = buildingArray.map((item) => item.name);
         console.log("buildingNames:", buildingNames);
-        
+
         this.form.buildingId = buildingArray[0].id;
         // 单元
         const unitArray = await this.getListByParentId(
@@ -255,7 +255,7 @@ export default {
         );
         this.unitOptions = unitArray;
         console.log("unitArray:", unitArray);
-        
+
         const unitNames = unitArray.map((item) => item.name);
         this.form.unitId = unitArray[0].id;
         // 户
@@ -369,6 +369,41 @@ export default {
       // this.form.waterMeters[index].fileList.splice(event.index, 1);
       // this.form.waterMeters[index].imageList.splice(event.index, 1);
     },
+    chooseMedia() {
+      uni.chooseMedia({
+        count: 10 - this.fileList.length,
+        mediaType: ["image", "video"],
+        sourceType: ["album", "camera"],
+        maxDuration: 60,
+        camera: "back",
+        success: async (res) => {
+          uni.showLoading({ title: "上传中...", mask: true });
+          try {
+            const files = res.tempFiles;
+            for (let i = 0; i < files.length; i++) {
+              const file = files[i];
+              const filePath = file.tempFilePath;
+              const type = file.fileType || (filePath.match(/\.(mp4|mov|avi|wmv|flv|mkv)$/i) ? "video" : "image");
+              // 上传
+              const uploadRes = await uploadImage(filePath);
+              this.fileList.push({
+                url: uploadRes.data?.url || uploadRes.url || uploadRes.path,
+                name: uploadRes.data?.name || uploadRes.name || "",
+                type: type,
+                status: "success",
+              });
+            }
+          } catch (e) {
+            uni.showToast({ title: "上传失败", icon: "none" });
+          } finally {
+            uni.hideLoading();
+          }
+        },
+        fail: () => {
+          uni.hideLoading();
+        },
+      });
+    },
     // 获取上次抄表
     async getLastMeter(item) {
       const params = {