Browse Source

bug修改

ljb 5 months ago
parent
commit
a3cb7f3e3a

+ 1 - 1
src/views/project-manage/components/implement-form.vue

@@ -14,7 +14,7 @@
             <span v-else>{{ `研发项目名称:${ formData.xmEntity ? formData.xmEntity.xmmc : '' }` }}</span>
             <span v-else>{{ `研发项目名称:${ formData.xmEntity ? formData.xmEntity.xmmc : '' }` }}</span>
           </div>
           </div>
           <div class="info-row">
           <div class="info-row">
-            <span v-if="!disabled">{{ `项目负责人:${ selProject.xmmc || '' }` }}</span>
+            <span v-if="!disabled">{{ `项目负责人:${ selProject.xmfzrxm || '' }` }}</span>
             <span v-else>{{ `项目负责人:${ formData.xmEntity ? formData.xmEntity.xmfzrxm : '' }` }}</span>
             <span v-else>{{ `项目负责人:${ formData.xmEntity ? formData.xmEntity.xmfzrxm : '' }` }}</span>
           </div>
           </div>
           <div class="info-row">
           <div class="info-row">

+ 7 - 2
src/views/wel/index.vue

@@ -78,7 +78,7 @@
       <el-divider></el-divider>
       <el-divider></el-divider>
 
 
       <basic-card title="项目预算与归集趋势图">
       <basic-card title="项目预算与归集趋势图">
-        <el-row>
+        <el-row v-if="xmList.length">
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <basic-chart
             <basic-chart
               style="width: 100%; height: 300px"
               style="width: 100%; height: 300px"
@@ -92,6 +92,8 @@
             />
             />
           </el-col>
           </el-col>
         </el-row>
         </el-row>
+
+        <el-empty description="暂无数据"></el-empty>
       </basic-card>
       </basic-card>
     </div>
     </div>
 
 
@@ -143,7 +145,9 @@ export default {
       // 本年度项目预算与归集表
       // 本年度项目预算与归集表
       currYearBudgetOpt: {},
       currYearBudgetOpt: {},
       // 全周期项目预算与归集表
       // 全周期项目预算与归集表
-      fullCycleBudgetOpt: {}
+      fullCycleBudgetOpt: {},
+
+      xmList: []
     };
     };
   },
   },
   computed: {
   computed: {
@@ -382,6 +386,7 @@ export default {
           ysList.push(item.xmys);
           ysList.push(item.xmys);
           costList.push(Number(item.cost).toFixed(2));
           costList.push(Number(item.cost).toFixed(2));
         });
         });
+        this.xmList = xmList;
         let _thisKey = currentYear == 1 ? 'currYearBudgetOpt' : 'fullCycleBudgetOpt';
         let _thisKey = currentYear == 1 ? 'currYearBudgetOpt' : 'fullCycleBudgetOpt';
         this[_thisKey] = {
         this[_thisKey] = {
           title: {
           title: {

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/dev-cost/yf-lease-allocation-list.vue

@@ -121,7 +121,7 @@ export default {
   computed: {
   computed: {
     ...mapGetters(['tag', 'pageYear']),
     ...mapGetters(['tag', 'pageYear']),
     pageTitle() {
     pageTitle() {
-      let yearAndMonthCN = moment(this.params.yearAndMonth).format('yyyy年MM月');
+      let yearAndMonthCN = moment(this.yearAndMonth).format('yyyy年MM月');
       return `${yearAndMonthCN}${this.tag.label}`.replace(/每月/g, '');
       return `${yearAndMonthCN}${this.tag.label}`.replace(/每月/g, '');
     }
     }
   },
   },