Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-01-25 b95ee46a0a669a14ce3d8af8e195f807072847a3

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/api/userHouse/list/houseHold.js

@@ -24,6 +24,16 @@
  })
}

export const getlabelStatistics = (params) => {
  return request({
    url: '/api/blade-household/household/getlabelStatistics',
    method: 'get',
    params: {
      ...params
    }
  })
}

export const getAllHouseHold = (params) => {
  return request({
    url: '/api/blade-household/household/getAllHouseHold',

 src/views/propertySupervision/residentSupervision.vue

@@ -8,14 +8,14 @@
        </div>

        <div class="cur-from-box">
            <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
                v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
      <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" v-model="form"
        :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
                :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
                @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
                @refresh-change="refreshChange" @on-load="onLoad">
                <template slot-scope="{row, size}" slot="menu">
                    <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
                        v-if="permission.househould_manager" @click="manageLabel(row)">标签
          <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" v-if="permission.househould_manager"
            @click="manageLabel(row)">标签
                    </el-button>
                </template>
                <template slot-scope="{row, size}" slot="phoneNumber">
@@ -81,6 +81,7 @@
<script>
import {
    getKeynotePersonnelPage,
    getlabelStatistics,
    remove,
    add,
    update,
@@ -850,7 +851,7 @@
        }
    },
    mounted () {
        this.getLabelCount()
      // this.getLabelCount()

    },
    methods: {
@@ -1072,8 +1073,16 @@
        },

        onLoad (page, params = {}) {
            this.query.parentId = 100
        // this.query.parentId = 100
            this.loading = true
        getlabelStatistics(Object.assign(params, this.query)).then(res => {
          const data = res.data.data
          let list = data[0].children
          this.labelCountList = list
          this.$nextTick(() => {
            this.setEchartsOption(list)
          })
        })
            getKeynotePersonnelPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
                const data = {
                    ...res.data.data,
@@ -1122,8 +1131,7 @@
                    length2: 0,
                    maxSurfaceAngle: 80
                },
                series: [
                    {
          series: [{
                        type: 'pie',
                        center: ['36%', '50%'],
                        radius: '80%', //修改大小
@@ -1136,8 +1144,7 @@
                                shadowColor: 'rgba(0, 0, 0, 0.5)'
                            }
                        }
                    }
                ]
          }]
            }
            let myEchart = document.getElementsByClassName('echarts-item') //获取类名
            for (let i = 0, ii = data.length; i < ii; i++) {
@@ -1172,6 +1179,7 @@
                })
            }


        }
    }
}