首页 发现 帮助
注册 登录
shaogen1995
/
YuHuaTai-Pc
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

up1

shaogen1995 2 年之前
父节点
509d6ebacb
当前提交
8884bdb819
共有 14 个文件被更改，包括 191 次插入 和 250 次删除
分列视图 显示文件统计
  1. 二进制
      QJKK/src/assets/media/bacMusic.mp3
  2. 1 1
      QJKK/src/framework/show/component/Map.vue
  3. 1 1
      SWKK/src/components/Hot.vue
  4. 0 181
      SWKK/src/components/aa.vue
  5. 61 17
      vue/package-lock.json
  6. 3 3
      vue/package.json
  7. 二进制
      vue/src/assets/media/bacVideo.mp4
  8. 2 2
      vue/src/router/index.js
  9. 23 0
      vue/src/utils/api.js
  10. 1 1
      vue/src/views/Goods/components/Img.vue
  11. 3 6
      vue/src/views/Goods/index.vue
  12. 9 9
      vue/src/views/Home.vue
  13. 81 22
      vue/src/views/LikeNum.vue
  14. 6 7
      vue/src/views/Video/index.vue

二进制
QJKK/src/assets/media/bacMusic.mp3
查看文件


+ 1 - 1
QJKK/src/framework/show/component/Map.vue
查看文件 

@@ -49,7 +49,7 @@ export default {
 
     loadModel(_map) {
 
       const modelLayer = new mars3d.layer.TilesetLayer({
 
         name: '雨花台模型',
 
-        url: 'https://testgis.4dage.com/yuhuatai1019-qp/tileset.json',
 
+        url: 'https://testgis.4dage.com/yuhuatai1021-qp/tileset.json',
 
         maximumMemoryUsage: 2048,
 
         position: { alt: -290 },
 
         preloadFlightDestinations: true,

+ 1 - 1
SWKK/src/components/Hot.vue
查看文件 

@@ -331,7 +331,7 @@ export default {
 
           position: absolute;
 
           top: 40px;
 
           left: 40px;
 
-          width: 450px;
 
+          width: 310px;
 
           & > h3 {
 
             font-size: 20px;
 
             color: #930909;

+ 0 - 181
SWKK/src/components/aa.vue
查看文件 

@@ -1,181 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-    <head>
 
-        <meta charset="UTF-8" />
 
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-        <title>Document</title>
 
-        <style>
 
-            *,
 
-            *::before,
 
-            *::after {
 
-                box-sizing: border-box;
 
-            }
 
-            html,
 
-            body {
 
-                width: 100%;
 
-                height: 100%;
 
-                margin: 0;
 
-                overflow: hidden;
 
-            }
 
-            .scene {
 
-                width: 100%;
 
-                height: 100%;
 
-            }
 
-            #toolbar {
 
-                position: absolute;
 
-                left: 50%;
 
-                top: 0;
 
-                z-index: 10000;
 
-            }
 
-            [xui_tags_view] .tag-body {
 
-                position: absolute;
 
-                left: 50%;
 
-                bottom: 50px;
 
-                transform: translateX(-50%) scale(0);
 
-                transform-origin: bottom;
 
-                transition: all 0.3s cubic-bezier(0.35, 0.32, 0.65, 0.63);
 
-            }
 
-            [xui_tags_view] .tag-body.show {
 
-                transform: translateX(-50%) scale(1);
 
-            }
 
-            [xui_tags_view] .tag-body .tag-image {
 
-                min-width: 230px;
 
-                height: 76px;
 
-                background: hsla(0, 0%, 100%, 0.8);
 
-                box-shadow: 0 3px 6px 0 rgb(0 0 0 / 16%);
 
-                border-radius: 2px;
 
-                position: relative;
 
-                margin-bottom: 30px;
 
-            }
 
-            [xui_tags_view] .tag-body .tag-image::before {
 
-                content: '';
 
-                display: inline-block;
 
-                left: 50%;
 
-                transform: translateX(-50%);
 
-                width: 2px;
 
-                height: 28px;
 
-                bottom: -30px;
 
-                background: linear-gradient(145deg, hsla(0, 0%, 100%, 0.8), hsla(0, 0%, 100%, 0));
 
-                position: absolute;
 
-            }
 
-            [xui_tags_view] .tag-body .tag-image .tag-avatar {
 
-                position: absolute;
 
-                z-index: 99;
 
-                width: 80px;
 
-                height: 80px;
 
-                background: #fff;
 
-                box-shadow: 0 3px 6px 0 rgb(0 0 0 / 16%);
 
-                border-radius: 2px;
 
-                top: -14px;
 
-                left: -12px;
 
-                background-size: cover;
 
-                pointer-events: none;
 
-            }
 
-            [xui_tags_view] .tag-body .tag-image .tag-title {
 
-                padding: 10px 10px 10px 76px;
 
-                overflow: hidden;
 
-                text-overflow: ellipsis;
 
-                white-space: nowrap;
 
-                width: 240px;
 
-            }
 
-            [xui_tags_view] .tag-body .tag-image .tag-info {
 
-                padding: 0 20px 0 76px;
 
-                font-size: 12px;
 
-                overflow: hidden;
 
-                text-overflow: ellipsis;
 
-                white-space: nowrap;
 
-            }
 
-        </style>
 
-    </head>
 
-    <body>
 
-        <div class="tag-audi-q3" style="display: none">
 
-            <span class="tag-icon animate"></span>
 
-            <div class="tag-body">
 
-                <div class="tag-image">
 
-                    <div class="tag-avatar"></div>
 
-                    <div class="tag-title"></div>
 
-                    <div class="tag-info"></div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-        <div id="scene" class="scene"></div>
 
-        <script src="//4dkk.4dage.com/v4/sdk/4.2.2/kankan-sdk-deps.js"></script>
 
-        <script src="//4dkk.4dage.com/v4/sdk/4.2.2/kankan-sdk.js"></script>
 
-        <script>
 
-            var kankan = new KanKan({
 
-                dom: '#scene',
 
-                num: 'KJ-JYo2ZZyKKJ'
 
-            })
 
-            kankan
 
-                .use('TagView', {
 
-                    render(data) {
 
-                        if (data.type == 'image') {
 
-                            if (data.sid === 'rLQekq473993') {
 
-                                // dom方式渲染
 
-                                var tag = document.querySelector('.tag-audi-q3')
 
-                                tag.querySelector('.tag-icon').style.backgroundImage = `url(${data.icon})`
 
-
 
-                                var container = tag.querySelector('.tag-image')
 
-                                
-                                var avatar = container.querySelector('.tag-avatar')
 
-                                avatar.style.backgroundImage = `url(${kankan.resource.getUserResourceURL(data.media[data.type][0].src)})`
 
-
 
-                                var title = container.querySelector('.tag-title')
 
-                                title.innerHTML = data.title
 
-
 
-                                var info = container.querySelector('.tag-info')
 
-                                info.innerHTML = data.content
 
-
 
-                                return tag
 
-                            } else {
 
-                                // 字符串方式渲染
 
-                                return `
 
-                                    <span class="tag-icon animate" style="background-image:url(${data.icon})"></span>
 
-                                    <div class="tag-body">
 
-                                    <div class="tag-image">
 
-                                            <div style="background-image:url(${kankan.resource.getUserResourceURL(data.media[data.type][0].src)})" class="tag-avatar"></div>
 
-                                            <div class="tag-title">${data.title}</div>
 
-                                            <div class="tag-info">${data.content}</div>
 
-                                        </div>
 
-                                    </div>
 
-                                `
 
-                            }
 
-                        } else {
 
-                            // 只渲染图标
 
-                            return `
 
-                                <span class="tag-icon animate" style="background-image:url({{icon}})"></span>
 
-                            `
 
-                        }
 
-                    },
 
-                })
 
-                .then(TagView => {
 
-                    // 监听手动点击事件
 
-                    TagView.on('click', e => {
 
-                        var tag = e.data
 
-
 
-                        // 如果只需监听热点点击，实现其他逻辑操作，下面的代码不需要调用
 
-
 
-                        // 聚焦当前点击的热点
 
-                        TagView.focus(tag.sid)
 
-                    })
 
-
 
-                    // 所有热点渲染完毕
 
-                    TagView.on('rendered',()=>{
 
-                        // 当前视角聚焦事件
 
-                        TagView.on('focus', e => {
 
-                            document.querySelectorAll('[xui_tags_view] >div').forEach(el => {
 
-                                if (el.getAttribute('data-tag-type') == 'image') {
 
-                                    el.querySelector('.tag-body').classList.remove('show')
 
-                                }
 
-                            })
 
-                            // 只有图片类型才自动显示
 
-                            if (e.data.type == 'image') {
 
-                                e.target.querySelector('.tag-body').classList.add('show')
 
-                            }
 
-                        })
 
-                    })
 
-                })
 
-            kankan.render()
 
-        </script>
 
-    </body>
 
-</html>

+ 61 - 17
vue/package-lock.json
查看文件 

@@ -8,6 +8,7 @@
 
       "name": "pc",
 
       "version": "0.1.0",
 
       "dependencies": {
 
+        "axios": "^1.1.3",
 
         "core-js": "^3.6.5",
 
         "v-viewer": "^1.5.1",
 
         "vue": "^2.6.11",
 
@@ -3126,8 +3127,7 @@
 
     "node_modules/asynckit": {
 
       "version": "0.4.0",
 
       "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
 
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
 
-      "dev": true
 
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
 
     },
 
     "node_modules/atob": {
 
       "version": "2.1.2",
 
@@ -3174,6 +3174,29 @@
 
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
 
       "dev": true
 
     },
 
+    "node_modules/axios": {
 
+      "version": "1.1.3",
 
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.1.3.tgz",
 
+      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
 
+      "dependencies": {
 
+        "follow-redirects": "^1.15.0",
 
+        "form-data": "^4.0.0",
 
+        "proxy-from-env": "^1.1.0"
 
+      }
 
+    },
 
+    "node_modules/axios/node_modules/form-data": {
 
+      "version": "4.0.0",
 
+      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
 
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
 
+      "dependencies": {
 
+        "asynckit": "^0.4.0",
 
+        "combined-stream": "^1.0.8",
 
+        "mime-types": "^2.1.12"
 
+      },
 
+      "engines": {
 
+        "node": ">= 6"
 
+      }
 
+    },
 
     "node_modules/babel-loader": {
 
       "version": "8.2.5",
 
       "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz",
 
@@ -4294,7 +4317,6 @@
 
       "version": "1.0.8",
 
       "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
 
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
 
-      "dev": true,
 
       "dependencies": {
 
         "delayed-stream": "~1.0.0"
 
       },
 
@@ -5422,7 +5444,6 @@
 
       "version": "1.0.0",
 
       "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
 
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
 
-      "dev": true,
 
       "engines": {
 
         "node": ">=0.4.0"
 
       }
 
@@ -6499,7 +6520,6 @@
 
       "version": "1.15.2",
 
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
 
       "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
 
-      "dev": true,
 
       "engines": {
 
         "node": ">=4.0"
 
       },
 
@@ -8609,7 +8629,6 @@
 
       "version": "1.52.0",
 
       "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
 
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
 
-      "dev": true,
 
       "engines": {
 
         "node": ">= 0.6"
 
       }
 
@@ -8618,7 +8637,6 @@
 
       "version": "2.1.35",
 
       "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
 
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
 
-      "dev": true,
 
       "dependencies": {
 
         "mime-db": "1.52.0"
 
       },
 
@@ -10477,6 +10495,11 @@
 
         "node": ">= 0.10"
 
       }
 
     },
 
+    "node_modules/proxy-from-env": {
 
+      "version": "1.1.0",
 
+      "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
 
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
 
+    },
 
     "node_modules/prr": {
 
       "version": "1.0.1",
 
       "resolved": "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz",
 
@@ -16779,8 +16802,7 @@
 
     "asynckit": {
 
       "version": "0.4.0",
 
       "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
 
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
 
-      "dev": true
 
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
 
     },
 
     "atob": {
 
       "version": "2.1.2",
 
@@ -16815,6 +16837,28 @@
 
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
 
       "dev": true
 
     },
 
+    "axios": {
 
+      "version": "1.1.3",
 
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.1.3.tgz",
 
+      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
 
+      "requires": {
 
+        "follow-redirects": "^1.15.0",
 
+        "form-data": "^4.0.0",
 
+        "proxy-from-env": "^1.1.0"
 
+      },
 
+      "dependencies": {
 
+        "form-data": {
 
+          "version": "4.0.0",
 
+          "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
 
+          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
 
+          "requires": {
 
+            "asynckit": "^0.4.0",
 
+            "combined-stream": "^1.0.8",
 
+            "mime-types": "^2.1.12"
 
+          }
 
+        }
 
+      }
 
+    },
 
     "babel-loader": {
 
       "version": "8.2.5",
 
       "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz",
 
@@ -17777,7 +17821,6 @@
 
       "version": "1.0.8",
 
       "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
 
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
 
-      "dev": true,
 
       "requires": {
 
         "delayed-stream": "~1.0.0"
 
       }
 
@@ -18698,8 +18741,7 @@
 
     "delayed-stream": {
 
       "version": "1.0.0",
 
       "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
 
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
 
-      "dev": true
 
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
 
     },
 
     "depd": {
 
       "version": "2.0.0",
 
@@ -19609,8 +19651,7 @@
 
     "follow-redirects": {
 
       "version": "1.15.2",
 
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
 
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
 
-      "dev": true
 
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
 
     },
 
     "for-in": {
 
       "version": "1.0.2",
 
@@ -21308,14 +21349,12 @@
 
     "mime-db": {
 
       "version": "1.52.0",
 
       "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
 
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
 
-      "dev": true
 
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
 
     },
 
     "mime-types": {
 
       "version": "2.1.35",
 
       "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
 
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
 
-      "dev": true,
 
       "requires": {
 
         "mime-db": "1.52.0"
 
       }
 
@@ -22887,6 +22926,11 @@
 
         "ipaddr.js": "1.9.1"
 
       }
 
     },
 
+    "proxy-from-env": {
 
+      "version": "1.1.0",
 
+      "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
 
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
 
+    },
 
     "prr": {
 
       "version": "1.0.1",
 
       "resolved": "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz",

+ 3 - 3
vue/package.json
查看文件 

@@ -8,10 +8,10 @@
 
   },
 
   "dependencies": {
 
     "core-js": "^3.6.5",
 
-    "vue": "^2.6.11",
 
-    "vue-router": "^3.2.0",
 
     "v-viewer": "^1.5.1",
 
-    "vue-lazyload": "^1.3.3"
 
+    "vue": "^2.6.11",
 
+    "vue-lazyload": "^1.3.3",
 
+    "vue-router": "^3.2.0"
 
   },
 
   "devDependencies": {
 
     "@vue/cli-plugin-babel": "~4.5.13",

二进制
vue/src/assets/media/bacVideo.mp4
查看文件


+ 2 - 2
vue/src/router/index.js
查看文件 

@@ -5,7 +5,7 @@ Vue.use(VueRouter)
 
 
 const routes = [
 
   {
 
-    path: '/',
 
+    path: '/Home',
 
     name: 'Home',
 
     component: () => import('../views/Home.vue')
 
   },
 
@@ -15,7 +15,7 @@ const routes = [
 
     component: () => import('../views/Goods/index.vue')
 
   },
 
   {
 
-    path: '/Video',
 
+    path: '/',
 
     name: 'Video',
 
     component: () => import('../views/Video/index.vue')
 
   },

+ 23 - 0
vue/src/utils/api.js
查看文件 

@@ -0,0 +1,23 @@
 
+
 
+export const baseURL = 'http://project.4dage.com:8036' //线上地址
 
+//export const baseURL ='http://192.168.20.55:8036' //本地地址
 
+//export const baseURL ='' //甲方有服务器的打包地址
 
+export const addNumAPI = (type) => {
 
+  fetch(`${baseURL}/api/visit/saveType`, {
 
+    method: "post",
 
+    body: JSON.stringify({
 
+      moduleType: "web",
 
+      type,
 
+    }),
 
+    headers: {
 
+      appId:
 
+        "E9A27605CEB3FFAF48F4D7B86858A03D9868419F60B5A45027FB6E6867F4EDA9",
 
+      "Content-Type": "application/json",
 
+    },
 
+  })
 
+    .then((res) => res.text()) //请求得到的数据转换为text
 
+    .then((res) => {
 
+    });
 
+}
 
+
 
+

+ 1 - 1
vue/src/views/Goods/components/Img.vue
查看文件 

@@ -132,7 +132,7 @@ export default {
 
     position: absolute;
 
     top: 44px;
 
     left: 40px;
 
-    width: 308px;
 
+    width: 300px;
 
     h3 {
 
       font-size: 20px;
 
       color: #930909;

+ 3 - 6
vue/src/views/Goods/index.vue
查看文件 

@@ -131,6 +131,8 @@
 
 </template>
 
 
 <script>
 
+import { addNumAPI } from "@/utils/api";
 
+
 
 import { goodsData } from "./data";
 
 import Three from "./components/Three.vue";
 
 import Tow from "./components/Tow.vue";
 
@@ -211,12 +213,7 @@ export default {
 
         setTimeout(() => {
 
           this.like = false;
 
         }, 2000);
 
-
 
-        fetch("http://map.4dage.com:8109/api/count/saveStar/museum_yuhuatai")
 
-          .then((response) => response.json())
 
-          .then((data) => {
 
-            console.log("增加点赞量");
 
-          });
 
+        addNumAPI("star");
 
       }
 
       if (type === 4) this.share = true;
 
     },

+ 9 - 9
vue/src/views/Home.vue
查看文件 

@@ -13,7 +13,7 @@
 
     </div>
 
     <!-- 底部列表 -->
 
     <div class="tab">
 
-      <div class="row" @click="$router.replace('/Video')">场馆漫游</div>
 
+      <div class="row" @click="toSwkk">场馆漫游</div>
 
       <div class="row row2" @click="toQjkk">全景风貌</div>
 
       <div class="row row3" @click="toGoods">文物赏析</div>
 
     </div>
 
@@ -21,6 +21,7 @@
 
 </template>
 
 
 <script>
 
+import { addNumAPI } from "@/utils/api";
 
 export default {
 
   name: "Home",
 
   components: {},
 
@@ -42,6 +43,9 @@ export default {
 
   },
 
   //方法集合
 
   methods: {
 
+    toSwkk() {
 
+      window.location.replace("/YHT/Swkk/index.html#/1");
 
+    },
 
     toQjkk() {
 
       window.location.replace("/YHT/Qjkk/show.html?id=WK1578926366500417536");
 
     },
 
@@ -52,15 +56,11 @@ export default {
 
     },
 
   },
 
   //生命周期 - 创建完成（可以访问当前this实例）
 
-  created() {},
 
-  //生命周期 - 挂载完成（可以访问DOM元素）
 
-  mounted() {
 
-    fetch("http://map.4dage.com:8109/api/count/saveVisit/museum_yuhuatai")
 
-      .then((response) => response.json())
 
-      .then((data) => {
 
-        console.log("增加访问量");
 
-      });
 
+  created() {
 
+    addNumAPI("visit");
 
   },
 
+  //生命周期 - 挂载完成（可以访问DOM元素）
 
+  mounted() {},
 
   beforeCreate() {}, //生命周期 - 创建之前
 
   beforeMount() {}, //生命周期 - 挂载之前
 
   beforeUpdate() {}, //生命周期 - 更新之前

+ 81 - 22
vue/src/views/LikeNum.vue
查看文件 

@@ -5,9 +5,10 @@
 
       <div class="allNum">
 
         <p>
 
           <span class="all1">总访问量：</span>
 
-          <span class="num">5000</span>&emsp;&emsp;
 
+          <span class="num">{{ countVisit }}</span
 
+          >&emsp;&emsp;
 
           <span class="all2">总点赞量：</span>
 
-          <span class="num">2000</span>
 
+          <span class="num">{{ countStar }}</span>
 
         </p>
 
       </div>
 
     </div>
 
@@ -15,12 +16,16 @@
 
 </template>
 
 
 <script>
 
+import { baseURL } from "@/utils/api";
 
 export default {
 
   name: "LikeNum",
 
   components: {},
 
   data() {
 
     //这里存放数据
 
-    return {};
 
+    return {
 
+      countStar: 0,
 
+      countVisit: 0,
 
+    };
 
   },
 
   //监听属性 类似于data概念
 
   computed: {},
 
@@ -28,7 +33,7 @@ export default {
 
   watch: {},
 
   //方法集合
 
   methods: {
 
-    echartsFu(data1, data2, data3, data4) {
 
+    echartsFu(data1, data2, data3) {
 
       let ecDemo = echarts.init(document.getElementById("echartsBox"));
 
       let option = {
 
         color: ["#37F4E9", "#FFD15C"],
 
@@ -77,6 +82,8 @@ export default {
 
             show: false,
 
           },
 
           axisLabel: {
 
+            // interval: 0,//使x轴文字显示全
 
+            // rotate:30,
 
             textStyle: {
 
               show: true,
 
               fontFamily: "微软雅黑",
 
@@ -169,23 +176,75 @@ export default {
 
     dom.style.minHeight = "100vh";
 
     dom.style.overflow = "hidden";
 
 
-    let arr1 = [
 
-      "",
 
-      "2022-10-12",
 
-      "2022-10-13",
 
-      "2022-10-14",
 
-      "2022-10-15",
 
-      "2022-10-16",
 
-      "2022-10-17",
 
-      "2022-10-18",
 
-      "2022-10-19",
 
-      "2022-10-20",
 
-      "2022-10-21",
 
-      "",
 
-    ];
 
-    let arr2 = [0, 10, 50, 20, 33, 13, 46, 46, 45, 66, 78, 0];
 
-    let arr3 = [0, 7, 34, 66, 13, 66, 75, 22, 31, 45, 54, 0];
 
-    this.echartsFu(arr1, arr2, arr3);
 
+    fetch(`${baseURL}/api/visit/getReport`, {
 
+      method: "post",
 
+      body: JSON.stringify({
 
+        moduleType: "web",
 
+        pcs: 10,
 
+      }),
 
+      headers: {
 
+        appId:
 
+          "E9A27605CEB3FFAF48F4D7B86858A03D9868419F60B5A45027FB6E6867F4EDA9",
 
+        "Content-Type": "application/json",
 
+      },
 
+    })
 
+      .then((res) => res.text()) //请求得到的数据转换为text
 
+      .then((res) => {
 
+        let data = JSON.parse(res);
 
+        this.countVisit = data.data.countVisit;
 
+        this.countStar = data.data.countStar;
 
+        let temp1 = data.data.rankingStar.reverse();
 
+        let temp2 = data.data.rankingVisit.reverse();
 
+        console.log("-------111-", temp1, temp2);
 
+        let arr1 = [];
 
+        let arr2 = [];
 
+        let arr3 = [];
 
+        if (temp2.length >= temp1.length) {
 
+
 
+
 
+
 
+          temp2.forEach((v, i) => {
 
+            arr1.push(v.day);
 
+            arr2.push(v.pcs);
 
+            if (temp1[i]&&temp1[i].day===v.day) {
 
+              console.log('------ssss',temp1[i].day,v.day);
 
+              arr3.push(temp1[i].pcs)
 
+              }
 
+            else arr3.push(0)
 
+          });
 
+        } else {
 
+          temp1.forEach((v, i) => {
 
+            arr1.push(v.day);
 
+            arr3.push(v.pcs);
 
+            if (temp2[i]) arr2.push(temp2[i].pcs);
 
+            else arr2.push(0);
 
+          });
 
+        }
 
+        arr1.push("");
 
+        arr2.push(0);
 
+        arr3.push(0);
 
+        arr1.unshift("");
 
+        arr2.unshift(0);
 
+        arr3.unshift(0);
 
+        console.log("---------", arr1, arr2, arr3);
 
+        // let arr1 = [
 
+        //   "",
 
+        //   "2022-10-12",
 
+        //   "2022-10-13",
 
+        //   "2022-10-14",
 
+        //   "2022-10-15",
 
+        //   "2022-10-16",
 
+        //   "2022-10-17",
 
+        //   "2022-10-18",
 
+        //   "2022-10-19",
 
+        //   "2022-10-20",
 
+        //   "2022-10-21",
 
+        //   "",
 
+        // ];
 
+        // let arr2 = [0, 10, 50, 20, 33, 13, 46, 46, 45, 66, 78, 0];
 
+        // let arr3 = [0, 7, 34, 66, 13, 66, 75, 22, 31, 45, 54, 0];
 
+        this.echartsFu(arr1, arr2, arr3);
 
+      });
 
   },
 
   beforeCreate() {}, //生命周期 - 创建之前
 
   beforeMount() {}, //生命周期 - 挂载之前
 
@@ -266,7 +325,7 @@ export default {
 
       width: 100% !important;
 
       top: -30px !important;
 
       left: 0 !important;
 
-      &>p{
 
+      & > p {
 
         justify-content: center;
 
       }
 
     }

+ 6 - 7
vue/src/views/Video/index.vue
查看文件 

@@ -8,12 +8,10 @@
 
         muted
 
         autoplay
 
       ></video>
 
-      <div class="skip" :class="{ active: skip }" @click="show = true">
 
-        跳过
 
-      </div>
 
+      <div class="skip" :class="{ active: skip }" @click="toSwkk">跳过</div>
 
     </div>
 
 
-    <div class="bacImg">
 
+    <div class="bacImg" v-show="0">
 
       <div class="btnn" @click="toSwkk">&emsp;进入展馆</div>
 
     </div>
 
   </div>
 
@@ -36,9 +34,9 @@ export default {
 
   watch: {},
 
   //方法集合
 
   methods: {
 
-    toSwkk(){
 
-      window.location.replace('/YHT/Swkk/index.html#/1')
 
-    }
 
+    toSwkk() {
 
+      this.$router.push("/Home");
 
+    },
 
   },
 
   //生命周期 - 创建完成（可以访问当前this实例）
 
   created() {},
 
@@ -50,6 +48,7 @@ export default {
 
     let dom = document.querySelector("#VideoDom");
 
     dom.addEventListener("ended", () => {
 
       this.show = true;
 
+      this.$router.push("/Home");
 
     });
 
   },
 
   beforeCreate() {}, //生命周期 - 创建之前