Merge remote-tracking branch 'origin/dev' into dev

src/components/Player/index.vue

@@ -86,3 +86,11 @@ defineExpose({
     paused,
 });
 </script>
+<style lang="less" scoped>
+:deep(.live-player-stretch-btn){
+  display: none;
+}
+:deep(.vjs-icon-spinner){
+  display: none;
+}
+</style>

src/views/Log/Access/index.vue

@@ -25,10 +25,18 @@
                 </j-tag>
             </template>
             <template #username="slotProps">
-                <j-tag color="geekblue">
+                
-                    {{ slotProps.context.userName }}
+                    <!-- <j-tag color="geekblue"> -->  
-                </j-tag>
+                    <div class="userName">
+                        <Ellipsis style="max-width: 100px;">
+                        {{ slotProps.context.userName }}
+                    </Ellipsis>
+                     <!-- </j-tag> -->
+                </div>
             </template>
+                   
+                   
+               
             <template #action="slotProps">
                 <j-space :size="16">
                     <j-tooltip
@@ -92,7 +100,7 @@
             <j-descriptions-item label="请求耗时">
                 {{
                     descriptionsData?.responseTime -
-                    descriptionsData?.responseTime +
+                    descriptionsData?.requestTime +
                     'ms'
                 }}
             </j-descriptions-item>
@@ -276,3 +284,20 @@ const handleSearch = (e: any) => {
     params.value = modifySearchColumnValue(e, column);
 };
 </script>
+<style scoped lang="less">
+.userName{
+    color: #1d39c4;
+    background: #f0f5ff;
+    border-color: #adc6ff;
+    list-style: none;
+    font-feature-settings: 'tnum';
+    display: inline-block;
+    height: auto;
+    margin-right: 8px;
+    padding: 0 7px;
+    font-size: 12px;
+    line-height: 20px;border: 1px solid #d9d9d9;
+    border-radius: 2px;
+    opacity: 1;
+}
+</style>

src/views/device/Product/Detail/DeviceAccess/accessModal.vue

@@ -85,7 +85,7 @@
                 </j-col>
                 <j-col :span="12">
                   <div class="card-item-content-text">协议</div>
-                  <div>{{ slotProps.protocolDetail?.name }}</div>
+                  <Ellipsis style="width:calc(100%-20px)"><div>{{ slotProps.protocolDetail?.name }}</div></Ellipsis>
                 </j-col>
               </j-row>
               <j-row>

src/views/link/AccessConfig/components/Cloud/OneNet.vue

@@ -94,7 +94,7 @@
                                             <template #label>
                                                 通知Token
                                                 <j-tooltip
-                                                    title="填写OneNet数据推送配置中设置的Token"
+                                                    title="OneNet端HTTP推送配置中设置的Token"
                                                 >
                                                     <AIcon
                                                         type="QuestionCircleOutlined"

src/views/media/Cascade/index.vue

@@ -52,9 +52,11 @@
                             </slot>
                         </template>
                         <template #content>
-                            <h3 class="card-item-content-title">
+                            <Ellipsis style="width: calc(100% - 100px);">
+                            <h3 style="font-size: 16px;font-weight: 700;color: #315efb;">
                                 {{ slotProps.name }}
                             </h3>
+                            </Ellipsis>
                             <p>通道数量：{{ slotProps.count || 0 }}</p>
                             <j-badge
                                 :status="