Compare commits
4 Commits
f5c731486a
...
1b595fa0fb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b595fa0fb | ||
|
|
9e17d35f96 | ||
|
|
c48212d3f2 | ||
|
|
212b88f895 |
@ -386,10 +386,10 @@ void CTrendInfoManage::loadDevGroupInfo(CDbApi *pReadDb)
|
|||||||
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())
|
if(!strLoctionFilter.isEmpty())
|
||||||
{
|
{
|
||||||
sqlSequenceQuery.append(QString(" %1 asc,dev_group_no asc,tag_name;").arg(strLoctionFilter));
|
sqlSequenceQuery.append(QString(" rtu_no asc, %1 asc,dev_group_no asc,tag_name;").arg(strLoctionFilter));
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
sqlSequenceQuery.append(QStringLiteral(" dev_group_no asc,tag_name;"));
|
sqlSequenceQuery.append(QStringLiteral(" rtu_no asc, dev_group_no asc,tag_name;"));
|
||||||
}
|
}
|
||||||
query.setForwardOnly(true);
|
query.setForwardOnly(true);
|
||||||
pReadDb->execute(sqlSequenceQuery, query);
|
pReadDb->execute(sqlSequenceQuery, query);
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 787 B After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 392 B After Width: | Height: | Size: 1.8 KiB |