xiuli.gao 7 ヶ月 前
コミット
34f7abf59d
共有40 個のファイルを変更した94 個の追加65 個の削除を含む
  1. 1 1
      dist/assets/index.ee551318.css
  2. 1 1
      dist/assets/index.48c5a837.js
  3. 1 1
      dist/index.html
  4. 1 1
      dist/js/Home/index.e1170c9c.js
  5. 1 1
      dist/js/_dialog/_dialog.8c7eca51.js
  6. 1 1
      dist/js/_input/_input.1db7c31b.js
  7. 1 1
      dist/js/_select/_select.83a71ea9.js
  8. 3 0
      dist/js/acStatement.vue/index.9cf513b3.js
  9. 0 3
      dist/js/acStatement.vue/index.a3e0e672.js
  10. 1 1
      dist/js/adTask/index.2b48389d.js
  11. 1 1
      dist/js/adqManage/index.58e69c73.js
  12. 1 1
      dist/js/basisMoudle/error.99893316.js
  13. 1 0
      dist/js/basisMoudle/login.31eb0347.js
  14. 0 1
      dist/js/basisMoudle/login.50199208.js
  15. 1 1
      dist/js/collectClip/index.eb321386.js
  16. 1 1
      dist/js/configArea/index.401c421c.js
  17. 1 1
      dist/js/define/define.8d57d390.js
  18. 1 1
      dist/js/gdtList/index.53b47fe6.js
  19. 1 1
      dist/js/index/index.92182fdb.js
  20. 1 1
      dist/js/index/index.8adaa13a.js
  21. 1 1
      dist/js/index/index.b275a5ad.js
  22. 1 1
      dist/js/layout/index.b4788e58.js
  23. 1 1
      dist/js/layout/index_head.213e14fb.js
  24. 1 1
      dist/js/limitManage/index.9da5d625.js
  25. 1 1
      dist/js/materialBlock/materialBlock.d866bf74.js
  26. 1 1
      dist/js/materialLibrary/index.0827490b.js
  27. 1 1
      dist/js/memberManage/index.903a1dd9.js
  28. 1 1
      dist/js/menu/index.1da3feda.js
  29. 1 1
      dist/js/miniprogram/index.8400e611.js
  30. 1 1
      dist/js/projectManage/index.e8e0b082.js
  31. 1 1
      dist/js/radioGroup/radioGroup.5e306d45.js
  32. 1 1
      dist/js/tableInfo/tableInfo.2c55e158.js
  33. 1 1
      dist/js/taskList/index.c1a1151d.js
  34. 1 1
      dist/js/teamManage/index.879bd3a9.js
  35. 1 1
      dist/js/timeScreen/timeScreen.b6617db3.js
  36. 1 1
      dist/js/warning/warning.a1924fc1.js
  37. 1 1
      dist/js/wechatPage/index.165a4989.js
  38. 1 1
      dist/js/weekTime/weekTime.f0d03aaf.js
  39. 1 2
      src/components/businessMoudle/dataManagement/acStatement.vue/dataList.vue
  40. 55 25
      src/components/businessMoudle/dataManagement/acStatement.vue/projectDataList.vue

File diff suppressed because it is too large
+ 1 - 1
dist/assets/index.ee551318.css


File diff suppressed because it is too large
+ 1 - 1
dist/assets/index.48c5a837.js


+ 1 - 1
dist/index.html

@@ -12,7 +12,7 @@
12 12
 			document.write('<script src="' + src + '"><\/script>');
13 13
 			})();
14 14
     </script>
15
-    <script type="module" crossorigin src="./assets/index.48c5a837.js"></script>
15
+    <script type="module" crossorigin src="./assets/index.c73b01f7.js"></script>
16 16
     <link rel="modulepreload" href="./js/@vue/@vue.5bfcce30.js">
17 17
     <link rel="modulepreload" href="./js/vue-router/vue-router.ccba075e.js">
18 18
     <link rel="modulepreload" href="./js/vue-demi/vue-demi.4f3c4c97.js">

File diff suppressed because it is too large
+ 1 - 1
dist/js/Home/index.e1170c9c.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/_dialog/_dialog.8c7eca51.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/_input/_input.1db7c31b.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/_select/_select.83a71ea9.js


File diff suppressed because it is too large
+ 3 - 0
dist/js/acStatement.vue/index.9cf513b3.js


File diff suppressed because it is too large
+ 0 - 3
dist/js/acStatement.vue/index.a3e0e672.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/adTask/index.2b48389d.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/adqManage/index.58e69c73.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/basisMoudle/error.99893316.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/basisMoudle/login.31eb0347.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/basisMoudle/login.50199208.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/collectClip/index.eb321386.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/configArea/index.401c421c.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/define/define.8d57d390.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/gdtList/index.53b47fe6.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/index/index.92182fdb.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/index/index.8adaa13a.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/index/index.b275a5ad.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/layout/index.b4788e58.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/layout/index_head.213e14fb.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/limitManage/index.9da5d625.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/materialBlock/materialBlock.d866bf74.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/materialLibrary/index.0827490b.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/memberManage/index.903a1dd9.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/menu/index.1da3feda.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/miniprogram/index.8400e611.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/projectManage/index.e8e0b082.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/radioGroup/radioGroup.5e306d45.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/tableInfo/tableInfo.2c55e158.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/taskList/index.c1a1151d.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/teamManage/index.879bd3a9.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/timeScreen/timeScreen.b6617db3.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/warning/warning.a1924fc1.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/wechatPage/index.165a4989.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/weekTime/weekTime.f0d03aaf.js


+ 1 - 2
src/components/businessMoudle/dataManagement/acStatement.vue/dataList.vue

@@ -37,8 +37,7 @@
37 37
                 <el-tooltip :disabled="!(scope.row[item.key_value] && scope.row[item.key_value].length > 30)"
38 38
                   effect="dark" :content="scope.row[item.key_value] + ''">
39 39
                   <div class="clampTwo line21" style="flex: 1">
40
-                    {{ scope.row[item.key_value] || scope.row[item.key_value] == 0 ?
41
-                      hasDot(scope.row[item.key_value], 2, true) : '-' }}<span
40
+                    {{ scope.row[item.key_value] || scope.row[item.key_value] == 0 ? (item.label.indexOf('ID') != -1 || item.label.indexOf('id') != -1 ? scope.row[item.key_value] : hasDot(scope.row[item.key_value], 2, true)) : '-'  }}<span
42 41
                       v-if="item.label.indexOf('率') != -1 && (scope.row[item.key_value] || scope.row[item.key_value] == 0)">%</span>
43 42
                   </div>
44 43
                 </el-tooltip>

+ 55 - 25
src/components/businessMoudle/dataManagement/acStatement.vue/projectDataList.vue

@@ -44,8 +44,7 @@
44 44
                 <el-tooltip :disabled="!(scope.row[item.key_value] && scope.row[item.key_value].length > 30)"
45 45
                   effect="dark" :content="scope.row[item.key_value] + ''">
46 46
                   <div class="clampTwo line21" style="flex: 1">
47
-                    {{ scope.row[item.key_value] || scope.row[item.key_value] == 0 ?
48
-                      hasDot(scope.row[item.key_value], 2, true) : '-' }}<span
47
+                    {{ scope.row[item.key_value] || scope.row[item.key_value] == 0 ? (item.label.indexOf('ID') != -1 || item.label.indexOf('id') != -1 ? scope.row[item.key_value] : hasDot(scope.row[item.key_value], 2, true)) : '-' }}<span
49 48
                       v-if="item.label.indexOf('率') != -1 && (scope.row[item.key_value] || scope.row[item.key_value] == 0)">%</span>
50 49
                   </div>
51 50
                 </el-tooltip>
@@ -94,7 +93,7 @@ const tableInfo = reactive<any>({
94 93
   updateKey: 1,
95 94
   dimensionList:[
96 95
     { name: '账户', key: 'account' },
97
-    { name: '人员', key: 'user' },
96
+    { name: '优化师', key: 'user' },
98 97
     { name: '部门', key: 'department' },
99 98
   ]
100 99
 })
@@ -136,19 +135,7 @@ const exportEvent = async () => {
136 135
   loading.value = false;
137 136
   if (res && res.errNo == '0') {
138 137
     let list = res.rst.data.list;
139
-    let descol = [{
140
-        disabled: 1,
141
-        if_sort: 1,
142
-        key_value: "time",
143
-        label: "时间",
144
-        tooltip: ""
145
-      },{
146
-        disabled: 1,
147
-        if_sort: 0,
148
-        key_value: "project_name",
149
-        label: "项目名称",
150
-        tooltip: ""
151
-      }].concat(res.rst.data?.explain)
138
+    let descol = getDesolOther().concat(res.rst.data?.explain)
152 139
 
153 140
     let tHeader = descol.map((v) => {
154 141
       return v.label;
@@ -193,7 +180,18 @@ const init = async (page?: any, pageSize?: any) => {
193 180
   loading.value = false;
194 181
   if (res && res.errNo == '0') {
195 182
     tableInfo.summary = res.rst?.data?.summary;
196
-    tableInfo.descol = [{
183
+    tableInfo.descol = getDesolOther().concat(res.rst?.data?.explain);
184
+    tableInfo.tableList = res.rst?.data?.list;
185
+    tableInfo.total = res.rst?.pageInfo.total
186
+    tableInfo.totalPages = res.rst?.pageInfo.total
187
+    tableInfo.updateKey ++;
188
+  } else {
189
+    ElMessage.error(res.errMsg)
190
+  }
191
+}
192
+
193
+const getDesolOther = () => {
194
+  let desArr = [{
197 195
         disabled: 1,
198 196
         if_sort: 1,
199 197
         key_value: "time",
@@ -205,14 +203,46 @@ const init = async (page?: any, pageSize?: any) => {
205 203
         key_value: "project_name",
206 204
         label: "项目名称",
207 205
         tooltip: ""
208
-      }].concat(res.rst?.data?.explain);
209
-    tableInfo.tableList = res.rst?.data?.list;
210
-    tableInfo.total = res.rst?.pageInfo.total
211
-    tableInfo.totalPages = res.rst?.pageInfo.total
212
-    tableInfo.updateKey ++;
213
-  } else {
214
-    ElMessage.error(res.errMsg)
215
-  }
206
+      }]
207
+  if(dimensionRef.value){
208
+      if( dimensionRef.value.value.includes('account') ) {
209
+        desArr = desArr.concat([
210
+          {
211
+            disabled: 0,
212
+            if_sort: 0,
213
+            key_value: "advertiser_nick",
214
+            label: "账户名称",
215
+            tooltip: ""
216
+          },
217
+          {
218
+            disabled: 0,
219
+            if_sort: 0,
220
+            key_value: "advertiser_id",
221
+            label: "账户ID",
222
+            tooltip: ""
223
+          }
224
+        ])
225
+      }
226
+      if( dimensionRef.value.value.includes('user') ) {
227
+        desArr.push({
228
+            disabled: 0,
229
+            if_sort: 0,
230
+            key_value: "user_name",
231
+            label: "优化师",
232
+            tooltip: ""
233
+          })
234
+      }
235
+      if( dimensionRef.value.value.includes('department') ) {
236
+        desArr.push({
237
+            disabled: 0,
238
+            if_sort: 0,
239
+            key_value: "department_name",
240
+            label: "部门",
241
+            tooltip: ""
242
+          })
243
+      }
244
+    }
245
+  return desArr
216 246
 }
217 247
 
218 248
 /**合计计算 */