feat: 算力分配模块交互完善

src/assets/dataScreen/computePower/bgCenterLeft.svg

@@ -0,0 +1,28 @@
+<svg width="110" height="474" viewBox="0 0 110 474" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M108 2C44.314 69.1667 -47.2221 257.2 96.1208 472" stroke="url(#paint0_linear_9562_48205)"
+    stroke-width="4" />
+  <path opacity="0.3" d="M90 2C26.314 69.1667 -65.2221 257.2 78.1208 472"
+    stroke="url(#paint1_linear_9562_48205)" stroke-width="3" />
+  <path d="M72 237L59 227L59 247L72 237Z" fill="url(#paint2_linear_9562_48205)" />
+  <defs>
+    <linearGradient id="paint0_linear_9562_48205" x1="64" y1="2" x2="64" y2="472"
+      gradientUnits="userSpaceOnUse">
+      <stop stop-color="#2F509D" stop-opacity="0" />
+      <stop offset="0.165" stop-color="#6AA7FF" />
+      <stop offset="0.435" stop-color="#A1E5FF" />
+      <stop offset="0.78" stop-color="#6AA7FF" />
+      <stop offset="0.99" stop-color="#295CA6" stop-opacity="0" />
+    </linearGradient>
+    <linearGradient id="paint1_linear_9562_48205" x1="46" y1="2" x2="46" y2="472"
+      gradientUnits="userSpaceOnUse">
+      <stop stop-color="#1B7FF5" stop-opacity="0" />
+      <stop offset="0.405" stop-color="#1B7FF5" />
+      <stop offset="1" stop-color="#1B7FF5" stop-opacity="0" />
+    </linearGradient>
+    <linearGradient id="paint2_linear_9562_48205" x1="72" y1="237" x2="59" y2="237"
+      gradientUnits="userSpaceOnUse">
+      <stop stop-color="white" />
+      <stop offset="1" stop-color="#0AFEFF" />
+    </linearGradient>
+  </defs>
+</svg>

src/assets/dataScreen/computePower/bgComputerPowerItem.svg

@@ -0,0 +1,64 @@
+<svg width="367" height="612" viewBox="0 0 367 612" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_iii_9562_48219)">
+<path d="M2 594.13V3H350.766L366 21.6778V594.13L352.24 611H18.76L2 594.13Z" fill="#00183E" fill-opacity="0.9"/>
+</g>
+<path d="M2 594.13V3H350.766L366 21.6778V594.13L352.24 611H18.76L2 594.13Z" stroke="#20A0FD" stroke-opacity="0.4" stroke-width="1.5"/>
+<path d="M342 12.88L344.88 10L354 19.12L351.12 22L342 12.88Z" fill="white"/>
+<path d="M311 3H349.86L365 20.6882V50" stroke="#2ABAF0" stroke-width="2"/>
+<g clip-path="url(#clip0_9562_48219)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 1H381.859V51H3V1Z" fill="url(#paint0_linear_9562_48219)"/>
+<line x1="3" y1="50.5" x2="11" y2="50.5" stroke="#3656C8"/>
+<line x1="13" y1="50.5" x2="21" y2="50.5" stroke="#3656C8" stroke-opacity="0.6"/>
+<line x1="23" y1="50.5" x2="31" y2="50.5" stroke="#3656C8" stroke-opacity="0.2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 1H381.859V3H3V1Z" fill="url(#paint1_linear_9562_48219)"/>
+<rect x="3" y="18" width="2" height="16" fill="#3656C8"/>
+</g>
+<path opacity="0.3" d="M342.755 50.0007H31.7021L32.3003 51C32.5818 50.9963 343.13 50.9364 343.1 50.9963L345.739 47.0029C345.739 46.9993 345.299 46 345.299 46L342.755 50.0007Z" fill="#3656C8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M173.927 50H195.073V51H173.927V50Z" fill="url(#paint2_linear_9562_48219)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M342.808 48H356.337L353.359 51H339.83L342.808 48Z" fill="url(#paint3_linear_9562_48219)"/>
+<path d="M2 37V2H74" stroke="#2CCAFF" stroke-width="3"/>
+<defs>
+<filter id="filter0_iii_9562_48219" x="1.25" y="-1.75" width="365.5" height="617.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-4"/>
+<feGaussianBlur stdDeviation="4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.109804 0 0 0 0 0.498039 0 0 0 0 0.94902 0 0 0 0.6 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_9562_48219"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-4"/>
+<feGaussianBlur stdDeviation="4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.109804 0 0 0 0 0.498039 0 0 0 0 0.94902 0 0 0 0.6 0"/>
+<feBlend mode="normal" in2="effect1_innerShadow_9562_48219" result="effect2_innerShadow_9562_48219"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.109804 0 0 0 0 0.498039 0 0 0 0 0.94902 0 0 0 0.6 0"/>
+<feBlend mode="normal" in2="effect2_innerShadow_9562_48219" result="effect3_innerShadow_9562_48219"/>
+</filter>
+<linearGradient id="paint0_linear_9562_48219" x1="3" y1="34.7505" x2="381.859" y2="34.7505" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3252C6" stop-opacity="0"/>
+<stop stop-color="#3252C6" stop-opacity="0.4"/>
+<stop offset="1" stop-color="#3252C6" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_9562_48219" x1="3" y1="2.00164" x2="381.859" y2="2.00164" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3656C8"/>
+<stop offset="1" stop-color="#2994FC" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_9562_48219" x1="184.5" y1="50" x2="184.5" y2="51" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FEF643"/>
+<stop offset="1" stop-color="#FFA217"/>
+</linearGradient>
+<linearGradient id="paint3_linear_9562_48219" x1="348.084" y1="48" x2="348.084" y2="51" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FEF643"/>
+<stop offset="1" stop-color="#FFA217"/>
+</linearGradient>
+<clipPath id="clip0_9562_48219">
+<rect width="363" height="50" fill="white" transform="translate(3 1)"/>
+</clipPath>
+</defs>
+</svg>

src/assets/dataScreen/home/error.svg

@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M12 22C14.7614 22 17.2614 20.8807 19.0711 19.0711C20.8807 17.2614 22 14.7614 22 12C22 9.2386 20.8807 6.7386 19.0711 4.92893C17.2614 3.11929 14.7614 2 12 2C9.2386 2 6.7386 3.11929 4.92893 4.92893C3.11929 6.7386 2 9.2386 2 12C2 14.7614 3.11929 17.2614 4.92893 19.0711C6.7386 20.8807 9.2386 22 12 22Z"
+    fill="white" />
+  <path
+    d="M13 17.25C13 17.8023 12.5523 18.25 12 18.25C11.4477 18.25 11 17.8023 11 17.25C11 16.6977 11.4477 16.25 12 16.25C12.5523 16.25 13 16.6977 13 17.25Z"
+    fill="#E80D0D" stroke="#E80D0D" stroke-width="0.5" />
+  <path d="M12 6V14V6Z" fill="#E80D0D" />
+  <path d="M12 6V14" stroke="#E80D0D" stroke-width="2" stroke-linecap="round"
+    stroke-linejoin="round" />
+</svg>

src/assets/dataScreen/home/online.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 22C14.7614 22 17.2614 20.8807 19.0711 19.0711C20.8807 17.2614 22 14.7614 22 12C22 9.2386 20.8807 6.7386 19.0711 4.92893C17.2614 3.11929 14.7614 2 12 2C9.2386 2 6.7386 3.11929 4.92893 4.92893C3.11929 6.7386 2 9.2386 2 12C2 14.7614 3.11929 17.2614 4.92893 19.0711C6.7386 20.8807 9.2386 22 12 22Z" fill="white"/>
+<path d="M8 12L11 15L17 9" stroke="#52C41A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

src/assets/dataScreen/home/outline.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 0C4.47713 0 0 4.47715 0 10C0 15.5229 4.47713 20 10 20C15.5229 20 20 15.5229 20 10C20 4.47715 15.5229 0 10 0ZM15.3891 14.2784L14.2784 15.3891L10 11.1106L5.72156 15.3891L4.61094 14.2784L8.88937 10L4.61094 5.72156L5.72156 4.61094L10 8.88937L14.2785 4.61094L15.3891 5.72156L11.1106 10L15.3891 14.2784Z" fill="white"/>
+</svg>

src/assets/dataScreen/home/process.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.2671 0.0655826C4.51398 -0.693915 -1.09236 5.25549 0.181805 12.091C0.946306 16.015 4.13173 19.053 8.08165 19.8125C14.9622 21.0784 20.6959 15.7619 19.9314 9.05298C19.5492 4.3694 15.8541 0.571915 11.2671 0.0655826ZM9.48323 13.8631H6.9349V6.26815H9.48323V13.8631ZM13.3057 13.8631H10.7574V6.26815H13.3057V13.8631Z" fill="white"/>
+</svg>

src/components/DsBox/src/dsBox2.tsx

@@ -10,8 +10,8 @@
  * @背景框尺寸说明
  *
  * 1、整体框
- * w1 1856px w2 1392px w3 430px
+ * w1 1856px w2 1392px w3 430px w4 364px
- * h1 788px  h2 763px
+ * h1 788px  h2 763px h3 608px
  * 默认标题
  */
 
@@ -71,6 +71,12 @@ export default defineComponent({
             height: "788px"
           };
           break;
+        case "w4h3":
+          options = {
+            width: "364px",
+            height: "608px"
+          };
+          break;
         default:
           options = {
             width: "100%",

src/pages/dataScreen/components/deviceStatus.vue

@@ -2,16 +2,16 @@
  * @Author: donghao donghao@supervision.ltd
  * @Date: 2024-01-12 13:27:07
  * @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-02-28 15:48:31
+ * @LastEditTime: 2024-02-28 16:24:16
  * @FilePath: \General-AI-Platform-Web-Client\src\views\workbench\components\DeviceStatus.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <script setup lang="ts">
 import { ref } from "vue";
-import deviceStatusOnline from "@/assets/svg/deviceStatus/online.svg?component";
+import deviceStatusOnline from "@/assets/dataScreen/home/online.svg?component";
-import deviceStatusProcess from "@/assets/svg/deviceStatus/process.svg?component";
+import deviceStatusProcess from "@/assets/dataScreen/home/process.svg?component";
-import deviceStatusError from "@/assets/svg/deviceStatus/error.svg?component";
+import deviceStatusError from "@/assets/dataScreen/home/error.svg?component";
-import deviceStatusOutline from "@/assets/svg/deviceStatus/outline.svg?component";
+import deviceStatusOutline from "@/assets/dataScreen/home/outline.svg?component";
 defineOptions({
   name: "DeviceStatus"
 });

src/pages/dataScreen/views/computePowerAllocation/components/computePowerCube.vue

@@ -2,7 +2,7 @@
  * @Author: donghao donghao@supervision.ltd
  * @Date: 2024-01-19 09:38:33
  * @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-02-26 16:55:24
+ * @LastEditTime: 2024-02-28 16:58:22
  * @FilePath: \General-AI-Platform-Web-Client\src\views\demo\cube.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -58,21 +58,7 @@ const fetchPathValByHeight = val => {
             class="bg_cube"
             :style="{ height: v.value + 'px', background: v.bgColor }"
           >
-            <div v-if="v.type === 0">
+            <DsTag1 :info="v" />
-              <DsTag1 :type="4" :info="v" />
-            </div>
-            <div v-if="v.type === 1">
-              <DsTag1 :type="4" :info="v" />
-            </div>
-            <div v-if="v.type === 2">
-              <DsTag1 :type="4" :info="v" />
-            </div>
-            <div v-if="v.type === 3">
-              <DsTag1 :type="3" :info="v" />
-            </div>
-            <div v-if="v.type === 4">
-              <DsTag1 :type="4" :info="v" />
-            </div>
           </div>
         </li>
         <li>

src/pages/dataScreen/views/computePowerAllocation/computePowerAllocation.scss

@@ -1,4 +1,4 @@
-.computePowerAllocation_wrap {
+.ds_computePowerAllocation_wrap {
   // height: 100%;
   // width: 100vw;
   padding: 45px 32px;
@@ -53,7 +53,7 @@
   }
 
   .computePower_banner {
-    padding: 0px 24px 0;
+    // padding: 0px 24px 0;
     .banner_item_box {
       padding-top: 99px;
     }
@@ -74,6 +74,12 @@
             height: 26px;
             background: url("@/assets/computePower/type1.svg") no-repeat 0 0;
           }
+          .cp_bg_logo_icon_0 {
+            width: 44px;
+            height: 16px;
+            background: url("@/assets/computePower/ruiyinweilogo.svg") no-repeat
+              0 0;
+          }
 
           .bg_banner_group_logo {
             width: 316px;
@@ -97,10 +103,22 @@
     //   background-repeat: no-repeat;
     //   background-size: contain;
     // }
+
+    .device_icons {
       .device-icon-box {
         width: 587px;
         height: 592px;
       }
+      .bg_device_inner {
+        width: 88px;
+        height: 470px;
+        background: url("@/assets/dataScreen/computePower/bgCenterLeft.svg")
+          no-repeat;
+      }
+      .bg_device_inner_right {
+        transform: rotateY(180deg);
+      }
+    }
 
     .banner_right {
       .computePowerCube_wrap {
@@ -113,7 +131,13 @@
     }
   }
 
+  .bg_computerPower_item {
+    background: url("@/assets/dataScreen/computePower/bgComputerPowerItem.svg")
+      no-repeat;
+  }
+
   .computePower_footer {
     padding: 10px;
+    font-size: 14px;
   }
 }

src/pages/dataScreen/views/computePowerAllocation/computePowerAllocationIndex.vue

@@ -2,7 +2,7 @@
  * @Author: donghao donghao@supervision.ltd
  * @Date: 2024-01-19 09:22:30
  * @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-02-28 10:53:36
+ * @LastEditTime: 2024-02-28 17:27:57
  * @FilePath: \General-AI-Platform-Web-Client\src\views\computePowerAllocation\index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -13,7 +13,7 @@ import ComputePowerType from "./components/computePowerType.vue";
 import { ComputePowerPoolItem } from "./typing";
 import { AnimationPic } from "@/components/AnimationCard";
 import computePowerAllocationIcon from "@/assets/animate/device/computePowerAllocation.json";
-import { DsBox1 } from "@/components/DsBox";
+import { DsBox2 } from "@/components/DsBox";
 
 defineOptions({
   name: "ComputePowerAllocation"
@@ -44,33 +44,73 @@ const groupList = ref<Record<string, any>[]>([
 
 const poolsData: ComputePowerPoolItem[] = [
   {
-    name: "螺纹缺陷检测",
+    name: "焊线颜色检测",
-    type: 4,
+    type: 9,
-    proportion: 25,
+    proportion: 7,
     pretreatmentEfficiency: 20,
-    color: "#3879FE",
+    color: "#014BE6",
     bgColor: "linear-gradient(180deg, #015DE6 0%, #4881F6 100%)"
   },
+  {
+    name: "螺纹缺陷检测",
+    type: 8,
+    proportion: 8,
+    pretreatmentEfficiency: 20,
+    color: "#FAA90B",
+    bgColor: "linear-gradient(180deg, #E64601 0%, #F6A648 100%)"
+  },
+  {
+    name: "PIN间距测量",
+    type: 7,
+    proportion: 4,
+    pretreatmentEfficiency: 15,
+    color: "#EA1281",
+    bgColor: "linear-gradient(180deg, #E60161 0%, #F648E5 100%)"
+  },
   {
     name: "螺纹无牙缺陷检测",
-    type: 3,
+    type: 6,
     proportion: 7,
-    pretreatmentEfficiency: 15,
+    pretreatmentEfficiency: 20,
-    color: "#FAA90B",
+    color: "#FA8616",
     bgColor: "linear-gradient(180deg, #FA8316 0%, #FAAD16 100%)"
   },
   {
     name: "压板缺陷检测",
-    type: 2,
+    type: 5,
-    proportion: 20,
+    proportion: 32,
-    pretreatmentEfficiency: 20,
+    pretreatmentEfficiency: 38,
-    color: "#18CAF9",
+    color: "#F9DB18",
+    bgColor: "linear-gradient(180deg, #FFC56F 0%, #F9E006 100%)"
+  },
+  {
+    name: "划伤缺陷检测",
+    type: 4,
+    proportion: 8,
+    pretreatmentEfficiency: 38,
+    color: "#1CCCFA",
     bgColor: "linear-gradient(180deg, #6FFFFF 0%, #06BEF9 100%)"
   },
+  {
+    name: "披锋（毛刺）缺陷检测",
+    type: 3,
+    proportion: 12,
+    pretreatmentEfficiency: 38,
+    color: "#9E26EE",
+    bgColor: "linear-gradient(180deg, #FF2494 0%, #8D27FF 100%)"
+  },
+  {
+    name: "工件尺寸测量",
+    type: 2,
+    proportion: 7,
+    pretreatmentEfficiency: 38,
+    color: "#6F50F6",
+    bgColor: "linear-gradient(180deg, #6B55F6 0%, #8C38F8 100%)"
+  },
   {
     name: "打孔不良检测",
     type: 1,
-    proportion: 38,
+    proportion: 5,
     pretreatmentEfficiency: 38,
     color: "#24ED75",
     bgColor: "linear-gradient(180deg, #43EA80 0%, #38F8D4 100%)"
@@ -87,13 +127,13 @@ const poolsData: ComputePowerPoolItem[] = [
 </script>
 
 <template>
-  <div class="flex justify-between computePowerAllocation_wrap">
+  <div class="flex justify-between ds_computePowerAllocation_wrap">
     <div class="banner_side banner_side_left" />
 
     <div class="computePowerAllocation_body">
       <div class="flex justify-between computePower_banner">
         <div class="flex items-center align-middle left_box banner_item_box">
-          <DsBox1 title="硬件组成" type="w2h2">
+          <DsBox2 title="硬件组成" type="w4h3" bgClass="bg_computerPower_item">
             <template #default>
               <div class="w-full h-full banner_left">
                 <ul class="banner_group">
@@ -103,7 +143,10 @@ const poolsData: ComputePowerPoolItem[] = [
                     class="flex items-center mb-[16px] mx-[24px]"
                   >
                     <div class="flex items-center px-[16px]">
-                      <div class="cp_bg_logo_icon" />
+                      <div
+                        class="cp_bg_logo_icon"
+                        :class="`cp_bg_logo_icon_${v.type}`"
+                      />
                       <span class="pl-[12px]">{{ v.label }}</span>
                     </div>
                     <div
@@ -114,7 +157,7 @@ const poolsData: ComputePowerPoolItem[] = [
                 </ul>
               </div>
             </template>
-          </DsBox1>
+          </DsBox2>
         </div>
         <div class="banner_center">
           <div class="flex justify-center computePower_header py-[12px]">
@@ -122,21 +165,23 @@ const poolsData: ComputePowerPoolItem[] = [
             <span class="ff1">苏胜天算力资源池</span>
             <div class="title_side title_right" />
           </div>
-          <!-- <div class="bg_banner_center">{{ null }}</div> -->
+          <div class="flex items-center justify-between device_icons">
+            <div class="bg_device_inner bg_device_inner_left" />
             <AnimationPic
               class="device-icon-box"
               :value="computePowerAllocationIcon"
             />
+            <div class="bg_device_inner bg_device_inner_right" />
+          </div>
         </div>
-        <!-- <AnimationPic class="device-icon-box" value="deviceClassify(device)" /> -->
         <div class="flex items-center align-middle right_box banner_item_box">
-          <DsBox1 title="算力配置" type="w2h2">
+          <DsBox2 title="算力配置" type="w4h3" bgClass="bg_computerPower_item">
             <template #default>
               <div class="w-full h-full banner_right">
                 <ComputePowerCube :list="poolsData" />
               </div>
             </template>
-          </DsBox1>
+          </DsBox2>
         </div>
       </div>
       <ul
@@ -145,7 +190,7 @@ const poolsData: ComputePowerPoolItem[] = [
         <li
           v-for="(v, k) in poolsData"
           :key="k"
-          class="flex items-center justify-center mx-[20px]"
+          class="flex items-center justify-center mx-[12px] mb-[8px]"
         >
           <ComputePowerType :info="v" />
         </li>

src/style/vars.scss

@@ -11,6 +11,13 @@ $--theme-color: #154ddd;
   font-style: normal;
 }
 
+@font-face {
+  font-family: "DingTalkJinBuTi";
+  src: url("@/assets/fonts/DingTalkJinBuTi.ttf") format("opentype");
+  font-weight: normal;
+  font-style: normal;
+}
+
 .text-web-font0 {
   color: $--web-font0;
 }
@@ -114,3 +121,7 @@ $--theme-color: #154ddd;
 .ff1 {
   font-family: "DouyinSansBold";
 }
+
+.ff2 {
+  font-family: "DingTalkJinBuTi";
+}