|  | @@ -5,6 +5,7 @@
 | 
	
		
			
				|  |  |  #include "NavBar.h"
 | 
	
		
			
				|  |  |  #include "Resource.h"
 | 
	
		
			
				|  |  |  #include "CTSManager.h"
 | 
	
		
			
				|  |  | +#include "Database.h"
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  class CNvaBarMenuButton : public CMFCToolBarMenuButton
 | 
	
		
			
				|  |  |  {
 | 
	
	
		
			
				|  | @@ -195,53 +196,40 @@ void CNavbar::InitNavCtrl()
 | 
	
		
			
				|  |  |  	delete pBitmap;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	//先创建ListCtrl (m_MyFriendListCtrl)
 | 
	
		
			
				|  |  | -	if (m_NavQuarter.Create(LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_OWNERDRAWFIXED | LVS_SHOWSELALWAYS | WS_CHILD,
 | 
	
		
			
				|  |  | -		CRect(0, 0, 0, 0), &m_DrawerCtrl, 50001))
 | 
	
		
			
				|  |  | +	if (m_NavQuarter.Create(LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_OWNERDRAWFIXED | LVS_SHOWSELALWAYS | WS_CHILD, CRect(0, 0, 0, 0), &m_DrawerCtrl, 50001))
 | 
	
		
			
				|  |  |  	{
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  		m_NavQuarter.SetExtendedStyle(m_NavQuarter.GetExtendedStyle() | LVS_EX_FULLROWSELECT);
 | 
	
		
			
				|  |  |  		m_NavQuarter.SetImageList(&m_listImage, LVSIL_SMALL);
 | 
	
		
			
				|  |  | -		m_NavQuarter.InsertColumn(0, "名字", LVCFMT_LEFT);
 | 
	
		
			
				|  |  | -		//m_NavQuarter.SetColumnWidth(0 ,100);
 | 
	
		
			
				|  |  | -		//往ListCtrl 中添加好友
 | 
	
		
			
				|  |  | -		for (int i = 0; i < 100; i++)
 | 
	
		
			
				|  |  | +		m_NavQuarter.InsertColumn(0, "季度", LVCFMT_LEFT);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +		// 查询季度表;
 | 
	
		
			
				|  |  | +		int i = 0;
 | 
	
		
			
				|  |  | +		std::vector<STQuarter> vtQuarter;
 | 
	
		
			
				|  |  | +		CDatabase::GetInstance()->QueryQuarter(vtQuarter);
 | 
	
		
			
				|  |  | +		for ( std::vector<STQuarter>::iterator it = vtQuarter.begin(); it != vtQuarter.end(); it++ )
 | 
	
		
			
				|  |  |  		{
 | 
	
		
			
				|  |  | -			CString strTemp = _T("");
 | 
	
		
			
				|  |  |  			LUSERITEM userInfo = { 0 };
 | 
	
		
			
				|  |  | -			strTemp.Format("季度:%d", i);
 | 
	
		
			
				|  |  | -			userInfo.szUserID = strTemp.GetBuffer(strTemp.GetLength());
 | 
	
		
			
				|  |  | -			strTemp.ReleaseBuffer();
 | 
	
		
			
				|  |  | -			userInfo.szNoticeMsg = _T("RTK2851!");
 | 
	
		
			
				|  |  | -			m_NavQuarter.InsertItem(i, strTemp, i, &userInfo);//第三个参数 Index of the ImageList
 | 
	
		
			
				|  |  | -			m_NavQuarter.SetItemData(i, (i % 2) ? i | CNavListCtrl::TVS_EMAIL : i);
 | 
	
		
			
				|  |  | +			userInfo.szNoticeMsg = _T("季度品牌");
 | 
	
		
			
				|  |  | +			m_NavQuarter.InsertItem(i, it->name.c_str(), i, &userInfo);//第三个参数 Index of the ImageList
 | 
	
		
			
				|  |  | +			i++;
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	if (m_NavOthers.Create(LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_OWNERDRAWFIXED | LVS_SHOWSELALWAYS | WS_CHILD,
 | 
	
		
			
				|  |  | -		CRect(0, 0, 0, 0), &m_DrawerCtrl, 50002))
 | 
	
		
			
				|  |  | +	if (m_NavOthers.Create(LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_OWNERDRAWFIXED | LVS_SHOWSELALWAYS | WS_CHILD, CRect(0, 0, 0, 0), &m_DrawerCtrl, 50002))
 | 
	
		
			
				|  |  |  	{
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  		m_NavOthers.SetExtendedStyle(m_NavOthers.GetExtendedStyle() | LVS_EX_FULLROWSELECT);
 | 
	
		
			
				|  |  |  		m_NavOthers.SetImageList(&m_listImage, LVSIL_SMALL);
 | 
	
		
			
				|  |  |  		m_NavOthers.InsertColumn(0, "名字", LVCFMT_LEFT);
 | 
	
		
			
				|  |  | -		//m_NavOthers.SetColumnWidth(0 ,100);
 | 
	
		
			
				|  |  |  		
 | 
	
		
			
				|  |  |  		CString strTemp = _T("");
 | 
	
		
			
				|  |  |  		LUSERITEM userInfo = { 0 };
 | 
	
		
			
				|  |  |  		userInfo.szUserID = strTemp.GetBuffer(strTemp.GetLength());
 | 
	
		
			
				|  |  |  		strTemp.ReleaseBuffer();
 | 
	
		
			
				|  |  |  		userInfo.szNoticeMsg = _T("RTK2851!");
 | 
	
		
			
				|  |  | -		m_NavOthers.InsertItem(0, _T("品牌"), 0, &userInfo);//第三个参数 Index of the ImageList
 | 
	
		
			
				|  |  | -		m_NavOthers.SetItemData(0, CNavListCtrl::TVS_EMAIL);
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -		m_NavOthers.InsertItem(1, _T("分支"), 1, &userInfo);//第三个参数 Index of the ImageList
 | 
	
		
			
				|  |  | -		m_NavOthers.SetItemData(1, CNavListCtrl::TVS_EMAIL);
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -		m_NavOthers.InsertItem(2, _T("机芯"), 2, &userInfo);//第三个参数 Index of the ImageList
 | 
	
		
			
				|  |  | -		m_NavOthers.SetItemData(2, CNavListCtrl::TVS_EMAIL);
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -		m_NavOthers.InsertItem(3, _T("日志"), 3, &userInfo);//第三个参数 Index of the ImageList
 | 
	
		
			
				|  |  | -		m_NavOthers.SetItemData(3, CNavListCtrl::TVS_EMAIL);
 | 
	
		
			
				|  |  | +		m_NavOthers.InsertItem(0, _T("机芯"), 0, &userInfo);
 | 
	
		
			
				|  |  | +		m_NavOthers.InsertItem(1, _T("品牌"), 0, &userInfo);
 | 
	
		
			
				|  |  | +		m_NavOthers.InsertItem(2, _T("分支"), 1, &userInfo);
 | 
	
		
			
				|  |  | +		m_NavOthers.InsertItem(3, _T("日志"), 3, &userInfo);
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	m_DrawerCtrl.AddFolderBar(_T("季度"), &m_NavQuarter, 0);
 |