diff --git a/src/views/components/screen-echarts-frame/index.vue b/src/views/components/screen-echarts-frame/index.vue
new file mode 100644
index 000000000..24fc5d6c8
--- /dev/null
+++ b/src/views/components/screen-echarts-frame/index.vue
@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <div v-show="!noData"
+         class="screenEchartsFrame"
+         ref="screenEchartsFrame"></div>
+    <screen-nodata v-show="noData"
+                   class="nodata"></screen-nodata>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import ScreenNodata from "@/views/modules/visual/components/screen-nodata";
+export default {
+  name: 'screen-echarts-frame',
+  data () {
+    return {
+      myChart: '',
+      noData: false,
+    }
+  },
+  props: {
+    chartMethod: {
+      type: Function
+    }
+  },
+  mounted () {
+    this.initChart()
+    window.onresize = () => {
+      this.myChart.resize()
+    }
+  },
+  beforeDestroy () {
+    // 销毁echarts实例对象
+    if (this.myChart) this.myChart.dispose()
+  },
+  watch: {},
+  components: {
+    ScreenNodata,
+
+  },
+  methods: {
+    initChart () {
+
+      this.$nextTick(() => {
+        const dom = this.$refs.screenEchartsFrame
+        this.myChart = echarts.init(dom)
+
+        // this.myChart.setOption(this.chartMethod());
+        this.$emit('myChartMethod', this.myChart)
+      })
+    },
+    //点击pie事件
+    handleClick (fun) {
+      this.myChart.on('click', fun);
+    },
+    //没有数据
+    setNoData (nodata) {
+
+      this.noData = nodata
+    },
+
+    //高亮
+    highLight (index) {
+      this.myChart.dispatchAction({
+        type: 'highlight',
+        seriesIndex: 1,
+        dataIndex: index
+      });
+    },
+    //取消高亮
+    downplay (index) {
+      this.myChart.dispatchAction({
+        type: 'downplay',
+        seriesIndex: 0,
+      });
+    },
+
+    // 配置option
+    setOption (option) {
+      this.myChart.setOption(option)
+    },
+    // 获取option
+    getOption () {
+      if (this.myChart) {
+        return this.myChart.getOption()
+      } else {
+        return null
+      }
+    },
+    //
+    resize () {
+      if (this.myChart) {
+        this.myChart.resize()
+      }
+    },
+    clear () {
+      if (this.myChart) {
+        this.myChart.clear()
+      }
+    },
+    showLoading () {
+      if (this.myChart) {
+        this.$nextTick(() => {
+          this.myChart.showLoading({
+            text: '',
+            color: '#29cdff',
+            textColor: '#29cdff',
+            maskColor: 'rgba(255, 255, 255, 0)',
+            zlevel: 0
+
+          })
+        })
+      }
+    },
+    hideLoading () {
+
+      if (this.myChart) {
+        this.myChart.hideLoading()
+      }
+    },
+    // 启动动画时使用
+    tooltipAnimate (chart, length) {
+      // 清除上一次动画
+      this.timeTicket && clearInterval(this.timeTicket)
+      const count = 0
+      // 启动动画
+      this._action(chart, count, length)
+      chart && // 移除动画
+        chart.on('mouseover', params => {
+          this._cleanAction(chart, params)
+        })
+      // 重写启动动画
+      chart &&
+        chart.on('mouseout', () => {
+          this._action(chart, count, length)
+        })
+    },
+    // tooltip动画action
+    _action (chart, count, length) {
+      this.timeTicket && clearInterval(this.timeTicket)
+      this.timeTicket = setInterval(() => {
+        if (!chart) {
+          clearInterval(this.timeTicket)
+          return
+        }
+        chart &&
+          chart.dispatchAction({
+            type: 'downplay',
+            seriesIndex: 0
+          })
+        chart &&
+          chart.dispatchAction({
+            type: 'highlight',
+            seriesIndex: 0,
+            dataIndex: count % length
+          })
+        chart &&
+          chart.dispatchAction({
+            type: 'showTip',
+            seriesIndex: 0,
+            dataIndex: count % length
+          })
+        count++
+      }, 1000 * 3)
+    },
+    _cleanAction (chart, params) {
+      this.timeTicket && clearInterval(this.timeTicket)
+      if (!chart) {
+        clearInterval(this.timeTicket)
+        return
+      }
+      chart &&
+        chart.dispatchAction({
+          type: 'downplay',
+          seriesIndex: 0
+        })
+      chart &&
+        chart.dispatchAction({
+          type: 'highlight',
+          seriesIndex: 0,
+          dataIndex: params.dataIndex
+        })
+      chart &&
+        chart.dispatchAction({
+          type: 'showTip',
+          seriesIndex: 0,
+          dataIndex: params.dataIndex
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.screenEchartsFrame {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/modules/communityParty/dyhx/crateForm copy.vue b/src/views/modules/communityParty/dyhx/crateForm copy.vue
new file mode 100644
index 000000000..ed8beee5a
--- /dev/null
+++ b/src/views/modules/communityParty/dyhx/crateForm copy.vue	
@@ -0,0 +1,425 @@
+<template>
+
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>党员信息</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleCancle">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <div class="m-top">
+
+          <div class="m-info-left">
+            <div class="m-info">
+              <div class="info-prop">
+                <span>所属党组织：</span>
+                <span>{{ form.orgName }}</span>
+              </div>
+              <div class="info-prop">
+                <span>姓名：</span>
+                <span>{{ form.name }}</span>
+              </div>
+              <div class="info-prop">
+                <span>手机号：</span>
+                <span>{{ form.showMobile }}</span>
+              </div>
+              <div class="info-prop">
+                <span>身份证：</span>
+                <span>{{ form.showIdCard }}</span>
+              </div>
+              <div class="info-prop">
+                <span>地址：</span>
+                <span>{{ form.address|| "--"  }}</span>
+              </div>
+              <div class="info-prop">
+                <span>流动党员：</span>
+                <span>{{ form.isLd==='1'?'是':'否' }}</span>
+              </div>
+
+              <div class="info-prop">
+                <span>备注：</span>
+                <span>{{ form.remark || "--" }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="m-info-right">
+            <div class="m-info">
+              <div class="info-prop">
+                <span>党员中心户：</span>
+                <span>{{ form.isDyzxh==='1'?'是':'否' }}</span>
+              </div>
+              <div class="info-prop">
+                <span>免学习：</span>
+                <span>{{ form.isMxx==='1'?'是':'否' }}</span>
+              </div>
+
+              <div class="info-prop">
+                <span>职务：</span>
+                <span>{{ form.postName|| "--"  }}</span>
+              </div>
+
+              <div class="info-prop">
+                <span>文化程度：</span>
+                <span>{{ form.cultureName || "--" }}</span>
+              </div>
+              <div class="info-prop">
+                <span>入党时间：</span>
+                <span>{{ form.rdsj || "--" }}</span>
+              </div>
+              <div class="info-prop">
+                <span>党员流动号：</span>
+                <span>{{ form.ldzh || "--" }}</span>
+              </div>
+
+            </div>
+          </div>
+
+        </div>
+
+        <div class="m-btn">
+          <div style="margin-top: 20px; text-align: center;">
+            <el-button size="small"
+                       :disabled="false"
+                       @click="handleCancle">取消</el-button>
+            <el-button v-if="form.icResiUser != null && form.icResiUser != ''"
+                       type="primary"
+                       :disabled="false"
+                       size="small"
+                       @click="jump(form.icResiUser)">查看更多</el-button>
+          </div>
+        </div>
+
+      </cpt-card>
+    </div>
+  </div>
+
+</template>
+
+<script>
+import { isCard, isMobile } from '@/utils/validate'
+import { computedCard } from '@/utils/index'
+import cptCard from "@/views/modules/visual/cpts/card";
+
+export default {
+  components: {
+    cptCard
+  },
+  props: {
+    partyList: {
+      type: Array,
+      default: () => []
+    },
+    info: {
+      type: Object,
+      default: () => { }
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    let checkMObile = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入手机号'))
+      } else {
+        if (!isMobile(value)) {
+          callback(new Error('手机号格式不正确'))
+        }
+        callback()
+      }
+    }
+    let checkIdCard = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入身份证'))
+      } else {
+        if (!isCard(value)) {
+          callback(new Error('身份证号格式不正确'))
+        }
+        callback()
+      }
+    }
+    return {
+      activesName: 'first',
+      isAuto: false,
+      formItemWd: '100%',
+      partymenberid: '',
+      partyProps: {
+        label: 'partyOrgName',
+        value: 'id',
+        emitPath: false
+      },
+      zwList: [
+        {
+          label: '普通党员',
+          value: '0'
+        },
+        {
+          label: '支部书记',
+          value: '1'
+        },
+        {
+          label: '支部委员',
+          value: '2'
+        },
+        {
+          label: '党委委员',
+          value: '3'
+        },
+      ],
+      form: {
+        icResiUser: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        address: '',
+        rdsj: '',
+        sszb: '',
+        isLd: '0',
+        ldzh: '',
+        partyZw: '0',
+        isDyzxh: '0',
+        isMxx: '0',
+        culture: '',
+        remark: ''
+      },
+      eduList: [],
+      rules: {
+        sszb: [{ required: true, message: '所属党组织不能为空', trigger: 'blur' }],
+        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+        idCard: [{ required: true, validator: checkIdCard, trigger: 'blur' }],
+      },
+      partyOrgs: []
+    }
+  },
+  watch: {
+    info: {
+      handler (val) {
+        if (Object.keys(val).length > 0) {
+          this.form = { ...val }
+          if (val.icResiUserId || val.icResiUser) this.isAuto = true
+          console.log('val----------in', val)
+          console.log('isAuto----------in', this.isAuto)
+          this.partyOrgs = val.orgPids.split(':')
+          console.log('partyOrgs-----', this.partyOrgs)
+          this.partymenberid = val.id
+        }
+      },
+      immediate: true
+    }
+  },
+  created () {
+    this.getEduList()
+    console.log('partyList', this.partyList)
+  },
+  mounted () {
+    // const w = document.getElementsByClassName('dialog-h-content')[0]
+    // this.formItemWd = w.clientWidth + 'px'
+  },
+  destroyed () {
+    // this.$refs['ruleForm'].resetFields()
+  },
+  methods: {
+
+
+    handleCancle () {
+      // this.$refs['ruleForm'].resetFields()
+      this.$emit('cancle')
+    },
+
+    handleValidBlur (n) {
+      if (!isCard(this.form.idCard)) return
+      const { age } = computedCard(this.form.idCard)
+      this.form.isMxx = age >= 70 ? '1' : '0'
+      this.validateResi()
+    },
+    async getEduList () {
+      await this.$http
+        .post('/sys/dict/data/education')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.eduList = res.data
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async validateResi () {
+      const params = {
+        idCard: this.form.idCard,
+        agencyId: this.$store.state.user.agencyId
+      }
+      await this.$http
+        .post('/epmetuser/icresiuser/getUserByIdCard', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            const { address, icResiUserId } = res.data
+            if (icResiUserId) {
+              this.form.address = address
+              this.isAuto = true
+            } else {
+              this.form.address = ''
+              this.isAuto = false
+            }
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    hadnleSubmitbase () {
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          if (Object.keys(this.info).length > 0) this.editBase()
+          else this.saveBase()
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    handleSavePoints (data) {
+
+      const _data = { ...data }
+      const params = {
+        ..._data,
+        baseOptions: data.baseOptions.length > 0 ? data.baseOptions.toString() : '',
+        reviewOptions: data.reviewOptions.length > 0 ? data.reviewOptions.toString() : '',
+        inspireOptions: data.inspireOptions.length > 0 ? data.inspireOptions.toString() : '',
+        warnOptions: data.warnOptions.length > 0 ? data.warnOptions.toString() : ''
+      }
+      this.savePoints(params)
+    },
+    async jump (icResiUserId) {
+      this.$emit('saveBase', icResiUserId)
+    },
+    async saveBase () {
+      const params = {
+        ...this.form
+      }
+      await this.$http
+        .post('/resi/partymember/icPartyMember/save', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('保存成功')
+            this.partymenberid = res.data
+            this.$emit('saveBase', true)
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async editBase () {
+      const params = {
+        ...this.form
+      }
+      await this.$http
+        .post('/resi/partymember/icPartyMember/update', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('保存成功')
+            this.partymenberid = res.data
+            this.$emit('saveBase', true)
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async savePoints (form) {
+      const params = {
+        ...form,
+        partyMemberId: this.partymenberid
+      }
+      let url = ''
+      if (form.id) url = '/resi/partymember/icPartyMemberPoint/update'
+      else url = '/resi/partymember/icPartyMemberPoint/save'
+      await this.$http
+        .post(url, params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('保存成功')
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async saveRecord (form) {
+      const params = {
+        ...form,
+        partyMemberId: this.partymenberid
+      }
+      await this.$http
+        .post('/resi/partymember/icPartyMemberPoint/save', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('保存成功')
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.input-width-textarea {
+  width: 400px;
+}
+.input-width {
+  width: 220px;
+}
+.flex-div {
+  display: flex;
+  // justify-content: space-between;
+}
+.wd50 {
+  width: 50%;
+}
+.pdl40 {
+  padding-left: 40px;
+}
+.pd0 {
+  padding: 0 !important;
+}
+</style>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/incident-info.scss"
+  scoped
+></style>
\ No newline at end of file
diff --git a/src/views/modules/communityParty/dyhx/crateForm.vue b/src/views/modules/communityParty/dyhx/crateForm.vue
new file mode 100644
index 000000000..212ed31a3
--- /dev/null
+++ b/src/views/modules/communityParty/dyhx/crateForm.vue
@@ -0,0 +1,365 @@
+<template>
+
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+
+      <div class="m-row">
+        <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-3">所属党组织：</span>
+            <span>{{ form.orgName }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">党员中心户：</span>
+            <span>{{ form.isDyzxh==='1'?'是':'否'}}</span>
+          </div>
+        </div>
+
+        <div class="m-row-2">
+
+          <div class="info-prop">
+            <span class="info-title-3">姓名：</span>
+            <span>{{ form.name}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">免学习：</span>
+            <span>{{form.isMxx==='1'?'是':'否'}}</span>
+          </div>
+        </div>
+
+        <div class="m-row-2">
+
+          <div class="info-prop">
+            <span class="info-title-3">手机号：</span>
+            <span>{{ form.showMobile }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">职务：</span>
+            <span>{{  form.postName|| "--"}}</span>
+          </div>
+        </div>
+
+        <div class="m-row-2">
+
+          <div class="info-prop">
+            <span class="info-title-3">身份证：</span>
+            <span>{{ form.showIdCard  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">文化程度：</span>
+            <span>{{form.cultureName || "--"}}</span>
+          </div>
+
+        </div>
+        <div class="m-row-2">
+
+          <div class="info-prop">
+            <span class="info-title-3">地址：</span>
+            <span>{{ form.address|| "--" }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">入党时间：</span>
+            <span>{{ form.rdsj || "--"}}</span>
+          </div>
+
+        </div>
+        <div class="m-row-2">
+
+          <div class="info-prop">
+            <span class="info-title-3">流动党员：</span>
+            <span>{{  form.isLd==='1'?'是':'否'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">党员流动号：</span>
+            <span>{{ form.ldzh || "--"  }}</span>
+          </div>
+
+        </div>
+        <div class="m-row-2">
+
+          <div class="info-prop">
+            <span class="info-title-3">备注：</span>
+            <span>{{  form.remark || "--" }}</span>
+          </div>
+
+        </div>
+
+      </div>
+
+    </div>
+
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <el-button v-if="form.icResiUser != null && form.icResiUser != ''"
+                 type="primary"
+                 :disabled="false"
+                 size="small"
+                 @click="jump(form.icResiUser)">查看更多</el-button>
+    </div>
+
+  </div>
+
+</template>
+
+<script>
+import { isCard, isMobile } from '@/utils/validate'
+import { computedCard } from '@/utils/index'
+import cptCard from "@/views/modules/visual/cpts/card";
+
+export default {
+  components: {
+    cptCard
+  },
+  props: {
+    partyList: {
+      type: Array,
+      default: () => []
+    },
+    info: {
+      type: Object,
+      default: () => { }
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+
+    return {
+      activesName: 'first',
+      isAuto: false,
+      formItemWd: '100%',
+      partymenberid: '',
+      partyProps: {
+        label: 'partyOrgName',
+        value: 'id',
+        emitPath: false
+      },
+
+      form: {
+        icResiUser: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        address: '',
+        rdsj: '',
+        sszb: '',
+        isLd: '0',
+        ldzh: '',
+        partyZw: '0',
+        isDyzxh: '0',
+        isMxx: '0',
+        culture: '',
+        remark: ''
+      },
+      eduList: [],
+
+      partyOrgs: []
+    }
+  },
+  watch: {
+    info: {
+      handler (val) {
+        if (Object.keys(val).length > 0) {
+          this.form = { ...val }
+          if (val.icResiUserId || val.icResiUser) this.isAuto = true
+          console.log('val----------in', val)
+          console.log('isAuto----------in', this.isAuto)
+          this.partyOrgs = val.orgPids.split(':')
+          console.log('partyOrgs-----', this.partyOrgs)
+          this.partymenberid = val.id
+        }
+      },
+      immediate: true
+    }
+  },
+  created () {
+    this.getEduList()
+    console.log('partyList', this.partyList)
+  },
+  mounted () {
+    // const w = document.getElementsByClassName('dialog-h-content')[0]
+    // this.formItemWd = w.clientWidth + 'px'
+  },
+  destroyed () {
+    // this.$refs['ruleForm'].resetFields()
+  },
+  methods: {
+
+
+    handleCancle () {
+      // this.$refs['ruleForm'].resetFields()
+      this.$emit('cancle')
+    },
+
+    handleValidBlur (n) {
+      if (!isCard(this.form.idCard)) return
+      const { age } = computedCard(this.form.idCard)
+      this.form.isMxx = age >= 70 ? '1' : '0'
+      this.validateResi()
+    },
+    async getEduList () {
+      await this.$http
+        .post('/sys/dict/data/education')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.eduList = res.data
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async validateResi () {
+      const params = {
+        idCard: this.form.idCard,
+        agencyId: this.$store.state.user.agencyId
+      }
+      await this.$http
+        .post('/epmetuser/icresiuser/getUserByIdCard', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            const { address, icResiUserId } = res.data
+            if (icResiUserId) {
+              this.form.address = address
+              this.isAuto = true
+            } else {
+              this.form.address = ''
+              this.isAuto = false
+            }
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    hadnleSubmitbase () {
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          if (Object.keys(this.info).length > 0) this.editBase()
+          else this.saveBase()
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    handleSavePoints (data) {
+
+      const _data = { ...data }
+      const params = {
+        ..._data,
+        baseOptions: data.baseOptions.length > 0 ? data.baseOptions.toString() : '',
+        reviewOptions: data.reviewOptions.length > 0 ? data.reviewOptions.toString() : '',
+        inspireOptions: data.inspireOptions.length > 0 ? data.inspireOptions.toString() : '',
+        warnOptions: data.warnOptions.length > 0 ? data.warnOptions.toString() : ''
+      }
+      this.savePoints(params)
+    },
+    async jump (icResiUserId) {
+      this.$emit('saveBase', icResiUserId)
+    },
+    async saveBase () {
+      const params = {
+        ...this.form
+      }
+      await this.$http
+        .post('/resi/partymember/icPartyMember/save', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('保存成功')
+            this.partymenberid = res.data
+            this.$emit('saveBase', true)
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async editBase () {
+      const params = {
+        ...this.form
+      }
+      await this.$http
+        .post('/resi/partymember/icPartyMember/update', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('保存成功')
+            this.partymenberid = res.data
+            this.$emit('saveBase', true)
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async savePoints (form) {
+      const params = {
+        ...form,
+        partyMemberId: this.partymenberid
+      }
+      let url = ''
+      if (form.id) url = '/resi/partymember/icPartyMemberPoint/update'
+      else url = '/resi/partymember/icPartyMemberPoint/save'
+      await this.$http
+        .post(url, params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('保存成功')
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async saveRecord (form) {
+      const params = {
+        ...form,
+        partyMemberId: this.partymenberid
+      }
+      await this.$http
+        .post('/resi/partymember/icPartyMemberPoint/save', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('保存成功')
+
+          }
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
diff --git a/src/views/modules/communityParty/dyhx/options.js b/src/views/modules/communityParty/dyhx/options.js
new file mode 100644
index 000000000..83ae6d0c0
--- /dev/null
+++ b/src/views/modules/communityParty/dyhx/options.js
@@ -0,0 +1,176 @@
+
+export function pieOption (_charts) {
+  const center= ['60%', '50%']
+    return {
+      title: {
+        text: '0',
+        top: 125,
+        left: 235,
+        textAlign: 'center',
+        textStyle: {
+          width: '100%',
+          fontSize: 32,
+          color: '#FFFFFF',
+          fontWeight: 400,
+          align: 'center'
+        },
+        itemGap: 5,
+        subtext: '总数',
+        subtextStyle: {
+          fontSize: 16,
+          color: '#fff',
+          fontWeight: 400,
+          align: 'center'
+        }
+      },
+      tooltip: {
+        show: false
+      },
+      legend: {
+        top: 500,
+        bottom: 0,
+        itemWidth: 20,
+        itemHeight: 10,
+        textStyle: {
+          color: '#000000',
+          fontSize: 16,
+          lineHeight: 20,
+        },
+      
+      },
+      series: [
+        // 外侧圆环
+        {
+          type: 'pie',
+          // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+          startAngle: 90,
+          hoverAnimation: false,
+          // tooltip: {
+          // },
+          center: center,
+          left: 'left',
+          radius: ['60%', '70%'],
+          width: 400,
+          label: {
+            show: false
+          },
+          labelLine: {
+            show: false
+          },
+          data: [{
+            value: 480,
+            itemStyle: {
+              color: 'rgba(40, 101, 250, 0)',
+              width:0,
+              borderColor: 'rgba(40, 101, 250, 0.5)',
+              borderWidth: 1,
+              borderType: 'dotted'
+            }
+          }
+          ]
+        },
+  
+        // 突出的
+        {
+          hoverAnimation: false,
+          type: 'pie',
+          center: center,
+          radius: ['40%', '60%'],
+          avoidLabelOverlap: false,
+          selectedMode: 'single',
+          left: 'left',
+          width: 400,
+          startAngle: 90,
+          label: {
+            // show: false,
+            position: 'outside',
+            alignTo: 'edge',
+            // formatter: '{a|{c}}\n\n{name|{b}}',
+            formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+            // minMargin: 5,
+            edgeDistance: 20,
+            lineHeight: 15,
+            // color: '#fff',
+            fontSize: 12,
+            // distanceToLabelLine: -60,
+            rich: {
+              name: {
+                padding: [0, 6, 0, 6]
+              },
+              a: {
+                fontSize: 30,
+                // color: '#fff',
+                padding: [0, 6, 6, 6]
+              },
+              r: {
+                backgroundColor: 'auto',
+                borderRadius: 6,
+                width: 6,
+                height: 6,
+                // padding: [3, 3, 0, -12]
+              }
+            }
+          },
+          labelLine: {
+            show: false,
+            smooth: 0.2,
+            length: 20,
+            length2: 10,
+            maxSurfaceAngle: 80
+          },
+          labelLayout: function (params) {
+            
+            const isLeft = params.labelRect.x < _charts.getWidth() / 3;
+            const points = params.labelLinePoints;
+            // Update the end point.
+            if (points) {
+              points[2][0] = isLeft
+              ? params.labelRect.x
+              : params.labelRect.x + params.labelRect.width;
+            }
+            
+            return {
+              labelLinePoints: points
+            };
+          },
+          itemStyle: {
+            
+          },
+          data: [],
+  
+        },
+           // 中间圆环
+           {
+            type: 'pie',
+            // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+            startAngle: 90,
+            hoverAnimation: false,
+            center: center,
+            left: 'left',
+            width: 400,
+            // tooltip: {
+            // },
+            radius: ['0%', '25%'],
+            label: {
+            
+                show: false
+             
+            },
+            labelLine: {
+                show: false
+            
+            },
+            data: [
+              {
+                value: 360,
+                itemStyle: {
+                  color: 'rgba(8, 37, 134, 1)',
+                }
+              }
+            ]
+          },
+      ]
+  
+    }
+  }
+  
\ No newline at end of file
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
new file mode 100644
index 000000000..4282056a8
--- /dev/null
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -0,0 +1,1183 @@
+<template>
+  <div class="div_main">
+
+    <div class="card-title">
+
+      <div class="title-label">
+        <span>所属组织</span>
+        <el-cascader style="margin-left:10px"
+                     v-model="partyOrgs"
+                     :options="partyOrgList"
+                     :props="{
+              label: 'partyOrgName',
+              value: 'id',
+              checkStrictly: true 
+            }"
+                     :show-all-levels="false"
+                     clearable
+                     @change="handlePartyCascader">
+        </el-cascader>
+      </div>
+    </div>
+    <div class="card-echart">
+      <div class="card-left">
+        <div class="card-left-title">党员年龄统计</div>
+        <div class="card-flex">
+          <div class="echart-wr">
+            <!-- <div class="echart-cicle"></div>  -->
+            <screen-echarts-frame class="echart-org"
+                                  @myChartMethod="pieInitOk"
+                                  ref="ageChart"></screen-echarts-frame>
+            <!-- <div id="echartOrg" class="echart-org"></div> -->
+          </div>
+          <div class="echarts-tips echarts-tips-wd50">
+            <div class="tips-lists">
+              <div v-for="(item, index) in ageItem"
+                   :key="index"
+                   class="tips-items">
+                <div class="tips-items-title"
+                     :class="'tips-items-title' + item.code">
+                  {{ item.name }}
+                </div>
+                <div class="tips-items-num">
+                  <div class="tips-item-count">{{item.value}}</div>
+                  <div class="tips-item-has">{{ item.radio }}</div>
+                </div>
+              </div>
+
+            </div>
+          </div>
+
+        </div>
+        <div class="ecahrts-button">
+          <el-button type="primary"
+                     size="small"
+                     @click="handleExport('age')">导出</el-button>
+        </div>
+        <div class="warning-box-bottom">
+          <el-table class="table"
+                    :data="tableDataAge"
+                    border
+                    :height="tableHeight"
+                    v-loading="tableLoadingAge"
+                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                    style="width: 100%">
+            <el-table-column label="序号"
+                             header-align="center"
+                             align="center"
+                             type="index"
+                             width="50"></el-table-column>
+
+            <el-table-column prop="name"
+                             header-align="center"
+                             align="center"
+                             label="姓名"
+                             :show-overflow-tooltip="true"
+                             min-width="180">
+            </el-table-column>
+            <el-table-column prop="age"
+                             header-align="center"
+                             align="center"
+                             :show-overflow-tooltip="true"
+                             label="年龄"
+                             min-width="180">
+            </el-table-column>
+
+            <el-table-column prop="mobile"
+                             header-align="center"
+                             align="center"
+                             :show-overflow-tooltip="true"
+                             label="手机号码"
+                             min-width="110">
+            </el-table-column>
+
+            <el-table-column label="操作"
+                             fixed="right"
+                             width="220"
+                             header-align="center"
+                             align="center"
+                             class="operate">
+              <template slot-scope="scope">
+                <el-button type="text"
+                           class="div-table-button--detail"
+                           size="small"
+                           @click="handleDetail(scope.row)">查看</el-button>
+
+              </template>
+            </el-table-column>
+          </el-table>
+          <div>
+            <el-pagination @size-change="pageSizeChangeHandleAge"
+                           @current-change="pageCurrentChangeHandleAge"
+                           :current-page.sync="agePageNo"
+                           :page-sizes="[10,20, 50, 100, 200]"
+                           :page-size="agePageSize"
+                           layout="sizes, prev, pager, next, total"
+                           :total="ageTotal">
+            </el-pagination>
+          </div>
+        </div>
+      </div>
+      <div class="card-left">
+        <div class="card-left-title">党员学历统计</div>
+        <div class="card-flex">
+          <div class="echart-wr echart-wr100">
+            <!-- <div class="echart-cicle echart-cicle0"></div> -->
+            <!-- <div id="echartType" class="echart-org"></div> -->
+            <screen-echarts-frame class="echart-org"
+                                  @myChartMethod="pieInitOks"
+                                  ref="eduChart"></screen-echarts-frame>
+          </div>
+          <div v-if="false"
+               class="echarts-tips">
+            <div class="tips-list">
+              <div v-for="item in eduItem"
+                   :key="item.value"
+                   class="tips-item">
+                <div class="tips-item-icon"
+                     :style="'background:' + item.color"></div>
+                <div class="tips-item-text">{{item.name}}</div>
+              </div>
+
+            </div>
+          </div>
+        </div>
+        <div class="ecahrts-button">
+          <el-button type="primary"
+                     size="small"
+                     @click="handleExport('edu')">导出</el-button>
+        </div>
+        <div class="warning-box-bottom">
+          <el-table class="table"
+                    :data="tableData"
+                    border
+                    :height="tableHeight"
+                    v-loading="tableLoading"
+                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                    style="width: 100%">
+            <el-table-column label="序号"
+                             header-align="center"
+                             align="center"
+                             type="index"
+                             width="50"></el-table-column>
+
+            <el-table-column prop="name"
+                             header-align="center"
+                             align="center"
+                             label="姓名"
+                             :show-overflow-tooltip="true"
+                             min-width="180">
+            </el-table-column>
+            <el-table-column prop="education"
+                             header-align="center"
+                             align="center"
+                             :show-overflow-tooltip="true"
+                             label="学历"
+                             min-width="180">
+            </el-table-column>
+
+            <el-table-column prop="mobile"
+                             header-align="center"
+                             align="center"
+                             :show-overflow-tooltip="true"
+                             label="手机号码"
+                             min-width="110">
+            </el-table-column>
+
+            <el-table-column label="操作"
+                             fixed="right"
+                             width="220"
+                             header-align="center"
+                             align="center"
+                             class="operate">
+              <template slot-scope="scope">
+                <el-button type="text"
+                           class="div-table-button--detail"
+                           size="small"
+                           @click="handleDetail(scope.row)">查看</el-button>
+
+              </template>
+            </el-table-column>
+          </el-table>
+          <div>
+            <el-pagination @size-change="pageSizeChangeHandleNew"
+                           @current-change="pageCurrentChangeHandleNew"
+                           :current-page.sync="pageNo"
+                           :page-sizes="[10,20, 50, 100, 200]"
+                           :page-size="pageSize"
+                           layout="sizes, prev, pager, next, total"
+                           :total="total">
+            </el-pagination>
+
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- <crate-form v-if="memberDialog"
+                :info="memberDetailInfo"
+                :partyList="optionsG"
+                :disabled="disabled"
+                @saveBase="jumpDetail"
+                @cancle="handlerCancle" /> -->
+    <el-dialog title="党员信息"
+               :visible.sync="memberDialog"
+               width="60%"
+               top="5vh"
+               class="dialog-h"
+               append-to-body
+               :close-on-click-modal="false"
+               :before-close="handlerCancle">
+      <crate-form v-if="memberDialog"
+                  :info="memberDetailInfo"
+                  :partyList="optionsG"
+                  :disabled="disabled"
+                  @saveBase="jumpDetail"
+                  @cancle="handlerCancle" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+
+import nextTick from "dai-js/tools/nextTick";
+import screenEchartsFrame from "@c/screen-echarts-frame";
+import crateForm from './crateForm.vue';
+import { pieOption } from './options'
+import { mapGetters } from 'vuex'
+
+import * as echarts from 'echarts';
+export default {
+  name: "warning-box",
+  components: {
+
+    screenEchartsFrame,
+    crateForm
+  },
+  data () {
+    return {
+      memberDialog: false,
+      disabled: true,
+      memberDetailInfo: {},
+      optionsG: [],
+
+
+      tableData: [
+        // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
+      ],
+      tableLoading: false,
+      tableLoadingAge: false,
+      tableDataAge: [],
+      noInit: false,
+      noEduInit: false,
+      selectAgency: null,
+      ageTotalCount: 0,
+      eduTotalCount: 0,
+      propTree: [],
+      value2: '',
+      visibleAgeLoading: true,
+      visibleLoading: true,
+      agencyId: '',
+      orgType: '',
+      ageCode: '',
+      eduCode: '',
+      pageNo: 1,
+      pageSize: 10,
+      agePageNo: 1,
+      agePageSize: 10,
+      total: 0,
+      ageTotal: 0,
+      eduItem: [
+        {
+          name: '小学',
+          value: 0,
+          color: 'rgba(27, 81, 255, 1)'
+        }, {
+          name: '初中',
+          value: 1,
+          color: 'rgba(0, 229, 237, 1)'
+        }, {
+          name: '高中',
+          value: 2,
+          color: 'rgba(120, 0, 255, 1)'
+        }, {
+          name: '中专',
+          value: 3,
+          color: 'rgba(255, 120, 0, 1)'
+        }, {
+          name: '大专',
+          value: 4,
+          color: 'rgba(255, 186, 0, 1)'
+        }, {
+          name: '本科',
+          value: 5,
+          color: 'rgba(22, 215, 131, 1)'
+        }, {
+          name: '硕士',
+          value: 6,
+          color: 'rgba(42, 0, 255, 1)'
+        }, {
+          name: '博士',
+          value: 7,
+          color: 'rgba(198, 0, 255, 1)'
+        }, {
+          name: '其他',
+          value: 8,
+          color: 'rgba(255, 42, 0, 1)'
+        }
+      ],
+      ageItem: [
+        {
+          name: '50岁以下',
+          value: 1,
+          color: 'rgba(27, 81, 255, 1)'
+        }, {
+          name: '50-59岁',
+          value: 2,
+          color: 'rgba(0, 229, 237, 1)'
+        }, {
+          name: '60-69岁',
+          value: 3,
+          color: 'rgba(120, 0, 255, 1)'
+        }, {
+          name: '70-79岁',
+          value: 4,
+          color: 'rgba(255, 120, 0, 1)'
+        }, {
+          name: '80岁以上',
+          value: 5,
+          color: 'rgba(255, 186, 0, 1)'
+        }
+      ],
+      partyOrgs: [],
+
+      partyOrgList: [],
+      pieAgeChartS: null,
+      pieEduChartSs: null,
+      pieAgeOptions: null,
+      pieEduOptions: null
+    };
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 500 + this.iframeHeight : this.clientHeight - 500
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  async mounted () {
+    await nextTick(100);
+    // await this.getAgencyList()
+    await this.getPartyOggList()
+    // this.getAgeCount(this.$store.state.user.agencyId, 'agency')
+    // this.getEduCount(this.$store.state.user.agencyId, 'agency')
+    // this.getAgeList(this.$store.state.user.agencyId, 'agency')
+    // this.getEduList(this.$store.state.user.agencyId, 'agency')
+    this.getAgeCount()
+    this.getEduCount()
+    this.getAgeList()
+    this.getEduList()
+    // this.initAgeCharts()
+    // this.initEduCharts()
+
+    // this.initChartType()
+  },
+  async created () {
+    this.getGridList('query')
+  },
+  methods: {
+    handleDetail (val) {
+      this.getDetail(val.userId)
+      this.memberDialog = true
+    },
+    handleSearch () {
+      this.memberDialog = false
+    },
+    handlerCancle () {
+      this.memberDialog = false
+    },
+    async getGridList (type, agencyId) {
+      const { user } = await this.$store.state
+      // addorupdate  query
+      await this.$http
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: { agencyId: agencyId || user.agencyId } })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.optionsG = this.deepArrTOnull(res.data)
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    pieInitOk (dom) {
+      console.log('pie准备好了', dom)
+      this.pieAgeChartS = dom
+      // this.pieInitState = true
+
+    },
+    pieInitOks (dom) {
+      console.log('pies准备好了', dom)
+      this.pieEduChartS = dom
+      // this.pieInitState = true
+
+    },
+    initAgeCharts () {
+      // const eId = document.getElementById('echartOrg')
+      // let _charts = echarts.init(eId)
+      let option = {
+
+      }
+      this.pieAgeOptions = pieOption(this.pieAgeChartS)
+      this.clickAgePie(0)
+      let fun = params => {
+        // if (params.seriesIndex == 0 || params.seriesIndex == 2) {
+        //   this.ageCode = ''
+        //   this.getAgeList()
+        //   return
+        // }
+        if (params.seriesIndex == 0 || params.seriesIndex == 2) {
+          console.log('请求了吗')
+          this.ageCode = ''
+          // this.getUnitList(this.agencyId)
+          this.getAgeList()
+          this.$refs.ageChart.clear()
+          this.noInit = false
+          this.clickAgePie(0)
+          // return
+        } else this.clickAgePie(params.dataIndex)
+        // this.clickAgePie(params.dataIndex)
+      }
+      this.$refs.ageChart.handleClick(fun)
+      // option && this.$refs.pieChart.setOption(option);
+
+    },
+    initEduCharts () {
+      // const eId = document.getElementById('echartOrg')
+      // let _charts = echarts.init(eId)
+      let option = {
+
+      }
+      let legend = {
+        show: true,
+        orient: 'vertical',
+        top: '20%',
+        right: 0,
+        textStyle: {
+          width: 90,
+          // color: '#fff',
+          rich: {
+            a: {
+              width: 90
+            }
+          }
+        },
+        formatter: name => {
+          for (let a = 0; a < this.eduItem.length; a++) {
+            // this.data  这个数据中有名称和次数
+            if (this.eduItem[a].name === name) {
+              //两个名称进行对比，取出对应的次数
+              let params1 = name + "\n"; //然后return你需要的legend格式即可
+              console.log(params1);
+              let tmp = params1.split("\n");
+              let res = "" + params1;
+              for (let i in tmp) {
+                res = res.replace(tmp[i], "");
+              }
+              return res + params1;
+            }
+          }
+        }
+      }
+      this.pieEduOptions = pieOption(this.pieEduChartS)
+      this.pieEduOptions.legend = { ...legend }
+      // this.pieEduOptions.series[1].width = 400
+      const maxValue = Math.max(...this.eduItem.map(i => Number(i.value)));
+      const maxIndex = this.eduItem.findIndex(a => Number(a.value) == maxValue);
+      this.clickEduPie(maxIndex)
+      console.log('----------------------最大值', maxValue, maxIndex)
+      let fun = params => {
+        // if (params.seriesIndex == 0 || params.seriesIndex == 2) {
+        //   this.eduCode = ''
+        //   this.getEduList()
+        //   return
+        // }
+        // this.clickEduPie(params.dataIndex)
+        if (params.seriesIndex == 0 || params.seriesIndex == 2) {
+          this.eduCode = ''
+          this.getEduList()
+          this.$refs.eduChart.clear()
+          this.noEduInit = false
+          this.clickEduPie(0)
+          // return
+        } else this.clickEduPie(params.dataIndex)
+      }
+      this.$refs.eduChart.handleClick(fun)
+      // this.noInit = true
+      // option && this.$refs.pieChart.setOption(option);
+
+    },
+
+    clickAgePie (seriesIndex) {
+      let _code = ''
+      let isClick = false
+      console.log('seriesIndex---', seriesIndex)
+      this.ageItem.forEach((element, index) => {
+        if (index === seriesIndex) {
+          _code = element.code
+
+          if (!this.noInit) isClick = false
+          else {
+            element.isClick = !element.isClick
+            isClick = element.isClick
+          }
+
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zlcm', element)
+        } else {
+          element.isClick = false
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.ageCode = isClick && _code || ''
+      this.pieAgeOptions.title.text = this.ageTotalCount
+      this.pieAgeOptions.series[1].data = this.ageItem
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.ageChart.setOption(this.pieAgeOptions)
+      if (this.noInit) {
+        // const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        // const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        //  console.log('zlcm---isClick', isClick)
+        //  this.agePageNo = 1
+        // this.getAgeList(_arr[0], orgType, isClick && _code || '')
+        const i = this.partyOrgs.length - 1
+        this.agePageNo = 1
+        this.getAgeList(this.partyOrgs[i], '', isClick && _code || '')
+      }
+      this.noInit = true
+
+    },
+    clickEduPie (seriesIndex) {
+      let _code = ''
+      let isClick = false
+      this.eduItem.forEach((element, index) => {
+        if (index === seriesIndex) {
+          _code = element.code
+
+          if (!this.noEduInit) isClick = false
+          else {
+            element.isClick = !element.isClick
+            isClick = element.isClick
+          }
+
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zlcm')
+        } else {
+          element.isClick = false
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.eduCode = isClick && _code || ''
+      this.pieEduOptions.title.text = this.eduTotalCount
+      this.pieEduOptions.series[1].data = this.eduItem
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.eduChart.setOption(this.pieEduOptions)
+      if (this.noEduInit) {
+        // const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        // const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        // this.pageNo = 1
+        // this.getEduList(_arr[0], orgType, isClick && _code || '')
+        const i = this.partyOrgs.length - 1
+        this.pageNo = 1
+        this.getEduList(this.partyOrgs[i], '', isClick && _code || '')
+
+      }
+      this.noEduInit = true
+
+
+    },
+    async getAgeCount (orgId, orgType) {
+      // const url = "/epmetuser/icresiuser/partymemberagestatistics";
+      const url = '/resi/partymember/icPartyMember/partymemberagestatistics'
+      let params = {
+        orgId: orgId || '',
+        orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        const colorList = [
+          {
+            name: '50岁以下',
+            value: 1,
+            color: '#FAC126'
+          }, {
+            name: '50-59岁',
+            value: 2,
+            color: '#3DDA83'
+          }, {
+            name: '60-69岁',
+            value: 3,
+            color: '#A800FF'
+          }, {
+            name: '70-79岁',
+            value: 4,
+            color: '#2865FA'
+          }, {
+            name: '80岁以上',
+            value: 5,
+            color: '#00DAD2'
+          }
+        ]
+        this.ageItem = data.map((item, index) => {
+          return {
+            ...item,
+            name: item.label,
+            isClick: false,
+            itemStyle: {
+              color: colorList[index].color
+            }
+          }
+        })
+        this.ageTotalCount = 0
+        data.forEach(item => {
+          this.ageTotalCount += Number(item.value)
+        })
+        this.initAgeCharts()
+      } else {
+      }
+    },
+    async getEduCount (orgId, orgType) {
+      // const url = "/epmetuser/icresiuser/partymembereducationstatistics";
+      const url = '/resi/partymember/icPartyMember/partymembereducationstatistics'
+      let params = {
+        orgId: orgId || '',
+        orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.eduItem = data.map(item => {
+          return {
+            ...item,
+            name: item.label,
+            isClick: false
+          }
+        })
+        console.log('&&&&&&&&&&&&', this.eduItem)
+        this.eduTotalCount = 0
+        data.forEach(item => {
+          this.eduTotalCount += Number(item.value)
+        })
+        this.initEduCharts()
+      } else {
+      }
+    },
+    async getAgeList (orgId, orgType, _code) {
+      this.tableLoadingAge = true
+      this.visibleAgeLoading = true
+      // const url = "/epmetuser/icresiuser/partymemberagelist";
+      const url = '/resi/partymember/icPartyMember/partymemberagelist'
+      let params = {
+        orgId: orgId || '',
+        orgType,
+        code: _code || '',
+        pageNo: this.agePageNo,
+        pageSize: this.agePageSize
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      this.tableLoadingAge = false
+      if (code === 0) {
+        this.tableDataAge = data.list
+
+        this.ageTotal = data.total
+      } else {
+        this.$message.error(msg)
+      }
+      // if (_code == 0 || _code) this.noInit = true
+      this.visibleAgeLoading = false
+    },
+    async getEduList (orgId, orgType, _code) {
+      this.tableLoading = true
+      this.visibleLoading = true
+      // const url = "/epmetuser/icresiuser/partymembereducationlist";
+      const url = '/resi/partymember/icPartyMember/partymembereducationlist'
+      let params = {
+        orgId: orgId || '',
+        orgType,
+        code: _code || '',
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      this.tableLoading = false
+      if (code === 0) {
+        this.tableData = data.list
+
+
+        this.total = data.total
+      } else {
+        this.$message.error(msg)
+      }
+      this.visibleLoading = false
+    },
+    async getPartyOggList (node, resolve) {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      // const url = '/gov/org/customeragency/agencygridtree'
+      // const url = '/resi/partymember/icPartyOrg/getTreelist'
+      const url = '/resi/partymember/icPartyOrg/getSearchTreelist'
+      let params = {
+        agencyId: this.$store.state.user.agencyId,
+      };
+      const { data, code, msg } = await requestGet(url, params);
+      console.log('data-orgparty----o', data)
+      if (code === 0) {
+
+        this.partyOrgList = this.deepArrTOnull(data)
+
+      } else {
+      }
+    },
+    deepArrTOnull (arr) {
+      let a = []
+      a = arr.map(item => {
+        return {
+          ...item,
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
+        }
+      })
+      return a
+    },
+    async getAgencyList (node, resolve) {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      const url = '/gov/org/customeragency/agencygridtree'
+      // let params = {
+      //   agencyId: this.$store.state.user.agencyId,
+      // };
+      const { data, code, msg } = await requestPost(url);
+      if (code === 0) {
+        console.log('data-org----o', data)
+        this.selectAgency = [`${data.agencyId}-${data.level}`]
+        this.orgType = data.level
+        this.agencyId = data.agencyId
+        let arr = []
+        arr.push(data)
+        this.propTree = arr && this.getTreeData(arr)
+
+      } else {
+      }
+    },
+    getTreeData (data) {
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.subAgencyList) {
+          if (item.subAgencyList.length === 0) {
+            _item = {
+              label: item.agencyName,
+              value: item.agencyId + '-' + item.level,
+              level: item.level,
+              children: undefined
+            }
+          } else _item = {
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+            children: this.getTreeData(item.subAgencyList)
+          }
+        } else {
+          _item = {
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+          }
+        }
+        return _item
+      })
+      return arr
+    },
+
+    jumpDetail (val) {
+      this.memberDialog = false
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${val}`,
+      });
+    },
+    getDetail (id) {
+      let params = {
+        id,
+      }
+      this.$http
+        .post(`/resi/partymember/icPartyMember/${id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.memberDetailInfo = { ...res.data }
+          }
+        })
+        .catch((err) => {
+          return this.$message.error('网络错误')
+        })
+    },
+    handleCascader (val) {
+      console.log('val-vvv', val)
+      const _arr = val[val.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
+      this.agencyId = _arr[0]
+      this.orgType = orgType
+      this.noInit = false
+      this.noEduInit = false
+      this.$refs.ageChart.clear()
+      this.$refs.eduChart.clear()
+      this.getAgeCount(_arr[0], orgType)
+      this.getEduCount(_arr[0], orgType)
+      this.getAgeList(_arr[0], orgType)
+      this.getEduList(_arr[0], orgType)
+    },
+    handlePartyCascader (val) {
+      console.log('val-vvvpppppp', val)
+      this.noInit = false
+      this.noEduInit = false
+      this.$refs.ageChart.clear()
+      this.$refs.eduChart.clear()
+      if (val.length > 0) {
+        const i = val.length - 1
+        this.agencyId = val[i]
+        this.getAgeCount(val[i])
+        this.getEduCount(val[i])
+        this.getAgeList(val[i])
+        this.getEduList(val[i])
+      } else {
+        this.agencyId = ''
+        this.getAgeCount('')
+        this.getEduCount('')
+        this.getAgeList('')
+        this.getEduList('')
+      }
+
+    },
+    getCheckedNodes (val) {
+      console.log('val-nnn', val)
+    },
+    lazyLoad (node, resolve) {
+      setTimeout(() => {
+        this.getAgeList(node, resolve)
+      }, 500)
+    },
+    pageSizeChangeHandleAge (val) {
+      this.agePageNo = 1
+      this.agePageSize = val
+      this.getAgeList(this.agencyId, this.orgType, this.ageCode)
+    },
+    pageCurrentChangeHandleAge (val) {
+      this.agePageNo = val
+      this.getAgeList(this.agencyId, this.orgType, this.ageCode)
+    },
+    pageSizeChangeHandleNew (val) {
+      this.pageNo = 1;
+      this.pageSize = val;
+      this.getEduList(this.agencyId, this.orgType, this.eduCode)
+    },
+    pageCurrentChangeHandleNew (val) {
+      this.pageNo = val;
+      this.getEduList(this.agencyId, this.orgType, this.eduCode)
+    },
+    async handleExport (type) {
+      const urls = {
+        age: '/epmetuser/icresiuser/partymemberagelist/export',
+        edu: '/epmetuser/icresiuser/partymembereducationlist/export'
+      }
+      const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
+      let params = {
+        orgId: _arr[0],
+        orgType: orgType,
+        code: type == 'age' ? this.ageCode : this.eduCode,
+      }
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      await this.$http({
+        method: 'POST',
+        url: urls[type],
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出失败', err)
+          return this.$message.error('网络错误')
+        })
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/warning.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+.div_main {
+  background: #fff;
+  margin: 10px;
+  padding: 10px;
+}
+.card-title {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
+  .title-icon {
+    display: block;
+    width: 46px;
+    height: 34px;
+    box-sizing: border-box;
+    margin-right: 6px;
+  }
+
+  .title-time {
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    margin-left: 30px;
+    font-size: 14px;
+    color: #fff;
+    .title-time-label {
+      margin-right: 10px;
+    }
+  }
+  .title-label {
+    font-size: 16px;
+    font-family: PingFang SC;
+    // font-weight: 800;
+  }
+}
+.card-echart {
+  display: flex;
+  margin-top: 40px;
+  height: 100%;
+  .card-left {
+    position: relative;
+    flex: 1;
+    // display: flex;
+    height: 100%;
+    .card-flex {
+      width: 100%;
+      display: flex;
+    }
+  }
+}
+.card-left-title {
+  position: relative;
+  padding-left: 40px;
+  font-size: 16px;
+  font-weight: 500;
+}
+.card-left-title::after {
+  content: "";
+  position: absolute;
+  top: 50%;
+  left: 20px;
+  width: 12px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-top: -6px;
+  background: #2865fa;
+  border-radius: 50%;
+}
+.echart-wr {
+  position: relative;
+  flex-shrink: 0;
+  width: 50%;
+  height: 320px;
+  box-sizing: border-box;
+  .echart-org {
+    width: 100%;
+    height: 100%;
+  }
+  .echart-cicle {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 240px;
+    height: 240px;
+    box-sizing: border-box;
+    margin-top: -120px;
+    margin-left: -120px;
+    border: 1px dashed rgba(0, 96, 240, 1);
+    border-radius: 50%;
+  }
+  .echart-cicle0 {
+    left: 80px;
+    margin-left: 0;
+  }
+}
+.echart-wr100 {
+  width: 70%;
+}
+.echarts-tips {
+  width: 40%;
+  // flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.echarts-tips-wd50 {
+  width: 320px;
+}
+.tips-list,
+.tips-item,
+.tips-lists,
+.tips-items-num {
+  display: flex;
+  align-items: center;
+}
+.tips-list {
+  // width: 100%;
+  // height: 100%;
+  flex-wrap: wrap;
+  // justify-content: center;
+  .tips-item {
+    // flex: 1;
+    width: 50%;
+    margin-top: 20px;
+    // margin-right: 40px;
+    cursor: pointer;
+    .tips-item-icon {
+      width: 20px;
+      height: 10px;
+      box-sizing: border-box;
+      margin-right: 8px;
+      background: #1b51ff;
+      border-radius: 2px;
+    }
+    .tips-item-text {
+      font-size: 16px;
+      color: #d2e7ff;
+    }
+  }
+}
+.tips-lists {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 30px 0 0 30px;
+  flex-wrap: wrap;
+  .tips-items {
+    margin-bottom: 30px;
+    margin-right: 40px;
+    // width: 50%;
+    cursor: pointer;
+    .tips-items-title {
+      position: relative;
+      width: 100px;
+      height: 26px;
+      box-sizing: border-box;
+      padding-left: 6px;
+      font-size: 16px;
+      // color: #eff0f1;
+      background: url("../../../../assets/img/shuju/measure/huang@2x.png")
+        no-repeat left bottom;
+      &1 {
+        background: url("../../../../assets/img/shuju/measure/lv@2x.png")
+          no-repeat left bottom;
+      }
+      &2 {
+        background: url("../../../../assets/img/shuju/measure/zi@2x.png")
+          no-repeat left bottom;
+      }
+      &3 {
+        background: url("../../../../assets/img/shuju/measure/lan@2x.png")
+          no-repeat left bottom;
+      }
+      &4 {
+        background: url("../../../../assets/img/shuju/measure/lanlv@2x.png")
+          no-repeat left bottom;
+      }
+    }
+    .tips-items-num {
+      justify-content: space-between;
+      box-sizing: border-box;
+      margin-top: 10px;
+      // padding-right: 30px;
+      font-size: 20px;
+      .tips-item-has {
+        font-size: 14px;
+      }
+    }
+  }
+}
+
+.warning-box-bottom {
+  height: calc(100% - 500px);
+  box-sizing: border-box;
+  margin-top: 10px;
+  padding: 0 30px;
+  // overflow-y: scroll;
+}
+.ecahrts-button {
+  width: 100%;
+  padding-left: 30px;
+  // text-align: right;
+}
+</style>