郜总意见调整

public/index.html

@@ -19,7 +19,7 @@
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
   <link rel="icon" href="<%= BASE_URL %>favicon.png">
-  <title>船舶线缆数据管理平台</title>
+  <title>船舶电缆信息管理平台</title>
   <style>
     html,
     body,

src/config/website.js

@@ -5,7 +5,7 @@ export default {
   title: "saber",
   logo: "S",
   key: 'saber',//配置主键,目前用于存储
-  indexTitle: '船舶线缆数据管理平台',
+  indexTitle: '船舶电缆信息管理平台',
   clientId: 'saber', // 客户端id
   clientSecret: 'saber_secret', // 客户端密钥
   tenantMode: false, // 是否开启租户模式

src/lang/zh.js

@@ -1,6 +1,6 @@
 export default {
   tip: '提示',
-  title: '船舶线缆数据管理平台',
+  title: '船舶电缆信息管理平台',
   logoutTip: '退出系统, 是否继续?',
   submitText: '确定',
   cancelText: '取消',
@@ -67,7 +67,7 @@ export default {
   },
   login: {
     title: '登录 ',
-    info: '船舶线缆数据管理平台',
+    info: 'SCIM',
     tenantId: '请输入租户ID',
     username: '请输入账号',
     password: '请输入密码',

src/page/index/logo.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="avue-logo">
-    <transition name="fade">
+<!--    <img src="/img/logo.jpg" width="150">-->
+    <div class="shiplogo"></div>
+    <!--<transition name="fade">
       <span v-if="keyCollapse"
             class="avue-logo_subtitle"
             key="0">
@@ -12,7 +14,7 @@
         <span class="avue-logo_title"
               key="1">{{website.indexTitle}} </span>
       </template>
-    </transition-group>
+    </transition-group>-->
   </div>
 </template>
 
@@ -70,4 +72,13 @@ export default {
     color: #fff;
   }
 }
-</style>
+
+  .shiplogo{
+    width: 100%;
+    height: 100%;
+    background: url(/img/2.png);
+    filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')";
+    -moz-background-size: 100% 100%;
+    background-size: 100% 100%;
+  }
+</style>

src/page/index/sidebar/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="avue-sidebar">
+  <div id="left-sidebar" class="avue-sidebar">
     <logo></logo>
     <el-scrollbar style="height:100%">
       <div v-if="validatenull(menu)"
@@ -45,5 +45,21 @@
   };
 </script>
 <style lang="scss" scoped>
+  .avue-logo{
+    background-color: #3fb2e9;
+  }
+  .avue-sidebar{
+    background-color: #3fb2e9;
+  }
+
+  #left-sidebar .avue-sidebar .el-menu-item:hover i,
+  #left-sidebar .avue-sidebar .el-menu-item span,
+  #left-sidebar .avue-sidebar .el-submenu__title i,
+  #left-sidebar .avue-sidebar .el-submenu__title span{
+    color: #000 !important;
+  }
+  .avue-sidebar .el-menu-item:hover i, .avue-sidebar .el-menu-item span, .avue-sidebar .el-submenu__title i, .avue-sidebar .el-submenu__title span{
+
+  }
 </style>
 

src/page/index/top/index.vue

@@ -1,70 +1,73 @@
 <template>
   <div class="avue-top">
-    <div class="top-bar__left">
+    <div>
+      <span class="shiptitle">船舶电缆信息管理平台</span>
+    </div>
+    <!--<div class="top-bar__left">
       <div class="avue-breadcrumb"
-           :class="[{ 'avue-breadcrumb--active': isCollapse }]"
+           :class="[{ 'avue-breadcrumb&#45;&#45;active': isCollapse }]"
            v-if="showCollapse">
         <i class="icon-navicon"
            @click="setCollapse"></i>
       </div>
-    </div>
-    <div class="top-bar__title">
-      <div class="top-bar__item top-bar__item--show"
-           v-if="showMenu">
-        <top-menu ref="topMenu"></top-menu>
-      </div>
-      <span class="top-bar__item"
+    </div>-->
+    <!--<div class="top-bar__title">
+     div class="top-bar__item top-bar__item&#45;&#45;show"
+          v-if="showMenu">
+       <top-menu ref="topMenu"></top-menu>
+     </div>-->
+      <!--<span class="top-bar__item"
             v-if="showSearch">
         <top-search></top-search>
       </span>
-    </div>
+    </div>-->
     <div class="top-bar__right">
-      <el-tooltip v-if="showColor"
-                  effect="dark"
-                  :content="$t('navbar.color')"
-                  placement="bottom">
-        <div class="top-bar__item">
-          <top-color></top-color>
-        </div>
-      </el-tooltip>
-      <el-tooltip v-if="showDebug"
-                  effect="dark"
-                  :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
-                  placement="bottom">
-        <div class="top-bar__item">
-          <top-logs></top-logs>
-        </div>
-      </el-tooltip>
-      <el-tooltip v-if="showLock"
-                  effect="dark"
-                  :content="$t('navbar.lock')"
-                  placement="bottom">
-        <div class="top-bar__item">
-          <top-lock></top-lock>
-        </div>
-      </el-tooltip>
-      <el-tooltip v-if="showTheme"
-                  effect="dark"
-                  :content="$t('navbar.theme')"
-                  placement="bottom">
-        <div class="top-bar__item top-bar__item--show">
-          <top-theme></top-theme>
-        </div>
-      </el-tooltip>
-      <el-tooltip effect="dark"
-                  :content="$t('navbar.notice')"
-                  placement="bottom">
-        <div class="top-bar__item top-bar__item--show">
-          <top-notice></top-notice>
-        </div>
-      </el-tooltip>
-      <el-tooltip effect="dark"
-                  :content="$t('navbar.language')"
-                  placement="bottom">
-        <div class="top-bar__item top-bar__item--show">
-          <top-lang></top-lang>
-        </div>
-      </el-tooltip>
+      <!--  <el-tooltip v-if="showColor"
+                    effect="dark"
+                    :content="$t('navbar.color')"
+                    placement="bottom">
+          <div class="top-bar__item">
+            <top-color></top-color>
+          </div>
+        </el-tooltip>
+        <el-tooltip v-if="showDebug"
+                    effect="dark"
+                    :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
+                    placement="bottom">
+          <div class="top-bar__item">
+            <top-logs></top-logs>
+          </div>
+        </el-tooltip>
+        <el-tooltip v-if="showLock"
+                    effect="dark"
+                    :content="$t('navbar.lock')"
+                    placement="bottom">
+          <div class="top-bar__item">
+            <top-lock></top-lock>
+          </div>
+        </el-tooltip>
+        <el-tooltip v-if="showTheme"
+                    effect="dark"
+                    :content="$t('navbar.theme')"
+                    placement="bottom">
+          <div class="top-bar__item top-bar__item&#45;&#45;show">
+            <top-theme></top-theme>
+          </div>
+        </el-tooltip>
+        <el-tooltip effect="dark"
+                    :content="$t('navbar.notice')"
+                    placement="bottom">
+          <div class="top-bar__item top-bar__item&#45;&#45;show">
+            <top-notice></top-notice>
+          </div>
+        </el-tooltip>
+        <el-tooltip effect="dark"
+                    :content="$t('navbar.language')"
+                    placement="bottom">
+          <div class="top-bar__item top-bar__item&#45;&#45;show">
+            <top-lang></top-lang>
+          </div>
+        </el-tooltip>-->
       <el-tooltip v-if="showFullScren"
                   effect="dark"
                   :content="isFullScren?$t('navbar.screenfullF'):$t('navbar.screenfull')"
@@ -179,4 +182,22 @@
 </script>
 
 <style lang="scss" scoped>
+  .avue-top{
+    /*width: 100%;*/
+    /*height: 100%;*/
+    background: url(/img/4.png);
+    background-color: #3fb2e9 !important;
+    filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')";
+    -moz-background-size: 30% 100%;
+    background-size: 30% 100%;
+  }
+  .shiptitle{
+    font-family: cursive;
+    font-size: 27px;
+    font-style: italic;
+    font-weight: bold;
+    text-shadow: 2px 2px 2px #000;
+    padding: 10px 0;
+    color: #FFF;
+  }
 </style>

src/page/login/index.vue

@@ -8,7 +8,7 @@
         <div class="login-time">
           {{time}}
         </div>
-        <img class="img" src="/img/logo.png" alt="">
+        <img class="img" src="/img/3.png" alt="">
         <p class="title">{{ $t('login.info') }}</p>
       </div>
       <div class="login-border">
@@ -30,6 +30,12 @@
 
       </div>
     </div>
+
+    <div style="position: fixed;left: 10px;top: 10px;display: table">
+      <img src="/img/2.png" width="250">
+      <span class="shiptitle">船舶电缆信息管理平台</span>
+    </div>
+
   </div>
 </template>
 <script>
@@ -117,4 +123,17 @@
 
 <style lang="scss">
   @import "@/styles/login.scss";
+
+  .shiptitle{
+    font-family: cursive;
+    font-size: 40px;
+    font-style: italic;
+    font-weight: bold;
+    text-shadow: 2px 2px 2px #000;
+    padding: 10px 0;
+    color: #3fb2e9;
+    display: table-cell;
+    vertical-align: middle;
+    padding: 30px;
+  }
 </style>

src/page/login/userlogin.vue

@@ -1,66 +1,73 @@
 <template>
-  <el-form class="login-form"
-           status-icon
-           :rules="loginRules"
-           ref="loginForm"
-           :model="loginForm"
-           label-width="0">
-    <el-form-item v-if="tenantMode" prop="tenantId">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                v-model="loginForm.tenantId"
-                auto-complete="off"
-                :placeholder="$t('login.tenantId')">
-        <i slot="prefix" class="icon-quanxian"/>
-      </el-input>
-    </el-form-item>
-    <el-form-item prop="username">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                v-model="loginForm.username"
-                auto-complete="off"
-                :placeholder="$t('login.username')">
-        <i slot="prefix" class="icon-yonghu"/>
-      </el-input>
-    </el-form-item>
-    <el-form-item prop="password">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                :type="passwordType"
-                v-model="loginForm.password"
-                auto-complete="off"
-                :placeholder="$t('login.password')">
-        <i class="el-icon-view el-input__icon" slot="suffix" @click="showPassword"/>
-        <i slot="prefix" class="icon-mima"/>
-      </el-input>
-    </el-form-item>
-    <el-form-item v-if="this.website.captchaMode" prop="code">
-      <el-row :span="24">
-        <el-col :span="16">
-          <el-input size="small"
-                    @keyup.enter.native="handleLogin"
-                    v-model="loginForm.code"
-                    auto-complete="off"
-                    :placeholder="$t('login.code')">
-            <i slot="prefix" class="icon-yanzhengma"/>
-          </el-input>
-        </el-col>
-        <el-col :span="8">
-          <div class="login-code">
-            <img :src="loginForm.image" class="login-code-img" @click="refreshCode"
-            />
-          </div>
-        </el-col>
-      </el-row>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary"
-                 size="small"
-                 @click.native.prevent="handleLogin"
-                 class="login-submit">{{$t('login.submit')}}
-      </el-button>
-    </el-form-item>
-  </el-form>
+  <div id="loginForm">
+    <el-form class="login-form"
+             status-icon
+             :rules="loginRules"
+             ref="loginForm"
+             :model="loginForm"
+             label-width="0">
+      <el-form-item v-if="tenantMode" prop="tenantId">
+        <el-input size="small"
+                  @keyup.enter.native="handleLogin"
+                  v-model="loginForm.tenantId"
+                  auto-complete="off"
+                  :placeholder="$t('login.tenantId')">
+          <i slot="prefix" class="icon-quanxian"/>
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="username">
+        <el-input size="small"
+                  @keyup.enter.native="handleLogin"
+                  v-model="loginForm.username"
+                  auto-complete="off"
+                  :placeholder="$t('login.username')">
+          <i slot="prefix" class="icon-yonghu"/>
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password">
+        <el-input size="small"
+                  @keyup.enter.native="handleLogin"
+                  :type="passwordType"
+                  v-model="loginForm.password"
+                  auto-complete="off"
+                  :placeholder="$t('login.password')">
+          <i class="el-icon-view el-input__icon" slot="suffix" @click="showPassword"/>
+          <i slot="prefix" class="icon-mima"/>
+        </el-input>
+      </el-form-item>
+      <el-form-item v-if="this.website.captchaMode" prop="code">
+        <el-row :span="24">
+          <el-col :span="16">
+            <el-input size="small"
+                      @keyup.enter.native="handleLogin"
+                      v-model="loginForm.code"
+                      auto-complete="off"
+                      :placeholder="$t('login.code')">
+              <i slot="prefix" class="icon-yanzhengma"/>
+            </el-input>
+          </el-col>
+          <el-col :span="8">
+            <div class="login-code">
+              <img :src="loginForm.image" class="login-code-img" @click="refreshCode"
+              />
+            </div>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary"
+                   size="small"
+                   @click.native.prevent="handleLogin"
+                   class="login-submit">{{$t('login.submit')}}
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <!--<div style="position: fixed;left: 10px;top: 10px;">
+      <img src="/img/logo.jpg" width="100">
+      <span>船舶电缆信息管理平台</span>
+    </div>-->
+  </div>
 </template>
 
 <script>

src/styles/login.scss

@@ -5,7 +5,7 @@
   width: 100%;
   height: 100%;
   margin: 0 auto;
-  background-image: url("/img/bg/bg.jpg");
+  background-image: url("/img/bg/ship.jpg");
   background-size: 100% 100%;
 }
 
@@ -21,19 +21,23 @@
 
 .login-left,
 .login-border {
+  opacity: 0.8;
   position: relative;
   min-height: 500px;
   align-items: center;
   display: flex;
 }
+.login-border {
+  background-color: #4fceff !important;
+}
 
 .login-left {
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
   justify-content: center;
   flex-direction: column;
-  background-color: #409EFF;
-  color: #fff;
+  background-color: #fff;
+  color: #000;
   float: left;
   width: 50%;
   position: relative;
@@ -48,7 +52,7 @@
   left: 25px;
   top: 25px;
   width: 100%;
-  color: #fff;
+  color: #000;
   font-weight: 200;
   opacity: 0.9;
   font-size: 18px;
@@ -58,7 +62,7 @@
 .login-left .title {
   margin-top: 60px;
   text-align: center;
-  color: #fff;
+  color: #000;
   font-weight: 300;
   letter-spacing: 2px;
   font-size: 25px;
@@ -113,7 +117,7 @@
 .login-submit {
   width: 100%;
   height: 45px;
-  border: 1px solid #409EFF;
+  border: 1px solid #FFF;
   background: none;
   font-size: 18px;
   letter-spacing: 2px;
@@ -172,7 +176,7 @@
   width: 100px;
   height: 38px;
   background-color: #fdfdfd;
-  border: 1px solid #f0f0f0;
+  border: 1px solid #fff;
   color: #333;
   font-size: 14px;
   font-weight: bold;
@@ -182,3 +186,11 @@
   text-align: center;
   cursor:pointer!important;
 }
+#loginForm .el-button--primary{
+  color: #000;
+}
+.el-button--primary:focus, .el-button--primary:hover {
+  background: #1481e7;
+  border-color: #303133;
+  color: #FFF;
+}

src/views/ship/appversion.vue

@@ -61,7 +61,7 @@
               drag: true,
               loadText: '模板上传中，请稍等',
               span: 24,
-              fileSize: 5120,
+              // fileSize: 5120,
               propsHttp: {
                 res: 'data'
               },
@@ -201,8 +201,7 @@
       },
 
       rowSave(row, done, loading) {
-        debugger
-        /*add(row).then(() => {
+        add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
@@ -212,7 +211,7 @@
         }, error => {
           loading();
           window.console.log(error);
-        });*/
+        });
       },
       rowUpdate(row, index, done, loading) {
         update(row).then(() => {

src/views/ship/device.vue

@@ -167,7 +167,6 @@
     },
     mounted() {
       let mydiv = document.getElementById("mydiv");
-      debugger
     },
     methods: {
       showSelect(row){
@@ -182,7 +181,6 @@
         if (this.selectUsers){
           this.form.personIds = this.selectUsers.join();
         }
-        debugger
         update(this.form).then(() => {
           this.onLoad(this.page);
           this.$message({

src/views/wel/index.vue

@@ -11,14 +11,14 @@
 
     <el-col :span="24">
       <basic-container>
-        <h3>今日新增</h3>
+        <h3 style="margin: 5px">今日新增</h3>
         <avue-data-display :option="optionToday"></avue-data-display>
       </basic-container>
     </el-col>
 
     <el-col :span="12">
       <basic-container>
-        <h3>新增趋势
+        <h3 style="margin: 5px">新增趋势
           <el-date-picker
             size="mini"
             :picker-options="tenantAddTrend.pickerOptions"
@@ -36,7 +36,7 @@
 
     <el-col :span="12">
       <basic-container>
-        <h3>标签绑定</h3>
+        <h3 style="margin: 5px">标签绑定</h3>
         <div id="labelBind" style="height: 500px;width: 100%"></div>
       </basic-container>
     </el-col>
@@ -392,9 +392,36 @@
   };
 </script>
 
-<style>
-  .el-font-size {
+<style scoped>
+  >>> .el-font-size {
     font-size: 14px;
   }
+  >>> .avue-data-panel .item-title{
+    font-size: 14px;
+  }
+  >>> .avue-data-panel .item-icon{
+    font-size: 40px;
+  }
+  >>> .el-card__body{
+    padding: 10px;
+  }
+  >>> .avue-data-display .count{
+    font-size: 25px;
+  }
+  >>> .avue-data-display .count{
+    margin: 5px 0;
+  }
+  >>> .avue-data-panel .item{
+    padding: 0 10px;
+    margin: 0 10px;
+    justify-content: space-around;
+  }
+  >>> .avue-data-display .title{
+    font-size: 14px;
+  }
+  >>> .el-form-item__label{
+    font-size: 17px;
+    font-weight: 600;
+  }
 </style>