Merge branch 'dev-fangyi' into test

src/App.vue

@@ -187,4 +187,11 @@ export default {
   padding: 6px !important;
   background-color: rgb(247, 250, 253);
 }
+
+//列表操作列，更多
+.table-more-btn {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 </style>

src/assets/scss/modules/management/epidemic.scss

@@ -75,11 +75,6 @@
   }
 }
 
-.more-btn {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
 .div-mult-form {
   margin-top: 20px;
 

src/views/modules/base/epidemic/natFocus/natFocusAdd.vue

@@ -127,14 +127,29 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="疫苗接种次数小于"
+
+              <el-form-item label="检测时间"
+                            prop="startTime">
+                <el-date-picker v-model="timeRange"
+                                size="mini"
+                                type="daterange"
+                                @change="handleTimeChange"
+                                format="yyyy-MM-dd"
+                                value-format="yyyyMMdd"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间">
+                </el-date-picker>
+
+              </el-form-item>
+              <el-form-item label="核酸检测次数小于"
                             label-width="150px">
                 <el-input-number class="item_width_3"
-                                 v-model="formDataSearch.vaccineCount"
+                                 v-model="formDataSearch.natCount"
                                  size="mini"
                                  :min="0"
                                  :max="20"
-                                 label="疫苗接种次数小于"></el-input-number>
+                                 label="核酸检测次数小于"></el-input-number>
               </el-form-item>
               <el-button style="margin-left:30px"
                          size="mini"
@@ -183,7 +198,7 @@
                                label="身份证"
                                min-width="170">
               </el-table-column>
-              <el-table-column prop="vaccineCount"
+              <el-table-column prop="natCount"
                                header-align="center"
                                align="center"
                                label="疫苗接种次数"
@@ -324,8 +339,12 @@ export default {
 
       formDataSearch: {
         gridId: '',
-        vaccineCount: undefined,
+        natCount: undefined,
+        startDate: '',
+        endDate: '',
+        attentionType: 2
       },
+      timeRange: [],
 
       formData1: {
         attentionType: 2,
@@ -384,7 +403,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/epmetuser/epidemicPrevention/page"
+      const url = "/epmetuser/epidemicPrevention/user-list"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
         pageSize: this.pageSize,
@@ -410,6 +429,19 @@ export default {
       this.tableLoading = false
     },
 
+    handleTimeChange (time) {
+      if (time) {
+        this.formData.startDate = time[0]
+        this.formData.endDate = time[1]
+
+      } else {
+        this.formData.startDate = ''
+        this.formData.endDate = ''
+
+      }
+
+    },
+
     handleSelectTable (selection, row) {
 
       row.isSel = !row.isSel
@@ -656,14 +688,9 @@ export default {
     resetSearch () {
       this.formDataSearch = {
         gridId: '',
-        vaccineCount: undefined,
+        natCount: undefined,
-
-
       }
-    },
+      this.timeRange = []
-
-    destroyed () {
-      console.log(11111111)
     },
 
     resetData () {
@@ -690,12 +717,11 @@ export default {
       }
       this.formDataSearch = {
         gridId: '',
-        vaccineCount: undefined,
+        natCount: undefined,
       }
 
       this.selectionAll = []//选中的人员
 
-
     },
 
     handleSizeChange (val) {

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -189,14 +189,14 @@
                         style="margin-left:10px"
                         width="20"
                         trigger="click">
-              <div class="more-btn">
+              <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"
                            @click="handleNoticeList(scope.row)">通知记录</el-button>
               </div>
 
-              <div class="more-btn">
+              <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"
@@ -505,7 +505,7 @@ export default {
       }
       this.sendNoticeFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_sendnotice.initForm(this.selectionAll)
+        this.$refs.ref_sendnotice.initForm(this.selectionAll, '2')
       })
 
     },
@@ -513,7 +513,7 @@ export default {
     handleNoticeList (row) {
       this.noticeListFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_noticelist.initTable(row.idCard)
+        this.$refs.ref_noticelist.initTable(row.idCard, '2')
       })
 
     },

src/views/modules/base/epidemic/natFocus/nfNoticeList.vue

@@ -70,7 +70,7 @@ export default {
       tableData: [],
       pageSize: 20,
       pageNo: 1,
-
+      origin: ''
     }
   },
   components: {},
@@ -80,8 +80,9 @@ export default {
 
   methods: {
 
-    async initTable (idCard) {
+    async initTable (idCard, origin) {
       this.idCard = idCard
+      this.origin = origin
       await this.loadTable()
 
     },
@@ -95,7 +96,7 @@ export default {
         idCard: this.idCard,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        origin: '2'
+        origin: this.origin
       }
 
       const { data, code, msg } = await requestPost(url, params)

src/views/modules/base/epidemic/natFocus/nfSendNotice.vue

@@ -8,7 +8,7 @@
                :rules="dataRule"
                class="form">
 
-        <el-form-item v-if="false"
+        <el-form-item
                       label="通知渠道"
                       prop="channel"
                       label-width="150px"
@@ -25,7 +25,7 @@
           </el-checkbox-group> -->
         </el-form-item>
 
-        <el-form-item v-if="false"
+        <el-form-item
                       label="通知内容"
                       prop="content"
                       label-width="150px"
@@ -75,7 +75,7 @@ export default {
       btnDisable: false,
 
       formData: {
-        origin: '1',
+        origin: '',
         isSelChannel: false,
         channel: [],
         content: '',
@@ -94,10 +94,11 @@ export default {
 
   methods: {
 
-    async initForm (selectionAll) {
+    async initForm (selectionAll, origin) {
 
       this.$refs['ref_form1'].resetFields();
       this.formData.userList = selectionAll
+      this.formData.origin = origin
 
     },
 
@@ -121,7 +122,7 @@ export default {
       }
 
       console.log(this.formData)
-      return false
+      // return false
 
       this.btnDisable = true
       setTimeout(() => {
@@ -130,8 +131,7 @@ export default {
 
       let url = ''
 
-      url = '/epmetuser/icNotice/batchnotice'
+      url = '/epmetuser/icNotice/sendNotice'
-      // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/batchnotice"
 
 
       const { data, code, msg } = await requestPost(url, this.formData)

src/views/modules/base/epidemic/natFocus/nfVisiteList.vue

@@ -55,7 +55,7 @@
                title="新增"
                append-to-body
                @closed="handleCancle">
-      <div class="epidemic-form">
+      <div v-if="dialogVisible" class="epidemic-form">
         <el-form ref="ref_form"
                  :inline="true"
                  :model="formData"
@@ -133,7 +133,7 @@ export default {
         idCard: '',
         name: '',
         mobile: '',
-        origin: '2'
+        origin: ''
       },
 
       dialogVisible: false,
@@ -169,7 +169,7 @@ export default {
         idCard: this.formData.idCard,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        origin: '2'
+        origin: this.formData.origin
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -208,6 +208,8 @@ export default {
     },
 
     handleCancle () {
+      this.formData.visitTime = ''
+      this.formData.content = ''
       this.dialogVisible = false
 
     },

src/views/modules/base/epidemic/natInfo/natList.vue

@@ -19,6 +19,36 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="本辖区居民">
+            <el-select class="list_item_width_1"
+                       size="small"
+                       :disabled="formData.orgType!='current'"
+                       v-model.trim="formData.isResiUser"
+                       placeholder="请选择">
+              <el-option v-for="item in isResiUserList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="接种时间"
+                        prop="startTime">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="datetimerange"
+                            @change="handleTimeChange"
+                            format="yyyy-MM-dd HH:mm"
+                            value-format="yyyy-MM-dd HH:mm"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+
+          <div>
             <el-form-item label="姓名"
                           prop="name">
               <el-input v-model="formData.name"
@@ -49,22 +79,6 @@
                         placeholder="请输入身份证">
               </el-input>
 
-          </el-form-item>
-          <div>
-
-            <el-form-item label="接种时间"
-                          prop="startTime">
-              <el-date-picker v-model="timeRange"
-                              size="small"
-                              type="datetimerange"
-                              @change="handleTimeChange"
-                              format="yyyy-MM-dd HH:mm"
-                              value-format="yyyy-MM-dd HH:mm"
-                              range-separator="至"
-                              start-placeholder="开始时间"
-                              end-placeholder="结束时间">
-              </el-date-picker>
-
             </el-form-item>
 
             <el-button style="margin-left:30px"
@@ -160,6 +174,14 @@
                          label="检测结果"
                          width="100">
         </el-table-column>
+        <el-table-column v-if="formData.orgType==='current'"
+                         prop="isResiUserShow"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="是否本辖区居民"
+                         width="120">
+        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"
@@ -174,48 +196,30 @@
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
 
-            <el-button v-if="scope.row.userType==='resi'||scope.row.userType==='icresi'"
+            <el-button v-if="formData.orgType==='all'"
-                       type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-button v-if="scope.row.userType==='resi'||scope.row.userType==='icresi'"
-                       type="text"
-                       class="div-table-button--delete "
-                       size="small"
-                       @click="handleDelete(scope.row,'delete')">删除</el-button>
-
-            <el-button v-if="scope.row.userType==='import'&&scope.row.agencyId!==agencyId"
                        type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleAttention(scope.row)">同步</el-button>
 
-            <el-button v-if="scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
+            <el-button v-if="formData.orgType==='current'&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
                        type="text"
-                       class="div-table-button--delete "
-                       size="small"
-                       @click="handleDelete(scope.row,'attention')">取消同步</el-button>
-            <!-- <el-button type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button type="text"
+            <el-button v-if="formData.orgType==='current'&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
+                       type="text"
                        class="div-table-button--delete "
                        size="small"
                        @click="handleDelete(scope.row,'delete')">删除</el-button>
 
-            <el-button type="text"
+            <el-button v-if="formData.orgType==='current'&&scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
-                       class="div-table-button--edit"
+                       type="text"
-                       size="small"
-                       @click="handleAttention(scope.row)">关注</el-button>
-
-            <el-button type="text"
                        class="div-table-button--delete "
                        size="small"
-                       @click="handleDelete(scope.row,'attention')">取消关注</el-button> -->
+                       @click="handleDelete(scope.row,'attention')">取消同步</el-button>
+
           </template>
         </el-table-column>
       </el-table>
@@ -277,6 +281,16 @@ export default {
           label: '全部检测记录'
         },
       ],
+      isResiUserList: [
+        {
+          value: '0',
+          label: '否'
+        },
+        {
+          value: '1',
+          label: '是'
+        },
+      ],
 
       timeRange: [],
       formData: {
@@ -286,6 +300,7 @@ export default {
         idCard: '',//身份证号码	
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+        isResiUser: ''//0:否  1:是
 
       },
 
@@ -337,6 +352,8 @@ export default {
         this.tableData = data.list
 
         this.tableData.forEach(item => {
+
+          item.isResiUserShow = item.isResiUser === '0' ? '否' : '是'
           if (item.natResult === '1') {
             item.natResultShow = '阳性'
           } else if (item.natResult === '0') {

src/views/modules/base/epidemic/travel.vue

@@ -23,7 +23,7 @@
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入姓名">
+                      placeholder="请输入手机号">
             </el-input>
 
           </el-form-item>
@@ -44,13 +44,14 @@
           
           <el-form-item label="来自地区"
                         prop="sourceAddressCode">
-            <el-input v-model="formData.sourceAddressCode"
+            <!-- <el-input v-model="formData.sourceAddressCode"
                       size="small"
                       class="list_item_width_1"
                       clearable
                       placeholder="请输入姓名">
-            </el-input>
+            </el-input> -->
-
+            <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps" 
+              v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader>
           </el-form-item>
 
           <el-form-item label="来到本地时间"
@@ -112,6 +113,10 @@
                    class="diy-button--more"
                    size="small"
                    @click="handleSendNotice">发送通知</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleAttention">加入关注</el-button>
         <el-button style="margin-left:15px"
                    class="diy-button--more"
                    size="small"
@@ -127,18 +132,18 @@
                 style="width: 100%"
                  @selection-change="handleSelectionChange">
         <el-table-column type="selection"
-                         width="55"></el-table-column>
+                         width="55" fixed="left"></el-table-column>
         <el-table-column label="序号"
                          header-align="center"
                          align="center"
                          type="index"
-                         width="50"></el-table-column>
+                         width="50" fixed="left"></el-table-column>
 
         <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="姓名"
-                         width="100">
+                         width="100" fixed="left">
         </el-table-column>
         <el-table-column prop="mobile"
                          header-align="center"
@@ -340,7 +345,7 @@ export default {
       pageNo: 0,
       tableLoading: false,
       sHeight: 0,
-
+      searchAreacode: [],
       agencyId: '',
       selectionAll: [],
       timeRange: [],
@@ -358,6 +363,11 @@ export default {
       //form相关
       formShow: false,
       formTitle: '新增',
+      areaProps: {
+        lazy: true,
+        checkStrictly: true,
+        lazyLoad: this.lzayLoadArea
+      }
 
     }
   },
@@ -383,6 +393,12 @@ export default {
   },
 
   methods: {
+    lzayLoadArea(node, resolve) {
+      this.getArea(node, resolve)
+      // setTimeout(() => {
+        
+      // }, 1000)
+    },
     handleSearch () {
       this.loadTable()
     },
@@ -391,7 +407,31 @@ export default {
       console.log('val----', val)
       this.selectionAll = val
     },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
 
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, // 
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
     async loadTable () {
       this.tableLoading = true
 
@@ -421,7 +461,13 @@ export default {
       }
       this.tableLoading = false
     },
+    handleAreaChange(val) {
       
+      if (val.length > 0) {
+        const len = val.length - 1
+        this.formData.sourceAddressCode = val[len]
+      } else this.formData.sourceAddressCode = ''
+    },
     handleScheduledTimeChange (time) {
       if (time) {
         this.formData.startDate = time[0]
@@ -445,7 +491,7 @@ export default {
     handleNoticeList (row) {
       this.noticeListFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_noticelist.initTable(row.idCard)
+        this.$refs.ref_noticelist.initTable(row.idCard, '0')
       })
 
     },
@@ -465,10 +511,36 @@ export default {
       }
       this.sendNoticeFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_sendnotice.initForm(this.selectionAll)
+        const arr = this.selectionAll.map(item => {
+          return {
+            userId: item.userId,
+            idCard: item.idCard,
+            mobile: item.mobile
+          }
+        })
+        this.$refs.ref_sendnotice.initForm(arr, '0')
       })
 
     },
+    handleAttention(row) {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要加入关注的名单')
+        return false
+      }
+      this.$confirm("确认选择的名单加入关注?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.saveFocus(row)
+        })
+        .catch(err => {
+          console.log('err-----', err)
+
+        });
+    },
+    
     async handleDeletes (row) {
       if (this.selectionAll.length === 0) {
         this.$message.info('请选择要取消关注的名单')
@@ -489,6 +561,37 @@ export default {
 
         });
     },
+    async saveFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-add"
+      // let idCards = []
+
+      // this.selectionAll.forEach(element => {
+      //   idCards.push(element.idCard)
+      // });
+      let params = {
+        list: this.selectionAll.map(item => {
+          return {
+            name: item.name,
+            mobile: item.mobile,
+            idCard: item.idCard,
+            attentionType: 2
+          }
+        })
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
     async deleteFocus (row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
@@ -498,7 +601,7 @@ export default {
         idCards.push(element.idCard)
       });
       let params = {
-        attentionType: 0,
+        attentionType: 2,
         idCards: idCards
       }
 
@@ -592,6 +695,7 @@ export default {
       this.$refs.ref_searchform.resetFields()
       this.formData.startDate = ''
       this.formData.endDate = ''
+      this.searchAreacode = []
       this.timeRange = []
       this.pageSize = 20
       this.pageNo = 1

src/views/modules/base/epidemic/travelForm.vue

@@ -155,7 +155,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="1000"
+                    maxlength="500"
                     show-word-limit
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
@@ -182,7 +182,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="1000"
+                    maxlength="500"
                     show-word-limit
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
@@ -320,19 +320,18 @@ export default {
     },
     async initForm (type, row) {
       console.log('row----', row)
+      this.formType = type
+      this.formData.agencyId = this.agencyId
       if (type != 'add') {
         this.formData = { ...row, channel: [], content: '' }
         this.sourceAllCode = row.sourceAddressPathCode && row.sourceAddressPathCode.split(',')
         
         if (row.userType == 'icresi') this.isFromResi = true
-        else this.nowAllCode = row.presentAddressPathCode.split(',')
+        else this.nowAllCode = row.presentAddressPathCode && row.presentAddressPathCode.split(',')
       }
-      this.formData.agencyId = this.agencyId
-
       // this.$refs['ref_form'].resetFields();
 
-      this.formType = type
+      console.log('formtype', type)
-
 
     },
 

src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@@ -303,6 +303,7 @@ export default {
       formDataSearch: {
         gridId: '',
         vaccineCount: undefined,
+        attentionType: 1
       },
 
       formData1: {
@@ -361,7 +362,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/epmetuser/epidemicPrevention/page"
+      const url = "/epmetuser/epidemicPrevention/user-list"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
         pageSize: this.pageSize,

src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@@ -184,14 +184,14 @@
                         style="margin-left:10px"
                         width="20"
                         trigger="click">
-              <div class="more-btn">
+              <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"
                            @click="handleNoticeList(scope.row)">通知记录</el-button>
               </div>
 
-              <div class="more-btn">
+              <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"

src/views/modules/communityService/ninePlaces/inspect/inspect.vue

@@ -183,14 +183,36 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       :disabled="true"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left:10px"
+                        width="20"
+                        trigger="click">
+              <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--edit"
                            size="small"
                            @click="handleReview(scope.row)">复查记录</el-button>
+              </div>
+
+              <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--delete"
                            size="small"
                            @click="handleDelete(scope.row)">删除</el-button>
+              </div>
+
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--more"
+                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+            </el-popover>
 
           </template>
         </el-table-column>
@@ -428,6 +450,14 @@ export default {
       })
     },
 
+    handleEdit (row) {
+      this.formTitle = '编辑'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row)
+      })
+    },
+
     handleReview (row) {
       this.reviewShow = true
       this.$nextTick(() => {

src/views/modules/shequ/index.vue

@@ -10,12 +10,10 @@
 
             <div class="search">
               <div class="input">
-                <el-dropdown
+                <el-dropdown class="select"
-                  class="select"
                              placement="bottom"
                              v-model="searchData.type"
-                  @command="(type) => (searchData.type = type)"
+                             @command="(type) => (searchData.type = type)">
-                >
                   <span class="select-show">
                     {{
                       { jumin: "居民", fangwu: "房屋", xuqiu: "需求" }[
@@ -30,48 +28,38 @@
                   </el-dropdown-menu>
                 </el-dropdown>
 
-                <input
+                <input type="text"
-                  type="text"
                        :placeholder="typePlaceholder[searchData.type]"
                        v-model="searchData.keyword"
-                  @keyup.enter="handleClickSearchBtn"
+                       @keyup.enter="handleClickSearchBtn" />
-                />
 
-                <div
+                <div class="close-btn"
-                  class="close-btn"
                      v-if="searchData.keyword != ''"
-                  @click="searchData.keyword = ''"
+                     @click="searchData.keyword = ''">
-                >
                   <img src="@/assets/img/shequ/close.png" />
                 </div>
               </div>
-              <div class="btn" @click="handleClickSearchBtn">搜索</div>
+              <div class="btn"
+                   @click="handleClickSearchBtn">搜索</div>
             </div>
 
-            <div
+            <div class="m-tb"
-              class="m-tb"
                  v-if="
                 searchData.type == 'jumin' &&
                 searchData.keyword != '' &&
                 searchStatus == 'ing'
-              "
+              ">
-            >
               <div class="tb">
-                <el-table
+                <el-table :data="searchJumin.list"
-                  :data="searchJumin.list"
                           border
                           style="width: 100%"
                           class="resi-table"
-                  :max-height="1000"
+                          :max-height="1000">
-                >
+                  <el-table-column label="序号"
-                  <el-table-column
-                    label="序号"
                                    type="index"
                                    align="center"
-                    width="50"
+                                   width="50" />
-                  />
+                  <el-table-column v-for="item in searchJumin.header"
-                  <el-table-column
-                    v-for="item in searchJumin.header"
                                    :key="item.columnName"
                                    :prop="item.columnName"
                                    :label="item.label"
@@ -81,238 +69,199 @@
                       item.itemType === 'radio'
                         ? computedWidth(item.label)
                         : 180
-                    "
+                    ">
-                  >
                     <template slot-scope="scope">
                       <span>{{ handleFilterSpan(scope.row, item) }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column fixed="right" label="操作" align="center">
+                  <el-table-column fixed="right"
+                                   label="操作"
+                                   align="center">
                     <template slot-scope="scope">
-                      <el-button
+                      <el-button @click="handleWatchSearchJumin(scope.$index)"
-                        @click="handleWatchSearchJumin(scope.$index)"
                                  type="text"
-                        size="small"
+                                 size="small">查看</el-button>
-                        >查看</el-button
-                      >
                     </template>
                   </el-table-column>
                 </el-table>
 
                 <div>
-                  <el-pagination
+                  <el-pagination @size-change="handleSizeChangeSearchJumin"
-                    @size-change="handleSizeChangeSearchJumin"
                                  @current-change="handleCurrentChangeSearchJumin"
                                  :current-page.sync="searchJumin.pageNo"
                                  :page-sizes="[20, 50, 100, 200]"
                                  :page-size="parseInt(searchJumin.pageSize)"
-                    layout="sizes, prev, pager, next"
+                                 layout="sizes, prev, pager, next, total"
-                    :total="searchJumin.total"
+                                 :total="searchJumin.total">
-                  >
                   </el-pagination>
                 </div>
               </div>
             </div>
 
-            <div
+            <div class="m-tb"
-              class="m-tb"
                  v-if="
                 searchData.type == 'fangwu' &&
                 searchData.keyword != '' &&
                 searchStatus == 'ing'
-              "
+              ">
-            >
               <div class="tb">
-                <el-table
+                <el-table :data="searchFangwu.list"
-                  :data="searchFangwu.list"
                           v-loading="searchFangwu.loading"
                           border
                           :max-height="1000"
-                  style="width: 100%"
+                          style="width: 100%">
-                >
+                  <el-table-column label="序号"
-                  <el-table-column
-                    label="序号"
                                    type="index"
                                    align="center"
-                    width="50"
+                                   width="50" />
-                  />
+                  <el-table-column prop="houseName"
-                  <el-table-column
-                    prop="houseName"
                                    label="房屋名称"
-                    width="120"
+                                   width="120">
-                  >
                   </el-table-column>
-                  <el-table-column
+                  <el-table-column prop="neighborHoodName"
-                    prop="neighborHoodName"
                                    label="所属小区"
-                    width="160"
+                                   width="160">
-                  >
                   </el-table-column>
-                  <el-table-column prop="buildingName" label="所属楼栋">
+                  <el-table-column prop="buildingName"
+                                   label="所属楼栋">
                   </el-table-column>
-                  <el-table-column prop="unitNum" label="单元号">
+                  <el-table-column prop="unitNum"
+                                   label="单元号">
                   </el-table-column>
-                  <el-table-column prop="doorName" label="门牌号">
+                  <el-table-column prop="doorName"
+                                   label="门牌号">
                   </el-table-column>
-                  <el-table-column prop="houseType" label="类型">
+                  <el-table-column prop="houseType"
+                                   label="类型">
                   </el-table-column>
-                  <el-table-column prop="purpose" label="用途">
+                  <el-table-column prop="purpose"
+                                   label="用途">
                   </el-table-column>
-                  <el-table-column prop="rentFlag" label="是否出租">
+                  <el-table-column prop="rentFlag"
+                                   label="是否出租">
                   </el-table-column>
-                  <el-table-column prop="ownerName" label="房主姓名">
+                  <el-table-column prop="ownerName"
+                                   label="房主姓名">
                   </el-table-column>
-                  <el-table-column
+                  <el-table-column prop="ownerPhone"
-                    prop="ownerPhone"
                                    label="房主电话"
-                    width="110"
+                                   width="110">
-                  >
                   </el-table-column>
-                  <el-table-column
+                  <el-table-column prop="ownerIdCard"
-                    prop="ownerIdCard"
                                    label="身份证"
-                    width="170"
+                                   width="170">
-                  >
                   </el-table-column>
-                  <el-table-column
+                  <el-table-column label="操作"
-                    label="操作"
                                    fixed="right"
                                    header-align="center"
                                    align="center"
-                    class="operate"
+                                   class="operate">
-                  >
                     <template slot-scope="scope">
-                      <el-button
+                      <el-button type="text"
-                        type="text"
                                  style="color: #1c6afd; text-decoration: underline"
                                  size="small"
-                        @click="handleWatchSearchFangwu(scope.row)"
+                                 @click="handleWatchSearchFangwu(scope.row)">查看</el-button>
-                        >查看</el-button
-                      >
                     </template>
                   </el-table-column>
                 </el-table>
                 <div>
-                  <el-pagination
+                  <el-pagination @size-change="handleSizeChangeSearchFangwu"
-                    @size-change="handleSizeChangeSearchFangwu"
                                  @current-change="handleCurrentChangeSearchFangwu"
                                  :current-page.sync="searchFangwu.pageNo"
                                  :page-sizes="[20, 50, 100, 200]"
                                  :page-size="parseInt(searchFangwu.pageSize)"
                                  layout="sizes, prev, pager, next"
-                    :total="searchFangwu.total"
+                                 :total="searchFangwu.total">
-                  >
                   </el-pagination>
                 </div>
               </div>
             </div>
 
-            <div
+            <div class="m-tb"
-              class="m-tb"
                  v-if="
                 searchData.type == 'xuqiu' &&
                 searchData.keyword != '' &&
                 searchStatus == 'ing'
-              "
+              ">
-            >
               <div class="tb">
-                <el-table
+                <el-table :data="searchXuqiu.list"
-                  :data="searchXuqiu.list"
                           v-loading="searchXuqiu.loading"
                           border
                           :max-height="1000"
-                  style="width: 100%"
+                          style="width: 100%">
-                >
+                  <el-table-column label="序号"
-                  <el-table-column
-                    label="序号"
                                    type="index"
                                    align="center"
-                    width="50"
+                                   width="50" />
-                  />
 
-                  <el-table-column
+                  <el-table-column v-for="item in searchXuqiu.header"
-                    v-for="item in searchXuqiu.header"
                                    :key="item.columnName"
                                    :prop="item.columnName"
                                    :label="item.label"
                                    :align="item.align"
                                    :width="item.width"
-                    :show-overflow-tooltip="true"
+                                   :show-overflow-tooltip="true">
-                  >
                     <template slot-scope="scope">
                       <span>{{ handleFilterSpan(scope.row, item) }}</span>
                     </template>
                   </el-table-column>
 
-                  <el-table-column
+                  <el-table-column label="操作"
-                    label="操作"
                                    fixed="right"
                                    header-align="center"
                                    align="center"
-                    class="operate"
+                                   class="operate">
-                  >
                     <template slot-scope="scope">
-                      <el-button
+                      <el-button type="text"
-                        type="text"
                                  style="color: #1c6afd; text-decoration: underline"
                                  size="small"
-                        @click="handleWatchSearchXuqiu(scope.row)"
+                                 @click="handleWatchSearchXuqiu(scope.row)">查看</el-button>
-                        >查看</el-button
-                      >
                     </template>
                   </el-table-column>
                 </el-table>
                 <div>
-                  <el-pagination
+                  <el-pagination @size-change="handleSizeChangeSearchXuqiu"
-                    @size-change="handleSizeChangeSearchXuqiu"
                                  @current-change="handleCurrentChangeSearchXuqiu"
                                  :current-page.sync="searchXuqiu.pageNo"
                                  :page-sizes="[20, 50, 100, 200]"
                                  :page-size="parseInt(searchXuqiu.pageSize)"
                                  layout="sizes, prev, pager, next"
-                    :total="searchXuqiu.total"
+                                 :total="searchXuqiu.total">
-                  >
                   </el-pagination>
                 </div>
               </div>
             </div>
 
-            <div
+            <div class="m-tb"
-              class="m-tb"
                  v-if="
                 searchData.type == 'xuqiu' &&
                 searchData.keyword != '' &&
                 searchStatus == 'ing'
-              "
+              ">
-            >
               <div class="tb"></div>
             </div>
 
-            <div class="m-list" v-if="searchStatus == 'ini'">
+            <div class="m-list"
+                 v-if="searchStatus == 'ini'">
               <div class="list-title">常用功能</div>
               <div class="list">
-                <div
+                <div class="item"
-                  class="item"
                      :key="item.menuId"
                      @click="handleClickFunc(item)"
-                  v-for="item in funcList"
+                     v-for="item in funcList">
-                >
                   <div class="icon">
-                    <svg
+                    <svg class="icon-svg aui-sidebar__menu-icon"
-                      class="icon-svg aui-sidebar__menu-icon"
+                         aria-hidden="true">
-                      aria-hidden="true"
-                    >
                       <use :xlink:href="`#${item.icon}`" />
                     </svg>
                   </div>
                   <p>{{ item.menuName }}</p>
                 </div>
 
-                <div class="item" @click="showedFuncPanel = true">
+                <div class="item"
+                     @click="showedFuncPanel = true">
                   <div class="icon">
-                    <img
+                    <img src="@/assets/img/shequ/function/tianjiayingyong.png" />
-                      src="@/assets/img/shequ/function/tianjiayingyong.png"
-                    />
                   </div>
                   <p>添加应用</p>
                 </div>
@@ -321,21 +270,22 @@
           </div>
         </div>
 
-        <div class="m-data" v-if="searchStatus == 'ini'">
+        <div class="m-data"
+             v-if="searchStatus == 'ini'">
           <div class="wrap">
             <div class="header">
               <div class="headline">人员预警</div>
 
-              <div class="notice" v-if="noticeList.length > 0">
+              <div class="notice"
-                <div class="notice-btn" @click="toNoticeInfo">通知</div>
+                   v-if="noticeList.length > 0">
+                <div class="notice-btn"
+                     @click="toNoticeInfo">通知</div>
                 <div class="notice-list">
                   <scroll-notice :list="noticeList">
-                    <a
+                    <a class="notice-item"
-                      class="notice-item"
                        v-for="(item, index) in noticeList"
                        :key="item.configId + item.buildingId + index"
-                      @click="toNoticeInfo(item)"
+                       @click="toNoticeInfo(item)">
-                    >
                       {{ item.noticeContent }}
                     </a>
                   </scroll-notice>
@@ -345,59 +295,55 @@
 
             <div class="cnt">
               <div class="chart">
-                <bar-chart
+                <bar-chart :width="520"
-                  :width="520"
                            :height="420"
                            v-if="warningChart.loading"
                            :total="warningChart.total"
                            :list="warningChart.list"
-                  @clickBar="changeCategoryCode"
+                           @clickBar="changeCategoryCode" />
-                />
               </div>
               <div class="tb">
-                <el-table
+                <el-table :data="warningTb.list"
-                  :data="warningTb.list"
                           border
                           style="width: 100%"
                           class="resi-table"
-                  :max-height="maxTableHeight"
+                          :max-height="maxTableHeight">
-                >
+                  <el-table-column label="序号"
-                  <el-table-column
-                    label="序号"
                                    type="index"
                                    align="center"
-                    width="50"
+                                   width="50" />
-                  />
+                  <el-table-column prop="typeName"
-                  <el-table-column prop="typeName" label="类型">
+                                   label="类型">
                   </el-table-column>
-                  <el-table-column prop="gridName" label="所属网格">
+                  <el-table-column prop="gridName"
+                                   label="所属网格">
                   </el-table-column>
-                  <el-table-column prop="name" label="姓名"> </el-table-column>
+                  <el-table-column prop="name"
-                  <el-table-column prop="family" label="所属家庭">
+                                   label="姓名"> </el-table-column>
+                  <el-table-column prop="family"
+                                   label="所属家庭">
                   </el-table-column>
-                  <el-table-column prop="mobile" label="电话">
+                  <el-table-column prop="mobile"
+                                   label="电话">
                   </el-table-column>
-                  <el-table-column fixed="right" label="操作" align="center">
+                  <el-table-column fixed="right"
+                                   label="操作"
+                                   align="center">
                     <template slot-scope="scope">
-                      <el-button
+                      <el-button @click="handleWatchWarning(scope.$index)"
-                        @click="handleWatchWarning(scope.$index)"
                                  type="text"
-                        size="small"
+                                 size="small">查看</el-button>
-                        >查看</el-button
-                      >
                     </template>
                   </el-table-column>
                 </el-table>
                 <div>
-                  <el-pagination
+                  <el-pagination @size-change="handleSizeChangeWarning"
-                    @size-change="handleSizeChangeWarning"
                                  @current-change="handleCurrentChangeWarning"
                                  :current-page.sync="warningTb.pageNo"
                                  :page-sizes="[20, 50, 100, 200]"
                                  :page-size="parseInt(warningTb.pageSize)"
-                    layout="sizes, prev, pager, next"
+                                 layout="sizes, prev, pager, next, total"
-                    :total="warningTb.total"
+                                 :total="warningTb.total">
-                  >
                   </el-pagination>
                 </div>
               </div>
@@ -407,35 +353,27 @@
       </div>
 
       <!-- 修改弹出框 -->
-      <div
+      <div v-show="showedFuncPanel"
-        v-show="showedFuncPanel"
            v-if="
           Array.isArray($store.state.sidebarMenuList) &&
           $store.state.sidebarMenuList.length > 0
-        "
+        ">
-      >
         <div class="m-panel">
-          <div
+          <div class="m-list"
-            class="m-list"
+               v-if="selectedFuncList && selectedFuncList.length > 0">
-            v-if="selectedFuncList && selectedFuncList.length > 0"
-          >
             <div class="list-title">常用功能</div>
             <div class="list">
-              <div
+              <div class="item"
-                class="item"
                    :key="item.menuId"
                    @click="selectFuncItem(item.menuId)"
-                v-for="item in selectedFuncList"
+                   v-for="item in selectedFuncList">
-              >
                 <div class="corner-mark z-on">
                   <i class="el-icon-success"></i>
                 </div>
 
                 <div class="icon">
-                  <svg
+                  <svg class="icon-svg aui-sidebar__menu-icon"
-                    class="icon-svg aui-sidebar__menu-icon"
+                       aria-hidden="true">
-                    aria-hidden="true"
-                  >
                     <use :xlink:href="`#${item.icon}`" />
                   </svg>
                 </div>
@@ -447,33 +385,25 @@
           <div class="m-list">
             <div class="list-title">所有功能</div>
 
-            <div
+            <div :key="'one' + menu.id"
-              :key="'one' + menu.id"
                  v-show="menu.children && menu.children.length > 0"
-              v-for="menu in $store.state.sidebarMenuList"
+                 v-for="menu in $store.state.sidebarMenuList">
-            >
               <div class="list-title2">{{ menu.name }}</div>
               <div class="list">
-                <div
+                <div class="item"
-                  class="item"
                      :key="'two' + item.id"
                      @click="selectFuncItem(item.id)"
-                  v-for="item in menu.children"
+                     v-for="item in menu.children">
-                >
+                  <div class="corner-mark"
-                  <div
-                    class="corner-mark"
                        :class="{
                       'z-on': selectedFuncIdList.indexOf(item.id) !== -1,
-                    }"
+                    }">
-                  >
                     <i class="el-icon-success"></i>
                   </div>
 
                   <div class="icon">
-                    <svg
+                    <svg class="icon-svg aui-sidebar__menu-icon"
-                      class="icon-svg aui-sidebar__menu-icon"
+                         aria-hidden="true">
-                      aria-hidden="true"
-                    >
                       <use :xlink:href="`#${item.icon}`" />
                     </svg>
                   </div>
@@ -484,10 +414,11 @@
           </div>
 
           <div class="operate">
-            <el-button round @click="showedFuncPanel = false">返回</el-button>
+            <el-button round
-            <el-button type="primary" round @click="editFuncList"
+                       @click="showedFuncPanel = false">返回</el-button>
-              >确认</el-button
+            <el-button type="primary"
-            >
+                       round
+                       @click="editFuncList">确认</el-button>
           </div>
         </div>
       </div>
@@ -500,47 +431,35 @@
         <span>人员预警</span>
       </div>
 
-      <warning-list
+      <warning-list :buildingId="currentNoticeBuildingId"
-        :buildingId="currentNoticeBuildingId"
+                    :configId="currentNoticeConfigId" />
-        :configId="currentNoticeConfigId"
-      />
     </div>
 
-    <people-more
+    <people-more v-if="showedPeopleMoreInfo && currentPepeleId"
-      v-if="showedPeopleMoreInfo && currentPepeleId"
                  :userId="currentPepeleId"
                  :gridName="currentPepeleGridName"
-      @close="showedPeopleMoreInfo = false"
+                 @close="showedPeopleMoreInfo = false" />
-    />
 
     <!-- 修改弹出框 -->
-    <el-dialog
+    <el-dialog :visible.sync="showedFangwuInfo"
-      :visible.sync="showedFangwuInfo"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                title="房屋详情"
                width="900px"
-      @closed="showedFangwuInfo = false"
+               @closed="showedFangwuInfo = false">
-    >
+      <fangwu-info ref="fangwu_info"
-      <fangwu-info
+                   @dialogCancle="showedFangwuInfo = false"></fangwu-info>
-        ref="fangwu_info"
-        @dialogCancle="showedFangwuInfo = false"
-      ></fangwu-info>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog
+    <el-dialog :visible.sync="showedXuqiuInfo"
-      :visible.sync="showedXuqiuInfo"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                title="需求详情"
                width="900px"
-      @closed="showedXuqiuInfo = false"
+               @closed="showedXuqiuInfo = false">
-    >
+      <xuqiu-info ref="xuqiu_info"
-      <xuqiu-info
+                  @dialogCancle="showedXuqiuInfo = false"></xuqiu-info>
-        ref="xuqiu_info"
-        @dialogCancle="showedXuqiuInfo = false"
-      ></xuqiu-info>
     </el-dialog>
   </div>
 </template>
@@ -566,7 +485,7 @@ export default {
     scrollNotice,
   },
 
-  data() {
+  data () {
     return {
       searchStatus: "ini", //ing over
       searchData: {
@@ -763,7 +682,7 @@ export default {
     };
   },
   computed: {
-    selectedFuncList() {
+    selectedFuncList () {
       const {
         selectedFuncIdList,
         $store: {
@@ -795,7 +714,7 @@ export default {
       });
       return selectedFuncIdList.map((id) => obj[id]);
     },
-    maxTableHeight() {
+    maxTableHeight () {
       // return this.clientHeight - 450;
       return 420;
     },
@@ -808,7 +727,7 @@ export default {
       }
     },
   },
-  mounted() {
+  mounted () {
     this.getApiData();
     console.log(
       "dynamicMenuRoutes----------------------------",
@@ -816,18 +735,18 @@ export default {
     );
   },
   methods: {
-    changeCategoryCode({ code }) {
+    changeCategoryCode ({ code }) {
       this.currentCategoryCode = code || "";
 
       this.warningTb.pageNo = 1;
       this.getWarningTb();
     },
 
-    computedWidth(label) {
+    computedWidth (label) {
       const wd = 20 * label.length;
       return wd > 80 ? wd : 80;
     },
-    handleFilterSpan(row, item) {
+    handleFilterSpan (row, item) {
       let _val = "";
       if (item.options && item.options.length > 0) {
         item.options.forEach((n) => {
@@ -837,7 +756,7 @@ export default {
       return _val || row[item.columnName];
     },
 
-    handleClickSearchBtn() {
+    handleClickSearchBtn () {
       const {
         searchData: { type, keyword },
       } = this;
@@ -858,18 +777,18 @@ export default {
       this.searchStatus = "ing";
     },
 
-    handleSizeChangeWarning(val) {
+    handleSizeChangeWarning (val) {
       console.log(`每页 ${val} 条`);
       this.warningTb.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getWarningTb();
     },
-    handleCurrentChangeWarning(val) {
+    handleCurrentChangeWarning (val) {
       console.log(`当前页: ${val}`);
       this.warningTb.pageNo = val;
       this.getWarningTb();
     },
-    async handleWatchWarning(rowIndex) {
+    async handleWatchWarning (rowIndex) {
       let item = this.warningTb.list[rowIndex];
       this.currentPepeleId = item.userId;
       this.currentPepeleGridName = item.gridName;
@@ -877,18 +796,18 @@ export default {
       this.showedPeopleMoreInfo = true;
     },
 
-    handleSizeChangeSearchJumin(val) {
+    handleSizeChangeSearchJumin (val) {
       console.log(`每页 ${val} 条`);
       this.searchJumin.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getSearchJumin();
     },
-    handleCurrentChangeSearchJumin(val) {
+    handleCurrentChangeSearchJumin (val) {
       console.log(`当前页: ${val}`);
       this.searchJumin.pageNo = val;
       this.getSearchJumin();
     },
-    async handleWatchSearchJumin(rowIndex) {
+    async handleWatchSearchJumin (rowIndex) {
       let item = this.searchJumin.list[rowIndex];
       this.currentPepeleId = item.icResiUserId;
       this.currentPepeleGridName = item.GRID_ID;
@@ -896,41 +815,41 @@ export default {
       this.showedPeopleMoreInfo = true;
     },
 
-    handleSizeChangeSearchFangwu(val) {
+    handleSizeChangeSearchFangwu (val) {
       console.log(`每页 ${val} 条`);
       this.searchFangwu.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getSearchFangwu();
     },
-    handleCurrentChangeSearchFangwu(val) {
+    handleCurrentChangeSearchFangwu (val) {
       console.log(`当前页: ${val}`);
       this.searchFangwu.pageNo = val;
       this.getSearchFangwu();
     },
-    async handleWatchSearchFangwu(row) {
+    async handleWatchSearchFangwu (row) {
       this.showedFangwuInfo = true;
       await nextTick();
       this.$refs.fangwu_info.initForm("detail", row);
     },
 
-    handleSizeChangeSearchXuqiu(val) {
+    handleSizeChangeSearchXuqiu (val) {
       console.log(`每页 ${val} 条`);
       this.searchXuqiu.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getSearchXuqiu();
     },
-    handleCurrentChangeSearchXuqiu(val) {
+    handleCurrentChangeSearchXuqiu (val) {
       console.log(`当前页: ${val}`);
       this.searchXuqiu.pageNo = val;
       this.getSearchXuqiu();
     },
-    async handleWatchSearchXuqiu(row) {
+    async handleWatchSearchXuqiu (row) {
       this.showedXuqiuInfo = true;
       await nextTick();
       this.$refs.xuqiu_info.initForm("detail", row);
     },
 
-    handleClickFunc(menu) {
+    handleClickFunc (menu) {
       const menuId = menu.menuId;
       var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter(
         (item) => item.meta.menuId === menuId
@@ -940,7 +859,7 @@ export default {
       }
     },
 
-    getApiData() {
+    getApiData () {
       this.getFuncList();
       this.getWarningList();
       this.getWarningTb();
@@ -948,7 +867,7 @@ export default {
       this.getNoticeList();
     },
 
-    selectFuncItem(id) {
+    selectFuncItem (id) {
       let index = this.selectedFuncIdList.indexOf(id);
       if (index === -1) {
         this.selectedFuncIdList.push(id);
@@ -957,7 +876,7 @@ export default {
       }
     },
 
-    toNoticeInfo(item) {
+    toNoticeInfo (item) {
       console.log(item);
       this.currentPage = "yujing";
       if (item) {
@@ -969,7 +888,7 @@ export default {
       }
     },
 
-    async getNoticeList() {
+    async getNoticeList () {
       const url = "/epmetuser/statsresiwarn/queryuserwarnnotice";
       const { data, code, msg } = await requestPost(url, {
         agencyId: this.$store.state.user.agencyId,
@@ -981,7 +900,7 @@ export default {
       }
     },
 
-    async getSearchJuminHeader() {
+    async getSearchJuminHeader () {
       const url = "/oper/customize/icform/tableheaders";
       const { data, code, msg } = await requestPost(url, {
         formCode: "resi_base_info",
@@ -994,7 +913,7 @@ export default {
       }
     },
 
-    async getSearchXuqiu() {
+    async getSearchXuqiu () {
       const url = "/heart/userdemand/search";
       const {
         searchData: { keyword },
@@ -1017,7 +936,7 @@ export default {
       }
     },
 
-    async getSearchJumin() {
+    async getSearchJumin () {
       const url = "/epmetuser/icresiuser/search";
       const {
         searchData: { keyword },
@@ -1040,7 +959,7 @@ export default {
       }
     },
 
-    async getSearchFangwu() {
+    async getSearchFangwu () {
       const url = "/gov/org/house/search";
       const {
         searchData: { keyword },
@@ -1063,7 +982,7 @@ export default {
       }
     },
 
-    async getWarningTb() {
+    async getWarningTb () {
       const url = "/epmetuser/icresiuser/personwarn/rightlist";
       const {
         warningTb: { pageSize, pageNo },
@@ -1087,7 +1006,7 @@ export default {
     },
 
     //加载组织数据
-    async getWarningList() {
+    async getWarningList () {
       const url = "/epmetuser/icstatsresiwarn/personwarn/leftpie";
       let params = {};
 
@@ -1110,7 +1029,7 @@ export default {
     },
 
     //加载组织数据
-    async getFuncList() {
+    async getFuncList () {
       const url = "/gov/access/icoftenusefunction/oftenusefunctionlist";
       let params = {};
 
@@ -1125,7 +1044,7 @@ export default {
     },
 
     //加载组织数据
-    async editFuncList() {
+    async editFuncList () {
       const url = "/gov/access/icoftenusefunction/addoftenusefunction";
       const { selectedFuncIdList } = this;
       let params = selectedFuncIdList.map((menuId, sort) => {