diff --git a/pages/login/login.vue b/pages/login/login.vue
index 780289e..f9853b2 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -137,7 +137,7 @@ export default {
 			    })
 			    .catch((err) => {
 			        uni.showToast({
-			            title: res.msg,
+			            title: err.msg,
 			            icon: 'none',
 			            duration: 3000
 			        });
diff --git a/pages/resiAndHouse/resiAndHouse.vue b/pages/resiAndHouse/resiAndHouse.vue
index b3ebb5b..647b06a 100644
--- a/pages/resiAndHouse/resiAndHouse.vue
+++ b/pages/resiAndHouse/resiAndHouse.vue
@@ -52,7 +52,7 @@
         <view class="group_2" v-if="selectVale === 'resi'">
             <view class="section_2">
                 <view class="box_16">
-                    <jia-cascader :itemList="angencyList"  @completeChange="completeGrid" @inputChange="changeResiCascader" :border="false" :clearIcon="false"></jia-cascader>
+                    <jia-cascader v-if="selectVale === 'resi' && resiText" :itemList="angencyList"  @completeChange="completeGrid" @inputChange="changeResiCascader" :border="false" :clearIcon="false" :request="true" :receiveData="receiveData"  :placeholder="resiText"></jia-cascader>
                 </view>
                 <view class="box_17">
                     <view class="tabs">
@@ -220,13 +220,7 @@
         <view class="group_2" v-if="selectVale === 'house'">
             <view class="section_2">
                 <view class="box_16" v-if="!houseListSearchFlag">
-                    <text lines="1" class="text_4" @tap="handelClickShowTreeFw">{{ cascaderNameFw }}</text>
-                    <view class="image-text_9">
-                        <view class="image-text_qh">
-                            <image src="/static/images/swapHorizontal.png" class="image_8"></image>
-                            <text lines="1" class="text_5" @tap="handelClickShowTreeFw">切换</text>
-                        </view>
-                    </view>
+                    <jia-cascader v-if="houseText && selectVale === 'house'" :itemList="angencyFwList"  @completeChange="completeGrid1" @inputChange="changeHouseCascader" :border="false" :clearIcon="false" :request="true" :receiveData="receiveDataFw" :placeholder="houseText"></jia-cascader>
                 </view>
                 <view class="box_17" v-if="!houseListSearchFlag">
                     <view class="tabs">
@@ -363,20 +357,6 @@ export default {
             tableData: [],
             tableFwData: [],
 
-            resiList: [
-                {
-                    name: '',
-                    resiTags: [''],
-                    nationalityName: '',
-                    nationName: '',
-                    mobile: '',
-                    idNum: '',
-                    agencyName: '',
-                    homeName: '',
-                    updatedTime: ''
-                }
-            ],
-
             pageNo: 1,
             pageSize: 10,
             lowerThreshold: '10',
@@ -391,7 +371,6 @@ export default {
             angencyId: null,
             category: null,
             searchOrgIdPath: '',
-            cascaderFwValue: '',
             angencyList: [],
 
             //组织树
@@ -399,14 +378,6 @@ export default {
 
             agencyName: '',
 
-            fieldName: {
-                text: 'label',
-                value: 'id',
-                children: 'children'
-            },
-
-            cascaderNameFw: null,
-
             params: {
                 agencyId: '',
                 orgId: '',
@@ -452,7 +423,6 @@ export default {
             ],
 
             tempList: [],
-            angencyJmList: [],
             houseListSearchFlag: false,
             cascaderName: '',
             statusHeight: '',
@@ -461,7 +431,11 @@ export default {
             loadLeve: '',
             resiSearch: '',
             houseSearch: '',
-            carList:[]
+            carList:[],
+            receiveData:[],
+            receiveDataFw:[],
+            houseText:'',
+            resiText:''
         };
     },
     /**
@@ -538,7 +512,8 @@ export default {
     onShareAppMessage() {},
     methods: {
         completeGrid(e) {
-          
+        },
+        completeGrid1(e) {
         },
        async carInfoPage(){
         try {
@@ -582,6 +557,17 @@ export default {
             }
         },
         changeResiCascader(e){
+            const {level,value} = e
+            getNextTree({
+                level,
+                id: value
+            }).then((res) => {
+                if (res.data.length > 0) {
+                    this.receiveData =  this.convertLabelToText(res.data)
+                }else{
+                    this.receiveData = null
+                }
+            });
             this.searchOrgIdPath = e.value;
            this.setData({
                     pageNo: 1,
@@ -596,44 +582,30 @@ export default {
                 url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${e.currentTarget.dataset.item.id}`
             });
         },
-
         getUnitoption(val) {
+            const level = val[0].level;
             getNextTree({
-                level: val[0].level,
-                id: val[0].id || val[0].agencyId
+                level: level,
+                id: val[0].id || val[0].value
             }).then((res) => {
                 if (res.data.length > 0) {
-                    if (res.data[0].level != 'unit' || res.data[0].level == 'unit') {
+                        if(level !== 'unit'){
+                            this.getUnitoption(res.data);
+                            this.setData({
+                                tempList:this.tempList.concat([res.data[0]])
+                            })
+                        }
+                        let houseText = this.tempList.map(item=>item.label).join('-')
                         this.setData({
-                            tempList: this.tempList.concat([res.data[0]])
-                        });
-                        this.getUnitoption(res.data);
-                    }
-                    let unitId = this.tempList.filter((item) => item.level == 'unit')[0]?.id;
-                    this.setData({
-                        cascaderNameFw: this.tempList
-                            .map((item) => item.label)
-                            .splice(0, this.tempList.length - 1)
-                            .join(','),
-                        'params1.searchOrgIdPath': unitId,
-                        'params.orgId': unitId
-                    });
-                    const data = res.data.map((item) => {
-                        if (item.level != 'unit') {
-                            return {
-                                ...item,
-                                children: []
-                            };
+                            houseText
+                        })
+                        if(level === 'unit'){
+                            this.setData({
+                                'params1.searchOrgIdPath': val[0].id,
+                                'params.orgId': val[0].id,
+                            });
+                            this.getTableFwData();
                         }
-                        return {
-                            ...item,
-                            children: null
-                        };
-                    });
-                    const arr = this.getTreeFun(val[0].agencyId, this.angencyFwList, data);
-                    this.setData({
-                        angencyFwList: arr
-                    });
                 } else {
                     const arr = this.getTreeFun(val[0].agencyId, this.angencyFwList, null);
                     this.setData({
@@ -681,9 +653,11 @@ export default {
         },
 
         getTopTreeData() {
-            api.getAgencygridtree().then((res) => {
+            api.getTopTree().then((res) => {
                 this.setData({
-                        angencyList: this.convertLabelToText([res.data])
+                        angencyList: this.convertLabelToText([res.data]),
+                        angencyFwList: this.convertLabelToText([res.data]),
+                        resiText:app.globalData.user.agencyName
                 });
             });
         },
@@ -693,17 +667,17 @@ export default {
                     ...node
                 };
                 // 将 label 替换为 text
-                if (newNode.agencyName !== undefined) {
-                    newNode.text = newNode.agencyName;
-                    delete newNode.agencyName;
+                if (newNode.label !== undefined) {
+                    newNode.text = newNode.label;
+                    delete newNode.label;
                 }
-                if (newNode.subAgencyList && newNode.subAgencyList.length > 0) {
-                    newNode.children = newNode.subAgencyList
-                    delete newNode.subAgencyList;
+                if (newNode.children && newNode.children.length > 0) {
+                    newNode.children = newNode.children
+                    delete newNode.children;
                 }
-                if (newNode.agencyId) {
-                    newNode.value = newNode.agencyId
-                    delete newNode.agencyId;
+                if (newNode.id) {
+                    newNode.value = newNode.id
+                    delete newNode.id;
                 }
                 if (newNode.children && newNode.children.length > 0) {
                     newNode.children = this.convertLabelToText(newNode.children);
@@ -730,100 +704,44 @@ export default {
             });
         },
 
-        onChangeJm(e) {
-            console.log(e);
-            const { value, selectedOptions } = e.detail;
-            const level = selectedOptions[selectedOptions.length - 1].level;
-            const orgId = selectedOptions[selectedOptions.length - 1].id;
-            const cascaderName = selectedOptions.map((item) => item.label).join('');
-            this.setData({
-                searchOrgIdPath: orgId,
-                cascaderName,
-                tableData: [],
-                pageNo: 1,
-                selectedOptions,
-                loadLeve: selectedOptions.findIndex((item) => item.level === 'house') !== -1 ? 'house' : ''
-            });
-            getNextTree({
-                level,
-                id: value
-            }).then((res) => {
-                if (res.data.length > 0) {
-                    const data = res.data.map((item) => {
-                        if (item.level != 'house') {
-                            return {
-                                ...item,
-                                children: []
-                            };
-                        }
-                        return {
-                            ...item,
-                            children: null
-                        };
-                    });
-                    const arr = this.getTreeFun(value, this.angencyJmList, data);
-                    this.setData({
-                        angencyJmList: arr
-                    });
-                } else {
-                    const arr = this.getTreeFun(value, this.angencyJmList, null);
-                    this.setData({
-                        angencyJmList: arr
-                    });
-                }
-            });
-            this.getAllOrgCategoryCount();
-            this.getTableData();
-        },
 
-        onFinishJm(e) {
-            this.setData({
-                pageNo: 1,
-                searchOrgIdPath: e.detail.selectedOptions[e.detail.selectedOptions.length - 1].id,
-                cascaderName: e.detail.selectedOptions.map((item) => item.label).join(','),
-                tableData: []
-            });
-            this.getAllOrgCategoryCount();
-        },
+      
+        changeHouseCascader(e) {
+            const { value, level } = e;
+            const updateParamsAndFetchData = (orgId) => {
+                this.setData({
+                    params: {
+                        ...this.params,
+                        agencyId: app.globalData.user.agencyId,
+                        orgId,
+                    },
+                    'params1.searchOrgIdPath': orgId
+                });
+                this.getTableFwData();
+            };
 
-        onChangeFw(e) {
-            const { value, tabIndex, selectedOptions } = e.detail;
-            if (tabIndex > 0 && selectedOptions[selectedOptions.length - 1].level != 'unit') {
-                const level = selectedOptions[selectedOptions.length - 1].level;
-                getNextTree({
-                    level,
-                    id: value
-                }).then((res) => {
+            if (level === 'unit') {
+                this.receiveDataFw = null;
+                updateParamsAndFetchData(value);
+            } else {
+                getNextTree({ level, id: value }).then((res) => {
                     if (res.data.length > 0) {
-                        const data = res.data.map((item) => {
-                            if (item.level != 'unit') {
-                                return {
-                                    ...item,
-                                    children: []
-                                };
-                            }
-                            return {
-                                ...item,
-                                children: null
-                            };
-                        });
-                        const arr = this.getTreeFun(value, this.angencyFwList, data);
-                        this.setData({
-                            angencyFwList: arr
-                        });
+                        this.receiveDataFw = this.convertLabelToText(res.data);
                     } else {
-                        const arr = this.getTreeFun(value, this.angencyFwList, null);
-                        this.setData({
-                            angencyFwList: arr
-                        });
+                        this.receiveDataFw = null;
+                        updateParamsAndFetchData(value);
                     }
                 });
             }
         },
 
+
         handelClickSearchType(e) {
             this.setData({
-                selectVale: e.currentTarget.dataset.type
+                selectVale: e.currentTarget.dataset.type,
+                receiveData:null,
+                houseText:null,
+                tempList:[]
             });
             if (e.currentTarget.dataset.type === 'resi') {
                 this.setData({
diff --git a/subpages/searchResult/pages/resiInfo/component/graph/graph.vue b/subpages/searchResult/pages/resiInfo/component/graph/graph.vue
index 1615973..efa71dd 100644
--- a/subpages/searchResult/pages/resiInfo/component/graph/graph.vue
+++ b/subpages/searchResult/pages/resiInfo/component/graph/graph.vue
@@ -1,27 +1,20 @@
 <template>
     <!-- subpages/searchResult/pages/resiInfo/modules/graph/graph.wxml -->
     <view class="hotlineComplaints">
-        <ec-canvas id="hotlineComplaints" canvas-id="hotlineComplaints" :ec="ec"></ec-canvas>
+        <view id="graph" style=" height: 338rpx; width: 100%;"></view>
     </view>
 </template>
 
 <script>
-import ecCanvas from '../../../../../../ec-canvas/ec-canvas';
-import * as echarts from '../../../../../../static/echarts.js';
+import * as echarts from 'echarts';
 import { getFamilyRelationshipList } from '../../../../../../utils/api';
-var chart;
 export default {
     components: {
-        ecCanvas
+
     },
     data() {
         return {
-            ec: {
-                lazyLoad: true
-                // onInit: initChart
-            },
-
-            tabValue: 1
+            myChart: null,
         };
     },
     props: {
@@ -35,166 +28,165 @@ export default {
         this.$nextTick(() => this.ready());
     },
     methods: {
+        initEcharts() {
+            var chartDom = document.getElementById('graph');
+            // 将创建的echarts示例放到vue的data中，这样在这个界面就想到于全局配置了
+            this.myChart = echarts.init(chartDom);
+        },
         ready() {
             this.getData();
+            this.initEcharts();
         },
 
         getData() {
-            this.zpSelectComponent('#hotlineComplaints').init((canvas, width, height, dpr) => {
-                chart = echarts.init(canvas, null, {
-                    width: width,
-                    height: height,
-                    devicePixelRatio: dpr // 像素比
-                });
 
-                let than = this;
-                chart.on('click', function (param) {
-                    if (param.dataType == 'node') {
-                        than.$emit('clickGraphNode', {
-                            detail: {
-                                data: param.data.data
-                            }
-                        });
+            let params = {
+                type: '0',
+                id: this.resiId
+            };
+            getFamilyRelationshipList(params).then(({ data }) => {
+                let index = data.findIndex((item) => item.id == this.resiId);
+                if (index !== -1) {
+                    const [item] = data.splice(index, 1);
+                    data.unshift(item);
+                }
+                let nodeList = data.map((item, index) => {
+                    let symbolUrl = '';
+                    if (item.type === 1) {
+                        symbolUrl = 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/a6cdfe6f699040f58fd8b2c10486b41d.png';
                     } else {
-                    }
-                });
-                canvas.setChart(chart);
-                let params = {
-                    type: '0',
-                    id: this.resiId
-                };
-                getFamilyRelationshipList(params).then(({ data }) => {
-                    let index = data.findIndex((item) => item.id == this.resiId);
-                    if (index !== -1) {
-                        const [item] = data.splice(index, 1);
-                        data.unshift(item);
-                    }
-                    let nodeList = data.map((item, index) => {
-                        let symbolUrl = '';
-                        if (item.type === 1) {
-                            symbolUrl = 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/a6cdfe6f699040f58fd8b2c10486b41d.png';
-                        } else {
-                            // 如果 type 不等于 1，则根据 gender 进行判断
-                            if (item.gender === '1') {
-                                // 如果 gender 等于 1，则根据 age 进行进一步的判断
-                                symbolUrl =
-                                    item.age > 18 && item.age < 60
-                                        ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png'
-                                        : item.age < 18
+                        // 如果 type 不等于 1，则根据 gender 进行判断
+                        if (item.gender === '1') {
+                            // 如果 gender 等于 1，则根据 age 进行进一步的判断
+                            symbolUrl =
+                                item.age > 18 && item.age < 60
+                                    ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png'
+                                    : item.age < 18
                                         ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/62c2b6a1ce834f8dae081b562b2579b9.png'
                                         : item.age > 60
-                                        ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/bd586a4e7d0f4b3aa68c79067dfe1428.png'
-                                        : '';
-                            } else if (item.gender === '2') {
-                                // 如果 gender 等于 2，则根据 age 进行进一步的判断
-                                symbolUrl =
-                                    item.age > 18 && item.age < 60
-                                        ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/3b44e3495dcd4d96a3c07baad1bd7c5e.png'
-                                        : item.age < 18
+                                            ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/bd586a4e7d0f4b3aa68c79067dfe1428.png'
+                                            : '';
+                        } else if (item.gender === '2') {
+                            // 如果 gender 等于 2，则根据 age 进行进一步的判断
+                            symbolUrl =
+                                item.age > 18 && item.age < 60
+                                    ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/3b44e3495dcd4d96a3c07baad1bd7c5e.png'
+                                    : item.age < 18
                                         ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/0c38251bba644a6b8e4a925aea74c9a7.png'
                                         : item.age > 60
-                                        ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/2465ff7633a94413bf4ed2aa778c2765.png'
-                                        : '';
-                            } else {
-                                symbolUrl = 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png';
-                            }
+                                            ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/2465ff7633a94413bf4ed2aa778c2765.png'
+                                            : '';
+                        } else {
+                            symbolUrl = 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png';
                         }
-                        return {
-                            name: item.name,
-                            id: index + 1,
-                            category: 0,
-                            symbolSize: item.id == this.resiId ? 50 : 30,
-                            symbol: symbolUrl,
-                            label: {
-                                position: 'bottom'
-                            },
-                            data: {
-                                type: item.type,
-                                id: item.id
-                            }
-                        };
-                    });
-                    let links = data.map((item, index) => ({
-                        source: 0,
-                        target: index,
-                        name: item.houseHolderRel || '未知',
+                    }
+                    return {
+                        name: item.name,
+                        id: index + 1,
+                        category: 0,
+                        symbolSize: item.id == this.resiId ? 50 : 30,
+                        symbol: symbolUrl,
                         label: {
-                            align: 'center',
-                            fontSize: 12,
-                            color: '#9cbbf9'
+                            position: 'bottom'
                         },
-                        lineStyle: {
-                            color: '#9cbbf9'
-                        }
-                    }));
-                    let categories = data.map((item, index) => ({
-                        name: item.houseHolderRel || '未知',
-                        id: index + 1,
-                        itemStyle: {
-                            color: '#9cbbf9'
+                        data: {
+                            type: item.type,
+                            id: item.id
                         }
-                    }));
-                    categories.splice(0, 1);
-                    var option = {
-                        legend: [
-                            {
-                                // selectedMode: 'single',
-                                // icon: 'circle'
-                                show: false
-                            }
-                        ],
-                        series: [
-                            {
-                                type: 'graph',
-                                layout: 'force',
-                                // symbolSize: 10,
-                                force: {
-                                    repulsion: 80,
-                                    gravity: 0,
-                                    edgeLength: 100,
-                                    //线条长度
-                                    layoutAnimation: true
-                                },
-                                draggable: true,
-                                roam: false,
-                                nodeScaleRatio: 0,
-                                focusNodeAdjacency: false,
-                                lineStyle: {
-                                    normal: {
-                                        opacity: 0.5,
-                                        width: 1.5,
-                                        curveness: 0
-                                    }
-                                },
-                                categories: categories,
-                                edgeSymbol: ['', 'arrow'],
-                                // edgeSymbolSize: [80, 10],
-                                edgeLabel: {
-                                    normal: {
-                                        show: true,
-                                        textStyle: {
-                                            fontSize: 20
-                                        },
-                                        formatter(x) {
-                                            return x.data.name;
-                                        }
-                                    }
-                                },
-                                label: {
-                                    show: true
-                                },
-                                data: nodeList,
-                                links: links
-                            }
-                        ]
                     };
-                    chart.setOption(option);
                 });
-                return chart;
+                let links = data.map((item, index) => ({
+                    source: 0,
+                    target: index,
+                    name: item.houseHolderRel || '未知',
+                    label: {
+                        align: 'center',
+                        fontSize: 12,
+                        color: '#9cbbf9'
+                    },
+                    lineStyle: {
+                        color: '#9cbbf9'
+                    }
+                }));
+                let categories = data.map((item, index) => ({
+                    name: item.houseHolderRel || '未知',
+                    id: index + 1,
+                    itemStyle: {
+                        color: '#9cbbf9'
+                    }
+                }));
+                categories.splice(0, 1);
+                var option = {
+                    legend: [
+                        {
+                            // selectedMode: 'single',
+                            // icon: 'circle'
+                            show: false
+                        }
+                    ],
+                    series: [
+                        {
+                            type: 'graph',
+                            layout: 'force',
+                            // symbolSize: 10,
+                            force: {
+                                repulsion: 80,
+                                gravity: 0,
+                                edgeLength: 100,
+                                //线条长度
+                                layoutAnimation: true
+                            },
+                            draggable: true,
+                            roam: false,
+                            nodeScaleRatio: 0,
+                            focusNodeAdjacency: false,
+                            lineStyle: {
+                                normal: {
+                                    opacity: 0.5,
+                                    width: 1.5,
+                                    curveness: 0
+                                }
+                            },
+                            categories: categories,
+                            edgeSymbol: ['', 'arrow'],
+                            // edgeSymbolSize: [80, 10],
+                            edgeLabel: {
+                                normal: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 20
+                                    },
+                                    formatter(x) {
+                                        return x.data.name;
+                                    }
+                                }
+                            },
+                            label: {
+                                show: true
+                            },
+                            data: nodeList,
+                            links: links
+                        }
+                    ]
+                };
+                if (option) {
+                    let than = this;
+                    this.myChart.on('click', function (param) {
+                        if (param.dataType == 'node') {
+                            than.$emit('clickGraphNode', {
+                                detail: {
+                                    data: param.data.data
+                                }
+                            });
+                        } else {
+                        }
+                    });
+                    this.myChart.setOption(option);
+                }
             });
         }
     },
-    created: function () {},
+    created: function () { },
     watch: {
         resiId: {
             handler: function (val) {
@@ -206,12 +198,8 @@ export default {
     }
 };
 </script>
-<style>
+<style scoped>
 /* subpages/searchResult/pages/resiInfo/modules/graph/graph.wxss */
-ec-canvas {
-    width: 100%;
-    height: 100%;
-}
 .hotlineComplaints {
     width: 100%;
     height: 618rpx;
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.vue b/subpages/searchResult/pages/resiInfo/resiInfo.vue
index 0a3904e..b9925ed 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.vue
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.vue
@@ -347,11 +347,12 @@
                 </view>
             </view>
         </view>
-        <view class="card" id="graph">
-            <view class="title">关系图谱</view>
-            <!-- <resi-graph :resiId="resiId" @clickGraphNode="clickGraphNode" v-if="resiId"></resi-graph> -->
+        <view class="card" id="graph1">
+            <view class="title">
+                <text>人员图谱</text>
+            </view>
+            <resi-graph :resiId="resiId" @clickGraphNode="clickGraphNode" ></resi-graph>
         </view>
-
         <view class="card" id="business">
             <view class="title">
                 <text>业务记录</text>
@@ -1184,7 +1185,7 @@ export default {
                 ensure_house: '保障房信息',
                 chronic_disease: '慢病信息',
                 base: '基本信息',
-                graph: '关系图谱',
+                graph1: '关系图谱',
                 update: '更新记录',
                 business: '业务记录'
             };
@@ -1199,7 +1200,7 @@ export default {
             list.push(
                 {
                     name: '关系图谱',
-                    id: 'graph'
+                    id: 'graph1'
                 },
                 {
                     name: '业务记录',
@@ -1623,7 +1624,7 @@ export default {
     }
 };
 </script>
-<style>
+<style scoped>
 /* subpages/searchResult/pages/resiInfo/resiInfo.wxss */
 /**index.wxss**/
 page {
diff --git a/utils/config.js b/utils/config.js
index 69888da..35ec36c 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -4,8 +4,8 @@ module.exports = {
     userId: ''
 };
 function BASEURL() {
-    return 'http://192.168.1.140/api/';
-    // return 'http://112.230.202.146:10081'//生产
+    // return 'http://192.168.1.140/api/';
+    return 'http://112.230.202.146:10081/api/'//生产
 }
 
 function getToken() {