Compare commits
No commits in common. "1b595fa0fb9868dd2280c2b37c60d99d60fbaf1d" and "f5c731486a62c791a5a985ca2ea94ee5530a8e5c" have entirely different histories.
1b595fa0fb
...
f5c731486a
@ -383,13 +383,13 @@ void CTrendInfoManage::loadDevGroupInfo(CDbApi *pReadDb)
|
||||
{
|
||||
return ;
|
||||
}
|
||||
QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3 order by ");
|
||||
QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3 order by");
|
||||
if(!strLoctionFilter.isEmpty())
|
||||
{
|
||||
sqlSequenceQuery.append(QString(" rtu_no asc, %1 asc,dev_group_no asc,tag_name;").arg(strLoctionFilter));
|
||||
sqlSequenceQuery.append(QString(" %1 asc,dev_group_no asc,tag_name;").arg(strLoctionFilter));
|
||||
}else
|
||||
{
|
||||
sqlSequenceQuery.append(QStringLiteral(" rtu_no asc, dev_group_no asc,tag_name;"));
|
||||
sqlSequenceQuery.append(QStringLiteral(" dev_group_no asc,tag_name;"));
|
||||
}
|
||||
query.setForwardOnly(true);
|
||||
pReadDb->execute(sqlSequenceQuery, query);
|
||||
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 787 B |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 392 B |