shaogen1995 4 роки тому
батько
коміт
80d316a3cb

+ 2 - 1
src/pages/cultural-relic/index.vue

@@ -38,8 +38,9 @@
         <div class="collection-con">
           <ul>
             <li class="theme-color" @click="gotoShow(item)" v-for="(item,i) in tableData" :key="i">
+              <!-- :src="'http://8.135.106.227:8002/'+form.unityPic" -->
               <div class="li-img">
-                <el-image :fit="'cover'" style="width:100%;height:100%;" :src="item.unityPic"></el-image>
+                <el-image :fit="'cover'" style="width:100%;height:100%;" :src="'http://8.135.106.227:8002/'+form.Pic"></el-image>
                 <!-- <div class="liulan"><span>浏览量: {{Math.round(Math.random()*100000)}}</span> 点赞数: {{Math.round(Math.random()*1000)}}</div> -->
               </div>
               <div>{{item.timeName}} {{item.typeName}} <span @click.stop="del(item)" class="del">删除</span></div>

+ 20 - 21
src/pages/editPages/cultural-relic/index.vue

@@ -14,7 +14,7 @@
             <el-form-item prop="name" label="文物名称:" style="width:318px;">
               <el-input v-model="form.name" placeholder="请输入文物名称"></el-input>
             </el-form-item>
-            <el-form-item prop="verticalName" label="竖排文物名">
+            <el-form-item prop="verticalName" label="竖排文物名" v-if="0">
               <el-input type="textarea" v-model="form.verticalName" class="verticla-input" />
               <!-- <textarea rows="10" >
                 在w3school,你可以找到你所需要的所有的网站建设教程。
@@ -26,7 +26,7 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="分类年代:" :rules="[
+            <el-form-item  label="分类年代:" :rules="[
               { required: true}
             ]">
               <el-select v-model="form.timeId" placeholder="请选择分类年代" style="width:400px">
@@ -36,33 +36,33 @@
             <el-form-item label="文物排序:">
               <el-input v-model="form.num" placeholder="请输入文物排序"></el-input>
             </el-form-item>
-            <el-form-item label="文物年代:" >
+            <el-form-item label="文物年代:"  v-if="0">
               <el-input v-model="form.typeTime" maxlength="50" show-word-limit placeholder="请输入文物年代"></el-input>
             </el-form-item>
 
             <el-form-item label="文物介绍:">
                 <vue-editor v-model="form.description" />
             </el-form-item>
-            <el-form-item label="文物介绍预览:">
+            <el-form-item label="文物介绍预览:" v-if="0">
                 <el-input type="textarea" v-model="form.description1" disabled />
             </el-form-item>
-            <el-form-item label="出土信息:" style="width:100%;">
+            <el-form-item label="出土信息:" style="width:100%;" v-if="0">
               <el-input v-model="form.venue" maxlength="50" show-word-limit placeholder="请输入出土信息"></el-input>
             </el-form-item>
 
-             <el-form-item label="文物用途:" style="width:100%;">
+             <el-form-item label="文物用途:" style="width:100%;" v-if="0">
               <el-input v-model="form.purpose" maxlength="50" show-word-limit placeholder="请输入文物用途"></el-input>
             </el-form-item>
 
-             <el-form-item label="文物材质:" style="width:100%;">
+             <el-form-item label="文物材质:" style="width:100%;" v-if="0">
               <el-input v-model="form.texture" maxlength="50" show-word-limit placeholder="请输入文物材质"></el-input>
             </el-form-item>
 
-             <el-form-item label="文物尺寸:" style="width:100%;">
+             <el-form-item label="文物尺寸:" style="width:100%;" v-if="0">
               <el-input v-model="form.size" maxlength="50" show-word-limit placeholder="请输入文物尺寸"></el-input>
             </el-form-item>
 
-            <el-form-item label="备注信息:" style="width:100%;">
+            <el-form-item label="备注信息:" style="width:100%;" v-if="0">
               <el-input v-model="form.remarks" maxlength="50" show-word-limit placeholder="请输入文物出土地点"></el-input>
             </el-form-item>
           </el-form>
@@ -153,7 +153,7 @@
               <el-button type="primary" @click="open">立即前往</el-button>
             </el-form-item> -->
 
-            <el-form-item label="unity文件:">
+            <el-form-item label="unity文件:" v-if="0">
               <el-upload
                 class="upload-demo"
                 drag
@@ -178,7 +178,7 @@
               </el-upload>
             </el-form-item>
 
-            <el-form-item label="视频动画:">
+            <el-form-item label="视频动画:" v-if="0">
               <el-upload
                 class="upload-demo"
                 drag
@@ -279,8 +279,7 @@ export default {
       contentUrlList: [],
       unityUrlList: [],
       rules: {
-        name: [{ required: true, message: '请输入文物名称', trigger: 'blur' }],
-        verticalName: [{ required: true, message: '请输入竖排文物名', trigger: 'blur' }]
+        name: [{ required: true, message: '请输入文物名称', trigger: 'blur' }]
       },
       form: {
         name: '',
@@ -378,14 +377,14 @@ export default {
         })
         return
       }
-      if (!verticalName) {
-        this.$notify.error({
-          title: '错误',
-          message: '请输入竖排文物名称',
-          duration: 2000
-        })
-        return
-      }
+      // if (!verticalName) {
+      //   this.$notify.error({
+      //     title: '错误',
+      //     message: '请输入竖排文物名称',
+      //     duration: 2000
+      //   })
+      //   return
+      // }
       contentUrl = this.contentUrlList[0] ? this.contentUrlList[0].url : ''
       unityUrl = this.unityUrlList[0] ? this.unityUrlList[0].url : ''
       if (type === '2D') {

+ 3 - 0
src/pages/scene/index.vue

@@ -193,6 +193,9 @@ export default {
   display: flex;
   justify-content: space-between;
 }
+.txt p {
+  width: 180px;
+}
 .txt > div {
   padding-right: 30px;
 }