瀏覽代碼

拉取提交备注

zhuxinbo 5 年之前
父節點
當前提交
4d8890a466

+ 2 - 1
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -318,12 +318,13 @@ export default {
    
     //点击时间的 昨日 按钮
     yesterdayHandle() {
+      this.loading = true
       let yesterday = moment()
           .subtract(1, 'days')
           .format('YYYY-MM-DD')
        this.dateRange=moment(yesterday)
       console.log(this.dateRange);
-      this.timedata=this.dateRange
+      this.timedata=moment(yesterday).format('YYYY-MM-DD')
       // this.totalSelect = 1
       // this.daysFlag = true
       postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListDaily', {

+ 3 - 3
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -426,7 +426,7 @@ export default {
           .subtract(1, 'days')
           .format('YYYY-MM-DD')
       
-
+      this.loading = true
       this.dateRange=[moment(lastStart),moment(lastEnd)]
       console.log(this.dateRange)
       this.totalSelect = (this.dateRange[1]._d - this.dateRange[0]._d) / (24 * 60 * 60 * 1000) + 1;
@@ -495,12 +495,12 @@ export default {
         signature: this.signature
       }).then(res => {
         let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接
         downloadElement.href = href
-        downloadElement.download = name + '-' +this.timedata[0] + '-' + this.timedata[1]    //下载后文件名
+        downloadElement.download = name + '-' +this.timedata[0] + '-' + this.timedata[1]+'.xlsx'    //下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() //点击下载
         document.body.removeChild(downloadElement) //下载完成移除元素

+ 3 - 2
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -85,6 +85,7 @@
       :width="tableWidth"
       @customHeaderCell="customHeaderCell(columns)"
       height="100"
+      style="word-break: break-all;"
     >
       <div slot="videoU" slot-scope="test,records">
         <img
@@ -384,12 +385,12 @@ export default {
         cost: this.consumeValue
       }).then(res => {
         let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
+          type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接
         downloadElement.href = href
-        downloadElement.download = this.statDate.format('YYYY-MM-DD') + '视频汇总' //下载后文件名
+        downloadElement.download = this.statDate.format('YYYY-MM-DD') + '视频汇总.xlsx' //下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() //点击下载
         document.body.removeChild(downloadElement) //下载完成移除元素

+ 6 - 6
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -410,7 +410,7 @@ export default {
     },
     //过去一周按钮事件
     lastWeekHandle() {
-
+      this.loading = true
       let lastStart = 
         moment()
           .subtract(7, 'days')
@@ -421,11 +421,11 @@ export default {
       this.dateRange=[lastStart,lastEnd]
       console.log(this.dateRange);
       this.timedata=this.dateRange
-      this.timedata=this.dateRange
-      // console.log(this.dateRange)
+    //   this.timedata=this.dateRange
+      console.log(this.dateRange)
       this.totalSelect = 7
       this.daysFlag = true
-      this.timedata=[this.dateRange[0]._i,this.dateRange[1]._i]
+      this.timedata=[moment(this.dateRange[0]._d).format('YYYY-MM-DD'),moment(this.dateRange[1]._d).format('YYYY-MM-DD')]
       postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListWeek', {
         startDate: this.timedata[0],
         endDate: this.timedata[1],
@@ -487,12 +487,12 @@ export default {
         signature: this.signature
       }).then(res => {
         let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接
         downloadElement.href = href
-        downloadElement.download = name + '-' +this.timedata[0] + '-' + this.timedata[1]    //下载后文件名
+        downloadElement.download = name + '-' +this.timedata[0] + '-' + this.timedata[1] +'.xlsx'   //下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() //点击下载
         document.body.removeChild(downloadElement) //下载完成移除元素

文件差異過大導致無法顯示
+ 588 - 647
src/views/modules/advertiser/ProjectMemberList.vue


+ 2 - 2
vue.config.js

@@ -64,13 +64,13 @@ module.exports = {
          }
        },*/
       '/jeecg-boot': {
-        // target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
+        target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
         // target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.13:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.103:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
-        target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
+        // target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.165:8080', //请求本地 需要jeecg-boot后台项目  毕洁泉
         ws: false,
         changeOrigin: true