Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/liangqichao_new

bigscene/.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 node_modules
 /dist
-public/data/*
 
 
 # local env files

bigscene/README.md

@@ -1,4 +1,4 @@
-# code
+# bigscene_new
 
 ## Project setup
 ```

bigscene/package.json

@@ -1,21 +1,19 @@
 {
-  "name": "code",
+  "name": "bigscene_new",
   "version": "0.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "serve-bendi": "vue-cli-service serve --mode bendi",
     "build": "vue-cli-service build",
-    "build-bendi": "vue-cli-service build --mode bendi",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
     "core-js": "^3.6.5",
-    "v-viewer": "^1.6.4",
     "vue": "^2.6.11",
+    "vue-router": "^3.2.0",
+    "v-viewer": "^1.6.4",
     "swiper": "^5.3.8",
-    "vue-awesome-swiper": "^4.1.1",
-    "vue-router": "^3.2.0"
+    "vue-awesome-swiper": "^4.1.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

bigscene/public/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>中国华能</title>
+    <title></title>
     <meta name="description" content="四维时代">
     <meta property="og:title" content="四维时代">
     <meta property="og:description" content="四维时代">

bigscene/public/static/css/main.css

@@ -3343,7 +3343,7 @@ a.hasHover:hover, a:active {
 }
 
 .darkGlass {
-    background-color: rgba(0, 0, 0, .45)
+    background-color: rgba(158, 73, 35, 0.9)
 }
 
 .ui-icon {
@@ -3473,7 +3473,7 @@ a.hasHover:hover, a:active {
 
 #gui-modes-map>div[rel] {
     float: left;
-    width: 94px;
+    width: 80px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -3869,7 +3869,7 @@ a.hasHover:hover, a:active {
 
 #play, #pause {
     position: relative;
-    width: 94px;
+    width: 80px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -4029,10 +4029,9 @@ a.hasHover:hover, a:active {
 
 .frame {
     width: calc(100% - 20px);
+    height: 136px;
     margin: 9px 10px;
-    float: left;
-    display: flex;
-    justify-content: center;
+    float: left
 }
 
 .frame.noScroll {
@@ -4108,11 +4107,11 @@ a.hasHover:hover, a:active {
 
 .frame .slidee li.thumbImg.active>img, .frame .slidee li.thumbImg.hasHover.active>img:hover {
     opacity: 1;
-    border: 2px solid #00F3FF;
+    border: 2px solid #FCC677;
 }
 
 .frame .slidee li.thumbImg.active>.overlay, .frame .slidee li.thumbImg.hasHover.active>.overlay:hover {
-    color: #00F3FF;
+    color: #FCC677;
 }
 
 .scrollbar {
@@ -4127,7 +4126,7 @@ a.hasHover:hover, a:active {
 .scrollbar .handle {
     width: 100px;
     height: 100%;
-    background: #00F3FF;
+    background: #FCC677;
     border-radius: 5px
 }