Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/project/Index.vue

@@ -142,12 +142,11 @@ import projectEditKey from "@/views/report/project/components/keyProject/project
 import projectView from '@/views/report/project/components/projectView'
 import previewFile from '@/views/components/common/previewFile'
 import axios from 'axios'
-import projectKpi from '@/views/report/project/components/projectKPI'
 
 export default {
   name: 'reportProject',
   components: {
-    projectView, projectCreate, projectEdit, paraMultiSelect, paraSelect, previewFile, projectEditKey, projectKpi
+    projectView, projectCreate, projectEdit, paraMultiSelect, paraSelect, previewFile, projectEditKey
   },
   data () {
     return {

src/views/report/project/components/projectInfo.vue

@@ -646,7 +646,7 @@
     </div>
     <div v-if="tabsData[7].isShow">
       <!-- 项目绩效目标表v-if="value.projState >= 50" -->
-      <project-kpi v-if="value.projectKPI" :projectKPI.sync="value.projectKPI" />
+      <project-kpi-info v-if="value.projectKPI" :projectKPI.sync="value.projectKPI" />
     </div>
     <div v-if="tabsData[8].isShow">
       <!-- 项目课题设置 -->
@@ -671,7 +671,7 @@ import budgetInfo from '@/views/report/project/components/budgetInfo'
 import fundPlanInfo from '@/views/report/project/components/fundPlanInfo'
 import equipmentsInfo from '@/views/report/project/components/equipmentsInfo.vue'
 import unitPaymentInfo from '@/views/report/project/components/unitPaymentInfo.vue'
-import projectKpi from '@/views/report/project/components/projectKPI.vue'
+import projectKpiInfo from '@/views/report/project/components/projectKpiInfo.vue'
 import projectSubInfo from '@/views/report/project/components/projectSubInfo'
 import managementRuleInfo from '@/views/report/project/components/managementRuleInfo'
 import fileInfo from "@/views/report/project/components/fileInfo";
@@ -684,7 +684,7 @@ import { toTextarea } from '@/views/utils/common'
 
 export default {
   components: {
-    projectMemberInfo, cooperativeUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectKpi, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
+    projectMemberInfo, cooperativeUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectKpiInfo, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
   },
   name: "ProjectInfo",
   data () {

src/views/report/project/components/projectKPI.vue → src/views/report/project/components/projectKpiInfo.vue

@@ -101,7 +101,7 @@
 
 <script>
 export default {
-  name: "projectKPI",
+  name: "projectKPIInfo",
   props: {
     projectKPI: {
       type: Object,