From 61b48b50ca2d807f372242a0a5603ebfaa7767b4 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Fri, 17 Mar 2023 14:48:59 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E8=BF=90=E7=BB=B4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=20=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=A0=87=E9=A2=98=E7=9C=81=E7=95=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DataCollect/Channel/data.ts         | 13 -------
 src/views/DataCollect/Channel/index.vue       | 28 ++++++---------
 .../Point/components/BatchUpdate/index.vue    | 11 +++---
 src/views/link/AccessConfig/data.ts           | 12 -------
 src/views/link/AccessConfig/index.vue         | 34 +++++++++----------
 src/views/link/Protocol/index.vue             | 29 +++++++---------
 src/views/link/Type/data.ts                   | 11 ------
 src/views/link/Type/index.vue                 | 24 ++++++++-----
 src/views/media/Stream/index.vue              | 29 +++++++++-------
 9 files changed, 77 insertions(+), 114 deletions(-)

diff --git a/src/views/DataCollect/Channel/data.ts b/src/views/DataCollect/Channel/data.ts
index 158b211e..630e903e 100644
--- a/src/views/DataCollect/Channel/data.ts
+++ b/src/views/DataCollect/Channel/data.ts
@@ -37,19 +37,6 @@ export const updateStatus = {
     },
 };
 
-export const TiTlePermissionButtonStyle = {
-    padding: 0,
-    'max-width': 'calc(100% - 90px)',
-    color: ' #1890ff !important',
-    'font-weight': 700,
-    'font-size': '16px',
-    overflow: 'hidden',
-    'text-overflow': 'ellipsis',
-    'white-space': 'nowrap',
-    width: 'calc(100%-150px)',
-    // width: '60%',
-};
-
 export const regOnlyNumber = new RegExp(/^\d+$/);
 
 export const regIP = new RegExp(
diff --git a/src/views/DataCollect/Channel/index.vue b/src/views/DataCollect/Channel/index.vue
index 5edbe4f6..e0dce96c 100644
--- a/src/views/DataCollect/Channel/index.vue
+++ b/src/views/DataCollect/Channel/index.vue
@@ -45,15 +45,16 @@
                         </template>
                         <template #content>
                             <div class="card-item-content">
-                                <PermissionButton
-                                    type="link"
-                                    @click="handlEye(slotProps.id)"
-                                    hasPermission="DataCollect/Collector:view"
-                                    :style="TiTlePermissionButtonStyle"
-                                >
-                                    {{ slotProps.name }}
-                                </PermissionButton>
-
+                                <Ellipsis style="width: calc(100% - 100px)">
+                                    <span
+                                        style="
+                                            font-size: 16px;
+                                            font-weight: 600;
+                                        "
+                                    >
+                                        {{ slotProps.name }}
+                                    </span>
+                                </Ellipsis>
                                 <j-row class="card-item-content-box">
                                     <j-col :span="12">
                                         <div class="card-item-content-text">
@@ -126,11 +127,7 @@ import type { ActionsType } from '@/components/Table/index';
 import { getImage } from '@/utils/comm';
 import { query, remove, update } from '@/api/data-collect/channel';
 import { onlyMessage } from '@/utils/comm';
-import {
-    TiTlePermissionButtonStyle,
-    StatusColorEnum,
-    updateStatus,
-} from './data';
+import { StatusColorEnum, updateStatus } from './data';
 import { useMenuStore } from 'store/menu';
 import Save from './Save/index.vue';
 import _ from 'lodash';
@@ -279,9 +276,6 @@ const handlEdit = (data: object) => {
     current.value = _.cloneDeep(data);
     visible.value = true;
 };
-const handlEye = (id: string) => {
-    menuStory.jumpPage(`DataCollect/Collector`, {}, { channelId: id });
-};
 const saveChange = (value: object) => {
     visible.value = false;
     current.value = {};
diff --git a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
index b401a9c4..c63d7351 100644
--- a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
@@ -1,4 +1,4 @@
-<template lang="">
+<template>
     <j-modal
         title="批量编辑"
         :visible="true"
@@ -6,9 +6,8 @@
         @cancel="handleCancel"
     >
         <div class="sizeText">
-            将批量修改{{
-                data.length
-            }}条数据的访问类型、采集频率、只推送变化的数据
+            将批量修改
+            {{ data.length }} 条数据的访问类型、采集频率、只推送变化的数据
         </div>
         <j-form
             class="form"
@@ -62,7 +61,7 @@
                 />
             </j-form-item>
 
-            <j-form-item label="" :name="['features']">
+            <j-form-item :name="['features']">
                 <j-checkbox-group v-model:value="formData.features">
                     <j-checkbox value="changedOnly" name="type"
                         >只推送变化的数据</j-checkbox
@@ -119,7 +118,7 @@ const checkLength = (_rule: Rule, value: string): Promise<any> =>
     });
 
 const handleOk = async () => {
-    const data: any = await formRef.value?.validate();
+    const data = cloneDeep(formData.value);
     const { accessModes, features, interval } = data;
     const ischange =
         accessModes.length !== 0 || features.length !== 0 || !!interval;
diff --git a/src/views/link/AccessConfig/data.ts b/src/views/link/AccessConfig/data.ts
index 4b92ebe1..f2c9ec7b 100644
--- a/src/views/link/AccessConfig/data.ts
+++ b/src/views/link/AccessConfig/data.ts
@@ -115,17 +115,6 @@ const ColumnsHTTP = [
     },
 ];
 
-const TiTlePermissionButtonStyle = {
-    padding: 0,
-    'max-width': 'calc(100% - 90px)',
-    color: ' #1890ff !important',
-    'font-weight': 700,
-    'font-size': '16px',
-    overflow: 'hidden',
-    'text-overflow': 'ellipsis',
-    'white-space': 'nowrap',
-};
-
 export {
     NetworkTypeMapping,
     ProtocolMapping,
@@ -133,5 +122,4 @@ export {
     descriptionList,
     ColumnsMQTT,
     ColumnsHTTP,
-    TiTlePermissionButtonStyle,
 };
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index d33cf243..7402e516 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -53,15 +53,23 @@
                         </template>
                         <template #content>
                             <div class="card-item-content">
-                                <PermissionButton
-                                    type="link"
-                                    @click="handlEye(slotProps.id)"
-                                    hasPermission="link/AccessConfig:view"
-                                    :style="TiTlePermissionButtonStyle"
+                                <Ellipsis
+                                    style="
+                                        width: calc(100% - 100px);
+                                        margin-bottom: 10px;
+                                        color: #2f54eb;
+                                    "
                                 >
-                                    {{ slotProps.name }}
-                                </PermissionButton>
-
+                                    <span
+                                        style="
+                                            font-size: 16px;
+                                            font-weight: 600;
+                                        "
+                                        @click.stop="handlEye(slotProps.id)"
+                                    >
+                                        {{ slotProps.name }}
+                                    </span>
+                                </Ellipsis>
                                 <j-row class="card-item-content-box">
                                     <j-col
                                         :span="12"
@@ -176,7 +184,6 @@ import {
 } from '@/api/link/accessConfig';
 import { onlyMessage } from '@/utils/comm';
 import { useMenuStore } from 'store/menu';
-import { TiTlePermissionButtonStyle } from './data';
 
 const menuStory = useMenuStore();
 const tableRef = ref<Record<string, any>>({});
@@ -368,15 +375,6 @@ const handleSearch = (e: any) => {
 
 .card-item-content {
     min-height: 100px;
-
-    .card-item-content-title-a {
-        color: #1890ff !important;
-        font-weight: 700;
-        font-size: 16px;
-        overflow: hidden; //超出的文本隐藏
-        text-overflow: ellipsis; //溢出用省略号显示
-        white-space: nowrap; //溢出不换行
-    }
     .card-item-content-box {
         min-height: 50px;
     }
diff --git a/src/views/link/Protocol/index.vue b/src/views/link/Protocol/index.vue
index 04d579f9..499e1811 100644
--- a/src/views/link/Protocol/index.vue
+++ b/src/views/link/Protocol/index.vue
@@ -40,16 +40,21 @@
                         </template>
                         <template #content>
                             <div class="card-item-content">
-                                <j-tooltip>
-                                    <template #title>
-                                        {{ slotProps.name }}
-                                    </template>
-                                    <h3
-                                        class="card-item-content-title card-item-content-title-a"
+                                <Ellipsis
+                                    style="
+                                        width: calc(100% - 100px);
+                                        margin-bottom: 10px;
+                                    "
+                                >
+                                    <span
+                                        style="
+                                            font-size: 16px;
+                                            font-weight: 600;
+                                        "
                                     >
                                         {{ slotProps.name }}
-                                    </h3>
-                                </j-tooltip>
+                                    </span>
+                                </Ellipsis>
                                 <j-row class="card-item-content-box">
                                     <j-col
                                         :span="12"
@@ -291,14 +296,6 @@ const handleSearch = (e: any) => {
 .card-item-content {
     min-height: 100px;
 
-    .card-item-content-title-a {
-        color: #000 !important;
-        font-weight: 700;
-        font-size: 16px;
-        overflow: hidden; //超出的文本隐藏
-        text-overflow: ellipsis; //溢出用省略号显示
-        white-space: nowrap; //溢出不换行
-    }
     .card-item-content-box {
         min-height: 50px;
     }
diff --git a/src/views/link/Type/data.ts b/src/views/link/Type/data.ts
index 89fade29..00ac3bc3 100644
--- a/src/views/link/Type/data.ts
+++ b/src/views/link/Type/data.ts
@@ -307,14 +307,3 @@ export const Rules = {
         },
     ],
 };
-
-export const TiTlePermissionButtonStyle = {
-    padding: 0,
-    'max-width': 'calc(100% - 90px)',
-    color: ' #1890ff !important',
-    'font-weight': 700,
-    'font-size': '16px',
-    overflow: 'hidden',
-    'text-overflow': 'ellipsis',
-    'white-space': 'nowrap',
-};
diff --git a/src/views/link/Type/index.vue b/src/views/link/Type/index.vue
index 78899a2a..40fa9f47 100644
--- a/src/views/link/Type/index.vue
+++ b/src/views/link/Type/index.vue
@@ -52,14 +52,23 @@
                         </template>
                         <template #content>
                             <div class="card-item-content">
-                                <PermissionButton
-                                    type="link"
-                                    @click="handlEye(slotProps.id)"
-                                    hasPermission="link/Type:view"
-                                    :style="TiTlePermissionButtonStyle"
+                                <Ellipsis
+                                    style="
+                                        width: calc(100% - 100px);
+                                        margin-bottom: 10px;
+                                        color: #2f54eb;
+                                    "
                                 >
-                                    {{ slotProps.name }}
-                                </PermissionButton>
+                                    <span
+                                        style="
+                                            font-size: 16px;
+                                            font-weight: 600;
+                                        "
+                                        @click.stop="handlEye(slotProps.id)"
+                                    >
+                                        {{ slotProps.name }}
+                                    </span>
+                                </Ellipsis>
                                 <j-row class="card-item-content-box">
                                     <j-col :span="12">
                                         <div class="card-item-content-text">
@@ -166,7 +175,6 @@ import type { ActionsType } from '@/components/Table/index';
 import { getImage } from '@/utils/comm';
 import { supports, query, remove, start, shutdown } from '@/api/link/type';
 import { onlyMessage } from '@/utils/comm';
-import { TiTlePermissionButtonStyle } from './data';
 import { useMenuStore } from 'store/menu';
 
 const menuStory = useMenuStore();
diff --git a/src/views/media/Stream/index.vue b/src/views/media/Stream/index.vue
index 2a366802..8f69be57 100644
--- a/src/views/media/Stream/index.vue
+++ b/src/views/media/Stream/index.vue
@@ -54,12 +54,23 @@
                         </template>
                         <template #content>
                             <div class="card-item-content">
-                                <h3
-                                    @click="handlEye(slotProps.id)"
-                                    class="card-item-content-title card-item-content-title-a"
+                                <Ellipsis
+                                    style="
+                                        width: calc(100% - 100px);
+                                        margin-bottom: 10px;
+                                        color: #2f54eb;
+                                    "
                                 >
-                                    {{ slotProps.name }}
-                                </h3>
+                                    <span
+                                        style="
+                                            font-size: 16px;
+                                            font-weight: 600;
+                                        "
+                                        @click.stop="handlEye(slotProps.id)"
+                                    >
+                                        {{ slotProps.name }}
+                                    </span>
+                                </Ellipsis>
                                 <j-row class="card-item-content-box">
                                     <j-col
                                         :span="8"
@@ -276,14 +287,6 @@ const handleSearch = (e: any) => {
 .card-item-content {
     min-height: 100px;
 
-    .card-item-content-title-a {
-        // color: #000 !important;
-        font-weight: 700;
-        font-size: 16px;
-        overflow: hidden; //超出的文本隐藏
-        text-overflow: ellipsis; //溢出用省略号显示
-        white-space: nowrap; //溢出不换行
-    }
     .card-item-content-box {
         min-height: 50px;
     }