魏志佳 пре 5 година
родитељ
комит
ba12b350c9

+ 17 - 9
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -47,11 +47,11 @@
             <li v-for="(item,index) in listNum" :key="index">
               <span v-if=" index <5">
                 <a-icon type="lock" />
-                <span>{{item.title}}</span>
+                <span class="listText">{{item.title}}</span>
               </span>
               <span v-else-if=" index >4">
                 <a-icon type="menu" style="color:#ccc" />
-                <span>{{item.title}}</span>
+                <span class="listText">{{item.title}}</span>
                 <a-icon
                   type="close"
                   @click="deleteCol(item,index)"
@@ -267,7 +267,7 @@ export default {
       //是否显示共选几天的提示
       daysFlag: false,
       //日期选择器显示的日期范围
-      dateRange: '',
+      dateRange: null,
       dataElse: [],
       loading: false,
       visible: false,
@@ -370,17 +370,22 @@ export default {
     //弹出框打开,自定义列
     customColumns() {
       this.visible = true
-      this.listNum = this.columns
+       this.listNum = [...this.columns]
     },
     //弹出框确定
     handleOk(e) {
       this.loading = false
-      this.columns = this.listNum
+     
       this.visible = false
-      // setTimeout(() => {
-      //     this.visible = false;
-      //     this.loading = false;
-      // }, 1000);
+     
+      if(this.listNum.length>=10){
+
+          let newlist=this.listNum.slice(columnsFixd.length)
+          console.log(newlist)
+          this.columns = [...columnsFixd,...newlist]
+      }
+
+
      if (this.listNum.length > 12 && this.listNum.length<=13 ) {
         this.scrollX =1900
         console.log(this.$refs.vSummaryTable)
@@ -509,6 +514,9 @@ export default {
     toPercentage(val) {
       return (val * 100).toFixed(2) + '%'
       // return val
+    },
+    tofixed(val){
+      return Number(val).toFixed(2)
     }
   },
 

+ 14 - 13
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -49,11 +49,11 @@
             <li v-for="(item,index) in listNum" :key="index">
               <span v-if=" index <6">
                 <a-icon type="lock" />
-                <span>{{item.title}}</span>
+                <span class="listText">{{item.title}}</span>
               </span>
               <span v-else-if=" index >5">
                 <a-icon type="menu" style="color:#ccc" />
-                <span>{{item.title}}</span>
+                <span class="listText">{{item.title}}</span>
                 <a-icon
                   type="close"
                   @click="deleteCol(item,index)"
@@ -519,18 +519,20 @@ export default {
     //弹出框打开,自定义列
     customColumns() {
       this.visible = true
-      this.listNum = this.columns
+       this.listNum = [...this.columns]
     },
     //弹出框确定
     handleOk(e) {
       this.loading = false
-      this.columns = this.listNum
-      console.log(this.columns)
+     
       this.visible = false
-      // setTimeout(() => {
-      //     this.visible = false;
-      //     this.loading = false;
-      // }, 1000);
+      if(this.listNum.length>=10){
+
+        let newlist=this.listNum.slice(columnsFixd.length)
+        console.log(newlist)
+        this.columns = [...columnsFixd,...newlist]
+      }
+
       if (this.listNum.length > 12 && this.listNum.length<=13 ) {
         this.scrollX =1900
         console.log(this.$refs.vSummaryTable)
@@ -691,10 +693,9 @@ export default {
       return (val * 100).toFixed(2) + '%'
       // return val
     },
-    toshowTime(val) {
-      // console.log(val, this.timedata)
-      // return this.timedata[0] + '~' + this.timedata[1]
-      return val
+   
+    tofixed(val){
+      return Number(val).toFixed(2)
     }
   }
 }

+ 17 - 11
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -174,7 +174,7 @@ const columnsFixd = [
 
   {
     title: '视频描述',
-    dataIndex: 'materialName',
+    dataIndex: 'materialDesc',
     align: 'center',
     width: 100,
     fixed: 'left'
@@ -394,11 +394,18 @@ export default {
     //弹出框确定
     handleOk(e) {
       this.loading = false
-      this.columns = [...this.listNum]
+      // this.columns = [...this.listNum]
       this.visible = false
 
       // console.log(this.columns)
 
+      if(this.listNum.length>=10){
+
+        let newlist=this.listNum.slice(columnsFixd.length)
+        console.log(newlist)
+        this.columns = [...columnsFixd,...newlist]
+      }
+
       if (this.listNum.length > 12 && this.listNum.length<=13 ) {
         this.scrollX =1900
         console.log(this.$refs.vSummaryTable)
@@ -493,14 +500,8 @@ export default {
               this.listNum.splice(index,1)
             }   
             })      
-          }
-
-
-          
+          }    
         
-        
-        
-
       } else {
         arr = this.listNum.filter((item, index) => {
           return item.dataIndex == val.dataIndex
@@ -534,11 +535,16 @@ export default {
       // console.log(JSON.parse(res.result))
       let columns=JSON.parse(res.result)
       if(columns.length){
-           columns.map((item,index)=>{
+        if(columns.length>=columnsFixd.length){
+            columns.map((item,index)=>{
              if(index>columnsFixd.length-1){
                  item.sorter=function(a,b){  return a[item.dataIndex]-b[item.dataIndex]}
              }})
-        this.columns=columns
+             columns=columns.slice(columnsFixd.length);
+            this.columns=[...columnsFixd,...columns]
+        }
+           
+        
         // console.log(this.columns)
       }
       }

+ 14 - 9
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -49,11 +49,11 @@
             <li v-for="(item,index) in listNum" :key="index">
               <span v-if=" index <6">
                 <a-icon type="lock" />
-                <span>{{item.title}}</span>
+                <span class="listText">{{item.title}}</span>
               </span>
               <span v-else-if=" index >5">
                 <a-icon type="menu" style="color:#ccc" />
-                <span>{{item.title}}</span>
+                <span class="listText">{{item.title}}</span>
                 <a-icon
                   type="close"
                   @click="deleteCol(item,index)"
@@ -513,18 +513,20 @@ export default {
     //弹出框打开,自定义列
     customColumns() {
       this.visible = true
-      this.listNum = this.columns
+       this.listNum = [...this.columns]
     },
     //弹出框确定
     handleOk(e) {
       this.loading = false
-      this.columns = this.listNum
-      console.log(this.columns)
+      
       this.visible = false
-      // setTimeout(() => {
-      //     this.visible = false;
-      //     this.loading = false;
-      // }, 1000);
+      if(this.listNum.length>=10){
+
+        let newlist=this.listNum.slice(columnsFixd.length)
+        console.log(newlist)
+        this.columns = [...columnsFixd,...newlist]
+      }
+
      if (this.listNum.length > 12 && this.listNum.length<=13 ) {
         this.scrollX =1900
         console.log(this.$refs.vSummaryTable)
@@ -688,6 +690,9 @@ export default {
       // console.log(val, this.timedata)
       // return this.timedata[0] + '~' + this.timedata[1]
       return val
+    },
+    tofixed(val){
+      return Number(val).toFixed(2)
     }
   }
 }