3 年之前 · a16a464977
--- a/backstage/src/configue/http.js
+++ b/backstage/src/configue/http.js
@@ -8,7 +8,7 @@ const vue = new Vue();
 
				 var isProduction = process.env.NODE_ENV === "production";
			
 
				 let loading = "";
			
 
				 
			
 
				-const serverName = isProduction ? "/" : "http://192.168.0.245:8004/";
			
 
				+const serverName = isProduction ? "/" : "http://192.168.0.135:8013/";
			
 
				 
			
 
				 const serverLocation = window.location.hostname;
			
 
				 
			
--- a/backstage/src/mixins/index.js
+++ b/backstage/src/mixins/index.js
@@ -126,6 +126,9 @@ let g_expert = [{
 
				   val:'院士',
			
 
				   id:4
			
 
				 },{
			
 
				+  val:'英模代表专家',
			
 
				+  id:6
			
 
				+},{
			
 
				   val:'其他',
			
 
				   id:5
			
 
				 }]
			
--- a/backstage/src/pages/content/expert/componets/expert.vue
+++ b/backstage/src/pages/content/expert/componets/expert.vue
@@ -55,13 +55,13 @@
 
				           ></el-input>
			
 
				         </el-form-item>
			
 
				 
			
 
				-        <el-form-item label="忠诚的力量：" prop="type">
			
 
				+        <!-- <el-form-item label="忠诚的力量：" prop="type">
			
 
				           <el-radio-group v-model="form.type">
			
 
				             <el-radio label="">无</el-radio>
			
 
				             <el-radio label="1">百岁专家</el-radio>
			
 
				-            <el-radio label="2">英模专家代表</el-radio>
			
 
				+            <el-radio label="2">英模代表专家</el-radio>
			
 
				           </el-radio-group>
			
 
				-        </el-form-item>
			
 
				+        </el-form-item> -->
			
 
				 
			
 
				         <el-form-item label="链接名称：" prop="url">
			
 
				           <el-input
			
--- a/backstage/src/pages/content/expert/componets/status/index.vue
+++ b/backstage/src/pages/content/expert/componets/status/index.vue
@@ -38,6 +38,10 @@ export default {
 
				           id: 5,
			
 
				           name: "其他专家",
			
 
				         },
			
 
				+        {
			
 
				+          id: 6,
			
 
				+          name: "英模代表专家",
			
 
				+        },
			
 
				       ]
			
 
				     }
			
 
				   },
			
--- a/web/.env
+++ b/web/.env
@@ -1,2 +1,2 @@
 
				-VUE_APP_STATIC_DIR=static
			
 
				+VUE_APP_STATIC_DIR=./static
			
 
				 VUE_APP_PROXY_URL=''
			
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -1,25 +1,205 @@
 
				 <!DOCTYPE html>
			
 
				 <html lang="en">
			
 
				-  <head>
			
 
				-    <meta charset="utf-8">
			
 
				-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
			
 
				-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				-    <meta name="renderer" content="webkit">
			
 
				-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
			
 
				-    <meta name="format-detection" content="telephone=no">
			
 
				-    <link rel="icon" href="<%= BASE_URL %>favicon.png">
			
 
				-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/js/lib/scrollbar/perfect-scrollbar.css"/>
			
 
				-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/css/animate.min.css"/>
			
 
				-
			
 
				-    <title>中国人民解放军总医院数字史馆</title>
			
 
				-  </head>
			
 
				-  <body>
			
 
				-    <div id="app"></div>
			
 
				-    <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jquery-2.1.1.min.js"></script>
			
 
				-    <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jquery.mousewheel.min.js"></script>
			
 
				-    <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/scrollbar/perfect-scrollbar.min.js"></script>
			
 
				-    <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jssor.slider-28.1.0.min.js"></script>
			
 
				-
			
 
				-
			
 
				-  </body>
			
 
				-</html>
			
 
				+
			
 
				+<head>
			
 
				+  <meta charset="utf-8">
			
 
				+  <base href="/web/" />
			
 
				+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
			
 
				+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				+  <meta name="renderer" content="webkit">
			
 
				+  <meta name="viewport"
			
 
				+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
			
 
				+  <meta name="format-detection" content="telephone=no">
			
 
				+  <link rel="icon" href="<%= BASE_URL %>favicon.png">
			
 
				+  <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/js/lib/scrollbar/perfect-scrollbar.css" />
			
 
				+  <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/css/animate.min.css" />
			
 
				+
			
 
				+  <title>中国人民解放军总医院数字史馆</title>
			
 
				+  <style>
			
 
				+    .broswertips {
			
 
				+      position: fixed;
			
 
				+      top: 50%;
			
 
				+      left: 50%;
			
 
				+      transform: translate(-50%, -50%);
			
 
				+      z-index: 99999999;
			
 
				+      width: 100%;
			
 
				+      height: 100%;
			
 
				+      overflow: hidden;
			
 
				+      display: none;
			
 
				+    }
			
 
				+
			
 
				+    .broswertips>img {
			
 
				+      width: 100%;
			
 
				+    }
			
 
				+
			
 
				+    .broswertips>.alert {
			
 
				+      position: absolute;
			
 
				+      top: 50%;
			
 
				+      left: 50%;
			
 
				+      transform: translate(-50%, -50%);
			
 
				+      width: 988px;
			
 
				+      margin: 0 auto;
			
 
				+      height: 500px;
			
 
				+      z-index: 99;
			
 
				+      color: #fff;
			
 
				+      padding: 30px 36px 0;
			
 
				+      border-top: 6px solid #ccaf8f;
			
 
				+      background: rgba(3, 51, 48, .5);
			
 
				+      border-bottom: 6px solid #ccaf8f;
			
 
				+    }
			
 
				+
			
 
				+    .broswertips>.alert>.qtitle {
			
 
				+      margin-top: 6px;
			
 
				+      text-align: center;
			
 
				+      font-size: 28px;
			
 
				+      font-weight: bold;
			
 
				+      line-height: 38px;
			
 
				+      color: #ffe0a6;
			
 
				+    }
			
 
				+
			
 
				+    .broswertips>.alert>.qline {
			
 
				+      width: 50%;
			
 
				+      height: 1px;
			
 
				+      margin: 26px auto;
			
 
				+      position: relative;
			
 
				+      background: linear-gradient(90deg,
			
 
				+          rgba(255, 255, 255, 0) 0%,
			
 
				+          #ffffff 48%,
			
 
				+          rgba(255, 255, 255, 0) 100%);
			
 
				+    }
			
 
				+
			
 
				+    .broswertips>.alert>.qline>img {
			
 
				+      position: absolute;
			
 
				+      left: 50%;
			
 
				+      width: 32px;
			
 
				+      transform: translateX(-50%);
			
 
				+      top: -12px;
			
 
				+    }
			
 
				+
			
 
				+    .broswertips>.alert>.dati {
			
 
				+      width: 100%;
			
 
				+      height: 50%;
			
 
				+      overflow-y: auto;
			
 
				+      margin: 0 auto;
			
 
				+      background-color: rgba(255, 255, 255, 0.7);
			
 
				+      color: #626260;
			
 
				+      display: flex;
			
 
				+      justify-content: center;
			
 
				+      align-items: center;
			
 
				+      text-align: justify;
			
 
				+      text-indent: 40px;
			
 
				+      line-height: 2;
			
 
				+      font-size: 18px;
			
 
				+      padding: 0 66px;
			
 
				+      max-width: 916px;
			
 
				+    }
			
 
				+
			
 
				+    .broswertips>.alert>.dati_btn {
			
 
				+      text-align: center;
			
 
				+    }
			
 
				+
			
 
				+    .broswertips>.alert>.dati_btn>a {
			
 
				+      display: inline-block;
			
 
				+      font-size: 16px;
			
 
				+      line-height: 36px;
			
 
				+      height: 36px;
			
 
				+      cursor: pointer;
			
 
				+      text-align: center;
			
 
				+      width: 186px;
			
 
				+      margin: 48px auto;
			
 
				+      border: 1px solid #ccaf8f;
			
 
				+      color: #fff;
			
 
				+      background: #ccaf8f;
			
 
				+    }
			
 
				+  </style>
			
 
				+</head>
			
 
				+
			
 
				+<body>
			
 
				+
			
 
				+  <div class="broswertips" id="broswertips">
			
 
				+    <img src="./tip_bg.jpg" alt="">
			
 
				+    <div class="alert">
			
 
				+      <p class="qtitle">访客须知</p>
			
 
				+      <div class="qline">
			
 
				+        <img src="./star.png" alt="">
			
 
				+      </div>
			
 
				+      <div class="dati">
			
 
				+        浏览器内核版本过低无法正常浏览网页，建议使用Chrome浏览器（谷歌浏览器版本号90以上），Firefox浏览器（火狐浏览器版本号80或以上），360极速浏览器（360极速浏览器版本号10或以上）。
			
 
				+      </div>
			
 
				+      <div class="dati_btn">
			
 
				+        <a href="broswer.exe" target="_blank">下载360极速浏览器</a>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+  </div>
			
 
				+  <script>
			
 
				+    function versions() {
			
 
				+      var u = window.navigator.userAgent
			
 
				+      var uLowCase = u.toLowerCase()
			
 
				+
			
 
				+      return {
			
 
				+        userAgent: u,
			
 
				+        // IE内核
			
 
				+        trident: u.indexOf('Trident') > -1,
			
 
				+        // opera内核
			
 
				+        presto: u.indexOf('Presto') > -1,
			
 
				+        // 苹果、谷歌内核
			
 
				+        webKit: u.indexOf('AppleWebKit') > -1,
			
 
				+        // 火狐内核
			
 
				+        gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') === -1,
			
 
				+        // 是否为移动终端 / Tablets use desktop version
			
 
				+        mobile: (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) && !(/Tablet|iPad/i.test(navigator.userAgent)),
			
 
				+        // ios终端
			
 
				+        ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
			
 
				+        // android终端或者uc浏览器
			
 
				+        android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1,
			
 
				+        // 是否为iPhone或者安卓QQ浏览器
			
 
				+        iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1,
			
 
				+        // 是否为iPad
			
 
				+        iPad: u.indexOf('iPad') > -1,
			
 
				+        // 是否为web应用程序，没有头部与底部
			
 
				+        webApp: u.indexOf('Safari') === -1,
			
 
				+        // 是否为微信浏览器
			
 
				+        weixin: ~u.indexOf('MicroMessenger'),
			
 
				+        // 火狐内核版本
			
 
				+        firefoxCore: uLowCase.match(/firefox\/([\d.]+)/),
			
 
				+        // chrome内核版本
			
 
				+        chromeCore: uLowCase.match(/chrome\/([\d.]+)/),
			
 
				+        // webkit内核版本
			
 
				+        webkitCore: uLowCase.match(/applewebkit\/([\d.]+)/),
			
 
				+
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+    var broswer = versions()
			
 
				+    var dommmm = document.getElementById('broswertips')
			
 
				+
			
 
				+    if (broswer.trident) {
			
 
				+      dommmm.style.display = 'block'
			
 
				+    }
			
 
				+    // 火狐
			
 
				+    else if (broswer.gecko) {
			
 
				+      var version = broswer.firefoxCore[1].split(".")[0]
			
 
				+      if (Number(version) < 80) {
			
 
				+        dommmm.style.display = 'block'
			
 
				+      }
			
 
				+    }
			
 
				+    // 谷歌
			
 
				+    else if (broswer.webKit) {
			
 
				+      var version = broswer.chromeCore[1].split(".")[0]
			
 
				+      if (Number(version) < 69) {
			
 
				+        dommmm.style.display = 'block'
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+  </script>
			
 
				+  <div id="app"></div>
			
 
				+  <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jquery-2.1.1.min.js"></script>
			
 
				+  <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jquery.mousewheel.min.js"></script>
			
 
				+  <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/scrollbar/perfect-scrollbar.min.js"></script>
			
 
				+  <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jssor.slider-28.1.0.min.js"></script>
			
 
				+
			
 
				+
			
 
				+</body>
			
 
				+
			
 
				+</html>
			
--- a/web/public/model/Build/WebGl-3DMapPage.data
+++ b/web/public/model/Build/WebGl-3DMapPage.data
--- a/web/public/model/Build/WebGl-3DMapPage.framework.js
+++ b/web/public/model/Build/WebGl-3DMapPage.framework.js
--- a/web/public/model/Build/WebGl-3DMapPage.wasm
+++ b/web/public/model/Build/WebGl-3DMapPage.wasm
--- a/web/public/star.png
+++ b/web/public/star.png
--- a/web/public/tip_bg.jpg
+++ b/web/public/tip_bg.jpg
--- a/web/src/assets/images/digital/tips.jpg
+++ b/web/src/assets/images/digital/tips.jpg
--- a/web/src/components/hotspot/iframe.vue
+++ b/web/src/components/hotspot/iframe.vue
@@ -64,7 +64,7 @@ export default {
 
				     margin: 0 auto;
			
 
				     width: 70%;
			
 
				     color: #fff;
			
 
				-    text-align: center;
			
 
				+    text-align: justify;
			
 
				     line-height: 1.8;
			
 
				     max-height: 120px;
			
 
				     overflow-y: auto;
			
--- a/web/src/components/hotspot/image.vue
+++ b/web/src/components/hotspot/image.vue
@@ -14,7 +14,7 @@
 
				         </ul>
			
 
				       </div>
			
 
				         <div class="title" v-html="hotspot.title"></div>
			
 
				-        <div class="desc" :style="{textAlign:hotspot.content.length>58?'justify':'center'}" v-html="handleContent(hotspot.contents[active]||hotspot.contents[0],16)">
			
 
				+        <div class="desc" v-html="handleContent(hotspot.contents[active]||hotspot.contents[0],16)">
			
 
				       </div>
			
 
				     </div>
			
 
				 
			
--- a/web/src/components/hotspot/model.vue
+++ b/web/src/components/hotspot/model.vue
@@ -22,7 +22,6 @@
 
				     <div class="title" v-html="hotspot.title"></div>
			
 
				     <div
			
 
				       class="desc"
			
 
				-      :style="{ textAlign: hotspot.content.length > 58 ? 'justify' : 'center' }"
			
 
				       v-html="
			
 
				         handleContent(hotspot.contents[active] || hotspot.contents[0], 16)
			
 
				       "
			
--- a/web/src/components/hotspot/multiple.vue
+++ b/web/src/components/hotspot/multiple.vue
@@ -28,9 +28,6 @@
 
				       <div class="title" v-html="hotspot.title"></div>
			
 
				       <div
			
 
				         class="desc"
			
 
				-        :style="{
			
 
				-          textAlign: hotspot.content.length > 58 ? 'justify' : 'center',
			
 
				-        }"
			
 
				         v-html="
			
 
				           handleContent(hotspot.contents[contentactive] || hotspot.contents[0], 16)
			
 
				         "
			
--- a/web/src/components/hotspot/video.vue
+++ b/web/src/components/hotspot/video.vue
@@ -150,7 +150,7 @@ export default {
 
				     margin: 0 auto;
			
 
				     width: 70%;
			
 
				     color: #fff;
			
 
				-    text-align: center;
			
 
				+    text-align: justify;
			
 
				     line-height: 1.8;
			
 
				     max-height: 120px;
			
 
				     overflow-y: auto;
			
--- a/web/src/mixins/index.js
+++ b/web/src/mixins/index.js
@@ -104,6 +104,7 @@ let g_typeStr ={
 
				   '3':'三级专家',
			
 
				   '4':'院士',
			
 
				   '5':'其他专家',
			
 
				+  '6':'英模代表专家',
			
 
				 }
			
 
				 
			
 
				 Vue.mixin({
			
@@ -144,8 +145,6 @@ Vue.mixin({
 
				         return '-'
			
 
				       }
			
 
				       let tmp = str.replace(RegExp(key, "g"), `<span style="color:#ffe0a6;font-size:inherit;">${key}</span>`)
			
 
				-      console.log(tmp);
			
 
				-
			
 
				       return tmp
			
 
				     },
			
 
				     handleContent(content,fontsize=16,newLine=false){
			
--- a/web/src/newcomponents/hovercom/index.vue
+++ b/web/src/newcomponents/hovercom/index.vue
@@ -6,6 +6,8 @@
 
				         <donate v-else-if="showType=='donate'" @close="close"/>
			
 
				         <commentator v-else-if="showType=='commentator'" @close="close"/>
			
 
				         <tips v-else-if="showType=='tips'" @close="close"/>
			
 
				+        <sandtips v-else-if="showType=='sandtips'" @close="close"/>
			
 
				+
			
 
				         <message v-else @close="close"/>
			
 
				       </template>
			
 
				   </div>
			
@@ -18,6 +20,8 @@ import donate from "./donate";
 
				 import dati from "./dati";
			
 
				 import commentator from "./commentator";
			
 
				 import tips from "./tips";
			
 
				+import sandtips from "./sandtips";
			
 
				+
			
 
				 
			
 
				 export default {
			
 
				   props:['showType'],
			
@@ -27,6 +31,7 @@ export default {
 
				     donate,
			
 
				     dati,
			
 
				     tips,
			
 
				+    sandtips,
			
 
				     commentator
			
 
				   },
			
 
				   methods:{
			
--- a/web/src/newcomponents/hovercom/sandtips/index.vue
+++ b/web/src/newcomponents/hovercom/sandtips/index.vue
@@ -0,0 +1,127 @@
 
				+<template>
			
 
				+  <div class="datiing brightnessBigW" @click.stop>
			
 
				+    <p class="qtitle">数字沙盘用户说明</p>
			
 
				+    <div class="qline">
			
 
				+      <img :src="require(`@/assets/images/icon/star.png`)" alt="" />
			
 
				+    </div>
			
 
				+    
			
 
				+    <div class="dati">
			
 
				+      <div class="sandimg">
			
 
				+      <img :src="require(`@/assets/images/digital/tips.jpg`)" alt="" />
			
 
				+    </div>
			
 
				+    <p>点击可以查看对应医学中心或医疗区详情</p>
			
 
				+      
			
 
				+    </div>
			
 
				+    <div class="dati_btn">
			
 
				+      <span class="default" @click="$emit('close')">我知道了</span>
			
 
				+    </div>
			
 
				+
			
 
				+    <img @click="$emit('close')" class="close" :src="require('@/assets/images/project/close1.png')" alt="" />
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+// import { data } from "./data";
			
 
				+
			
 
				+export default {
			
 
				+  data() {
			
 
				+    return {};
			
 
				+  },
			
 
				+
			
 
				+  methods: {
			
 
				+    handleLeave() {
			
 
				+      this.$bus.$emit("hovershowType", "message");
			
 
				+    },
			
 
				+  },
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="less" scoped>
			
 
				+.datiing {
			
 
				+  width: 988px;
			
 
				+  margin: 0 auto;
			
 
				+  position: fixed;
			
 
				+  height: 715px;
			
 
				+  top: 50%;
			
 
				+  left: 50%;
			
 
				+  transform: translate(-50%, -50%);
			
 
				+  z-index: 99;
			
 
				+  color: #fff;
			
 
				+  padding: 30px 36px 0;
			
 
				+  border-top: 8px solid #fff;
			
 
				+  background: rgba(19,36,112, 0.4);
			
 
				+  border-bottom: 8px solid #fff;
			
 
				+  .qtitle {
			
 
				+    margin-top: 6px;
			
 
				+    text-align: center;
			
 
				+    font-size: 28px;
			
 
				+    font-weight: bold;
			
 
				+    line-height: 38px;
			
 
				+    color: #fff;
			
 
				+  }
			
 
				+  .qline {
			
 
				+    width: 50%;
			
 
				+    height: 1px;
			
 
				+    margin: 26px auto;
			
 
				+    position: relative;
			
 
				+    background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, #ffffff 48%, rgba(255, 255, 255, 0) 100%);
			
 
				+    > img {
			
 
				+      position: absolute;
			
 
				+      left: 50%;
			
 
				+      width: 32px;
			
 
				+      transform: translateX(-50%);
			
 
				+      top: -12px;
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+ 
			
 
				+  .dati {
			
 
				+    width: 100%;
			
 
				+    overflow-y: auto;
			
 
				+    margin: 0 auto;
			
 
				+    background-color: rgba(255, 255, 255, 0.7);
			
 
				+    line-height: 2.5;
			
 
				+    font-size: 20px;
			
 
				+    padding: 24px 0;
			
 
				+    .sandimg{
			
 
				+      max-width: 618px;
			
 
				+      min-height: 388px;
			
 
				+      margin: 0 auto;
			
 
				+      >img{
			
 
				+        width: 100%;
			
 
				+      }
			
 
				+    }
			
 
				+    p{
			
 
				+      color: #626260;
			
 
				+      font-size: 20px;
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  .dati_btn {
			
 
				+    > span {
			
 
				+      display: inline-block;
			
 
				+      font-size: 16px;
			
 
				+      line-height: 36px;
			
 
				+      height: 36px;
			
 
				+      cursor: pointer;
			
 
				+      vertical-align: middle;
			
 
				+      width: 142px;
			
 
				+      margin: 20px auto;
			
 
				+      border: 1px solid rgba(255,255,255, 0.3);
			
 
				+      color: #fff;
			
 
				+      background: rgba(255,255,255, 0.3);
			
 
				+   
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  .close {
			
 
				+    position: absolute;
			
 
				+    top: 45px;
			
 
				+    right: 38px;
			
 
				+    width: 20px;
			
 
				+    height: 20px;
			
 
				+    cursor: pointer;
			
 
				+    z-index: 9999999;
			
 
				+  }
			
 
				+}
			
 
				+</style>
			
--- a/web/src/newcomponents/hovercom/tips/data.js
+++ b/web/src/newcomponents/hovercom/tips/data.js
@@ -1,244 +0,0 @@
 
				-let data = [
			
 
				-  {
			
 
				-    id: 1,
			
 
				-    question: "解放军总医院的院训是什么？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "敬业、忠诚、厚德、创新",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "忠诚、敬业、创新、厚德",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "忠诚、厚德、创新、敬业",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "忠诚、敬业、厚德、创新",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "D",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 2,
			
 
				-    question: "关于修建解放军总医院提出 “先准备、后建设”的国家领导人是谁？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "周恩来",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "毛泽东",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "朱德",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "聂荣臻",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "B",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 3,
			
 
				-    question: "军委直属机关医院改称中国人民解放军第三〇一医院的时间是？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "1954年7月2日",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "1955年7月1日",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "1953年8月5日",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "1954年8月4日",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "D",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 4,
			
 
				-    question: "解放军总医院首任院长是谁？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "靳来川",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "白崇友",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "蒲荣钦",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "涂通今",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "A",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 5,
			
 
				-    question: "20世纪90年代，解放军总医院哪位专家当选为中国工程院首批院士？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "黄志强",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "盛志勇",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "姜泗长",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "卢世璧",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "C",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 6,
			
 
				-    question:
			
 
				-      "解放军总医院2018年，解放军总医院转隶联勤保障部队的日期是？的院训是什么？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "12月28日",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "12月31日",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "12月30日",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "12月29日",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "B",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 7,
			
 
				-    question: "解放军总医院共有几个医学中心、几个医疗区？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "8、5",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "9、6",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "14 、5",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "10、8",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "A",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 8,
			
 
				-    question: "解放军总医院共有多少位院士？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "12",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "10",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "11",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "9",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "A",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 9,
			
 
				-    question: "解放军总医院共有多少个临床医学部？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "8",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "21",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "17",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "25",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "B",
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    id: 10,
			
 
				-    question: "解放军总医院获得过几项国家科技进步一等奖？",
			
 
				-    answer: [
			
 
				-      {
			
 
				-        val: "A",
			
 
				-        title: "9",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "B",
			
 
				-        title: "14",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "C",
			
 
				-        title: "12",
			
 
				-      },
			
 
				-      {
			
 
				-        val: "D",
			
 
				-        title: "15",
			
 
				-      },
			
 
				-    ],
			
 
				-    correct: "C",
			
 
				-  },
			
 
				-];
			
 
				-
			
 
				-export { data };
			
--- a/web/src/newcomponents/hovercom/tips/index.vue
+++ b/web/src/newcomponents/hovercom/tips/index.vue
@@ -51,9 +51,9 @@ export default {
 
				   z-index: 99;
			
 
				   color: #fff;
			
 
				   padding: 30px 36px 0;
			
 
				-  border-top: 8px solid #ccaf8f;
			
 
				+  border-top: 6px solid #ccaf8f;
			
 
				   background: rgba(3, 51, 48, 0.5);
			
 
				-  border-bottom: 8px solid #ccaf8f;
			
 
				+  border-bottom: 6px solid #ccaf8f;
			
 
				   .qtitle {
			
 
				     margin-top: 6px;
			
 
				     text-align: center;
			
--- a/web/src/newcomponents/searchcon/detail/expert.vue
+++ b/web/src/newcomponents/searchcon/detail/expert.vue
@@ -8,7 +8,7 @@
 
				             {{currentItem.name}}
			
 
				             <span>{{currentItem.years?`（${currentItem.years}）`:''}}</span>
			
 
				           </h2>
			
 
				-          <h3>{{currentItem.title || g_typeStr[currentItem.type]}}</h3>
			
 
				+          <h3>{{currentItem.title || g_typeStr[currentItem.level]}}</h3>
			
 
				           <p>{{currentItem.description}}</p>
			
 
				         </div>
			
 
				       </div>
			
--- a/web/src/views/digital/index.vue
+++ b/web/src/views/digital/index.vue
@@ -125,12 +125,11 @@ export default {
 
				     };
			
 
				   },
			
 
				   watch:{
			
 
				-    isshowaside(newVal){
			
 
				-      if (!newVal) {
			
 
				-        this.$refs.ifr.contentWindow.unityInstance.SendMessage('Main Camera', 'RecoverScenePoint');
			
 
				-      }
			
 
				-
			
 
				-    }
			
 
				+    // isshowaside(newVal){
			
 
				+    //   if (!newVal) {
			
 
				+    //     this.$refs.ifr.contentWindow.unityInstance.SendMessage('Main Camera', 'RecoverScenePoint');
			
 
				+    //   }
			
 
				+    // }
			
 
				   },
			
 
				   methods: {
			
 
				     switchtab(data){
			
@@ -204,6 +203,7 @@ export default {
 
				           }
			
 
				           if (data.data.type == "modelLoadFinish") {
			
 
				             this.$hideLoading()
			
 
				+            this.$bus.$emit("hovershowType", 'sandtips');
			
 
				           }
			
 
				         }
			
 
				       });
			
--- a/web/src/views/digital/tips.vue
+++ b/web/src/views/digital/tips.vue
@@ -0,0 +1,169 @@
 
				+<template>
			
 
				+  <div class="aside">
			
 
				+    <div class="asidecon brightness">
			
 
				+      <div class="img">
			
 
				+        <img :src="require(`@/assets/images/digital/tips.jpg`)" alt="" />
			
 
				+      </div>
			
 
				+
			
 
				+      <div class="atitle">
			
 
				+        <p class="qtitle">数字沙盘用户说明</p>
			
 
				+        <div class="qline">
			
 
				+          <img :src="require(`@/assets/images/icon/star.png`)" alt="" />
			
 
				+        </div>
			
 
				+      </div>
			
 
				+
			
 
				+
			
 
				+      <div class="intro">
			
 
				+        <span>点击可以查看对应医学中心或医疗区详情</span>
			
 
				+        <img :src="require(`@/assets/images/project/enter.png`)" alt="" />
			
 
				+      </div>
			
 
				+    </div>
			
 
				+
			
 
				+    <img @click="$emit('close'), (active = 'star1_1')" class="close" :src="require('@/assets/images/project/cancel.png')" alt="" />
			
 
				+
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+  data() {
			
 
				+    return {
			
 
				+    };
			
 
				+  },
			
 
				+
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="less" scoped>
			
 
				+@w: 895px;
			
 
				+.aside {
			
 
				+  position: fixed;
			
 
				+  top: 0;
			
 
				+  left: 0;
			
 
				+  width: 100%;
			
 
				+  height: 100%;
			
 
				+  transition: 0.3s ease all;
			
 
				+  z-index: 999;
			
 
				+  color: #fff;
			
 
				+  .tabul {
			
 
				+    position: absolute;
			
 
				+    bottom: 74px;
			
 
				+    right: 50px;
			
 
				+    font-size: 0;
			
 
				+    z-index: 99999;
			
 
				+    
			
 
				+    > li {
			
 
				+      display: inline-block;
			
 
				+      min-width: 150px;
			
 
				+      height: 55px;
			
 
				+      line-height: 55px;
			
 
				+      margin: 0 auto;
			
 
				+      position: relative;
			
 
				+      padding: 0 20px;
			
 
				+      cursor: pointer;
			
 
				+      font-size: 18px;
			
 
				+      margin: 0 10px;
			
 
				+      background: rgba(255, 255, 255, 0.3);
			
 
				+      color: #fff;
			
 
				+      &.active {
			
 
				+        background: rgba(78, 86, 144, 1);
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+  .asidecon {
			
 
				+    // background: linear-gradient(180deg, rgba(165, 177, 236, 0.7) 0%, rgba(134, 145, 199, 0.7) 100%);
			
 
				+    width: 100%;
			
 
				+    // clip-path: polygon(0 0, 100% 0, 100% 100%, 0 100%);
			
 
				+    height: 100%;
			
 
				+    padding: 62px 78px;
			
 
				+    .atitle {
			
 
				+      margin: 45px auto 0;
			
 
				+      width: @w;
			
 
				+
			
 
				+      .qtitle {
			
 
				+        width: 100%;
			
 
				+        height: 24px;
			
 
				+        font-size: 24px;
			
 
				+        display: inline-block;
			
 
				+        font-weight: bold;
			
 
				+        line-height: 38px;
			
 
				+        text-align: center;
			
 
				+        color: #fff;
			
 
				+      }
			
 
				+      .qline {
			
 
				+        width: 100%;
			
 
				+        height: 1px;
			
 
				+        margin: 26px 0;
			
 
				+        position: relative;
			
 
				+        background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, #ffffff 48%, rgba(255, 255, 255, 0) 100%);
			
 
				+        > img {
			
 
				+          position: absolute;
			
 
				+          left: 50%;
			
 
				+          transform: translateX(-50%);
			
 
				+          width: 32px;
			
 
				+          top: -12px;
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+    .img {
			
 
				+      width: 880px;
			
 
				+      margin: 20px auto;
			
 
				+      position: relative;
			
 
				+      min-height: 460px;
			
 
				+      max-height: 500px;
			
 
				+      overflow: hidden;
			
 
				+      > img {
			
 
				+        width: 100%;
			
 
				+        position: absolute;
			
 
				+        top: 50%;
			
 
				+        left: 50%;
			
 
				+        transform: translate(-50%, -50%);
			
 
				+      }
			
 
				+    }
			
 
				+    .desc {
			
 
				+      text-align: justify;
			
 
				+      width: @w;
			
 
				+      margin: 0 auto;
			
 
				+      > p {
			
 
				+        line-height: 1.8;
			
 
				+        font-size: 20px;
			
 
				+        max-height: 10vh;
			
 
				+        overflow-y: auto;
			
 
				+        padding-right: 10px;
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+    .intro {
			
 
				+      margin: 30px auto 0;
			
 
				+      background: rgba(65, 74, 199, 0.4);
			
 
				+      height: 66px;
			
 
				+      line-height: 66px;
			
 
				+      position: relative;
			
 
				+      display: inline-block;
			
 
				+      padding: 0 90px;
			
 
				+      cursor: pointer;
			
 
				+      > span {
			
 
				+        font-size: 24px;
			
 
				+        width: 100%;
			
 
				+        display: inline-block;
			
 
				+      }
			
 
				+      > img {
			
 
				+        position: absolute;
			
 
				+        top: 50%;
			
 
				+        transform: translateY(-50%);
			
 
				+        right: 20px;
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  .close {
			
 
				+    position: absolute;
			
 
				+    top: 45px;
			
 
				+    right: 50px;
			
 
				+    width: 54px;
			
 
				+    height: 54px;
			
 
				+    cursor: pointer;
			
 
				+    z-index: 9999999;
			
 
				+  }
			
 
				+}
			
 
				+</style>
			
--- a/web/src/views/expert/carousel/bigpic_demo.vue
+++ b/web/src/views/expert/carousel/bigpic_demo.vue
@@ -8,7 +8,7 @@
 
				         v-for="(item, i) in piclist"
			
 
				         :key="i"
			
 
				       >
			
 
				-        <div  data-u="image">
			
 
				+        <div data-u="image">
			
 
				 
			
 
				         <div class="imgdefault">
			
 
				           <!-- 'http://192.168.0.109:8004/'+ -->
			
@@ -16,7 +16,7 @@
 
				           <img :class="{ hideImg: noImg }" :src="item.thumb" alt="" />
			
 
				           <p>
			
 
				             <strong :title="item.name">{{ item.name }}</strong>
			
 
				-            <span :title="item.title || g_typeStr[item.level]">{{ item.title || g_typeStr[item.level] }}</span>
			
 
				+            <span v-if="item.level!=6" :title="item.title || g_typeStr[item.level]">{{ item.title || g_typeStr[item.level] }}</span>
			
 
				             <span :title="item.years ? `（${item.years}）` : ''">{{ item.years ? `（${item.years}）` : "" }}</span>
			
 
				           </p>
			
 
				         </div>
			
@@ -27,7 +27,7 @@
 
				             <span :title="item.years ? `（${item.years}）` : ''">{{ item.years ? `（${item.years}）` : "" }}</span>
			
 
				           </h2>
			
 
				           <h2>
			
 
				-            <strong :title="item.title || g_typeStr[item.level]">{{ item.title || g_typeStr[item.level] }}</strong>
			
 
				+            <strong v-if="item.level!=6" :title="item.title || g_typeStr[item.level]">{{ item.title || g_typeStr[item.level] }}</strong>
			
 
				           </h2>
			
 
				 
			
 
				           <!-- 'http://192.168.0.245:8004/'+ -->
			
--- a/web/src/views/expert/index.vue
+++ b/web/src/views/expert/index.vue
@@ -15,17 +15,11 @@
 
				           </div>
			
 
				           <div class="listcls" :class="{ active: isShowLi }">
			
 
				             <ul>
			
 
				-              <li :class="{ bactive: nowActive.id == item.id ||
			
 
				-               ((nowActive.id == 'loyal_2'||nowActive.id == 'loyal_1')&&item.id=='zongcheng') }" @click="handleItem(item)" v-for="(item, i) in expertlist" :key="i">
			
 
				+              <li :class="{ bactive: nowActive.id == item.id }" @click="handleItem(item)" v-for="(item, i) in expertlist" :key="i">
			
 
				                 {{ item.title }}
			
 
				               </li>
			
 
				             </ul>
			
 
				 
			
 
				-            <ul v-if="nowActive.id == 'zongcheng'">
			
 
				-              <li :class="{ bactive: subtitle == sub.title }" @click="handleItem(sub)" v-for="(sub, ii) in nowActive.sub" :key="ii">
			
 
				-                {{ sub.title }}
			
 
				-              </li>
			
 
				-            </ul>
			
 
				           </div>
			
 
				 
			
 
				           <div class="line"></div>
			
@@ -69,20 +63,8 @@ import { getExpertList } from "@/config/api";
 
				 
			
 
				 let expertlist = [
			
 
				   {
			
 
				-    title: "忠诚的力量",
			
 
				-    id: "zongcheng",
			
 
				-    sub: [
			
 
				-      {
			
 
				-        title: "英模代表专家",
			
 
				-        id: "loyal_2",
			
 
				-        parentid: "zongcheng",
			
 
				-      },
			
 
				-      {
			
 
				-        title: "百岁专家",
			
 
				-        id: "loyal_1",
			
 
				-        parentid: "zongcheng",
			
 
				-      },
			
 
				-    ],
			
 
				+    title: "英模代表专家",
			
 
				+    id: "6",
			
 
				   },
			
 
				   {
			
 
				     title: "院士",
			
@@ -112,14 +94,13 @@ export default {
 
				     return {
			
 
				       isShowLi: false,
			
 
				       position: "0,0",
			
 
				-      nowActive: expertlist[0].sub[0],
			
 
				+      nowActive: expertlist[0],
			
 
				       list: [],
			
 
				       expertlist: expertlist,
			
 
				       current: {},
			
 
				       pageNum: 1,
			
 
				       key: "",
			
 
				-      lockApi: false,
			
 
				-      subtitle:expertlist[0].sub[0].title
			
 
				+      lockApi: false
			
 
				     };
			
 
				   },
			
 
				   watch: {
			
@@ -143,16 +124,6 @@ export default {
 
				     },
			
 
				     handleItem(item) {
			
 
				       this.nowActive = item;
			
 
				-
			
 
				-      if (this.nowActive.parentid == 'zongcheng') {
			
 
				-        this.subtitle = this.nowActive.title
			
 
				-      }
			
 
				-
			
 
				-      if (item.id != "zongcheng") {
			
 
				-        if (item.parentid != "zongcheng") {
			
 
				-          this.subtitle = ''
			
 
				-        }
			
 
				-      }
			
 
				     },
			
 
				 
			
 
				     search(data) {
			
@@ -170,7 +141,7 @@ export default {
 
				         {
			
 
				           pageNum: this.pageNum,
			
 
				           pageSize: 1000,
			
 
				-          type: this.key ? null : (this.nowActive.id == 'zongcheng' ? (this.subtitle=='英模代表专家'?'loyal_2':'loyal_1') : this.nowActive.id) || "loyal_2" || '',
			
 
				+          type: (this.key ? null : this.nowActive.id)|| "6" || '',
			
 
				           searchKey: this.key,
			
 
				         },
			
 
				         (data) => {