diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 7b4fd53..dc8427d 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -1030,7 +1030,11 @@ export default {
   }
 }
 </style>
-
+<style scoped>
+  /deep/ .el-table .cell.el-tooltip{
+    font-size:18px !important;
+  }
+</style>
 <style>
 .xy-table__row-fade {
   animation: fade-in-row 600ms;
diff --git a/src/views/component/table.vue b/src/views/component/table.vue
index c186ea8..90d118d 100644
--- a/src/views/component/table.vue
+++ b/src/views/component/table.vue
@@ -548,7 +548,7 @@ export default {
             {
               prop: i.field,
               label: i.name,
-              width: i.width,
+              width: i.width==0?'120':i.width,
               fixed: i.is_fixed,
               align: i.width==240?'left':'center'
             },
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index 69fb708..acf9e2d 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -5,16 +5,33 @@
       <lx-header icon="md-apps" text="档案管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <slot>
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
-            <Input v-model="select.keyword" style="width: 200px;margin-right: 10px;" placeholder="搜索姓名" />
-            <el-select class='street' v-model="select.street" placeholder="请选择" clearable>
+            <Input v-model="select.keyword" style="width: 150px;margin-right: 10px;" placeholder="搜索姓名" />
+            <el-select class='street' v-model="select.street" placeholder="请选择街道" clearable>
                 <el-option
-                  v-for="item in streetList"
+                  v-for="item in lists.streetList"
                   :key="item.value"
                   :label="item.value"
                   :value="item.value">
                 </el-option>
-              </el-select>
+              </el-select>
+              <el-select class='street' v-model="select.disabilityType" placeholder="请选择残疾类别" clearable>
+                  <el-option
+                    v-for="item in lists.disabilitytypeList"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+                <el-select class='street' v-model="select.disabilityLevel" placeholder="请选择残疾等级" clearable>
+                    <el-option
+                      v-for="item in lists.disabilitylevelList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
             <Button type="primary" @click="getindex">查询</Button>
+            <Button type="primary" style="margin-left: 10px;" @click="resetindex">重置</Button>
             <Button type="primary" style="margin-left: 10px;"
               @click="$refs['addRecord'].isShow = true,$refs['addRecord'].type = 'add'">添加</Button>
             <Button type="primary" style="margin-left: 10px;"
@@ -85,9 +102,15 @@
           pageSize: 40,
           pageIndex: 1,
           keyword: "",
-          street:''
+          street:'',
+          disabilityLevel:"",
+          disabilityType:""
         },
-        streetList:[],
+        lists:{
+          disabilitytypeList: [],
+          disabilitylevelList: [],
+          streetList:[]
+        },
         customForm: {
           customFormId: 1,
           tableName: "records"
@@ -101,14 +124,14 @@
             label: '序号',
             type: 'index',
             fixed: 'left',
-            width: 80
+            width: 60
           },
-          {
-            label: "所属街道",
-            width: 120,
-            prop: 'street',
-            align: 'center'
-          },
+          // {
+          //   label: "所属街道",
+          //   width: 120,
+          //   prop: 'street',
+          //   align: 'center'
+          // },
           {
             label: "姓名",
             width: 120,
@@ -118,70 +141,94 @@
           },
           {
             label: "性别",
-            width: 120,
+            width: 80,
             prop: 'sex',
-            align: 'center'
-          },
-          {
-            label: "身份证号",
-            width: 180,
-            prop: 'idcard',
-            align: 'center'
-          },
-          {
-            label: "联系电话",
-            width: 120,
-            prop: 'mobile',
-            align: 'center'
-          },
-          {
-            label: "固话",
-            width: 120,
-            prop: 'telephone',
-            align: 'center'
-          },
-          {
-            label: "残疾证号",
-            width: 180,
-            prop: 'number',
-            align: 'center'
+            align: 'center',
+          },
+          {
+            label: "年龄",
+            width: 80,
+            prop: 'idcard',
+            align: 'center',
+            formatter:(cell,data,value)=>{
+              return this.getName(value)
+            }
           },
+          // {
+          //   label: "身份证号",
+          //   width: 180,
+          //   prop: 'idcard',
+          //   align: 'center'
+          // },
+          // {
+          //   label: "联系电话",
+          //   width: 120,
+          //   prop: 'mobile',
+          //   align: 'center'
+          // },
+          // {
+          //   label: "固话",
+          //   width: 120,
+          //   prop: 'telephone',
+          //   align: 'center'
+          // },
+          // {
+          //   label: "残疾证号",
+          //   width: 180,
+          //   prop: 'number',
+          //   align: 'center'
+          // },
           {
             label: "残疾类别",
-            width: 120,
+            width: 80,
             prop: 'disabilitytype',
             align: 'center'
           },
           {
             label: "残疾等级",
-            width: 120,
+            width: 80,
             prop: 'disabilitylevel',
             align: 'center'
+          },
+          {
+            label: "户籍地址",
+            // width: 240,
+            prop: 'address',
+            align: 'left',
+            formatter:(cell,data,value)=>{
+              return value.indexOf('江苏省常州市金坛区')>-1? value.replace('江苏省常州市金坛区',''):value
+            }
           },
-          {
-            label: "有效期至",
-            width: 180,
-            prop: 'validity',
-            align: 'center'
-          },
-          {
-            label: "户籍地址",
-            width: 240,
-            prop: 'address',
-            align: 'left'
-          },
-          {
-            label: "现居住地",
-            width: 240,
-            prop: 'reside',
-            align: 'left'
-          }
+          // {
+          //   label: "有效期至",
+          //   width: 180,
+          //   prop: 'validity',
+          //   align: 'center'
+          // },
+
+          // {
+          //   label: "现居住地",
+          //   width: 240,
+          //   prop: 'reside',
+          //   align: 'left'
+          // }
         ]
       }
     },
     methods: {
       showInfo(id) {
         this.$router.push({path:"/record/personinfo",query:{id:id}})
+      },
+      resetindex(){
+        this.select = {
+          pageSize: 40,
+          pageIndex: 1,
+          keyword: "",
+          street:'',
+          disabilityLevel:"",
+          disabilityType:""
+        }
+        this.getindex()
       },
       async getindex() {
         const res = await index({
@@ -197,6 +244,14 @@
             "key": "street",
             "op": "eq",
             "value": this.select.street
+          },{
+            "key": "disabilitytype",
+            "op": "eq",
+            "value": this.select.disabilityType
+          },{
+            "key": "disabilitylevel",
+            "op": "eq",
+            "value": this.select.disabilityLevel
           }],
         })
         this.list = res.data
@@ -230,7 +285,28 @@
           })
           this.getindex()
         })
-      },
+      },
+      getName(iden) {
+          let val = iden.length;
+          let myDate = new Date();
+          let month = myDate.getMonth() + 1;
+          let day = myDate.getDate();
+          let age = 0;
+
+          if (val === 18) {
+            age = myDate.getFullYear() - iden.substring(6, 10) - 1;
+
+            if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++;
+
+          }
+          if (val === 15) {
+            age = myDate.getFullYear() - iden.substring(6, 8) - 1901;
+
+            if (iden.substring(8, 10) < month || iden.substring(8, 10) == month && iden.substring(10, 12) <= day) age++;
+          }
+
+          return age
+        },
       // 获取表信息
       async getField() {
         // console.log(this.$route.meta.params, "---", this.$route)
@@ -311,16 +387,26 @@
           const wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' });
           saveAs(new Blob([wbout], { type: 'application/octet-stream' }), `${sheetName}.xlsx`);
         }
+      },
+      async getLabel() {
+        let numbers = {
+          number:['streetList','disabilitylevelList','disabilitytypeList']
+        }
+        const res = await getparameter(numbers);
+        for(var k of res){
+          for(var m in this.lists){
+            if(m==k.number){
+              this.lists[m] = k.detail
+            }
+          }
+        }
       },
     },
     mounted() {
       this.getindex()
       this.getField()
-      getparameter({
-        number:'streetList'
-      }).then(res=>{
-        this.streetList = res.detail
-      })
+      this.getLabel()
+
     }
 
   }
@@ -328,7 +414,8 @@
 
 <style scoped>
   .street{
-    margin-right:10px
+    margin-right:10px;
+    width:150px
   }
   /deep/ .street .el-input__inner{
     height:32px;
diff --git a/src/views/record/personinfo.vue b/src/views/record/personinfo.vue
index 7b8c0b3..c35396e 100644
--- a/src/views/record/personinfo.vue
+++ b/src/views/record/personinfo.vue
@@ -3,6 +3,10 @@
     <!--    <el-button type="primary" @click="$refs.flow.addNode('测试节点')">添加节点</el-button>
     <el-button type="primary" @click="handleNext">下一个节点</el-button>
     <br /><br /> -->
+    <div class="curvedarrow-upleft curvedarrow"></div>
+    <div class="curvedarrow-upright curvedarrow"></div>
+    <div class="curvedarrow-bottomleft curvedarrow"></div>
+    <div class="curvedarrow-bottomright curvedarrow"></div>
     <avue-flow :height="mapHeight" width="100%" ref="flow" :option="option" v-model="form">
       <template slot-scope="scope" slot="header">
         <!-- <i class="el-icon-delete" @click="$refs.flow.deleteNode(scope.node.id)"></i> -->
@@ -15,13 +19,13 @@
   </div>
 
 </template>
-<script>
-  import {
-    show
-  } from "@/api/system/baseForm.js"
-  import {
-    getSsttIndex
-  } from "@/api/sstt"
+<script>
+  import {
+    show
+  } from "@/api/system/baseForm.js"
+  import {
+    getSsttIndex
+  } from "@/api/sstt"
   import {
     Message
   } from 'element-ui'
@@ -30,23 +34,23 @@
       return {
         count: 0,
         form: '',
-        mapHeight: 0,
-        idcard:'',
+        mapHeight: 0,
+        idcard: '',
         option: {
           "name": "视图",
           "nodeList": [{
               "id": "all",
               "name": "人员",
               "left": 550,
-              "top": 320,
-              "content":''
+              "top": 320,
+              "content": ''
             },
             {
               "id": "person",
               "name": "个人信息",
               "left": 200,
-              "top": 80,
-              "content":''
+              "top": 80,
+              "content": ''
             },
             {
               "id": "business",
@@ -58,34 +62,34 @@
               "id": "view",
               "name": "访视信息",
               "left": 900,
-              "top": 480,
-              "content":''
-            },
-            {
-              "id": "raises",
-              "name": "居家照护",
-              "left": 200,
-              "top": 480,
-              "content":''
-            }
-          ],
-          "lineList": [{
-              "from": "all",
-              "to": "person"
-            },
-            {
-              "from": "all",
-              "to": "business"
+              "top": 480,
+              "content": ''
             },
             {
-              "from": "all",
-              "to": "view"
-            },
-            {
-              "from": "all",
-              "to": "raises"
+              "id": "raises",
+              "name": "居家照护",
+              "left": 200,
+              "top": 480,
+              "content": ''
             }
-          ]
+          ],
+          // "lineList": [{
+          //     "from": "all",
+          //     "to": "person"
+          //   },
+          //   {
+          //     "from": "all",
+          //     "to": "business"
+          //   },
+          //   {
+          //     "from": "all",
+          //     "to": "view"
+          //   },
+          //   {
+          //     "from": "all",
+          //     "to": "raises"
+          //   }
+          // ]
         }
       }
     },
@@ -99,74 +103,76 @@
         let winHeight = document.body.clientHeight
         this.mapHeight = winHeight - 50 - 20
         console.log(winHeight)
-      },
-      getPerson(){
-        if (this.$route.query?.id) {
-          let id = this.$route.query.id
-          this.showPersonInfo(id)
-        }else{
-          Message({
-            type:'warning',
-            message:'请先选择人员档案'
-          })
-        }
-      },
-      async showPersonInfo(id){
-        const res = await show({
-          id: id,
-          table_name: 'records'
-        })
-        let names = `<div class="persons">${res.name}</div>`
-        let contents = `<p>姓名：${res.name}</p><p>性别：${res.sex}</p><p>残疾类别：${res.disabilitytype}</p><p>残疾等级：${res?.disabilitylevel}</p><p>现居住地：${res.reside}</p>`
-        let views = ''
-        let workflows = ''
-        this.idcard = res.idcard
-        if(res.idcard_viewrecords_idcard_relation.length>0){
-          for(var k of res.idcard_viewrecords_idcard_relation){
-            if(k.checkstatus=='通过'){
-              views+=`<p>${k.viewtime?.substring(0,10)}/${k.viewscene}<p>`
-            }
-          }
-        }
-        if(res.idcard_workflows_idcard_relation.length>0){
-          for(var k of res.idcard_workflows_idcard_relation){
-
-            if(k.work_status=='通过'){
-              // 辅具适配
-              if(k.guanlianbiao=='assists'){
-                workflows+=`<p>${k.created_at?.substring(0,10)}/${k.guanlianbiaoming}<p>`
-                workflows+=`<p>管理年限：${k.detail.guanlinianxian}<p>`
-                workflows+=`<p>辅具类别：${k.detail.sub_type}<p>`
-                workflows+=`<p>可申请补贴金额：${k.detail.apply_money}<p>`
-                workflows+=`<p>已申请补贴金额：${k.detail.get_money}<p>`
-                 workflows+=`<p>结余金额：${k.detail.surplus_money}<p>`
-              }else{
-                 workflows+=`<p>${k.created_at?.substring(0,10)}/${k.guanlianbiaoming}<p>`
-              }
-
-            }
-          }
-        }
-
-        this.option['nodeList'][0]['content'] = names
-        this.option['nodeList'][1]['content'] = contents
-        this.option['nodeList'][2]['content'] = workflows
-        this.option['nodeList'][3]['content'] = views
-        this.getSstt()
-      },
-      getSstt(){
-        getSsttIndex({
-          idcard:this.idcard,
-          start_date:'2020-01-01',
-          page:1
-        }).then(res=>{
-          let raises = ''
-          for(var k of res){
-            raises+=`<p>${k.start_time?.substring(0,10)}/${k.status_text}<p>`
-          }
-          this.option['nodeList'][4]['content'] = raises
-        })
-      }
+      },
+      getPerson() {
+        if (this.$route.query?.id) {
+          let id = this.$route.query.id
+          this.showPersonInfo(id)
+        } else {
+          Message({
+            type: 'warning',
+            message: '请先选择人员档案'
+          })
+        }
+      },
+      async showPersonInfo(id) {
+        const res = await show({
+          id: id,
+          table_name: 'records'
+        })
+        let names = `<div class="persons">${res.name}</div>`
+        let contents =
+          `<p>姓名：${res.name}</p><p>性别：${res.sex}</p><p>残疾类别：${res.disabilitytype}</p><p>残疾等级：${res?.disabilitylevel}</p><p>现居住地：${res.reside}</p>`
+        let views = ''
+        let workflows = ''
+        this.idcard = res.idcard
+        if (res.idcard_viewrecords_idcard_relation.length > 0) {
+          for (var k of res.idcard_viewrecords_idcard_relation) {
+            if (k.checkstatus == '通过') {
+              views += `<p>${k.viewtime?.substring(0,10)}/${k.viewscene}<p>`
+            }
+          }
+        }
+        if (res.idcard_workflows_idcard_relation.length > 0) {
+          for (var k of res.idcard_workflows_idcard_relation) {
+
+            if (k.work_status == '通过') {
+              // 辅具适配
+              if (k.guanlianbiao == 'assists') {
+                workflows += `<p>${k.created_at?.substring(0,10)}/${k.guanlianbiaoming}<p>`
+                workflows += `<p>申请年限：${k.detail.shenqingnianxian}<p>`
+                workflows += `<p>管理年限：${k.detail.guanlinianxian}<p>`
+                workflows += `<p>辅具类别：${k.detail.sub_type}<p>`
+                workflows += `<p>可申请补贴金额：${k.detail.apply_money}<p>`
+                workflows += `<p>已申请补贴金额：${k.detail.get_money}<p>`
+                workflows += `<p>结余金额：${k.detail.surplus_money}<p>`
+              } else {
+                workflows += `<p>${k.created_at?.substring(0,10)}/${k.guanlianbiaoming}<p>`
+              }
+
+            }
+          }
+        }
+
+        this.option['nodeList'][0]['content'] = names
+        this.option['nodeList'][1]['content'] = contents
+        this.option['nodeList'][2]['content'] = workflows
+        this.option['nodeList'][3]['content'] = views
+        this.getSstt()
+      },
+      getSstt() {
+        getSsttIndex({
+          idcard: this.idcard,
+          start_date: '2020-01-01',
+          page: 1
+        }).then(res => {
+          let raises = ''
+          for (var k of res) {
+            raises += `<p>${k.start_time?.substring(0,10)}/${k.status_text}<p>`
+          }
+          this.option['nodeList'][4]['content'] = raises
+        })
+      }
 
     }
 
@@ -175,6 +181,67 @@
 </script>
 
 <style scoped>
+  .curvedarrow {
+    position: relative;
+    width: 0;
+    border-top: 30px solid transparent;
+    border-right: 30px solid #147d38;
+  }
+  .curvedarrow:after{
+    content: "";
+    position: absolute;
+    border: 0 solid transparent;
+    border-top: 10px solid #147d38;
+    border-radius: 100px 0 0 0;
+    top: -94px;
+    left: -167px;
+    width: 182px;
+    height: 99px;
+  }
+  .curvedarrow-upleft {
+    position: relative;
+    left: 483px;
+    top: 210px;
+    -webkit-transform: rotate(180deg) translateX(100%);
+    transform: rotate(194deg) translateX(100%);
+  }
+
+  .curvedarrow-upleft:after {
+    transform: rotate(45deg);
+  }
+
+  .curvedarrow-upright {
+    left: 842px;
+    top: 210px;
+    transform: rotate(-60deg) translateX(100%);
+  }
+
+  .curvedarrow-upright:after {
+    transform: rotate(45deg);
+  }
+
+  .curvedarrow-bottomleft {
+    left: 457px;
+    top: 447px;
+    transform: rotate(95deg) translateX(100%);
+  }
+
+  .curvedarrow-bottomleft:after {
+    transform: rotate(45deg);
+  }
+
+  .curvedarrow-bottomright {
+    left: 880px;
+    top: 350px;
+    transform: rotate(10deg) translateX(100%);
+  }
+
+  .curvedarrow-bottomright:after {
+    transform: rotate(45deg);
+  }
+  /deep/ .avue-flow{
+    margin-top:-120px
+  }
   /deep/ .avue-grid {
     background-image: none;
   }
@@ -182,21 +249,24 @@
   /deep/ .avue-flow__node {
     height: 300px;
     width: 250px;
-  }
-  /deep/ .avue-flow__node-drag{
-    display: none;
   }
-  /deep/ .avue-flow__node--active{
-    border-color: #147d38;
+
+  /deep/ .avue-flow__node-drag {
+    display: none;
+  }
+
+  /deep/ .avue-flow__node--active {
+    border-color: #147d38;
   }
+
   /deep/ .avue-flow__node-header {
     flex: none;
     height: 50px;
     line-height: 50px;
     text-align: center;
     color: #fff;
-    font-size: 24px;
-    background-color:#147d38
+    font-size: 24px;
+    background-color: #147d38
   }
 
   /deep/ .avue-flow__node-body {
@@ -204,22 +274,24 @@
     flex: none;
     overflow: auto;
     text-align: left;
-    padding: 15px;
-    font-size:15px;
+    padding: 15px;
+    font-size: 15px;
     align-items: normal;
-  }
-  /deep/ .jtk-droppable{
-    height: 300px!important;
-    width: 250px!important;
-  }
-  /deep/ .avue-flow__node-body .persons{
-        font-size: 26px;
-        text-align: center;
-        height: 150px;
-        width: 150px;
-        background: #ddd;
-        border-radius: 100%;
-        line-height: 150px;
-        margin: 35px auto;
+  }
+
+  /deep/ .jtk-droppable {
+    height: 300px !important;
+    width: 250px !important;
+  }
+
+  /deep/ .avue-flow__node-body .persons {
+    font-size: 26px;
+    text-align: center;
+    height: 150px;
+    width: 150px;
+    background: #ddd;
+    border-radius: 100%;
+    line-height: 150px;
+    margin: 35px auto;
   }
 </style>
diff --git a/src/views/record/street.vue b/src/views/record/street.vue
index bb76dba..cce3160 100644
--- a/src/views/record/street.vue
+++ b/src/views/record/street.vue
@@ -17,7 +17,7 @@
       </div>
       <div class="table-tree">
         <el-table :data="tableData" :height="tableHeight" class="v-table" style="width: 100%; margin-bottom: 20px"
-          row-key="id" border default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+          row-key="id" border :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
           <el-table-column type="index" align="center"> </el-table-column>
           <el-table-column prop="mingcheng" label="名称" sortable>
           </el-table-column>