shaogen1995 1 päivä sitten
vanhempi
commit
e8c7fdd08a

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 1
project/public/three/data.js


+ 20 - 0
project/src/pages/A5view/PageSon/A5model/index.module.scss

@@ -18,8 +18,16 @@
     }
     .A5Mtxt {
       position: absolute;
+      height: 86%;
       top: 2%;
       left: 1%;
+      overflow: auto;
+      &::-webkit-scrollbar {
+        width: 0.3vw;
+      }
+      &::-webkit-scrollbar-thumb {
+        background: var(--themeColor2);
+      }
 
       & > h3 {
         color: #f9d36d;
@@ -33,10 +41,22 @@
         font-size: 16px;
         display: flex;
         flex-wrap: wrap;
+
         & > div {
           font-weight: 700;
         }
       }
+
+      .A5Mtext {
+        padding-right: 15px;
+        text-align: justify;
+        font-size: 16px;
+        line-height: 26px;
+        margin-top: 2vh;
+        color: var(--themeColor2);
+        width: 16vw;
+        word-wrap: break-word;
+      }
     }
 
     .A5Mbtn {

+ 5 - 1
project/src/pages/A5view/PageSon/A5model/index.tsx

@@ -51,7 +51,7 @@ function A5model() {
           ></iframe>
 
           {/* 左上角内容 */}
-          <div className='A5Mtxt'>
+          <div className='A5Mtxt mySorrl'>
             <h3>{info.name}</h3>
             {txtArr.map(item => (
               <div className='A5Mrow' key={item.name}>
@@ -59,6 +59,10 @@ function A5model() {
                 <p>{item.txt}</p>
               </div>
             ))}
+
+            {info.text ? (
+              <div className='A5Mtext' dangerouslySetInnerHTML={{ __html: info.text }}></div>
+            ) : null}
           </div>
 
           {/* 关闭按钮 */}

+ 4 - 1
project/src/pages/A5view/PageSon/A5win/index.module.scss

@@ -51,8 +51,11 @@
           }
         }
         .A5Mtu {
+          object-fit: contain;
+          max-width: 46%;
+          max-height: 70%;
           position: absolute;
-          top: 50%;
+          top: 46%;
           left: 50%;
           transform: translate(-50%, -50%);
         }

+ 10 - 7
project/src/pages/A5view/PageSon/A5win/index.tsx

@@ -17,7 +17,6 @@ function A5win({ id, closeFu }: Props) {
 
   const txtArr = useMemo(() => {
     let arr: any[] = []
-
     if (info.id) {
       const obj = info.obj
       for (const k in obj) {
@@ -37,7 +36,8 @@ function A5win({ id, closeFu }: Props) {
               <h3>{info.name}</h3>
               {txtArr.map(item => (
                 <div className='A5Mrow' key={item.name}>
-                  <div>{item.name}:</div>
+                  {item.name.includes('&空') ? null : <div>{item.name}:</div>}
+
                   <p>{item.txt}</p>
                 </div>
               ))}
@@ -45,11 +45,14 @@ function A5win({ id, closeFu }: Props) {
               <img className='A5Mtu' src={`${baseOssUrl}modelSS/img/${info.img}`} alt='' />
 
               <div className='A5Mbtn'>
-                <img
-                  src={require('@/assets/three/icG.png')}
-                  alt=''
-                  onClick={() => history.replace(`/view/atlas?id=${info.id}`)}
-                />
+                {info.son && info.son.length ? (
+                  <img
+                    src={require('@/assets/three/icG.png')}
+                    alt=''
+                    onClick={() => history.replace(`/view/atlas?id=${info.id}`)}
+                  />
+                ) : null}
+
                 <img src={require('@/assets/three/icX.png')} alt='' onClick={closeFu} />
                 <img
                   src={require('@/assets/three/icM.png')}