xuqiang 4 лет назад
Родитель
Сommit
4c17f3ce31

BIN
src/main/vue/src/assets/bg@3x.png


BIN
src/main/vue/src/assets/bg_login.jpg


+ 0 - 1
src/main/vue/src/components/operation/RoomInfo.vue

@@ -172,7 +172,6 @@ export default {
     min-width: 120px;
     height: 110px;
     // background: white;
-
     background: #242744;
     // border: 1px solid #f6f6f6;
     box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.08);

+ 18 - 18
src/main/vue/src/views/Admin.vue

@@ -24,27 +24,26 @@
                 怡辰公寓运管中心管理系统
             </div>
 
-            <el-select
-                :value="selectedStoreId"
-                @input="storeIdChange"
-                placeholder="请选择店铺"
-                size="small"
-                class="store-select"
-                :disabled="$store.state.fetchingData"
-                filterable
-            >
-                <img slot="prefix" src="../assets/icon_nav_xuanzhemendian@3x.png" class="store-img" alt="" />
-                <el-option
-                    :label="item.storeName"
-                    :value="item.id"
-                    v-for="(item, index) in stores"
-                    :key="index"
-                ></el-option>
-            </el-select>
-
             <div style="flex-grow:1"></div>
 
             <template v-if="nightAuditStatus">
+                <el-select
+                    :value="selectedStoreId"
+                    @input="storeIdChange"
+                    placeholder="请选择店铺"
+                    size="small"
+                    class="store-select"
+                    :disabled="$store.state.fetchingData"
+                    filterable
+                >
+                    <img slot="prefix" src="../assets/icon_nav_xuanzhemendian@3x.png" class="store-img" alt="" />
+                    <el-option
+                        :label="item.storeName"
+                        :value="item.id"
+                        v-for="(item, index) in stores"
+                        :key="index"
+                    ></el-option>
+                </el-select>
                 <div class="user-content" v-if="userInfo">
                     <img :src="userInfo ? userInfo.avatar || '' : ''" class="avatar" />
                     <div class="user-name">{{ userInfo.nickname }}</div>
@@ -699,6 +698,7 @@ export default {
     display: flex;
     // flex-direction: column;
     align-items: center;
+    margin-left: 30px;
     // background: #242744;
     // padding: 30px;
     .avatar {

+ 5 - 4
src/main/vue/src/views/Login.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="container" :style="{ backgroundImage: 'url(' + require('../assets/bg_login.jpg') + ')' }">
+    <div class="container" :style="{ backgroundImage: 'url(' + require('../assets/bg@3x.png') + ')' }">
         <transition :name="`slide-${register ? 'in' : 'out'}`">
             <div class="login-wrapper" @keyup.enter="doRegister" v-if="register" key="register">
                 <el-page-header @back="register = false" title="登录" style="width: 350px;line-height: 60px;">
@@ -290,7 +290,7 @@ export default {
     align-items: center;
     justify-content: center;
     background-color: @border3;
-    background-image: url('https://microball.oss-cn-hangzhou.aliyuncs.com/izouma/application/rawpixel-com-565462-unsplash%20%281%29.jpg');
+    // background-image: url('../assets/bg@3x.png');
     background-size: cover;
     background-position: center;
     background-repeat: no-repeat;
@@ -307,8 +307,9 @@ export default {
     background: white;
     border: 1px #eaeaea solid;
     position: absolute;
-    right: 100px;
-    top: 100px;
+    right: 0;
+    left: 0;
+    margin: 0 auto;
     width: 400px;
 
     .title {

+ 1 - 0
src/main/vue/src/views/Operation/RoomStatus.vue

@@ -1333,6 +1333,7 @@ export default {
 
 .goTop {
     position: fixed;
+    border-bottom: 1px solid;
     bottom: 20px;
     right: 55px;
     width: 40px;

+ 7 - 3
src/main/vue/src/views/sale/SaleIndex.vue

@@ -122,11 +122,15 @@
                         <div>
                             <div>
                                 <div class="ball-name1">完成合同额</div>
-                                <div class="ball-val" style="color:#FFFFFF">¥{{ targetInfo.rent || 0 }}</div>
+                                <div class="ball-val" style="color:#FFFFFF;margin-top:4px">
+                                    ¥{{ targetInfo.rent || 0 }}
+                                </div>
                             </div>
                             <div style="margin-top:48px">
                                 <div class="ball-name1">目标合同额</div>
-                                <div class="ball-val" style="color:#FFFFFF">¥{{ targetInfo.target || 0 }}</div>
+                                <div class="ball-val" style="color:#FFFFFF;margin-top:4px">
+                                    ¥{{ targetInfo.target || 0 }}
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -215,7 +219,7 @@
                         </div>
                     </div>
                     <div class="content">
-                        <canvas ref="chart" class="chart" style="width:100%;height:216px"></canvas>
+                        <canvas ref="chart" class="chart" style="width:100%;height:215px"></canvas>
                     </div>
                 </el-card>
             </el-col>