shaogen1995 2 роки тому
батько
коміт
ed93a5d580

+ 7 - 1
houtai/src/views/tab2/add.vue

@@ -466,6 +466,12 @@ export default {
     padding-right: 300px;
     padding-top: 20px;
 
+    .upHint {
+      position: absolute;
+      bottom: 40px;
+      left: 160px;
+    }
+
     .avatar-uploader .el-upload {
       border-radius: 6px;
       cursor: pointer;
@@ -502,7 +508,7 @@ export default {
 
     /deep/.el-textarea textarea {
       margin-top: 10px;
-      height: 80px;
+      height: 55px;
       resize: none;
     }
 

+ 1 - 0
houtai/src/views/tab2/index.vue

@@ -309,6 +309,7 @@ export default {
             registerNum: v.registerNum,
             dictTextureName: v.dictTextureName,
             dictAgeName: v.dictAgeName,
+            dictLevelName: v.dictLevelName,
             sizeLength: v.sizeLength.replace(',', ''),
             sizeWidth: v.sizeWidth.replace(',', ''),
             sizeHeight: v.sizeHeight.replace(',', ''),

+ 2 - 3
houtai/src/views/tab3/index.vue

@@ -6,17 +6,16 @@
     <div class="obstruct"></div>
     <!-- 主要内容 -->
     <div class="conten">
-      <div class="search"  @keyup.enter="searchBtn">
+      <!-- <div class="search"  @keyup.enter="searchBtn">
         <el-input
           v-model="formData.searchKey"
           placeholder="请输入关键字"
           style="width: 240px"
         ></el-input>
-        <!-- 右侧按钮 -->
         <div class="search_btn">
           <el-button type="primary" @click="searchBtn">查 询</el-button>
         </div>
-      </div>
+      </div> -->
       <!-- 表格 -->
       <div class="table">
         <el-table :data="tableData" style="width: 100%">

+ 9 - 1
webNew/src/components/Model/index.tsx

@@ -27,15 +27,21 @@ export default function Model({ modelId, closeModel }: props) {
     if (modelId) {
       const info = list.filter(v => v.id === modelId)[0]
       setInfo(info)
+      setMusic(true)
+      setTimeout(() => {
+        musicPlayFu(true)
+        
+      }, 500);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [modelId])
 
+
   // 控制模型放大缩小和复位
   const ifrBoxRef = useRef<any>(null)
   const modelChangeFu = (val: number) => {
     const dom = ifrBoxRef.current
-    
+
     if (dom && dom.contentWindow && dom.contentWindow.webview) {
       if (val === 1) dom.contentWindow.webview.zoomIn()  // 放大
       else if (val === 2) dom.contentWindow.webview.zoomOut() // 缩小
@@ -51,6 +57,8 @@ export default function Model({ modelId, closeModel }: props) {
     const dom = musicRef.current
     if (dom) {
       if (flag) {
+        console.log('--------------');
+
         // 打开音乐
         setMusic(true)
         dom.play()

+ 14 - 6
webNew/src/pages/Home/index.module.scss

@@ -58,10 +58,12 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        &>div{
+
+        &>div {
           width: 300px;
           height: 30px;
         }
+
         .search {
           position: relative;
 
@@ -88,7 +90,8 @@
             align-items: center;
           }
         }
-        .sortBox{
+
+        .sortBox {
           margin: 0 40px;
         }
       }
@@ -129,10 +132,11 @@
           background-color: #CFCABD;
           margin: 0 40px 40px 0;
           position: relative;
-          .modelBox_row_hover{
+
+          .modelBox_row_hover {
             opacity: 0;
             position: none;
-            transition:opacity .3s;
+            transition: opacity .3s;
             text-align: center;
             display: flex;
             justify-content: center;
@@ -150,11 +154,13 @@
             width: 100%;
             height: 100%;
           }
-          &:hover{
-            .modelBox_row_hover{
+
+          &:hover {
+            .modelBox_row_hover {
               opacity: 1;
             }
           }
+
           &:nth-of-type(4n) {
             margin-right: 0;
           }
@@ -197,6 +203,7 @@
           justify-content: center;
           align-items: center;
           flex-direction: column;
+          position: relative;
 
           .incoBox {
             font-size: 24px;
@@ -219,6 +226,7 @@
         }
       }
 
+
       .page {
         margin-top: 10px;
         display: flex;