aixianling
							
						 
					 | 
					
						
						
							
						
						ec729eb1e9
					 | 
					
						
						
							
							BUG 30959
						
						
						
						
						
						
					 | 
					
						2022-08-23 11:27:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						7590a5bcb2
					 | 
					
						
						
							
							减少冗余代码
						
						
						
						
						
						
					 | 
					
						2022-08-23 11:05:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						7bbdaee6d3
					 | 
					
						
						
							
							Merge branch 'dev' into build
						
						
						
						
						
						
						
						# Conflicts:
#	components/AiOkrTree/AiOkrTree.vue
#	project/dv/apps/AppGridDV.vue 
						
						
					 | 
					
						2022-08-23 11:04:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						de190a9076
					 | 
					
						
						
							
							减少冗余代码
						
						
						
						
						
						
					 | 
					
						2022-08-23 10:58:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						efdb76ff0c
					 | 
					
						
						
							
							异常修复
						
						
						
						
						
						
					 | 
					
						2022-08-23 10:53:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						a0d348748c
					 | 
					
						
						
							
							重新构建一遍okr-tree
						
						
						
						
						
						
					 | 
					
						2022-08-23 10:41:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						3c499a1f8d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-08-23 10:39:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						df498efd2f
					 | 
					
						
						
							
							重新构建一遍okr-tree
						
						
						
						
						
						
					 | 
					
						2022-08-23 10:38:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						e445063afc
					 | 
					
						
						
							
							重新构建一遍okr-tree
						
						
						
						
						
						
					 | 
					
						2022-08-23 10:37:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						6561f31e2d
					 | 
					
						
						
							
							css
						
						
						
						
						
						
					 | 
					
						2022-08-23 08:58:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						59542c73b3
					 | 
					
						
						
							
							Merge branch 'dev' into build
						
						
						
						
						
						
						
						# Conflicts:
#	package.json
#	project/dv/apps/AppGridDV.vue 
						
						
					 | 
					
						2022-08-22 18:07:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						f0edad2b97
					 | 
					
						
						
							
							okrtree改成cdn加载
						
						
						
						
						
						
					 | 
					
						2022-08-22 18:04:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						37e37540f8
					 | 
					
						
						
							
							okrtree改成cdn加载
						
						
						
						
						
						
					 | 
					
						2022-08-22 18:03:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shijingjing
							
						 
					 | 
					
						
						
							
						
						8312807917
					 | 
					
						
						
							
							30953
						
						
						
						
						
						
					 | 
					
						2022-08-22 17:51:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						b52c178051
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2022-08-22 17:06:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						8c0f9451b7
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-08-22 16:00:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						0a262cbb25
					 | 
					
						
						
							
							郫都大屏
						
						
						
						
						
						
					 | 
					
						2022-08-22 16:00:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						e7fb16bd70
					 | 
					
						
						
							
							修复状态显示异常
						
						
						
						
						
						
					 | 
					
						2022-08-22 15:24:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						4bb6e3be77
					 | 
					
						
						
							
							Merge branch 'dev' into build
						
						
						
						
						
						
					 | 
					
						2022-08-22 15:23:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						41810a8b80
					 | 
					
						
						
							
							宣发统计
						
						
						
						
						
						
					 | 
					
						2022-08-22 15:03:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						88296e0f3e
					 | 
					
						
						
							
							okrtree
						
						
						
						
						
						
					 | 
					
						2022-08-22 14:39:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						425cb93e8d
					 | 
					
						
						
							
							兼容判断
						
						
						
						
						
						
					 | 
					
						2022-08-22 14:20:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						53ee346ba0
					 | 
					
						
						
							
							上架宣发
						
						
						
						
						
						
					 | 
					
						2022-08-22 11:42:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						fbfa584d55
					 | 
					
						
						
							
							30710
						
						
						
						
						
						
					 | 
					
						2022-08-22 11:30:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						f18a7fd85c
					 | 
					
						
						
							
							调整目录结构使其能够被引用
						
						
						
						
						
						
					 | 
					
						2022-08-22 11:27:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						e67a8c4ac2
					 | 
					
						
						
							
							Merge branch 'dev' into build
						
						
						
						
						
						
					 | 
					
						2022-08-22 11:17:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						dbbd384221
					 | 
					
						
						
							
							调整目录结构使其能够被引用
						
						
						
						
						
						
					 | 
					
						2022-08-22 11:16:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						bca314e635
					 | 
					
						
						
							
							增加web端埋点
						
						
						
						
						
						
					 | 
					
						2022-08-22 11:09:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						2d834a57d5
					 | 
					
						
						
							
							宣发统计
						
						
						
						
						
						
					 | 
					
						2022-08-22 10:44:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						7b5841122e
					 | 
					
						
						
							
							更新引入路径为相对路径
						
						
						
						
						
						
					 | 
					
						2022-08-22 09:28:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						58ec778b3e
					 | 
					
						
						
							
							Merge branch 'dev' into build
						
						
						
						
						
						
					 | 
					
						2022-08-19 13:55:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						a8041026a9
					 | 
					
						
						
							
							临时处理一下
						
						
						
						
						
						
					 | 
					
						2022-08-19 13:55:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						c04bcbf90e
					 | 
					
						
						
							
							大屏组件做一下切割
						
						
						
						
						
						
					 | 
					
						2022-08-19 13:54:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						89b39916d7
					 | 
					
						
						
							
							构建版产品库组件整合
						
						
						
						
						
						
					 | 
					
						2022-08-19 13:39:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						b388d03536
					 | 
					
						
						
							
							Merge branch 'dev' into build
						
						
						
						
						
						
					 | 
					
						2022-08-19 11:54:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						e6c3c1c857
					 | 
					
						
						
							
							BUG 30939
						
						
						
						
						
						
					 | 
					
						2022-08-19 11:12:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						37df0942ff
					 | 
					
						
						
							
							BUG 30868
						
						
						
						
						
						
					 | 
					
						2022-08-19 11:03:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						3f51798bc1
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-08-19 10:32:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						85e34eda3d
					 | 
					
						
						
							
							增加信息标注
						
						
						
						
						
						
					 | 
					
						2022-08-19 10:32:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						329f7562db
					 | 
					
						
						
							
							回调
						
						
						
						
						
						
					 | 
					
						2022-08-19 10:24:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						a80efb09c0
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-08-19 09:42:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						122d12fec0
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2022-08-19 09:42:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						17bc8ad651
					 | 
					
						
						
							
							30941
						
						
						
						
						
						
					 | 
					
						2022-08-19 09:15:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						587028883a
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2022-08-19 09:01:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuye
							
						 
					 | 
					
						
						
							
						
						79bfd71a8e
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2022-08-19 09:00:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						8aae3b84a5
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2022-08-18 18:33:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						238a6807ac
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-08-18 18:25:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						49bd61c376
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2022-08-18 18:24:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						097b434712
					 | 
					
						
						
							
							更换列表上标绘接口
						
						
						
						
						
						
					 | 
					
						2022-08-18 17:36:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						392ffee1ea
					 | 
					
						
						
							
							Merge branch 'dev' into build
						
						
						
						
						
						
						
						# Conflicts:
#	package.json
#	vue.config.js 
						
						
					 | 
					
						2022-08-18 17:33:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |