| 
					
				 | 
			
			
				@@ -332,6 +332,7 @@ class Mvp: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         self.tag_data = ExcelUtil(file_name=path).init_mvp_data() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         self.crowd_info = ExcelUtil(file_name=path, sheet_name='选项-人群分类对应表').init_crowd_info() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         self.citys = self.init_city() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         self.age = self.init_age() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         self.people_sub_option_ids = self.marketing_db.select(self.sql_10) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         self.crowd_contain_sub_option_ids = self.get_crowd_contain_sub_option_ids() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -514,6 +515,13 @@ class Mvp: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if people_info[0] == city_1 and people_info[1] == age_1 and people_info[2] == crowd_1: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return id_1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    def update_image(self): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        """ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            更新标签关联的图片信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        :return: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        """ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        pass 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     def update_icon(self): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         """ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             标签关联图标 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -847,24 +855,21 @@ class Mvp: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         d = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         e = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         f = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        result_1 = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for rt in result: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            result_1.append([rt.uuid, rt.city, rt.age, rt.crowd, rt.sex]) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            # crowds = rt.crowd 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            # if 'A' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            #     a += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            # if 'B' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            #     b += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            # if 'C' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            #     c += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            # if 'D' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            #     d += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            # if 'E' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            #     e += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            # if 'F' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            #     f += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return result_1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        # return {'A': a, 'B': b, 'C': b, 'D': d, 'E': e, 'F': f} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            crowds = rt.crowd 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if 'A' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                a += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if 'B' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                b += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if 'C' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                c += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if 'D' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                d += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if 'E' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                e += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if 'F' in crowds: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                f += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return {'A': a, 'B': b, 'C': b, 'D': d, 'E': e, 'F': f} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     def get_crowd_people(self): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         result = {} 
			 |