Browse Source

Merge branch 'front-dev'

SyuanYu 1 year ago
parent
commit
93759ba81f
35 changed files with 64 additions and 37 deletions
  1. BIN
      frontend/src/assets/img/anchor/Aima.webp
  2. BIN
      frontend/src/assets/img/anchor/Alitia.webp
  3. BIN
      frontend/src/assets/img/anchor/Cora.webp
  4. BIN
      frontend/src/assets/img/anchor/Elara.webp
  5. BIN
      frontend/src/assets/img/anchor/ITRI-1.webp
  6. BIN
      frontend/src/assets/img/anchor/ITRI-2.webp
  7. BIN
      frontend/src/assets/img/anchor/ITRI-3.webp
  8. BIN
      frontend/src/assets/img/anchor/ITRI_1.webp
  9. BIN
      frontend/src/assets/img/anchor/ITRI_2.webp
  10. BIN
      frontend/src/assets/img/anchor/ITRI_3.webp
  11. BIN
      frontend/src/assets/img/anchor/Sporty.webp
  12. BIN
      frontend/src/assets/img/anchor/syscom.webp
  13. BIN
      frontend/src/assets/img/template/ITRI背景-1.webp
  14. BIN
      frontend/src/assets/img/template/ITRI背景-10.webp
  15. BIN
      frontend/src/assets/img/template/ITRI背景-2.webp
  16. BIN
      frontend/src/assets/img/template/ITRI背景-3.webp
  17. BIN
      frontend/src/assets/img/template/ITRI背景-4.webp
  18. BIN
      frontend/src/assets/img/template/ITRI背景-5.webp
  19. BIN
      frontend/src/assets/img/template/ITRI背景-6.webp
  20. BIN
      frontend/src/assets/img/template/ITRI背景-7.webp
  21. BIN
      frontend/src/assets/img/template/ITRI背景-8.webp
  22. BIN
      frontend/src/assets/img/template/ITRI背景-9.webp
  23. BIN
      frontend/src/assets/img/template/syscom.webp
  24. 0 0
      frontend/src/assets/img/template/舊/城市.webp
  25. 0 0
      frontend/src/assets/img/template/舊/城市2.webp
  26. 0 0
      frontend/src/assets/img/template/舊/城市3.webp
  27. 0 0
      frontend/src/assets/img/template/舊/天井.webp
  28. 0 0
      frontend/src/assets/img/template/舊/網路.webp
  29. 0 0
      frontend/src/assets/img/template/舊/網路2.webp
  30. 0 0
      frontend/src/assets/img/template/舊/網路3.webp
  31. 0 0
      frontend/src/assets/img/template/舊/落地窗.webp
  32. 0 0
      frontend/src/assets/img/template/舊/落地窗2.webp
  33. 0 0
      frontend/src/assets/img/template/舊/高樓.webp
  34. BIN
      frontend/src/assets/img/template/鏡面-05.webp
  35. 64 37
      frontend/src/views/main/Upload.vue

BIN
frontend/src/assets/img/anchor/Aima.webp


BIN
frontend/src/assets/img/anchor/Alitia.webp


BIN
frontend/src/assets/img/anchor/Cora.webp


BIN
frontend/src/assets/img/anchor/Elara.webp


BIN
frontend/src/assets/img/anchor/ITRI-1.webp


BIN
frontend/src/assets/img/anchor/ITRI-2.webp


BIN
frontend/src/assets/img/anchor/ITRI-3.webp


BIN
frontend/src/assets/img/anchor/ITRI_1.webp


BIN
frontend/src/assets/img/anchor/ITRI_2.webp


BIN
frontend/src/assets/img/anchor/ITRI_3.webp


BIN
frontend/src/assets/img/anchor/Sporty.webp


BIN
frontend/src/assets/img/anchor/syscom.webp


BIN
frontend/src/assets/img/template/ITRI背景-1.webp


BIN
frontend/src/assets/img/template/ITRI背景-10.webp


BIN
frontend/src/assets/img/template/ITRI背景-2.webp


BIN
frontend/src/assets/img/template/ITRI背景-3.webp


BIN
frontend/src/assets/img/template/ITRI背景-4.webp


BIN
frontend/src/assets/img/template/ITRI背景-5.webp


BIN
frontend/src/assets/img/template/ITRI背景-6.webp


BIN
frontend/src/assets/img/template/ITRI背景-7.webp


BIN
frontend/src/assets/img/template/ITRI背景-8.webp


BIN
frontend/src/assets/img/template/ITRI背景-9.webp


BIN
frontend/src/assets/img/template/syscom.webp


+ 0 - 0
frontend/src/assets/img/template/城市.webp → frontend/src/assets/img/template/舊/城市.webp


+ 0 - 0
frontend/src/assets/img/template/城市2.webp → frontend/src/assets/img/template/舊/城市2.webp


+ 0 - 0
frontend/src/assets/img/template/城市3.webp → frontend/src/assets/img/template/舊/城市3.webp


+ 0 - 0
frontend/src/assets/img/template/天井.webp → frontend/src/assets/img/template/舊/天井.webp


+ 0 - 0
frontend/src/assets/img/template/網路.webp → frontend/src/assets/img/template/舊/網路.webp


+ 0 - 0
frontend/src/assets/img/template/網路2.webp → frontend/src/assets/img/template/舊/網路2.webp


+ 0 - 0
frontend/src/assets/img/template/網路3.webp → frontend/src/assets/img/template/舊/網路3.webp


+ 0 - 0
frontend/src/assets/img/template/落地窗.webp → frontend/src/assets/img/template/舊/落地窗.webp


+ 0 - 0
frontend/src/assets/img/template/落地窗2.webp → frontend/src/assets/img/template/舊/落地窗2.webp


+ 0 - 0
frontend/src/assets/img/template/高樓.webp → frontend/src/assets/img/template/舊/高樓.webp


BIN
frontend/src/assets/img/template/鏡面-05.webp


+ 64 - 37
frontend/src/views/main/Upload.vue

@@ -29,6 +29,26 @@ let dialog = reactive({
 });
 
 const anchorList = reactive([
+  {
+    anchor_id: "Aima",
+    name: "Aima",
+  },
+  {
+    anchor_id: "Alitia",
+    name: "Alitia",
+  },
+  {
+    anchor_id: "Cora",
+    name: "Cora",
+  },
+  {
+    anchor_id: "Elara",
+    name: "Elara",
+  },
+  {
+    anchor_id: "Sporty",
+    name: "Sporty",
+  },
   {
     anchor_id: "angela",
     name: "Angela",
@@ -46,79 +66,87 @@ const anchorList = reactive([
     name: "Peggy",
   },
   {
-    anchor_id: "ITRI_1",
-    name: "ITRI_1",
+    anchor_id: "ITRI-1",
+    name: "ITRI-1",
+  },
+  {
+    anchor_id: "ITRI-2",
+    name: "ITRI-2",
   },
   {
-    anchor_id: "ITRI_2",
-    name: "ITRI_2",
+    anchor_id: "ITRI-3",
+    name: "ITRI-3",
   },
   {
-    anchor_id: "ITRI_3",
-    name: "ITRI_3",
+    anchor_id: "syscom",
+    name: "James Liu",
   },
-  // {
-  //   anchor_id: "syscom",
-  //   name: "James Liu",
-  // },
 ]);
 
 const templateList = reactive([
   {
     template_id: "style1",
-    img: "天井",
+    img: "鏡面-01",
   },
   {
     template_id: "style2",
-    img: "城市",
+    img: "鏡面-02",
   },
   {
     template_id: "style3",
-    img: "城市2",
+    img: "鏡面-03",
   },
   {
     template_id: "style4",
-    img: "城市3",
+    img: "鏡面-04",
   },
   {
     template_id: "style5",
-    img: "高樓",
+    img: "鏡面-05",
   },
   {
-    template_id: "style6",
-    img: "落地窗",
+    template_id: "ITRI_1",
+    img: "ITRI背景-1",
   },
   {
-    template_id: "style7",
-    img: "落地窗2",
+    template_id: "ITRI_2",
+    img: "ITRI背景-2",
   },
   {
-    template_id: "style8",
-    img: "網路",
+    template_id: "ITRI_3",
+    img: "ITRI背景-3",
   },
   {
-    template_id: "style9",
-    img: "網路2",
+    template_id: "ITRI_4",
+    img: "ITRI背景-4",
   },
   {
-    template_id: "style10",
-    img: "網路3",
+    template_id: "ITRI_5",
+    img: "ITRI背景-5",
   },
   {
-    template_id: "style11",
-    img: "鏡面-01",
+    template_id: "ITRI_6",
+    img: "ITRI背景-6",
   },
   {
-    template_id: "style12",
-    img: "鏡面-02",
+    template_id: "ITRI_7",
+    img: "ITRI背景-7",
   },
   {
-    template_id: "style13",
-    img: "鏡面-03",
+    template_id: "ITRI_8",
+    img: "ITRI背景-8",
   },
   {
-    template_id: "style14",
-    img: "鏡面-04",
+    template_id: "ITRI_9",
+    img: "ITRI背景-9",
+  },
+  {
+    template_id: "ITRI_10",
+    img: "ITRI背景-10",
+  },
+  {
+    template_id: "syscom",
+    img: "syscom",
   },
 ]);
 
@@ -379,7 +407,7 @@ async function Submit() {
 .anchor-list {
   ul {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(180px, max-content));
+    grid-template-columns: repeat(auto-fit, minmax(185px, max-content));
     grid-gap: 20px;
     justify-content: center;
     padding: initial;
@@ -388,10 +416,9 @@ async function Submit() {
     }
   }
   img {
-    width: 200px;
-    height: 170px;
+    width: 190px;
+    height: 155px;
     object-fit: cover;
-    object-position: right;
   }
 
   .v-card--variant-elevated {