Compare commits

...

4 Commits

Author SHA1 Message Date
shijianquan
1b595fa0fb [M]修改图标 2025-09-09 16:44:57 +08:00
shijianquan
9e17d35f96 Merge branch 'master' of http://47.103.159.168:10012/GZHM/HM-SPMS 2025-09-09 16:42:08 +08:00
shijianquan
c48212d3f2 Merge branch 'master' of http://47.103.159.168:10012/GZHM/HM-SPMS 2025-08-21 10:18:22 +08:00
shijianquan
212b88f895 [M]增加设备组排序优先按rtu号 2025-08-21 10:05:44 +08:00
21 changed files with 3 additions and 3 deletions

View File

@ -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);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 1.8 KiB