Home Explore Help
Register Sign In
chenzhiguang
/
xinjiang_army
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

tremble 3 years ago
parent
efba4c0ebb
commit
5dc51a1562
15 changed files with 229 additions and 13 deletions
Split View Show Diff Stats
  1. BIN
      new_backstage/public/favicon.png
  2. 1 1
      new_backstage/public/index.html
  3. 1 1
      new_backstage/src/assets/font/iconfont.json
  4. BIN
      new_backstage/src/assets/img/logo.png
  5. 2 2
      new_backstage/src/components/uploadFile/index.vue
  6. 1 1
      new_backstage/src/configue/http.js
  7. 50 0
      new_backstage/src/pages/content/collection/componets/audio.vue
  8. 1 1
      new_backstage/src/pages/content/collection/componets/model.vue
  9. 50 0
      new_backstage/src/pages/content/collection/componets/pdf.vue
  10. 1 1
      new_backstage/src/pages/content/collection/componets/video.vue
  11. 108 0
      new_backstage/src/pages/content/collection/data.js
  12. 5 1
      new_backstage/src/pages/content/collection/edit.vue
  13. 6 2
      new_backstage/src/pages/content/scene/index.vue
  14. 1 1
      new_backstage/src/pages/layout/head.vue
  15. 2 2
      new_backstage/src/pages/login/index.vue

BIN
new_backstage/public/favicon.png
View File


+ 1 - 1
new_backstage/public/index.html
View File 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.png">
 
-    <title>中国人民武装警察部队新疆生产建设兵团总部</title>
 
+    <title>中国人民解放军某部</title>
 
   </head>
 
   <body>
 
     <noscript>

+ 1 - 1
new_backstage/src/assets/font/iconfont.json
View File 

@@ -1,6 +1,6 @@
 
 {
 
   "id": "1855608",
 
-  "name": "中国人民武装警察部队新疆生产建设兵团总部",
 
+  "name": "中国人民解放军某部",
 
   "font_family": "iconfont",
 
   "css_prefix_text": "icon",
 
   "description": "展示界面和管理后台",

BIN
new_backstage/src/assets/img/logo.png
View File


+ 2 - 2
new_backstage/src/components/uploadFile/index.vue
View File 

@@ -24,7 +24,7 @@
 
 
 <script>
 
 export default {
 
-  props:['filePath','url','desc'],
 
+  props:['filePath','url','desc','type'],
 
   data(){
 
     return {
 
       token:window.localStorage.getItem('token')
 
@@ -35,7 +35,7 @@ export default {
 
       this.loading = this.$loading(this.loadOption)
 
     },
 
     beforeMultipleUpload(file){
 
-      let typeArr = this.desc.indexOf('4dage')>-1 ? ['.4dage'] : ['avi','mov','rmvb','rm','flv','mp4','3gp']
 
+      let typeArr = this.type
 
       let type = this.isTypeBySend(file.name,typeArr);
 
       if (!type) {
 
         this.$message.error('只允许指定文件格式的文件');

+ 1 - 1
new_backstage/src/configue/http.js
View File 

@@ -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:8003/";
 
+const serverName = isProduction ? "/" : "http://192.168.0.135:8003/";
 
 
 const serverLocation = window.location.hostname;

+ 50 - 0
new_backstage/src/pages/content/collection/componets/audio.vue
View File 

@@ -0,0 +1,50 @@
 
+<template>
 
+  <div>
 
+    <el-form-item label="标题：" prop="name">
 
+      <el-input v-model="form.name" :maxlength="INPUTLENGTH" show-word-limit></el-input>
 
+    </el-form-item>
 
+
 
+    <el-form-item label="精品类型：">
 
+      <el-radio disabled v-model="radio" label="选中且禁用">音频档案</el-radio>
 
+    </el-form-item>
 
+
 
+    <el-form-item label="封面图片：" prop="thumb">
 
+      <uploadThumb :url="thumbUrl" @update="data=>{form.thumb = data}" :thumb="form.thumb" />
 
+    </el-form-item>
 
+
 
+
 
+    <el-form-item label="音频文件：" prop="filePath">
 
+      <uploadFile :url="fileUrl"  @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :filePath="form.filePath" :type="['mp3','wav']" :desc="'支持mp3,wav等格式的音频文件，大小不超过100m'" />
 
+      <audio class="svideo" v-if="form.filePath" controls :src="form.filePath">
 
+      </audio>
 
+    </el-form-item>
 
+
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+import uploadThumb from "@/components/uploadThumb";
 
+import uploadFile from "@/components/uploadFile";
 
+
 
+export default {
 
+  props: ["data",'rule'],
 
+  components: { uploadThumb,uploadFile },
 
+  data() {
 
+    return {
 
+      form: this.data,
 
+      radio: "选中且禁用",
 
+      thumbUrl: this.$serverName + "cms/goods/upload/thumb",
 
+      fileUrl: this.$serverName + "cms/goods/upload/audio",
 
+    };
 
+  },
 
+};
 
+</script>
 
+
 
+<style lang="less" scoped>
 
+iframe{
 
+  width: 50%;
 
+  height: 400px;
 
+  pointer-events: auto!important;
 
+  opacity: 1!important;
 
+}
 
+</style>

+ 1 - 1
new_backstage/src/pages/content/collection/componets/model.vue
View File 

@@ -13,7 +13,7 @@
 
     </el-form-item>
 
 
     <el-form-item label="模型文件：" prop="filePath">
 
-      <uploadFile :url="fileUrl" @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :filePath="form.filePath" :desc="'仅支持.4dage格式的模型文件,大小不得超过500m'" >
 
+      <uploadFile :url="fileUrl" @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :type="['4dage']" :filePath="form.filePath" :desc="'仅支持.4dage格式的模型文件,大小不得超过500m'" >
 
         <div slot="filePath" v-if="form.filePath">
 
           <iframe :src="`/model-page/model.html?m=${form.fileName}`" frameborder="0"></iframe>
 
         </div>

+ 50 - 0
new_backstage/src/pages/content/collection/componets/pdf.vue
View File 

@@ -0,0 +1,50 @@
 
+<template>
 
+  <div>
 
+    <el-form-item label="标题：" prop="name">
 
+      <el-input v-model="form.name" :maxlength="INPUTLENGTH" show-word-limit></el-input>
 
+    </el-form-item>
 
+
 
+    <el-form-item label="精品类型：">
 
+      <el-radio disabled v-model="radio" label="选中且禁用">pdf文件</el-radio>
 
+    </el-form-item>
 
+
 
+    <el-form-item label="封面图片：" prop="thumb">
 
+      <uploadThumb :url="thumbUrl" @update="data=>{form.thumb = data}" :thumb="form.thumb" />
 
+    </el-form-item>
 
+
 
+    <el-form-item label="pdf文件：" prop="filePath">
 
+      <uploadFile :url="fileUrl" :type="['pdf']" @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :filePath="form.filePath" :desc="'仅支持.pdf格式的文件,大小不得超过100m'" >
 
+        <div slot="filePath" v-if="form.filePath">
 
+          <a :href="form.filePath" target="_blank">{{form.fileName}}</a>
 
+        </div>
 
+      </uploadFile>
 
+    </el-form-item>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+import uploadThumb from "@/components/uploadThumb";
 
+import uploadFile from "@/components/uploadFile";
 
+
 
+export default {
 
+  props: ["data",'rule'],
 
+  components: { uploadThumb,uploadFile },
 
+  data() {
 
+    return {
 
+      form: this.data,
 
+      radio: "选中且禁用",
 
+      thumbUrl: this.$serverName + "cms/goods/upload/thumb",
 
+      fileUrl: this.$serverName + "cms/goods/upload/pdf",
 
+    };
 
+  },
 
+};
 
+</script>
 
+
 
+<style lang="less" scoped>
 
+iframe{
 
+  width: 50%;
 
+  height: 400px;
 
+  pointer-events: auto!important;
 
+  opacity: 1!important;
 
+}
 
+</style>

+ 1 - 1
new_backstage/src/pages/content/collection/componets/video.vue
View File 

@@ -13,7 +13,7 @@
 
     </el-form-item>
 
 
     <el-form-item label="视频文件：" prop="filePath">
 
-      <uploadFile :url="fileUrl"  @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :filePath="form.filePath" :desc="'支持AVI、mov、rmvb、rm、FLV、mp4、3GP等格式的视频文件，大小不超过2GB'" />
 
+      <uploadFile :url="fileUrl"  @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :type="['avi','mov','rmvb','rm','flv','mp4','3gp']" :filePath="form.filePath" :desc="'支持AVI、mov、rmvb、rm、FLV、mp4、3GP等格式的视频文件，大小不超过2GB'" />
 
       <video class="svideo" v-if="form.filePath" controls :src="form.filePath">
 
       </video>
 
     </el-form-item>

+ 108 - 0
new_backstage/src/pages/content/collection/data.js
View File 

@@ -112,6 +112,82 @@ let raw = {
 
       prop: "display",
 
       label: "是否显示"
 
     },
 
+  ],
 
+  audio: [
 
+    {
 
+      prop: "idx",
 
+      label: "编号",
 
+    },
 
+    {
 
+      prop: "name",
 
+      label: "标题",
 
+    },
 
+    {
 
+      prop: "thumb",
 
+      label: "封面图片",
 
+    },
 
+    {
 
+      prop: "visit",
 
+      label: "阅读量",
 
+    },
 
+    {
 
+      prop: "userName",
 
+      label: "提交人",
 
+    },
 
+    {
 
+      prop: "updateTime",
 
+      label: "提交时间",
 
+    },
 
+    {
 
+      prop: "status",
 
+      label: "状态",
 
+    },
 
+    {
 
+      prop: "record",
 
+      label: "审核记录",
 
+    },
 
+    {
 
+      prop: "display",
 
+      label: "是否显示"
 
+    },
 
+  ],
 
+  pdf: [
 
+    {
 
+      prop: "idx",
 
+      label: "编号",
 
+    },
 
+    {
 
+      prop: "name",
 
+      label: "标题",
 
+    },
 
+    {
 
+      prop: "thumb",
 
+      label: "封面图片",
 
+    },
 
+    {
 
+      prop: "visit",
 
+      label: "阅读量",
 
+    },
 
+    {
 
+      prop: "userName",
 
+      label: "提交人",
 
+    },
 
+    {
 
+      prop: "updateTime",
 
+      label: "提交时间",
 
+    },
 
+    {
 
+      prop: "status",
 
+      label: "状态",
 
+    },
 
+    {
 
+      prop: "record",
 
+      label: "审核记录",
 
+    },
 
+    {
 
+      prop: "display",
 
+      label: "是否显示"
 
+    },
 
   ]
 
 }
 
 
@@ -128,6 +204,14 @@ let menu = [
 
     id: 'video',
 
     name: "视频档案",
 
   },
 
+  {
 
+    id: 'audio',
 
+    name: "音频档案",
 
+  },
 
+  {
 
+    id: 'pdf',
 
+    name: "pdf文件",
 
+  },
 
 ];
 
 
 let formKey = {
 
@@ -149,6 +233,18 @@ let formKey = {
 
     thumb:'',
 
     filePath:'',
 
     display: false
 
+  },
 
+  audio:{ 
+    name:'',
 
+    thumb:'',
 
+    filePath:'',
 
+    display: false
 
+  },
 
+  pdf:{ 
+    name:'',
 
+    thumb:'',
 
+    filePath:'',
 
+    display: false
 
   }
 
 }
 
 
@@ -167,6 +263,16 @@ let rules = {
 
     name: [{ required: true, message: "请输入标题", trigger: "blur" }],
 
     thumb: [{ required: true, message: "请上传封面图片", trigger: "blur" }],
 
     filePath: [{ required: true, message: "请上传封面图片", trigger: "blur" }]
 
+  },
 
+  audio:{
 
+    name: [{ required: true, message: "请输入标题", trigger: "blur" }],
 
+    thumb: [{ required: true, message: "请上传封面图片", trigger: "change" }],
 
+    filePath: [{ required: true, message: "请上传音频文件", trigger: "change" }]
 
+  },
 
+  pdf:{
 
+    name: [{ required: true, message: "请输入标题", trigger: "blur" }],
 
+    thumb: [{ required: true, message: "请上传封面图片", trigger: "change" }],
 
+    filePath: [{ required: true, message: "请上传pdf文件", trigger: "change" }]
 
   }
 
 }
 
 
@@ -175,6 +281,8 @@ let menuStr = {
 
   'model':'模型',
 
   'img':'图片',
 
   'video':'视频',
 
+  'audio':'模型',
 
+  'pdf':'模型',
 
 }

+ 5 - 1
new_backstage/src/pages/content/collection/edit.vue
View File 

@@ -29,6 +29,8 @@ import { mapGetters } from "vuex";
 
 import vmodel from "./componets/model";
 
 import vimg from "./componets/img";
 
 import vvideo from "./componets/video";
 
+import vaudio from "./componets/audio";
 
+import vpdf from "./componets/pdf";
 
 
 import { formKey, rules } from "./data";
 
 import { save, getDetail } from "@/configue/api";
 
@@ -41,7 +43,9 @@ export default {
 
   components: {
 
     vmodel,
 
     vimg,
 
-    vvideo
 
+    vvideo,
 
+    vaudio,
 
+    vpdf
 
   },
 
   data() {
 
     let { type, id, status } = this.$route.params;

+ 6 - 2
new_backstage/src/pages/content/scene/index.vue
View File 

@@ -48,6 +48,7 @@
 
           >
 
             <el-table-column slot="operate" label="操作" width="190">
 
               <template slot-scope="scope">
 
+                <span class="o-span" @click="openFLink(scope.row)">查看</span>
 
                 <span class="o-span" v-if="activeSub['编辑']" @click="openLink(scope.row)">编辑</span>
 
                 <span class="o-span" v-if="activeSub['删除']" @click="delScene(scope.row)">删除</span>
 
               </template>
 
@@ -102,8 +103,11 @@ export default {
 
         this.list = res.data;
 
       });
 
     },
 
-    openLink(){
 
-      this.$alert('场景链接还没生成')
 
+    openFLink(data){
 
+      window.open('http://www.4dmodel.com/SuperTwo/index.html?m='+data.sceneCode,'_blank')
 
+    },
 
+    openLink(data){
 
+      window.open('http://47.112.166.173:8105/editPage/edit.html?m='+data.sceneCode,'_blank')
 
     },
 
     delScene(data){
 
       this.confirm("删除后，信息将无法恢复，是否继续？", () => {

+ 1 - 1
new_backstage/src/pages/layout/head.vue
View File 

@@ -3,7 +3,7 @@
 
 <div class='header card'>
 
   <div class="header-title">
 
     <img src="@/assets/img/logo.png" alt="">
 
-    <span>中国人民武装警察部队新疆生产建设兵团总部</span>
 
+    <span>中国人民解放军某部</span>
 
   </div>
 
   <div class="header-user">
 
     <div class="avatars" @click="isShowEdit=true,ran=Math.random()">

+ 2 - 2
new_backstage/src/pages/login/index.vue
View File 

@@ -4,13 +4,13 @@
 
   <div class="layout-con">
 
     <div class="logo">
 
       <img :src="require('@/assets/img/logo.png')" alt="">
 
-      <span>中国人民武装警察部队新疆生产建设兵团总部</span>
 
+      <span>中国人民解放军某部</span>
 
     </div>
 
     <img class="bg" :src="require('@/assets/img/bg.jpg')" alt="">
 
     <div class="mask"></div>
 
     <div class="middle">
 
       <div class="middle-left">
 
-        <div>中国人民武装警察部队新疆生产建设兵团总部<br/>管理后台</div>
 
+        <div>中国人民解放军某部<br/>管理后台</div>
 
       </div>
 
       <div class="middle-right">
 
         <el-form class="middle-form" :rules="ruleLogin" status-icon :model="formLogin" ref="formLogin">