From 0082fa417fb2af9add3406bf05ab3e3e45890c34 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 12 Jun 2025 14:30:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage

---
 src/views/device/components/devicePerShare.vue |   66 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/views/device/components/devicePerShare.vue b/src/views/device/components/devicePerShare.vue
index bc8c5ff..0abf44a 100644
--- a/src/views/device/components/devicePerShare.vue
+++ b/src/views/device/components/devicePerShare.vue
@@ -31,8 +31,8 @@
 export default {
   data() {
     return {
-      deptId:'',
-      deviceSn:'',
+      deptId: '',
+      deviceSn: '',
       form: {},
       query: {},
       loading: true,
@@ -42,11 +42,10 @@
         total: 0,
       },
       selectionList: [],
+      deptTreeData: [],
       option: {
         lazy: true,
         tree: true,
-        height: 'atuo',
-        calcHeight: 32,
         dialogWidth: 750,
         tip: false,
         searchShow: true,
@@ -62,19 +61,19 @@
         column: [
           {
             label: '授权单位',
-            prop: 'dept_id',
+            prop: 'deptId',
             labelWidth: 130,
             type: 'tree',
-            dicData:[],
+            dicData: [],
             props: {
               label: 'name',
               value: 'id',
             },
-            span:24,
-            row:true,
-            hide:true,
-            editDisplay:false,
-            viewDisplay:false,
+            span: 24,
+            row: true,
+            hide: true,
+            editDisplay: false,
+            viewDisplay: false,
             rules: [
               {
                 required: true,
@@ -85,14 +84,14 @@
           },
           {
             label: '授权单位',
-            prop: 'dept_name',
+            prop: 'deptName',
             labelWidth: 130,
-            addDisplay:false,
+            addDisplay: false,
             editDisabled: true,
             search: true,
             searchSpan: 6,
-            span:24,
-            row:true,
+            span: 24,
+            row: true,
             rules: [
               {
                 required: true,
@@ -103,18 +102,18 @@
           },
           {
             label: '授权功能',
-            prop: 'device_per_menu_id',
+            prop: 'devicePerMenuId',
             labelWidth: 130,
             type: 'tree',
-            dicUrl: '/blade-system',
+            dicUrl: '/blade-system/manage/api/v1/devicePerMenu/selectDeviceList',
             props: {
               label: 'name',
               value: 'id',
             },
             multiple: true,
             dataType: 'string',
-            span:24,
-            row:true,
+            span: 24,
+            row: true,
             rules: [
               {
                 required: true,
@@ -125,7 +124,7 @@
           },
           {
             label: '授权时间',
-            prop: 'create_time',
+            prop: 'createTime',
             type: 'date',
             addDisplay: false,
             editDisplay: false,
@@ -133,7 +132,6 @@
             row: true,
             width: 160,
             format: 'YYYY-MM-DD HH:mm:ss',
-            // valueFormat: 'YYYY-MM-DD HH:mm:ss',
           },
         ],
       },
@@ -159,26 +157,28 @@
     },
   },
   methods: {
-    // 初始化数据
     init(data) {
       this.deptId = data.dept_id;
       this.deviceSn = data.device_sn;
       this.getDeptTreeInfo();
       this.getLoadPage(this.page);
     },
-    getDeptTreeInfo(){
-      getDeptTreeByNotItself(this.deptId,this.deviceSn).then(res => {
-        const column = this.findObject(this.option.column, 'dept_id');
+    getDeptTreeInfo() {
+      getDeptTreeByNotItself(this.deptId, this.deviceSn).then(res => {
+        const column = this.findObject(this.option.column, 'deptId');
+        this.deptTreeData = res.data.data;
         column.dicData = res.data.data;
       });
     },
     rowSave(row, done, loading) {
-      row['device_sn'] = this.deviceSn;
+      // 添加毫秒级时间戳
+      row['createTime'] = Date.now();
+      row['deviceSn'] = this.deviceSn;
+
       add(row).then(
         () => {
           this.initFlag = false;
           this.getLoadPage(this.page);
-          // 刷新机构树
           this.getDeptTreeInfo();
           this.$message({
             type: 'success',
@@ -194,7 +194,7 @@
     },
     rowUpdate(row, index, done, loading) {
       row['device_sn'] = this.deviceSn;
-        update(row).then(
+      update(row).then(
         () => {
           this.getLoadPage(this.page);
           this.$message({
@@ -219,7 +219,6 @@
           return remove(row.id);
         })
         .then(() => {
-          // 刷新机构树
           this.getDeptTreeInfo();
           this.getLoadPage(this.page);
           this.$message({
@@ -272,15 +271,18 @@
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.getLoadPage(this.page, this.query); // 添加数据刷新
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.page.currentPage = 1; // 每页条数改变时，重置到第一页
+      this.getLoadPage(this.page, this.query); // 添加数据刷新
     },
     refreshChange() {
       this.getLoadPage(this.page, this.query);
     },
     getLoadPage(page, params = {}) {
-      params['device_sn'] = this.deviceSn;
+      params['deviceSn'] = this.deviceSn;
       this.loading = true;
       getList(page.currentPage, page.pageSize, params).then(res => {
         const data = res.data.data;
@@ -288,6 +290,9 @@
         this.data = data.records;
         this.loading = false;
         this.selectionClear();
+      }).catch(err => {
+        console.error('加载数据失败:', err);
+        this.loading = false;
       });
     },
   },
@@ -301,6 +306,5 @@
 }
 .firmware_status:hover {
   cursor: pointer;
-  /* color: aqua; */
 }
 </style>

--
Gitblit v1.9.3