diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 6b792b37..09970092 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -159,7 +159,7 @@
                     @click="addCommunityPeo(scope.row)"
                 >新增</el-button>
                 </template>
-                <template>
+                <template slot-scope="scope">
                 <el-button 
                     size="mini"
                     type="warning"
@@ -540,6 +540,154 @@
             </div>
         </el-dialog>
 
+
+        <!-- 修改市区级组织 -->
+        <el-dialog
+        title="修改组织"
+        :visible.sync="modifyCityOrgPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
+                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改街道/社区级组织 -->
+        <el-dialog
+        title="修改组织"
+        :visible.sync="streetOrCommunity"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                 <!-- 组织区划 -->
+                <el-form-item label="组织区划">
+                    <el-select v-model="zonings.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                        <el-option 
+                        v-for="item in zonings"
+                        :key="item.areaCode"
+                        :label="item.areaName"
+                        :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelstreetOrCommunity">取 消</el-button>
+                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改下级机关单位 -->
+        <el-dialog
+        title="修改部门"
+        :visible.sync="OrgUnitPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="部门名称">
+                    <el-input v-model="OrgUnitDetailsForm.departmentName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgUnitDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgUnitDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgUnitDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelOrgUnitPop">取 消</el-button>
+                <el-button type="primary" @click="sunmitOrgUnitForm">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改网格 -->
+        <el-dialog
+        title="修改网格"
+        :visible.sync="modifyGridPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="网格名称">
+                    <el-input v-model="modifyGridFrom.gridName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="modifyGridFrom.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+
+                <!-- 网格类型下拉框 -->
+                <el-form-item label="网格类型" prop="typeTag">
+                        <el-select v-model="modifyGridFrom.gridType" clearable placeholder="网格类型">
+                            <el-option v-for="item in typeList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                <el-form-item label="负责人">
+                    <el-input v-model="modifyGridFrom.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="modifyGridFrom.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+
+                <!-- 组织位置,地图 -->
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelModifyGridPop">取 消</el-button>
+                <el-button type="primary" @click="submitModifyGrid">确 定</el-button>
+            </div>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -552,7 +700,14 @@ export default {
         return{
             // 新增组织弹窗
             createAgencyDialogFlag: false,
-
+            // 修改市区级组织弹窗
+            modifyCityOrgPop:false,
+            // 修改街道/社区级组织弹窗
+            streetOrCommunity:false,
+            // 修改下级机关单位弹窗
+            OrgUnitPop:false,
+            // 修改网格弹窗
+            modifyGridPop:false,
             // 组织列表展示标识
             agencyTableFlag: true,
             // 组织工作人员列表展示标识
@@ -589,8 +744,8 @@ export default {
            // 经纬度坐标
            lat:'11',
            lng:'11',
-           latitude:'11',
-           longitude:'11',
+           latitude:'39.984104',
+           longitude:'116.307503',
            Navigation:'',
             // 查询参数
             queryParams: {
@@ -686,6 +841,40 @@ export default {
                 level:'',
                 parentAgencyId:''
             },
+            // 组织详细信息
+            OrgDetailsForm:{
+                level:'',
+                agencyName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                centerAddress:'',
+                areaCode:'',
+                agencyId:''
+            },
+            // 下级机关单位
+            OrgUnitDetailsForm:{
+                code:'',
+                contacts:'',
+                departmentId:'',
+                departmentName:'',
+                mobile:''
+            },
+            // 网格修改表单
+            modifyGridFrom:{
+                gridName:'',
+                code:'',
+                gridTypeName:'',
+                contacts:'',
+                mobile:'',
+                latitude:'',
+                longitude:'',
+                agencyId:'',
+                gridType:'',
+                manageDistrict:'',
+                griId:''
+            },
+            judgeOrgInfoLevel:[],
             keyWords: '',
             typeList:[],
             // 性别字典
@@ -781,6 +970,30 @@ export default {
                     this.createMap(_t)
                 }, 1000);
             }
+        },
+        modifyCityOrgPop(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        streetOrCommunity(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        modifyGridPop(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
         }
     },
     mounted(){
@@ -1126,6 +1339,41 @@ export default {
             this.latitude = '',
             this.longitude = ''
         },
+        // 修改市级组织
+        cancelModifyCityOrgPopRest(){
+            this.OrgDetailsForm.level = '',
+            this.OrgDetailsForm.agencyName = '',
+            this.OrgDetailsForm.code = '',
+            this.OrgDetailsForm.contacts = '',
+            this.OrgDetailsForm.mobile = '',
+            this.OrgDetailsForm.centerAddress = '',
+            this.OrgDetailsForm.areaCode = ''
+            this.OrgDetailsForm.agencyId = ''
+            this.latitude = '',
+            this.longitude = ''
+        },
+        // 修改下级机关单位
+        OrgUnitDetailsRest(){
+            this.OrgUnitDetailsForm.code = '',
+            this.OrgUnitDetailsForm.contacts = '',
+            this.OrgUnitDetailsForm.departmentId = '',
+            this.OrgUnitDetailsForm.departmentName = '',
+            this.OrgUnitDetailsForm.mobile = ''
+        },
+        // 修改网格清空
+        ModifyGridPopRest(){
+            this.modifyGridFrom.gridName = '',
+            this.modifyGridFrom.code = '',
+            this.modifyGridFrom.gridTypeName = '',
+            this.modifyGridFrom.contacts = '',
+            this.modifyGridFrom.mobile = '',
+            this.latitude = '',
+            this.longitude = '',
+            this.modifyGridFrom.agencyId = '',
+            this.modifyGridFrom.gridType = '',
+            this.modifyGridFrom.manageDistrict = '',
+            this.modifyGridFrom.griId = ''
+        },
         // 社区新增弹框取消按钮
         cancel(){
             this.dialogVisible = false
@@ -1161,6 +1409,26 @@ export default {
             this.addNewAgencyRest()
             this.createAgencyDialogFlag = false
         },
+        // 修改市级组织取消按钮
+        cancelModifyCityOrgPop(){
+            this.cancelModifyCityOrgPopRest()
+            this.modifyCityOrgPop = false
+        },
+        // 修改街道/社区级取消按钮
+        cancelstreetOrCommunity(){
+            this.cancelModifyCityOrgPopRest()
+            this.streetOrCommunity = false
+        },
+        // 取消修改下级机关单位按钮
+        cancelOrgUnitPop(){
+            this.OrgUnitPop = false
+            this.OrgUnitDetailsRest()
+        },
+        // 取消修改网格按钮
+        cancelModifyGridPop(){
+            this.modifyGridPop = false
+            this.ModifyGridPopRest()
+        },
         // 进入网格，查询网格所属人员
         entryGrid(gridId){
             this.gridStaffTableListData = []
@@ -1354,8 +1622,9 @@ export default {
                 this.options[0].label = data.agencyName
                 this.options[0].value = data.agencyId
 
+                    console.log('--------',this.options)
                 let depart = Array.from(data.departmentList)
-                let gr = Array.from(data.gridTableFlag)
+                let gr = Array.from(data.gridList)
 
                 depart.forEach(item => {
                     const ob = {
@@ -1662,8 +1931,183 @@ export default {
 
         // 修改面包屑
         modifyOrgInfo(){
-            let orgInfo = this.breadcrumbArr[this.breadcrumbArr.length-1]
-            console.log(orgInfo)
+            this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length-1]
+            console.log(this.judgeOrgInfoLevel)
+            if(this.judgeOrgInfoLevel.type === "agency"){
+                this.getOrgDetailsById()
+                setTimeout(() => {
+                    if(this.OrgDetailsForm.level === "district"){
+                    /** 修改市区级弹窗 */
+                    this.modifyCityOrgPop = true
+                    }else {
+                        /** 街道级和社区级弹窗 */
+                        this.getUser()
+                        this.streetOrCommunity = true
+                    }
+                }, 1000);
+            } else if(this.judgeOrgInfoLevel.type === "department"){
+                /** 下级机关单位修改 */
+                this.OrgUnitPop = true
+                this.getOrgUnitDetailsById()
+            } else {
+                /** 网格修改 */
+                this.getDictionaries()
+                this.modifyGridPop = true
+                this.getGridDetailsById()
+            }
+        },
+
+        // 根据id获取组织机构详细信息
+        async getOrgDetailsById(){
+            const url = '/gov/org/agency/agencydetail'
+
+            let params = {
+                agencyId:this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.OrgDetailsForm.level = data.level
+                this.OrgDetailsForm.agencyName = data.agencyName
+                this.OrgDetailsForm.code = data.code
+                this.OrgDetailsForm.contacts = data.contacts
+                this.OrgDetailsForm.centerAddress = data.centerAddress
+                this.OrgDetailsForm.areaCode = data.areaCode
+                this.OrgDetailsForm.mobile = data.mobile
+                this.latitude = data.latitude
+                this.longitude = data.longitude
+                this.OrgDetailsForm.agencyId = data.agencyId
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 根据id获取下级机关单位详情
+        async getOrgUnitDetailsById(){
+            const url = '/gov/org/department/departmentdetail'
+
+            let params = {
+                departmentId:this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.OrgUnitDetailsForm.code = data.code
+                this.OrgUnitDetailsForm.contacts = data.contacts
+                this.OrgUnitDetailsForm.departmentId = data.departmentId
+                this.OrgUnitDetailsForm.departmentName = data.departmentName
+                this.OrgUnitDetailsForm.mobile = data.mobile
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 根据id获取网格详情
+        async getGridDetailsById(){
+            const url = '/gov/org/grid/griddetail'
+
+            let params = {
+                gridId: this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.modifyGridFrom.gridName = data.gridName
+                this.modifyGridFrom.code = data.code
+                this.modifyGridFrom.gridTypeName = data.gridTypeName
+                this.modifyGridFrom.contacts = data.contacts
+                this.modifyGridFrom.mobile = data.mobile
+                this.modifyGridFrom.agencyId = data.agencyId
+                this.modifyGridFrom.gridType = data.gridType
+                this.modifyGridFrom.manageDistrict = data.manageDistrict
+                this.modifyGridFrom.griId = data.griId
+            }else {
+                this.$message.error(msg)
+            }
+        },  
+
+        // 市级/街道/社区级组织修改确定按钮
+        async sunmitModifyCityOrgPop(){
+            const url = '/gov/org/agency/editagency'
+
+            let params = {
+                agencyId: this.OrgDetailsForm.agencyId,
+                agencyName: this.OrgDetailsForm.agencyName,
+                contacts: this.OrgDetailsForm.contacts,
+                mobile: this.OrgDetailsForm.mobile,
+                code: this.OrgDetailsForm.code,
+                latitude: this.latitude,
+                longitude: this.longitude
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.modifyCityOrgPop = false
+                this.streetOrCommunity = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 修改下级机关单位确定按钮
+        async sunmitOrgUnitForm(){
+            const url = '/gov/org/department/editdepartment'
+
+            let params = {
+                code: this.OrgUnitDetailsForm.code,
+                contacts: this.OrgUnitDetailsForm.contacts,
+                departmentId: this.OrgUnitDetailsForm.departmentId,
+                departmentName: this.OrgUnitDetailsForm.departmentName,
+                mobile: this.OrgUnitDetailsForm.mobile
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.OrgUnitPop = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 修改网格确定按钮
+        async submitModifyGrid(){
+            const url = '/gov/org/grid/editgrid'
+
+            let params = {
+                gridId: this.modifyGridFrom.griId,
+                gridName: this.modifyGridFrom.gridName,
+                manageDistrict: this.modifyGridFrom.manageDistrict,
+                contacts: this.modifyGridFrom.contacts,
+                mobile: this.modifyGridFrom.mobile,
+                code: this.modifyGridFrom.code,
+                gridType: this.modifyGridFrom.gridType
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.modifyGridPop = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            }else {
+                this.$message.error(msg)
+            }
         },
 
        /** 地图初始化 */
@@ -1689,7 +2133,7 @@ export default {
             document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
             var position = document.getElementById("pos");
 
-            var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
+            var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
             //初始化地图
             var map = new window.TMap.Map("con", {
                 center: center