liuxiaona 2 years ago
parent
commit
272a0c5e79

+ 2 - 2
.idea/workspace.xml

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
4
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
5
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" afterDir="false" />
6
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonPuton.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonPuton.vue" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonSon.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonSon.vue" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/project/src/components/warningManage/warningListInstall.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/warningManage/warningListInstall.vue" afterDir="false" />
8
     </list>
8
     </list>
9
     <option name="SHOW_DIALOG" value="false" />
9
     <option name="SHOW_DIALOG" value="false" />
10
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
10
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

+ 1 - 1
index.html

7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8
         var s = document.getElementsByTagName("script")[0];
8
         var s = document.getElementsByTagName("script")[0];
9
         s.parentNode.insertBefore(hm, s);
9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.3b107e43c59ca320ba72c4cc9bba7f38.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.1d7f15e593bb0ef8cc13.js></script><script type=text/javascript src=./static/js/app.dff10b3056e815a8bbdd.js></script></body></html>
10
+      })();</script><link href=./static/css/app.fe514190a436e2e5cb90d6b03a2cf3bf.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.b9ffc85ad60e133ca051.js></script><script type=text/javascript src=./static/js/app.a3522c415d1a18a09570.js></script></body></html>

+ 0 - 4
project/src/components/dataBoard/playletData.vue

148
         { prop: 'cost_cover_rate', label: "回本率(%)" },
148
         { prop: 'cost_cover_rate', label: "回本率(%)" },
149
         { prop: 'fans_increase', label: "新增粉丝数" },
149
         { prop: 'fans_increase', label: "新增粉丝数" },
150
         { prop: 'new_user_cost', label: "新增粉丝成本" },
150
         { prop: 'new_user_cost', label: "新增粉丝成本" },
151
-
152
         { prop: 'new_user_charge_uv_count', label: "充值总人数", },
151
         { prop: 'new_user_charge_uv_count', label: "充值总人数", },
153
         { prop: 'new_user_charge_uv', label: "当日首充人数", },
152
         { prop: 'new_user_charge_uv', label: "当日首充人数", },
154
         { prop: 'new_user_charge_pv_count', label: "总充值次数", },
153
         { prop: 'new_user_charge_pv_count', label: "总充值次数", },
155
         { prop: 'new_user_charge_pv', label: "新用户首日充值次数", },
154
         { prop: 'new_user_charge_pv', label: "新用户首日充值次数", },
156
-
157
-        { prop: 'new_user_charge_uv', label: "充值人数" },
158
-        { prop: 'new_user_charge_pv', label: "充值次数" },
159
         { prop: 'charge_user_cost', label: "充值用户成本", notes: '充值用户成本=当天消耗/充值人数', min_width: "160" },
155
         { prop: 'charge_user_cost', label: "充值用户成本", notes: '充值用户成本=当天消耗/充值人数', min_width: "160" },
160
       ],
156
       ],
161
       extra: [],
157
       extra: [],

+ 0 - 3
project/src/components/warningManage/warningListInstall.vue

129
       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupList, {
129
       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupList, {
130
         params: {
130
         params: {
131
           keyword: this.input_keyword,
131
           keyword: this.input_keyword,
132
-          is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
133
           sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
132
           sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
134
         }
133
         }
135
       }).then((res) => {
134
       }).then((res) => {
152
       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupDetail, {
151
       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupDetail, {
153
         params: {
152
         params: {
154
           group_id: id,
153
           group_id: id,
155
-          is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
156
           sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
154
           sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
157
         }
155
         }
158
       }).then((res) => {
156
       }).then((res) => {
209
 
207
 
210
       let axios_api = this.URL.warn_groupEdit;
208
       let axios_api = this.URL.warn_groupEdit;
211
       let params = {
209
       let params = {
212
-        is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
213
         sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
210
         sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
214
         group_name: this.groupName,
211
         group_name: this.groupName,
215
         user_list: JSON.stringify(this.warningArrs)
212
         user_list: JSON.stringify(this.warningArrs)

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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/31.3684163420e16b54f35e.js


File diff suppressed because it is too large
+ 1 - 1
static/js/32.c270c0dcc6f00e8a1609.js


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


File diff suppressed because it is too large
+ 1 - 1
static/js/33.6dde91a745b17396936e.js


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


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


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


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