From 1afe55f972ea83ad8ee3a8f9ecc6fa89e9e1a920 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 14:11:51 +0800
Subject: [PATCH 01/11] 30170

---
 src/apps/AppBroadcast1/LiveBroadcast.vue | 26 +++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index 9b86d560..07a42b6b 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -16,10 +16,12 @@
         <scroll-view scroll-y class="record-wrapper">
           <div class="record-item" v-for="(item, index) in recordList" :key="index">
             <image :src="user.avatar" />
-            <div class="right" :style="{width: item.duration + '%'}">
-              <image mode="aspectFit" @click="play(item.src, index)" v-if="!item.isPlay" src="./img/voice-icon.png" />
-              <image v-else @click="play(item.src, index)" src="./img/voice.gif" />
-              <span>{{ item.duration }}"</span>
+            <div class="right-wrapper">
+              <div class="right" :style="{width: 'calc(83px + ' + (item.duration / 2) + '%)'}">
+                <image mode="aspectFit" @click="play(item.src, index)" v-if="!item.isPlay" src="./img/voice-icon.png" />
+                <image v-else @click="play(item.src, index)" src="./img/voice.gif" />
+                <span>{{ item.duration }}"</span>
+              </div>
             </div>
           </div>
         </scroll-view>
@@ -147,7 +149,7 @@
     methods: {
       onLongtap () {
         if (!this.equipmentList.length) {
-          return this.$u.toast('请选择播发设备')
+          // return this.$u.toast('请选择播发设备')
         }
 
         this.isImpact = false
@@ -240,6 +242,14 @@
           let formData = {}
           formData = new FormData()
           formData.append('file', new window.File([blob], `${(new Date).getTime()}` ))
+                  this.$u.toast('播发成功')
+                  this.recordList.push({
+                    src: (window.URL || webkitURL).createObjectURL(blob),
+                    isPlay: false,
+                    duration: (duration / 1000).toFixed(0)
+                  })
+                  this.isShowRecord = true
+                  return
 
           this.$loading()
           this.$http.post(`/app/appdlbresource/uploadDlbFile`, formData).then(res => {
@@ -520,6 +530,11 @@
               border-radius: 8px;
             }
 
+            .right-wrapper {
+              // flex: 1;
+              width: calc(100% - 102px);
+            }
+
             .right {
               display: flex;
               align-items: center;
@@ -530,6 +545,7 @@
               min-width: 160px;
               max-width: 100%;
               background: #C0DAFF;
+              box-sizing: border-box;
 
               &::after {
                 position: absolute;

From 45480002290205a0ebe93d69f435fa92db6815f5 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 14:13:30 +0800
Subject: [PATCH 02/11] bug

---
 src/apps/AppBroadcast1/LiveBroadcast.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index 07a42b6b..8baa569b 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -149,7 +149,7 @@
     methods: {
       onLongtap () {
         if (!this.equipmentList.length) {
-          // return this.$u.toast('请选择播发设备')
+          return this.$u.toast('请选择播发设备')
         }
 
         this.isImpact = false
@@ -242,14 +242,14 @@
           let formData = {}
           formData = new FormData()
           formData.append('file', new window.File([blob], `${(new Date).getTime()}` ))
-                  this.$u.toast('播发成功')
-                  this.recordList.push({
-                    src: (window.URL || webkitURL).createObjectURL(blob),
-                    isPlay: false,
-                    duration: (duration / 1000).toFixed(0)
-                  })
-                  this.isShowRecord = true
-                  return
+                  // this.$u.toast('播发成功')
+                  // this.recordList.push({
+                  //   src: (window.URL || webkitURL).createObjectURL(blob),
+                  //   isPlay: false,
+                  //   duration: (duration / 1000).toFixed(0)
+                  // })
+                  // this.isShowRecord = true
+                  // return
 
           this.$loading()
           this.$http.post(`/app/appdlbresource/uploadDlbFile`, formData).then(res => {

From 0b157621ca586e50232e095a9add38aee1e3eb2d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 14:31:38 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppBroadcast1/LiveBroadcast.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index 8baa569b..60742e98 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -123,9 +123,15 @@
         this.y = close.offsetTop
         this.w = close.clientWidth
         this.h = close.clientHeight
+
+        document.body.addEventListener('touchmove', this.bindEvent, { passive: false })
       })
     },
 
+    destroyed () {
+      document.body.removeEventListener('touchmove', this.bindEvent)
+    },
+
     onLoad () {
       this.innerAudioContext = uni.createInnerAudioContext()
       this.innerAudioContext.autoplay = true
@@ -147,6 +153,10 @@
     },
 
     methods: {
+      bindEvent (e) {
+        e.preventDefault()
+      },
+
       onLongtap () {
         if (!this.equipmentList.length) {
           return this.$u.toast('请选择播发设备')
@@ -374,6 +384,8 @@
         image {
           width: 96px;
           height: 96px;
+          pointer-events: none;
+          user-select: none;
         }
       }
 
@@ -587,6 +599,7 @@
         height: 128px;
         margin-bottom: 16px;
         pointer-events: none;
+        user-select: none;
       }
 
       p {

From c216053db2218707f18be2a4f1ebd5be3113fcb9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 14:35:54 +0800
Subject: [PATCH 04/11] 30173

---
 src/apps/AppBroadcast1/LiveBroadcast.vue |   3 ++-
 src/apps/AppBroadcast1/img/voice-bg.png  | Bin 0 -> 29835 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 src/apps/AppBroadcast1/img/voice-bg.png

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index 60742e98..4f32b28c 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -379,7 +379,8 @@
         height: 234px;
         margin-top: 48px;
         border-radius: 200px 200px 0 0;
-        background: linear-gradient(180deg, #9D9E9F 0%, #D4D5D6 100%);
+        background: url(./img/voice-bg.png);
+        background-size: 100% 100%;
 
         image {
           width: 96px;
diff --git a/src/apps/AppBroadcast1/img/voice-bg.png b/src/apps/AppBroadcast1/img/voice-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..7345d1303341eac3af27a88f12d47c9d28571b1e
GIT binary patch
literal 29835
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

literal 0
HcmV?d00001


From 285d6a6aab2cc8934058fa392dea133a527ddc6c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 14:58:32 +0800
Subject: [PATCH 05/11] bug

---
 src/apps/AppBroadcast1/LiveBroadcast.vue | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index 4f32b28c..c61e83e2 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -26,7 +26,7 @@
           </div>
         </scroll-view>
       </div>
-      <div class="tips">
+      <div class="tips" v-if="!isShowRecord">
         <image src="./img/body.png" />
         <p>请先选择设备再按住下方按钮开始喊话~</p>
       </div>
@@ -84,7 +84,7 @@
         y: 0,
         w: 0,
         h: 0,
-        isShowRecord: false,
+        isShowRecord: true,
         close: require('./img/close.png'),
         closeW: require('./img/close-w.png'),
         isShow: false,
@@ -159,7 +159,7 @@
 
       onLongtap () {
         if (!this.equipmentList.length) {
-          return this.$u.toast('请选择播发设备')
+          // return this.$u.toast('请选择播发设备')
         }
 
         this.isImpact = false
@@ -253,13 +253,13 @@
           formData = new FormData()
           formData.append('file', new window.File([blob], `${(new Date).getTime()}` ))
                   // this.$u.toast('播发成功')
-                  // this.recordList.push({
-                  //   src: (window.URL || webkitURL).createObjectURL(blob),
-                  //   isPlay: false,
-                  //   duration: (duration / 1000).toFixed(0)
-                  // })
-                  // this.isShowRecord = true
-                  // return
+                  this.recordList.push({
+                    src: (window.URL || webkitURL).createObjectURL(blob),
+                    isPlay: false,
+                    duration: (duration / 1000).toFixed(0)
+                  })
+                  this.isShowRecord = true
+                  return
 
           this.$loading()
           this.$http.post(`/app/appdlbresource/uploadDlbFile`, formData).then(res => {
@@ -378,7 +378,6 @@
         width: 100%;
         height: 234px;
         margin-top: 48px;
-        border-radius: 200px 200px 0 0;
         background: url(./img/voice-bg.png);
         background-size: 100% 100%;
 

From a277ff318e38cef5efaa58c0c99c6ea23e7ab5e8 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 15:01:12 +0800
Subject: [PATCH 06/11] bug

---
 src/apps/AppBroadcast1/LiveBroadcast.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index c61e83e2..91564b95 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -480,6 +480,7 @@
 
     .middle {
       height: calc(100% - 378px);
+      overflow: hidden;
       background: #fff;
 
       .tips {

From 76566698d0ea1477f7e503535d9ccc589edd6b92 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 15:02:36 +0800
Subject: [PATCH 07/11] bug

---
 src/apps/AppBroadcast1/LiveBroadcast.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index 91564b95..22f5d8f5 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -84,7 +84,7 @@
         y: 0,
         w: 0,
         h: 0,
-        isShowRecord: true,
+        isShowRecord: false,
         close: require('./img/close.png'),
         closeW: require('./img/close-w.png'),
         isShow: false,

From 34995af61ff8d496053f98e19d9904274bdc0556 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 15:12:30 +0800
Subject: [PATCH 08/11] bug

---
 src/apps/AppBroadcast1/AppBroadcast1.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppBroadcast1/AppBroadcast1.vue b/src/apps/AppBroadcast1/AppBroadcast1.vue
index 209073ab..18acce70 100644
--- a/src/apps/AppBroadcast1/AppBroadcast1.vue
+++ b/src/apps/AppBroadcast1/AppBroadcast1.vue
@@ -52,13 +52,13 @@ export default {
         {
           title: '音频录制',
           text: '音频文件的录制',
-          path: './AppResourcesManage/addPlay?type=1',
+          path: '../AppResourcesManage/addPlay?type=1',
           imgUrl: require('./img/bigHorn-icon33@2x.png'),
           bgClass: 'bg-E5B565'
         },
         {
           title: '媒资管理',
-          path: './AppResourcesManage/AppResourcesManage',
+          path: '../AppResourcesManage/AppResourcesManage',
           text: '支持音频文件和录音内容添加',
           imgUrl: require('./img/bigHorn-icon44@2x.png'),
           bgClass: 'bg-F19661'

From 2c29b04f5a6bac19623b7b0455a717bbf3a1fa67 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 15:16:09 +0800
Subject: [PATCH 09/11] bug

---
 src/apps/AppBroadcast1/LiveBroadcast.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index 22f5d8f5..bf9ce4c4 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -159,7 +159,7 @@
 
       onLongtap () {
         if (!this.equipmentList.length) {
-          // return this.$u.toast('请选择播发设备')
+          return this.$u.toast('请选择播发设备')
         }
 
         this.isImpact = false
@@ -253,13 +253,13 @@
           formData = new FormData()
           formData.append('file', new window.File([blob], `${(new Date).getTime()}` ))
                   // this.$u.toast('播发成功')
-                  this.recordList.push({
-                    src: (window.URL || webkitURL).createObjectURL(blob),
-                    isPlay: false,
-                    duration: (duration / 1000).toFixed(0)
-                  })
-                  this.isShowRecord = true
-                  return
+                  // this.recordList.push({
+                  //   src: (window.URL || webkitURL).createObjectURL(blob),
+                  //   isPlay: false,
+                  //   duration: (duration / 1000).toFixed(0)
+                  // })
+                  // this.isShowRecord = true
+                  // return
 
           this.$loading()
           this.$http.post(`/app/appdlbresource/uploadDlbFile`, formData).then(res => {

From 262df6d24eedc96dfe58b8f5953b575a74b926b0 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Jun 2022 15:25:29 +0800
Subject: [PATCH 10/11] bug

---
 src/apps/AppBroadcast1/LiveBroadcast.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppBroadcast1/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue
index bf9ce4c4..c94f043b 100644
--- a/src/apps/AppBroadcast1/LiveBroadcast.vue
+++ b/src/apps/AppBroadcast1/LiveBroadcast.vue
@@ -17,9 +17,9 @@
           <div class="record-item" v-for="(item, index) in recordList" :key="index">
             <image :src="user.avatar" />
             <div class="right-wrapper">
-              <div class="right" :style="{width: 'calc(83px + ' + (item.duration / 2) + '%)'}">
-                <image mode="aspectFit" @click="play(item.src, index)" v-if="!item.isPlay" src="./img/voice-icon.png" />
-                <image v-else @click="play(item.src, index)" src="./img/voice.gif" />
+              <div class="right" :style="{width: 'calc(83px + ' + (item.duration / 2) + '%)'}" @click="play(item.src, index)">
+                <image mode="aspectFit" v-if="!item.isPlay" src="./img/voice-icon.png" />
+                <image v-else src="./img/voice.gif" />
                 <span>{{ item.duration }}"</span>
               </div>
             </div>

From 9775fd01f87c82ddc723ac50d308b1487c762ea6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 13 Jun 2022 15:29:42 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMonitoringObject/Add.vue            | 13 +++++++++++++
 src/apps/AppMonitoringObject/residentDetail.vue |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 1db5dde1..272fcc87 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -100,6 +100,18 @@
             </div>
           </div>
         </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>共同生活家庭人口数</span>
+            </div>
+            <div class="right">
+              <input placeholder="请输入" type="number" v-model="form.familyCount" :maxlength="20"
+                     placeholder-style="color: #999; font-size: 30rpx;"/>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="form-group">
         <div class="form-item">
@@ -483,6 +495,7 @@ export default {
         foreignWorkers: '',
         foreignWorkersAddress: '',
         houseIdNumber: '',
+        familyCount: '',
       },
       $areaId: '',
       girdInfo: {},
diff --git a/src/apps/AppMonitoringObject/residentDetail.vue b/src/apps/AppMonitoringObject/residentDetail.vue
index 6589ca9c..9fda37b9 100644
--- a/src/apps/AppMonitoringObject/residentDetail.vue
+++ b/src/apps/AppMonitoringObject/residentDetail.vue
@@ -65,6 +65,10 @@
           <label>残疾证办证年度</label>
           <span>{{ $dict.getLabel('fpYear', info.disabilityCertificateYear) }}</span>
         </div>
+        <div class="item-info">
+          <label>家庭人口数</label>
+          <span>{{ info.familyCount }}</span>
+        </div>
         <!-- 基础保障 -->
         <h4 style="fon-size: 17px;font-weight: 600;margin-top: 8px;">基础保障</h4>
         <div class="item-info">