From 60edb1d11b2f667869806502579608a975111130 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Tue, 28 Mar 2023 21:05:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#11085=E3=80=8111130=E3=80=8111081?=
 =?UTF-8?q?=E3=80=8111078=E3=80=8111162=20=E9=87=87=E9=9B=86=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data-collect/collector.ts             |  4 +-
 .../Collector/Point/Scan/Table.vue            |  8 ++--
 .../DataCollect/Collector/Point/Scan/Tree.vue | 20 +++++++--
 .../Collector/Point/Scan/index.vue            |  2 +-
 .../DataCollect/Collector/Point/index.vue     | 44 ++++++++++++++-----
 .../DataCollect/Collector/Tree/index.vue      |  6 ++-
 src/views/device/Firmware/index.vue           |  8 ++--
 7 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/src/api/data-collect/collector.ts b/src/api/data-collect/collector.ts
index 8f91b4f8..8dadd463 100644
--- a/src/api/data-collect/collector.ts
+++ b/src/api/data-collect/collector.ts
@@ -46,8 +46,8 @@ export const readPoint = (collectorId: string, data: string[]) =>
 export const writePoint = (collectorId: string, data: string[]) =>
     server.post(`/data-collect/collector/${collectorId}/points/_write`, data);
 
-export const queryPointNoPaging = () =>
-    server.post(`/data-collect/point/_query/no-paging`, { paging: false });
+export const queryPointNoPaging = (data: any) =>
+    server.post(`/data-collect/point/_query/no-paging`, data);
 
 export const scanOpcUAList = (data: any) =>
     server.get(
diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index 543bcb5a..51e183f9 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -47,7 +47,11 @@
                         ></j-input>
                     </j-form-item>
                     <div style="margin: -24px 0 0 10px">
-                        {{ record[dataIndex] }}
+                        <Ellipsis style="width: calc(100% - 10px)">
+                            <span>
+                                {{ record[dataIndex] }}
+                            </span>
+                        </Ellipsis>
                     </div>
                 </template>
                 <template v-if="dataIndex === 'accessModes'">
@@ -246,10 +250,8 @@ const changeValue = (index: number, type: string) => {
 };
 
 const changeCheckbox = async (index: number, type: string) => {
-    // console.log(1, getTargetData(index, type).check,getTargetData(index, type));
     //Dom未更新完成，需要用 setTimeout 或者 await nextTick() 处理
     setTimeout(() => {
-        // console.log(2, getTargetData(index, type).check,getTargetData(index, type));
         let startIndex = 0;
         const { dataSource } = modelRef;
         const currentCheck = getTargetData(index, type).check;
diff --git a/src/views/DataCollect/Collector/Point/Scan/Tree.vue b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
index 10b13f72..f506b4a5 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Tree.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
@@ -54,7 +54,6 @@ const props = defineProps({
 const emits = defineEmits(['change']);
 
 const channelId = props.data?.channelId;
-
 const checkedKeys = ref<string[]>([]);
 const selectKeys = ref<string[]>([]);
 const spinning = ref(false);
@@ -166,14 +165,29 @@ const updateTreeData = (list: any, key: string, children: any[]): any[] => {
 
 const getPoint = async () => {
     spinning.value = true;
-    const res: any = await queryPointNoPaging();
+    const res: any = await queryPointNoPaging({
+        paging: false,
+        terms: [
+            {
+                terms: [
+                    {
+                        column: 'collectorId',
+                        value: props.data?.id,
+                    },
+                ],
+            },
+        ],
+    });
     if (res.status === 200) {
         selectKeys.value = res.result.map((item: any) => item.pointKey);
     }
     getScanOpcUAList();
     spinning.value = false;
 };
-getPoint();
+
+onMounted(() => {
+    getPoint();
+});
 
 const getScanOpcUAList = async () => {
     spinning.value = true;
diff --git a/src/views/DataCollect/Collector/Point/Scan/index.vue b/src/views/DataCollect/Collector/Point/Scan/index.vue
index d87a39f7..0509830f 100644
--- a/src/views/DataCollect/Collector/Point/Scan/index.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/index.vue
@@ -1,5 +1,5 @@
 <template lang="">
-    <j-modal title="扫描" :visible="true" width="90%" @cancel="handleCancel">
+    <j-modal title="扫描" :visible="true" width="95%" @cancel="handleCancel">
         <div class="content">
             <Tree
                 :data="treeData"
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 0af577a7..3082c1eb 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -114,15 +114,37 @@
                         </template>
                         <template #action>
                             <div class="card-box-action">
-                                <j-popconfirm
-                                    title="确定删除？"
-                                    @confirm="handlDelete(slotProps.id)"
+                                <PermissionButton
+                                    type="text"
+                                    :tooltip="{
+                                        title: '删除',
+                                    }"
+                                    hasPermission="DataCollect/Collector:delete"
+                                    :popConfirm="{
+                                        title: `确定删除？`,
+                                        onConfirm: () =>
+                                            handlDelete(slotProps.id),
+                                    }"
                                 >
-                                    <a><AIcon type="DeleteOutlined" /></a>
-                                </j-popconfirm>
-                                <a @click="handlEdit(slotProps)"
-                                    ><AIcon type="FormOutlined"
-                                /></a>
+                                    <a
+                                        style="
+                                            font-size: 20px;
+                                            margin-top: -10px;
+                                        "
+                                        ><AIcon type="DeleteOutlined"
+                                    /></a>
+                                </PermissionButton>
+
+                                <PermissionButton
+                                    class="add-btn"
+                                    type="text"
+                                    @click="handlEdit(slotProps)"
+                                    hasPermission="DataCollect/Collector:update"
+                                >
+                                    <a style="font-size: 20px"
+                                        ><AIcon type="FormOutlined"
+                                    /></a>
+                                </PermissionButton>
                             </div>
                         </template>
                         <template #img>
@@ -526,7 +548,7 @@ const saveChange = (value: object) => {
     }
 };
 
-const onSelectChange = (keys: string[]) => {
+const onSelectChange = (keys: string[]) => {    
     _selectedRowKeys.value = [...keys];
 };
 
@@ -647,11 +669,11 @@ const handleSearch = (e: any) => {
         color: #474747;
     }
     .card-box-action {
-        width: 50px;
+        width: 90px;
         display: flex;
         justify-content: space-between;
         align-items: center;
-        font-size: 20px;
+        margin-top: -10px;
     }
     .card-box-content {
         margin-top: 20px;
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index a348df25..5f7c0fa1 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -70,7 +70,7 @@
                                         ? '启用'
                                         : '禁用',
                             }"
-                            hasPermission="DataCollect/Collector:update"
+                            hasPermission="DataCollect/Collector:action"
                             :popConfirm="{
                                 title:
                                     data?.state?.value === 'disabled'
@@ -271,11 +271,13 @@ onMounted(() => {
 
 watch(
     () => selectedKeys.value,
-    (n) => {
+    (n, p) => {
         const key = _.isArray(n) ? n[0] : n;
         if (key) {
             const row = collectorAll.value.find((i: any) => i.id === key);
             emits('change', row);
+        } else {
+            selectedKeys.value = p; // 防止取消
         }
     },
 );
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
index dc87eb89..3dbf35dd 100644
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@@ -31,7 +31,7 @@
                 </template>
                 <template #createTime="slotProps">
                     <span>{{
-                        moment(slotProps.createTime).format(
+                        dayjs(slotProps.createTime).format(
                             'YYYY-MM-DD HH:mm:ss',
                         )
                     }}</span>
@@ -69,7 +69,7 @@
 <script lang="ts" setup name="FirmwarePage">
 import type { ActionsType } from '@/components/Table/index';
 import { query, queryProduct, remove } from '@/api/device/firmware';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import _ from 'lodash';
 import Save from './Save/index.vue';
 import { useMenuStore } from 'store/menu';
@@ -244,9 +244,11 @@ const saveChange = (value: FormDataType) => {
 
 const handlDelete = async (id: string) => {
     const res = await remove(id);
-    if (res.success) {
+    if (res.status === 200) {
         onlyMessage('操作成功', 'success');
         tableRef.value.reload();
+    } else {
+        onlyMessage(res?.message, 'error');
     }
 };