报表时间&经营性利润排序等bug

.env.dev

@@ -12,9 +12,9 @@ VUE_APP_TITLE = 洛玻集团驾驶舱
 # 杨姗姗
 # VUE_APP_BASE_API = 'http://172.16.20.218:7070'
 # 小田
-VUE_APP_BASE_API = 'http://172.16.19.232:7070'
+# VUE_APP_BASE_API = 'http://172.16.19.232:7070'
 # 测试
-# VUE_APP_BASE_API = 'http://192.168.0.35:8080'
+VUE_APP_BASE_API = 'http://192.168.0.35:8080'
 
 
 # 路由懒加载

src/views/home/components/order-bottom-leftItem.vue

@@ -65,7 +65,7 @@
           'bg-green': item.currentValue >= item.targetValue
         }" style="font-size: 12px;display: flex;align-items: center;justify-content: flex-end;">
           <div class="title">完成率</div>
-          <div class="yield" style="font-size: 22px;margin-bottom: 4px;">
+          <div class="yield" style="font-size: 18px;margin-bottom: 4px;">
             {{ item.progress }}
           </div>
           <div class="unit">%</div>
@@ -359,12 +359,11 @@ export default {
       text-align: center;
 
       .title {
-        margin-top: 10px;
+        margin-top:4px;
         height: 12px;
         font-family: PingFangSC, PingFang SC;
         font-weight: 400;
         font-size: 12px;
-        margin-right: 8px;
         color: #000000;
         line-height: 12px;
         text-align: left;
@@ -372,7 +371,7 @@ export default {
       }
 
       .unit {
-        margin-top: 10px;
+        margin-top: 4px;
         margin-right: 14px;
         height: 12px;
         font-family: PingFangSC, PingFang SC;

src/views/home/operatingProfit/operatingProfit.vue

@@ -149,7 +149,6 @@ export default {
         levelId:1,
         // timeDim: this.dateData.mode
       }).then((res) => {
-        console.log(res);
         this.monData = res.data.currentMonthData
         this.totalData = res.data.totalMonthData
         // this.totalData = res.data.totalData

src/views/home/operatingProfitComponents/operatingBar.vue

@@ -121,6 +121,7 @@ export default {
     // 最终传递给图表的排序后数据
     chartD() {
       const data = this.currentDataSource;
+      console.log('charData+++++++++++++++++++++++++++++',data)
       const salesData = {
         allPlaceNames: this.locations,
         series: [
@@ -143,7 +144,7 @@ export default {
                 { offset: 1, color: 'rgba(40, 138, 255, 0)' }
               ])
             },
-            data: data.rate || [],
+            data: data.rates || [],
             symbol: 'circle',
             symbolSize: 6
           },

src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue

@@ -95,7 +95,6 @@ export default {
       meterialName:'',
       materialOptions: [
         {value:'硅砂',label:'硅砂'},
-        {value:'海砂',label:'海砂'},
         {value:'纯碱',label:'纯碱'},
         {value:'白云石',label:'白云石'},
         {value:'石灰石',label:'石灰石'}

src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue

@@ -84,7 +84,7 @@ export default {
       overheadName:'',
       overheadOptions:[
         {value:'包材',label:'包材'},
-        {value:'备品丶机物料',label:'备品丶机物料'},
+        {value:'备件、机物料',label:'备件、机物料'},
         {value:'折旧',label:'折旧'},
         {value:'其他',label:'其他'}
       ]

src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue

@@ -64,7 +64,7 @@ export default {
       profitOptions: [
         '原片制造费用成本',
         '包材',
-        '备品丶机物料',
+        '备件、机物料',
         '折旧',
         '其他',
       ]

src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue

@@ -63,7 +63,7 @@ export default {
       selectedProfit: '制造费用', // 选中的名称，初始为null
       profitOptions: [
         '制造费用',
-        '备品丶机物料',
+        '备件、机物料',
         '折旧',
         '其他',
       ]

src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue

@@ -15,7 +15,7 @@
               <operatingSingleBar :detailData="packagingData"></operatingSingleBar>
             </div>
           </div>
-          <div class="dashboard right" @click="handleDashboardClick('备品丶机物料')">
+          <div class="dashboard right" @click="handleDashboardClick('备件、机物料')">
             <div class="title">
               备件、机物料·元/吨
             </div>

src/views/home/productionCostAnalysisComponents/relateFuelCostAnalysis.vue

@@ -13,12 +13,12 @@
             </div>
           </div>
           <!-- 2. 海砂组件：传递对应筛选数据 -->
-          <div class="dashboard right" @click="handleDashboardClick('海砂', 'SIMFRMCostAnalysis')">
+          <!-- <div class="dashboard right" @click="handleDashboardClick('海砂', 'SIMFRMCostAnalysis')">
             <div class="title">海砂·元/㎡</div>
             <div class="line">
               <operatingSingleBar :detailData="seaSandData"></operatingSingleBar>
             </div>
-          </div>
+          </div> -->
           <!-- 3. 纯碱组件：传递对应筛选数据 -->
           <div class="dashboard right" @click="handleDashboardClick('纯碱', 'SIMFRMCostAnalysis')">
             <div class="title">纯碱·元/㎡</div>
@@ -203,7 +203,7 @@ export default {
 }
 
 .dashboard {
-  width: 310px;
+  width: 390px;
   height: 205px;
   background: #F9FCFF;
   padding: 16px 0 0 10px;

src/views/report/cockpitReport/index.vue

@@ -135,9 +135,9 @@ export default {
   mounted() {
     let timeArr = []
     if (this.$route.query.startTime && this.$route.query.endTime) {
-      timeArr = [moment(Number(this.$route.query.startTime)).format('YYYY-MM'), moment(Number(this.$route.query.endTime)).format('YYYY-MM')]
+      timeArr = [moment(Number(this.$route.query.startTime)).format('YYYY-MM-DD'), moment(Number(this.$route.query.endTime)).format('YYYY-MM-DD')]
     }else{
-      timeArr = [moment().startOf('month').format('YYYY-MM'), moment().endOf('month').format('YYYY-MM')]
+      timeArr = [moment().startOf('month').format('YYYY-MM-DD'), moment().endOf('month').format('YYYY-MM-DD')]
     };
     this.$refs.searchBarForm.formInline.timeValMonth = timeArr
     this.listQuery.startTime = moment(timeArr[0]).startOf('day').valueOf();
@@ -195,8 +195,8 @@ export default {
       this.listQuery.pageNo = 1;
       this.listQuery.pageSize = 20;
       this.listQuery.status = val.status ? val.status : undefined;
-      this.listQuery.startTime = moment(val.timeValMonth[0]).startOf('day').valueOf();
+      this.listQuery.startTime = moment(moment(val.timeValMonth[0]).startOf('month').format('YYYY-MM-DD')).startOf('day').valueOf();
-      this.listQuery.endTime = moment(val.timeValMonth[1]).endOf('day').valueOf();
+      this.listQuery.endTime = moment(moment(val.timeValMonth[1]).endOf('month').format('YYYY-MM-DD')).endOf('day').valueOf();
       switch (val.btnName) {
         case 'search':
           this.getDataList();