From 50bef9380af524c86e4a31ad77f4dc409d0528f8 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 28 Apr 2022 10:25:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E6=B4=BB=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MonitorFamilySituation.vue                | 259 +++++++++++++++++-
 1 file changed, 248 insertions(+), 11 deletions(-)

diff --git a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
index 2a34d601..4c441a11 100644
--- a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
+++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
@@ -1,17 +1,68 @@
 <template>
   <div class="add">
     <div class="form-group">
+      <p>生活条件</p>
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
-            <i>*</i>
-            <span>监测对象类型</span>
+            <i></i>
+            <span>户类型</span>
           </div>
           <div class="right">
             <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
           </div>
         </div>
       </div>
+
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>住房面积</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>与村主干路距离</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>入户路类型</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>主要燃料类型</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="form-group" style="margin-top: 8px;">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -28,7 +79,7 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i>*</i>
-            <span>是否饮水安全问题</span>
+            <span>是否解决安全饮水</span>
           </div>
           <div class="right">
             <div class="check-item" :class="form.drinkingWaterSafety == '01' ? 'check-active' : '' " @click="form.drinkingWaterSafety='01'">是<img src="./components/img/check-icon.png" alt=""></div>
@@ -40,7 +91,55 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i>*</i>
-            <span>是否搬迁</span>
+            <span>是否住房损坏</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.move == '01' ? 'check-active' : '' " @click="form.move='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.move !='01' ? 'check-active' : '' " @click="form.move='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否饮水设施损坏</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.move == '01' ? 'check-active' : '' " @click="form.move='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.move !='01' ? 'check-active' : '' " @click="form.move='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否有卫生厕所</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.move == '01' ? 'check-active' : '' " @click="form.move='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.move !='01' ? 'check-active' : '' " @click="form.move='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否通生活用电</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.move == '01' ? 'check-active' : '' " @click="form.move='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.move !='01' ? 'check-active' : '' " @click="form.move='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否通广播电视</span>
           </div>
           <div class="right">
             <div class="check-item" :class="form.move == '01' ? 'check-active' : '' " @click="form.move='01'">是<img src="./components/img/check-icon.png" alt=""></div>
@@ -49,8 +148,132 @@
         </div>
       </div>
     </div>
-    <div class="btn" hover-class="text" @click="submit">保存</div>
 
+    <div class="form-group" style="margin-top: 8px;">
+      <p>生产条件</p>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>耕地面积(亩)</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>林果面积(亩)</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>林地面积(亩)</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>退耕还林面积(亩)</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>牧草地面积(亩)</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>水面面积(亩)</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="form-group" style="margin-top: 8px;">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否有龙头企业带动</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.dilapidatedHousehold == '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.dilapidatedHousehold != '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否通生产用电</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.drinkingWaterSafety == '01' ? 'check-active' : '' " @click="form.drinkingWaterSafety='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.drinkingWaterSafety != '01' ? 'check-active' : '' " @click="form.drinkingWaterSafety='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否加入农民专业合作社</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.move == '01' ? 'check-active' : '' " @click="form.move='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.move !='01' ? 'check-active' : '' " @click="form.move='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否有创业致富带头人带动</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.move == '01' ? 'check-active' : '' " @click="form.move='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.move !='01' ? 'check-active' : '' " @click="form.move='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="btn" hover-class="text" @click="submit">保存</div>
   </div>
 </template>
 
@@ -84,7 +307,7 @@ export default {
   },
 
   onShow() {
-    document.title = '编辑家庭情况'
+    document.title = '生活生产条件'
   },
 
   methods: {
@@ -143,7 +366,7 @@ export default {
 
   & > div {
     margin-bottom: 16px;
-    background: #fff;
+    // background: #fff;
   }
 
   ::v-deep .u-radio {
@@ -155,8 +378,16 @@ export default {
   }
 
   .form-group {
+    background: #fff;
+    p {
+      color: #333333;
+      font-size: 36px;
+      padding: 20px 32px;
+      // border-bottom: 1px solid #E4E5E6;
+      font-weight: 600;
+    }
     .form-item {
-      padding-left: 32px;
+      padding: 0 32px;
 
       .form-item__wrapper {
         display: flex;
@@ -166,10 +397,16 @@ export default {
         border-bottom: 1px solid #E4E5E6;
       }
 
+      .left {
+        width: 300px;
+      }
+
       .right {
-        height: 112px;
-        line-height: 112px;
-        padding-right: 32px;
+        width: calc(100% - 300px);
+        text-align: right;
+        ::v-deep .u-input .u-input__input .uni-input-wrapper {
+          text-align: right;
+        }
 
         span {
           font-size: 30px;

From e904d9590cc11ccdf422ae3b68aec2ed4cdcf2b1 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 28 Apr 2022 11:02:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMonitoringObject/Detail.vue       |   2 +-
 .../MonitorFamilySituation.vue                |   4 +-
 src/apps/AppMonitoringObject/familyRisk.vue   | 290 ++++++++++++++++++
 3 files changed, 292 insertions(+), 4 deletions(-)
 create mode 100644 src/apps/AppMonitoringObject/familyRisk.vue

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index 9c439e92..c9138374 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -83,7 +83,7 @@
               <h2>家庭风险情况</h2>
               <i :style="{color: isIncome ? '#2EA222' : '#FF4466'}">({{ isIncome ? '已填写' : '未填写' }})</i>
             </div>
-            <span @click="linkTo(`./MonitorIncome?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
+            <span @click="linkTo(`./familyRisk?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
           </div>
           <div class="item-info">
             <label>风险因素</label>
diff --git a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
index 4c441a11..a8e454f6 100644
--- a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
+++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
@@ -13,7 +13,6 @@
           </div>
         </div>
       </div>
-
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -25,7 +24,6 @@
           </div>
         </div>
       </div>
-
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -37,7 +35,6 @@
           </div>
         </div>
       </div>
-
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -291,6 +288,7 @@ export default {
       id: '',
       girdId: '',
       girdName: '',
+      value: '',
     }
   },
 
diff --git a/src/apps/AppMonitoringObject/familyRisk.vue b/src/apps/AppMonitoringObject/familyRisk.vue
new file mode 100644
index 00000000..3e5b2f09
--- /dev/null
+++ b/src/apps/AppMonitoringObject/familyRisk.vue
@@ -0,0 +1,290 @@
+<template>
+  <div class="familyRisk">
+    <div class="form-group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>监测对象类型</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="margin-right: 8px;"></i>
+            <span>脱贫年度</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="form-group" style="margin-top: 8px;">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>风险因素</span>
+          </div>
+          <div class="right">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="margin-right: 8px;"></i>
+            <span>因自然灾害事项</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="form-group" style="margin-top: 8px;">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否军烈属</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.dilapidatedHousehold == '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.dilapidatedHousehold != '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否义务阶段失学辍学</span>
+          </div>
+          <div class="right">
+            <div class="check-item" :class="form.dilapidatedHousehold == '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.dilapidatedHousehold != '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrappers">
+          <div class="top">
+            <i style="margin-right: 8px;"></i>
+            <span>义务阶段未上学原因</span>
+          </div>
+          <div class="bottom">
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" :height="200" type="textarea" maxlength="500" />
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="btn">保存</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'familyRisk',
+  data() {
+    return {
+      form: {},
+      value: '',
+    }
+  },
+  onShow() {
+    document.title = '家庭风险情况'
+  },
+  onLoad() {},
+  methods: {}
+}
+</script>
+
+<style lang="scss">
+.familyRisk {
+  width: 100%;
+  box-sizing: border-box;
+  padding-bottom: 120px;
+  .form-group {
+    background: #fff;
+    p {
+      color: #333333;
+      font-size: 36px;
+      padding: 20px 32px;
+      // border-bottom: 1px solid #E4E5E6;
+      font-weight: 600;
+    }
+    .form-item {
+      padding: 0 32px;
+
+      ::v-deep .AiSelect .display {
+        justify-content: flex-end;
+      }
+
+      .form-item__wrapper {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 112px;
+        border-bottom: 1px solid #E4E5E6;
+
+        .left {
+          width: 300px;
+        }
+
+        .right {
+          width: calc(100% - 300px);
+          text-align: right !important;
+          ::v-deep .u-input .u-input__input .uni-input-wrapper {
+            text-align: right;
+          }
+
+          span {
+            font-size: 30px;
+            color: #999999;
+          }
+          .check-item{
+            display: inline-block;
+            width: 160px;
+            height: 64px;
+            line-height: 64px;
+            text-align: center;
+            background: #F5F5F5;
+            border-radius: 4px;
+            font-size: 30px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #333;
+            position: relative;
+            img{
+              display: none;
+            }
+          }
+          .check-item:nth-of-type(1) {
+            margin-right: 36px;
+          }
+          .check-active{
+            background: #E7F1FE;
+            color: #1174FE;
+            img{
+              display: block;
+              position: absolute;
+              bottom: 0;
+              right: 0;
+              width: 48px;
+              height: 48px;
+            }
+          }
+        }
+
+        input {
+          height: 100%;
+          text-align: right;
+        }
+
+        .left {
+          display: flex;
+          align-items: center;
+
+          span {
+            color: #333333;
+            font-size: 32px;
+          }
+
+          i {
+            margin-right: 4px;
+            font-style: normal;
+            color: #FF4466;
+            font-size: 32px;
+          }
+        }
+
+        &:last-child {
+          .form-item__wrapper {
+            border: none;
+          }
+        }
+      }
+
+      
+      .form-item__wrappers {
+        font-size: 32px;
+        .top {
+          padding: 20px 0;
+        }
+        .bottom {
+          padding: 5px 20px;
+        }
+      }
+    }
+  }
+
+  .form-item__imgs {
+    padding: 32px;
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+      margin-bottom: 34px;
+
+      h2 {
+        color: #333333;
+        font-weight: normal;
+        font-size: 32px;
+      }
+
+      i {
+        color: #999999;
+        font-size: 28px;
+        font-style: normal;
+      }
+    }
+
+    textarea {
+      width: 100%;
+    }
+  }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
+</style>
\ No newline at end of file