diff --git a/src/views/modules/kpi/kpiformula-add-or-update.vue b/src/views/modules/kpi/formula-add-or-update.vue
similarity index 90%
rename from src/views/modules/kpi/kpiformula-add-or-update.vue
rename to src/views/modules/kpi/formula-add-or-update.vue
index 73e411cd..138433d5 100644
--- a/src/views/modules/kpi/kpiformula-add-or-update.vue
+++ b/src/views/modules/kpi/formula-add-or-update.vue
@@ -10,9 +10,9 @@
       <el-form-item label="方法名" prop="functionName">
           <el-input v-model="dataForm.functionName" placeholder="方法名"></el-input>
       </el-form-item>
-          <el-form-item label="公式运行方法" prop="formula">
-          <el-input v-model="dataForm.formula" placeholder="公式运行方法（Javascript）" type="textarea"></el-input>
-      </el-form-item>
+        <el-form-item label="公式运行方法"  prop="formula">
+          <el-input :rows="8" v-model="dataForm.formula" placeholder="公式运行方法（Javascript）" type="textarea"></el-input>
+        </el-form-item>
           <el-form-item label="公式参数数量" prop="paramAmount">
           <el-input v-model="dataForm.paramAmount" placeholder="公式参数数量"></el-input>
       </el-form-item>
@@ -87,7 +87,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/kpi/kpiformula/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/kpi/formula/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -103,7 +103,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpiformula/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/formula/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/kpi/kpiformula.vue b/src/views/modules/kpi/formula.vue
similarity index 78%
rename from src/views/modules/kpi/kpiformula.vue
rename to src/views/modules/kpi/formula.vue
index e1250557..542f73ff 100644
--- a/src/views/modules/kpi/kpiformula.vue
+++ b/src/views/modules/kpi/formula.vue
@@ -18,14 +18,11 @@
       <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 type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="code" label="公式编码" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="name" label="公式名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="code" label="公式编码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="functionName" label="方法名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="formula" label="公式运行方法" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="paramAmount" label="公式参数数量" header-align="center" align="center" ></el-table-column>
-        <el-table-column prop="description" label="公式描述" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="paramAmount" width='50' label="参数数量" header-align="center" align="center" ></el-table-column>
+        <el-table-column prop="description" width='400' label="公式描述" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" 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">
@@ -51,15 +48,15 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './kpiformula-add-or-update'
+import AddOrUpdate from './formula-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/kpi/kpiformula/page',
+        getDataListURL: '/kpi/formula/page',
         getDataListIsPage: true,
-        deleteURL: '/kpi/kpiformula',
+        deleteURL: '/kpi/formula',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/kpi/kpirule.vue b/src/views/modules/kpi/kpirule.vue
deleted file mode 100644
index 741fcf8f..00000000
--- a/src/views/modules/kpi/kpirule.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-kpi__kpirule}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="考核规则名称">
-          <el-input v-model="dataForm.ruleName" placeholder="考核规则名称" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('kpi:kpirule:save')" type="primary" @click="addOrUpdateHandle('0')">新增公式规则</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('kpi:kpirule:save')" type="primary" @click="addOrUpdateHandle('1')">新增手动打分规则</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('kpi:kpirule:delete')" 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 type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="ruleName" label="考核规则名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ruleCode" label="考核规则编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ruleMode" label="规则生成方式" header-align="center" align="center" :formatter="showRuleModeFormatter"></el-table-column>
-        <el-table-column prop="referenceId" label="引用ID" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="referenceName" label="引用" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center" :formatter="showKpiCycleFormatter"></el-table-column>
-        <el-table-column prop="deptTypeKey" label="考核部门类别" header-align="center" align="center" :formatter="showDeptTypeKeyFormatter"></el-table-column>
-        <el-table-column prop="createdTime" 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 v-if="$hasPermission('kpi:kpirule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.ruleMode,scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('kpi:kpirule:delete')" 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>
-      <!-- 弹窗, 新增 / 修改手动打分规则 -->
-      <manual-score-add-or-update v-if="manualScoreAddOrUpdateVisible" ref="manualScoreAddOrUpdate" @refreshDataList="getDataList"></manual-score-add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './kpirule-add-or-update'
-import ManualScoreAddOrUpdate from './manual-score-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/kpi/kpirule/query',
-        getDataListIsPage: true,
-        deleteURL: '/kpi/kpirule',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        ruleName: ''
-      },
-      manualScoreAddOrUpdateVisible: false, // 手动打分新增／更新，弹窗visible状态
-      ruleModeList: [],
-      kpiCycleList: [],
-      deptTypeKeyList: []
-    }
-  },
-  components: {
-    AddOrUpdate,
-    ManualScoreAddOrUpdate
-  },
-  created () {
-    this.getRuleModeList()
-    this.getKpiCycleList()
-    this.getDeptTypeKeyList()
-  },
-  methods: {
-    // 新增 修改
-    addOrUpdateHandle (ruleMode, id) {
-      if (ruleMode === '0') {
-        // console.log(+'ruleMode=' + ruleMode + '元公式;id=' + id)
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.dataForm.id = id
-          this.$refs.addOrUpdate.init()
-        })
-      } else if (ruleMode === '1') {
-        // console.log('ruleMode=' + ruleMode + '手动打分;id=' + id)
-        this.manualScoreAddOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.manualScoreAddOrUpdate.dataForm.id = id
-          this.$refs.manualScoreAddOrUpdate.init()
-        })
-      }
-    },
-    // 获取绩效考核规则生成方式
-    getRuleModeList () {
-      this.$http.get(`/sys/dict/listSimple/rule_mode`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.ruleModeList = res.data
-      }).catch(() => { })
-    },
-    showRuleModeFormatter: function (row, column) {
-      if (row.ruleMode) {
-        let dict = this.ruleModeList.filter(item => item.dictValue === row.ruleMode)[0]
-        if (dict) {
-          return dict.dictName
-        }
-      }
-      return ''
-    },
-    // 获取绩效考核周期下拉框集合
-    getKpiCycleList () {
-      this.$http.get(`/sys/dict/listSimple/kpi_cycle`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.kpiCycleList = res.data
-      }).catch(() => { })
-    },
-    showKpiCycleFormatter: function (row, column) {
-      if (row.kpiCycle) {
-        let dict = this.kpiCycleList.filter(item => item.dictValue === row.kpiCycle)[0]
-        if (dict) {
-          return dict.dictName
-        }
-      }
-      return ''
-    },
-    // 获取考核部门类别下拉框
-    getDeptTypeKeyList () {
-      this.$http.get(`/sys/dict/listSimple/org_type`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.deptTypeKeyList = res.data
-      }).catch(() => { })
-    },
-    // 转换考核部门显示名称
-    showDeptTypeKeyFormatter: function (row, column) {
-      if (row.deptTypeKey) {
-        let dict = this.deptTypeKeyList.filter(item => item.dictValue === row.deptTypeKey)[0]
-        if (dict) {
-          return dict.dictName
-        }
-      }
-      return ''
-    }
-  }
-}
-</script>
diff --git a/src/views/modules/kpi/kpitimelimitissue.vue b/src/views/modules/kpi/kpitimelimitissue.vue
deleted file mode 100644
index 39b589b4..00000000
--- a/src/views/modules/kpi/kpitimelimitissue.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-kpi__kpitimelimitissue}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('kpi:kpitimelimitissue:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('kpi:kpitimelimitissue:delete')" 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 type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="validRespondTime" label="有效响应时间(h)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('kpi:kpitimelimitissue:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('kpi:kpitimelimitissue:delete')" 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 './kpitimelimitissue-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/kpi/kpitimelimitissue/page',
-        getDataListIsPage: true,
-        deleteURL: '/kpi/kpitimelimitissue',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>
diff --git a/src/views/modules/kpi/kpitimelimititem-add-or-update.vue b/src/views/modules/kpi/kpitimelimititem-add-or-update.vue
deleted file mode 100644
index 9acfed97..00000000
--- a/src/views/modules/kpi/kpitimelimititem-add-or-update.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<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' : '125px'">
-          <el-form-item label="有效响应时间(h)" prop="validRespondTime">
-          <el-input v-model="dataForm.validRespondTime" placeholder="有效响应时间(h)" v-if="false"></el-input>
-          <el-input-number v-model="dataForm.validRespondTime" :min="1"></el-input-number>
-      </el-form-item>
-          <el-form-item label="有效结案时间(h)" prop="validCloseTime">
-          <el-input v-model="dataForm.validCloseTime" placeholder="有效结案时间(h)" v-if="false"></el-input>
-          <el-input-number v-model="dataForm.validCloseTime" :min="1"></el-input-number>
-      </el-form-item>
-      <el-form-item label="项目类别" prop="categoryId" v-if="!this.dataForm.id" >
-          <el-cascader clearable v-model="dataForm.categoryIds"
-                  :props="{multiple :true }" :options="categoryOptions" filterable>
-          </el-cascader>
-      </el-form-item>
-          <el-form-item label="所有上级项目类别id" prop="parentCategoryIds" v-if="false">
-          <el-input v-model="dataForm.parentCategoryIds" placeholder="所有上级项目类别id"></el-input>
-      </el-form-item>
-          <el-form-item label="上级项目类别" prop="parentCategoryNames" v-if="false">
-          <el-input v-model="dataForm.parentCategoryNames" placeholder="所有上级项目类别名称"></el-input>
-      </el-form-item>
-          <el-form-item label="所有项目类别id" prop="allCategoryIds"  v-if="false">
-          <el-input v-model="dataForm.allCategoryIds" placeholder="所有项目类别id"></el-input>
-      </el-form-item>
-          <el-form-item label="所属项目类别" prop="allCategoryNames" v-if="this.dataForm.id">
-          <el-input v-model="dataForm.allCategoryNames" placeholder="所有项目类别名称" :disabled="disabled"></el-input>
-      </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: '',
-        validRespondTime: '',
-        validCloseTime: '',
-        categoryId: '',
-        parentCategoryIds: '',
-        parentCategoryNames: '',
-        allCategoryIds: '',
-        allCategoryNames: '',
-        categoryIds: []
-      },
-      categoryOptions: [],
-      disabled: false
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        validRespondTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        validCloseTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        categoryId: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentCategoryIds: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentCategoryNames: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allCategoryIds: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allCategoryNames: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created () {
-    this.getCategoryList()
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        this.dataForm.categoryIds = []
-        if (this.dataForm.id) {
-          this.getInfo()
-          this.getCategoryList()
-          this.disabled = true
-        } else {
-          this.disabled = false
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/kpi/kpitimelimititem/${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
-        }
-        if (!new RegExp('^[1-9][0-9]*$').test(this.dataForm.validRespondTime)) {
-          return this.$message.error('有效响应时间请输入正整数')
-        }
-        if (!new RegExp('^[1-9][0-9]*$').test(this.dataForm.validCloseTime)) {
-          return this.$message.error('有效结案时间请输入正整数')
-        }
-        if (!this.dataForm.id && this.dataForm.categoryIds.length === 0) {
-          return this.$message.error('请选择考核类别')
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpitimelimititem/', 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 }),
-    getCategoryList () {
-      return this.$http.get('/events/category/getCategoryTree').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.categoryOptions = res.data.options
-      }).catch(() => { })
-    }
-  }
-}
-</script>
diff --git a/src/views/modules/kpi/kpimanualscore-add-or-update.vue b/src/views/modules/kpi/manualScore-add-or-update.vue
similarity index 75%
rename from src/views/modules/kpi/kpimanualscore-add-or-update.vue
rename to src/views/modules/kpi/manualScore-add-or-update.vue
index df8cc90a..20e0252f 100644
--- a/src/views/modules/kpi/kpimanualscore-add-or-update.vue
+++ b/src/views/modules/kpi/manualScore-add-or-update.vue
@@ -40,16 +40,7 @@
           <el-input v-model="dataForm.allDeptNames" placeholder="完整部门名称" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="得分" prop="score">
-          <el-input-number v-model="dataForm.score" :min="0" :max="100"></el-input-number>
-      </el-form-item>
-      <el-form-item label="所有父级部门id" prop="parentDeptIds" v-if="false">
-          <el-input v-model="dataForm.parentDeptIds" placeholder="所有父级部门id"></el-input>
-      </el-form-item>
-      <el-form-item label="所有父级部门名称" prop="parentDeptNames" v-if="false">
-          <el-input v-model="dataForm.parentDeptNames" placeholder="所有父级部门名称"></el-input>
-      </el-form-item>
-      <el-form-item label="完整部门id" prop="allDeptIds" v-if="false">
-          <el-input v-model="dataForm.allDeptIds" placeholder="完整部门id"></el-input>
+          <el-input-number v-model="dataForm.score" :min="0"></el-input-number>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -72,10 +63,6 @@ export default {
         score: '',
         scoreStartDate: '',
         scoreEndDate: '',
-        parentDeptIds: '',
-        parentDeptNames: '',
-        allDeptIds: '',
-        allDeptNames: '',
         scoreStartMonth: ''
       },
       kpiManualRuleList: [], // 已绑定手动打分的考核规则列表
@@ -85,14 +72,12 @@ export default {
     }
   },
   created () {
-    this.$http
-      .get(`/sys/user/deptOptions/getByLoginUser`)
-      .then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.deptIdOptions = res.data.options
-      })
+    this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.deptIdOptions = res.data.options
+    })
       .catch(() => {})
   },
   watch: {
@@ -124,18 +109,6 @@ export default {
         ],
         scoreEndDate: [
           { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptIds: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptNames: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptIds: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptNames: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -159,7 +132,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/kpi/kpimanualscore/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/kpi/manualScore/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -175,7 +148,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpimanualscore/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/manualScore/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -192,7 +165,7 @@ export default {
       })
     }, 1000, { 'leading': true, 'trailing': false }),
     getKpiManualRule () {
-      this.$http.get(`/kpi/kpirule/getKpiManualRule/`).then(({ data: res }) => {
+      this.$http.get(`/kpi/rule/getKpiManualRule/`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/kpi/kpimanualscore.vue b/src/views/modules/kpi/manualScore.vue
similarity index 62%
rename from src/views/modules/kpi/kpimanualscore.vue
rename to src/views/modules/kpi/manualScore.vue
index 54f13077..2522ed36 100644
--- a/src/views/modules/kpi/kpimanualscore.vue
+++ b/src/views/modules/kpi/manualScore.vue
@@ -2,6 +2,14 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpimanualscore}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
         <el-form-item label="考核规则名称">
           <el-select clearable v-model="dataForm.ruleId">
             <el-option
@@ -39,26 +47,19 @@
                      :on-success='uploadSuccess'
                      :on-error='errorExceed'
                      accept=".xls,.xlsx">
-            <el-button type="primary">上传</el-button>
+            <el-button type="primary">导入打分结果</el-button>
           </el-upload>
         </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="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="allDeptNames" label="部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="部门名称" header-align="center" align="center"  width="400"></el-table-column>
         <el-table-column prop="ruleName" label="考核规则名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center" :formatter="showKpiCycleFormatter"></el-table-column>
-        <el-table-column prop="scoreStartDate" label="考核起止日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="scoreEndDate" label="考核终止日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="score" label="得分" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ruleId" label="epdc_kpi_rule表主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="deptId" label="被打分的部门id" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="parentDeptIds" label="所有父级部门id" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="parentDeptNames" label="所有父级部门名称" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="allDeptIds" label="完整部门id" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center"  width="100" :formatter="showKpiCycleFormatter"></el-table-column>
+        <el-table-column prop="scoreStartDate" label="考核起始日" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="scoreEndDate" label="考核终止日" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="score" label="得分" header-align="center" align="center"  width="50"></el-table-column>
+        <el-table-column prop="createdTime" 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 v-if="$hasPermission('kpi:kpimanualscore:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -78,23 +79,13 @@
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <!-- 错误信息 -->
-      <el-dialog :visible.sync="faultDataVisible"
-                 title="请修改后重新提交">
-        <el-table :data="errordataList"
-                  border
-                  style="width: 100%;">
-          <el-table-column prop="errorLine"
-                           label="行数"
-                           header-align="center"
-                           align="center"></el-table-column>
-          <el-table-column prop="errorInfo"
-                           label="错误信息"
-                           header-align="center"
-                           align="center"></el-table-column>
+      <el-dialog :visible.sync="faultDataVisible" title="请修改后重新提交">
+        <el-table :data="errordataList" border style="width: 100%;">
+          <el-table-column prop="rowNum" width="50" label="行" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="errorMsg" label="错误信息" header-align="center" align="center"></el-table-column>
         </el-table>
         <template slot="footer">
-          <el-button type="primary"
-                     @click="faultDataVisible = false">确定</el-button>
+          <el-button type="primary" @click="faultDataVisible = false">确定</el-button>
         </template>
       </el-dialog>
     </div>
@@ -103,7 +94,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './kpimanualscore-add-or-update'
+import AddOrUpdate from './manualScore-add-or-update'
 import Cookies from 'js-cookie'
 import qs from 'qs'
 export default {
@@ -111,11 +102,11 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/kpi/kpimanualscore/page',
+        getDataListURL: '/kpi/manualScore/page',
         getDataListIsPage: true,
-        deleteURL: '/kpi/kpimanualscore',
+        deleteURL: '/kpi/manualScore',
         deleteIsBatch: true,
-        exportURL: '/kpi/kpimanualscore/exportTemplate'
+        exportURL: '/kpi/manualScore/exportTemplate'
       },
       dataForm: {
         ruleId: '',
@@ -125,7 +116,13 @@ export default {
       faultDataVisible: false,
       errordataList: [],
       kpiManualRuleList: [], // 已绑定手动打分的考核规则列表
-      kpiCycleList: []// 考核周期字典表值
+      kpiCycleList: [], // 考核周期字典表值
+      // 所属机构配置
+      deptIdList: [],
+      options: [],
+      streetList: [],
+      communityList: [],
+      gridList: []
     }
   },
   components: {
@@ -134,12 +131,22 @@ export default {
   created () {
     this.getKpiManualRule()
     this.getKpiCycleList()
-    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/kpimanualscore/importManualScoreExcel?token=${Cookies.get('token')}`
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/manualScore/importManualScoreExcel?token=${Cookies.get('token')}`
+    // 所属机构创建
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
   },
   // 已绑定手动打分的考核规则
   methods: {
     getKpiManualRule () {
-      this.$http.get(`/kpi/kpirule/getKpiManualRule/`).then(({ data: res }) => {
+      this.$http.get(`/kpi/rule/getKpiManualRule/`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -166,20 +173,29 @@ export default {
     },
     // 导出录入模板
     exportTemplate () {
-      var scoreStartDate = this.dataForm.scoreStartDate
-      var ruleId = this.dataForm.ruleId
-      var params = qs.stringify({
+      let scoreStartDate = this.dataForm.scoreStartDate
+      let ruleId = this.dataForm.ruleId
+      let params = qs.stringify({
         'token': Cookies.get('token'),
-        'scoreStartTime': scoreStartDate,
+        'scoreStartDate': scoreStartDate,
         'ruleId': ruleId
       })
+      let paramsJson = {
+        'scoreStartDate': scoreStartDate, 'ruleId': ruleId
+      }
       if (!ruleId) {
         return this.$message.error('考核规则不能为空')
       }
       if (!scoreStartDate) {
         return this.$message.error('考核周期起始月不能为空')
       }
-      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+      this.$http.get(`/kpi/manualScore/checkExportTemplate`, { params: paramsJson }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+        }
+      }).catch(() => { })
     },
     errorExceed (file, fileList) {
       this.$message.error('上传失败请重试')
@@ -187,15 +203,13 @@ export default {
     uploadSuccess (response, file, fileList) {
       this.dataListLoading = false
       this.$refs.upload.clearFiles()
-      if (response.code !== 0 && (response.data == null || response.data.length === 0)) {
-        this.$message.error('上传失败' + response.msg)
-        return
-      }
       if (response.code !== 0 || (response.data !== null && response.data.length > 0)) {
-        this.faultDataVisible = true
         this.errordataList = response.data
-        console.log(this.faultDataVisible)
-        this.$message.error('上传失败')
+        if (this.errordataList != null && this.errordataList.length > 0) {
+          this.faultDataVisible = true
+        } else {
+          this.$message.error(response.msg)
+        }
         return
       }
       this.$message({
@@ -207,6 +221,30 @@ export default {
         }
       })
     }
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/modules/kpi/kpimanualscorerule-add-or-update.vue b/src/views/modules/kpi/manualScoreRule-add-or-update.vue
similarity index 95%
rename from src/views/modules/kpi/kpimanualscorerule-add-or-update.vue
rename to src/views/modules/kpi/manualScoreRule-add-or-update.vue
index f9d042fb..486704f9 100644
--- a/src/views/modules/kpi/kpimanualscorerule-add-or-update.vue
+++ b/src/views/modules/kpi/manualScoreRule-add-or-update.vue
@@ -86,7 +86,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/kpi/kpimanualscorerule/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/kpi/manualScoreRule/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -102,7 +102,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpimanualscorerule/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/manualScoreRule/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/kpi/kpimanualscorerule.vue b/src/views/modules/kpi/manualScoreRule.vue
similarity index 97%
rename from src/views/modules/kpi/kpimanualscorerule.vue
rename to src/views/modules/kpi/manualScoreRule.vue
index 3bee55e5..1ca55d94 100644
--- a/src/views/modules/kpi/kpimanualscorerule.vue
+++ b/src/views/modules/kpi/manualScoreRule.vue
@@ -53,15 +53,15 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './kpimanualscorerule-add-or-update'
+import AddOrUpdate from './manualScoreRule-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/kpi/kpimanualscorerule/page',
+        getDataListURL: '/kpi/manualScoreRule/page',
         getDataListIsPage: true,
-        deleteURL: '/kpi/kpimanualscorerule',
+        deleteURL: '/kpi/manualScoreRule',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/kpi/resultGrid-add-or-update.vue b/src/views/modules/kpi/resultGrid-add-or-update.vue
new file mode 100644
index 00000000..fa8dde44
--- /dev/null
+++ b/src/views/modules/kpi/resultGrid-add-or-update.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-dialog :visible.sync="visible" title="详情" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-table border :data="dataList" style="width: 100%;">
+        <el-table-column prop="rownum" label="序号" width="50" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="rule" label="规则" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="detail" :formatter="publishState" label="详情" header-align="center"></el-table-column>
+      </el-table>
+    <template slot="footer">
+      <el-button type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style>
+  .el-table .cell{
+      white-space:pre-line;
+  }
+</style>
+<script>
+import Cookies from 'js-cookie'
+import qs from 'qs'
+export default {
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        exportURL: '/kpi/gridResult/tableExport'
+      },
+      visible: false,
+      dataForm: {
+        id: '',
+        gridId: '',
+        manualScore: '',
+        workScore: '',
+        voteScore: '',
+        finalScore: '',
+        rownum: '',
+        rule: '',
+        detail: ''
+      },
+      dataList: []
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    publishState: function (row) {
+      return row.detail.replace(',', '\n')
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/kpi/gridResult/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataList = res.data
+      }).catch(() => {})
+    },
+    // Excel导出
+    tableExport () {
+      let id = this.dataForm.id
+      let params = qs.stringify({
+        'token': Cookies.get('token'),
+        'id': id
+      })
+      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/resultGrid.vue b/src/views/modules/kpi/resultGrid.vue
new file mode 100644
index 00000000..2dbacd6e
--- /dev/null
+++ b/src/views/modules/kpi/resultGrid.vue
@@ -0,0 +1,154 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-kpi__kpiresultgrid}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item label="考核周期起始月">
+          <el-date-picker v-model="dataForm.scoreStartDate"
+              type="month" clearable placeholder="选择月"
+              value-format="yyyy-MM"  format="yyyy-MM">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center" width="440"></el-table-column>
+        <el-table-column prop="leaderName" label="网格长" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startDate" label="考核周期开始日" header-align="center" align="center" :formatter="startDateFormat"></el-table-column>
+        <el-table-column prop="endDate" label="考核周期结束日" header-align="center" align="center" :formatter="endDateFormat"></el-table-column>
+        <!-- 手动打分 -->
+        <el-table-column prop="manualScore" label="基层党建工作职责得分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="workScore" label="平时工作得分" header-align="center" align="center" width="160"></el-table-column>
+        <el-table-column prop="finalScore" label="总分" header-align="center" align="center" width="160"></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="detailQuery(scope.row.id)">详情</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 './resultGrid-add-or-update'
+import Cookies from 'js-cookie'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/kpi/gridResult/page',
+        getDataListIsPage: true,
+        deleteURL: '/kpi/gridResult',
+        deleteIsBatch: true,
+        exportURL: '/kpi/gridResult/export'
+      },
+      dataForm: {
+        id: '',
+        gridId: '',
+        scoreStartDate: ''
+      },
+      // 所属机构配置
+      deptIdList: [],
+      options: [],
+      streetList: [],
+      communityList: [],
+      gridList: []
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
+  },
+  methods: {
+    // 考核周期开始日字段,格式化
+    startDateFormat: function (row) {
+      return row.startDate.substring(0, 10)
+    },
+    // 考核周期结束日字段,格式化
+    endDateFormat: function (row) {
+      return row.endDate.substring(0, 10)
+    },
+    detailQuery (id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.dataForm.id = id
+        this.$refs.addOrUpdate.init()
+      })
+    },
+    // Excel导出
+    tableExport () {
+      let id = this.dataForm.id
+      let params = qs.stringify({
+        'token': Cookies.get('token'),
+        'id': id,
+        'scoreStartDate': this.dataForm.scoreStartDate,
+        'streetId': this.deptIdList[0],
+        'communityId': this.deptIdList[1],
+        'gridId': this.deptIdList[2]
+      })
+      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+    }
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/resultSuperior-add-or-update.vue b/src/views/modules/kpi/resultSuperior-add-or-update.vue
new file mode 100644
index 00000000..164f0379
--- /dev/null
+++ b/src/views/modules/kpi/resultSuperior-add-or-update.vue
@@ -0,0 +1,70 @@
+<template>
+  <el-dialog :visible.sync="visible" title="详情" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-table border :data="dataList" style="width: 100%;">
+        <el-table-column prop="gridCallSuperiorAmount" label="网格呼叫事项总数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridCallSuperiorRespAmount" label="响应网格呼叫事项数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridCallSuperiorCloseAmount" label="办结网格呼叫事项数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridHighEvaluationAmount" label="工作评议满意数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridMediumEvaluationAmount" label="工作评议基本满意数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridLowEvaluationAmount" label="工作评议不满意数" header-align="center" align="center"></el-table-column>
+      </el-table>
+    <template slot="footer">
+      <el-button type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import qs from 'qs'
+export default {
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        exportURL: '/kpi/kpiresultsuperior/tableExport'
+      },
+      visible: false,
+      dataForm: {
+        id: '',
+        deptId: '',
+        gridCallSuperiorAmount: '',
+        gridCallSuperiorRespAmount: '',
+        gridCallSuperiorCloseAmount: '',
+        gridHighEvaluationAmount: '',
+        gridMediumEvaluationAmount: '',
+        gridLowEvaluationAmount: ''
+      },
+      dataList: []
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/kpi/kpiresultsuperior/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataList = res.data
+      }).catch(() => {})
+    },
+    // Excel导出
+    tableExport () {
+      let id = this.dataForm.id
+      let params = qs.stringify({
+        'token': Cookies.get('token'),
+        'id': id
+      })
+      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/resultSuperior.vue b/src/views/modules/kpi/resultSuperior.vue
new file mode 100644
index 00000000..6f95c849
--- /dev/null
+++ b/src/views/modules/kpi/resultSuperior.vue
@@ -0,0 +1,178 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-kpi__kpiresultsuperior}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item label="考核周期起始月">
+          <el-date-picker v-model="dataForm.scoreStartDate"
+              type="month" clearable placeholder="选择月"
+              value-format="yyyy-MM"  format="yyyy-MM">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center" width="440"></el-table-column>
+        <el-table-column prop="finalScore" label="最终得分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startDate" label="考核周期开始日" header-align="center" :formatter="startDateFormat" align="center"></el-table-column>
+        <el-table-column prop="endDate" label="考核周期结束日" header-align="center" :formatter="endDateFormat" align="center"></el-table-column>
+        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" :formatter="kpiCycleFormat" align="center"></el-table-column>
+        <el-table-column prop="deptTypeKey" label="机构类别" header-align="center" :formatter="deptTypeKeyFormat" 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="detailQuery(scope.row.id)">详情</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 './resultSuperior-add-or-update'
+import Cookies from 'js-cookie'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/kpi/kpiresultsuperior/page',
+        getDataListIsPage: true,
+        deleteURL: '/kpi/kpiresultsuperior',
+        deleteIsBatch: true,
+        exportURL: '/kpi/kpiresultsuperior/export'
+      },
+      dataForm: {
+        id: '',
+        scoreStartDate: ''
+      },
+      // 所属机构配置
+      deptIdList: [],
+      options: [],
+      streetList: [],
+      communityList: [],
+      gridList: []
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
+  },
+  methods: {
+    // Excel导出
+    tableExport () {
+      let id = this.dataForm.id
+      let params = qs.stringify({
+        'token': Cookies.get('token'),
+        'id': id,
+        'scoreStartDate': this.dataForm.scoreStartDate,
+        'streetId': this.deptIdList[0],
+        'communityId': this.deptIdList[1],
+        'gridId': this.deptIdList[2]
+      })
+      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+    },
+    // 考核周期开始日字段,格式化
+    startDateFormat: function (row) {
+      return row.startDate.substring(0, 10)
+    },
+    // 考核周期结束日字段,格式化
+    endDateFormat: function (row) {
+      return row.endDate.substring(0, 10)
+    },
+    // 考核周期,格式化
+    kpiCycleFormat: function (row) {
+      if (row.kpiCycle === 'month') {
+        return '月'
+      } else if (row.kpiCycle === 'quarter') {
+        return '季'
+      } else if (row.kpiCycle === 'year') {
+        return '年'
+      }
+    },
+    // 机构类别,格式化
+    deptTypeKeyFormat: function (row) {
+      if (row.deptTypeKey === 'district_party') {
+        return '区党委'
+      } else if (row.deptTypeKey === 'district_dept') {
+        return '区直部门'
+      } else if (row.deptTypeKey === 'street_party') {
+        return '街道党工委'
+      } else if (row.deptTypeKey === 'street_dept') {
+        return '街道部门'
+      } else if (row.deptTypeKey === 'community_party') {
+        return '社区党工委'
+      } else if (row.deptTypeKey === 'grid_party') {
+        return '网格党支部'
+      }
+    },
+    // 跳转到详情页
+    detailQuery (id, startDate, endDate, deptId) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.dataForm.id = id
+        this.$refs.addOrUpdate.init()
+      })
+    }
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/kpirule-add-or-update.vue b/src/views/modules/kpi/rule-add-or-update.vue
similarity index 58%
rename from src/views/modules/kpi/kpirule-add-or-update.vue
rename to src/views/modules/kpi/rule-add-or-update.vue
index 9be01ab0..66e6957c 100644
--- a/src/views/modules/kpi/kpirule-add-or-update.vue
+++ b/src/views/modules/kpi/rule-add-or-update.vue
@@ -1,104 +1,119 @@
 <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' : '120px'"
-    >
-      <el-form-item label="考核规则名称" prop="ruleName">
-        <el-input
-          v-model="dataForm.ruleName"
-          placeholder="考核规则名称"
-          clearable
-        ></el-input>
+  <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' : '120px'">
+      <el-form-item label="考核规则名称"
+                    prop="ruleName">
+        <el-input v-model="dataForm.ruleName"
+                  placeholder="考核规则名称"
+                  clearable></el-input>
       </el-form-item>
-      <el-form-item label="考核规则编码" prop="ruleCode">
-        <el-input
-          v-model="dataForm.ruleCode"
-          placeholder="考核规则编码"
-          clearable
-        ></el-input>
+      <el-form-item label="考核类别"
+                    prop="ruleCode">
+        <el-select v-model="dataForm.ruleCode"
+                   placeholder="考核类别">
+          <el-option v-for="item in dictTypeList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="考核周期" prop="kpiCycle">
-        <el-select v-model="dataForm.kpiCycle" placeholder="考核周期">
-          <el-option
-            v-for="item in kpiCycleList"
-            :key="item.dictValue"
-            :label="item.dictName"
-            :value="item.dictValue"
-          >
+      <el-form-item label="考核周期"
+                    prop="kpiCycle">
+        <el-select v-model="dataForm.kpiCycle"
+                   placeholder="考核周期">
+          <el-option v-for="item in kpiCycleList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="考核部门类别" prop="deptTypeKey">
-        <el-select v-model="dataForm.deptTypeKey" placeholder="考核部门类别">
-          <el-option
-            v-for="item in deptTypeKeyList"
-            :key="item.dictValue"
-            :label="item.dictName"
-            :value="item.dictValue"
-          >
+      <el-form-item label="考核部门类别"
+                    prop="deptTypeKeys">
+        <el-select v-model="dataForm.deptTypeKeys"
+                   multiple
+                   placeholder="考核部门类别">
+          <el-option v-for="item in deptTypeKeyList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="引用" prop="referenceId">
-        <el-select v-model="dataForm.referenceId" clearable placeholder="引用" @change="handlereference(dataForm.referenceId)">
-          <el-option
-            v-for="item in kpiFormulaList"
-            :key="item.id"
-            :label="item.formulaName"
-            :value="item.id"
-          >
+      <el-form-item label="引用"
+                    prop="referenceId">
+        <el-select v-model="dataForm.referenceId"
+                   clearable
+                   placeholder="引用"
+                   @change="handlereference(dataForm.referenceId)">
+          <el-option v-for="item in kpiFormulaList"
+                     :key="item.id"
+                     :label="item.formulaName"
+                     :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="入参" prop="metaDataCode">
-        <el-select
-          v-model="dataForm.metaDataCode"
-          filterable
-          clearable
-          placeholder="入参"
-        >
-          <el-option
-            v-for="item in metaDataCodeList"
-            :key="item.dictValue"
-            :label="item.dictName"
-            :value="item.dictValue"
-          >
+      <el-form-item label="入参"
+                    prop="metaDataCode">
+        <el-select v-model="dataForm.metaDataCode"
+                   filterable
+                   clearable
+                   placeholder="入参">
+          <el-option v-for="item in metaDataCodeList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
           </el-option>
         </el-select>
         &nbsp; &nbsp;
-        <el-button type="primary" @click="addRuleParam(dataForm.metaDataCode)">添加</el-button>
+        <el-button type="primary"
+                   @click="addRuleParam(dataForm.metaDataCode)">添加</el-button>
       </el-form-item>
-      <el-table :data="dataForm.ruleParamList" v-if="dataForm.ruleParamList &&dataForm.ruleParamList.length>0" border>
-        <el-table-column type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="id" label="参数表主键" v-if="false"></el-table-column>
-        <el-table-column prop="metaDataCode" label="参数名称" :formatter="showMetaDataCodeFormatter"> </el-table-column>
-        <el-table-column prop="sort" label="排序">
+      <el-table :data="dataForm.ruleParamList"
+                v-if="dataForm.ruleParamList &&dataForm.ruleParamList.length>0"
+                border>
+        <el-table-column type="index"
+                         width="50"
+                         label="序号"></el-table-column>
+        <el-table-column prop="id"
+                         label="参数表主键"
+                         v-if="false"></el-table-column>
+        <el-table-column prop="metaDataCode"
+                         label="参数名称"
+                         :formatter="showMetaDataCodeFormatter"> </el-table-column>
+        <el-table-column prop="sort"
+                         label="排序">
           <template slot-scope="scope">
-              <el-input-number v-model="scope.row.sort"
-                         controls-position="right"
-                         :min="1" :max="paramAmount">
-              </el-input-number>
+            <el-input-number v-model="scope.row.sort"
+                             controls-position="right"
+                             :min="1"
+                             :max="paramAmount">
+            </el-input-number>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="100">
+        <el-table-column fixed="right"
+                         label="操作"
+                         width="100">
           <template slot-scope="scope">
-            <el-button  @click="handleRemoveClick(scope.$index,dataForm.ruleParamList)" type="text" size="small">移除</el-button>
+            <el-button @click="handleRemoveClick(scope.$index,dataForm.ruleParamList)"
+                       type="text"
+                       size="small">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{
         $t("confirm")
       }}</el-button>
     </template>
@@ -115,6 +130,7 @@ export default {
       kpiCycleList: [],
       kpiFormulaList: [],
       metaDataCodeList: [],
+      dictTypeList: [],
       paramAmount: 100, // 公式参数数量
       dataForm: {
         id: '',
@@ -123,7 +139,7 @@ export default {
         ruleMode: '0', // 规则生成方式(0-元公式，1-手工打分，2-投票)
         referenceId: '', // 引用公式id
         kpiCycle: '', // 考核周期
-        deptTypeKey: '', // 考核部门类别
+        deptTypeKeys: [], // 考核部门类别
         metaDataCode: '', // 入参
         ruleParamList: []// 入参列表
       },
@@ -161,7 +177,7 @@ export default {
             trigger: 'blur'
           }
         ],
-        deptTypeKey: [
+        deptTypeKeys: [
           {
             required: true,
             message: this.$t('validate.required'),
@@ -183,6 +199,7 @@ export default {
     this.getKpiFormulaList()
     this.getMetaDataCodeList()
     this.getDeptTypeKeyList()
+    this.getDictTypeList()
   },
   methods: {
     init () {
@@ -200,7 +217,7 @@ export default {
     // 获取信息
     getInfo () {
       this.$http
-        .get(`/kpi/kpirule/${this.dataForm.id}`)
+        .get(`/kpi/rule/${this.dataForm.id}`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -210,7 +227,7 @@ export default {
             ...res.data
           }
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 表单提交
     dataFormSubmitHandle: debounce(
@@ -220,7 +237,7 @@ export default {
             return false
           }
           this.$http[!this.dataForm.id ? 'post' : 'put'](
-            '/kpi/kpirule/saveOrUpdate/',
+            '/kpi/rule/saveOrUpdate/',
             this.dataForm
           )
             .then(({ data: res }) => {
@@ -237,12 +254,24 @@ export default {
                 }
               })
             })
-            .catch(() => {})
+            .catch(() => { })
         })
       },
       1000,
       { leading: true, trailing: false }
     ),
+    // 获取考核类别下拉框集合
+    getDictTypeList () {
+      this.$http
+        .get(`/sys/dict/listSimple/kpi_rule_code_formula`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.dictTypeList = res.data
+        })
+        .catch(() => { })
+    },
     // 获取绩效考核周期下拉框集合
     getKpiCycleList () {
       this.$http
@@ -253,19 +282,19 @@ export default {
           }
           this.kpiCycleList = res.data
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 获取绩效考核公式列表
     getKpiFormulaList () {
       this.$http
-        .get(`/kpi/kpiformula/getKpiFormulaList`)
+        .get(`/kpi/formula/getKpiFormulaList`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
           this.kpiFormulaList = res.data
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 获取元数据编码字典表
     getMetaDataCodeList () {
@@ -277,7 +306,7 @@ export default {
           }
           this.metaDataCodeList = res.data
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 转换绩效考核元数据编码
     showMetaDataCodeFormatter: function (row, column) {
diff --git a/src/views/modules/kpi/manual-score-add-or-update.vue b/src/views/modules/kpi/rule-manualScore-add-or-update.vue
similarity index 62%
rename from src/views/modules/kpi/manual-score-add-or-update.vue
rename to src/views/modules/kpi/rule-manualScore-add-or-update.vue
index 1cc8bf4d..d40a19b8 100644
--- a/src/views/modules/kpi/manual-score-add-or-update.vue
+++ b/src/views/modules/kpi/rule-manualScore-add-or-update.vue
@@ -1,46 +1,55 @@
 <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' : '120px'"
-    >
-      <el-form-item label="考核规则名称" prop="ruleName">
-        <el-input
-          v-model="dataForm.ruleName"
-          placeholder="考核规则名称"
-          clearable
-        ></el-input>
+  <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' : '120px'">
+      <el-form-item label="考核规则名称"
+                    prop="ruleName">
+        <el-input v-model="dataForm.ruleName"
+                  placeholder="考核规则名称"
+                  clearable></el-input>
       </el-form-item>
-      <el-form-item label="考核规则编码" prop="ruleCode">
+      <!-- <el-form-item label="考核规则编码" prop="ruleCode">
         <el-input
           v-model="dataForm.ruleCode"
           placeholder="考核规则编码"
           clearable
         ></el-input>
+      </el-form-item> -->
+      <el-form-item label="考核类别"
+                    prop="ruleCode">
+        <el-select v-model="dataForm.ruleCode"
+                   placeholder="考核类别">
+          <el-option v-for="item in dictTypeList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="关联的手动打分" prop="referenceId">
-        <el-select v-model="dataForm.referenceId" clearable placeholder="关联的手动打分" @change="handlereference(dataForm.referenceId)">
-          <el-option
-            v-for="item in kpiManualScoreList"
-            :key="item.id"
-            :label="item.scoreName"
-            :value="item.id"
-          >
+      <el-form-item label="关联的手动打分"
+                    prop="referenceId">
+        <el-select v-model="dataForm.referenceId"
+                   clearable
+                   placeholder="关联的手动打分"
+                   @change="handlereference(dataForm.referenceId)">
+          <el-option v-for="item in kpiManualScoreList"
+                     :key="item.id"
+                     :label="item.scoreName"
+                     :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{
         $t("confirm")
       }}</el-button>
     </template>
@@ -65,7 +74,8 @@ export default {
         referenceId: '', // 关联的手动打分项
         kpiCycle: '', // 考核周期来源于选择的手动打分项
         deptTypeKey: '' // 考核部门类别来源于选择的手动打分项
-      }
+      },
+      dictTypeList: [],
     }
   },
   computed: {
@@ -97,6 +107,7 @@ export default {
   },
   created () {
     this.getKpiManualScoreList()
+    this.getDictTypeList()
   },
   methods: {
     init () {
@@ -111,7 +122,7 @@ export default {
     // 获取信息
     getInfo () {
       this.$http
-        .get(`/kpi/kpirule/${this.dataForm.id}`)
+        .get(`/kpi/rule/${this.dataForm.id}`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -121,7 +132,19 @@ export default {
             ...res.data
           }
         })
-        .catch(() => {})
+        .catch(() => { })
+    },
+    // 获取考核类别下拉框集合
+    getDictTypeList () {
+      this.$http
+        .get(`/sys/dict/listSimple/kpi_rule_code_manual_score`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.dictTypeList = res.data
+        })
+        .catch(() => { })
     },
     // 表单提交
     dataFormSubmitHandle: debounce(
@@ -131,7 +154,7 @@ export default {
             return false
           }
           this.$http[!this.dataForm.id ? 'post' : 'put'](
-            '/kpi/kpirule/saveOrUpdate/',
+            '/kpi/rule/saveOrUpdate/',
             this.dataForm
           )
             .then(({ data: res }) => {
@@ -148,7 +171,7 @@ export default {
                 }
               })
             })
-            .catch(() => {})
+            .catch(() => { })
         })
       },
       1000,
@@ -157,14 +180,14 @@ export default {
     // 查询手动打分下拉框
     getKpiManualScoreList () {
       this.$http
-        .get(`/kpi/kpimanualscorerule/getKpiManualScoreList`)
+        .get(`/kpi/manualScoreRule/getKpiManualScoreList`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
           this.kpiManualScoreList = res.data
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 关联的手动打分改变
     handlereference (referenceId) {
diff --git a/src/views/modules/kpi/rule.vue b/src/views/modules/kpi/rule.vue
new file mode 100644
index 00000000..12426c9a
--- /dev/null
+++ b/src/views/modules/kpi/rule.vue
@@ -0,0 +1,233 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-kpi__kpirule}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="考核规则名称">
+          <el-input v-model="dataForm.ruleName"
+                    placeholder="考核规则名称"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpirule:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle('0')">新增公式规则</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpirule:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle('1')">新增手动打分规则</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpirule:delete')"
+                     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 type="index"
+                         width="50"
+                         label="序号"></el-table-column>
+        <el-table-column prop="ruleName"
+                         label="规则名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="ruleName"
+                         label="考核类别"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="ruleMode"
+                         width="100"
+                         label="生成方式"
+                         header-align="center"
+                         align="center"
+                         :formatter="showRuleModeFormatter"></el-table-column>
+        <el-table-column prop="referenceName"
+                         label="引用"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="kpiCycle"
+                         width="50"
+                         label="考核周期"
+                         header-align="center"
+                         align="center"
+                         :formatter="showKpiCycleFormatter"></el-table-column>
+        <el-table-column prop="deptTypeKey"
+                         label="考核部门类别"
+                         header-align="center"
+                         align="center"
+                         :formatter="showDeptTypeKeyFormatter"></el-table-column>
+        <el-table-column prop="createdTime"
+                         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 v-if="$hasPermission('kpi:kpirule:update')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.ruleMode,scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('kpi:kpirule:delete')"
+                       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>
+      <!-- 弹窗, 新增 / 修改手动打分规则 -->
+      <manual-score-add-or-update v-if="manualScoreAddOrUpdateVisible"
+                                  ref="manualScoreAddOrUpdate"
+                                  @refreshDataList="getDataList"></manual-score-add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './rule-add-or-update'
+import ManualScoreAddOrUpdate from './rule-manualScore-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/kpi/rule/query',
+        getDataListIsPage: true,
+        deleteURL: '/kpi/rule',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        ruleName: ''
+      },
+      manualScoreAddOrUpdateVisible: false, // 手动打分新增／更新，弹窗visible状态
+      ruleModeList: [],
+      kpiCycleList: [],
+      deptTypeKeyList: []
+    }
+  },
+  components: {
+    AddOrUpdate,
+    ManualScoreAddOrUpdate
+  },
+  created () {
+    this.getRuleModeList()
+    this.getKpiCycleList()
+    this.getDeptTypeKeyList()
+  },
+  methods: {
+    // 新增 修改
+    addOrUpdateHandle (ruleMode, id) {
+      if (ruleMode === '0') {
+        // console.log(+'ruleMode=' + ruleMode + '元公式;id=' + id)
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.dataForm.id = id
+          this.$refs.addOrUpdate.init()
+        })
+      } else if (ruleMode === '1') {
+        // console.log('ruleMode=' + ruleMode + '手动打分;id=' + id)
+        this.manualScoreAddOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.manualScoreAddOrUpdate.dataForm.id = id
+          this.$refs.manualScoreAddOrUpdate.init()
+        })
+      }
+    },
+    // 获取绩效考核规则生成方式
+    getRuleModeList () {
+      this.$http.get(`/sys/dict/listSimple/rule_mode`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.ruleModeList = res.data
+      }).catch(() => { })
+    },
+    showRuleModeFormatter: function (row, column) {
+      if (row.ruleMode) {
+        let dict = this.ruleModeList.filter(item => item.dictValue === row.ruleMode)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    },
+    // 获取绩效考核周期下拉框集合
+    getKpiCycleList () {
+      this.$http.get(`/sys/dict/listSimple/kpi_cycle`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.kpiCycleList = res.data
+      }).catch(() => { })
+    },
+    showKpiCycleFormatter: function (row, column) {
+      if (row.kpiCycle) {
+        let dict = this.kpiCycleList.filter(item => item.dictValue === row.kpiCycle)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    },
+    // 获取考核部门类别下拉框
+    getDeptTypeKeyList () {
+      this.$http.get(`/sys/dict/listSimple/org_type`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptTypeKeyList = res.data
+      }).catch(() => { })
+    },
+    // 转换考核部门显示名称
+    showDeptTypeKeyFormatter: function (row, column) {
+      var deptTypeKeyNames = ''
+      var deptTypeKeys = row.deptTypeKey.split(',')// 在每个逗号(,)处进行分解。
+      for (var i = 0; i < deptTypeKeys.length; i++) {
+        var dict = this.deptTypeKeyList.filter(item => item.dictValue === deptTypeKeys[i])[0]
+        deptTypeKeyNames = deptTypeKeyNames + dict.dictName + ' '
+      }
+      if (deptTypeKeyNames) {
+        return deptTypeKeyNames
+      }
+      console.log(deptTypeKeyNames)
+      // if (row.deptTypeKey) {
+
+      //   let dict = this.deptTypeKeyList.filter(item => item.dictValue === row.deptTypeKey)[0]
+      //   if (dict) {
+      //     return dict.dictName
+      //   }
+      // }
+      return ''
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/kpitimelimitissue-add-or-update.vue b/src/views/modules/kpi/timeLimitIssue-add-or-update.vue
similarity index 95%
rename from src/views/modules/kpi/kpitimelimitissue-add-or-update.vue
rename to src/views/modules/kpi/timeLimitIssue-add-or-update.vue
index 28f225e2..0ff0ee31 100644
--- a/src/views/modules/kpi/kpitimelimitissue-add-or-update.vue
+++ b/src/views/modules/kpi/timeLimitIssue-add-or-update.vue
@@ -87,7 +87,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/kpi/kpitimelimitissue/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/kpi/timeLimitIssue/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -106,7 +106,7 @@ export default {
         if (!new RegExp('^[1-9][0-9]*$').test(this.dataForm.validRespondTime)) {
           return this.$message.error('有效响应时间请输入正整数')
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpitimelimitissue/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/timeLimitIssue/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/kpi/timeLimitIssue.vue b/src/views/modules/kpi/timeLimitIssue.vue
new file mode 100644
index 00000000..02c0ae7d
--- /dev/null
+++ b/src/views/modules/kpi/timeLimitIssue.vue
@@ -0,0 +1,128 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-kpi__kpitimelimitissue}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <!-- <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpitimelimitissue:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpitimelimitissue:delete')"
+                     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 type="index"
+                         width="50"
+                         label="序号"></el-table-column>
+        <el-table-column prop="id"
+                         label="主键"
+                         header-align="center"
+                         align="center"></el-table-column> -->
+        <el-table-column prop="validRespondTime"
+                         label="有效响应时间(h)"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="revision"
+                         label="乐观锁"
+                         header-align="center"
+                         align="center"
+                         v-if="false"></el-table-column>
+        <el-table-column prop="createdBy"
+                         label="创建人"
+                         header-align="center"
+                         align="center"
+                         v-if="false"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="创建时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="updatedBy"
+                         label="更新人"
+                         header-align="center"
+                         align="center"
+                         v-if="false"></el-table-column>
+        <el-table-column prop="updatedTime"
+                         label="更新时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="delFlag"
+                         label="删除标记"
+                         header-align="center"
+                         align="center"
+                         v-if="false"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('kpi:kpitimelimitissue:update')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('kpi:kpitimelimitissue:delete')"
+                       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 './timeLimitIssue-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/kpi/timeLimitIssue/page',
+        getDataListIsPage: true,
+        deleteURL: '/kpi/timeLimitIssue',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/timeLimitItem-add-or-update.vue b/src/views/modules/kpi/timeLimitItem-add-or-update.vue
new file mode 100644
index 00000000..6f93d424
--- /dev/null
+++ b/src/views/modules/kpi/timeLimitItem-add-or-update.vue
@@ -0,0 +1,146 @@
+<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' : '125px'">
+      <el-form-item label="有效响应时间(h)"
+                    prop="validRespondTime">
+        <el-input-number v-model="dataForm.validRespondTime"
+                         :min="1"></el-input-number>
+      </el-form-item>
+      <el-form-item label="有效结案时间(h)"
+                    prop="validCloseTime">
+        <el-input-number v-model="dataForm.validCloseTime"
+                         :min="1"></el-input-number>
+      </el-form-item>
+      <el-form-item label="项目类别"
+                    prop="categoryId"
+                    v-if="!this.dataForm.id">
+        <el-cascader clearable
+                     v-model="dataForm.categoryIds"
+                     :props="{multiple :true }"
+                     :options="categoryOptions"
+                     collapse-tags></el-cascader>
+      </el-form-item>
+      <el-form-item label="所属项目类别"
+                    prop="allCategoryNames"
+                    v-if="this.dataForm.id">
+        <el-input v-model="dataForm.allCategoryNames"
+                  placeholder="所有项目类别名称"
+                  readonly></el-input>
+      </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: '',
+        validRespondTime: '',
+        validCloseTime: '',
+        allCategoryNames: '',
+        categoryIds: []
+      },
+      categoryOptions: [],
+      disabled: false
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        validRespondTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        validCloseTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getCategoryList()
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        this.dataForm.categoryIds = []
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.getCategoryList()
+          this.disabled = true
+        } else {
+          this.disabled = false
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/kpi/timeLimitItem/${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
+        }
+        if (!new RegExp('^[1-9][0-9]*$').test(this.dataForm.validRespondTime)) {
+          return this.$message.error('有效响应时间请输入正整数')
+        }
+        if (!new RegExp('^[1-9][0-9]*$').test(this.dataForm.validCloseTime)) {
+          return this.$message.error('有效结案时间请输入正整数')
+        }
+        if (!this.dataForm.id && this.dataForm.categoryIds.length === 0) {
+          return this.$message.error('请选择考核类别')
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/timeLimitItem/', 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 }),
+    getCategoryList () {
+      return this.$http.get('/events/category/getCategoryTree').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.categoryOptions = res.data.options
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/kpitimelimititem.vue b/src/views/modules/kpi/timeLimitItem.vue
similarity index 76%
rename from src/views/modules/kpi/kpitimelimititem.vue
rename to src/views/modules/kpi/timeLimitItem.vue
index 906a5b11..ea960a5a 100644
--- a/src/views/modules/kpi/kpitimelimititem.vue
+++ b/src/views/modules/kpi/timeLimitItem.vue
@@ -19,15 +19,9 @@
       </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 type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="allCategoryNames" label="所属类别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="categoryId" label="项目类别id" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="allCategoryNames" label="所属类别" width="500" header-align="center" align="center"></el-table-column>
         <el-table-column prop="validRespondTime" label="有效响应时间(h)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="validCloseTime" label="有效结案时间(h)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentCategoryIds" label="所有上级项目类别id" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="parentCategoryNames" label="所有上级项目类别名称" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="allCategoryIds" label="所有项目类别id" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="validCloseTime"  label="有效结案时间(h)" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" 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">
@@ -53,15 +47,15 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './kpitimelimititem-add-or-update'
+import AddOrUpdate from './timeLimitItem-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/kpi/kpitimelimititem/page',
+        getDataListURL: '/kpi/timeLimitItem/page',
         getDataListIsPage: true,
-        deleteURL: '/kpi/kpitimelimititem',
+        deleteURL: '/kpi/timeLimitItem',
         deleteIsBatch: true
       },
       dataForm: {