From 15c6a009a9f8daf9ee9d994c6b9917bc09c453dc Mon Sep 17 00:00:00 2001
From: PLUTO <>
Date: Thu, 12 Oct 2023 10:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/home/dangerHome.png         | Bin 627 -> 584 bytes
 src/assets/images/home/dangerPeople.png       | Bin 0 -> 565 bytes
 .../cpts/homeDetails/PeopleMount/index.vue    |  59 +++++++
 .../dataBoard/cpts/homeDetails/index.vue      | 162 +++++++++++++-----
 .../dissatisfiedPersonnel/index.vue           |  42 ++---
 5 files changed, 196 insertions(+), 67 deletions(-)
 create mode 100644 src/assets/images/home/dangerPeople.png
 create mode 100644 src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue

diff --git a/src/assets/images/home/dangerHome.png b/src/assets/images/home/dangerHome.png
index a3102ad7337935be64404c6baa3595b02c111617..f383f2d53f5fdbe65c7a297f494fe6277c22d342 100644
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%0!c(cR5(wClTS#~VHn3h&+j+NGB<K=4QU9Lw8LN${Sn>DLqtJIr%oO65G6q!
z3p#i3(kc1_9m_*qf(Vm{f@v)+&1zAUmo$r2GtDVuzV93R*_Q4PJ%{)3zR%~w`+ay{
zp-TPSL%V4D5W4E)ysp+Kl@8J|Iy4Lj)B-a)$39<z(Mr8#f^?Lq5gxD%FPCA?!2X6o
zo|j5i2~r)zY@y$*g#Qs4Z8+#3BEC{m6r^?$6RRp*U>3FFaA1T-g$+lL+D^>a|Ah-o
z)`BDc5ho@x*-ED++y~ZIn{<WTISfY|UvXC^!#qJ~1w2&+rsPEUj^SPKEuBt;&)Ybq
zg{xHr8Ov}fXSnCmWE5;QHq%=^@WP3ZUnZLA0j^XK{L&UtcN0HcS$ZT#NY;?dDy|2f
zk}3*52I(;s1PZ!+Ej*MQ2^5=E*9oltn}}YVGE1~IJmZUVgZF`Qfq{AR4X>|_Yd|-1
zpl-j!KE4}VOBl_qO~V{>1aG|M5ybE{oThOq!mxpzd4YYQ7j^L*xSg=c;5cDNFy`j8
z2$xG{urM==x2c6Y#&8G);_+Z+XTf%cH_-fv1CC&{mWXHujj&;rL~*93o^dpf$zs*r
z=wtruNl?F)SnLf=GgN%aaoAY17QfDaoxf#++L2{qtd4dOdi4S!dmTxH^N~3c`L;hD
W7P1jxJv9gb0000<MNUMnLSTY(zW&ev

literal 627
zcmeAS@N?(olHy`uVBq!ia0vp^MnG)E!3HEh<#62rQjEnx?oJHr&dI!FU|`bqba4#H
zaDF?>G5@lINXzq^(JMM0UvR$5vM$$e=@auW6Sg^iNOoMJ+WxOCz+!2PVrR8RVa}DH
z_2O&Sx~yaoiYg6`uG)7i|4*7-wZHS??uX^9CLId0MFCT_gC(alc^_C)d!f>E@%h6n
zE$O!!v{_a#`H3*hTy}IB*Zy1Utxb3RF`A<}q5k`CzU$ZR6_>IER=(BfJy^PN>sJ|R
ze=~=Gi}zOhHS6u?OXu79&t%V`pATd_=RDz`_VtqE^*vI2yW4MYZkwnn`SxwO)E8gr
z!kBuSd5iu(<oQ^`_poczF9)sQimz5x`TZBO-YT3<*;0M}gvycS{md$bF^o!befLT(
zX0hcwxoE%hk$j?3KVQ;L24PM9?j&KgLoPb12j)*(n$Vj%v!k$N8r#ecTCxB4d(=0i
z#5L-9-8~%mUOsk;{9{eO`}38qxw&*^`>kvV|6cIv9gF_E?ag{=PbSz)wp+aB=TcUE
zpPi|Ee6QZDwG3Lp7vKGJRL;M^_~ibbJ4r%ql}Fco;k8n{z{8Z2XLmLBz#>QUOKu`H
zd-n)1g=(5E%jAmXW>L&qFLm*Fhgoo%RQF;(=@Y(By#F6P@o3)1n>&sjOsy};Oj)Y8
u`<SiVyU^}kZ?YPHKD=^$@s_BBf6UVx?90`b6h{D45re0zpUXO@geCxy1{>r6

diff --git a/src/assets/images/home/dangerPeople.png b/src/assets/images/home/dangerPeople.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4eb892f28f13a3255ef3f9cce083931811ec8c6
GIT binary patch
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$?@2^KR5(w4l3z%ZVHAg-^DUDx7S?KI%_P)ZX|)IjN$X02x{+>z?z-`=sEY~|
z5rWX_D%!13H$l)%P~HU*IcgLc!f??liZ&SiS)y}py7$QUfigBf&(-_B=f`v2bIwnw
zi9e?}k8o9#J-|-`4|YxQqE=IXmbHgMj7tU{Hi!*_fdmt75C@<je`DkXr*eJdcDx}Z
zj;t{pK)#O-k446<%Cgeinjqy0DD)9ofoV5@Rpn$L$vgKSM7fD@cauKHgGq*60l$uO
z%wv&I@NFQfh~Z4@G_PF&b|QO}dkQz|MG6ybGYoFJ1v~lS1WmybFBMMLi2r$^eM#v@
z7|}U8@beAjPWxw`+PZZg*q85}jHxiR4lrC7A)~@G%FrBtOl9O6y7U_{Ts-iVCu=^i
zzU=3m2#*i~4nQex5q7S?TOgwU!8iGe#S8t=R7I3b=MTDMb}w-e27tD@KHrD4MAQ2y
z04+KX-l1Vi<70^5QC7lPnk5z7*kK6io;-(AyGf!%F<^zdF*)0BRlE7wo;-(TX1l9J
zjT*Yt!$DCdwT#trKhE5(QDm{80t3ATp35h{%Ma`^D2d_%XMKK-2;4Sh!q!&O2&0jC
zrkpK&^m0X@TOnl6L1CNyE=pB}1%Y(2#N`;yEE-}J!bqhNHePJ`00000NkvXXu0mjf
DEmHVm

literal 0
HcmV?d00001

diff --git a/src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue b/src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue
new file mode 100644
index 000000000..5c316daf8
--- /dev/null
+++ b/src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="peopleMount">
+    <div v-for="item in peopleList" :key="item.name" class="content">
+      <span class="fontStyleLable">{{ item.name }}</span>
+      <span class="fontStyle" :style="{ color: item.color }">{{ item.value }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "PeopleMount",
+  props: {},
+  data() {
+    return {
+      peopleList: [
+        {
+          name: "老年人数",
+          value: "42",
+          color: "#3CF5FF",
+        },
+        {
+          name: "残疾人数",
+          value: "28",
+          color: "#08EBAE",
+        },
+        {
+          name: "满意度风险家庭",
+          value: "13",
+          color: "#FFC100",
+        },
+      ],
+    };
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.peopleMount {
+  display: flex;
+  .content {
+    &:not(:last-child) {
+      margin-right: 40px;
+    }
+    .fontStyleLable {
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 400;
+      color: #ffffff;
+      margin-right: 10px;
+    }
+    .fontStyle {
+      font-size: 24px;
+      font-family: DIN Alternate;
+      font-weight: bold;
+    }
+  }
+}
+</style>
diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue
index 4dc750786..05117bc92 100644
--- a/src/views/dataBoard/cpts/homeDetails/index.vue
+++ b/src/views/dataBoard/cpts/homeDetails/index.vue
@@ -22,18 +22,24 @@
             <span v-if="homeMsg && homeMsg.type" :class="[homeMsg.type === 'red' ? 'miniGrid_red' : homeMsg.type === 'yellow' ? 'miniGrid_yellow' : 'miniGrid_green']">{{ homeMsg.type === "red" ? "红" : homeMsg.type === "yellow" ? "黄" : "绿" }}色微网格</span>
           </Title>
         </div>
+        <div class="mount">
+          <people-mount />
+        </div>
         <div class="apartment">
           <div class="apar_comtent">
             <div class="apar_top">
               <img src="@/assets/images/home/homeTop.png" alt="/" />
             </div>
-            <div class="apar_center">
-              <div class="apar_center_flex" :style="{ width: flexWidth + 'px' }">
-                <div v-for="(item, index) in houseMountArr" :key="index" class="floor">
-                  <div class="households" v-for="itm in item" :key="itm.id">{{ itm.doorName }}</div>
+            <div style="min-width: 284px; max-width: 488px; padding: 0 20px">
+              <div class="apar_center">
+                <div class="apar_center_flex" :style="{ width: flexWidth + 'px' }">
+                  <div v-for="(item, index) in houseMountArr" :key="index" class="floor">
+                    <div class="households" v-for="itm in item" :key="itm.id">{{ itm.doorName }}</div>
+                  </div>
                 </div>
               </div>
             </div>
+
             <div class="apar_bottom">
               <img src="@/assets/images/home/homeBottom.png" alt="/" />
             </div>
@@ -44,32 +50,61 @@
         </div>
       </el-col>
       <el-col :span="16">
+        <div class="screen">
+          <el-form :model="queryParams" inline>
+            <el-input v-model.trim="queryParams.ownerName" size="small" placeholder="按房主姓名"></el-input>
+            <el-input v-model.trim="queryParams.ownerPhone" size="small" placeholder="按房主电话"></el-input>
+            <el-input v-model.trim="queryParams.ownerIdCard" size="small" placeholder="按房主身份证号"></el-input>
+            <el-select popper-class="selectPopClass" clearable v-model="queryParams.residentTag" size="small" placeholder="居民类型">
+              <el-option v-for="item in satisfactionCategoryOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+            </el-select>
+            <el-select popper-class="selectPopClass" clearable v-model="queryParams.riskyFlag" size="small" placeholder="满意度风险家庭">
+              <el-option v-for="item in satisfactionCategoryOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+            </el-select>
+
+            <el-button size="small" class="btn" type="primary" @click="search">查询</el-button>
+          </el-form>
+        </div>
         <div class="table">
           <el-table :data="list" v-loading="loading" height="500" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
             <el-table-column label="序号" type="index" width="80" />
-            <el-table-column prop="doorName" label="门牌号" />
-            <el-table-column prop="fullName" show-overflow-tooltip label="所属小区" />
-            <el-table-column prop="buildingId" show-overflow-tooltip label="所属楼栋" />
-            <el-table-column prop="buildingUnitId" show-overflow-tooltip label="所属单元" />
-            <el-table-column prop="houseCode" label="房屋编码" />
-            <el-table-column prop="rentFlag" label="房屋状态">
+            <el-table-column prop="doorName" width="100" label="门牌号" />
+            <el-table-column prop="fullName" width="120" show-overflow-tooltip label="所属小区" />
+            <el-table-column prop="buildingId" width="120" show-overflow-tooltip label="所属楼栋" />
+            <el-table-column prop="buildingUnitId" width="120" show-overflow-tooltip label="所属单元" />
+            <el-table-column prop="houseCode" width="120" label="房屋编码" />
+            <el-table-column prop="rentFlag" width="120" label="房屋状态">
               <template slot-scope="scope">
                 <!-- 1：出租 0：自住 2：闲置 3：未售出 -->
                 <span>{{ getRentFlag(scope.row.rentFlag) }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="houseType" label="房屋类型">
+            <el-table-column prop="houseType" width="120" label="房屋类型">
               <template slot-scope="scope">
                 <!-- 1楼房，2平房，3别墅 -->
                 <span>{{ getHouseType(scope.row.houseType) }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="ownerName" label="房主姓名" />
-            <el-table-column prop="ownerPhone" label="房主电话">
+            <el-table-column prop="ownerName" width="120" label="房主姓名" />
+            <el-table-column prop="ownerPhone" width="120" label="房主电话">
               <template slot-scope="scope">
                 {{ $sensitive(scope.row.ownerPhone, 3, 7) }}
               </template>
             </el-table-column>
+            <el-table-column prop="riskyNum" width="170" label="满意度风险家庭">
+              <template slot="header"> <img :src="require('@/assets/images/home/dangerHome.png')" alt="" /> 满意度风险家庭 </template>
+              <template slot-scope="scope">
+                <span style="color: #f95619" v-if="+scope.row.riskyNum > 0">是</span>
+                <span style="color: #3cf5ff" v-else>否</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="importanceNum" width="140" label="重点人员">
+              <template slot="header"> <img :src="require('@/assets/images/home/dangerPeople.png')" alt="" /> 重点人员 </template>
+              <template slot-scope="scope">
+                <span style="color: #f95619" v-if="+scope.row.importanceNum > 0">是</span>
+                <span style="color: #3cf5ff" v-else>否</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" width="90" align="center">
               <template slot-scope="{ row }">
                 <el-button type="text" @click="$router.push(`/dataBoard/overview/familyPortrait/?name=${row.doorName}&houseId=${row.id}&id=${row.buildingId}&buId=${row.buildingUnitId}&type=${$route.query.typeB}&name2=${row.houseName}`)">查看</el-button>
@@ -77,9 +112,9 @@
             </el-table-column>
           </el-table>
         </div>
-        <!-- <div>
-          <Pagination v-show="total > 0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" @pagination="getList" />
-        </div> -->
+        <div>
+          <Pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" @pagination="getTableData" />
+        </div>
       </el-col>
     </el-row>
   </div>
@@ -89,6 +124,7 @@
 import Pagination from "@/views/dataBoard/satisfactionEval/components/Pagination";
 import Title from "./Title/index.vue";
 import BreadCrumb from "@/views/dataBoard/cpts/personnel/components/Breadcrumb/index.vue";
+import PeopleMount from "./PeopleMount/index.vue";
 
 export default {
   name: "homeDetails",
@@ -96,12 +132,24 @@ export default {
     Pagination,
     Title,
     BreadCrumb,
+    PeopleMount,
   },
   data() {
     return {
-      //   total: 0,
-      //   pageNum: 1,
-      //   pageSize: 10,
+      total: 0,
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        unitId: "",
+        ownerName: "",
+        ownerPhone: "",
+        ownerIdCard: "",
+        riskyFlag: "",
+        residentTag: "",
+      },
+      orgOptions: [],
+      satisfactionSourceOptions: [],
+      satisfactionCategoryOptions: [],
       flexWidth: 0,
       loading: false,
       homeMsg: {},
@@ -111,28 +159,11 @@ export default {
       houseMountArr: [],
     };
   },
-  watch: {
-    // "$route.query.buIding": {
-    //   handler(val) {
-    //     if (val) {
-    //       this.getList(val);
-    //     }
-    //   },
-    //   immediate: true,
-    // },
-    // "$route.query.typeB": {
-    //   handler(val) {
-    //     console.log("jhjkbhkjhkjhkjhkjhkj");
-    //     if (val) {
-    //       this.getList();
-    //     }
-    //   },
-    //   immediate: true,
-    // },
-  },
+  watch: {},
   mounted() {
     const buId = this.$route.query.buId || null;
     this.getList(buId);
+    this.getTableData();
   },
   methods: {
     getDoorNameList(list) {
@@ -167,7 +198,6 @@ export default {
     },
 
     getUnitList(id) {
-      this.loading = true;
       this.$http.get(`/actual/base/streetOverview/getUnitHouseList?unitId=` + id).then((res) => {
         const {
           code,
@@ -175,13 +205,24 @@ export default {
         } = res.data;
         if (code === 0) {
           let unitInfos = unitInfo || {};
-          this.list = houseList;
           this.homeMsg = unitInfos;
           this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : "");
           this.houseMountArr = this.getDoorNameList(this.list);
           if (this.houseMountArr.length > 0) {
             this.flexWidth = this.houseMountArr[0].length * 58;
           }
+        }
+      });
+    },
+
+    getTableData() {
+      const { id } = this.$route.query;
+      this.queryParams.unitId = id;
+      this.loading = true;
+      this.$http.get("/actual/base/streetOverview/getUnitHouseOverviewList?" + this.$paramsFormat(this.queryParams)).then((res) => {
+        const { code, data } = res.data;
+        if (code === 0) {
+          this.list = data;
           this.loading = false;
         } else {
           this.loading = false;
@@ -189,6 +230,8 @@ export default {
       });
     },
 
+    search() {},
+
     getList(buid) {
       const homeType = this.$route.query.typeB;
       if (homeType === "building") {
@@ -201,7 +244,6 @@ export default {
             if (this.buildingList && this.buildingList.length > 0) {
               if (buid) {
                 this.buildingList.forEach((item, i) => {
-                  console.log(item);
                   if (item.id === buid) {
                     item.ifActive = true;
                     this.getUnitList(item.id);
@@ -327,7 +369,7 @@ export default {
     display: flex;
     align-items: flex-end;
     justify-content: center;
-    margin-top: 100px;
+    margin-top: 60px;
 
     .apar_comtent {
       display: flex;
@@ -338,7 +380,7 @@ export default {
       .apar_center {
         min-width: 244px;
         max-width: 488px;
-        height: 584px;
+        height: 578px;
         overflow: auto;
         background: #caab93;
         padding: 30px 30px 10px 30px;
@@ -426,5 +468,39 @@ export default {
       color: yellow;
     }
   }
+  .mount {
+    margin-top: 25px;
+  }
+
+  .screen {
+    margin: 5px 0 40px;
+
+    .el-select,
+    .el-input {
+      width: 150px;
+      margin-right: 4px;
+      border: 1px solid #126ac5;
+      border-radius: 2px;
+
+      /deep/ .el-input__inner {
+        background: none;
+        border: none;
+        color: #fff;
+      }
+    }
+
+    .searchSelect {
+      width: 200px;
+      /deep/ .el-select__tags {
+        width: 200px !important;
+        max-width: 200px !important;
+      }
+    }
+
+    .btn {
+      margin-left: 46px;
+      height: 32px;
+    }
+  }
 }
 </style>
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
index 08a4415b1..5a452452c 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
@@ -1,19 +1,14 @@
 <template>
   <div>
-    <Breadcrumb :list="breadcrumbList"/>
+    <Breadcrumb :list="breadcrumbList" />
     <!--    <div class="main-title">
       <Title :text="`“${title}”画像匹配同类潜在不满意人员 `" noBg/>
     </div>-->
     <div class="table">
-      <el-table :data="list"
-                v-loading="loading"
-                element-loading-text="加载中..."
-                element-loading-spinner="el-icon-loading"
-                element-loading-background="rgba(0,0,0,0.5)"
-      >
-        <el-table-column label="序号" type="index" width="80"/>
+      <el-table :data="list" v-loading="loading" element-loading-text="加载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0,0,0,0.5)">
+        <el-table-column label="序号" type="index" width="80" />
 
-        <el-table-column prop="gridName" width="118" label="所属组织"/>
+        <el-table-column prop="gridName" width="118" label="所属组织" />
 
         <el-table-column prop="restName" label="姓名"></el-table-column>
 
@@ -23,7 +18,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="categoryNames" label="人员性质"/>
+        <el-table-column prop="categoryNames" label="人员性质" />
 
         <el-table-column prop="gender" label="性别">
           <template slot-scope="{ row }">
@@ -31,13 +26,13 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="age" label="年龄"/>
+        <el-table-column prop="age" label="年龄" />
 
-        <el-table-column prop="cultureName" label="学历"/>
+        <el-table-column prop="cultureName" label="学历" />
 
-        <el-table-column prop="marriageName" label="婚姻"/>
+        <el-table-column prop="marriageName" label="婚姻" />
 
-        <el-table-column prop="monthIncomeLevel" label="月收入"/>
+        <el-table-column prop="monthIncomeLevel" label="月收入" />
 
         <el-table-column label="详情" width="90" align="center">
           <template slot-scope="data">
@@ -47,8 +42,7 @@
       </el-table>
     </div>
 
-    <Pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <Pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" @pagination="getList" />
   </div>
 </template>
 
@@ -59,7 +53,7 @@ import Title from "@/views/dataBoard/satisfactionEval/components/Title";
 
 export default {
   name: "dissatisfied",
-  components: {Breadcrumb, Pagination, Title},
+  components: { Breadcrumb, Pagination, Title },
   data() {
     return {
       queryParams: {
@@ -78,14 +72,14 @@ export default {
         },
       ],
       monthOptions: new Array(12).fill(0).map((_, index) => {
-        return {label: index - 0 + 1 + "月", value: index - 0 + 1};
+        return { label: index - 0 + 1 + "月", value: index - 0 + 1 };
       }),
       list: [],
       title: "",
-      loading: true
+      loading: true,
     };
   },
-  activated() {
+  mounted() {
     this.title = this.$route.query.title;
     let searchParams = JSON.parse(this.$route.query.searchParams);
     console.log(searchParams);
@@ -97,14 +91,14 @@ export default {
   },
   methods: {
     getList() {
-      this.loading = true
-      this.$http.get("/governance/satisfactionOverview/satisfactionCrowdList?" + this.$paramsFormat(this.queryParams)).then(({data: {data}}) => {
+      this.loading = true;
+      this.$http.get("/governance/satisfactionOverview/satisfactionCrowdList?" + this.$paramsFormat(this.queryParams)).then(({ data: { data } }) => {
         this.list = data.list;
         this.total = data.total;
-        this.loading = false
+        this.loading = false;
       });
     },
-    handleView({restName, restId}) {
+    handleView({ restName, restId }) {
       this.$router.push("/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail?name=" + restName + "&user_id=" + restId);
     },
   },