From e37950d54b9b1a65b4f5337fe5ac44a05011e932 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 28 Mar 2022 09:54:18 +0800
Subject: [PATCH] 28552

---
 .../jianping/AppAssessment/AppAssessment.vue  | 642 +-----------------
 .../AppAssessment/components/List.vue         | 119 ++++
 .../AppAssessment/components/Statistics.vue   | 339 +++++++++
 .../AppVisitToVerify/components/Detail.vue    |   8 +-
 .../AppMonitorManage/AppMonitorManage.vue     |   2 +-
 .../monitor/components/deviceSlider.vue       |   3 +-
 6 files changed, 499 insertions(+), 614 deletions(-)
 create mode 100644 packages/jianping/AppAssessment/components/List.vue
 create mode 100644 packages/jianping/AppAssessment/components/Statistics.vue

diff --git a/packages/jianping/AppAssessment/AppAssessment.vue b/packages/jianping/AppAssessment/AppAssessment.vue
index 60fdc4db..09d4522b 100644
--- a/packages/jianping/AppAssessment/AppAssessment.vue
+++ b/packages/jianping/AppAssessment/AppAssessment.vue
@@ -1,640 +1,66 @@
 <template>
-  <ai-list class="AppAssessment">
-    <template slot="title">
-      <ai-title title="工作考核" isShowBottomBorder :hideLevel="hideLevel" :isShowArea="true" v-model="search.areaId" :instance="instance" @change="onChange"></ai-title>
-    </template>
-    <template slot="content">
-      <div class="statistics-top">
-        <div class="statistics-top__item">
-          <span>监测家庭户数</span>
-          <h2 style="color: #2266FF;">{{ totalInfo['监测家庭户数'] }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>监测对象总数</span>
-          <h2 style="color: #22AA99;">{{ totalInfo['监测对象总数'] }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>解除风险人数</span>
-          <h2 style="color: #F8B425">{{ totalInfo['解除风险人数'] }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>解除风险户数</span>
-          <h2 style="color: red">{{ totalInfo['解除风险户数'] }}</h2>
-        </div>
-      </div>
-      <div class="info">
-        <ai-card title="饮用水和三保障情况">
-          <template #content>
-            <ai-wrapper label-width="120px">
-              <ai-info-item label="住房安全" :value="info.title"></ai-info-item>
-              <ai-info-item label="饮水安全" :value="info.publishUnitName"></ai-info-item>
-              <ai-info-item label="失学辍学" :value="info.title"></ai-info-item>
-              <ai-info-item label="未参加医疗保险" :value="info.publishUnitName"></ai-info-item>
-              <ai-info-item label="低于家庭收入" :value="info.title"></ai-info-item>
-              <ai-info-item label="低于人均收入" :value="info.publishUnitName"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="信息采集进度">
-          <template #content>
-            <div class="progress-wrapper">
-              <div class="progress">
-                <div class="item" v-for="(item, index) in 10" :key="index">
-                  <h2>网格</h2>
-                  <el-progress :percentage="99"></el-progress>
-                </div>
-              </div>
-            </div>
-          </template>
-        </ai-card>
-      </div>
-      <ai-card title="帮扶走访情况">
-        <template #content>
-          <ai-search-bar bottomBorder>
-            <template #left>
-              <el-date-picker
-                value-format="yyyy-MM-dd"
-                v-model="search.beginDate"
-                type="date"
-                size="small"
-                unlink-panels
-                placeholder="请选择开始日期"
-                @change="search.current = 1, getList()" />
-              <el-date-picker
-                value-format="yyyy-MM-dd"
-                v-model="search.endDate"
-                type="date"
-                size="small"
-                unlink-panels
-                placeholder="请选择结束日期"
-                @change="search.current = 1, getList()" />
-              <ai-select
-                v-model="search.isGird"
-                clearable
-                placeholder="请选择是否关联网格"
-                :selectList="visitDict"
-                @change="search.current = 1, getList()">
-              </ai-select>
-              <ai-select
-                v-model="search.isVisit"
-                clearable
-                placeholder="请选择走访次数"
-                :selectList="girdDict"
-                @change="search.current = 1, getList()">
-              </ai-select>
-              <!-- <ai-download :instance="instance" url="/app/apppreventionreturntopovertyriskperson/export" :params="search" fileName="帮扶走访" :disabled="tableData.length == 0">
-                <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
-              </ai-download> -->
-            </template>
-            <template #right>
-              <el-input
-                v-model="search.name"
-                size="small"
-                placeholder="户主姓名/身份证号/网格员"
-                clearable
-                v-throttle="() => {search.current = 1, getList()}"
-                @clear="search.current = 1, search.name = '', getList()"
-                suffix-icon="iconfont iconSearch">
-              </el-input>
-            </template>
-          </ai-search-bar>
-          <ai-table
-            :tableData="tableData"
-            :col-configs="colConfigs"
-            :total="total"
-            tableSize="small"
-            border
-            style="margin-top: 12px;"
-            :current.sync="search.current"
-            :size.sync="search.size"
-            @selection-change="(v) => (ids = v.map((e) => e.id))"
-            @getList="getList">
-          </ai-table>
-        </template>
-      </ai-card>
-    </template>
-  </ai-list>
+  <div class="doc-circulation ailist-wrapper">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
 </template>
 
 <script>
-  import { mapState } from 'vuex'
+  import Statistics from './components/Statistics'
+  import List from './components/List'
+
   export default {
     name: 'AppAssessment',
     label: '工作考核',
+
     props: {
       instance: Function,
       dict: Object
     },
 
-    data() {
+    data () {
       return {
-        search: {
-          current: 1,
-          size: 10,
-          name: '',
-          areaId: '',
-          beginDate: '',
-          endDate: '',
-          isVisit: '',
-          isGird: ''
-        },
-        visitDict: [{
-          dictName: '否',
-          dictValue: '0'
-        }, {
-          dictName: '是',
-          dictValue: '1'
-        }],
-        girdDict: [{
-          dictName: '等于0次',
-          dictValue: '0'
-        }, {
-          dictName: '大于0次',
-          dictValue: '1'
-        }],
-        info: {
-
-        },
-        ids: [],
-        total: 10,
-        hideLevel: 3,
-        totalInfo: {},
-        tableData: []
+        component: 'Statistics',
+        params: {},
+        include: []
       }
     },
 
-    computed: {
-      ...mapState(['user']),
-
-      colConfigs () {
-        return [
-          { prop: 'name', label: '户主姓名', align: 'left' },
-          { prop: 'sex', label: '性别', align: 'center', formart: v => this.dict.getLabel('sex', v) },
-          { prop: 'idNumber', label: '身份证号', align: 'center' },
-          { prop: 'householdPhone', label: '户主联系方式', align: 'center' },
-          { prop: 'address', label: '家庭住址', align: 'center' },
-          { prop: 'status', label: '状态', align: 'center', formart: v => this.dict.getLabel('fpRiskPersonStatus', v) },
-          { prop: 'girdMemberName', label: '网格员', align: 'center' },
-          { prop: 'girdMemberPhone', label: '网格员电话', align: 'center' },
-          { prop: 'visitCount', label: '走访次数', align: 'center' }
-        ]
-      }
+    components: {
+      Statistics,
+      List
     },
 
-    created () {
-      this.search.areaId = this.user.info.areaId
-      this.hideLevel = this.user.info.areaList.length - 1
-
-      this.dict.load('fpRiskPersonStatus', 'sex').then(() => {
-        this.getList()
-      })
-      this.getTotal()
+    mounted () {
     },
 
     methods: {
-      getList() {
-        this.instance.post(`/app/apppreventionreturntopovertylog/service-rating-list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
+      onChange (data) {
+        if (data.type === 'List') {
+          this.component = 'List'
+          this.params = data.params
+        }
 
-      onChange () {
-        this.getList()
-        this.getTotal()
-      },
+        if (data.type === 'Statistics') {
+          this.component = 'Statistics'
+          this.params = data.params
 
-      getTotal() {
-        this.instance.post(`/app/statistics/preventionreturntopoverty/povertyReportNumber`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.totalInfo = res.data
-          }
-        })
-      },
-
-      removeAll () {
-        var id = this.ids.join(',')
-        this.remove(id)
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appmininotice/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
             }
           })
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            id: id || ''
-          }
-        })
-      },
-
-      toAdd(id) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            id: id || ''
-          }
-        })
+        }
       }
     }
   }
 </script>
 
-<style lang="scss" scoped>
-  .AppAssessment {
-    .info {
-      display: flex;
-      justify-content: space-between;
-
-      .ai-card {
-        flex: 1;
-        height: 300px;
-        overflow-y: auto;
-
-        &:first-child {
-          margin-right: 20px;
-        }
-
-        .progress-wrapper {
-        }
-
-        .progress {
-          overflow-y: auto;
-          height: 190px;
-
-          .item {
-            display: flex;
-            align-items: center;
-            margin-bottom: 12px;
-
-            .el-progress {
-              flex: 1;
-            }
-
-            h2 {
-              margin-right: 10px;
-              font-size: 14px;
-              color: #333;
-            }
-          }
-        }
-      }
-    }
-
-    .statistics-top {
-      display: flex;
-      align-items: center;
-      margin-bottom: 20px;
-
-      & > div {
-        flex: 1;
-        height: 96px;
-        line-height: 1;
-        margin-right: 20px;
-        padding: 16px 24px;
-        background: #FFFFFF;
-        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
-        border-radius: 4px;
-
-        &:last-child {
-          margin-right: 0;
-        }
-
-        h3 {
-          font-size: 24px;
-        }
-
-        span {
-          display: block;
-          margin-bottom: 16px;
-          color: #888888;
-          font-size: 16px;
-        }
-      }
-    }
-    ::v-deep .ai-list__content {
-      width: 100%;
-      .ai-list__content--right {
-        width: 100%!important;
-
-        .ai-list__content--right-wrapper {
-          padding: 0!important;
-          background: transparent!important;
-          box-shadow: none!important;
-        }
-      }
-    }
-    ::v-deep.el-pager {
-      li.active + li {
-        border-left: 1px solid #D0D4DC;
-      }
-    } 
-
-    .newPagination {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      height: 64px;
-      padding: 0 40px!important;
-
-      .el-pagination {
-        width: 100%;
-        padding: 0;
-      }
-      ::v-deep .el-pager li.active {
-        background-color: #fff !important;
-        color: #2266FF !important;
-        border-color: #2266FF;
-      }
-
-      ::v-deep .el-pager li {
-        background-color: #fff;
-        border: solid 1px #d0d4dc;
-        margin-left: 8px;
-        border-radius: 4px !important;
-        line-height: 26px !important;
-      }
-
-      .paginationPre {
-        display: flex;
-        height: 28px;
-        line-height: 1;
-        font-size: 14px;
-        font-weight: normal;
-        align-items: center;
-
-        .pagination-btns {
-          display: flex;
-          align-items: center;
-          gap: 8px;
-          color: #2266FF !important;
-
-          ::v-deep span, ::v-deep div {
-            font-size: 12px;
-            cursor: pointer;
-            color: #2266FF !important;
-
-            &:hover {
-              opacity: 0.8;
-            }
-          }
-        }
-
-        .paginationPre-total {
-          font-size: 12px;
-          color: #555;
-
-          label {
-            padding: 0 2px;
-            font-weight: 700;
-          }
-        }
-
-        & > * + * {
-          margin-left: 24px;
-        }
-
-        ::v-deep .el-pagination button, .el-pagination span:not([class*=suffix]) {
-          line-height: 1 !important;
-        }
-
-        ::v-deep.el-checkbox {
-          padding-left: 14px;
-          display: flex;
-          align-items: center;
-
-          .el-checkbox__input, .el-checkbox__inner {
-            width: 14px;
-            height: 14px;
-            min-width: 0 !important;
-            line-height: 1 !important;
-          }
-
-          .el-checkbox__label {
-            font-size: 12px;
-            color: #222222;
-            height: auto !important;
-            line-height: 1 !important;
-            padding-left: 3px !important;
-          }
-        }
-      }
-    }
-
-    .form-list__list {
-      display: flex;
-      flex-wrap: wrap;
-      margin-top: 8px;
-
-      .list-item {
-        display: flex;
-        position: relative;
-        flex-direction: column;
-        justify-content: space-between;
-        margin-bottom: 12px;
-        padding: 18px 16px 16px;
-
-        .list-item__img {
-          width: 100%;
-          height: 140px;
-          cursor: pointer;
-
-          img {
-            width: 100%;
-            height: 140px;
-            object-fit: none;
-          }
-        }
-
-        &:hover {
-          .list-item__operate {
-            display: flex;
-          }
-        }
-
-        .list-item__operate {
-          display: none;
-          align-items: center;
-          position: absolute;
-          left: 0;
-          bottom: 0;
-          z-index: 1;
-          width: 100%;
-          height: 52px;
-          text-align: center;
-          background: #F7F8FA;
-
-          & > div {
-            flex: 1;
-          }
-
-          ::v-deep .el-button {
-            margin-left: 0;
-            padding: 0;
-            i {
-              color: #8899BB;
-              font-size: 14px;
-              transition: all 0.3s;
-            }
-
-            .el-button + .el-button {
-              margin-left: 0;
-            }
-
-            span {
-              margin-left: 0;
-              color: #555555;
-              font-size: 12px;
-              transition: all 0.3s;
-            }
-
-            &:hover {
-              &.is-disabled {
-                i {
-                  color: #8899BB;
-                }
-
-                span {
-                  color: #555555;
-                }
-              }
-            }
-          }
-
-          .list-item__operate--item {
-            flex: 1;
-
-            &:hover {
-              ::v-deep i, ::v-deep span {
-                color: #2266FF;
-              }
-            }
-          }
-        }
-
-        .list-item__bottom {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          color: #888888;
-          font-size: 12px;
-
-          i {
-            font-style: normal;
-          }
-
-          .left {
-            display: flex;
-            align-items: center;
-
-            .tag {
-              height: 26px;
-              line-height: 26px;
-              margin-right: 8px;
-              padding: 0 6px;
-              border-radius: 4px;
-              background: #42D784;
-              color: #fff;
-            }
-          }
-        }
-
-        p {
-          line-height: 22px;
-          color: #333333;
-          font-size: 14px;
-          font-weight: 700;
-        }
-
-        .list-item__user {
-          display: flex;
-          align-items: center;
-          margin-top: 12px;
-          color: #888888;
-          font-size: 12px;
-          line-height: 20px;
-
-          & > div:first-child {
-            margin-right: 8px;
-          }
-        }
-
-        .list-item__title {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          margin-bottom: 14px;
-
-          h2 {
-            color: #2EA222;
-            font-size: 12px;
-          }
-
-          span {
-            width: 64px;
-            height: 24px;
-            line-height: 24px;
-            text-align: center;
-            border-radius: 4px;
-            font-size: 12px;
-          }
-        }
-      }
-
-      .list-add {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        flex-direction: column;
-        padding: 0;
-        cursor: pointer;
-
-        span {
-          font-size: 32px;
-          color: #8899bb;
-        }
-
-        h2 {
-          color: #555555;
-          font-size: 12px;
-        }
-
-        &:hover {
-          opacity: 0.6;
-        }
-      }
-
-      & > div {
-        width: calc((100% - 60px) / 4);
-        height: 216px;
-        margin: 0 20px 20px 0;
-        background: #FFFFFF;
-        box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.05);
-        border-radius: 2px;
-
-        &:nth-of-type(4n) {
-          margin-right: 0;
-        }
-      }
-    }
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
   }
 </style>
diff --git a/packages/jianping/AppAssessment/components/List.vue b/packages/jianping/AppAssessment/components/List.vue
new file mode 100644
index 00000000..04a5bcd5
--- /dev/null
+++ b/packages/jianping/AppAssessment/components/List.vue
@@ -0,0 +1,119 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="走访排查情况统计" isShowBottomBorder :isShowArea="true" v-model="search.areaId" :instance="instance" @change="getList"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar>
+        <template #left>
+          <el-date-picker
+            value-format="yyyy-MM"
+            v-model="search.beginDate"
+            type="month"
+            size="small"
+            unlink-panels
+            placeholder="请选择考核开始月份"
+            @change="search.current = 1, getList()" />
+          <el-date-picker
+            value-format="yyyy-MM"
+            v-model="search.endDate"
+            type="month"
+            size="small"
+            unlink-panels
+            placeholder="请选择考核结束月份"
+            @change="search.current = 1, getList()" />
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.name"
+            size="small"
+            placeholder="网格员姓名"
+            clearable
+            v-throttle="() => {search.current = 1, getList()}"
+            @clear="search.current = 1, search.name = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 12px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @selection-change="(v) => (ids = v.map((e) => e.id))"
+        @getList="getList">
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          title: '',
+          areaId: '',
+          beginDate: '',
+          endDate: ''
+        },
+        ids: [],
+        total: 10,
+        tableData: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user']),
+
+      colConfigs () {
+        return [
+          { prop: 'title', label: '考核月份', align: 'left' },
+          { prop: 'createUserName', label: '网格员姓名', align: 'center' },
+          { prop: 'createTime', label: '网格员联系方式', align: 'center' },
+          { prop: 'createTime', label: '监测家庭数量', align: 'center' },
+          { prop: 'createUserName', label: '开展走访次数', align: 'center' },
+          { prop: 'createTime', label: '已走访家庭数量', align: 'center' },
+          { prop: 'createTime', label: '走访进度', align: 'center' }
+        ]
+      }
+    },
+
+    created () {
+      this.search.areaId = this.user.info.areaId
+      this.dict.load('epidemicRecentTestResult').then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appmininotice/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/packages/jianping/AppAssessment/components/Statistics.vue b/packages/jianping/AppAssessment/components/Statistics.vue
new file mode 100644
index 00000000..977bd967
--- /dev/null
+++ b/packages/jianping/AppAssessment/components/Statistics.vue
@@ -0,0 +1,339 @@
+<template>
+  <ai-list class="AppAssessment">
+    <template slot="title">
+      <ai-title title="工作考核" isShowBottomBorder :hideLevel="hideLevel" :isShowArea="true" v-model="search.areaId" :instance="instance" @change="onChange"></ai-title>
+    </template>
+    <template slot="content">
+      <div class="statistics-top">
+        <div class="statistics-top__item">
+          <span>监测家庭户数</span>
+          <h2 style="color: #2266FF;">{{ totalInfo['监测家庭户数'] }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>监测对象总数</span>
+          <h2 style="color: #22AA99;">{{ totalInfo['监测对象总数'] }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>解除风险人数</span>
+          <h2 style="color: #F8B425">{{ totalInfo['解除风险人数'] }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>解除风险户数</span>
+          <h2 style="color: red">{{ totalInfo['解除风险户数'] }}</h2>
+        </div>
+      </div>
+      <div class="info">
+        <ai-card title="饮用水和三保障情况">
+          <template #content>
+            <ai-wrapper label-width="120px">
+              <ai-info-item label="住房安全" :value="info.title"></ai-info-item>
+              <ai-info-item label="饮水安全" :value="info.publishUnitName"></ai-info-item>
+              <ai-info-item label="失学辍学" :value="info.title"></ai-info-item>
+              <ai-info-item label="未参加医疗保险" :value="info.publishUnitName"></ai-info-item>
+              <ai-info-item label="低于家庭收入" :value="info.title"></ai-info-item>
+              <ai-info-item label="低于人均收入" :value="info.publishUnitName"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="本月网格员走访进度">
+          <template #right>
+            <el-button type="text" @click="toList">全部</el-button>
+          </template>
+          <template #content>
+            <div class="progress-wrapper">
+              <div class="progress">
+                <div class="item" v-for="(item, index) in 10" :key="index">
+                  <h2>网格</h2>
+                  <el-progress :percentage="99"></el-progress>
+                </div>
+              </div>
+            </div>
+          </template>
+        </ai-card>
+      </div>
+      <ai-card title="帮扶走访情况">
+        <template #content>
+          <ai-search-bar bottomBorder>
+            <template #left>
+              <el-date-picker
+                value-format="yyyy-MM-dd"
+                v-model="search.beginDate"
+                type="date"
+                size="small"
+                unlink-panels
+                placeholder="请选择开始日期"
+                @change="search.current = 1, getList()" />
+              <el-date-picker
+                value-format="yyyy-MM-dd"
+                v-model="search.endDate"
+                type="date"
+                size="small"
+                unlink-panels
+                placeholder="请选择结束日期"
+                @change="search.current = 1, getList()" />
+              <ai-select
+                v-model="search.isGird"
+                clearable
+                placeholder="请选择是否关联网格"
+                :selectList="visitDict"
+                @change="search.current = 1, getList()">
+              </ai-select>
+              <ai-select
+                v-model="search.isVisit"
+                clearable
+                placeholder="请选择走访次数"
+                :selectList="girdDict"
+                @change="search.current = 1, getList()">
+              </ai-select>
+              <!-- <ai-download :instance="instance" url="/app/apppreventionreturntopovertyriskperson/export" :params="search" fileName="帮扶走访" :disabled="tableData.length == 0">
+                <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
+              </ai-download> -->
+            </template>
+            <template #right>
+              <el-input
+                v-model="search.name"
+                size="small"
+                placeholder="户主姓名/身份证号/网格员"
+                clearable
+                v-throttle="() => {search.current = 1, getList()}"
+                @clear="search.current = 1, search.name = '', getList()"
+                suffix-icon="iconfont iconSearch">
+              </el-input>
+            </template>
+          </ai-search-bar>
+          <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            tableSize="small"
+            border
+            style="margin-top: 12px;"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @selection-change="(v) => (ids = v.map((e) => e.id))"
+            @getList="getList">
+          </ai-table>
+        </template>
+      </ai-card>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'Statistics',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          name: '',
+          areaId: '',
+          beginDate: '',
+          endDate: '',
+          isVisit: '',
+          isGird: ''
+        },
+        visitDict: [{
+          dictName: '否',
+          dictValue: '0'
+        }, {
+          dictName: '是',
+          dictValue: '1'
+        }],
+        girdDict: [{
+          dictName: '等于0次',
+          dictValue: '0'
+        }, {
+          dictName: '大于0次',
+          dictValue: '1'
+        }],
+        info: {
+
+        },
+        ids: [],
+        total: 10,
+        hideLevel: 3,
+        totalInfo: {},
+        tableData: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user']),
+
+      colConfigs () {
+        return [
+          { prop: 'name', label: '户主姓名', align: 'left' },
+          { prop: 'sex', label: '性别', align: 'center', formart: v => this.dict.getLabel('sex', v) },
+          { prop: 'idNumber', label: '身份证号', align: 'center' },
+          { prop: 'householdPhone', label: '户主联系方式', align: 'center' },
+          { prop: 'address', label: '家庭住址', align: 'center' },
+          { prop: 'status', label: '状态', align: 'center', formart: v => this.dict.getLabel('fpRiskPersonStatus', v) },
+          { prop: 'girdMemberName', label: '网格员', align: 'center' },
+          { prop: 'girdMemberPhone', label: '网格员电话', align: 'center' },
+          { prop: 'visitCount', label: '走访次数', align: 'center' }
+        ]
+      }
+    },
+
+    created () {
+      this.search.areaId = this.user.info.areaId
+      this.hideLevel = this.user.info.areaList.length - 1
+
+      this.dict.load('fpRiskPersonStatus', 'sex').then(() => {
+        this.getList()
+      })
+      this.getTotal()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/apppreventionreturntopovertylog/service-rating-list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      onChange () {
+        this.getList()
+        this.getTotal()
+      },
+
+      getTotal() {
+        this.instance.post(`/app/statistics/preventionreturntopoverty/povertyReportNumber`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.totalInfo = res.data
+          }
+        })
+      },
+
+      removeAll () {
+        var id = this.ids.join(',')
+        this.remove(id)
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appmininotice/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      toList () {
+        this.$emit('change', {
+          type: 'List',
+          params: {
+            id: ''
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .AppAssessment {
+    .info {
+      display: flex;
+      justify-content: space-between;
+
+      .ai-card {
+        flex: 1;
+        height: 300px;
+        overflow-y: auto;
+
+        &:first-child {
+          margin-right: 20px;
+        }
+
+        .progress {
+          overflow-y: auto;
+          height: 190px;
+
+          .item {
+            display: flex;
+            align-items: center;
+            margin-bottom: 12px;
+
+            .el-progress {
+              flex: 1;
+            }
+
+            h2 {
+              margin-right: 10px;
+              font-size: 14px;
+              color: #333;
+            }
+          }
+        }
+      }
+    }
+
+    .statistics-top {
+      display: flex;
+      align-items: center;
+      margin-bottom: 20px;
+
+      & > div {
+        flex: 1;
+        height: 96px;
+        line-height: 1;
+        margin-right: 20px;
+        padding: 16px 24px;
+        background: #FFFFFF;
+        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
+        border-radius: 4px;
+
+        &:last-child {
+          margin-right: 0;
+        }
+
+        h3 {
+          font-size: 24px;
+        }
+
+        span {
+          display: block;
+          margin-bottom: 16px;
+          color: #888888;
+          font-size: 16px;
+        }
+      }
+    }
+
+    ::v-deep .ai-list__content {
+      width: 100%;
+      .ai-list__content--right {
+        width: 100%!important;
+
+        .ai-list__content--right-wrapper {
+          padding: 0!important;
+          background: transparent!important;
+          box-shadow: none!important;
+        }
+      }
+    }
+  }
+</style>
diff --git a/packages/jianping/AppVisitToVerify/components/Detail.vue b/packages/jianping/AppVisitToVerify/components/Detail.vue
index c5d0a965..8f165395 100644
--- a/packages/jianping/AppVisitToVerify/components/Detail.vue
+++ b/packages/jianping/AppVisitToVerify/components/Detail.vue
@@ -37,7 +37,7 @@
             <ai-info-item label="处理意见" :value="info.visitOpinion"></ai-info-item>
             <ai-info-item label="处理时间" :value="info.visitTime"></ai-info-item>
             <ai-info-item label="业务员" :value="info.visitUserName"></ai-info-item>
-            <ai-info-item label="照片">
+            <ai-info-item label="照片" isLine>
               <ai-uploader
                 disabled
                 :instance="instance"
@@ -54,7 +54,7 @@
             <ai-info-item label="处理意见" :value="info.auditOpinion"></ai-info-item>
             <ai-info-item label="处理时间" :value="info.auditTime"></ai-info-item>
             <ai-info-item label="业务员" :value="info.auditUserName"></ai-info-item>
-            <ai-info-item label="照片">
+            <ai-info-item label="照片" isLine>
               <ai-uploader
                 disabled
                 :instance="instance"
@@ -75,8 +75,8 @@
           <el-form-item label="处理意见" prop="operation" style="width: 100%;" :rules="[{ required: true, message: '请选择处理意见' }]">
             <el-radio-group v-model="form.operation">
               <el-radio label="0" v-if="checkType === '1'">疑似风险</el-radio>
-              <el-radio label="2" v-if="checkType === '2'">纳入监测</el-radio>
-              <el-radio label="1">解除风险</el-radio>
+              <el-radio label="1" v-if="checkType === '2'">纳入监测</el-radio>
+              <el-radio label="2">解除风险</el-radio>
             </el-radio-group>
             <!-- <span v-if="info.status != '2'">解除风险</span>
             <span v-if="info.status === '0' && checkType === '1'">疑似风险</span>
diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
index c76524ba..63a921ab 100644
--- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
+++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="AppMonitorManage">
-    <device-slider :show.sync="slider" :ins="instance" :dict="dict" @treeCommand="handleSliderOption" @select="handleSelectMonitor"
+    <device-slider :permissions="permissions" :show.sync="slider" :ins="instance" :dict="dict" @treeCommand="handleSliderOption" @select="handleSelectMonitor"
                    :render-item="renderTreeItem" ref="DeviceSlider"/>
     <div class="monitorPane">
       <div class="headerBar">
diff --git a/project/shandong10086/apps/shandong/monitor/components/deviceSlider.vue b/project/shandong10086/apps/shandong/monitor/components/deviceSlider.vue
index a0de9b05..9c5bc58b 100644
--- a/project/shandong10086/apps/shandong/monitor/components/deviceSlider.vue
+++ b/project/shandong10086/apps/shandong/monitor/components/deviceSlider.vue
@@ -32,7 +32,7 @@
               :style="{top: menuInfo.y + 'px', left: menuInfo.x + 'px', position: 'fixed', zIndex: 2023}"
               x-placement="top-end">
             <li class="el-dropdown-menu__item" @click="handleTreeCommand('edit', menuInfo.node)">修改名称</li>
-            <li class="el-dropdown-menu__item" @click="handleTreeCommand('area', menuInfo.node)">行政地区</li>
+            <!-- <li class="el-dropdown-menu__item" @click="handleTreeCommand('area', menuInfo.node)">行政地区</li> -->
             <li class="el-dropdown-menu__item" @click="handleTreeCommand('locate', menuInfo.node)">地图标绘</li>
           </ul>
       </div>
@@ -50,6 +50,7 @@ export default {
     show: Boolean,
     ins: Function,
     dict: Object,
+    permissions: Function,
     renderItem: Function
   },
   computed: {