Home Explore Help
Register Sign In
xiuli.gao
/
playlet
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 1777 Releases 0 Wiki
Browse Source

Merge branch 'master' into feature/0719

zhengxy 1 year ago
parent
8d25a79468 03d1f499ae
commit
3d6f5728c6
49 changed files with 280 additions and 185 deletions
Split View Show Diff Stats
  1. 1 1
      index.html
  2. 16 4
      project/src/components/assembly/screen/customerService.vue
  3. 16 4
      project/src/components/assembly/screen/customerServiceCorp.vue
  4. 18 4
      project/src/components/assembly/screen/customerServiceCorpV2.vue
  5. 34 26
      project/src/components/dataBoard/accountTrends.vue
  6. 34 26
      project/src/components/dataBoard/fansActiveTrends.vue
  7. 8 4
      project/src/components/dataBoard/loseUserTrends.vue
  8. 33 25
      project/src/components/dataBoard/officialAccount.vue
  9. 9 1
      project/src/components/dataBoard/operateDayRetrieve.vue
  10. 33 25
      project/src/components/dataBoard/shortDramaTrends.vue
  11. 32 24
      project/src/components/dataBoard/thePublicTrend.vue
  12. 6 5
      project/src/components/dataBoard/throwPerson/throwPersonPuton.vue
  13. 6 2
      project/src/theme.scss
  14. 0 1
      static/css/app.ba2f62b7fe0fd0a97f0c6dff2d4c3fa1.css
  15. 1 0
      static/css/app.d9edfa14c4c0c21bd3085661e23ba621.css
  16. 9 0
      static/js/0.805a91bc6ab7dcf409f0.js
  17. 0 9
      static/js/0.c332782df28d4bb994cd.js
  18. 1 0
      static/js/15.246709c63ec595b073d3.js
  19. 0 1
      static/js/15.a2a78e98f3ef3e9d2184.js
  20. 1 0
      static/js/3.269e2738a9bc33033b8b.js
  21. 0 1
      static/js/3.7c3ccbbb9c2e1a3a5d1d.js
  22. 0 0
      static/js/35.4ab5b54ac1a70725d90f.js
  23. 0 1
      static/js/41.06ab1adc221aad5a16c7.js
  24. 1 1
      static/js/42.69586790f33abdc7b6ae.js
  25. 1 1
      static/js/43.5d6e5acd072ff6dce236.js
  26. 1 1
      static/js/44.d97b6704d04665ad4a76.js
  27. 1 0
      static/js/44.935331dd4ffb3926e0d9.js
  28. 1 1
      static/js/51.4a62398545f014f3db39.js
  29. 1 1
      static/js/52.e6230a2824446b9b340c.js
  30. 1 1
      static/js/50.db9feab003481813f5cc.js
  31. 1 1
      static/js/54.9a6cadee5f3e6cf80cff.js
  32. 0 1
      static/js/58.66b192623869ed29da9e.js
  33. 1 0
      static/js/58.ea8c8a185633147f7566.js
  34. 1 1
      static/js/63.02c4f61840d7ccaaaab8.js
  35. 0 1
      static/js/62.f007013714ec22633ee2.js
  36. 1 1
      static/js/64.4df77857b69ad123f2d5.js
  37. 1 1
      static/js/65.c91f880ea716652d33fb.js
  38. 1 0
      static/js/65.dfbd2a6955b8259cdedc.js
  39. 1 0
      static/js/66.1e973154c712523a3dd8.js
  40. 1 1
      static/js/66.0f91563c7e79be3e788a.js
  41. 1 1
      static/js/67.897ba365926e14488bc5.js
  42. 1 1
      static/js/68.f6c95020e971cdcf1a9b.js
  43. 1 1
      static/js/69.9102c33b48da7465c3fb.js
  44. 1 1
      static/js/70.cdbef9e1287128a1f3be.js
  45. 1 1
      static/js/71.ed7c70f29d6a7cbae0c1.js
  46. 0 1
      static/js/72.a2a1b5c13a61aed4a6fc.js
  47. 1 1
      static/js/app.829edfe4e58baaaaaf5b.js
  48. 0 1
      static/js/manifest.3568fb7a2fb30a989da6.js
  49. 1 0
      static/js/manifest.7f1e0ce347d6c744bee9.js

+ 1 - 1
index.html
View File 

@@ -7,4 +7,4 @@
7 7 
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8 
         var s = document.getElementsByTagName("script")[0];
9 9 
         s.parentNode.insertBefore(hm, s);
10 
-      })();</script><link href=./static/css/app.ba2f62b7fe0fd0a97f0c6dff2d4c3fa1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3568fb7a2fb30a989da6.js></script><script type=text/javascript src=./static/js/app.829edfe4e58baaaaaf5b.js></script></body></html>
10 
+      })();</script><link href=./static/css/app.d9edfa14c4c0c21bd3085661e23ba621.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.7f1e0ce347d6c744bee9.js></script><script type=text/javascript src=./static/js/app.d0ab4a91e201adb7742d.js></script></body></html>

+ 16 - 4
project/src/components/assembly/screen/customerService.vue
View File 

@@ -36,8 +36,8 @@
36 36 
       <div class="flex" style="padding:10px">
37 37 
         <div class="propoverItem">
38 38 
           <self-input :reset='resetFlag' :hasLabel="false" label_name="成员名称" :inputFlag='true'
39 
-            @inputChange='(val) => { input_keyword = val; userSearch() }' width="270px" style="margin-top:0" />
40 
-          <!-- <self-input :reset='resetFlag' :hasLabel="false" @inputChange='(val)=>{input_keyword = val;init("userSearch")}' width="270px" style="margin-top:0"></self-input> -->
39 
+            @inputChange='(val) => { input_keyword = val; userSearch() }' width="270px" style="margin-top:0;margin-bottom:4px" />
40 
+          <div style="font-size:12px;color:#f9a527;">添加 空格 可进行多成员搜索</div>
41 41 
           <div class="allMember">全部{{ source == 'chatGroup' ? '群主' : '成员' }}({{ userTotal }}):</div>
42 42 
           <div class="memberBoxBig self-scrollbar-3">
43 43 
             <template v-for="(item, index) in userList">
 
@@ -257,10 +257,22 @@ export default {
257 257
258 258 
     },
259 259 
     userSearch () {//模糊搜索
260 
+      let input_keyword_arr = this.input_keyword.split(' ');
261 
+      input_keyword_arr = input_keyword_arr.filter((v)=>{
262 
+        return v != ''
263 
+      })
264 
+      input_keyword_arr.length == 0 ? input_keyword_arr = [''] : ''
265 
+
260 266 
       let search_user_list = []
261 267 
       this.old_user_list.forEach((item) => {
262 268 
         let arr = item.user_list.filter((v) => {
263 
-          return v.name.indexOf(this.input_keyword) != -1
269 
+          let flag = false
270 
+          input_keyword_arr.forEach((s_info)=>{
271 
+            if (!flag) {
272 
+              flag = v.name && v.name.indexOf(s_info) != -1
273 
+            }
274 
+          })
275 
+          return flag
264 276 
         })
265 277 
         if (arr && arr.length > 0) {
266 278 
           let self_item = JSON.parse(JSON.stringify(item))
 
@@ -413,7 +425,7 @@ export default {
413 425 
     color: #666666;
414 426 
     font-size: 14px;
415 427 
     line-height: 20px;
416 
-    margin-top: 17px;
428 
+    margin-top: 10px;
417 429 
   }
418 430
419 431 
   .title {

+ 16 - 4
project/src/components/assembly/screen/customerServiceCorp.vue
View File 

@@ -22,8 +22,8 @@
22 22 
       </div>
23 23 
       <div class="flex" style="padding:10px">
24 24 
         <div class="propoverItem">
25 
-          <self-input :reset='resetFlag' :hasLabel="false" :inputFlag='true' @inputChange='(val)=>{input_keyword = val;userSearch()}' width="270px" style="margin-top:0"></self-input>
26 
-          <!-- <self-input :reset='resetFlag' :hasLabel="false" @inputChange='(val)=>{input_keyword = val;init("userSearch")}' width="270px" style="margin-top:0"></self-input> -->
25 
+          <self-input :reset='resetFlag' :hasLabel="false" :inputFlag='true' @inputChange='(val)=>{input_keyword = val;userSearch()}' width="270px" style="margin-top:0;margin-bottom:4px"></self-input>
26 
+          <div style="font-size:12px;color:#f9a527;">添加 空格 可进行多成员搜索</div>
27 27 
           <div class="allMember">全部成员({{userTotal}}):</div>
28 28 
           <div class="memberBoxBig self-scrollbar-3">
29 29 
             <template v-for="(item,index) in userList">
 
@@ -211,10 +211,22 @@ export default {
211 211 
       this.$emit('customerDefine', this.selectUser)
212 212 
     },
213 213 
     userSearch () {//模糊搜索
214 
+      let input_keyword_arr = this.input_keyword.split(' ');
215 
+      input_keyword_arr = input_keyword_arr.filter((v)=>{
216 
+        return v != ''
217 
+      })
218 
+      input_keyword_arr.length == 0 ? input_keyword_arr = [''] : ''
219 
+
214 220 
       let search_user_list = []
215 221 
       this.old_user_list.forEach((item) => {
216 222 
         let arr = item.user_list.filter((v) => {
217 
-          return v.name && v.name.indexOf(this.input_keyword) != -1
223 
+          let flag = false
224 
+          input_keyword_arr.forEach((s_info)=>{
225 
+            if (!flag) {
226 
+              flag = v.name && v.name.indexOf(s_info) != -1
227 
+            }
228 
+          })
229 
+          return flag
218 230 
         })
219 231 
         if (arr && arr.length > 0) {
220 232 
           let self_item = JSON.parse(JSON.stringify(item))
 
@@ -368,7 +380,7 @@ export default {
368 380 
     color: #666666;
369 381 
     font-size: 14px;
370 382 
     line-height: 20px;
371 
-    margin-top: 17px;
383 
+    margin-top: 10px;
372 384 
   }
373 385 
   .title {
374 386 
     color: #383e47;

+ 18 - 4
project/src/components/assembly/screen/customerServiceCorpV2.vue
View File 

@@ -22,7 +22,8 @@
22 22 
       </div>
23 23 
       <div class="flex" style="padding:10px">
24 24 
         <div class="propoverItem">
25 
-          <selfInput :reset='resetFlag' :hasLabel="false" :inputFlag='true' @inputChange='(val)=>{input_keyword = val;userSearch()}' width="270px" style="margin-top:0" label_name="企微主体或成员昵称" />
25 
+          <selfInput :reset='resetFlag' :hasLabel="false" :inputFlag='true' @inputChange='(val)=>{input_keyword = val;userSearch()}' width="270px" style="margin-top:0;margin-bottom:4px" label_name="企微主体或成员昵称" />
26 
+            <div style="font-size:12px;color:#f9a527;">添加 空格 可进行多成员搜索</div>
26 27 
           <div class="allMember">全部企微主体({{corpTotal}}):</div>
27 28 
           <div class="memberBoxBig self-scrollbar-3">
28 29 
             <template v-for="(item,index) in userList">
 
@@ -281,11 +282,23 @@ export default {
281 282 
         res_format_2: this.selectedCorpList,
282 283 
       })
283 284 
     },
284 
-    userSearch () {//模糊搜索
285 
+    userSearch () {//模糊搜索 空格 可搜索多个结果
286 
+      let input_keyword_arr = this.input_keyword.split(' ');
287 
+      input_keyword_arr = input_keyword_arr.filter((v)=>{
288 
+        return v != ''
289 
+      })
285 290 
       let search_user_list = []
291 
+      input_keyword_arr.length == 0 ? input_keyword_arr = [''] : ''
292 
+
286 293 
       this.old_user_list.forEach((item) => {
287 294 
         let arr = item.user_list.filter((v) => {
288 
-          return (v.name && v.name.indexOf(this.input_keyword) != -1) || (v.corp_name && v.corp_name.indexOf(this.input_keyword) != -1)
295 
+          let flag = false
296 
+          input_keyword_arr.forEach((s_info)=>{
297 
+            if (!flag) {
298 
+              flag = (v.name && v.name.indexOf(s_info) != -1) || (v.corp_name && v.corp_name.indexOf(s_info) != -1)
299 
+            }
300 
+          })
301 
+          return flag
289 302 
         })
290 303 
         if (arr && arr.length > 0) {
291 304 
           let self_item = JSON.parse(JSON.stringify(item))
 
@@ -293,6 +306,7 @@ export default {
293 306 
           search_user_list.push(self_item)
294 307 
         }
295 308 
       })
309 
+
296 310 
       this.userList = search_user_list;
297 311 
       let userTotal = 0;
298 312 
       this.userList.forEach((item) => {
 
@@ -461,7 +475,7 @@ export default {
461 475 
     color: #666666;
462 476 
     font-size: 14px;
463 477 
     line-height: 20px;
464 
-    margin-top: 17px;
478 
+    margin-top: 10px;
465 479 
   }
466 480 
   .title {
467 481 
     color: #383e47;

+ 34 - 26
project/src/components/dataBoard/accountTrends.vue
View File 

@@ -139,7 +139,7 @@
139 139 
             </template>
140 140 
           </ux-table-column>
141 141 
           <!-- DAY1、DAY2... -->
142 
-          <ux-table-column width="120" v-for="(dayItem, dayIdx) in detailsTableColDays" :key="dayIdx + dayItem.tableName + dayItem.name">
142 
+          <ux-table-column width="170" v-for="(dayItem, dayIdx) in detailsTableColDays" :key="dayIdx + dayItem.tableName + dayItem.name">
143 143 
             <template #header>
144 144 
               <div class="flex-align-jus-center">{{ dayItem.name }}
145 145 
                 <el-tooltip placement="top" v-if="dayIdx === 0">
 
@@ -149,31 +149,35 @@
149 149 
               </div>
150 150 
             </template>
151 151 
             <template v-slot="{ row }">
152 
-              <div>
153 
-                <span class="font" style="color:#2C9841">充:</span>
154 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].pay_money ?
155 
-                    row.day_info[dayIdx].pay_money : '-'
156 
-                }}</span>
157 
-              </div>
158 
-              <div>
159 
-                <span class="font" style="color:#EB4315">回:</span>
160 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].total_roi ?
161 
-                    row.day_info[dayIdx].total_roi : '-'
162 
-                }}</span>
163 
-              </div>
164 
-              <div>
165 
-                <span class="font" style="color:#F28544">增:</span>
166 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].new_roi ?
167 
-                    row.day_info[dayIdx].new_roi : '-'
168 
-                }}</span>
152 
+              <div class="flex-align-center">
153 
+                <div class="day_class_info">
154 
+                  <span class="font" style="color:#2C9841">充:</span>
155 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].pay_money ?
156 
+                      row.day_info[dayIdx].pay_money : '-'
157 
+                  }}</span>
158 
+                </div>
159 
+                <div class="day_class_info">
160 
+                  <span class="font" style="color:#EB4315">回:</span>
161 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].total_roi ?
162 
+                      row.day_info[dayIdx].total_roi : '-'
163 
+                  }}</span>
164 
+                </div>
169 165 
               </div>
170 
-              <div>
171 
-                <span class="font" style="color:#2983DF">倍:</span>
172 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].income_times ?
173 
-                    row.day_info[dayIdx].income_times : '-'
174 
-                }}</span>
166 
+              <div class="flex-align-center">
167 
+                <div class="day_class_info">
168 
+                  <span class="font" style="color:#F28544">增:</span>
169 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].new_roi ?
170 
+                      row.day_info[dayIdx].new_roi : '-'
171 
+                  }}</span>
172 
+                </div>
173 
+                <div class="day_class_info">
174 
+                  <span class="font" style="color:#2983DF">倍:</span>
175 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].income_times ?
176 
+                      row.day_info[dayIdx].income_times : '-'
177 
+                  }}</span>
178 
+                </div>
175 179 
               </div>
176 
-              <div>
180 
+              <div class="day_class_info">
177 181 
                 <span class="font" style="color:#7366FF">充值人数:</span>
178 182 
                 <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].charge_user ?
179 183 
                     row.day_info[dayIdx].charge_user : '-'
 
@@ -964,7 +968,7 @@ export default {
964 968 
   .elx-table.elx-editable.size--mini .elx-body--column,
965 969 
   .elx-table.size--mini .elx-body--column.col--ellipsis,
966 970 
   .elx-table.size--mini .elx-footer--column.col--ellipsis {
967 
-    height: 120px !important;
971 
+    height: 56px !important;
968 972 
   }
969 973 
   .elx-table.size--mini .elx-body--column.col--ellipsis>.elx-cell,
970 974 
   .elx-table.size--mini .elx-footer--column.col--ellipsis>.elx-cell {
 
@@ -1072,4 +1076,8 @@ export default {
1072 1076 
     margin-top: -3px;
1073 1077 
   }
1074 1078 
 }
1075 
-</style>
1079 
+.day_class_info{
1080 
+  width: 78px;
1081 
+  font-size: 12px;
1082 
+}
1083 
+</style>

+ 34 - 26
project/src/components/dataBoard/fansActiveTrends.vue
View File 

@@ -107,7 +107,7 @@
107 107 
             </template>
108 108 
           </ux-table-column>
109 109 
           <!-- DAY1、DAY2... -->
110 
-          <ux-table-column width="120" v-for="(dayItem, dayIdx) in detailsTableColDays" :key="dayIdx + dayItem.tableName + dayItem.name">
110 
+          <ux-table-column width="170" v-for="(dayItem, dayIdx) in detailsTableColDays" :key="dayIdx + dayItem.tableName + dayItem.name">
111 111 
             <template #header>
112 112 
               <div class="flex-align-jus-center">{{ dayItem.name }}
113 113 
                 <el-tooltip placement="top" v-if="dayIdx === 0">
 
@@ -117,31 +117,35 @@
117 117 
               </div>
118 118 
             </template>
119 119 
             <template v-slot="{ row }">
120 
-              <div>
121 
-                <span class="font" style="color:#2C9841">充:</span>
122 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].pay_money ?
123 
-                    row.day_info[dayIdx].pay_money : '-'
124 
-                }}</span>
125 
-              </div>
126 
-              <div>
127 
-                <span class="font" style="color:#EB4315">回:</span>
128 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].total_roi ?
129 
-                    row.day_info[dayIdx].total_roi : '-'
130 
-                }}</span>
131 
-              </div>
132 
-              <div>
133 
-                <span class="font" style="color:#F28544">增:</span>
134 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].new_roi ?
135 
-                    row.day_info[dayIdx].new_roi : '-'
136 
-                }}</span>
120 
+              <div class="flex-align-center">
121 
+                <div class="day_class_info">
122 
+                  <span class="font" style="color:#2C9841">充:</span>
123 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].pay_money ?
124 
+                      row.day_info[dayIdx].pay_money : '-'
125 
+                  }}</span>
126 
+                </div>
127 
+                <div class="day_class_info">
128 
+                  <span class="font" style="color:#EB4315">回:</span>
129 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].total_roi ?
130 
+                      row.day_info[dayIdx].total_roi : '-'
131 
+                  }}</span>
132 
+                </div>
137 133 
               </div>
138 
-              <div>
139 
-                <span class="font" style="color:#2983DF">倍:</span>
140 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].income_times ?
141 
-                    row.day_info[dayIdx].income_times : '-'
142 
-                }}</span>
134 
+              <div class="flex-align-center">
135 
+                <div class="day_class_info">
136 
+                  <span class="font" style="color:#F28544">增:</span>
137 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].new_roi ?
138 
+                      row.day_info[dayIdx].new_roi : '-'
139 
+                  }}</span>
140 
+                </div>
141 
+                <div class="day_class_info">
142 
+                  <span class="font" style="color:#2983DF">倍:</span>
143 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].income_times ?
144 
+                      row.day_info[dayIdx].income_times : '-'
145 
+                  }}</span>
146 
+                </div>
143 147 
               </div>
144 
-              <div>
148 
+              <div class="day_class_info">
145 149 
                 <span class="font" style="color:#7366FF">充值人数:</span>
146 150 
                 <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].charge_user ?
147 151 
                     row.day_info[dayIdx].charge_user : '-'
 
@@ -913,7 +917,7 @@ export default {
913 917 
   .elx-table.elx-editable.size--mini .elx-body--column,
914 918 
   .elx-table.size--mini .elx-body--column.col--ellipsis,
915 919 
   .elx-table.size--mini .elx-footer--column.col--ellipsis {
916 
-    height: 120px !important;
920 
+    height: 56px !important;
917 921 
   }
918 922 
   .elx-table.size--mini .elx-body--column.col--ellipsis>.elx-cell,
919 923 
   .elx-table.size--mini .elx-footer--column.col--ellipsis>.elx-cell {
 
@@ -1021,4 +1025,8 @@ export default {
1021 1025 
     margin-top: -3px;
1022 1026 
   }
1023 1027 
 }
1024 
-</style>
1028 
+.day_class_info{
1029 
+  width: 78px;
1030 
+  font-size: 12px;
1031 
+}
1032 
+</style>

+ 8 - 4
project/src/components/dataBoard/loseUserTrends.vue
View File 

@@ -94,13 +94,13 @@
94 94 
               </div>
95 95 
             </template>
96 96 
             <template v-slot="{ row }">
97 
-              <div>
97 
+              <div class="day_class_info">
98 98 
                 <span class="font" style="color:#2C9841">流失人数:</span>
99 99 
                 <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].loss_count ?
100 100 
                     row.day_info[dayIdx].loss_count : '-'
101 101 
                 }}</span>
102 102 
               </div>
103 
-              <div>
103 
+              <div class="day_class_info">
104 104 
                 <span class="font" style="color:#EB4315">流失倍率:</span>
105 105 
                 <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].loss_rate ?
106 106 
                     row.day_info[dayIdx].loss_rate : '-'
 
@@ -691,7 +691,7 @@ export default {
691 691 
   .elx-table.elx-editable.size--mini .elx-body--column,
692 692 
   .elx-table.size--mini .elx-body--column.col--ellipsis,
693 693 
   .elx-table.size--mini .elx-footer--column.col--ellipsis {
694 
-    height: 120px !important;
694 
+    height: 40px !important;
695 695 
   }
696 696 
   .elx-table.size--mini .elx-body--column.col--ellipsis>.elx-cell,
697 697 
   .elx-table.size--mini .elx-footer--column.col--ellipsis>.elx-cell {
 
@@ -700,6 +700,10 @@ export default {
700 700 
 }
701 701 
 </style>
702 702 
 <style lang="scss" scoped>
703 
+.day_class_info{
704 
+  width: 78px;
705 
+  font-size: 12px;
706 
+}
703 707 
 .loseUserTrends-wrap {
704 708 
   min-width: 1125px;
705 709 
 }
 
@@ -778,4 +782,4 @@ export default {
778 782 
     margin-top: -3px;
779 783 
   }
780 784 
 }
781 
-</style>
785 
+</style>

+ 33 - 25
project/src/components/dataBoard/officialAccount.vue
View File 

@@ -90,7 +90,7 @@
90 90 
             </template>
91 91 
           </ux-table-column>
92 92 
           <!-- DAY1、DAY2... -->
93 
-          <ux-table-column width="120" v-for="(dayItem, dayIdx) in detailsTableColDays" :key="dayIdx + dayItem.name">
93 
+          <ux-table-column width="170" v-for="(dayItem, dayIdx) in detailsTableColDays" :key="dayIdx + dayItem.name">
94 94 
             <template #header>
95 95 
               <div class="flex-align-jus-center">{{ dayItem.name }}
96 96 
                 <el-tooltip placement="top" v-if="dayIdx === 0">
 
@@ -100,31 +100,35 @@
100 100 
               </div>
101 101 
             </template>
102 102 
             <template v-slot="{ row }">
103 
-              <div>
104 
-                <span class="font" style="color:#2C9841">充:</span>
105 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].pay_money ?
106 
-                    row.day_info[dayIdx].pay_money : '-'
107 
-                }}</span>
108 
-              </div>
109 
-              <div>
110 
-                <span class="font" style="color:#EB4315">回:</span>
111 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].total_roi ?
112 
-                    row.day_info[dayIdx].total_roi : '-'
113 
-                }}</span>
114 
-              </div>
115 
-              <div>
116 
-                <span class="font" style="color:#F28544">增:</span>
117 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].new_roi ?
118 
-                    row.day_info[dayIdx].new_roi : '-'
119 
-                }}</span>
103 
+              <div class="flex-align-center">
104 
+                <div class="day_class_info">
105 
+                  <span class="font" style="color:#2C9841">充:</span>
106 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].pay_money ?
107 
+                      row.day_info[dayIdx].pay_money : '-'
108 
+                  }}</span>
109 
+                </div>
110 
+                <div class="day_class_info">
111 
+                  <span class="font" style="color:#EB4315">回:</span>
112 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].total_roi ?
113 
+                      row.day_info[dayIdx].total_roi : '-'
114 
+                  }}</span>
115 
+                </div>
120 116 
               </div>
121 
-              <div>
122 
-                <span class="font" style="color:#2983DF">倍:</span>
123 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].income_times ?
124 
-                    row.day_info[dayIdx].income_times : '-'
125 
-                }}</span>
117 
+              <div class="flex-align-center">
118 
+                <div class="day_class_info">
119 
+                  <span class="font" style="color:#F28544">增:</span>
120 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].new_roi ?
121 
+                      row.day_info[dayIdx].new_roi : '-'
122 
+                  }}</span>
123 
+                </div>
124 
+                <div class="day_class_info">
125 
+                  <span class="font" style="color:#2983DF">倍:</span>
126 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].income_times ?
127 
+                      row.day_info[dayIdx].income_times : '-'
128 
+                  }}</span>
129 
+                </div>
126 130 
               </div>
127 
-              <div>
131 
+              <div class="day_class_info">
128 132 
                 <span class="font" style="color:#7366FF">充值人数:</span>
129 133 
                 <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].charge_user ?
130 134 
                     row.day_info[dayIdx].charge_user : '-'
 
@@ -509,7 +513,7 @@ export default {
509 513 
   .elx-table.elx-editable.size--mini .elx-body--column,
510 514 
   .elx-table.size--mini .elx-body--column.col--ellipsis,
511 515 
   .elx-table.size--mini .elx-footer--column.col--ellipsis {
512 
-    height: 120px !important;
516 
+    height: 56px !important;
513 517 
   }
514 518 
   .elx-table.size--mini .elx-body--column.col--ellipsis>.elx-cell,
515 519 
   .elx-table.size--mini .elx-footer--column.col--ellipsis>.elx-cell {
 
@@ -518,6 +522,10 @@ export default {
518 522 
 }
519 523 
 </style>
520 524 
 <style lang="scss" scoped>
525 
+.day_class_info{
526 
+  width: 78px;
527 
+  font-size: 12px;
528 
+}
521 529 
 .officialAccount-wrap {
522 530 
   position: relative;
523 531 
   min-height: calc(100vh - 70px);

+ 9 - 1
project/src/components/dataBoard/operateDayRetrieve.vue
View File 

@@ -234,6 +234,14 @@ export default {
234 234 
   }
235 235 
 }
236 236 
 </script>
237 
+<style lang="scss">
238 
+.operateDayRetrieve-wrap {
239 
+
240 
+ /deep/ .elx-table.elx-editable.size--mini .elx-body--column, .elx-table.size--mini .elx-body--column.col--ellipsis, .elx-table.size--mini .elx-footer--column.col--ellipsis, .elx-table.size--mini .elx-header--column.col--ellipsis{
241 
+    height: 30px !important;
242 
+  }
243 
+}
244 
+</style>
237 245 
 <style lang="scss" scoped>
238 246 
 .operateDayRetrieve-wrap {
239 247 
   position: relative;
 
@@ -265,4 +273,4 @@ export default {
265 273 
   background: #fff;
266 274 
   padding: 5px 20px;
267 275 
 }
268 
-</style>
276 
+</style>

+ 33 - 25
project/src/components/dataBoard/shortDramaTrends.vue
View File 

@@ -101,7 +101,7 @@
101 101 
             </template>
102 102 
           </ux-table-column>
103 103 
           <!-- DAY1、DAY2... -->
104 
-          <ux-table-column width="120" v-for="(dayItem, dayIdx) in detailsTableColDays" :key="dayIdx + dayItem.tableName + dayItem.name">
104 
+          <ux-table-column width="170" v-for="(dayItem, dayIdx) in detailsTableColDays" :key="dayIdx + dayItem.tableName + dayItem.name">
105 105 
             <template #header>
106 106 
               <div class="flex-align-jus-center">{{ dayItem.name }}
107 107 
                 <el-tooltip placement="top" v-if="dayIdx === 0">
 
@@ -111,31 +111,35 @@
111 111 
               </div>
112 112 
             </template>
113 113 
             <template v-slot="{ row }">
114 
-              <div>
115 
-                <span class="font" style="color:#2C9841">充:</span>
116 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].pay_money ?
117 
-                    row.day_info[dayIdx].pay_money : '-'
118 
-                }}</span>
119 
-              </div>
120 
-              <div>
121 
-                <span class="font" style="color:#EB4315">回:</span>
122 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].total_roi ?
123 
-                    row.day_info[dayIdx].total_roi : '-'
124 
-                }}</span>
125 
-              </div>
126 
-              <div>
127 
-                <span class="font" style="color:#F28544">增:</span>
128 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].new_roi ?
129 
-                    row.day_info[dayIdx].new_roi : '-'
130 
-                }}</span>
114 
+              <div class="flex-align-center">
115 
+                <div class="day_class_info">
116 
+                  <span class="font" style="color:#2C9841">充:</span>
117 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].pay_money ?
118 
+                      row.day_info[dayIdx].pay_money : '-'
119 
+                  }}</span>
120 
+                </div>
121 
+                <div class="day_class_info">
122 
+                  <span class="font" style="color:#EB4315">回:</span>
123 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].total_roi ?
124 
+                      row.day_info[dayIdx].total_roi : '-'
125 
+                  }}</span>
126 
+                </div>
131 127 
               </div>
132 
-              <div>
133 
-                <span class="font" style="color:#2983DF">倍:</span>
134 
-                <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].income_times ?
135 
-                    row.day_info[dayIdx].income_times : '-'
136 
-                }}</span>
128 
+              <div class="flex-align-center">
129 
+                <div class="day_class_info">
130 
+                  <span class="font" style="color:#F28544">增:</span>
131 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].new_roi ?
132 
+                      row.day_info[dayIdx].new_roi : '-'
133 
+                  }}</span>
134 
+                </div>
135 
+                <div class="day_class_info">
136 
+                  <span class="font" style="color:#2983DF">倍:</span>
137 
+                  <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].income_times ?
138 
+                      row.day_info[dayIdx].income_times : '-'
139 
+                  }}</span>
140 
+                </div>
137 141 
               </div>
138 
-              <div>
142 
+              <div class="day_class_info">
139 143 
                 <span class="font" style="color:#7366FF">充值人数:</span>
140 144 
                 <span>{{ row && row.day_info && row.day_info[dayIdx] && row.day_info[dayIdx].charge_user ?
141 145 
                     row.day_info[dayIdx].charge_user : '-'
 
@@ -888,7 +892,7 @@ export default {
888 892 
   .elx-table.elx-editable.size--mini .elx-body--column,
889 893 
   .elx-table.size--mini .elx-body--column.col--ellipsis,
890 894 
   .elx-table.size--mini .elx-footer--column.col--ellipsis {
891 
-    height: 120px !important;
895 
+    height: 56px !important;
892 896 
   }
893 897 
   .elx-table.size--mini .elx-body--column.col--ellipsis>.elx-cell,
894 898 
   .elx-table.size--mini .elx-footer--column.col--ellipsis>.elx-cell {
 
@@ -996,4 +1000,8 @@ export default {
996 1000 
     margin-top: -3px;
997 1001 
   }
998 1002 
 }
1003 
+.day_class_info{
1004 
+  width: 78px;
1005 
+  font-size: 12px;
1006 
+}
999 1007 
 </style>

+ 32 - 24
project/src/components/dataBoard/thePublicTrend.vue
View File 

@@ -81,7 +81,7 @@
81 81 
           }}</span>
82 82 
         </template>
83 83 
       </ux-table-column>
84 
-      <ux-table-column width="100" v-for="(item_extra, index_extra) in extra" :key="index_extra + 'extra'">
84 
+      <ux-table-column width="170" v-for="(item_extra, index_extra) in extra" :key="index_extra + 'extra'">
85 85 
         <template #header>
86 86 
           <div class="flex-align-jus-center">{{ item_extra }}
87 87 
             <el-tooltip placement="top" v-if="index_extra == 1">
 
@@ -91,29 +91,33 @@
91 91 
           </div>
92 92 
         </template>
93 93 
         <template v-slot="{ row }">
94 
-          <div>
95 
-            <span class="font" style="color:#2C9841">充:</span>
96 
-            <span>{{ row && row.day_info && row.day_info[index_extra] && row.day_info[index_extra].pay_money ?
97 
-                row.day_info[index_extra].pay_money : '-'
98 
-            }}</span>
94 
+          <div class="flex-align-center">
95 
+            <div class="day_class_info">
96 
+              <span class="font" style="color:#2C9841">充:</span>
97 
+              <span>{{ row && row.day_info && row.day_info[index_extra] && row.day_info[index_extra].pay_money ?
98 
+                  row.day_info[index_extra].pay_money : '-'
99 
+              }}</span>
100 
+            </div>
101 
+            <div class="day_class_info">
102 
+              <span class="font" style="color:#F28544">增:</span>
103 
+              <span>{{ row && row.day_info && row.day_info[index_extra] && row.day_info[index_extra].new_roi ?
104 
+                  row.day_info[index_extra].new_roi : '-'
105 
+              }}</span>
106 
+            </div>
99 107 
           </div>
100 
-          <div>
101 
-            <span class="font" style="color:#F28544">增:</span>
102 
-            <span>{{ row && row.day_info && row.day_info[index_extra] && row.day_info[index_extra].new_roi ?
103 
-                row.day_info[index_extra].new_roi : '-'
104 
-            }}</span>
105 
-          </div>
106 
-          <div>
107 
-            <span class="font" style="color:#EB4315">回:</span>
108 
-            <span>{{ row && row.day_info && row.day_info[index_extra] && row.day_info[index_extra].total_roi ?
109 
-                row.day_info[index_extra].total_roi : '-'
110 
-            }}</span>
111 
-          </div>
112 
-          <div>
113 
-            <span class="font" style="color:#2983DF">倍:</span>
114 
-            <span>{{ row && row.day_info && row.day_info[index_extra] && row.day_info[index_extra].income_times ?
115 
-                row.day_info[index_extra].income_times : '-'
116 
-            }}</span>
108 
+          <div class="flex-align-center">
109 
+            <div class="day_class_info">
110 
+              <span class="font" style="color:#EB4315">回:</span>
111 
+              <span>{{ row && row.day_info && row.day_info[index_extra] && row.day_info[index_extra].total_roi ?
112 
+                  row.day_info[index_extra].total_roi : '-'
113 
+              }}</span>
114 
+            </div>
115 
+            <div class="day_class_info">
116 
+              <span class="font" style="color:#2983DF">倍:</span>
117 
+              <span>{{ row && row.day_info && row.day_info[index_extra] && row.day_info[index_extra].income_times ?
118 
+                  row.day_info[index_extra].income_times : '-'
119 
+              }}</span>
120 
+            </div>
117 121 
           </div>
118 122 
         </template>
119 123 
       </ux-table-column>
 
@@ -426,7 +430,7 @@ export default {
426 430 
   .elx-table.elx-editable.size--mini .elx-body--column,
427 431 
   .elx-table.size--mini .elx-body--column.col--ellipsis,
428 432 
   .elx-table.size--mini .elx-footer--column.col--ellipsis {
429 
-    height: 110px !important;
433 
+    height: 40px !important;
430 434 
   }
431 435
432 436 
   //,.elx-table.size--mini .elx-header--column.col--ellipsis  ,
 
@@ -439,6 +443,10 @@ export default {
439 443 
 }
440 444 
 </style>
441 445 
 <style lang="scss" scoped>
446 
+.day_class_info{
447 
+  width: 78px;
448 
+  font-size: 12px;
449 
+}
442 450 
 .screenBox {
443 451 
   background: #fff;
444 452 
   padding: 5px 20px;

+ 6 - 5
project/src/components/dataBoard/throwPerson/throwPersonPuton.vue
View File 

@@ -68,7 +68,8 @@
68 68 
       :header-cell-style="headerColor" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip"
69 69 
       size="mini">
70 70 
       <ux-table-column v-for="item in desCol" :key="item.prop" :resizable="true" :field="item.prop" :title="item.label"
71 
-        :min-width="item.min_width ? item.min_width : 120" :fixed="item.fixed ? item.fixed : ''" align="center">
71 
+        :min-width="item.min_width ? item.min_width : 120" align="center">
72 
+        <!-- :fixed="item.fixed ? item.fixed : ''" -->
72 73 
         <template #header>
73 74 
           <div
74 75 
             :class="['flex-align-jus-center', item.sort ? 'pointer' : '', sort_field == item.prop ? 'sortFieldStyle' : '']"
 
@@ -84,7 +85,7 @@
84 85 
           <span v-if="item.prop === 'account_name'" :class="sort_field == item.prop ? 'sortFieldStyle' : ''">{{ row[item.prop] }}</span>
85 86
86 87 
           <!-- S 使用客服 -->
87 
-          <div v-else-if="item.prop === 'user_list_show'">
88 
+          <div v-else-if="item.prop === 'user_list_show'" style="padding: 4px 0;">
88 89 
             <template v-if="row['user_list_show'] && row['user_list_show'].length">
89 90 
               <colPopover :list="row['user_list_show']" :maxLength="4" :width="280" />
90 91 
             </template>
 
@@ -231,7 +232,7 @@ export default {
231 232 
     },
232 233 
   },
233 234 
   created () {
234 
-    this.height = document.documentElement.clientHeight - 340 > 400 ? document.documentElement.clientHeight - 340 : 400
235 
+    this.height = document.documentElement.clientHeight - 360 > 400 ? document.documentElement.clientHeight - 360 : 400
235 236 
     this.time = this.default_time
236 237 
     this.stat_throwPersonData()
237 238 
     this.init(1)
 
@@ -351,7 +352,7 @@ export default {
351 352 
           if (type == 'export') {
352 353 
             this.exportEvent(res.rst.data)
353 354 
           } else {
354 
-            this.datas = res.rst.data // 知道为啥datas不在 data()方法里面定义吗？嘻嘻
355 
+            this.datas = res.rst.data
355 356 
             this.$refs.plxTable.reloadData(this.datas)
356 357 
             this.total = res.rst.pageInfo.total;
357 358 
             this.pages = res.rst.pageInfo.pages;
 
@@ -455,7 +456,7 @@ export default {
455 456 
   .elx-table.elx-editable.size--mini .elx-body--column,
456 457 
   .elx-table.size--mini .elx-body--column.col--ellipsis,
457 458 
   .elx-table.size--mini .elx-footer--column.col--ellipsis {
458 
-    height: 120px !important;
459 
+    // height: auto !important;
459 460 
   }
460 461 
   .elx-table.size--mini .elx-body--column.col--ellipsis>.elx-cell,
461 462 
   .elx-table.size--mini .elx-footer--column.col--ellipsis>.elx-cell {

+ 6 - 2
project/src/theme.scss
View File 

@@ -58,7 +58,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
58 58 
 .elx-table.border--default .elx-body--column, .elx-table.border--default .elx-footer--column, .elx-table.border--default .elx-header--column, .elx-table.border--inner .elx-body--column, .elx-table.border--inner .elx-footer--column, .elx-table.border--inner .elx-header--column{
59 59 
   background-image: linear-gradient(#EBEEF5,#EBEEF5) !important;
60 60 
 }
61 
-.elx-table.elx-editable.size--mini .elx-body--column, .elx-table.size--mini .elx-body--column.col--ellipsis, .elx-table.size--mini .elx-footer--column.col--ellipsis, .elx-table.size--mini .elx-header--column.col--ellipsis{
61 
+.elx-table.size--mini .elx-header--column.col--ellipsis{
62 62 
   height: 50px !important;
63 63 
 }
64 64 
 .elx-header--column.col--ellipsis>.elx-cell .elx-cell--title,.elx-header--column .elx-cell--title{
 
@@ -73,4 +73,8 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
73 73 
 }
74 74 
 .elx-table .elx-table--border-line{//表格外边框
75 75 
   border: none !important;
76 
-}
76 
+}
77 
+
78 
+.elx-table .elx-body--column, .elx-table .elx-footer--column, .elx-table .elx-header--column{
79 
+  line-height: 16px;
80 
+}

File diff suppressed because it is too large
+ 0 - 1
static/css/app.ba2f62b7fe0fd0a97f0c6dff2d4c3fa1.css


File diff suppressed because it is too large
+ 1 - 0
static/css/app.d9edfa14c4c0c21bd3085661e23ba621.css


File diff suppressed because it is too large
+ 9 - 0
static/js/0.805a91bc6ab7dcf409f0.js


File diff suppressed because it is too large
+ 0 - 9
static/js/0.c332782df28d4bb994cd.js


File diff suppressed because it is too large
+ 1 - 0
static/js/15.246709c63ec595b073d3.js


File diff suppressed because it is too large
+ 0 - 1
static/js/15.a2a78e98f3ef3e9d2184.js


File diff suppressed because it is too large
+ 1 - 0
static/js/3.269e2738a9bc33033b8b.js


File diff suppressed because it is too large
+ 0 - 1
static/js/3.7c3ccbbb9c2e1a3a5d1d.js


static/js/35.8e7f712ac0f39ae13294.js → static/js/35.4ab5b54ac1a70725d90f.js
View File


File diff suppressed because it is too large
+ 0 - 1
static/js/41.06ab1adc221aad5a16c7.js


File diff suppressed because it is too large
+ 1 - 1
static/js/42.69586790f33abdc7b6ae.js


File diff suppressed because it is too large
+ 1 - 1
static/js/43.5d6e5acd072ff6dce236.js


File diff suppressed because it is too large
+ 1 - 1
static/js/44.d97b6704d04665ad4a76.js


File diff suppressed because it is too large
+ 1 - 0
static/js/44.935331dd4ffb3926e0d9.js


File diff suppressed because it is too large
+ 1 - 1
static/js/51.4a62398545f014f3db39.js


File diff suppressed because it is too large
+ 1 - 1
static/js/52.e6230a2824446b9b340c.js


File diff suppressed because it is too large
+ 1 - 1
static/js/50.db9feab003481813f5cc.js


File diff suppressed because it is too large
+ 1 - 1
static/js/54.9a6cadee5f3e6cf80cff.js


File diff suppressed because it is too large
+ 0 - 1
static/js/58.66b192623869ed29da9e.js


File diff suppressed because it is too large
+ 1 - 0
static/js/58.ea8c8a185633147f7566.js


File diff suppressed because it is too large
+ 1 - 1
static/js/63.02c4f61840d7ccaaaab8.js


File diff suppressed because it is too large
+ 0 - 1
static/js/62.f007013714ec22633ee2.js


File diff suppressed because it is too large
+ 1 - 1
static/js/64.4df77857b69ad123f2d5.js


File diff suppressed because it is too large
+ 1 - 1
static/js/65.c91f880ea716652d33fb.js


File diff suppressed because it is too large
+ 1 - 0
static/js/65.dfbd2a6955b8259cdedc.js


File diff suppressed because it is too large
+ 1 - 0
static/js/66.1e973154c712523a3dd8.js


File diff suppressed because it is too large
+ 1 - 1
static/js/66.0f91563c7e79be3e788a.js


File diff suppressed because it is too large
+ 1 - 1
static/js/67.897ba365926e14488bc5.js


File diff suppressed because it is too large
+ 1 - 1
static/js/68.f6c95020e971cdcf1a9b.js


File diff suppressed because it is too large
+ 1 - 1
static/js/69.9102c33b48da7465c3fb.js


File diff suppressed because it is too large
+ 1 - 1
static/js/70.cdbef9e1287128a1f3be.js


File diff suppressed because it is too large
+ 1 - 1
static/js/71.ed7c70f29d6a7cbae0c1.js


File diff suppressed because it is too large
+ 0 - 1
static/js/72.a2a1b5c13a61aed4a6fc.js


File diff suppressed because it is too large
+ 1 - 1
static/js/app.829edfe4e58baaaaaf5b.js


File diff suppressed because it is too large
+ 0 - 1
static/js/manifest.3568fb7a2fb30a989da6.js


File diff suppressed because it is too large
+ 1 - 0
static/js/manifest.7f1e0ce347d6c744bee9.js