From 29b02c3f5910ed5b77916ebc9a903bada48c29af Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 2 Sep 2022 11:16:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityParty/crateForm.vue       | 431 ++++++++++++++++++
 .../modules/visual/communityParty/party.vue   |  73 ++-
 2 files changed, 498 insertions(+), 6 deletions(-)
 create mode 100644 src/views/modules/visual/communityParty/crateForm.vue

diff --git a/src/views/modules/visual/communityParty/crateForm.vue b/src/views/modules/visual/communityParty/crateForm.vue
new file mode 100644
index 000000000..86ed68e07
--- /dev/null
+++ b/src/views/modules/visual/communityParty/crateForm.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="dialog-h-content scroll-h pd0">
+    <el-form label-width="120px" :model="form" :inline="true" 
+      :disabled="disabled" :rules="rules" ref="ruleForm" 
+      class="form-wr">
+      <div class="flex-div">
+        <el-form-item label="所属党组织" prop="sszb" class="wd50">
+          <el-cascader
+                v-model="form.sszb"
+                :options="partyList"
+                :props="partyProps"
+                clearable
+                 class="input-width"
+                @change="handlePartyChange"></el-cascader>
+        </el-form-item>
+        <el-form-item label="党员中心户" prop="isDyzxh" class="wd50">
+          <el-radio-group v-model="form.isDyzxh">
+              <el-radio label="1">是</el-radio>
+              <el-radio label="0">否</el-radio>
+            </el-radio-group>
+        </el-form-item>
+      </div>
+      <div class="flex-div">
+        <el-form-item label="姓名" prop="name" class="wd50">
+          <el-input v-model="form.name" placeholder="请输入" :disabled="disabled" class="input-width" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="免学习" prop="isMxx" class="wd50">
+          <el-radio-group v-model="form.isMxx">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </div>
+      <div class="flex-div">
+        <el-form-item label="手机号" prop="mobile" class="wd50">
+          <el-input v-model="form.mobile" placeholder="请输入" :disabled="disabled" class="input-width" clearable />
+        </el-form-item>
+        <el-form-item label="职务" prop="partyZw" class="wd50">
+          <el-select v-model="form.partyZw" filterable :disabled="disabled" placeholder="请选择" class="input-width" clearable>
+            <el-option
+              v-for="item in zwList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </div>
+      <div class="flex-div">
+        <el-form-item label="身份证" prop="idCard" class="wd50">
+          <el-input v-model="form.idCard" placeholder="请输入" :disabled="disabled" 
+          class="input-width" clearable @blur="handleValidBlur" />
+        </el-form-item>
+        <el-form-item label="文化程度" prop="culture" class="wd50">
+          <el-select v-model="form.culture" filterable :disabled="disabled" placeholder="请选择" class="input-width" clearable>
+            <el-option
+              v-for="item in eduList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </div>
+      <div class="flex-div">
+        <el-form-item label="地址" prop="address" class="wd50">
+          <el-input v-model="form.address" placeholder="请输入" :disabled="disabled || isAuto" class="input-width" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="入党时间" prop="rdsj" class="wd50">
+          <el-date-picker
+            v-model="form.rdsj"
+             :disabled="disabled"
+            type="date"
+            class="input-width"
+            clearable
+            placeholder="选择日期"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+      </div>
+      <div class="flex-div">
+        <el-form-item label="流动党员" prop="isLd" class="wd50">
+          <el-radio-group v-model="form.isLd" class="input-width">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="流动党员号" prop="ldzh" class="wd50">
+          <el-input v-model="form.ldzh" placeholder="请输入" :disabled="disabled" class="input-width" clearable></el-input>
+        </el-form-item>
+      </div>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" :autosize="{ minRows: 4, maxRows: 10}" :disabled="disabled" type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <div >
+        <div style="margin-top: 20px; text-align: center;">
+            <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>
+      
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { isCard, isMobile } from '@/utils/validate'
+import { computedCard } from '@/utils/index'
+
+export default {
+  components: {
+
+  },
+  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')
+    },
+    handlePartyChange(val) {
+      console.log('val------pp', val)
+      // if (val.length > 0) {
+      //   const i = val.length - 1
+      //   this.form.sszb = val[i]
+      // } else this.form.sszb = ''
+    },
+    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>
\ No newline at end of file
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 826333519..f318f3eef 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -131,6 +131,18 @@
 
       
     </cpt-card>
+    <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>
 
@@ -140,6 +152,7 @@ import screenTable from "../components/screen-table/index";
 import cptCard from "@/views/modules/visual/cpts/card";
 import nextTick from "dai-js/tools/nextTick";
 import screenEchartsFrame from "../components/screen-echarts-frame";
+import crateForm from './crateForm.vue';
 import { pieOption } from './options'
 
 import * as echarts from 'echarts';
@@ -148,10 +161,15 @@ export default {
   components: {
     cptCard,
     screenTable,
-    screenEchartsFrame
+    screenEchartsFrame,
+    crateForm
   },
   data() {
     return {
+      memberDialog: false,
+      disabled: true,
+      memberDetailInfo: {},
+      optionsG: [],
       headerList: [
         { title: "序号", coulmn: 'index' },
         { title: "姓名", coulmn: 'name' },
@@ -289,7 +307,32 @@ export default {
     
     // this.initChartType()
   },
+  async created() {
+    this.getGridList('query')
+  },
   methods: {
+    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
@@ -719,14 +762,32 @@ export default {
       return arr
     },
     handleClickRow(val) {
-      console.log('click-row----', val)
-      if (!val.icResiUser) {
-        return this.$message.warning('该党员居民信息未完善')
-      }
+      this.getDetail(val.userId)
+      this.memberDialog = true
+    },
+    jumpDetail (val) {
+      this.memberDialog = false
       this.$router.push({
-        path: `/main-shuju/visual-basicinfo-people/${val.icResiUser}`,
+        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('-')

From 39973e940acfd6840811e68679790cd93cec0356 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 2 Sep 2022 13:29:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/communityParty/crateForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityParty/crateForm.vue b/src/views/modules/visual/communityParty/crateForm.vue
index 86ed68e07..35f50f53a 100644
--- a/src/views/modules/visual/communityParty/crateForm.vue
+++ b/src/views/modules/visual/communityParty/crateForm.vue
@@ -95,7 +95,7 @@
       </el-form-item>
       <div >
         <div style="margin-top: 20px; text-align: center;">
-            <el-button size="small" @click="handleCancle">取消</el-button>
+            <el-button size="small" :disabled="false" @click="handleCancle">取消</el-button>
             <el-button
               v-if="form.icResiUser != null && form.icResiUser != ''"
               type="primary"

From 5ca0a953c56263fec2c40eca1f6ce769301c0b1e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 6 Sep 2022 15:38:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=85=9A?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityParty/crateForm.vue       | 286 ++++++++--------
 .../modules/visual/communityParty/party.vue   | 306 +++++++++---------
 2 files changed, 302 insertions(+), 290 deletions(-)

diff --git a/src/views/modules/visual/communityParty/crateForm.vue b/src/views/modules/visual/communityParty/crateForm.vue
index 35f50f53a..ff37c1c27 100644
--- a/src/views/modules/visual/communityParty/crateForm.vue
+++ b/src/views/modules/visual/communityParty/crateForm.vue
@@ -1,121 +1,113 @@
 <template>
-  <div class="dialog-h-content scroll-h pd0">
-    <el-form label-width="120px" :model="form" :inline="true" 
-      :disabled="disabled" :rules="rules" ref="ruleForm" 
-      class="form-wr">
-      <div class="flex-div">
-        <el-form-item label="所属党组织" prop="sszb" class="wd50">
-          <el-cascader
-                v-model="form.sszb"
-                :options="partyList"
-                :props="partyProps"
-                clearable
-                 class="input-width"
-                @change="handlePartyChange"></el-cascader>
-        </el-form-item>
-        <el-form-item label="党员中心户" prop="isDyzxh" class="wd50">
-          <el-radio-group v-model="form.isDyzxh">
-              <el-radio label="1">是</el-radio>
-              <el-radio label="0">否</el-radio>
-            </el-radio-group>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="姓名" prop="name" class="wd50">
-          <el-input v-model="form.name" placeholder="请输入" :disabled="disabled" class="input-width" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="免学习" prop="isMxx" class="wd50">
-          <el-radio-group v-model="form.isMxx">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="手机号" prop="mobile" class="wd50">
-          <el-input v-model="form.mobile" placeholder="请输入" :disabled="disabled" class="input-width" clearable />
-        </el-form-item>
-        <el-form-item label="职务" prop="partyZw" class="wd50">
-          <el-select v-model="form.partyZw" filterable :disabled="disabled" placeholder="请选择" class="input-width" clearable>
-            <el-option
-              v-for="item in zwList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="身份证" prop="idCard" class="wd50">
-          <el-input v-model="form.idCard" placeholder="请输入" :disabled="disabled" 
-          class="input-width" clearable @blur="handleValidBlur" />
-        </el-form-item>
-        <el-form-item label="文化程度" prop="culture" class="wd50">
-          <el-select v-model="form.culture" filterable :disabled="disabled" placeholder="请选择" class="input-width" clearable>
-            <el-option
-              v-for="item in eduList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="地址" prop="address" class="wd50">
-          <el-input v-model="form.address" placeholder="请输入" :disabled="disabled || isAuto" class="input-width" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="入党时间" prop="rdsj" class="wd50">
-          <el-date-picker
-            v-model="form.rdsj"
-             :disabled="disabled"
-            type="date"
-            class="input-width"
-            clearable
-            placeholder="选择日期"
-            format="yyyy 年 MM 月 dd 日"
-            value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="流动党员" prop="isLd" class="wd50">
-          <el-radio-group v-model="form.isLd" class="input-width">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="流动党员号" prop="ldzh" class="wd50">
-          <el-input v-model="form.ldzh" placeholder="请输入" :disabled="disabled" class="input-width" clearable></el-input>
-        </el-form-item>
-      </div>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" :autosize="{ minRows: 4, maxRows: 10}" :disabled="disabled" type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <div >
-        <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 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.mobile }}</span>
+              </div>
+              <div class="info-prop">
+                <span>身份证：</span>
+                <span>{{ form.idCard }}</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>
-      
-    </el-form>
+        </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: {
@@ -124,14 +116,14 @@ export default {
     },
     info: {
       type: Object,
-      default: () => {}
+      default: () => { }
     },
     disabled: {
       type: Boolean,
       default: false
     }
   },
-  data() {
+  data () {
     let checkMObile = (rule, value, callback) => {
       if (value === '') {
         callback(new Error('请输入手机号'))
@@ -208,7 +200,7 @@ export default {
   },
   watch: {
     info: {
-      handler(val) {
+      handler (val) {
         if (Object.keys(val).length > 0) {
           this.form = { ...val }
           if (val.icResiUserId || val.icResiUser) this.isAuto = true
@@ -222,36 +214,32 @@ export default {
       immediate: true
     }
   },
-  created() {
+  created () {
     this.getEduList()
     console.log('partyList', this.partyList)
   },
-  mounted() {
-    const w = document.getElementsByClassName('dialog-h-content')[0]
-    this.formItemWd = w.clientWidth + 'px'
+  mounted () {
+    // const w = document.getElementsByClassName('dialog-h-content')[0]
+    // this.formItemWd = w.clientWidth + 'px'
   },
-  destroyed() {
+  destroyed () {
     // this.$refs['ruleForm'].resetFields()
   },
   methods: {
-    handleCancle() {
-      this.$refs['ruleForm'].resetFields()
+
+
+    handleCancle () {
+      // this.$refs['ruleForm'].resetFields()
       this.$emit('cancle')
     },
-    handlePartyChange(val) {
-      console.log('val------pp', val)
-      // if (val.length > 0) {
-      //   const i = val.length - 1
-      //   this.form.sszb = val[i]
-      // } else this.form.sszb = ''
-    },
-    handleValidBlur(n) {
+
+    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() {
+    async getEduList () {
       await this.$http
         .post('/sys/dict/data/education')
         .then(({ data: res }) => {
@@ -259,14 +247,14 @@ export default {
             return this.$message.error(res.msg)
           } else {
             this.eduList = res.data
-          } 
+          }
         })
         .catch(err => {
           console.log('err', err)
           return this.$message.error('网络错误')
         })
     },
-    async validateResi() {
+    async validateResi () {
       const params = {
         idCard: this.form.idCard,
         agencyId: this.$store.state.user.agencyId
@@ -285,15 +273,15 @@ export default {
               this.form.address = ''
               this.isAuto = false
             }
-            
-          } 
+
+          }
         })
         .catch(err => {
           console.log('err', err)
           return this.$message.error('网络错误')
         })
     },
-    hadnleSubmitbase() {
+    hadnleSubmitbase () {
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
           if (Object.keys(this.info).length > 0) this.editBase()
@@ -304,7 +292,7 @@ export default {
         }
       });
     },
-    handleSavePoints(data) {
+    handleSavePoints (data) {
 
       const _data = { ...data }
       const params = {
@@ -316,10 +304,10 @@ export default {
       }
       this.savePoints(params)
     },
-    async jump(icResiUserId) {
+    async jump (icResiUserId) {
       this.$emit('saveBase', icResiUserId)
     },
-    async saveBase() {
+    async saveBase () {
       const params = {
         ...this.form
       }
@@ -332,15 +320,15 @@ export default {
             this.$message.success('保存成功')
             this.partymenberid = res.data
             this.$emit('saveBase', true)
-            
-          } 
+
+          }
         })
         .catch(err => {
           console.log('err', err)
           return this.$message.error('网络错误')
         })
     },
-    async editBase() {
+    async editBase () {
       const params = {
         ...this.form
       }
@@ -353,15 +341,15 @@ export default {
             this.$message.success('保存成功')
             this.partymenberid = res.data
             this.$emit('saveBase', true)
-            
-          } 
+
+          }
         })
         .catch(err => {
           console.log('err', err)
           return this.$message.error('网络错误')
         })
     },
-    async savePoints(form) {
+    async savePoints (form) {
       const params = {
         ...form,
         partyMemberId: this.partymenberid
@@ -376,15 +364,15 @@ export default {
             return this.$message.error(res.msg)
           } else {
             this.$message.success('保存成功')
-            
-          } 
+
+          }
         })
         .catch(err => {
           console.log('err', err)
           return this.$message.error('网络错误')
         })
     },
-    async saveRecord(form) {
+    async saveRecord (form) {
       const params = {
         ...form,
         partyMemberId: this.partymenberid
@@ -396,8 +384,8 @@ export default {
             return this.$message.error(res.msg)
           } else {
             this.$message.success('保存成功')
-            
-          } 
+
+          }
         })
         .catch(err => {
           console.log('err', err)
@@ -428,4 +416,10 @@ export default {
 .pd0 {
   padding: 0 !important;
 }
-</style>
\ No newline at end of file
+</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/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index f318f3eef..637d14fe3 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -2,7 +2,8 @@
   <div class="warning-box">
     <cpt-card :min-full-screen="true">
       <div class="card-title">
-        <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
+        <img class="title-icon"
+             src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           党员信息统计&nbsp;&nbsp;
           <!-- <el-cascader 
@@ -13,18 +14,18 @@
             :getCheckedNodes="getCheckedNodes"
             clearable @change="handleCascader">
           </el-cascader> -->
-          <el-cascader 
-            v-model="partyOrgs"
-            :options="partyOrgList" 
-            :props="{
+          <el-cascader v-model="partyOrgs"
+                       :options="partyOrgList"
+                       :props="{
               label: 'partyOrgName',
               value: 'id',
               checkStrictly: true 
-            }" 
-            :show-all-levels="false"
-            clearable @change="handlePartyCascader">
+            }"
+                       :show-all-levels="false"
+                       clearable
+                       @change="handlePartyCascader">
           </el-cascader>
-        </div> 
+        </div>
       </div>
       <div class="card-echart">
         <div class="card-left">
@@ -33,14 +34,17 @@
             <div class="echart-wr">
               <!-- <div class="echart-cicle"></div>  -->
               <screen-echarts-frame class="echart-org"
-                              @myChartMethod="pieInitOk"
-                              ref="ageChart"></screen-echarts-frame>
+                                    @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">
+                <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">
@@ -48,34 +52,33 @@
                     <div class="tips-item-has">{{ item.radio }}</div>
                   </div>
                 </div>
-                
+
               </div>
             </div>
-            
+
           </div>
           <div class="ecahrts-button">
-            <el-button type="warning" size="small" @click="handleExport('age')">导出</el-button>
+            <el-button type="warning"
+                       size="small"
+                       @click="handleExport('age')">导出</el-button>
           </div>
           <div class="warning-box-bottom">
-            <screen-table
-              :headerList="headerList"
-              :tableData="ageList"
-              :headerStyle="headerStyle"
-              :tableContentStyle="headerStyle"
-              :visibleLoading="visibleAgeLoading"
-              :operate="false"
-              @row="handleClickRow"
-            ></screen-table>
+            <screen-table :headerList="headerList"
+                          :tableData="ageList"
+                          :headerStyle="headerStyle"
+                          :tableContentStyle="headerStyle"
+                          :visibleLoading="visibleAgeLoading"
+                          :operate="false"
+                          @row="handleClickRow"></screen-table>
             <div class="pagination">
               <el-pagination hide-on-single-page
-                :current-page="agePageNo"
-                :page-size="agePageSize"
-                background
-                layout="prev, pager, next"
-                @size-change="pageSizeChangeHandleAge"
-                @current-change="pageCurrentChangeHandleAge"
-                :total="ageTotal"
-              >
+                             :current-page="agePageNo"
+                             :page-size="agePageSize"
+                             background
+                             layout="prev, pager, next"
+                             @size-change="pageSizeChangeHandleAge"
+                             @current-change="pageCurrentChangeHandleAge"
+                             :total="ageTotal">
               </el-pagination>
             </div>
           </div>
@@ -87,51 +90,60 @@
               <!-- <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>
+                                    @myChartMethod="pieInitOks"
+                                    ref="eduChart"></screen-echarts-frame>
             </div>
-            <div v-if="false" class="echarts-tips">
+            <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 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="warning" size="small" @click="handleExport('edu')">导出</el-button>
+            <el-button type="warning"
+                       size="small"
+                       @click="handleExport('edu')">导出</el-button>
           </div>
           <div class="warning-box-bottom">
-            <screen-table
-              :headerList="headerEduList"
-              :tableData="eduList"
-              :headerStyle="headerStyle"
-              :tableContentStyle="headerStyle"
-              :visibleLoading="visibleLoading"
-              :operate="false"
-              @row="handleClickRow"
-            ></screen-table>
+            <screen-table :headerList="headerEduList"
+                          :tableData="eduList"
+                          :headerStyle="headerStyle"
+                          :tableContentStyle="headerStyle"
+                          :visibleLoading="visibleLoading"
+                          :operate="false"
+                          @row="handleClickRow"></screen-table>
             <div class="pagination">
               <el-pagination hide-on-single-page
-                :current-page="pageNo"
-                :page-size="pageSize"
-                background
-                layout="prev, pager, next"
-                @size-change="pageSizeChangeHandleNew"
-                @current-change="pageCurrentChangeHandleNew"
-                :total="total"
-              >
+                             :current-page="pageNo"
+                             :page-size="pageSize"
+                             background
+                             layout="prev, pager, next"
+                             @size-change="pageSizeChangeHandleNew"
+                             @current-change="pageCurrentChangeHandleNew"
+                             :total="total">
               </el-pagination>
             </div>
           </div>
         </div>
       </div>
 
-      
     </cpt-card>
-    <el-dialog
+
+    <crate-form v-if="memberDialog"
+                :info="memberDetailInfo"
+                :partyList="optionsG"
+                :disabled="disabled"
+                @saveBase="jumpDetail"
+                @cancle="handlerCancle" />
+    <!-- <el-dialog
             title="党员信息"
             :visible.sync="memberDialog"
             width="60%"
@@ -142,7 +154,7 @@
             :before-close="handlerCancle">
       <crate-form v-if="memberDialog" :info="memberDetailInfo" :partyList="optionsG" :disabled="disabled"
                   @saveBase="jumpDetail" @cancle="handlerCancle" />
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -164,7 +176,7 @@ export default {
     screenEchartsFrame,
     crateForm
   },
-  data() {
+  data () {
     return {
       memberDialog: false,
       disabled: true,
@@ -290,7 +302,7 @@ export default {
       pieEduOptions: null
     };
   },
-  async mounted() {
+  async mounted () {
     await nextTick(100);
     // await this.getAgencyList()
     await this.getPartyOggList()
@@ -298,16 +310,16 @@ export default {
     // 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.getAgeCount()
     this.getEduCount()
     this.getAgeList()
     this.getEduList()
     // this.initAgeCharts()
     // this.initEduCharts()
-    
+
     // this.initChartType()
   },
-  async created() {
+  async created () {
     this.getGridList('query')
   },
   methods: {
@@ -317,21 +329,21 @@ export default {
     handlerCancle () {
       this.memberDialog = false
     },
-    async getGridList(type, agencyId) {
+    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('网络错误')
-              })
+        .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)
@@ -345,11 +357,11 @@ export default {
       // this.pieInitState = true
 
     },
-    initAgeCharts() {
+    initAgeCharts () {
       // const eId = document.getElementById('echartOrg')
       // let _charts = echarts.init(eId)
       let option = {
-      
+
       }
       this.pieAgeOptions = pieOption(this.pieAgeChartS)
       this.clickAgePie(0)
@@ -375,11 +387,11 @@ export default {
       // option && this.$refs.pieChart.setOption(option);
 
     },
-    initEduCharts() {
+    initEduCharts () {
       // const eId = document.getElementById('echartOrg')
       // let _charts = echarts.init(eId)
       let option = {
-      
+
       }
       let legend = {
         show: true,
@@ -437,7 +449,7 @@ export default {
       // option && this.$refs.pieChart.setOption(option);
 
     },
-    
+
     clickAgePie (seriesIndex) {
       let _code = ''
       let isClick = false
@@ -445,7 +457,7 @@ export default {
       this.ageItem.forEach((element, index) => {
         if (index === seriesIndex) {
           _code = element.code
-          
+
           if (!this.noInit) isClick = false
           else {
             element.isClick = !element.isClick
@@ -557,10 +569,10 @@ export default {
 
       }
       this.noEduInit = true
-      
+
 
     },
-    async getAgeCount(orgId, orgType) {
+    async getAgeCount (orgId, orgType) {
       // const url = "/epmetuser/icresiuser/partymemberagestatistics";
       const url = '/resi/partymember/icPartyMember/partymemberagestatistics'
       let params = {
@@ -610,7 +622,7 @@ export default {
       } else {
       }
     },
-    async getEduCount(orgId, orgType) {
+    async getEduCount (orgId, orgType) {
       // const url = "/epmetuser/icresiuser/partymembereducationstatistics";
       const url = '/resi/partymember/icPartyMember/partymembereducationstatistics'
       let params = {
@@ -634,8 +646,8 @@ export default {
       } else {
       }
     },
-    async getAgeList(orgId, orgType, _code) {
-      
+    async getAgeList (orgId, orgType, _code) {
+
       this.visibleAgeLoading = true
       // const url = "/epmetuser/icresiuser/partymemberagelist";
       const url = '/resi/partymember/icPartyMember/partymemberagelist'
@@ -661,7 +673,7 @@ export default {
       // if (_code == 0 || _code) this.noInit = true
       this.visibleAgeLoading = false
     },
-    async getEduList(orgId, orgType, _code) {
+    async getEduList (orgId, orgType, _code) {
       this.visibleLoading = true
       // const url = "/epmetuser/icresiuser/partymembereducationlist";
       const url = '/resi/partymember/icPartyMember/partymembereducationlist'
@@ -687,34 +699,34 @@ export default {
       }
       this.visibleLoading = false
     },
-    async getPartyOggList(node, resolve) {
+    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'
+      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) {
+    deepArrTOnull (arr) {
       let a = []
       a = arr.map(item => {
         return {
           ...item,
-          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
         }
       })
       return a
     },
-    async getAgencyList(node, resolve) {
+    async getAgencyList (node, resolve) {
       // const url = "/gov/org/customeragency/staffinagencylist";
       const url = '/gov/org/customeragency/agencygridtree'
       // let params = {
@@ -733,25 +745,26 @@ export default {
       } else {
       }
     },
-    getTreeData(data){
+    getTreeData (data) {
       if (!Array.isArray(data)) return []
       let arr = data.map(item => {
         let _item = {}
         if (item.subAgencyList) {
           if (item.subAgencyList.length === 0) {
-            _item = { 
+            _item = {
               label: item.agencyName,
               value: item.agencyId + '-' + item.level,
               level: item.level,
-              children: undefined 
+              children: undefined
             }
-          } else _item = { 
+          } else _item = {
             label: item.agencyName,
             value: item.agencyId + '-' + item.level,
             level: item.level,
-            children: this.getTreeData(item.subAgencyList)}
+            children: this.getTreeData(item.subAgencyList)
+          }
         } else {
-          _item = { 
+          _item = {
             label: item.agencyName,
             value: item.agencyId + '-' + item.level,
             level: item.level,
@@ -761,7 +774,7 @@ export default {
       })
       return arr
     },
-    handleClickRow(val) {
+    handleClickRow (val) {
       this.getDetail(val.userId)
       this.memberDialog = true
     },
@@ -771,27 +784,27 @@ export default {
         path: `/main-shuju/visual-basicinfo-people/${val}`,
       });
     },
-    getDetail(id) {
+    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('网络错误')
-          })
+        .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) {
+    handleCascader (val) {
       console.log('val-vvv', val)
       const _arr = val[val.length - 1].split('-')
-      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
       this.agencyId = _arr[0]
       this.orgType = orgType
       this.noInit = false
@@ -803,7 +816,7 @@ export default {
       this.getAgeList(_arr[0], orgType)
       this.getEduList(_arr[0], orgType)
     },
-    handlePartyCascader(val) {
+    handlePartyCascader (val) {
       console.log('val-vvvpppppp', val)
       this.noInit = false
       this.noEduInit = false
@@ -823,17 +836,17 @@ export default {
         this.getAgeList('')
         this.getEduList('')
       }
-      
+
     },
-    getCheckedNodes(val) {
+    getCheckedNodes (val) {
       console.log('val-nnn', val)
     },
-    lazyLoad(node, resolve) {
+    lazyLoad (node, resolve) {
       setTimeout(() => {
         this.getAgeList(node, resolve)
       }, 500)
     },
-    pageSizeChangeHandleAge(val) {
+    pageSizeChangeHandleAge (val) {
       this.agePageNo = 1
       this.agePageSize = val
       this.getAgeList(this.agencyId, this.orgType, this.ageCode)
@@ -842,22 +855,22 @@ export default {
       this.agePageNo = val
       this.getAgeList(this.agencyId, this.orgType, this.ageCode)
     },
-    pageSizeChangeHandleNew(val) {
+    pageSizeChangeHandleNew (val) {
       this.pageNo = 1;
       this.pageSize = val;
       this.getEduList(this.agencyId, this.orgType, this.eduCode)
     },
-    pageCurrentChangeHandleNew(val) {
+    pageCurrentChangeHandleNew (val) {
       this.pageNo = val;
       this.getEduList(this.agencyId, this.orgType, this.eduCode)
     },
-    async handleExport(type) {
+    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'
+      const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
       let params = {
         orgId: _arr[0],
         orgType: orgType,
@@ -939,8 +952,8 @@ export default {
         color: #fff;
         line-height: 24px;
         text-align: center;
-        background: #06186D;
-        border: 1px solid #1A64CC;
+        background: #06186d;
+        border: 1px solid #1a64cc;
         border-radius: 2px;
       }
       .el-input__prefix {
@@ -952,15 +965,13 @@ export default {
           line-height: 24px;
         }
       }
-      
     }
   }
- .title-label {
+  .title-label {
     font-size: 22px;
     font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
-      
       width: 180px;
       .el-input__inner {
         font-size: 18px;
@@ -970,7 +981,7 @@ export default {
         border: 1px solid #1a64cc;
       }
       .el-icon-arrow-down::before {
-          content: "\e790";
+        content: "\e790";
       }
     }
   }
@@ -998,7 +1009,7 @@ export default {
   color: #fff;
 }
 .card-left-title::after {
-  content: '';
+  content: "";
   position: absolute;
   top: 50%;
   left: 20px;
@@ -1006,7 +1017,7 @@ export default {
   height: 12px;
   box-sizing: border-box;
   margin-top: -6px;
-  background: #2865FA;
+  background: #2865fa;
   border-radius: 50%;
 }
 .echart-wr {
@@ -1049,7 +1060,10 @@ export default {
 .echarts-tips-wd50 {
   width: 320px;
 }
-.tips-list, .tips-item, .tips-lists, .tips-items-num {
+.tips-list,
+.tips-item,
+.tips-lists,
+.tips-items-num {
   display: flex;
   align-items: center;
 }
@@ -1069,12 +1083,12 @@ export default {
       height: 10px;
       box-sizing: border-box;
       margin-right: 8px;
-      background: #1B51FF;
+      background: #1b51ff;
       border-radius: 2px;
     }
     .tips-item-text {
       font-size: 16px;
-      color: #D2E7FF;
+      color: #d2e7ff;
     }
   }
 }
@@ -1095,19 +1109,24 @@ export default {
       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;
+      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;
+        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;
+        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;
+        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;
+        background: url("../../../../assets/img/shuju/measure/lanlv@2x.png")
+          no-repeat left bottom;
       }
     }
     .tips-items-num {
@@ -1135,8 +1154,7 @@ export default {
   padding-right: 30px;
   text-align: right;
   ::v-deep .el-button--warning {
-
-    background: linear-gradient(90deg, #0863EA, #3B9FFC);
+    background: linear-gradient(90deg, #0863ea, #3b9ffc);
     border: 0;
   }
 }