diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue
index 798b524f..a79230be 100644
--- a/src/views/modules/plugins/power/poweraxis.vue
+++ b/src/views/modules/plugins/power/poweraxis.vue
@@ -22,11 +22,11 @@
         </el-form>
       </div>
       <div class="div_table">
-        <div>
+        <div class="div_btn">
             <el-button style=""
                     class="diy-button--add"
                     size="small"
-                    @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+                    @click="handleAdd()">{{ $t('add') }}</el-button>
         </div>
         <!-- 列表表格 -->
         <el-table
@@ -39,21 +39,45 @@
             :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}">
             <el-table-column prop="name" label="动力主轴"></el-table-column>
             <el-table-column prop="categoryCode" :formatter="categoryCodeFormatter" label="类别" ></el-table-column>
-            <el-table-column prop="leaderName" label="负责人"></el-table-column>
-            <el-table-column prop="leaderMobile" label="联系方式" ></el-table-column>
-            <el-table-column prop="createdTime" label="创建时间" ></el-table-column>
+            <el-table-column prop="leaderName" label="负责人" width="100"></el-table-column>
+            <el-table-column prop="leaderMobile" label="联系方式" width="110"></el-table-column>
+            <el-table-column prop="createdTime" label="创建时间" width="160"></el-table-column>
             <el-table-column label="操作" align="center" width="300">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="danger" icon="el-icon-edit" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+                    <!-- <el-button size="mini" type="danger" icon="el-icon-edit" @click="addOrUpdateHandle(scope.row.id)">修改</el-button> -->
+                    <el-button size="mini" type="danger" icon="el-icon-edit" @click="handleEdit(scope.row.id)">修改</el-button>
                     <el-button size="mini" type="warning" icon="el-icon-edit" @click="deleteHandle_my(scope.row.id)">删除</el-button>
-                    <el-button size="mini" type="primary" icon="el-icon-user" @click="addLeader(scope.row.id, scope.row.leaderId, scope.row.structLevel)">负责人</el-button>
+                    <el-button size="mini" type="primary" icon="el-icon-user" @click="add_edit_Leader(scope.row.id, scope.row.leaderId, scope.row.structLevel)">负责人</el-button>
                 </template>
             </el-table-column>
         </el-table>
       </div>
-     <!-- 弹窗, 新增 / 修改 -->
-     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-     <add-leader :axisStructId="axisStructId" :structLevel="structLevel" :leaderId="leaderId" :leaderVisible="leaderVisible" ref="poweraxisAddLeader" @refreshDataListleader="getDataList"></add-leader>
+        <!-- 弹窗, 新增 / 修改 -->
+        <el-dialog :visible.sync="formShow"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                :title="formTitle"
+                width="850px"
+                top="5vh"
+                class="dialog-h"
+                @closed="diaClose">
+        <poweraxis-form ref="ref_form"
+                        @dialogCancle="addFormCancle"
+                        @dialogOk="addFormOk"></poweraxis-form>
+        </el-dialog>
+        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        <el-dialog  :visible.sync="leaderVisible"
+                    :close-on-click-modal="false"
+                    :close-on-press-escape="false"
+                    :title="formTitle"
+                    width="850px"
+                    top="5vh"
+                    class="dialog-h"
+                    @closed="leaderDiaClose">
+            <add-leader ref="ref_leader"
+                        @leaderCancle="addleaderCancle"
+                        @leaderOk="addleaderOk"></add-leader>
+        </el-dialog>
     </div>
 </template>
 
@@ -62,6 +86,7 @@ import { requestPost } from "@/js/dai/request";
 import { handleTree } from "@/utils/treeSelect";
 import Treeselect from "@riophae/vue-treeselect";
 import AddOrUpdate from './poweraxis-add-or-update'
+import poweraxisForm from './poweraxisForm'
 import mixinViewModule from '@/mixins/view-module'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import AddLeader from './poweraxis_add_leader.vue';
@@ -70,7 +95,8 @@ export default {
     components: { 
       Treeselect,
       AddOrUpdate,
-      AddLeader
+      AddLeader,
+      poweraxisForm
     },
     data(){
         return{
@@ -91,30 +117,59 @@ export default {
             leaderVisible: false,
             axisStructId: '', // 动力主轴id 添加负责人的时候用
             structLevel: null, // 动力主轴节点级别 添加负责人的时候用
-            leaderId: ''
+            leaderId: '',
+            dataListLoading: false,
+            //form相关
+            formShow: false,
+            formTitle: '新增小区',
         }
     },
-    created(){
-        this.getDataList()
-        this.getAgencyTree()
-        this.getTagCategoryArr()
+    async created(){
+        this.dataListLoading = true
+        await this.getDataList()
+        await this.getAgencyTree()
+        await this.getTagCategoryArr()
+        this.dataListLoading = false
     },
     mounted(){
         this.customerId = localStorage.getItem('customerId')
         this.agencyId = localStorage.getItem('agencyId')
     },
     methods:{
+        handleEdit (id) {
+            this.formTitle = '修改'
+            this.formShow = true
+            this.$nextTick(() => {
+                this.$refs.ref_form.initForm('edit', id)
+            })
+        },
+        handleAdd () {
+            this.formTitle = '新增'
+            this.formShow = true
+            this.$nextTick(() => {
+                this.$refs.ref_form.initForm('add')
+            })
+        },
+        addFormCancle () {
+            this.formShow = false
+        },
+        addFormOk () {
+            this.formShow = false
+            this.getDataList()
+        },
+        diaClose () {
+        // this.$refs.ref_form.resetData()
+        this.formShow = false
+        },
         // 获取组织列表
         async getAgencyTree(){
             const url = '/data/aggregator/org/agencytree'
 
             let params = {
-                agencyId:this.agencyId,
+                agencyId:  localStorage.getItem('agencyId'),
                 client:'gov'
             }
-
             const { data, code, msg } = await requestPost(url,params)
-
             if (code === 0) {
                 let _data
                 if (data) {
@@ -218,16 +273,33 @@ export default {
             }
         },
         // 添加负责人
-        addLeader(axisStructId, leaderId, structLevel) {
+        add_edit_Leader(axisStructId, leaderId, structLevel) {
             this.leaderVisible = true
-            this.axisStructId = axisStructId
-            this.structLevel = structLevel
-            this.leaderId = leaderId
+            let agencyObj = {
+                axisStructId: axisStructId,
+                structLevel: structLevel,
+                leaderId: leaderId,
+            }
+            this.$nextTick(() => {
+                this.$refs.ref_leader.initForm(agencyObj)
+            })
+        },
+        addleaderOk() {
+            this.leaderVisible = false
+            this.axisStructId = ''
+            this.getDataList()
         },
-        getDataListLeader() {
-             this.leaderVisible = false
-             this.axisStructId = ''
-             this.getDataList()
+        addleaderCancle() {
+           this.leaderVisible = false
+        },
+        leaderDiaClose() {
+           this.leaderVisible = false
+        },
+        // 取消按钮 
+        handleCancle () {
+            console.log('取消：：：：')
+        // this.resetData()
+        // this.$emit('dialogCancle')
         }
     }
 }
@@ -264,6 +336,9 @@ export default {
   }
 }
 
+.div_btn {
+}
+
 .el-row {
   /* margin-bottom: 20px; */
   display: flex;
diff --git a/src/views/modules/plugins/power/poweraxisForm.vue b/src/views/modules/plugins/power/poweraxisForm.vue
new file mode 100644
index 00000000..9b2b2941
--- /dev/null
+++ b/src/views/modules/plugins/power/poweraxisForm.vue
@@ -0,0 +1,472 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div v-show="!propertyFormShow">
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="dataForm"
+                 :rules="dataRule"
+                 :disabled="formType === 'detail'"
+                 class="form">
+
+      <el-form-item prop="categoryCode" label="类别" label-width="150px">
+          <el-select class="item_width_1" v-model="dataForm.categoryCode" @change="handelChange" placeholder="请选择类别" clearable>
+              <el-option
+              v-for="item in structCategoryArr"
+              :key="item.categoryCode"
+              :label="item.categoryName"
+              :value="item.categoryCode">
+              </el-option>
+          </el-select>
+      </el-form-item>
+          <el-form-item label="名称"
+                        prop="name"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      maxlength="50"
+                      show-word-limit
+                      placeholder="请输入名称"
+                      v-model="dataForm.name">
+            </el-input>
+          </el-form-item>
+          <!-- 下拉框组织的参数 -->
+          <el-form-item abel-width="150px" prop="agencyId" label="所属组织" v-if="orgListSwitch" label-width="150px">
+              <el-cascader
+                  class="item_width_1"
+                  v-model="dataForm.agencyId"
+                  :options="agencytree"
+                  placeholder="请选择所属组织"
+                  :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"
+                  :show-all-levels="false"
+                  clearable />
+          </el-form-item>
+          <el-form-item abel-width="150px" prop="pid" label="所属上级" v-if="!orgListSwitch" label-width="150px">
+              <el-cascader
+                class="item_width_1"
+                placeholder="请选择所属上级"
+                :options="parentStructTree"
+                v-model="dataForm.pid"
+                :props="{ expandTrigger: 'hover', emitPath: false, label: 'name', value: 'id', children: 'children' }"
+                :show-all-levels="false"
+                clearable />
+          </el-form-item>
+          <el-form-item abel-width="150px" label="排序" label-width="150px">
+              <el-input-number v-model="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
+          </el-form-item>
+          <el-form-item label="输入位置查坐标"
+                        prop="longitude"
+                        label-width="150px"
+                        style="display: block">
+            <div style="width:500px">
+              <el-input class="item_width_4"
+                        maxlength="50"
+                        placeholder="请输入关键字"
+                        v-model="keyWords">
+              </el-input>
+              <el-button style="margin-left: 10px"
+                         type="primary"
+                         size="small"
+                         @click="handleSearchMap">查询</el-button>
+              <div id="app"
+                   class="div_map"></div>
+              <div style="margin-top: 10px">
+                <span>经度</span>
+                <el-input class="item_width_3"
+                          maxlength="50"
+                          placeholder="请输入经度"
+                          :readonly="true"
+                          v-model="dataForm.longitude">
+                </el-input>
+                <span style="margin-left: 20px">纬度</span>
+                <el-input class="item_width_3"
+                          maxlength="50"
+                          placeholder="请输入纬度"
+                          :readonly="true"
+                          v-model="dataForm.latitude">
+                </el-input>
+              </div>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+var map
+var search
+var markers
+var infoWindowList
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      dataForm: {
+        id:'',
+        name:'',
+        agencyId:'',
+        structLevel: null,
+        pid:'',
+        categoryCode:'',
+        sort:'',
+        longitude: '', //经度
+        latitude: ''//纬度
+      },
+      propertyFormShow: false,
+      keyWords: '',
+      structCategoryArr: [], // 查询动力主轴标签类别
+      leaderCategoryArr: [], // 查询动力主轴负责人标签类别
+      agencytree: [], // 绑定组织列表
+      parentStructTree: [], // 上级节点列表
+      orgListSwitch: false, // 组织列表开关
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+  methods: {
+    initForm (type, id) {
+      this.$refs.ref_form.resetFields();
+      this.formType = type
+      this.getTagCategoryArr()
+      this.getAgencyTree()
+      if (this.formType === 'edit') {
+         this.getInfo(id)
+      }
+    },
+    // 获取动力主轴标签
+    async getTagCategoryArr(){
+        const url = '/pli/power/axisTag/listSimpleAll'
+        let params = {}
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+            data.forEach((item) => {
+                if (item.tagCategory === 'struct') {
+                    this.structCategoryArr = item.tagList
+                }
+                if (item.tagCategory === 'leader') {
+                    this.leaderCategoryArr = item.tagList
+                } 
+            })
+        } else {
+            this.$message.error(msg)
+        }
+    },
+    // 获取组织列表
+    async getAgencyTree(){
+        const url = '/data/aggregator/org/agencytree'
+
+        let params = {
+            agencyId:  localStorage.getItem('agencyId'),
+            client:'gov'
+        }
+        const { data, code, msg } = await requestPost(url,params)
+        if (code === 0) {
+            let _data
+            if (data) {
+                _data = this.removeByOrgType(data, 'agency')
+                if (_data) {
+                    this.agencytree = this.removeEmptySubOrgList(_data)
+                }
+            }
+        } else {
+            this.$message.error(msg)
+        }
+    },
+    removeByOrgType (orgArray, orgType) {
+        if (orgArray && orgArray.length > 0) {
+            for (let p = orgArray.length - 1; p >= 0; p--) {
+                let orgInfo = orgArray[p]
+                if (orgInfo) {
+                    if (orgInfo.orgType !== orgType) {
+                        orgArray.splice(p, 1)
+                    } else {
+                        this.removeByOrgType(orgInfo.subOrgList, orgType)
+                    }
+                }
+            }
+        }
+        return orgArray
+    },
+    removeEmptySubOrgList (orgArray) {
+        orgArray.forEach((orgInfo) => {
+            if (orgInfo && orgInfo.subOrgList) {
+                if (orgInfo.subOrgList.length === 0) {
+                    orgInfo.subOrgList = undefined
+                } else {
+                    this.removeEmptySubOrgList(orgInfo.subOrgList)
+                }
+            }
+        })
+        return orgArray;
+    },
+    removeEmptyStructTree (structArray) {
+        structArray.forEach((structInfo) => {
+            if (structInfo && structInfo.children) {
+                if (structInfo.children.length === 0) {
+                    structInfo.children = undefined
+                } else {
+                    this.removeEmptyStructTree(structInfo.children)
+                }
+            }
+        })
+        return structArray;
+    },
+    // 获取信息
+    getInfo (id) {
+      this.$http.post(`/pli/power/axisStruct/queryModifyById/${id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
+        this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
+        this.structCategoryArr.forEach((item) => {
+          if(item.categoryCode === this.dataForm.categoryCode){
+            this.dataForm.structLevel = item.structLevel
+            if(this.dataForm.structLevel === 0) {
+              this.orgListSwitch = true
+            } else {
+              this.orgListSwitch = false
+              this.getParentStructTree(this.dataForm.structLevel)
+            }
+          }
+        })
+      }).catch(() => {})
+    },
+    // 获取上级动力主轴节点
+    async getParentStructTree(structLevel){
+        const url = `/pli/power/axisStruct/bylevel/${structLevel}/parenttree`
+        let params = {}
+        const { data, code, msg } = await requestPost(url,params)
+        if (code === 0) {
+            this.parentStructTree = this.removeEmptyStructTree(data)
+        } else {
+            this.$message.error(msg)
+        }
+    },
+    // 动力主轴选中后的操作
+    handelChange(val){
+        this.dataForm.categoryCode = val
+        this.structCategoryArr.forEach((item) => {
+          if(item.categoryCode === val){
+            this.dataForm.structLevel = item.structLevel
+          }
+        })
+        if (this.dataForm.structLevel === 0) {
+          this.orgListSwitch = true
+          this.dataForm.pid = '0'
+        } else {
+          this.orgListSwitch = false
+          this.dataForm.pid = ''
+          this.getParentStructTree(this.dataForm.structLevel)
+        }
+    },
+
+
+    // 添加
+    async handleComfirm () {
+      // 确定
+        this.btnDisable = true
+        setTimeout(() => {
+          this.btnDisable = false
+        }, 10000)
+        this.$refs['ref_form'].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj)
+            this.btnDisable = false
+          } else {
+            this.addCommunity()
+          }
+
+        })
+    },
+    async addCommunity () {
+      let url = ''
+      if (this.formType === 'add') {
+        this.dataForm.id = ''
+        url = '/pli/power/axisStruct/save'
+      } else {
+        url = '/pli/power/axisStruct/update'
+      }
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        // this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+    // 取消按钮 
+    handleCancle () {
+      // this.resetData()
+      this.$emit('dialogCancle')
+    },
+    resetData () {
+      this.keyWords = ''
+      this.dataForm = {
+        id:'',
+        name:'',
+        agencyId:'',
+        structLevel: null,
+        pid:'',
+        categoryCode:'',
+        sort:'',
+        longitude: '', //经度
+        latitude: ''//纬度
+      }
+      this.propertyFormShow = false
+      this.keyWords= ''
+      this.structCategoryArr = [] // 查询动力主轴标签类别
+      this.leaderCategoryArr = [] // 查询动力主轴负责人标签类别
+      this.agencytree = [] // 绑定组织列表
+      this.parentStructTree = [] // 上级节点列表
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    },
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('app'), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45 // 设置地图旋转角度
+      })
+
+      search = new window.TMap.service.Search({ pageSize: 10 })
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: []
+      })
+      infoWindowList = Array(10)
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      this.handleMoveCenter()
+    },
+    setMarker (lat, lng) {
+      markers.setGeometries([])
+      markers.add([
+        {
+          id: '4',
+          styleId: 'marker',
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: 'marker4'
+          }
+        }
+      ])
+    },
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close()
+      })
+      infoWindowList.length = 0
+      markers.setGeometries([])
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds()
+        })
+        .then((result) => {
+          let { data } = result
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng }
+            } = data[0]
+            map.setCenter(new TMap.LatLng(lat, lng))
+            this.setMarker(lat, lng)
+            this.dataForm.latitude = lat
+            this.dataForm.longitude = lng
+          } else {
+            this.$message.error('未检索到相关位置坐标')
+          }
+        })
+    },
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.dataForm.latitude = lat
+      this.dataForm.longitude = lng
+      this.setMarker(lat, lng)
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        categoryCode:[
+            { required: true, message: "类别不能为空", trigger: "blur" }
+        ],
+        name:[
+            { required: true, message: "名称不能为空", trigger: "blur" }
+        ],
+        agencyId:[
+            { required: true, message: "所属组织不能为空", trigger: "blur" }
+        ],
+        pid:[
+            { required: true, message: "所属上级不能为空", trigger: "blur" }
+        ],
+        longitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+
+
+
diff --git a/src/views/modules/plugins/power/poweraxis_add_leader.vue b/src/views/modules/plugins/power/poweraxis_add_leader.vue
index 05e46f0d..4293b65d 100644
--- a/src/views/modules/plugins/power/poweraxis_add_leader.vue
+++ b/src/views/modules/plugins/power/poweraxis_add_leader.vue
@@ -1,51 +1,65 @@
 <template>
-  <el-dialog :visible.sync="visible" title="负责人" :close-on-click-modal="false" :close-on-press-escape="false" @closed="leaderClosed">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="类别" label-width="110px" v-if="structLevel || structLevel === 0">
-          {{ leaderCategoryCodeArr[structLevel].categoryName }}
-      </el-form-item>
-      <el-form-item label="名称" prop="name" label-width="110px">
-          <el-input style="width:250px" v-model="dataForm.name" placeholder="负责任人名称"></el-input>
-      </el-form-item>
-      <el-form-item label="性别" prop="gender" label-width="110px">
-        <el-select style="width:250px" v-model="dataForm.gender" clearable placeholder="性别">
-          <el-option
-            v-for="item in gender"
-            :key="item.dictValue"
-            :label="item.dictName"
-            :value="item.dictValue"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="联系方式" prop="mobile" label-width="110px">
-          <el-input style="width:250px" v-model="dataForm.mobile" placeholder="联系方式"></el-input>
-      </el-form-item>
-      <el-form-item label="简介" prop="interoduction" label-width="110px">
-          <el-input style="width:250px" v-model="dataForm.interoduction" placeholder="简介"></el-input>
-      </el-form-item>
-      <el-form-item label="头像" prop="avatar" label-width="110px">
-          <el-input style="width:250px" v-model="dataForm.avatar" placeholder="头像"></el-input>
-      </el-form-item>
-      <!-- <el-form-item label="头像" prop="avatar" label-width="110px">
-        <el-upload class="avatar-uploader"
-          :action="uploadUlr"
-          :show-file-list="false"
-          :on-success="(response, file, fileList) => handleImgSuccess('avatar', response, file, fileList)"
-          :before-upload="beforeImgUpload">
-          <img v-if="dataForm.avatar"
-            :src="dataForm.avatar"
-            style="width:70px;height:70px"
-            class="function-icon">
-          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-        </el-upload>
-      </el-form-item> -->
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+  <div>
+    <div class="dialog-h-content scroll-h">
+        <div>
+          <el-form ref="ref_leader"
+                  :inline="true"
+                  :model="dataForm"
+                  :rules="dataRule"
+                  :disabled="formType === 'detail'"
+                  class="form">
+            <el-form-item label="类别" label-width="150px" v-if="structLevel || structLevel === 0">
+                <el-input class="item_width_1" :readonly="true" v-model="categoryName"></el-input>
+            </el-form-item>
+            <el-form-item label="名称" prop="name" label-width="150px">
+                <el-input class="item_width_1" v-model="dataForm.name" placeholder="负责任人名称"></el-input>
+            </el-form-item>
+            <el-form-item label="性别" prop="gender" label-width="150px">
+              <el-select class="item_width_1" v-model="dataForm.gender" clearable placeholder="性别">
+                <el-option
+                  v-for="item in gender"
+                  :key="item.dictValue"
+                  :label="item.dictName"
+                  :value="item.dictValue"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="联系方式" prop="mobile" label-width="150px">
+                <el-input class="item_width_1" v-model="dataForm.mobile" placeholder="联系方式"></el-input>
+            </el-form-item>
+            <el-form-item label="简介" prop="interoduction" label-width="150px">
+                <el-input class="item_width_1" v-model="dataForm.interoduction" placeholder="简介"></el-input>
+            </el-form-item>
+            <!-- <el-form-item label="头像" prop="avatar" label-width="110px">
+                <el-input style="width:250px" v-model="dataForm.avatar" placeholder="头像"></el-input>
+            </el-form-item> -->
+            <el-form-item label="头像" prop="avatar" label-width="150px">
+              <el-upload class="avatar-uploader"
+                :action="uploadUlr"
+                :show-file-list="false"
+                :on-success="(response, file, fileList) => handleImgSuccess('avatar', response, file, fileList)"
+                :before-upload="beforeImgUpload">
+                <img v-if="dataForm.avatar"
+                  :src="dataForm.avatar"
+                  style="width:70px;height:70px"
+                  class="function-icon">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </el-form-item>
+          </el-form>
+          <div class="div_btn">
+            <el-button size="small"
+                      @click="handleCancle">取 消</el-button>
+            <el-button size="small"
+                      v-if="formType != 'detail'"
+                      type="primary"
+                      :disabled="btnDisable"
+                      @click="dataFormSubmitHandle">确 定</el-button>
+          </div>
+        </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -54,8 +68,9 @@ import { requestPost } from "@/js/dai/request";
 export default {
   data () {
     return {
+      btnDisable: false,
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-      visible: false,
       dataForm: {
         name: '',
         gender: '',
@@ -64,51 +79,21 @@ export default {
         categoryCode: '',
         avatar: '',
         structReferenceId: '', // 动力主轴节点ID
-        // customerId: localStorage.getItem('customerId'),
         leaderId: ''
       },
+      structLevel: '',
       leaderCategoryCodeArr: '', // 动力主轴节点级别
+      categoryName: '',
       gender: [
-        { dictValue: '男', dictName: '男' },
-        { dictValue: '女', dictName: '女' }
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '2', dictName: '女' }
       ],
     }
   },
 
   props: {
-    leaderVisible: {
-      type: Boolean,
-      default: false
-    },
-    axisStructId: {
-      type: String,
-      default: ''
-    },
-    leaderId: {
-      type: String,
-      default: ''
-    },
-    structLevel: {
-      type: Number,
-      default: null
-    },
-  },
-  created(){
-      this.getTagCategoryArr()
   },
   watch: {
-      leaderVisible(newName){
-          this.visible = newName
-      },
-      axisStructId (newName) {
-        this.dataForm.structReferenceId = newName
-      },
-      leaderId(newName) {
-        if (newName) {
-          this.dataForm.leaderId = newName
-          this.getInfo()
-        }
-      }
   },
   computed: {
     dataRule () {
@@ -125,13 +110,23 @@ export default {
         interoduction: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        avatar: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
+        // avatar: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ]
       }
     }
   },
   methods: {
+    initForm(agencyObj) {
+      this.$refs.ref_leader.resetFields();
+      this.dataForm.structReferenceId = agencyObj.axisStructId
+      this.dataForm.leaderId = agencyObj.leaderId
+      this.structLevel = agencyObj.structLevel
+      this.getTagCategoryArr()
+      if (this.dataForm.leaderId) {
+        this.getInfo()
+      }
+    },
     handleImgSuccess (type, res, file) {
       if (res.code === 0 && res.msg === 'success') {
 
@@ -178,21 +173,24 @@ export default {
       }
     },
     // 表单提交
-     dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        if (this.leaderId) {
-          this.updateLeader()
-        } else {
-          this.addLeader()
-        }
-      })
-    }, 1000, { 'leading': true, 'trailing': false }),
-    leaderClosed () {
-      this.visible = false
-      this.$emit('refreshDataListleader')
+    async dataFormSubmitHandle () {
+      // 确定
+        this.btnDisable = true
+        setTimeout(() => {
+          this.btnDisable = false
+        }, 10000)
+        this.$refs['ref_leader'].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj)
+            this.btnDisable = false
+          } else {
+            if (this.dataForm.leaderId) {
+              this.updateLeader()
+            } else {
+              this.addLeader()
+            }
+          }
+        })
     },
     async addLeader() {
       this.dataForm.categoryCode = this.leaderCategoryCodeArr[this.structLevel].categoryCode
@@ -204,8 +202,7 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataListleader')
+              this.$emit('leaderOk')
             }
           })
       } else {
@@ -222,8 +219,7 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataListleader')
+              this.$emit('leaderOk')
             }
           })
       } else {
@@ -241,6 +237,11 @@ export default {
       } else {
           this.$message.error(msg)
       }
+      this.categoryName = this.leaderCategoryCodeArr[this.structLevel].categoryName
+    },
+    // 取消按钮 
+    handleCancle () {
+      this.$emit('leaderCancle')
     },
   }
 }
@@ -273,3 +274,6 @@ export default {
   }
 }
 </style>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
diff --git a/src/views/modules/plugins/power/servicestationTable.vue b/src/views/modules/plugins/power/servicestationTable.vue
index 00fb305a..26f5c421 100644
--- a/src/views/modules/plugins/power/servicestationTable.vue
+++ b/src/views/modules/plugins/power/servicestationTable.vue
@@ -91,7 +91,7 @@
 <script>
 
 import ServicestationForm from './servicestationForm'
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 export default {
   data () {
@@ -121,12 +121,12 @@ export default {
       this.tableLoading = true
       const url = "/pli/power/serviceStation/page"
       let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
+        limit: this.pageSize,
+        page: this.pageNo,
         axisStructId: this.axisStructId,
         name: this.name
       }
-      const { data, code, msg, total } = await requestPost(url, params)
+      const { data, code, msg, total } = await requestGet(url, params)
       if (code === 0) {        
         this.total = data.total || 0;
         this.tableData = data.list ? data.list.map((item) => { return item }) : []