0722

sh_backstage/src/configue/http.js

@@ -11,7 +11,7 @@ let loading = ''
 
 // const serverName = isProduction ? '' : 'http://ly.4dage.com/'
 // const serverName = isProduction ? '' : 'http://192.168.0.207:8100'
-const serverName = isProduction ? '/' : 'http://192.168.0.44:8100/'
+const serverName = isProduction ? '/museumcms/' : 'http://192.168.0.135:8100/museumcms/'
 // http://192.168.0.44:8100/web/index.html#/
 
 const serverLocation = window.location.hostname

sh_backstage/src/pages/content/Architecture.vue

@@ -69,7 +69,7 @@ import MainTop from '@/components/main-top'
 
 const crumbData = [
   {
-    name: '建筑信息',
+    name: '建筑信息管理',
     id: 2
   }
 ]

sh_backstage/src/pages/content/Parts.vue

@@ -72,7 +72,7 @@
 import MainTop from '@/components/main-top'
 const crumbData = [
   {
-    name: '部件信息',
+    name: '部件信息管理',
     id: 4
   }
 ]

sh_backstage/src/pages/content/Roam.vue

@@ -73,7 +73,7 @@
 import MainTop from '@/components/main-top'
 const crumbData = [
   {
-    name: '漫游信息',
+    name: '漫游信息管理',
     id: 4
   }
 ]

sh_backstage/src/pages/content/Structure.vue

@@ -62,7 +62,7 @@
 import MainTop from '@/components/main-top'
 const crumbData = [
   {
-    name: '结构信息',
+    name: '结构模型管理',
     id: 4
   }
 ]

sh_museum/package.json

@@ -8,10 +8,11 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "axios": "^0.19.2",
     "babel-polyfill": "^6.26.0",
     "classlist-polyfill": "^1.2.0",
     "core-js": "^3.6.4",
-    "swiper": "^5.3.8",
+    "swiper": "^5.4.5",
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^4.1.1",
     "vue-router": "^3.1.6"

sh_museum/src/components/slide/index.vue

@@ -21,7 +21,6 @@
     <div class="pagenav" @click="slide('slideNext')">
       <img :src="`${$cdn}images/next.png`" />
       <img class="active" :src="`${$cdn}images/next_active.png`" />
-
     </div>
   </div>
 </template>

sh_museum/src/pages/layout/header.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="header">
     <img class="logo" @click="$router.push({path:'/'})" :src="`${$cdn}images/k.png`" alt="">
-    <div :class="{hide:!hasback}" @click="$router.back()">
+    <div :class="{hide:!hasback}" @click="clickHandle">
       <img :src="`${$cdn}images/back-icon.png`" alt="">
       <p>返回</p>
     </div>
@@ -10,13 +10,19 @@
 
 <script>
 let routeWithBack = [
-      'Floorlist'
+      'Floorlist',
+      'Parts'
     ]
 export default {
   computed:{
     hasback: function () {
       return routeWithBack.find(item=>item===this.$route.name)
     }
+  },
+  methods:{
+    clickHandle(){
+      this.$route.name === 'Parts' ? this.$router.push({path:'/list'}):this.$router.back()
+    }
   }
  
 }
@@ -34,7 +40,6 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  pointer-events: none;
   .logo{
     cursor: pointer;
     width: 220px;

sh_museum/src/pages/list/index.vue

@@ -168,12 +168,6 @@ export default {
   },
   methods: {
     handleItem(){
-      //  this.$showBroadcast({
-      //   link: {
-      //     type: 'part',
-      //     item
-      //   }
-      // })
       this.$router.push({
         name:'Parts',
         query:{

sh_museum/src/pages/parts/index.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="layout">
-    <div class="l-back" @click="$router.push({path:'/list'})">
-      <img :src="`${$cdn}images/back-icon.png`" alt="">
-      <p>返回</p>
-    </div>
     <div class="p-con">
       <div class="p-detail">
         <div class="p-title" ref="ptil">
@@ -60,7 +56,6 @@ export default {
   },
   methods:{
     handleItem(item){
-      console.log(item);
       this.activeItem = item
     },
     sliceStr(str=''){
@@ -73,14 +68,14 @@ export default {
       return arr
     },
     async getList(){
-      let {block,typeId,zone} = this.$route.query
+      let {block,typeId,zone,searchKey=""} = this.$route.query
       let res = await this.$http({
         method:'post',
         data:{
           block,
           pageNum: 1,
           pageSize: 1000,
-          searchKey: "",
+          searchKey,
           typeId,
           zone
         },
@@ -102,14 +97,6 @@ export default {
   top: 0;
   width: calc(100% - 200px);
   left: 0;
-  .l-back{
-    position: absolute;
-    top: 20px;
-    right: 40px;
-    color: @theme;
-    cursor: pointer;
-    z-index: 999;
-  }
   .p-con{
     position: absolute;
     width: 100%;

sh_museum/src/pages/result/index.vue

@@ -13,7 +13,7 @@
       </ul>
       <template v-if="list.length>0">
         <div class="l-con">
-          <Card v-for="(item, i) in list" :item="item" :key="i" />
+          <Card @handleItem="handleItem(item)" v-for="(item, i) in list" :item="item" :key="i" />
         </div>
         <div class="paging" :class="{ pagingshow: total }">
           <Paging
@@ -59,6 +59,17 @@ export default {
     pageChange(num) {
       this.currentPage = num
     },
+    handleItem(){
+      this.$router.push({
+        name:'Parts',
+        query:{
+          block: '',
+          typeId: '',
+          zone: '',
+          searchKey:this.$route.query.keyword
+        }
+      })
+    },
     gotoResult(item = "") {
       this.$router.push({
         name: "Result",

sh_museum/src/pages/tunnel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="layout">
     <div class="video-con">
-      <video ref="tunnel" muted :src="`${$cdn}video/Final_OLD_web.mp4`" autoplay loop></video>
+      <video ref="tunnel" :src="`${$cdn}video/Final_OLD_web.mp4`" autoplay loop></video>
     </div>
     <img v-if="showBtn" class="bofang" :src="`${$cdn}images/bofang.png`" alt="">
   </div>

sh_museum/src/router/index.js

@@ -47,7 +47,7 @@ VueRouter.prototype.push = function push (location) {
     path: '/parts',
     name: 'Parts',
     component: () => import('../pages/parts/index.vue'),
-    meta: {id: 1}
+    meta: {id: 2}
   },
   {
     path: '/select',

sh_museum/src/utils/http.js

@@ -4,7 +4,7 @@ import axios from 'axios'
 // let vue = new Vue()
 
 var isProduction = process.env.NODE_ENV === 'production'
-const serverName = isProduction ? '' : 'http://192.168.0.44:8100/'
+const serverName = isProduction ? '/museumcms/' : 'https://shmuseum.4dage.com/museumcms/'
 
 axios.defaults.baseURL = serverName
 axios.defaults.headers['X-Requested-with'] = 'XMLHttpRequest'