up

src/main.js

@@ -28,7 +28,8 @@ const checkBtn = {
     myApplication (id) {
       const list = [
         { id: 'web', name: '网页端' },
-        { id: 'app', name: '移动端' }
+        { id: 'app', name: '移动端' },
+        { id: 'webAndApp', name: '网页端 + 移动端' }
       ]
       return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     },

src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 const service = axios.create({
-  // baseURL: 'http://192.168.0.135:8007', // 本地调试
-  baseURL: 'http://8.135.106.227:8010', // 线上调试
-  // baseURL: '', // build
+  // baseURL: 'http://192.168.0.135:8010', // 本地调试
+  // baseURL: 'http://8.135.106.227:8010', // 线上调试
+  baseURL: '', // build
   timeout: 5000
 })
 // 请求拦截器

src/views/tab1/tab1_add.vue

@@ -60,6 +60,10 @@
                 <el-select v-model="ruleForm.application">
                   <el-option label="网页端" value="web"></el-option>
                   <el-option label="移动端" value="app"></el-option>
+                  <el-option
+                    label="网页端 + 移动端"
+                    value="webAndApp"
+                  ></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="应用技术：">
@@ -141,6 +145,14 @@
               placeholder="URL网址链接"
               style="width: 500px"
             ></el-input>
+            <el-input
+              maxlength="32"
+              show-word-limit
+              v-model="tab2Arr[index].remark"
+              placeholder="场景标签"
+              style="width: 200px; margin-left: 20px"
+            ></el-input>
+
             <i
               class="el-icon-circle-close"
               @click="tab2Del(index)"
@@ -248,6 +260,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="文物标签：">
+          <el-input
+            maxlength="50"
+            show-word-limit
+            style="width: 500px"
+            v-model="addForm.remark"
+            placeholder="请输入文物标签"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="文物图片：" class="myImgBox">
           <div class="upImgBox">
             <div
@@ -276,19 +297,19 @@
                 >
               </div>
             </div>
-          <el-upload
-            drag
-            class="avatar-uploader"
-            :action="baseURL + '/cms/goods/upload'"
-            :headers="{ token }"
-            :show-file-list="false"
-            :before-upload="beforethumbUpload"
-            :on-success="upload_thumb_success"
-          >
-            <div class="upImg">
-              <i slot="default" class="el-icon-plus"></i>
-            </div>
-          </el-upload>
+            <el-upload
+              drag
+              class="avatar-uploader"
+              :action="baseURL + '/cms/goods/upload'"
+              :headers="{ token }"
+              :show-file-list="false"
+              :before-upload="beforethumbUpload"
+              :on-success="upload_thumb_success"
+            >
+              <div class="upImg">
+                <i slot="default" class="el-icon-plus"></i>
+              </div>
+            </el-upload>
           </div>
         </el-form-item>
         <span style="margin-left: 100px"
@@ -338,7 +359,8 @@ export default {
         url: '', // 链接
         goodsTypeId: null, // 文物类型id
         // projectId: '', // 项目id
-        thumb: '' // 封面
+        thumb: '', // 封面
+        remark: ''// 文物标签
       },
       addRules: {
         name: [
@@ -358,7 +380,7 @@ export default {
       // 项目网址数据
       tab1Arr: [{ name: '', href: '' }],
       // 三维场景数据
-      tab2Arr: [{ name: '', href: '' }],
+      tab2Arr: [{ name: '', href: '', remark: '' }],
       topTabInd: 0,
       topTab: [
         { name: '项目详情', id: '#tab0' },
@@ -416,9 +438,15 @@ export default {
       } else if (index === 2 && this.topTabInd !== index) {
         tabAll.scrollTop = tab0.offsetHeight + tab1.offsetHeight + 20
       } else if (index === 3 && this.topTabInd !== index) {
-        tabAll.scrollTop = tab0.offsetHeight + tab1.offsetHeight + tab2.offsetHeight + 30
+        tabAll.scrollTop =
+          tab0.offsetHeight + tab1.offsetHeight + tab2.offsetHeight + 30
       } else if (index === 4 && this.topTabInd !== index) {
-        tabAll.scrollTop = tab0.offsetHeight + tab1.offsetHeight + tab2.offsetHeight + tab3.offsetHeight + 40
+        tabAll.scrollTop =
+          tab0.offsetHeight +
+          tab1.offsetHeight +
+          tab2.offsetHeight +
+          tab3.offsetHeight +
+          40
       }
       this.topTabInd = index
     },
@@ -454,7 +482,7 @@ export default {
       ) {
         return this.$message.warning('场景名称或链接不能为空')
       }
-      this.tab2Arr.push({ name: '', href: '' })
+      this.tab2Arr.push({ name: '', href: '', remark: '' })
     },
     tab2Del (index) {
       this.$confirm('确定删除吗?', '提示', {
@@ -518,11 +546,11 @@ export default {
         temp1.push(v.id)
       })
       // 处理项目网址数据
-      const websites = {}
+      const websites = []
       let tempBoo = false
       let tempBoo1 = false
       this.tab1Arr.forEach((v, i) => {
-        websites[v.name] = v.href
+        websites.push({ name: v.name, url: v.href })
         if (i !== this.tab1Arr.length - 1) {
           if (v.name.trim() === '' || v.href.trim() === '') tempBoo = true
         }
@@ -532,11 +560,13 @@ export default {
       if (tempBoo) return this.$message.warning('项目网址名称和链接不能为空')
       if (tempBoo1) return this.$message.warning('项目网址名称或链接不能为空')
       // 处理三维场景数据
-      const scenes = {}
+      const scenes = []
       let tempBoo2 = false
       let tempBoo3 = false
       this.tab2Arr.forEach((v, i) => {
-        if (v.href !== '' && v.name !== '') scenes[v.name] = v.href
+        if (v.href !== '' && v.name !== '') {
+          scenes.push({ name: v.name, remark: v.remark, url: v.href })
+        }
         if (i !== this.tab2Arr.length - 1) {
           if (v.name.trim() === '' || v.href.trim() === '') tempBoo2 = true
         }
@@ -576,7 +606,9 @@ export default {
       if (file.code === 0) {
         this.fuJianArr.push({ name: file.data.name, id: file.data.id })
         this.$message.success('上传成功')
-      } else if (file.code === -1) { this.$message.warning('上传失败，不支持的文件格式') }
+      } else if (file.code === -1) {
+        this.$message.warning('上传失败，不支持的文件格式')
+      }
     },
     // 删除附件
     delFJ (index) {
@@ -894,7 +926,7 @@ export default {
     .txt {
       font-weight: 700;
       height: 40px;
-      border-bottom: 1px solid #A3A2A9;
+      border-bottom: 1px solid #a3a2a9;
     }
     .search {
       position: relative;

src/views/tab1/tab1_edit.vue

@@ -59,6 +59,10 @@
               <el-select v-model="ruleForm.application">
                 <el-option label="网页端" value="web"></el-option>
                 <el-option label="移动端" value="app"></el-option>
+                <el-option
+                  label="网页端 + 移动端"
+                  value="webAndApp"
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="应用技术：">
@@ -141,6 +145,13 @@
             placeholder="URL网址链接"
             style="width: 500px"
           ></el-input>
+          <el-input
+            maxlength="32"
+            show-word-limit
+            v-model="tab2Arr[index].remark"
+            placeholder="场景标签"
+            style="width: 200px; margin-left: 20px"
+          ></el-input>
           <i
             class="el-icon-circle-close"
             @click="tab2Del(index, item.id)"
@@ -249,6 +260,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="文物标签：">
+          <el-input
+            maxlength="50"
+            show-word-limit
+            v-model="addForm.remark"
+            placeholder="请输入文物标签"
+            style="width: 500px"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="文物图片：" class="myImgBox">
           <div class="upImgBox">
             <div
@@ -277,19 +297,19 @@
                 >
               </div>
             </div>
-          <el-upload
-            drag
-            class="avatar-uploader"
-            :action="baseURL + '/cms/goods/upload'"
-            :headers="{ token }"
-            :show-file-list="false"
-            :before-upload="beforethumbUpload"
-            :on-success="upload_thumb_success"
-          >
-            <div class="upImg">
-              <i slot="default" class="el-icon-plus"></i>
-            </div>
-          </el-upload>
+            <el-upload
+              drag
+              class="avatar-uploader"
+              :action="baseURL + '/cms/goods/upload'"
+              :headers="{ token }"
+              :show-file-list="false"
+              :before-upload="beforethumbUpload"
+              :on-success="upload_thumb_success"
+            >
+              <div class="upImg">
+                <i slot="default" class="el-icon-plus"></i>
+              </div>
+            </el-upload>
           </div>
         </el-form-item>
         <span style="margin-left: 100px"
@@ -375,6 +395,7 @@ export default {
         url: '', // 链接
         goodsTypeId: null, // 文物类型id
         // projectId: '', // 项目id
+        remark: '', // 文物标签
         thumb: '' // 封面
       },
       addRules: {
@@ -646,8 +667,12 @@ export default {
       ) {
         return this.$message.warning('网址名称或链接不能为空')
       }
-      if (this.tab1Arr[this.tab1Arr.length - 1].name.length > 32) return this.$message.warning('网址名称不能超过32个字')
-      if (this.tab1Arr[this.tab1Arr.length - 1].url.length > 128) return this.$message.warning('网址链接不能超过128个字')
+      if (this.tab1Arr[this.tab1Arr.length - 1].name.length > 32) {
+        return this.$message.warning('网址名称不能超过32个字')
+      }
+      if (this.tab1Arr[this.tab1Arr.length - 1].url.length > 128) {
+        return this.$message.warning('网址链接不能超过128个字')
+      }
 
       this.tab1Arr.push({ name: '', url: '', id: null })
     },
@@ -674,7 +699,7 @@ export default {
       ) {
         return this.$message.warning('网址名称或链接不能为空')
       }
-      this.tab2Arr.push({ name: '', url: '', id: null })
+      this.tab2Arr.push({ name: '', url: '', id: null, remark: '' })
     },
     tab2Del (index, id) {
       this.$confirm('确定删除吗?', '提示', {
@@ -724,7 +749,9 @@ export default {
           if (v.name.trim() !== '' && v.url.trim() === '') tempBoo1 = true
         })
         if (tempBoo) return this.$message.warning('项目网址名称和链接不能为空')
-        if (tempBoo1) return this.$message.warning('项目网址名称或链接不能为空')
+        if (tempBoo1) {
+          return this.$message.warning('项目网址名称或链接不能为空')
+        }
         const res = await editScene({
           delIds: this.tab1ArrDel.join(','),
           dto: temp
@@ -746,7 +773,8 @@ export default {
               name: v.name,
               projectId: Number(this.$route.query.id),
               type: 'scene',
-              url: v.url
+              url: v.url,
+              remark: v.remark
             })
           }
           if (i !== this.tab2Arr.length - 1) {
@@ -755,8 +783,12 @@ export default {
           if (v.name.trim() === '' && v.url.trim() !== '') tempBoo3 = true
           if (v.name.trim() !== '' && v.url.trim() === '') tempBoo3 = true
         })
-        if (tempBoo2) return this.$message.warning('三维场景名称和链接不能为空')
-        if (tempBoo3) return this.$message.warning('三维场景名称或链接不能为空')
+        if (tempBoo2) {
+          return this.$message.warning('三维场景名称和链接不能为空')
+        }
+        if (tempBoo3) {
+          return this.$message.warning('三维场景名称或链接不能为空')
+        }
 
         const res = await editScene({
           delIds: this.tab2ArrDel.join(','),
@@ -806,12 +838,12 @@ export default {
         setTimeout(() => {
           if (index !== false) this.topTabInd = index
           this.cuontChange1 =
-                this.cuontChange2 =
-                this.cuontChange3 =
-                this.cuontChange4 =
-                this.cuontChange5 =
-                  1
-        }, 100)
+            this.cuontChange2 =
+            this.cuontChange3 =
+            this.cuontChange4 =
+            this.cuontChange5 =
+              1
+        }, 300)
       })
     },
     // 封装获取详情方法
@@ -856,7 +888,7 @@ export default {
                 this.cuontChange4 =
                 this.cuontChange5 =
                   1
-            }, 100)
+            }, 300)
           })
       } else this.topTabInd = index
       // ---------------分割

src/views/tab1/tab1_look.vue

@@ -59,7 +59,7 @@
             v-for="item in tab1Data"
             :key="item.id"
           >
-            <div :title='item.name'>{{ item.name }}：</div>
+            <div :title="item.name">{{ item.name }}：</div>
             <a :href="item.url" target="_blank">{{ item.url }}</a>
           </div>
           <div
@@ -81,16 +81,10 @@
             v-for="item in tab2Data"
             :key="item.id"
           >
-            <div :title='item.name'>{{ item.name }}：</div>
+            <div :title="item.name">{{ item.name }}<span :title="item.remark" v-if="item.remark">（{{item.remark}}）</span> ：</div>
             <a :href="item.url" target="_blank">{{ item.url }}</a>
           </div>
-          <div
-            class="noData"
-            v-if="
-              tab2Data.length === 0"
-          >
-            暂无数据
-          </div>
+          <div class="noData" v-if="tab2Data.length === 0">暂无数据</div>
         </div>
         <div id="tab3" class="conten_box">
           <div class="title">资料文档</div>
@@ -158,6 +152,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="文物标签：">
+          <el-input
+            disabled
+            v-model="addForm.remark"
+            placeholder="请输入文物标签"
+            style="width: 500px"
+          ></el-input>
+        </el-form-item>
+
         <el-form-item label="文物图片：" class="myImgBox">
           <div class="upImgBox" v-if="imgList.length">
             <div
@@ -181,7 +184,7 @@
               </div>
             </div>
           </div>
-          <div v-else style="font-weight: 700;">暂 无</div>
+          <div v-else style="font-weight: 700">暂 无</div>
         </el-form-item>
       </el-form>
 
@@ -189,12 +192,11 @@
         <el-button type="primary" @click="isShow = false">确 定</el-button>
       </div>
     </el-dialog>
-        <!-- 点击查看图片 -->
+    <!-- 点击查看图片 -->
     <div class="lookImg" v-if="dialogImageIshow">
       <img :src="baseURL + dialogImageUrl" alt="" :onerror="defaultImg" />
       <div class="imgBtnX" @click="dialogImageIshow = false">关 闭</div>
     </div>
-
   </div>
 </template>
 
@@ -331,7 +333,7 @@ export default {
 <style lang='less' scoped>
 //@import url(); 引入公共css类
 .template {
-   .lookImg {
+  .lookImg {
     padding-top: 15px;
     display: flex;
     justify-content: center;
@@ -489,16 +491,18 @@ export default {
         }
       }
     }
-      #tab1{
-        .row{
-          width: 60%;
-        }
+    #tab1 {
+      .row {
+        width: 60%;
+        min-width: 800px;
       }
-      #tab2{
-        .row{
-          width: 60%;
-        }
+    }
+    #tab2 {
+      .row {
+        width: 60%;
+        min-width: 800px;
       }
+    }
     .conten_box {
       padding: 15px 30px;
       background-color: #fff;

src/views/tab2/index.vue

@@ -67,9 +67,9 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="文物名称"></el-table-column>
+          <el-table-column prop="name" label="文物名称" width="350"></el-table-column>
           <el-table-column
-            width="120"
+            width="100"
             prop="goodsTypeName"
             label="文物类别"
           ></el-table-column>
@@ -78,7 +78,9 @@
               row.projectName
             }}</span>
           </el-table-column>
-          <el-table-column label="所属项目分类" prop="projectTypeName" width="160">
+          <el-table-column label="所属项目分类" prop="projectTypeName">
+          </el-table-column>
+          <el-table-column label="文物标签" prop="remark">
           </el-table-column>
           <el-table-column label="链接" #default="{ row }">
             <a :href="row.url" target="_blank">{{ row.url }}</a>

src/views/tab3/index.vue

@@ -50,12 +50,13 @@
               {{ scope.$index + (form.pageNum - 1) * form.pageSize + 1 }}
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="场景名称"></el-table-column>
+          <el-table-column prop="name" label="场景名称"  width="350"></el-table-column>
           <el-table-column label="所属项目" #default="{ row }">
             <span style="cursor: pointer;" @click="jump(row.projectId)">{{row.projectName}}</span>
           </el-table-column>
           <el-table-column prop="projectTypeName" label="所属项目分类" width="160"></el-table-column>
-          <el-table-column prop="age" label="项目时间" width="180"> </el-table-column>
+          <el-table-column prop="remark" label="场景标签" width="180"> </el-table-column>
+          <el-table-column prop="age" label="项目时间" width="120"> </el-table-column>
           <el-table-column label="链接" #default="{ row }">
             <a :href="row.url" target="_blank">{{ row.url }}</a>
           </el-table-column>