Browse Source

素材大盘提测状态

朱鑫波 3 years ago
parent
commit
c41c307c76

+ 4 - 0
.env.development

@@ -11,3 +11,7 @@ VUE_APP_BASE_REPORT_URL = http://api.tjyourong.com.cn/reportModule
 
 #脚本视频接口
 VUE_APP_BASE_SCRIPT_URL = http://139.186.134.115:31013
+
+
+#素材大盘相关接口
+VUE_APP_BASE_MATERIAL_URL = http://192.168.1.134:9999/material

+ 5 - 1
.env.production

@@ -9,4 +9,8 @@ VUE_APP_BASE_REPORT_URL = http://api.tjyourong.com.cn/reportModule
 #脚本视频接口
 VUE_APP_BASE_SCRIPT_URL = http://114.117.193.186:31013
 # 线上地址 http://114.117.193.186:31013
-# 测试地址 http://139.186.134.115:31013
+# 测试地址 http://139.186.134.115:31013
+
+
+#素材大盘相关接口
+VUE_APP_BASE_MATERIAL_URL = http://api.tjyourong.com.cn/material

+ 2 - 2
src/views/modules/Statistics/materialReport/marterialList.vue

@@ -599,7 +599,7 @@ export default {
 
       params.pageSize = this.ipagination.pageSize
       params.pageNo = this.ipagination.current
-      this.postDataAction('/overView/materialTopViewMore', params).then((res) => {
+      this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/materialTopViewMore', params).then((res) => {
         this.loading = false
         this.resetLoading = false
         this.videoloading = false
@@ -637,7 +637,7 @@ export default {
         } else {
           params.target = this.params.order = this.order == 'descend' ? 'desc' : 'asc'
         }
-        this.postDataAction('/overView/designTop', params).then((res) => {
+        this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/designTop', params).then((res) => {
           this.designTopLoading = false
           if (res.success) {
             this.designTopList = res.result.list

+ 2 - 2
src/views/modules/Statistics/materialReport/marterialTtList.vue

@@ -543,7 +543,7 @@ export default {
 
       params.pageSize = this.ipagination.pageSize
       params.pageNo = this.ipagination.current
-      this.postDataAction('/overView/materialTopViewMore', params).then((res) => {
+      this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/materialTopViewMore', params).then((res) => {
         this.loading = false
         this.resetLoading = false
         this.videoLoading = false
@@ -582,7 +582,7 @@ export default {
           params.target = this.target
           params.order = this.order == 'descend' ? 'desc' : 'asc'
         }
-        this.postDataAction('/overView/designTop', params).then((res) => {
+        this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/designTop', params).then((res) => {
           this.designTopLoading = false
           if (res.success) {
             this.designTopList = res.result.list

+ 18 - 22
src/views/modules/Statistics/materialReport/materialReport.vue

@@ -416,7 +416,7 @@
 
         <a-row :gutter="24" style="margin-top: 20px">
             <a-col :xl="12">
-                <a-card title="top素材排行榜" style="width: 100%; min-height: 700px" :bordered="false">
+                <a-card title="top素材排行榜" style="width: 100%; min-height: 720px" :bordered="false">
                     <a-radio-group
                         v-if="mediaDimension === 'b'"
                         v-model="materialRankValue"
@@ -503,15 +503,17 @@
                                 </div>
                             </li>
                         </ul>
+                        
                     </div>
                     <a-empty v-else-if="!signatureStatus && videoList.length === 0" style="margin-top: 20%" />
                     <div v-else style="height: 200px;line-height: 200px;text-align: center;">
                         <a-spin />
                     </div>
+                    <a-pagination size="small" :total="50" v-if="designTopList.length>0" style="visibility:hidden;"/>
                 </a-card>
             </a-col>
             <a-col :xl="12">
-                <a-card title="top设计排行榜" style="width: 100%; min-height: 700px" :bordered="false">
+                <a-card title="top设计排行榜" style="width: 100%; min-height: 720px" :bordered="false">
                     <a-radio-group
                         v-model="designRankingValue"
                         style="margin-bottom: 15px;"
@@ -554,11 +556,8 @@ var echarts = require('echarts')
 const columnsFixd = [
     {
         title: '排名',
-        dataIndex: 'rowNumber',
+        dataIndex: 'number',
         align: 'center',
-        customRender: (t, r, index) => {
-            return index + 1
-        }
     },
     {
         title: '设计人员',
@@ -580,11 +579,8 @@ const columnsFixd = [
 const columnsTt = [
     {
         title: '排名',
-        dataIndex: 'rowNumber',
+        dataIndex: 'number',
         align: 'center',
-        customRender: (t, r, index) => {
-            return index + 1
-        }
     },
     {
         title: '设计人员',
@@ -938,7 +934,7 @@ export default {
             this.specificLoading = true
             return new Promise((resolve, reject) => {
                 this.postDataAction(
-                    '/overView/getProjects?userId=' +
+                    process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/getProjects?userId=' +
                         this.userInfo().id +
                         '&mediaId=' +
                         (this.mediaDimension == 'a' ? 1 : 2)
@@ -1027,7 +1023,7 @@ export default {
             }
 
             return new Promise((resolve, reject) => {
-                that.postDataAction('/overView/sumData', params).then(res => {
+                that.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/sumData', params).then(res => {
                     if (res.success) {
                         let defaultList = res.result
                         if (this.mediaDimension === 'b') {
@@ -1062,7 +1058,7 @@ export default {
                 }
 
                 return new Promise((resolve, reject) => {
-                    that.postDataAction('/overView/getDesignerAvgData', params).then(res => {
+                    that.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/getDesignerAvgData', params).then(res => {
                         if (res.success) {
                             // let defaultList = res.result
                             // if (this.mediaDimension === 'b') {
@@ -1098,7 +1094,7 @@ export default {
                 params.designerId = this.userInfo().id
             }
             return new Promise((resolve, reject) => {
-                that.postDataAction('/overView/sumDataVideoNewEffective', params).then(res => {
+                that.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/sumDataVideoNewEffective', params).then(res => {
                     if (res.success) {
                         this.accountIndexList = res.result
                         this.initEchart('accountIndexEchart', this.initAccountIndexEchart(res.result))
@@ -1129,7 +1125,7 @@ export default {
             }
             this.spinningPopularVideoList = true
             return new Promise((resolve, reject) => {
-                that.postDataAction('/overView/sumDataVideoHot', params).then(res => {
+                that.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/sumDataVideoHot', params).then(res => {
                     this.spinningPopularVideoList = false
                     if (res.success) {
                         this.popularVideoList = res.result
@@ -1162,7 +1158,7 @@ export default {
                 params.designerId = this.userInfo().id
             }
             return new Promise((resolve, reject) => {
-                this.postDataAction('/overView/labelRatio', params).then(res => {
+                this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/labelRatio', params).then(res => {
                     this.spinningChartPie = false
                     if (res.success) {
                         if (res.result) {
@@ -1200,7 +1196,7 @@ export default {
                 params.designerId = this.userInfo().id
             }
             return new Promise((resolve, reject) => {
-                this.postDataAction('/overView/chartData', params).then(res => {
+                this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/chartData', params).then(res => {
                     this.spinningChart = false
                     if (res.success) {
                         this.chartList = res.result
@@ -1236,7 +1232,7 @@ export default {
                 params.designerId = this.userInfo().id
             }
             return new Promise((resolve, reject) => {
-                this.postDataAction('/overView/materialTop', params)
+                this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/materialTop', params)
                     .then(res => {
                         this.signatureStatus = false
                         if (res.success) {
@@ -1315,7 +1311,7 @@ export default {
             //     projects: this.dataDimensionValue,
             //     type: this.designRankingValue
             // }
-            this.postDataAction('/overView/designTop', params).then(res => {
+            this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/designTop', params).then(res => {
                 if (res.success) {
                     this.designTopLoading = false
                     this.designTopList = res.result.list
@@ -1328,7 +1324,7 @@ export default {
         },
         getTagProportionAnalyseList() {
             return new Promise((resolve, reject) => {
-                this.postDataAction('/overView/tagProportionAnalyse', {}).then(res => {
+                this.postDataAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/tagProportionAnalyse', {}).then(res => {
                     if (res.success) {
                         resolve(res.result)
                     } else {
@@ -1574,7 +1570,7 @@ export default {
             var params = {}
             params.mediaId = this.mediaDimension == 'a' ? 1 : 2
             params.userId = this.userInfo().id
-            this.getAction('/overView/getDesignTeamList', params).then(res => {
+            this.getAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/getDesignTeamList', params).then(res => {
                 this.specificLoading = false
                 if (res.success) {
                     this.dataDimensionList = res.result.map(item => {
@@ -1611,7 +1607,7 @@ export default {
     mounted() {
         this.clientWidth = document.documentElement.clientWidth - 224
         this.$nextTick(() => {
-            this.getAction('/overView/getRole', {userId:this.userInfo().id}).then(res=>{
+            this.getAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/overView/V2/getRole', {userId:this.userInfo().id}).then(res=>{
                 if(res.success){
                     this.groupDisabled = !res.result.permissions
                 }else{