Merge branch 'ft' into 'main_dev'

fix(external/Componse): 修复三个小标题渐变ID值重复问题 See merge request yunteng/thingskit-view!34

Merge branch 'ft' into 'main_dev'
fix(external/Componse): 修复三个小标题渐变ID值重复问题 See merge request yunteng/thingskit-view!34
xp.Huang
2 parents 6d1c87fb 1dc01d4d
Showing 5 changed files with 22 additions and 20 deletions
src/components/external/GoUserInfo/index.vue
src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/index.vue
src/packages/components/external/Composes/Mores/Camera/index.vue
src/packages/components/external/Composes/Mores/Title2/index.vue
src/packages/components/external/Composes/Mores/Title3/index.vue
--- a/src/components/external/GoUserInfo/index.vue
View file @ef098c9
+++ b/src/components/external/GoUserInfo/index.vue
View file @ef098c9
@@ -2,7 +2,14 @@
   <n-dropdown trigger="hover" @select="handleSelect" :show-arrow="true" :options="options">
     <div class="user-info-box">
       <person-icon v-if="fallback"></person-icon>
-      <n-avatar v-if="!fallback" round object-fit="cover" size="medium" :src="Person" @error="errorHandle"></n-avatar>
+      <n-avatar
+        v-if="!fallback"
+        round
+        object-fit="cover"
+        size="medium"
+        :src="!avatarLogo ? Person : avatarLogo"
+        @error="errorHandle"
+      ></n-avatar>
     </div>
   </n-dropdown>
@@ -31,6 +38,7 @@ const { dataSyncUpdate } = useSyncRemote()
 const modelShowInfo = ref(false)
 const modelShow = ref(false)
+const avatarLogo = ref('')
 // 是否失败
 const fallback = ref(false)
@@ -39,7 +47,7 @@ const fallback = ref(false)
 const renderUserInfo = () => {
   const userStoreOverride = useUserStore()
   const { username, avatar } = userStoreOverride.getUserInfo
-  console.log(userStoreOverride.getUserInfo)
+  avatarLogo.value = avatar as string
   return h(
     'div',
     {
@@ -49,7 +57,7 @@ const renderUserInfo = () => {
       h(NAvatar, {
         round: true,
         style: 'margin-right: 12px;',
-        src: Person
+        src: !avatar ? Person : avatar
       }),
       h('div', null, [
         h('div', null, [
--- a/src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/index.vue
View file @ef098c9
+++ b/src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/index.vue
View file @ef098c9
@@ -48,12 +48,6 @@ let newData = ref('2021-2-3 08:00:00')
 let timer: any = null
-//默认设置宽高距离位置
-props.chartConfig.attr.w = 1920
-props.chartConfig.attr.h = 148
-props.chartConfig.attr.x = 0
-props.chartConfig.attr.y = 0
-
 watch(
     () => props.chartConfig.option,
     (newData: any) => {
--- a/src/packages/components/external/Composes/Mores/Camera/index.vue
View file @ef098c9
+++ b/src/packages/components/external/Composes/Mores/Camera/index.vue
View file @ef098c9
 <template>
   <div class="go-content-box" :style="{ width: w + 'px', height: h + 'px' }">
-    <video id="my-player" ref="videoRef" class="video-js my-video">
+    <video id="my-player" ref="videoRef" class="video-js my-video vjs-theme-city vjs-big-play-centered">
       <source :src="dataset" />
     </video>
   </div>
--- a/src/packages/components/external/Composes/Mores/Title2/index.vue
View file @ef098c9
+++ b/src/packages/components/external/Composes/Mores/Title2/index.vue
View file @ef098c9
@@ -2,11 +2,11 @@
   <div class="go-content-box">
     <svg :width="w" :height="h" fill="none">
       <defs xmlns="http://www.w3.org/2000/svg">
-        <linearGradient id="linear_title2_u" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
+        <linearGradient id="title2_0" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
           <stop offset="0" :stop-color="attribute.linearColors[0]" stop-opacity="1" />
           <stop offset="1" :stop-color="attribute.linearColors[1]" stop-opacity="1" />
         </linearGradient>
-        <linearGradient id="linear_title2_d" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
+        <linearGradient id="title2_1" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
           <stop offset="0" :stop-color="attribute.linearColors[3]" stop-opacity="1" />
           <stop offset="1" :stop-color="attribute.linearColors[4]" stop-opacity="0" />
         </linearGradient>
@@ -15,7 +15,7 @@
         <path
           id="矩形 title2_u"
           fill-rule="evenodd"
-          fill="url(#linear_title2_u)"
+          fill="url(#title2_0)"
           transform="translate(0 0)  rotate(0 160 15)"
           opacity="1"
           :d="`M2.77,${h} L${w},${h} L${w},0 L${
@@ -24,7 +24,7 @@
         />
         <path
           id="矩形 title2_u"
-          style="stroke: url(#linear_title2_d); stroke-width: 1; stroke-opacity: 100; stroke-dasharray: 0 0"
+          style="stroke: url(#title2_1); stroke-width: 1; stroke-opacity: 100; stroke-dasharray: 0 0"
           transform="translate(0 0)  rotate(0 160 15)"
           :d="`M2.77,${h} L${w},${h} L${w},0 L11.44,0 C10.58,0 9.81,0.55 9.54,1.37 L0.88,27.37 C0.68,27.98 0.78,28.65 1.15,29.17 C1.53,29.69 2.13,30 2.77,30 Z `"
         />
--- a/src/packages/components/external/Composes/Mores/Title3/index.vue
View file @ef098c9
+++ b/src/packages/components/external/Composes/Mores/Title3/index.vue
View file @ef098c9
@@ -2,15 +2,15 @@
   <div class="go-content-box">
     <svg :width="w" :height="h" fill="none">
       <defs>
-        <linearGradient id="linear_0" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
+        <linearGradient id="title3_0" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
           <stop offset="0" :stop-color="attribute.linearColors[0]" stop-opacity="1" />
           <stop offset="1" :stop-color="attribute.linearColors[1]" stop-opacity="1" />
         </linearGradient>
-        <linearGradient id="linear_1" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
+        <linearGradient id="title3_1" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
           <stop offset="0" :stop-color="attribute.linearColors[2]" stop-opacity="1" />
           <stop offset="1" :stop-color="attribute.linearColors[3]" stop-opacity="0" />
         </linearGradient>
-        <linearGradient id="linear_2" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
+        <linearGradient id="title3_2" x1="0%" y1="50%" x2="100%" y2="50%" gradientUnits="objectBoundingBox">
           <stop offset="0" :stop-color="attribute.linearColors[4]" stop-opacity="1" />
           <stop offset="1" :stop-color="attribute.linearColors[5]" stop-opacity="0" />
         </linearGradient>
@@ -19,7 +19,7 @@
         <path
           id="矩形 16"
           fill-rule="evenodd"
-          fill="url(#linear_0)"
+          fill="url(#title3_0)"
           transform="translate(6.249999895402425e-8 2)  rotate(0 160 13)"
           opacity="1"
           :d="`M0,${h - 5} L${w},${h - 5} L${w},0 L0,0 L0,${h - 5} Z`"
@@ -42,13 +42,13 @@
         </g>
         <path
           id="路径 5"
-          style="stroke: url(#linear_1); stroke-width: 1; stroke-opacity: 100; stroke-dasharray: 0 0"
+          style="stroke: url(#title3_1); stroke-width: 1; stroke-opacity: 100; stroke-dasharray: 0 0"
           transform="translate(6.249999895402425e-8 30)  rotate(0 160 0)"
           d="M0,0L320,0 "
         />
         <path
           id="路径 5"
-          style="stroke: url(#linear_2); stroke-width: 1; stroke-opacity: 100; stroke-dasharray: 0 0"
+          style="stroke: url(#title3_2); stroke-width: 1; stroke-opacity: 100; stroke-dasharray: 0 0"
           transform="translate(6.249999895402425e-8 0)  rotate(0 160 0)"
           d="M0,0L320,0 "
         />