Merge branch 'master' of https://dd.tall.wiki/gitea/binbin0314/green.v0.3

src/components/Rotation/Rotation.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="head">
-    <img class="settle-in" src="~assets/settleIn.png" />
+    <img
+      @click="$router.push('/IncubationPlatform/MakerSpace')"
+      class="settle-in pointer"
+      src="~assets/settleIn.png"
+    />
     <a-carousel :autoplay-speed="time" autoplay>
       <div :key="item.id" class="img-box" v-for="item in lists">
         <img :src="item.url" alt />

src/views/NewPlatform/Children/Core.vue

@@ -31,9 +31,15 @@
       </div>
       <div class="bottom-content">
         <div :style="{ height: '500px' }" id="treeChart"></div>
-        <div class="absolute-box" style="top: 2.5%" v-if="showDiv">科技资源共享服务平台</div>
-        <div class="absolute-box" style="top: 35%" v-if="showDiv">知识产权与技术转移转化服务平台</div>
-        <div class="absolute-box" style="top: 67.5%" v-if="showDiv">知识培训与科技人才服务平台</div>
+        <div class="absolute-box" style="top: 2.5%" v-if="showDiv">
+          <div class="case"></div>科技资源共享服务平台
+        </div>
+        <div class="absolute-box" style="top: 39%;height: 33%;" v-if="showDiv">
+          <div class="case"></div>知识产权与技术转移转化服务平台
+        </div>
+        <div class="absolute-box" style="top: 72%;height: 25%;" v-if="showDiv">
+          <div class="case"></div>知识培训与科技人才服务平台
+        </div>
       </div>
     </div>
     <!-- <div class="partner-box">
@@ -146,7 +152,7 @@ export default {
             top: '2%',
             left: '12%',
             bottom: '1%',
-            right: '36%',
+            right: '40%',
             symbolSize: 7,
             lineStyle: { width: 4 },
             itemStyle: { borderWidth: 3, borderColor: '#AACD06' },
@@ -198,11 +204,9 @@ export default {
 .absolute-box {
   position: absolute;
   right: 0;
-  height: 30%;
+  height: 36%;
   // border: 1px solid #ccc;
-  border-radius: 10px;
   // box-shadow: 0 0 6px rgba(19, 172, 196, 0.6);
-  box-shadow: -2px 0 0 rgb(170 205 6);
   width: 70px;
   padding: 4px;
   align-items: center;
@@ -210,11 +214,19 @@ export default {
   font-size: 14px;
   display: flex;
   justify-content: center;
+
+  .case {
+    width: 40px;
+    height: 100%;
+    border-radius: 10px;
+    margin-right: 10px;
+    box-shadow: 2px 0 0 rgb(170 205 6);
+  }
 }
 
 @media only screen and (max-width: 1400px) {
   .absolute-box {
-    right: -70px;
+    right: -40px;
   }
 }
 </style>