From dbf7fa1650401f87cb268dea251372c4c38ff44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?=
 <9463626+zhou-junjiezjj@user.noreply.gitee.com>
Date: Mon, 7 Aug 2023 13:34:50 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/device/service/impl/DeviceServiceImpl.java  | 2 +-
 .../main/java/org/nl/acs/device/wql/Qdevice_query_002.wql  | 5 ++---
 acs/nladmin-ui/src/views/acs/device/protocol/index.vue     | 7 +++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
index c51ff77..7feb516 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
@@ -110,7 +110,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
         if (whereJson.get("opc_id") != null) {
             param.put("opc_id", whereJson.get("opc_id"));
         }
-        JSONObject json = WQL.getWO("Qdevice_query_002").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
+        JSONObject json = WQL.getWO("Qdevice_query_002").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "d.device_code,e.extra_name");
         return json;
     }
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql b/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql
index 2f4f6eb..0cb1592 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql
@@ -78,7 +78,7 @@
 	ENDPAGEQUERY
  ENDIF
  IF 输入.flag = "2"
- 	QUERY
+ 	PAGEQUERY
  			SELECT
              	d.device_id,d.device_code,d.driver_code,d.device_type,
              	e.extra_code,e.extra_name,
@@ -100,9 +100,8 @@
                 OPTION 输入.opc_id <> ""
                     d.opc_server_id = 输入.opc_id
                 ENDOPTION
-                ORDER BY d.device_code,e.extra_name
  		ENDSELECT
- 	ENDQUERY
+ 	ENDPAGEQUERY
   ENDIF
 
  IF 输入.flag = "3"
diff --git a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue
index 6283787..163d7a1 100644
--- a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue
@@ -113,6 +113,8 @@
         <el-table-column prop="opc_code" label="OpcServer" />
         <el-table-column prop="plc_code" label="OpcPlc" />
       </el-table>
+      <!--分页组件-->
+      <pagination />
     </div>
   </div>
 </template>
@@ -125,14 +127,15 @@ import { get } from '@/api/system/dictDetail'
 import { selectOpcList } from '@/api/acs/device/opc'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
+import pagination from '@crud/Pagination'
 
 export default {
   name: 'Protocol',
-  components: { crudOperation, rrOperation },
+  components: { crudOperation, rrOperation, pagination },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
-      title: '设备协议', url: 'api/device/protocol', idField: 'id', sort: 'id,desc',
+      title: '设备协议', url: '/api/device/protocol', idField: 'id', sort: 'id,desc',
       optShow: {
         download: false
       }