merge

src/lang/en.js

@@ -125,12 +125,12 @@ const en = {
     }
   },
   ImageBasedSurgicalPlanning: {
-    tab1: 'Liver Mass',
-    tab2: 'Femoral Shaft Fracture',
-    tab3: 'TAVI',
-    tab4: 'Kidney Mass',
-    tab5: 'Pancreatic Tumor',
-    tab6: 'AAA',
+    tab_LM: "Liver Mass",
+    tab_FSF: "Femoral Shaft Fracture",
+    tab_TAVI: "TAVI",
+    tab_KM: "Kidney Mass",
+    tab_PT: "Pancreatic Tumor",
+    tab_AAA: "AAA",
     title1: 'Series',
     title2: 'Clinical Implications',
     title3: 'Images',

src/views/front/layout/index.vue

@@ -2,47 +2,35 @@
   <div class="layout">
     <div class="header">
       <div class="menu_wrapper">
-          <img
-            @click="$router.push('/home')"
-            src="../../../../src/static/images/zzlogo3.png"
-            alt=""
-          />
-          <el-menu
-            mode="horizontal"
-            background-color="#fff"
-            :default-active="active.toString()"
-            text-color="#333"
-            @select="selectTab"
-            active-text-color="#428bca"
-          >
-            <template>
-              <el-menu-item key="0" index="0">{{$t('home.menuName')}}</el-menu-item>
-              <el-submenu key="1" index="1" @click.native="selectTab('1')">
-                <template slot="title" style="display: flex;align-items: center">
-                  {{$t('service.menuName')}}
-                </template>
-                <el-menu-item key="1-1" index="1-1">{{$t('service.subMenu1')}}</el-menu-item>
-                <el-menu-item key="1-2" index="1-2">{{$t('service.subMenu2')}}</el-menu-item>
-              </el-submenu>
-              <el-menu-item key="2" index="2">{{$t('about.menuName')}}</el-menu-item>
-              <el-menu-item key="3" index="3">{{$t('media.menuName')}}</el-menu-item>
-              <el-menu-item key="4" index="4">{{$t('book.menuName')}}</el-menu-item>
-              <el-menu-item key="5" index="5">{{$t('login.menuName')}}</el-menu-item>
-            </template>
-          </el-menu>
-        </div>
+        <img @click="$router.push('/home')" src="@/static/images/zzlogo2.png" alt="" v-if="$i18n.locale === 'zh'" />
+        <img @click="$router.push('/home')" src="@/static/images/zzlogo4.png" alt="" v-else />
+        <el-menu mode="horizontal" background-color="#fff" :default-active="active.toString()" text-color="#333"
+          @select="selectTab" active-text-color="#428bca">
+          <template>
+            <el-menu-item key="0" index="0">{{ $t('home.menuName') }}</el-menu-item>
+            <el-submenu key="1" index="1" @click.native="selectTab('1')">
+              <template slot="title">
+                {{ $t('service.menuName') }}
+              </template>
+              <el-menu-item key="1-1" index="1-1">{{ $t('service.subMenu1') }}</el-menu-item>
+              <el-menu-item key="1-2" index="1-2">{{ $t('service.subMenu2') }}</el-menu-item>
+            </el-submenu>
+            <el-menu-item key="2" index="2">{{ $t('about.menuName') }}</el-menu-item>
+            <el-menu-item key="3" index="3">{{ $t('media.menuName') }}</el-menu-item>
+            <el-menu-item key="4" index="4">{{ $t('book.menuName') }}</el-menu-item>
+            <el-menu-item key="5" index="5">{{ $t('login.menuName') }}</el-menu-item>
+          </template>
+        </el-menu>
+      </div>
     </div>
     <div class="container">
       <keep-alive v-if="$route.meta.keepAlive">
         <router-view :key="$route.path + new Date().getTime()"></router-view>
       </keep-alive>
-      <router-view
-        :key="$route.path + new Date().getTime()"
-        v-if="!$route.meta.keepAlive"
-      ></router-view>
+      <router-view :key="$route.path + new Date().getTime()" v-if="!$route.meta.keepAlive"></router-view>
     </div>
     <div class="bottom" style="text-align: center">
-      <a
+      <!-- <a
         target="_blank"
         style="
           color: #fff;
@@ -51,14 +39,39 @@
           text-align: center;
         "
         >© {{ new Date().getFullYear() }} Elevate Imaging Inc. info@elevateimaging.ai</a
-      >
+      > -->
+      <div class="copyright cf">
+        <p class="left">
+          <a class="text-color" href="https://beian.miit.gov.cn" target="_blank">Copyright © {{ new Date().getFullYear()
+          }}
+            上海展影医疗科技有限公司 版权所有 |
+            沪ICP备2021037850-2</a>
+          <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859"
+            style="margin-left:20px;">
+            <img src="@/static/images/ba.png" style="vertical-align: middle;">
+            <span style="margin: 0px 0px 0px 3px; vertical-align: middle;">沪公网安备 31011002005859号</span></a>
+        </p><a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859"
+          style="margin-left:20px;">
+        </a>
+        <p></p>
+        <!-- <a href="javascript:;" class="backTop tre"><i class="fa fa-angle-up"></i></a> -->
+        <div class="shares cf">
+          <a href="http://weibo.com/u/5834449233?is_all=1" class="a1" target="_blank"><img
+              src="@/static/images/weibo.png" alt=""></a>
+          <a href="javascript:;" class="a2">
+            <img src="@/static/images/wechat.png" alt="">
+            <img src="@/static/images/wxqr.jpg" style="width:128px;height:128px;" class="qrCode">
+          </a>
+
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 export default {
-  data () {
+  data() {
     return {
       menuList: [
         'Home',
@@ -78,12 +91,12 @@ export default {
     }
   },
   watch: {
-    $route (v) {
+    $route(v) {
       this.changeTab()
     }
   },
   methods: {
-    changeTab () {
+    changeTab() {
       if (this.menuList.findIndex((v) => v === this.$route.name) === -1) {
         if (this.$route.name === 'Center Imaging Services') {
           this.active = '1'
@@ -95,7 +108,7 @@ export default {
         this.active = this.menuList.findIndex((v) => v === this.$route.name)
       }
     },
-    selectTab (v, title) {
+    selectTab(v, title) {
       console.log('selectTab')
       if (v === '5') {
         window.open('https://lili.elevateimaging.ai/')
@@ -119,7 +132,7 @@ export default {
       }
     }
   },
-  mounted () {
+  mounted() {
     if (this.menuList.findIndex((v) => v === this.$route.name) === -1) {
       if (this.$route.name === 'Center Imaging Services') {
         this.active = '1'
@@ -134,13 +147,14 @@ export default {
 }
 </script>
 <style>
-.layout .el-menu--horizontal > .el-submenu .el-submenu__title {
+.layout .el-menu--horizontal>.el-submenu .el-submenu__title {
   height: 90px;
   line-height: 120px;
   background: #fff !important;
   font-size: 18px;
 }
-.layout .el-menu--horizontal > .el-submenu .el-submenu__title i {
+
+.layout .el-menu--horizontal>.el-submenu .el-submenu__title i {
   line-height: 120px;
 }
 </style>
@@ -148,9 +162,11 @@ export default {
 .layout {
   overflow: auto;
   user-select: none;
+
   .header {
     background: #fff;
     position: relative;
+
     p {
       height: 120px;
       display: flex;
@@ -158,12 +174,15 @@ export default {
       justify-content: center;
       text-align: center;
       cursor: pointer;
+
       &:hover {
         letter-spacing: 5px;
+
         b {
           letter-spacing: 10px;
         }
       }
+
       span {
         line-height: 30px;
         position: relative;
@@ -176,6 +195,7 @@ export default {
         padding: 0;
         z-index: 2;
         transition: all 0.5s ease-out;
+
         b {
           letter-spacing: 2px;
           color: #fff;
@@ -185,6 +205,7 @@ export default {
         }
       }
     }
+
     .menu_wrapper {
       height: 120px;
       max-width: 1226px;
@@ -192,16 +213,20 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+
       img {
         width: 180px;
         cursor: pointer
       }
     }
+
     .el-menu {
       height: 100%;
+
       &.el-menu--horizontal {
         border-bottom: none;
       }
+
       .el-menu-item {
         height: 90px;
         line-height: 120px;
@@ -209,11 +234,14 @@ export default {
         font-size: 18px;
       }
     }
+
     .menu {
       background-color: #302f6d;
+
       div {
         max-width: 1226px;
         margin: 0 auto;
+
         .el-menu.el-menu--horizontal {
           border-bottom: none;
         }
@@ -221,21 +249,88 @@ export default {
     }
 
   }
+
   .container {
     text-align: left;
     position: relative;
     box-sizing: border-box;
     min-height: calc(100vh - 160px);
   }
+
   .bottom {
-    background: #302f6d;
+    width: 1125px;
+    height: 74px;
+    background: #d4d4d4;
+    margin: 30px auto 30px auto;
     position: relative;
+    font-size: 12px !important;
+
     p {
-      font-size: 14px;
-      color: #fff;
-      line-height: 40px;
-      text-align: center;
+      padding-left: 30px;
+      color: #3e3e3f;
+      line-height: 74px;
     }
+
+    .left {
+      float: left;
+      font-size: 12px !important;
+
+      a {
+        font-size: 13px !important;
+      }
+
+      span {
+        font-size: 13px !important;
+      }
+    }
+
+    .shares {
+      float: right;
+      line-height: 1;
+
+      // margin-top: 22px;
+      a {
+        display: block;
+        width: 34px;
+        height: 34px;
+        border: 1px solid #898d98;
+        border-radius: 2px;
+        margin-right: 15px;
+        float: left;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        img {
+          font-size: 17px;
+          color: #898d98;
+          text-align: center;
+          width: 30px;
+          height: 30px;
+          display: block;
+        }
+      }
+    }
+
+    .a2 {
+      position: relative;
+
+      .qrCode {
+        display: none;
+        position: absolute;
+        right: -15px;
+        bottom: 35px;
+        box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+      }
+
+      &:hover {
+        .qrCode {
+          display: block;
+        }
+      }
+    }
+
+
   }
 }
 </style>

src/views/front/services/3D-post-processing-services/Image-Based-Surgical-Planning/index.vue

@@ -10,21 +10,21 @@
                 $t(`ImageBasedSurgicalPlanning.title6`) }}</em>
                 <div class="aAs cf">
                   <span :class="{ cur: activeName === 'LM' }" @click.stop="handleClick('LM')">{{
-                    $t(`ImageBasedSurgicalPlanning.tab1`) }}</span>
+                    $t(`ImageBasedSurgicalPlanning.tab_LM`) }}</span>
                   | <span :class="{ cur: activeName === 'FSF' }" @click.stop="handleClick('FSF')">{{
-                    $t(`ImageBasedSurgicalPlanning.tab2`) }}</span> | <span :class="{ cur: activeName === 'TAVI' }"
+                    $t(`ImageBasedSurgicalPlanning.tab_FSF`) }}</span> | <span :class="{ cur: activeName === 'TAVI' }"
                     @click.stop="handleClick('TAVI')">{{
-                      $t(`ImageBasedSurgicalPlanning.tab3`) }}</span> | <span :class="{ cur: activeName === 'KM' }"
+                      $t(`ImageBasedSurgicalPlanning.tab_TAVI`) }}</span> | <span :class="{ cur: activeName === 'KM' }"
                     @click.stop="handleClick('KM')">{{
-                      $t(`ImageBasedSurgicalPlanning.tab4`) }}</span> | <span :class="{ cur: activeName === 'PT' }"
+                      $t(`ImageBasedSurgicalPlanning.tab_KM`) }}</span> | <span :class="{ cur: activeName === 'PT' }"
                     @click.stop="handleClick('PT')">{{
-                      $t(`ImageBasedSurgicalPlanning.tab5`) }}</span> | <span :class="{ cur: activeName === 'AAA' }"
+                      $t(`ImageBasedSurgicalPlanning.tab_PT`) }}</span> | <span :class="{ cur: activeName === 'AAA' }"
                     @click.stop="handleClick('AAA')">{{
-                      $t(`ImageBasedSurgicalPlanning.tab6`) }}</span>
+                      $t(`ImageBasedSurgicalPlanning.tab_AAA`) }}</span>
                 </div>
               </h2>
               <div class="liverList cf">
-                <h3>{{ $t(`ImageBasedSurgicalPlanning.title4`) }}</h3>
+                <h3>{{ $t(`ImageBasedSurgicalPlanning.tab_${activeName}`) }}</h3>
                 <p style="float:right;  font-size:14px; color:#777; margin-bottom:0px; "><i
                     class="fa fa-search-plus"></i>{{ $t(`ImageBasedSurgicalPlanning.msg1`) }}</p>
                 <table class="comTable liverTable cf">
@@ -715,9 +715,14 @@ li {
       padding: 15px 20px 15px 20px;
     }
 
+    .td1 {
+      text-align: left;
+    }
+
     .td2 {
       p {
         padding-bottom: 0;
+        text-align: justify;
       }
     }
 

src/views/front/services/3D-post-processing-services/index.vue

@@ -272,6 +272,7 @@ export default {
       }
       this.$nextTick(() => {
         this.$refs['picture_perview'].$viewer.show()
+        this.$refs['picture_perview'].$viewer.view(num - 1)
       })
     },
     getSrc(id, num, key) {
@@ -307,6 +308,10 @@ export default {
 .Post-Processing-Services {
   background: #fff;
 
+  p {
+    text-align: justify;
+  }
+
   .banner {
     height: 300px;
     background: url(../../../../../src/static/images/bannerSolution3.jpg) no-repeat center center;
@@ -596,7 +601,7 @@ li {
       width: auto;
       padding: 0 20px;
       position: relative;
-      text-align: center;
+      text-align: justify;
       cursor: pointer;
     }
 
@@ -684,7 +689,7 @@ li {
 
         li {
           width: 180px !important;
-          height: 130px;
+          height: 180px !important;
           float: left !important;
           margin-left: 40px;
           margin-bottom: 22px;
@@ -766,7 +771,7 @@ table {
   }
 
   td.td2 {
-    text-align: left;
+    text-align: justify;
   }
 
   .last td {