Merge remote-tracking branch 'origin/master'

package-lock.json

@@ -1,9 +1,14 @@
 {
   "name": "saber-admin",
-  "version": "2.8.1",
+  "version": "2.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@amap/amap-vue": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@amap/amap-vue/-/amap-vue-2.0.13.tgz",
+      "integrity": "sha512-aFIehFi01acAcDMvGUsAC9HxIhDNNOnBxb25dHdO/CbFGEegaOfCxDo6l9adkn4mVW5SgD6nPhkT4R+xVWhc7w=="
+    },
     "@babel/code-frame": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
@@ -10877,6 +10882,11 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
       "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
     },
+    "signals": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz",
+      "integrity": "sha1-ZfDBWZNSs1Ny7KrlolDmEHN27Wk="
+    },
     "simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",

package.json

@@ -33,6 +33,7 @@
     "nprogress": "^0.2.0",
     "portfinder": "^1.0.23",
     "script-loader": "^0.7.2",
+    "signals": "^1.0.0",
     "three": "^0.131.3",
     "vue": "^2.6.10",
     "vue-axios": "^2.1.2",

src/components/basic-container/main.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="basic-container"
+  <div class="basic-container silderFromLeft"
        :class="{'basic-container--block':block}">
     <el-card>
       <slot></slot>

src/main.js

@@ -9,7 +9,7 @@ import './cache';//页面缓存
 import store from './store';
 import {loadStyle} from './util/util'
 import * as urls from '@/config/env';
-import './styles/element-theme/index.css'
+// import './styles/element-theme/index.css'
 import Element from 'element-ui';
 import dataV from '@jiaminghi/data-view'
 import AmapVue from '@amap/amap-vue';

src/page/index/logo.vue

@@ -48,9 +48,9 @@ export default {
   left: 0;
   width: 240px;
   height: 64px;
-  margin-top: 64px;
+  /* margin-top: 64px; */
   line-height: 64px;
-  background-color: #1b315e;
+  /* background-color: #1b315e; */
   font-size: 20px;
   overflow: hidden;
   box-sizing: border-box;

src/page/index/sidebar/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="avue-sidebar">
-    <!-- <logo></logo> -->
+  <div class="avue-sidebar toRight">
+    <logo></logo>
     <el-scrollbar style="height:100%">
       <div v-if="validatenull(menu)"
            class="avue-sidebar--tip">{{$t('menuTip')}}

src/page/index/top/index.vue

@@ -96,10 +96,11 @@
       </el-dropdown>
     </div>
     <!-- announcement 公告  -->
-    <div class="announcement"></div>
+    
+    <!-- <div class="announcement"></div>
     <div class="nav-bar">
       <navbar></navbar>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>

src/page/index/top/nav/nav-bar.vue

@@ -97,7 +97,7 @@ export default {
       transition: color 0.2s;
       text-decoration: none !important;
       display: block;
-      color: #dddddd;
+      color: #1A1D2D80;
       width: auto;
       min-width: 80px;
       line-height: 40px;

src/page/index/top/nav/nav-canvas.js

@@ -76,7 +76,7 @@ export class NavCanvas {
     ctx.lineWidth = 0.4
     for (let g = 3, h = 0.8, j = 1; 30 > j; j++) {
     //设置或返回用于笔触的颜色、渐变或模式
-      ctx.strokeStyle = `RGBA(22, 120, 160, ${h})`
+      ctx.strokeStyle = `RGBA(26,29,45, ${h})`
       //开始一条路径
       ctx.beginPath()
       //把路径移动到画布中的指定点，不创建线条
@@ -119,9 +119,9 @@ export class NavCanvas {
 
     //clearRect 在给定的矩形内清除指定的像素,这里清完了
     ctx.clearRect(0, 0, 2 * opt.width, 2 * opt.height)
-    ctx.shadowColor = 'rgba(36, 131, 255, 1)'
+    ctx.shadowColor = 'rgba(26,29,45, 1)'
     ctx.shadowBlur = 5
-    ctx.strokeStyle = '#004CB3'
+    ctx.strokeStyle = '#1A1D2D'
     ctx.lineWidth = 0.8
     ctx.fillStyle = 'none'
     this.draw(ctx, false)

src/page/login/index.vue

@@ -2,72 +2,33 @@
   <div class="login-container"
        ref="login"
        @keyup.enter.native="handleLogin">
-       <particles/>
-       <indexbg/>
-      <!-- <div class="login-container-left">
-        <h4 class="login-title"> -->
-          <!-- {{ $t('login.title') }} -->
-          <!-- {{website.title}} -->
-          <!-- <top-lang></top-lang> -->
-        <!-- </h4>
-        <div class="bg"></div>
+    <top-color v-show="false"></top-color>
+    <div class="login-weaper animated bounceInDown">
+      <div class="login-left">
+        <div class="login-time">
+          {{time}}
+        </div>
+        <img class="img" src="/img/logo.png" alt="">
+        <p class="title">{{ $t('login.info') }}</p>
       </div>
-      <div class="login-container-right"> -->
-        <!-- <div class="login-weaper animated bounceInDown">
-        <div class="login-left">
-          <div class="login-time">
-            {{time}}
+      <div class="login-border">
+        <div class="login-main">
+          <h4 class="login-title">
+            {{ $t('login.title') }}{{website.title}}
+            <top-lang></top-lang>
+          </h4>
+          <userLogin v-if="activeName==='user'"></userLogin>
+          <codeLogin v-else-if="activeName==='code'"></codeLogin>
+          <thirdLogin v-else-if="activeName==='third'"></thirdLogin>
+          <div class="login-menu">
+            <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>
+            <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
+            <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>
           </div>
-          <img class="img" src="/img/logo.png" alt="">
-          <p class="title">{{ $t('login.info') }}</p>
-        </div> -->
-        <div class="login-border">
-          <div class="login-main">
-            <span class="login-title">{{website.title}}</span>
-            <userLogin v-if="activeName==='user'"></userLogin>
-            <codeLogin v-else-if="activeName==='code'"></codeLogin>
-            <thirdLogin v-else-if="activeName==='third'"></thirdLogin>
-            <div class="login-menu">
-              <!-- <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a> -->
-              <!-- <a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a> -->
-              <!-- <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a> -->
-            </div>
-          </div>
-      </div>
-    <!-- </div>
-      </div> -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+        </div>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <!-- <top-color v-show="false"></top-color> -->
-      <foot/>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -80,9 +41,7 @@
   import topLang from "@/page/index/top/top-lang";
   import topColor from "@/page/index/top/top-color";
   import {getQueryString, getTopUrl} from "@/util/util";
-  import indexbg from '@/components/login/bg'
-  import particles from "@/components/login/particles";
-  import foot from "@/components/login/foot";
+
   export default {
     name: "login",
     components: {
@@ -90,10 +49,7 @@
       codeLogin,
       thirdLogin,
       topLang,
-      topColor,
-      particles,
-      indexbg,
-      foot
+      topColor
     },
     data() {
       return {
@@ -160,4 +116,4 @@
 
 <style lang="scss">
   @import "@/styles/login.scss";
-</style>
+</style>

src/router/views/index.js

@@ -1,5 +1,6 @@
 import Layout from '@/page/index/'
-export default [{
+export default [
+  {
   path: '/wel',
   component: Layout,
   redirect: '/wel/index',
@@ -34,7 +35,18 @@ export default [{
     component: () =>
       import( /* webpackChunkName: "views" */ '@/views/util/test')
   }]
-}, {
+}, 
+// {
+//   path: '/editor',
+//   component: Layout,
+//   children: [{
+//     path: 'scene',
+//     name: '3D场景设计器',
+//     component: () =>
+//       import( /* webpackChunkName: "views" */ '@/views/editor/editor')
+//   }]
+// },
+{
   path: '/dict-horizontal',
   component: Layout,
   redirect: '/dict-horizontal/index',

src/store/modules/common.js

@@ -9,7 +9,7 @@ const common = {
 
   state: {
     language: getStore({name: 'language'}) || 'zh',
-    isCollapse: true,
+    isCollapse: false,
     isFullScren: false,
     isMenu: true,
     isShade: false,
@@ -22,7 +22,7 @@ const common = {
     showLock: true,
     showFullScren: true,
     showTheme: false,
-    showMenu: false,
+    showMenu: true,
     showColor: false,
     colorName: getStore({name: 'colorName'}) || '#409EFF',
     themeName: getStore({name: 'themeName'}) || 'theme-default',

src/styles/avue.scss

@@ -1,52 +0,0 @@
-$backgrouind: #17171A;
-
-.avue-crud__menu{
-  background: $backgrouind;
-}
-.avue-group .el-collapse,
-.avue-group .el-collapse-item__wrap {
-  border-color: $backgrouind;
-}
-
-.avue-crud .el-table th {
-  word-break: break-word;
-  color: rgba(0, 0, 0, .85);
-  background-color: #404458;
-}
-
-.el-loading-mask {
-  background-color: $backgrouind;
-}
-
-//对话框
-.avue-dialog .el-dialog__title,
-.avue-dialog .el-drawer__header {
-  color: #4f546f;
-}
-
-.avue-dialog .el-dialog__header {
-  padding: 16px 24px;
-  min-height: 20px;
-  border-bottom: 1px solid $backgrouind;
-}
-
-//空状态文本
-.avue-empty__desc {
-  color: #4f546f;
-}
-
-//日期范围选择输入
-.el-range-editor--small .el-range-input {
-  background: $backgrouind;
-}
-
-//表格斑马条纹
-.el-table--striped .el-table__body tr.el-table__row--striped td {
-  background: #414b57;
-}
-
-//表头字体颜色
-.avue-crud .el-table th {
-  color: rgba(164, 160, 160, 0.85);
-  background-color: #404458;
-}

src/styles/common.scss

@@ -13,20 +13,11 @@
 // 动画
 @import './animate/vue-transition.scss';
 //主题
-@import './element-theme/index.css';
+@import './theme/index.scss';
 //适配
 @import './media.scss';
 //通用配置
 @import './normalize.scss';
-//element - 重写的样式
-@import url(./element-rewrite/index.scss);
-//avue - 重写的样式
-@import url(./avue.scss);
-
-
-
-
-
 
 a{
   text-decoration: none;
@@ -36,60 +27,4 @@ a{
   outline: none;
 }
 //滚动条样式
-@include scrollBar;
-
-.center{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.full{
-  width: 100%;
-  height: 100%;
-}
-.linkHover:hover{
-  cursor: pointer;
-  text-shadow: 2px 2px 2px #007e8c;
-  text-decoration: underline;
-}
-
-.enterBuilding:hover:after{
-  content: "(进入楼栋)";
-}
-
-.toRight{
-  animation: to-right 1s ease-in-out ;
-}
-@keyframes to-right {
-  from{
-    opacity: 0;
-    transform: translate(-100%,0);
-  }
-}
-.toLeft{
-  animation: to-left 1s ease-in-out;
-}
-@keyframes to-left {
-  from{
-    opacity: 0;
-    transform: translate(100%,0);
-  }
-}
-.toTop{
-  animation: to-top 1s ease-in-out ;
-}
-@keyframes to-top {
-  from{
-    opacity: 0;
-    transform: translate(0,100%);
-  }
-}
-.toBottom{
-  animation: to-bottom 1s ease-in-out;
-}
-@keyframes to-bottom {
-  from{
-    opacity: 0;
-    transform: translate(0,-100%);
-  }
-}
+@include scrollBar;

src/styles/element-rewrite/index.scss

@@ -1 +0,0 @@
-@import url(./message.scss);

src/styles/element-rewrite/message.scss

@@ -1,58 +0,0 @@
-@import "../variables.scss";
-
-.el-message {
-  border-radius: 0;
-
-  .el-message__icon {
-    font-size: 16px;
-  }
-
-  .el-icon-success {
-    color: $color-success;
-  }
-
-  .el-icon-warning {
-    color: $color-warning;
-  }
-
-  .el-icon-error {
-    color: $color-red;
-  }
-}
-
-.el-message--error {
-  background-color: $message-bgcolor-error;
-  border-color: $message-border-color-error;
-
-  .el-message__content {
-    font-size: 12px;
-    font-weight: 500;
-    color: $message-font-color;
-  }
-}
-
-.el-message--success {
-  background-color: $message-bgcolor-success;
-  border-color: $message-border-color-success;
-
-  .el-message__content {
-    font-size: 12px;
-    font-weight: 500;
-    color: $message-font-color;
-  }
-}
-
-.el-message--warning {
-  background-color: $message-bgcolor-warning;
-  border-color: $message-border-color-warning;
-
-  .el-message__content {
-    font-size: 12px;
-    font-weight: 500;
-    color: $message-font-color;
-  }
-}
-
-.el-message__closeBtn {
-  color: $message-font-color;
-}

src/styles/element-ui.scss

@@ -69,4 +69,3 @@
 .el-divider--horizontal {
   margin: 12px 0 !important;
 }
-

src/styles/login.scss

@@ -1,14 +1,11 @@
 .login-container {
   display: flex;
   align-items: center;
-  flex-direction: column;
   position: relative;
-  overflow: hidden;
   width: 100%;
   height: 100%;
-  background-color: #4682B4;
   margin: 0 auto;
-  // background-image: url("/img/bg/bg1.jpg");
+  background-image: url("/img/bg/bg.jpg");
   background-size: 100% 100%;
 }
 
@@ -35,10 +32,10 @@
   border-bottom-left-radius: 5px;
   justify-content: center;
   flex-direction: column;
-  background-color: #4682B4;
+  background-color: #409EFF;
   color: #fff;
   float: left;
-  width: 70%;
+  width: 50%;
   position: relative;
 }
 
@@ -68,24 +65,19 @@
 }
 
 .login-border {
-  position: absolute;
-  right: 10%;
-  top: 30%;
-  // border-left: none;
+  border-left: none;
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
   color: #fff;
-  background-color:transparent;
-  width: 30%;
-  // float: left;
-  // box-sizing: border-box;
+  background-color: #fff;
+  width: 50%;
+  float: left;
+  box-sizing: border-box;
 }
 
 .login-main {
   margin: 0 auto;
-
-  width: 100%;
-  z-index: 9999999999;
+  width: 65%;
   box-sizing: border-box;
 }
 
@@ -97,14 +89,14 @@
   color: #76838f;
 }
 
-// .login-title {
-//   color: #fff;
-//   margin-bottom: 40px;
-//   font-weight: 500;
-//   font-size: 22px;
-//   text-align: center;
-//   letter-spacing: 4px;
-// }
+.login-title {
+  color: #333;
+  margin-bottom: 40px;
+  font-weight: 500;
+  font-size: 22px;
+  text-align: center;
+  letter-spacing: 4px;
+}
 
 .login-menu {
   margin-top: 40px;
@@ -119,26 +111,25 @@
 }
 
 .login-submit {
-  width: 20%;
+  width: 100%;
   height: 45px;
-  border: 1px solid #ddd;
-  background: #0C5B8D;
+  border: 1px solid #409EFF;
+  background: none;
   font-size: 18px;
   letter-spacing: 2px;
   font-weight: 300;
-  color: #ddd;
+  color: #409EFF;
   cursor: pointer;
   margin-top: 30px;
   font-family: "neo";
   transition: 0.25s;
-  float: right;
 }
 
 .login-form {
-  margin: 100px 0;
+  margin: 10px 0;
 
   i {
-    color: #fff;
+    color: #333;
   }
 
   .el-form-item__content {
@@ -152,20 +143,18 @@
   .el-input {
     input {
       padding-bottom: 10px;
-      text-indent: 20px;
+      text-indent: 5px;
       background: transparent;
-      font-size: 20px;
-      width: 100%;
       border: none;
       border-radius: 0;
-      color: #fff;
+      color: #333;
       border-bottom: 1px solid rgb(235, 237, 242);
     }
 
     .el-input__prefix {
       i {
         padding: 0 5px;
-        font-size: 25px !important;
+        font-size: 16px !important;
       }
     }
   }
@@ -184,7 +173,7 @@
   height: 38px;
   background-color: #fdfdfd;
   border: 1px solid #f0f0f0;
-  color: #fff;
+  color: #333;
   font-size: 14px;
   font-weight: bold;
   letter-spacing: 5px;
@@ -193,19 +182,3 @@
   text-align: center;
   cursor:pointer!important;
 }
-
-// ======================================================================================
-#particles-js {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 1000;
-  width: 100%;
-  height: 100%;
-}
-.login-title{
-  color: #fff;
-  font-size: 50px;
-  user-select: none;
-  margin-bottom: 100px;
-}

src/styles/media.scss

@@ -1,4 +1,3 @@
-@import url('./variables.scss');
 .avue-left,
 .avue-header,
 .avue-top,
@@ -21,6 +20,7 @@
 .avue-left {
   position: fixed;
   left: 0;
+  top: 0;
   width: 240px;
   height: 100%;
   z-index: 1025;
@@ -33,7 +33,7 @@
   }
 
   .avue-header {
-    padding-left: 0px;
+    padding-left: 60px;
   }
 
   .avue-main {
@@ -43,7 +43,7 @@
 }
 
 .avue-header {
-  padding-left: 0px;
+  padding-left: 240px;
   width: 100%;
   background-color: #fff;
   box-sizing: border-box;
@@ -55,12 +55,11 @@
   padding: 0;
   padding-bottom: 20px;
   width: calc(100% - 240px);
-  height: calc(100% - 180px);
+  height: calc(100% - 64px);
   box-sizing: border-box;
   overflow: hidden;
   transition: all 0.5s;
-  // background: #f0f2f5;
-  background: $backgrouind;
+  background: #f0f2f5;
   z-index: 1026;
 
   &--fullscreen {
@@ -154,7 +153,7 @@
   }
   .avue-header {
     margin-bottom: 15px;
-    padding-left: 0px;
+    padding-left: 15px;
   }
   .top-bar__item {
     display: none;
@@ -163,7 +162,6 @@
     .avue-left,
     .avue-logo {
       width: $width;
-      margin-top: 64px;
       left: 0;
     }
 

src/styles/sidebar.scss

@@ -1,25 +1,25 @@
-$mainColor: #1b315e;
-@import url('./variables.scss');
+
+
 .el-menu--popup{
     .el-menu-item{
-        background-color: $mainColor;
+        background-color: #20222a;
         i,span{
             color:hsla(0,0%,100%,.7);
         }
         &:hover{
             i,span{
-                color:rgb(99, 99, 99);
+                color:#fff;
             }
         }
         &.is-active {
-            background-color: $backgrouind;
+            background-color: rgba(0,0,0,.8);
             &:before {
                 content: '';
                 top: 0;
                 left: 0;
                 bottom: 0;
                 width: 4px;
-                background: $backgrouind;
+                background: #409eff;
                 position: absolute;
             }
             i,span{
@@ -32,10 +32,10 @@ $mainColor: #1b315e;
 .avue-sidebar {
     user-select: none; 
     position: relative;
-    // padding-top: 60px;
-    height: calc(100% - 180px);
+    padding-top: 60px;
+    height: 100%;
     position: relative;
-    background-color: $backgrouind;
+    background-color: #20222a;
     transition: width .2s;
     box-sizing: border-box;
     box-shadow: 2px 0 6px rgba(0,21,41,.35);
@@ -78,7 +78,7 @@ $mainColor: #1b315e;
                 left: 0;
                 bottom: 0;
                 width: 4px;
-                background: #2d58ac;
+                background: #409eff;
                 position: absolute;
             }
             background-color: rgba(0,0,0,.8);

src/styles/tags.scss

@@ -1,4 +1,4 @@
-@import url('./variables.scss');
+
 
 .avue-tags {
     user-select: none; 
@@ -7,9 +7,8 @@
     margin-bottom: 10px;
     box-sizing: border-box;
     overflow: hidden;
-    // border-top: 1px solid #f6f6f6;
-    // background-color: #fff;
-    background-color: $backgrouind;
+    border-top: 1px solid #f6f6f6;
+    background-color: #fff;
     box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .05);
     .el-tabs--card>.el-tabs__header {
         margin: 0;
@@ -30,8 +29,8 @@
         font-weight: normal;
         color: #ccc;
         &.is-active {
-            color: #dddddd;
-            border-bottom: 3px solid #1b315e;
+            color: #409EFF;
+            border-bottom: 3px solid #409EFF;
         }
     }
     .el-tabs__nav-prev,
@@ -78,7 +77,7 @@
                 border-bottom-right-radius: 5px;
             }
             &:hover{
-                background-color: #1b315e;
+                background-color: #409EFF;
                 color:#fff;
             }
         }

src/styles/top.scss

@@ -1,28 +1,22 @@
-$height:180px;
-$mainColor: #ffffff;
-$floor-first: 80px;
-$font-color: #B2C0CC;
+$height:64px;
 .avue-top {
     padding: 0 20px;
     position: relative;
-    background: #17171A url("/img/bg/top-bg.png") no-repeat center/cover;
     box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
-    // color: rgba(0, 0, 0, .65);
-     color: $font-color;
+    color: rgba(0, 0, 0, .65);
     font-size: 28px;
     height: $height;
-    line-height: $floor-first;
+    line-height: $height;
     box-sizing: border-box;
     white-space: nowrap;
     .el-menu-item{
         i,span{
-            color: $font-color;
             font-size: 13px;
         }
     }
     .el-menu--horizontal>.el-menu-item {
-      height: $floor-first;
-      line-height: $floor-first;
+      height: $height;
+      line-height: $height;
     }
 }
 .avue-breadcrumb {
@@ -44,7 +38,7 @@ $font-color: #B2C0CC;
 }
 
 .top-search {
-    line-height: $floor-first;
+    line-height: $height;
     position: absolute !important;
     left: 20px;
     top:0;
@@ -69,11 +63,11 @@ $font-color: #B2C0CC;
 
 .top-bar__left,
 .top-bar__right {
-    height: $floor-first;
+    height: $height;
     position: absolute;
     top: 0;
     i{
-        line-height: $floor-first;
+        line-height: $height;
     }
 }
 
@@ -90,14 +84,14 @@ $font-color: #B2C0CC;
 .top-bar__item {
     position: relative;
     display: inline-block;
-    height: $floor-first;
+    height: $height;
     margin:0 10px;
     font-size: 16px;
     &--show {
         display: inline-block !important;
     }
     .el-badge__content.is-fixed{
-        top:25px;
+        top:12px;
         right: 5px;
     }
 }
@@ -112,15 +106,3 @@ $font-color: #B2C0CC;
     font-size: inherit;
     font-weight: 400;
 }
-
-
-// =================================================================
-
-.nav-bar{
-    width: 100%;
-    height: 80px;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    background: linear-gradient(to bottom, transparent, #17181C);
-}

src/styles/variables.scss

@@ -1,29 +1,2 @@
-
 //main
-$mainBg: #4682B4;
-$mainColor: #1b315e;
-$backgrouind: #17171A;
-
-
-$color-white: #fff;
-$color-black: #000;
-$color-gray: #90a0ae;
-$color-dark: #262c33;
-$color-red: #eb6243;
-
-
-$color-primary: #2681ff;
-$color-success: #50e3c2;
-$color-warning: #f27a24;
-$color-error: red;
-$color-info: gray;
-
-
-// Message
-$message-font-color: #fff;
-$message-bgcolor-success: #1b3964;
-$message-bgcolor-warning: #593c27;
-$message-bgcolor-error: #5d2b3e;
-$message-border-color-success: $color-primary;
-$message-border-color-warning: $color-warning;
-$message-border-color-error: $color-red;
+$mainBg: #409eff;

src/views/wel/index.vue

@@ -46,6 +46,48 @@ export default {
             href:'http://36.103.227.152:1666',
             target:'_blank'
           },
+          {
+            name: '宁夏银川市望远工业园区德锐斯创业园',
+            src: './test/6.png',
+            text: '宁夏银川市望远工业园区德锐斯创业园',
+            href:'http://139.9.103.171:1999/#/wel/index21',
+            target:'_blank'
+          },
+          {
+            name: '宁夏数字社区',
+            src: './test/7.png',
+            text: '宁夏数字社区',
+            href:'http://139.9.103.171:1888/#/wel/smartCommunity',
+            target:'_blank'
+          },
+          {
+            name: '消防态势--设备态势',
+            src: './test/8.png',  
+            text: '消防态势--设备态势',
+            href:'http://139.9.103.171:1888/#/wel/fireDevices',
+            target:'_blank'
+          },
+          {
+            name: '养老服务',
+            src: './test/9.png',
+            text: '养老服务',
+            href:'http://139.9.103.171:1888/#/wel/smartPension',
+            target:'_blank'
+          },
+          {
+            name: '公安服务',
+            src: './test/10.png',
+            text: '公安服务',
+            href:'http://139.9.103.171:1888/#/wel/smartPolice',
+            target:'_blank'
+          },
+          {
+            name: '运营服务',
+            src: './test/11.png',
+            text: '运营服务',
+            href:'http://139.9.103.171:1888/#/wel/operatePlatform',
+            target:'_blank'
+          },
         ]
       },
     }
@@ -63,11 +105,11 @@ export default {
     width: 500px;
     height: 300px;
     overflow: hidden;
-    border-radius: 5px;
-    border-color: transparent;
-    border-width: 1px;
-    border-style: solid;
-    box-shadow: 2px 2px 2px #30313B;
+    /* border-radius: 5px;
+    border-color: transparent; */
+    /* border-width: 1px;
+    border-style: solid; */
+    /* box-shadow: 2px 2px 2px #30313B; */
     
 }
 /deep/ .el-card {