2 年前 · 272a0c5e79
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,9 @@
 
				 <project version="4">
			
 
				   <component name="ChangeListManager">
			
 
				     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
			
 
				+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
			
 
				       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" afterDir="false" />
			
 
				-      <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" />
			
 
				-      <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" />
			
 
				+      <change beforePath="$PROJECT_DIR$/project/src/components/warningManage/warningListInstall.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/warningManage/warningListInstall.vue" afterDir="false" />
			
 
				     </list>
			
 
				     <option name="SHOW_DIALOG" value="false" />
			
 
				     <option name="HIGHLIGHT_CONFLICTS" value="true" />
			
--- a/index.html
+++ b/index.html
@@ -7,4 +7,4 @@
 
				         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
			
 
				         var s = document.getElementsByTagName("script")[0];
			
 
				         s.parentNode.insertBefore(hm, s);
			
 
				-      })();</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>
			
 
				+      })();</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>
			
--- a/project/src/components/dataBoard/playletData.vue
+++ b/project/src/components/dataBoard/playletData.vue
@@ -148,14 +148,10 @@ export default {
 
				         { prop: 'cost_cover_rate', label: "回本率(%)" },
			
 
				         { prop: 'fans_increase', label: "新增粉丝数" },
			
 
				         { prop: 'new_user_cost', label: "新增粉丝成本" },
			
 
				-
			
 
				         { prop: 'new_user_charge_uv_count', label: "充值总人数", },
			
 
				         { prop: 'new_user_charge_uv', label: "当日首充人数", },
			
 
				         { prop: 'new_user_charge_pv_count', label: "总充值次数", },
			
 
				         { prop: 'new_user_charge_pv', label: "新用户首日充值次数", },
			
 
				-
			
 
				-        { prop: 'new_user_charge_uv', label: "充值人数" },
			
 
				-        { prop: 'new_user_charge_pv', label: "充值次数" },
			
 
				         { prop: 'charge_user_cost', label: "充值用户成本", notes: '充值用户成本=当天消耗/充值人数', min_width: "160" },
			
 
				       ],
			
 
				       extra: [],
			
--- a/project/src/components/warningManage/warningListInstall.vue
+++ b/project/src/components/warningManage/warningListInstall.vue
@@ -129,7 +129,6 @@ export default {
 
				       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupList, {
			
 
				         params: {
			
 
				           keyword: this.input_keyword,
			
 
				-          is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
			
 
				           sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
			
 
				         }
			
 
				       }).then((res) => {
			
@@ -152,7 +151,6 @@ export default {
 
				       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupDetail, {
			
 
				         params: {
			
 
				           group_id: id,
			
 
				-          is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
			
 
				           sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
			
 
				         }
			
 
				       }).then((res) => {
			
@@ -209,7 +207,6 @@ export default {
 
				 
			
 
				       let axios_api = this.URL.warn_groupEdit;
			
 
				       let params = {
			
 
				-        is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
			
 
				         sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
			
 
				         group_name: this.groupName,
			
 
				         user_list: JSON.stringify(this.warningArrs)
			
--- a/static/css/app.3b107e43c59ca320ba72c4cc9bba7f38.css
+++ b/static/css/app.3b107e43c59ca320ba72c4cc9bba7f38.css
--- a/static/js/31.bb08cc48d0ec0ff3d0c7.js
+++ b/static/js/31.bb08cc48d0ec0ff3d0c7.js
--- a/static/js/31.3684163420e16b54f35e.js
+++ b/static/js/31.3684163420e16b54f35e.js
--- a/static/js/32.c270c0dcc6f00e8a1609.js
+++ b/static/js/32.c270c0dcc6f00e8a1609.js
--- a/static/js/34.7a5dce3f89f4c6861cb4.js
+++ b/static/js/34.7a5dce3f89f4c6861cb4.js
--- a/static/js/33.6dde91a745b17396936e.js
+++ b/static/js/33.6dde91a745b17396936e.js
--- a/static/js/7.1f807776ba44cee527c0.js
+++ b/static/js/7.1f807776ba44cee527c0.js
--- a/static/js/7.7a62130a6bf719c0d055.js
+++ b/static/js/7.7a62130a6bf719c0d055.js
--- a/static/js/app.dff10b3056e815a8bbdd.js
+++ b/static/js/app.dff10b3056e815a8bbdd.js
--- a/static/js/manifest.1d7f15e593bb0ef8cc13.js
+++ b/static/js/manifest.1d7f15e593bb0ef8cc13.js