From bb654cea7b1666d5b3c04dbd81a074a5a502cc67 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期五, 31 五月 2024 09:36:40 +0800 Subject: [PATCH] 1、登录页实现登录窗口响应式布局,同时限制最大最小宽高 2、除设备级看板其余看板中点击技术状态以及报修故障图表后打开对应弹窗,并实现与接口联动 3、设备级看板点击保养计划按钮后打开对应弹窗并实现与后端数据联调 4、优化设备级看板折线图样式,将Y轴移至左侧,删除右侧Y轴,设置数据值在图标上的显示 --- src/views/user/Login.vue | 138 +++++++++++++++++++++++----------------------- 1 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index ff89d12..e7d4f86 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -1,75 +1,75 @@ <template> - <div class="main"> - <div style="display: flex;padding: 50px;"> + <div class="main" style="width: 100%;height: 100%;display: flex;padding: 50px;"> - <div style="flex: 1;display: flex;align-items: center;justify-content: center;position: relative"> - <div class="top"> - <div class="header"> - <a href="/"> - <img src="~@/assets/lxzn.png" class="logo" alt="logo"> - <span class="title">MDC鏅烘収杞﹂棿</span> - </a> - </div> + <div style="flex: 1.2;display: flex;align-items: center;justify-content: center;position: relative"> + <div class="top"> + <div class="header"> + <a href="/"> + <img src="~@/assets/lxzn.png" class="logo" alt="logo"> + <span class="title">MDC鏅烘収杞﹂棿</span> + </a> </div> - <img src="@/assets/login.jpeg" width="60%"> </div> - <div style="width: 368px;margin: 30px 50px"> - <a-form-model - class="user-layout-login" - @keyup.enter.native="handleSubmit" - > - <a-tabs - :activeKey="customActiveKey" - :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }" - @change="handleTabClick" - > - <a-tab-pane - key="tab1" - tab="璐﹀彿瀵嗙爜鐧诲綍" - > - <login-account - ref="alogin" - @validateFail="validateFail" - @success="requestSuccess" - @fail="requestFailed" - ></login-account> - </a-tab-pane> - - <!--<a-tab-pane key="tab2" tab="鎵嬫満鍙风櫥褰�">--> - <!--<login-phone ref="plogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-phone>--> - <!--</a-tab-pane>--> - </a-tabs> - - <a-form-model-item> - <!--<a-checkbox @change="handleRememberMeChange" default-checked>鑷姩鐧诲綍</a-checkbox>--> - <!--<router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">--> - <!--蹇樿瀵嗙爜--> - <!--</router-link>--> - <!--<router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >--> - <!--娉ㄥ唽璐︽埛--> - <!--</router-link>--> - </a-form-model-item> - - <a-form-item style="margin-top:24px"> - <a-button - size="large" - type="primary" - htmlType="submit" - class="login-button" - :loading="loginBtn" - @click.stop.prevent="handleSubmit" - :disabled="loginBtn" - >纭畾 - </a-button> - </a-form-item> - - <a-form-model-item style="color: red"> - 瀵嗙骇锛氬唴閮� 璀﹀憡锛氭湰绯荤粺绂佹瀛樺偍銆佸鐞嗐�佷紶杈撴秹瀵嗕俊鎭� - </a-form-model-item> - - </a-form-model> - </div> + <img src="@/assets/login.jpeg" width="65%" height="44%"> </div> + + <div style="flex: 1;padding: 30px 50px;"> + <a-form-model + class="user-layout-login" + @keyup.enter.native="handleSubmit" + > + <a-tabs + :activeKey="customActiveKey" + :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }" + @change="handleTabClick" + > + <a-tab-pane + key="tab1" + tab="璐﹀彿瀵嗙爜鐧诲綍" + > + <login-account + ref="alogin" + @validateFail="validateFail" + @success="requestSuccess" + @fail="requestFailed" + ></login-account> + </a-tab-pane> + + <!--<a-tab-pane key="tab2" tab="鎵嬫満鍙风櫥褰�">--> + <!--<login-phone ref="plogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-phone>--> + <!--</a-tab-pane>--> + </a-tabs> + + <a-form-model-item> + <!--<a-checkbox @change="handleRememberMeChange" default-checked>鑷姩鐧诲綍</a-checkbox>--> + <!--<router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">--> + <!--蹇樿瀵嗙爜--> + <!--</router-link>--> + <!--<router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >--> + <!--娉ㄥ唽璐︽埛--> + <!--</router-link>--> + </a-form-model-item> + + <a-form-item style="margin-top:24px"> + <a-button + size="large" + type="primary" + htmlType="submit" + class="login-button" + :loading="loginBtn" + @click.stop.prevent="handleSubmit" + :disabled="loginBtn" + >纭畾 + </a-button> + </a-form-item> + + <a-form-model-item style="color: red;font-size: 0.8vw"> + 瀵嗙骇锛氬唴閮� 璀﹀憡锛氭湰绯荤粺绂佹瀛樺偍銆佸鐞嗐�佷紶杈撴秹瀵嗕俊鎭� + </a-form-model-item> + + </a-form-model> + </div> + <!--<two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>--> <login-select-tenant ref="loginSelect" @@ -306,7 +306,7 @@ .top { text-align: center; position: absolute; - top: 45px; + top: 10%; .header { height: 44px; @@ -330,7 +330,7 @@ } .title { - font-size: 30px; + font-size: 2vw; color: #000; font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-weight: 600; -- Gitblit v1.9.3