From 00276d0f591dea3de0ccd3d28ebf05d8df13c172 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Fri, 22 Apr 2022 18:51:31 +0800
Subject: [PATCH 1/8] update

---
 .../plugins/power/poweraxis-add-or-update.vue |  24 ++--
 .../power/poweraxistag-add-or-update.vue      | 127 ++++++++++++++++++
 .../modules/plugins/power/poweraxistag.vue    |  82 +++++++++++
 3 files changed, 224 insertions(+), 9 deletions(-)
 create mode 100644 src/views/modules/plugins/power/poweraxistag-add-or-update.vue
 create mode 100644 src/views/modules/plugins/power/poweraxistag.vue

diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
index 2188c43d7..e53c81e4d 100644
--- a/src/views/modules/plugins/power/poweraxis-add-or-update.vue
+++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
@@ -141,16 +141,16 @@ export default {
     dataRule () {
       return {
         categoryCode:[
-            { required: true, message: "上级部门不能为空", trigger: "blur" }
+            { required: true, message: "类别不能为空", trigger: "blur" }
         ],
         name:[
-            { required: true, message: "上级部门不能为空", trigger: "blur" }
+            { required: true, message: "名称不能为空", trigger: "blur" }
         ],
         orgId:[
-            { required: true, message: "上级部门不能为空", trigger: "blur" }
+            { required: true, message: "所属组织不能为空", trigger: "blur" }
         ],
         pid:[
-            { required: true, message: "上级部门不能为空", trigger: "blur" }
+            { required: true, message: "所属上级不能为空", trigger: "blur" }
         ],
         longitude: [
           { required: true, message: '坐标不能为空', trigger: 'blur' }
@@ -300,20 +300,26 @@ export default {
     // 动力主轴选中后的操作
     handelChange(val){
         this.dataForm.categoryCode = val
-        if (val === 'community_party') {
+        let selectedLevel
+        this.structCategoryArr.forEach((item) => {
+          if(item.categoryCode === val){
+            selectedLevel = item.structLevel
+          }
+        })
+        if (selectedLevel === 0) {
             this.orgListSwitch = true
             this.GridPartyBranchSwitch = false
             this.partyCommSwitch = false
-            this.dataForm.pid = 0
+            this.dataForm.pid = '0'
         } 
-        if(val === 'grid_party') {
+        if(selectedLevel === 1) {
             this.orgListSwitch = false
             this.GridPartyBranchSwitch = false
             this.partyCommSwitch = true
-            this.getPartyCommList()
             this.dataForm.pid = ''
+            this.getPartyCommList()
         }
-        if(val === 'group_party') {
+        if(selectedLevel === 2) {
             this.GridPartyBranchSwitch = true
             this.partyCommSwitch = false
             this.dataForm.pid = ''
diff --git a/src/views/modules/plugins/power/poweraxistag-add-or-update.vue b/src/views/modules/plugins/power/poweraxistag-add-or-update.vue
new file mode 100644
index 000000000..cf029a4ee
--- /dev/null
+++ b/src/views/modules/plugins/power/poweraxistag-add-or-update.vue
@@ -0,0 +1,127 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="类别" prop="tagCategory">
+        <el-radio-group v-model="dataForm.tagCategory" size="small">
+          <el-radio-button label="struct">动力主轴</el-radio-button>
+          <el-radio-button label="leader">负责人</el-radio-button>
+          <el-radio-button label="param">默认参数</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="类别编码" prop="categoryCode">
+        <el-input v-model="dataForm.categoryCode" placeholder="标签类别编码"></el-input>
+      </el-form-item>
+      <el-form-item label="类别属性" prop="categoryName">
+        <el-input v-model="dataForm.categoryName" placeholder="标签类别属性"></el-input>
+      </el-form-item>
+      <el-form-item label="节点等级" prop="structLevel">
+        <el-radio-group v-model="dataForm.structLevel" size="small">
+          <el-radio-button label="0">一级</el-radio-button>
+          <el-radio-button label="1">二级</el-radio-button>
+          <el-radio-button label="2">三级</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="禁用" prop="forbiddenFlag">
+        <el-switch
+          v-model="dataForm.forbiddenFlag"
+          active-color="#ff4949"
+          inactive-color="#13ce66"
+          active-value="1"
+          inactive-value="0"
+          active-text="禁用"
+          inactive-text="正常">
+        </el-switch>
+      </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>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        tagCategory: '',
+        categoryCode: '',
+        categoryName: '',
+        structLevel: 0,
+        forbiddenFlag: '0'
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        tagCategory: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        categoryCode: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        categoryName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        structLevel: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        forbiddenFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/pli/power/axisTag/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http['post'](
+          !this.dataForm.id ? '/pli/power/axisTag/save' : '/pli/power/axisTag/update', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/power/poweraxistag.vue b/src/views/modules/plugins/power/poweraxistag.vue
new file mode 100644
index 000000000..70f08291d
--- /dev/null
+++ b/src/views/modules/plugins/power/poweraxistag.vue
@@ -0,0 +1,82 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-axis__powerAxisTag}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="tagCategory" label="类别" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-tag size="mini" v-if="scope.row.tagCategory ==='struct'">动力主轴</el-tag>
+            <el-tag size="mini" v-if="scope.row.tagCategory ==='leader'" type="success">负责人</el-tag>
+            <el-tag size="mini" v-if="scope.row.tagCategory ==='param'" type="info">默认参数</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="categoryCode" label="类别编码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="categoryName" label="类别属性" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="structLevel" label="节点等级" header-align="center" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.structLevel === 0 ? '一级' : scope.row.structLevel === 1 ? '二级' : '三级' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="forbiddenFlag" label="禁用状态" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-tag size="mini" v-if="scope.row.forbiddenFlag === '0'" type="success">正常</el-tag>
+            <el-tag size="mini" v-else type="danger">禁用</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './poweraxistag-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/pli/power/axisTag/page',
+        getDataListIsPage: true,
+        deleteURL: '/pli/power/axisTag/delete',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From b5d5f8c60de6875cd63d1a470bbbbafa26ec2b96 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 22 Apr 2022 19:40:55 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/power/poweraxis-add-or-update.vue |   2 +
 .../modules/plugins/power/servicestation.vue  | 242 ++++++++++++++
 .../plugins/power/servicestationForm.vue      | 303 ++++++++++++++++++
 .../plugins/power/servicestationTable.vue     | 240 ++++++++++++++
 4 files changed, 787 insertions(+)
 create mode 100644 src/views/modules/plugins/power/servicestation.vue
 create mode 100644 src/views/modules/plugins/power/servicestationForm.vue
 create mode 100644 src/views/modules/plugins/power/servicestationTable.vue

diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
index e53c81e4d..a6c9b498c 100644
--- a/src/views/modules/plugins/power/poweraxis-add-or-update.vue
+++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
@@ -81,12 +81,14 @@
             <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>
diff --git a/src/views/modules/plugins/power/servicestation.vue b/src/views/modules/plugins/power/servicestation.vue
new file mode 100644
index 000000000..eb68fc23d
--- /dev/null
+++ b/src/views/modules/plugins/power/servicestation.vue
@@ -0,0 +1,242 @@
+<template>
+  <div>
+    <div class="div_search">
+      <el-form :rules="dataRule" :inline="true">
+          <el-form-item label="所属组织" prop="deptName">
+              <el-cascader
+                      style="width:350px"
+                      placeholder="请选择所属组织"
+                      :options="agencytree"
+                      v-model="agencyId"
+                      :props="{ expandTrigger: 'hover', label: 'orgName', value: 'orgId', children: 'subOrgList' }"
+                      clearable/>
+          </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="loadTree()">加载动力主轴</el-button>
+            </el-form-item>
+      </el-form>
+    </div>
+    <div class="div_main">
+      <div :style="{height:rowHeight}"
+          class="div_tree">
+        <el-input placeholder="输入关键字进行过滤"
+                  v-model="filterText">
+        </el-input>
+        <el-scrollbar :style="{height:treeHeight}"
+                      class="scrollar">
+          <el-tree ref="ref_tree"
+                  v-loading="treeLoading"
+                  class="filter_tree"
+                  :data="treeData"
+                  :props="defaultProps"
+                  :highlight-current="true"
+                  node-key="id"
+                  :expand-on-click-node="false"
+                  default-expand-all
+                  :filter-node-method="filterNode"
+                  @node-click="handleNodeClick">
+          </el-tree>
+        </el-scrollbar>
+      </div>
+      <div :style="{height:rowHeight}"
+          class="div_table">
+        <servicestation-table :axisStructId="axisStructId" ref="ref_communityTable"></servicestation-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import CDialog from '@c/CDialog'
+import servicestationTable from './servicestationTable'
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+export default {
+  data () {
+    return {
+      agencytree: [], // 所属组织
+      agencyId: '',
+      filterText: '',
+      treeLoading: false,
+      treeData: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      selTreeObj: {},
+      centerPoint: [],
+      axisStructId: '' // 动力主轴节点id
+    }
+  },
+  async mounted () {
+    // this.treeLoading = true
+    // await this.loadTree()
+    await this.getAgencyTree()
+    // this.treeLoading = false
+  },
+  computed: {
+    rowHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 230 + this.iframeHeight + 'px' : this.clientHeight - 230 + 'px'
+    },
+    treeHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight + 'px' : this.clientHeight - 310 + 'px'
+    },
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+
+    dataRule () {
+      return {
+        deptName:[
+            { required: true, message: "请选择", trigger: "blur" }
+        ]
+      }
+    }
+  },
+  methods: {
+    async loadTree () {
+      this.axisStructId = ''
+      if (this.agencyId.length === 0 || !this.agencyId) {
+        return this.$message.error('请选择所属组织')
+      }
+      this.treeLoading = true
+      const url = "/pli/power/data/axis/structTree"
+      let params = {
+        agencyId: this.agencyId[this.agencyId.length-1]
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      this.treeLoading = false
+      if (code === 0) {
+        this.treeData = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleNodeClick (obj) {
+      this.axisStructId = obj.id
+    },
+    filterNode (value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+    // 获取组织列表
+    async getAgencyTree(){
+        const url = '/data/aggregator/org/agencytree'
+
+        let params = {
+            agencyId:this.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;
+    }
+  },
+  watch: {
+    filterText (val) {
+      this.$refs.ref_tree.filter(val);
+    }
+  },
+  components: {
+    servicestationTable, CDialog
+  }
+}
+</script>
+<style lang="scss" scoped >
+.div_search {
+  width: calc(100% - 5px);
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 30px 20px 5px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+.div_main {
+  margin-top: 10px;
+  display: flex;
+}
+.scrollar {
+  margin-top: 10px;
+}
+
+.div_tree {
+  flex: 0 0 280px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+  overflow-y: hidden;
+}
+.filter_tree {
+  overflow-x: auto;
+}
+
+.div_table {
+  margin-left: 15px;
+  // flex: 1;
+  width: calc(100% - 300px);
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.div_btn {
+  margin-top: 20px;
+}
+
+.row {
+  padding: 10px;
+}
+</style>
+
+<style>
+/* .aui-content > .el-tabs > .el-tabs__content {
+  padding: 0px;
+} */
+
+.el-tree-node:focus > .el-tree-node__content {
+  /* background-color: #ccc !important; */
+  color: #2195fe;
+}
+</style>
+<style lang="scss" scoped>
+.div_tree {
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden !important;
+  }
+}
+</style>
diff --git a/src/views/modules/plugins/power/servicestationForm.vue b/src/views/modules/plugins/power/servicestationForm.vue
new file mode 100644
index 000000000..0deec305b
--- /dev/null
+++ b/src/views/modules/plugins/power/servicestationForm.vue
@@ -0,0 +1,303 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+                :inline="true"
+                :model="dataForm"
+                :rules="dataRule"
+                :disabled="formType === 'detail'"
+                class="form">
+
+        <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 label="服务站地址"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入服务站地址"
+                    v-model="dataForm.address">
+          </el-input>
+        </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-item label-width="150px" label="排序">
+            <el-input-number v-model="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
+        </el-form-item>
+      </el-form>
+    </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 { 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: {
+        structReferenceId: '', //关联动力主轴ID
+        name: '', //服务站名称
+        address: '', // 服务站地址
+        longitude: '', //服务站经度
+        latitude: '', //服务站纬度
+        sort: '', // 排序
+      },
+      keyWords: ''
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+
+  methods: {
+    async initForm (type, row, agencyObj) {
+      this.$refs.ref_form.resetFields();
+      this.agencyObj = agencyObj
+      this.formType = type
+      console.log(row)
+      if (row) {
+        this.dataForm = JSON.parse(JSON.stringify(row))
+        map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
+        this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
+      } 
+      // else {
+      //   map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
+      // }
+    },
+    // 地图初始化函数，本例取名为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)
+    },
+
+    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 = ''
+      this.dataForm.structReferenceId = this.axisStructId
+      if (this.formType === 'add') {
+        url = '/pli/power/serviceStation/save'
+      } else {
+        url = '/pli/power/serviceStation/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 = {
+        name: '', // 服务站名称
+        address: '', //详细地址
+        longitude: '', //服务站经度
+        latitude: '' //服务站纬度
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '服务站名称不能为空', trigger: 'blur' },
+          {
+            min: 1,
+            max: 50,
+            message: '服务站名称长度在 1 到 50个字符',
+            trigger: 'blur'
+          }
+        ],
+        address: [
+          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        ],
+        longitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+    propertyRule () {
+      name: [
+        { required: true, message: '物业名称不能为空', trigger: 'blur' }
+        // { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
+      ]
+    }
+  },
+  props: {
+    axisStructId: { // 动力主轴id
+      type: String,
+      default: ''
+    }
+  },
+}
+</script>
+<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
new file mode 100644
index 000000000..e547f4149
--- /dev/null
+++ b/src/views/modules/plugins/power/servicestationTable.vue
@@ -0,0 +1,240 @@
+<template>
+  <div>
+    <div class="div_search">
+      <div class="resi-cell">
+        <div class="resi-cell-label">服务站名</div>
+        <div class="resi-cell-value">
+          <el-input v-model="ownerName"
+                    class="resi-cell-input"
+                    size="small"
+                    clearable
+                    placeholder="请输入服务站名">
+          </el-input>
+        </div>
+      </div>
+      <el-button style="margin-left:10px"
+                 class="diy-button--search"
+                 size="small"
+                 @click="handleSearch">查询</el-button>
+    </div>
+    <div class="div_btn">
+      <el-button style=""
+                 class="diy-button--add"
+                 size="small"
+                 @click="handleAdd">添加</el-button>
+    </div>
+    <div class="div_table">
+      <el-table ref="ref_table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column prop="name"
+                         label="服务站名称"
+                         width="150">
+        </el-table-column>
+        <el-table-column prop="address"
+                         label="服务站地址">
+        </el-table-column>
+        <el-table-column prop="createdTime"
+                         label="创建时间">
+        </el-table-column>
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="120"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       class="div-table-button--delete"
+                       size="small"
+                       @click="handleDelete(scope.row.id)">删除</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+    <!-- 修改弹出框 -->
+    <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">
+      <servicestation-form ref="ref_form"
+                      @dialogCancle="addFormCancle"
+                      @dialogOk="addFormOk"
+                      :axisStructId="axisStructId"></servicestation-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import ServicestationForm from './servicestationForm'
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+export default {
+  data () {
+    return {
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      ownerName: '',
+      tableData: [],
+      //form相关
+      formShow: false,
+      formTitle: '添加'
+    }
+  },
+  components: {
+    ServicestationForm
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeight : this.clientHeight - 410
+    },
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  methods: {
+    async loadTable () {
+      this.tableLoading = true
+      const url = "/pli/power/serviceStation/page"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        axisStructId: this.axisStructId,
+        ownerName: this.ownerName
+      }
+      const { data, code, msg, total } = await requestPost(url, params)
+      if (code === 0) {        
+        this.total = data.total || 0;
+        this.tableData = data.list ? data.list.map((item) => { return item }) : []
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+    // 删除
+    async handleDelete (id) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+          this.deleteKernelhousehold(id)
+        }).catch(err => {
+          console.log('取消删除')
+        })
+    },
+
+    async deleteKernelhousehold (id) {
+      const url = "/pli/power/serviceStation/delete"
+      const { data, code, msg } = await requestPost(url, [id])
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+    handleSearch () {
+      if (!this.axisStructId) {
+        return this.$message.error('请选择动力主轴节点')
+      }
+      this.loadTable()
+    },
+    diaClose () {
+      // this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+    handleAdd () {
+      if (this.axisStructId) {
+          this.formShow = true
+          this.$nextTick(() => {
+            this.$refs.ref_form.initForm('add', null, {})
+          })
+      } else {
+        return this.$message.error('请选择动力主轴节点')
+      }
+    },
+    // 修改
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row, {})
+      })
+    },
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+    },
+  },
+  props: {
+    axisStructId: {
+      type: String,
+      default: '',
+    }
+  },
+  watch: {
+    axisStructId (newName) {
+      if (newName) {
+        this.pageSize = 20
+        this.pageNo = 1
+        this.loadTable()
+      } else {
+        this.pageSize = 20
+        this.pageNo = 0
+        this.total = 0;
+        this.tableData = []
+      }
+    }
+  },
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManage.scss";
+</style>
+
+<style >
+.el-message.is-closable .el-message__content {
+  line-height: 20px;
+}
+</style>
+

From aff222a9f04559300919b007385144034cec9aea Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 22 Apr 2022 19:47:37 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/power/poweraxis-add-or-update.vue | 4 ++--
 src/views/modules/plugins/power/servicestationForm.vue      | 4 ++--
 src/views/modules/plugins/power/servicestationTable.vue     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
index a6c9b498c..8aa947dc0 100644
--- a/src/views/modules/plugins/power/poweraxis-add-or-update.vue
+++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
@@ -81,14 +81,14 @@
             <el-input class="item_width_3"
                       maxlength="50"
                       placeholder="请输入经度"
-                      readonly="true"
+                      :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"
+                      :readonly="true"
                       v-model="dataForm.latitude">
             </el-input>
           </div>
diff --git a/src/views/modules/plugins/power/servicestationForm.vue b/src/views/modules/plugins/power/servicestationForm.vue
index 0deec305b..9075e983d 100644
--- a/src/views/modules/plugins/power/servicestationForm.vue
+++ b/src/views/modules/plugins/power/servicestationForm.vue
@@ -52,14 +52,14 @@
               <el-input class="item_width_3"
                         maxlength="50"
                         placeholder="请输入经度"
-                        readonly="true"
+                        :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"
+                        :readonly="true"
                         v-model="dataForm.latitude">
               </el-input>
             </div>
diff --git a/src/views/modules/plugins/power/servicestationTable.vue b/src/views/modules/plugins/power/servicestationTable.vue
index e547f4149..00fb305a6 100644
--- a/src/views/modules/plugins/power/servicestationTable.vue
+++ b/src/views/modules/plugins/power/servicestationTable.vue
@@ -4,7 +4,7 @@
       <div class="resi-cell">
         <div class="resi-cell-label">服务站名</div>
         <div class="resi-cell-value">
-          <el-input v-model="ownerName"
+          <el-input v-model="name"
                     class="resi-cell-input"
                     size="small"
                     clearable
@@ -100,7 +100,7 @@ export default {
       pageSize: 20,
       pageNo: 0,
       tableLoading: false,
-      ownerName: '',
+      name: '',
       tableData: [],
       //form相关
       formShow: false,
@@ -124,7 +124,7 @@ export default {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
         axisStructId: this.axisStructId,
-        ownerName: this.ownerName
+        name: this.name
       }
       const { data, code, msg, total } = await requestPost(url, params)
       if (code === 0) {        

From cb102cd249ab9c202eda945d6f8d351480900778 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 22 Apr 2022 20:10:08 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/power/kernelhouseholdTable.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue
index 15b72549d..6375c2b85 100644
--- a/src/views/modules/plugins/power/kernelhouseholdTable.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue
@@ -84,7 +84,7 @@
 <script>
 
 import KernelhouseholdForm from './kernelhouseholdForm'
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 export default {
   data () {
@@ -114,12 +114,12 @@ export default {
       this.tableLoading = true
       const url = "/pli/power/kernelHousehold/page"
       let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
+        limit: this.pageSize,
+        page: this.pageNo,
         axisStructId: this.axisStructId,
         ownerName: this.ownerName
       }
-      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 }) : []

From 726272da651bdff1904483bd6705918874dfafc5 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Sat, 23 Apr 2022 11:08:54 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/power/poweraxis-add-or-update.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
index 8aa947dc0..6419a28d0 100644
--- a/src/views/modules/plugins/power/poweraxis-add-or-update.vue
+++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
@@ -458,7 +458,7 @@ export default {
     // 修改
     async submitModifyOrg(){
         this.dataForm.agencyId = this.dataForm.orgId[this.dataForm.orgId.length - 1]
-        const url = '/pli/power/axisStruct/modifyOrg'
+        const url = '/pli/power/axisStruct/update'
         const { data, code, msg } = await requestPost(url,this.dataForm)
         if (code === 0) {
           this.$message({
@@ -476,7 +476,7 @@ export default {
     },
     // 新增
     async submitAddNewOrg(){
-        const url = '/pli/power/axisStruct/addOrg'
+        const url = '/pli/power/axisStruct/save'
         this.dataForm.agencyId = this.dataForm.orgId[this.dataForm.orgId.length - 1]
         const { data, code, msg } = await requestPost(url,this.dataForm)
         if (code === 0) {

From 0872beb612a7a596a4ee2265358e2f2c3f99fb86 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Sat, 23 Apr 2022 15:27:34 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A8=E5=8A=9B?=
 =?UTF-8?q?=E4=B8=BB=E8=BD=B4=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/power/poweraxis-add-or-update.vue | 136 +++++++-----------
 src/views/modules/plugins/power/poweraxis.vue |   5 +-
 2 files changed, 50 insertions(+), 91 deletions(-)

diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
index 6419a28d0..1803dc288 100644
--- a/src/views/modules/plugins/power/poweraxis-add-or-update.vue
+++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
@@ -20,35 +20,23 @@
           <el-input  v-model="dataForm.name" placeholder="请输入名称"  style="width:250px"></el-input>
       </el-form-item>
       <!-- 下拉框组织的参数 -->
-      <el-form-item  prop="orgId" label="所属组织" v-if="orgListSwitch">
+      <el-form-item  prop="agencyId" label="所属组织" v-if="orgListSwitch">
           <el-cascader
-              v-model="dataForm.orgId"
+              v-model="dataForm.agencyId"
               :options="agencytree"
               placeholder="请选择所属组织"
-              :props="{ expandTrigger: 'hover', label: 'orgName', value: 'orgId', children: 'subOrgList' }"
-              ></el-cascader>
+              :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"
+              :show-all-levels="false"
+              clearable />
       </el-form-item>
-      <!-- 网格党支部下拉框 -->
-      <el-form-item prop="pid" label="所属上级" v-if="GridPartyBranchSwitch">
-          <el-select v-model="dataForm.pid" placeholder="请选择所属上级">
-              <el-option
-              v-for="item in GridPartyBranchList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-              </el-option>
-          </el-select>
-      </el-form-item>
-      <!-- 党委下拉框 -->
-      <el-form-item prop="pid" label="所属上级" v-if="partyCommSwitch">
-          <el-select v-model="dataForm.pid" placeholder="请选择所属上级">
-              <el-option
-              v-for="item in PartyCommList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-              </el-option>
-          </el-select>
+      <el-form-item prop="pid" label="所属上级" v-if="!orgListSwitch">
+          <el-cascader
+            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 label="排序">
           <el-input-number v-model="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
@@ -120,7 +108,6 @@ export default {
         name:'',
         agencyId:'',
         agencyName:'',
-        orgId: '',
         agencyType:'',
         pid:'',
         categoryCode:'',
@@ -132,11 +119,8 @@ export default {
       structCategoryArr: [], // 查询动力主轴标签类别
       leaderCategoryArr: [], // 查询动力主轴负责人标签类别
       agencytree: [], // 绑定组织列表
-      GridPartyBranchList:[], // 上级网格党支部列表
-      PartyCommList:[], // 党委列表
-      orgListSwitch:false, // 组织列表开关
-      GridPartyBranchSwitch:false, // 上级网格党支部列表
-      partyCommSwitch:false, // 党委下拉框列表开关
+      parentStructTree: [], // 上级节点列表
+      orgListSwitch: false, // 组织列表开关
     }
   },
   computed: {
@@ -148,7 +132,7 @@ export default {
         name:[
             { required: true, message: "名称不能为空", trigger: "blur" }
         ],
-        orgId:[
+        agencyId:[
             { required: true, message: "所属组织不能为空", trigger: "blur" }
         ],
         pid:[
@@ -243,6 +227,18 @@ export default {
         })
         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 () {
       this.$http.post(`/pli/power/axisStruct/queryModifyById/${this.dataForm.id}`).then(({ data: res }) => {
@@ -253,48 +249,27 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-        if(this.dataForm.categoryCode === 'community_party') {
-            this.orgListSwitch = true
-            this.GridPartyBranchSwitch = false
-            this.partyCommSwitch = false
-        }
-        if(this.dataForm.categoryCode === 'grid_party') {
-            this.orgListSwitch = false
-            this.GridPartyBranchSwitch = false
-            this.partyCommSwitch = true
-            this.getPartyCommList()
-        }
-        if(this.dataForm.categoryCode === 'group_party') {
-            this.GridPartyBranchSwitch = true
-            this.partyCommSwitch = false
-            this.getGridPartyBranchList()
-        }
-      }).catch(() => {})
-    },
-    // 获取上级网格党支部
-    async getGridPartyBranchList(){
-        const url = '/pli/power/axisStruct/GridPartyBranchList'
-
-        let params = {}
-
-        const { data, code, msg } = await requestPost(url,params)
-
-        if (code === 0) {
-            this.GridPartyBranchList = data
+        let selectedLevel
+        this.structCategoryArr.forEach((item) => {
+          if(item.categoryCode === this.dataForm.categoryCode){
+            selectedLevel = item.structLevel
+          }
+        })
+        if(selectedLevel === 0) {
+          this.orgListSwitch = true
         } else {
-            this.$message.error(msg)
+          this.orgListSwitch = false
+          this.getParentStructTree(selectedLevel)
         }
+      }).catch(() => {})
     },
-    // 获取上级组织党委
-    async getPartyCommList(){
-        const url = '/pli/power/axisStruct/getPartyCommList'
-
+    // 获取上级动力主轴节点
+    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.PartyCommList = data
+            this.parentStructTree = this.removeEmptyStructTree(data)
         } else {
             this.$message.error(msg)
         }
@@ -309,23 +284,12 @@ export default {
           }
         })
         if (selectedLevel === 0) {
-            this.orgListSwitch = true
-            this.GridPartyBranchSwitch = false
-            this.partyCommSwitch = false
-            this.dataForm.pid = '0'
-        } 
-        if(selectedLevel === 1) {
-            this.orgListSwitch = false
-            this.GridPartyBranchSwitch = false
-            this.partyCommSwitch = true
-            this.dataForm.pid = ''
-            this.getPartyCommList()
-        }
-        if(selectedLevel === 2) {
-            this.GridPartyBranchSwitch = true
-            this.partyCommSwitch = false
-            this.dataForm.pid = ''
-            this.getGridPartyBranchList()
+          this.orgListSwitch = true
+          this.dataForm.pid = '0'
+        } else {
+          this.orgListSwitch = false
+          this.dataForm.pid = ''
+          this.getParentStructTree(selectedLevel)
         }
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
@@ -457,7 +421,6 @@ export default {
     }, 1000, { 'leading': true, 'trailing': false }),
     // 修改
     async submitModifyOrg(){
-        this.dataForm.agencyId = this.dataForm.orgId[this.dataForm.orgId.length - 1]
         const url = '/pli/power/axisStruct/update'
         const { data, code, msg } = await requestPost(url,this.dataForm)
         if (code === 0) {
@@ -477,7 +440,6 @@ export default {
     // 新增
     async submitAddNewOrg(){
         const url = '/pli/power/axisStruct/save'
-        this.dataForm.agencyId = this.dataForm.orgId[this.dataForm.orgId.length - 1]
         const { data, code, msg } = await requestPost(url,this.dataForm)
         if (code === 0) {
           this.$message({
diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue
index f42975d86..798b524fd 100644
--- a/src/views/modules/plugins/power/poweraxis.vue
+++ b/src/views/modules/plugins/power/poweraxis.vue
@@ -22,7 +22,7 @@
         </el-form>
       </div>
       <div class="div_table">
-        <div class="div_btn">
+        <div>
             <el-button style=""
                     class="diy-button--add"
                     size="small"
@@ -264,9 +264,6 @@ export default {
   }
 }
 
-.div_btn {
-}
-
 .el-row {
   /* margin-bottom: 20px; */
   display: flex;

From 16c3f6abe929ef10cd7a72a46945b513322da685 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Sat, 23 Apr 2022 15:57:15 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/power/poweraxis-add-or-update.vue     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
index 1803dc288..ac35c2cb8 100644
--- a/src/views/modules/plugins/power/poweraxis-add-or-update.vue
+++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
@@ -109,6 +109,7 @@ export default {
         agencyId:'',
         agencyName:'',
         agencyType:'',
+        structLevel: null,
         pid:'',
         categoryCode:'',
         sort:'',
@@ -249,17 +250,16 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-        let selectedLevel
         this.structCategoryArr.forEach((item) => {
           if(item.categoryCode === this.dataForm.categoryCode){
-            selectedLevel = item.structLevel
+            this.dataForm.structLevel = item.structLevel
           }
         })
-        if(selectedLevel === 0) {
+        if(this.dataForm.structLevel === 0) {
           this.orgListSwitch = true
         } else {
           this.orgListSwitch = false
-          this.getParentStructTree(selectedLevel)
+          this.getParentStructTree(this.dataForm.structLevel)
         }
       }).catch(() => {})
     },
@@ -277,19 +277,18 @@ export default {
     // 动力主轴选中后的操作
     handelChange(val){
         this.dataForm.categoryCode = val
-        let selectedLevel
         this.structCategoryArr.forEach((item) => {
           if(item.categoryCode === val){
-            selectedLevel = item.structLevel
+            this.dataForm.structLevel = item.structLevel
           }
         })
-        if (selectedLevel === 0) {
+        if (this.dataForm.structLevel === 0) {
           this.orgListSwitch = true
           this.dataForm.pid = '0'
         } else {
           this.orgListSwitch = false
           this.dataForm.pid = ''
-          this.getParentStructTree(selectedLevel)
+          this.getParentStructTree(this.dataForm.structLevel)
         }
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义

From 1f8a867a4b9a200feb618da16c78df9ded918a4b Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Sun, 24 Apr 2022 18:27:10 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/power/poweraxis.vue | 129 ++++-
 .../modules/plugins/power/poweraxisForm.vue   | 472 ++++++++++++++++++
 .../plugins/power/poweraxis_add_leader.vue    | 212 ++++----
 .../plugins/power/servicestationTable.vue     |   8 +-
 4 files changed, 686 insertions(+), 135 deletions(-)
 create mode 100644 src/views/modules/plugins/power/poweraxisForm.vue

diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue
index 798b524fd..a79230be4 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 000000000..9b2b2941e
--- /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 05e46f0da..4293b65de 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 00fb305a6..26f5c4216 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 }) : []