瀏覽代碼

盯盘运营账户-定版

朱鑫波 3 年之前
父節點
當前提交
e3d92f976b

+ 7 - 7
src/views/dashboard/managerStatistics.vue

@@ -251,7 +251,7 @@
                                         <span style="font-size: 36px; color: rgb(245, 178, 62)">{{
                                             allData.cost | decimalsHandle
                                         }}</span
-                                        ><span style="position: relative; top: 20px">
+                                        ><span style="position: relative; top: 20px" v-if="allData.costRatio">
                                             <img
                                                 style="width: 20px; position: absolute; right: 70px"
                                                 src="./assets/shang.png"
@@ -267,8 +267,8 @@
                                                 alt=""
                                                 v-else
                                             />
-
-                                            {{ allData.costRatio }}%</span
+                                            
+                                            {{ allData.costRatio ? allData.costRatio + '%' : '-' }}</span
                                         >
                                     </p>
                                     <h4>今日基建数</h4>
@@ -284,7 +284,7 @@
                                         <span style="font-size: 24px; color: rgb(33, 105, 254)">{{
                                             allData.groupNum + '个'
                                         }}</span
-                                        ><span style="position: relative; top: 20px">
+                                        ><span style="position: relative; top: 20px" v-if="allData.unitRatio">
                                             <img
                                                 style="width: 20px; position: absolute; right: 70px"
                                                 src="./assets/shang.png"
@@ -300,7 +300,7 @@
                                                 alt=""
                                                 v-else
                                             />
-                                            {{ allData.unitRatio }}%</span
+                                             {{ allData.unitRatio ? allData.unitRatio + '%' : '-' }}</span
                                         >
                                     </p>
                                     <h4>今日素材产出</h4>
@@ -316,7 +316,7 @@
                                         <span style="font-size: 24px; color: rgb(232, 84, 65)">{{
                                             allData.materialNum + '个'
                                         }}</span
-                                        ><span style="position: relative; top: 20px">
+                                        ><span style="position: relative; top: 20px" v-if="allData.materialRatio">
                                             <img
                                                 style="width: 20px; position: absolute; right: 70px"
                                                 src="./assets/shang.png"
@@ -331,7 +331,7 @@
                                                 src="./assets/xia.png"
                                                 alt=""
                                                 v-else
-                                            />{{ allData.materialRatio }}%</span
+                                            />{{ allData.materialRatio ? allData.materialRatio + '%' : '-' }}</span
                                         >
                                     </p>
                                     <h4>人效比</h4>

+ 19 - 14
src/views/modules/Statistics/components/Treeselect.vue

@@ -183,7 +183,6 @@ export default {
       } else if (this.request == '2,4') {
         params.type = 'kuaishou'
       }
-
       if (this.reqUrl == '/ctop/projectMember/participateListByMediaId') {
         if (this.options.length > 0) {
           return
@@ -261,25 +260,31 @@ export default {
       } else {
         getAction(this.reqUrl, {
           userId: this.userInfo().id,
+          type:params.type
         }).then((res) => {
           if (res.code == 0) {
             if (res.result.length > 0) {
-              var arr = this.request.split(',')
-              var dataTwo = []
-              var data = res.result.filter((item) => {
-                return item.mediaId == arr[0]
-              })
-              if (arr.length > 1) {
-                dataTwo = res.result.filter((item) => {
-                  return item.mediaId == arr[1]
-                })
-              }
-              var allData = data.concat(dataTwo)
-              this.options = allData.map((item) => {
+              this.options =  res.result.map((item) => {
                 return {
                   id: item.projectId,
                   label: item.projectName + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' + item.advertiserName,
-                  children: null,
+                  children: item.accountList
+                  ? item.accountList.map((i) => {
+                      return {
+                        id: i.accountId,
+                        label:
+                          (i.userName&&i.userName.length == 2
+                            ? i.userName + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0'
+                            : i.userName&&i.userName.length == 3
+                            ? i.userName + '\xa0\xa0\xa0\xa0'
+                            : i.userName) +
+                          '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' +
+                          i.accountId +
+                          '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' +
+                          i.authName,
+                      }
+                    })
+                  : [],
                 }
               })
             } else {

文件差異過大導致無法顯示
+ 223 - 109
src/views/modules/stockWatch/modules/new-keepManage/account-newkeepManage.vue


+ 2 - 2
src/views/modules/stockWatch/modules/new-keepManage/group-keepManage.vue

@@ -634,8 +634,8 @@
                 this.showColumn();
             },
             accountNameClick(row) {
-                // sessionStorage.setItem("personalaccountId",row.accountId)
-                // this.$router.push({ path: '/modules/stockWatch/modules/new-keepManage/account-newkeepManage'})
+                sessionStorage.setItem("personalaccountId",row.accountId)
+                this.$router.push({ path: '/modules/stockWatch/modules/new-keepManage/account-newkeepManage'})
             },
             userNameClick(row) {
                 sessionStorage.setItem("personalUserId",row.userId)

+ 3 - 2
src/views/modules/stockWatch/modules/new-keepManage/new-keep-data.js

@@ -203,9 +203,9 @@
         return [
             {
                 title: '状态操作',
-                dataIndex: 'status',
+                dataIndex: 'putStatus',
                 align: 'center',
-                scopedSlots: { customRender: 'status' },
+                scopedSlots: { customRender: 'putStatus' },
                 },
                 {
                 title: '组名称',
@@ -221,6 +221,7 @@
                 title: '出价',
                 dataIndex: 'bid',
                 align: 'center',
+                scopedSlots: { customRender: 'bid' },
                 sorter: (a, b) => a.bid - b.bid,
                 },{
                 title: '激活数',

文件差異過大導致無法顯示
+ 39 - 12
src/views/modules/stockWatch/modules/new-keepManage/personal-keepManage.vue