liuhj пре 9 месеци
родитељ
комит
2b2326f74a

+ 5 - 14
src/components/Resource/OpOfficialActivities.vue

@@ -466,19 +466,11 @@ export default {
     methods: {
         //日期处理(日)
         TimeProcessingri(val){
-            if(val instanceof Date){
-                let newsyear=val.getFullYear();
-                let newsMonth=val.getMonth() + 1;
-                let newsday=val.getDate();
-                if((val.getMonth() + 1)<10){
-                    newsMonth='0'+newsMonth
-                }else{
-                    newsMonth=val.getMonth() + 1
-                }
-                return newsyear+ '-' +newsMonth+ '-' + newsday;
-            }else{
-                return val
-            }
+            let datetime=new Date(val)
+            let newsyear=datetime.getFullYear();
+            let newsMonth=datetime.getMonth() + 1<10?'0'+(datetime.getMonth() + 1):datetime.getMonth() + 1;
+            let newsday=datetime.getDate()<10?'0'+datetime.getDate():datetime.getDate();
+            return newsyear+ '-' +newsMonth+ '-' + newsday;
         },
         //团组下拉框
         GetGroupAllList() {
@@ -677,7 +669,6 @@ export default {
             })
         },
         addBtn() { 
-            console.log(this.OpOfficialActivitiesDto.date);
             if (this.DiId == null && this.DiId == undefined && this.DiId == "") {
                 this.$message.error("请选择团组名称");
                 return;

+ 80 - 4
src/components/statistics/Statistically.vue

@@ -59,6 +59,14 @@
                                     <div>{{townum(item.samePeriodFee)}}</div>
                                 </div>
                             </div>
+                            <div class="monthtableul">
+                                <div class="monthtableli" v-for="(item,index) in tableDatamonth" :key="index">
+                                    <div class="monthtablebox" v-for="(items,index) in item.feeDatas" :key="index">
+                                        {{items.currPeriodFee}}/{{items.samePeriodFee}}({{items.yoy}} %)
+                                    </div>
+                                </div>
+                            </div>
+
                             <!-- <el-table
                             :data="tableData"
                             border
@@ -84,8 +92,6 @@
                 <el-tab-pane label="会务数据统计" name="third">会务数据统计</el-tab-pane>
                 <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>
             </el-tabs>
-            
-            
         </div>
     </div>
 </template>
@@ -157,7 +163,8 @@ export default {
             label: '团组数据'
             }],
             value: 3,
-            tableData:[]
+            tableData:[],
+            tableDatamonth:[],
         }
     }, 
     methods: {
@@ -678,6 +685,36 @@ export default {
                 }
             })
         },
+        //获取会务数据统计
+        StatisticsConferenceCity(){
+            var url = "/api/Statistics/StatisticsConferenceCity"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    year:that.getdate(that.year),
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    // that.customersNumber=[];
+                    // let datainfo=res.data.data;
+                    // that.customersNumber.push(['product',datainfo.yearData.yearName+'出访人数']);
+                    // for(let i=0;i<datainfo.quarterData.length;i++){
+                    //     that.customersNumber.push([datainfo.quarterData[i].quarterName,datainfo.quarterData[i].num]);
+                    // }
+                    // that.teamrs();
+                }else{
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            })
+        },
         //获取国交数据统计数据出访人数
         StatisticsGroupPeopleNum(){
             var url = "/api/Statistics/StatisticsGroupPeopleNum"
@@ -738,7 +775,7 @@ export default {
                 }
             })
         },
-        //获取国交数据统计数据OP
+        //获取国交数据统计数据OP(年)
         StatisticsOP(val){
             var url = "/api/Statistics/StatisticsOP"
             var that = this
@@ -771,6 +808,34 @@ export default {
                 }
             })
         },
+        //获取国交数据统计数据OP(月)
+        StatisticsOPmonth(val){
+            var url = "/api/Statistics/StatisticsOP"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    year:that.getdate(that.year),
+                    type:val
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    that.tableDatamonth=res.data.data;
+                    console.log(that.tableDatamonth);
+                    
+                    
+                }else{
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            })
+        },
     },
     watch:{
         invitationtop:{
@@ -784,6 +849,7 @@ export default {
         // this.StatisticsYOY();
         this.countrieschange(this.value);
         this.StatisticsOP(1);
+        this.StatisticsOPmonth(2);
         // this.StatisticsAirTicket();
         // this.StatisticsHotel();
         // this.StatisticsInvitation();
@@ -833,4 +899,14 @@ export default {
 .yeartableli:nth-child(1) div{
     border-left: none;
 }
+.monthtableli{
+    font-size: 12px;
+    display: flex;
+}
+.monthtablebox{
+    width: 125px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
 </style>