From 2c466497502d35f88ea0492e221da2c246beaab3 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 29 Mar 2023 19:15:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#11008=E3=80=8111180=E3=80=8111184?=
 =?UTF-8?q?=E3=80=8111198=E3=80=8111097?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCollect/Collector/Point/Scan/Table.vue   |  4 ++++
 .../Point/components/BatchUpdate/index.vue       | 12 ++++++++++--
 src/views/DataCollect/Collector/Tree/index.vue   |  6 +++++-
 src/views/DataCollect/Dashboard/tool.ts          | 16 ++++++++--------
 src/views/link/AccessConfig/index.vue            | 10 ++++++----
 src/views/link/Certificate/index.vue             |  2 +-
 src/views/link/DashBoard/components/tool.ts      |  1 +
 src/views/link/Protocol/index.vue                |  6 ++++--
 src/views/link/Type/index.vue                    |  6 ++++--
 9 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index cdb19d27..40b5ca5e 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -26,6 +26,10 @@
                                 required: true,
                                 message: '请输入',
                             },
+                            {
+                                validator: checkLength,
+                                trigger: 'change',
+                            },
                         ]"
                     >
                         <j-input
diff --git a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
index c63d7351..86c0396b 100644
--- a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
@@ -88,7 +88,7 @@
 import type { FormInstance } from 'ant-design-vue';
 import { savePointBatch } from '@/api/data-collect/collector';
 import { Rule } from 'ant-design-vue/lib/form';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, isObject } from 'lodash';
 import { regOnlyNumber } from '../../../data';
 
 const props = defineProps({
@@ -125,7 +125,15 @@ const handleOk = async () => {
     if (ischange) {
         const params = cloneDeep(props.data);
         params.forEach((i: any) => {
-            accessModes.length !== 0 && (i.accessModes = data.accessModes);
+            if (accessModes.length !== 0) {
+                i.accessModes = data.accessModes;
+            } else {
+                if (isObject(i.accessModes)) {
+                    i.accessModes = i.accessModes.map(
+                        (item: any) => item.value,
+                    );
+                }
+            }
             features.length !== 0 && (i.features = data.features);
             if (!!interval) {
                 i.interval = data.interval;
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index 5f7c0fa1..48cd8035 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -28,7 +28,7 @@
                     defualtDataSource.length !== 0 ||
                     defualtDataSource?.[0]?.children?.length !== 0
                 "
-                :height="600"
+                :height="660"
                 defaultExpandAll
             >
                 <template #title="{ name, data }">
@@ -302,6 +302,10 @@ watch(
         }
     }
 
+    :deep(.ant-tree-list-holder-inner) {
+        width: 90%;
+    }
+
     :deep(.ant-tree-treenode) {
         width: 100%;
         .ant-tree-node-content-wrapper {
diff --git a/src/views/DataCollect/Dashboard/tool.ts b/src/views/DataCollect/Dashboard/tool.ts
index ad1fef87..7ca5d408 100644
--- a/src/views/DataCollect/Dashboard/tool.ts
+++ b/src/views/DataCollect/Dashboard/tool.ts
@@ -6,19 +6,19 @@ const getParams = (dt: any) => {
             return {
                 limit: 24,
                 interval: '1h',
-                format: 'HH:mm',
+                format: 'YYYY-MM-dd HH:mm',
             };
         case 'week':
             return {
                 limit: 7,
                 interval: '1d',
-                format: 'MM-dd',
+                format: 'YYYY-MM-dd HH:mm',
             };
         case 'hour':
             return {
                 limit: 60,
                 interval: '1m',
-                format: 'HH:mm',
+                format: 'YYYY-MM-dd HH:mm',
             };
         default:
             const time = dt.time[1] - dt.time[0];
@@ -29,31 +29,31 @@ const getParams = (dt: any) => {
                 return {
                     limit: Math.abs(Math.ceil(time / (60 * 60))),
                     interval: '1m',
-                    format: 'HH:mm',
+                    format: 'YYYY-MM-dd HH:mm',
                 };
             } else if (time > hour && time <= days) {
                 return {
                     limit: Math.abs(Math.ceil(time / hour)),
                     interval: '1h',
-                    format: 'HH:mm',
+                    format: 'YYYY-MM-dd HH:mm',
                 };
             } else if (time > days && time <= days * 7) {
                 return {
                     limit: Math.abs(Math.ceil(time / days / 7)) + 1,
                     interval: '1d',
-                    format: 'YYYY-MM-DD',
+                    format: 'YYYY-MM-dd HH:mm',
                 };
             } else if (time >= year) {
                 return {
                     limit: Math.abs(Math.ceil(time / days / 31)) + 1,
                     interval: '1M',
-                    format: 'yyyy年-M月',
+                    format: 'YYYY-MM-dd HH:mm',
                 };
             } else {
                 return {
                     limit: Math.abs(Math.ceil(time / days)) + 1,
                     interval: '1d',
-                    format: 'MM-dd',
+                    format: 'YYYY-MM-dd HH:mm',
                 };
             }
     }
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index 255ccf75..3fe616b8 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -188,7 +188,7 @@ import {
 } from '@/api/link/accessConfig';
 import { onlyMessage } from '@/utils/comm';
 import { useMenuStore } from 'store/menu';
-import { accessConfigTypeFilter } from '@/utils/setting'
+import { accessConfigTypeFilter } from '@/utils/setting';
 
 const menuStory = useMenuStore();
 const tableRef = ref<Record<string, any>>({});
@@ -304,10 +304,12 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             popConfirm: {
                 title: '确认删除?',
                 onConfirm: async () => {
-                    const res = await remove(data.id);
-                    if (res.success) {
+                    const res: any = await remove(data.id);
+                    if (res.status === 200) {
                         onlyMessage('操作成功', 'success');
                         tableRef.value.reload();
+                    } else {
+                        onlyMessage(res?.message, 'error');
                     }
                 },
             },
@@ -319,7 +321,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
 const getProvidersList = async () => {
     const res: any = await getProviders();
     providersList.value = res.result;
-    providersOptions.value = accessConfigTypeFilter(res.result || [])
+    providersOptions.value = accessConfigTypeFilter(res.result || []);
 };
 getProvidersList();
 
diff --git a/src/views/link/Certificate/index.vue b/src/views/link/Certificate/index.vue
index c573c068..0b218c17 100644
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@@ -80,7 +80,7 @@ const columns = [
             type: 'select',
             options: [
                 {
-                    label: '证书标准',
+                    label: '国际标准',
                     value: 'common',
                 },
             ],
diff --git a/src/views/link/DashBoard/components/tool.ts b/src/views/link/DashBoard/components/tool.ts
index 1618a238..2b32809e 100644
--- a/src/views/link/DashBoard/components/tool.ts
+++ b/src/views/link/DashBoard/components/tool.ts
@@ -99,6 +99,7 @@ export const networkParams = (val: any) => {
                 from: Number(val.time.time[0]),
                 to: Number(val.time.time[1]),
                 limit: _limit,
+                format: 'YYYY-MM-dd HH:mm',
             },
         },
     ];
diff --git a/src/views/link/Protocol/index.vue b/src/views/link/Protocol/index.vue
index 689ea20a..c91982bf 100644
--- a/src/views/link/Protocol/index.vue
+++ b/src/views/link/Protocol/index.vue
@@ -238,10 +238,12 @@ const getActions = (
             popConfirm: {
                 title: '确认删除?',
                 onConfirm: async () => {
-                    const res = await remove(data.id);
-                    if (res.success) {
+                    const res: any = await remove(data.id);
+                    if (res.status === 200) {
                         onlyMessage('操作成功', 'success');
                         tableRef.value.reload();
+                    } else {
+                        onlyMessage(res?.message, 'error');
                     }
                 },
             },
diff --git a/src/views/link/Type/index.vue b/src/views/link/Type/index.vue
index 409a52d3..efdb8755 100644
--- a/src/views/link/Type/index.vue
+++ b/src/views/link/Type/index.vue
@@ -327,10 +327,12 @@ const getActions = (
             popConfirm: {
                 title: '确认删除?',
                 onConfirm: async () => {
-                    const res = await remove(data.id);
-                    if (res.success) {
+                    const res: any = await remove(data.id);
+                    if (res.status === 200) {
                         onlyMessage('操作成功', 'success');
                         tableRef.value.reload();
+                    } else {
+                        onlyMessage(res?.message, 'error');
                     }
                 },
             },