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 2188c43d..e53c81e4 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 00000000..cf029a4e
--- /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 00000000..70f08291
--- /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>