Merge branch 'feature-page' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-16 11:14:12
+ * @LastEditTime: 2021-12-21 11:18:11
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -96,4 +96,12 @@ FEATURE
 `2021年12月16日`
 FEATURE
 - 修改 用户例外搜索功能，可根据imei搜索
-- 修改 告警分页查询页面功能
+- 修改 告警分页查询页面功能
+
+
+## v1.1.1F
+`2021年12月21日`
+IMPROVEMENT
+- 优化 首页样式
+- 统一 输入框长度
+- 统一 状态判断

src/styles/element-ui.scss

@@ -22,8 +22,8 @@
   left: 0;
   position: relative;
   margin: 0 auto;
-  width: 50%;
-  min-width: 375px;
+  /* width: 50%; */
+ /*  min-width: 375px; */
 }
 .el-pagination {
     white-space: pre-wrap;

src/utils/model.js

@@ -1,8 +1,8 @@
 /*
  * @Date: 2021-11-30 15:09:25
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-16 10:23:05
+ * @LastEditTime: 2021-12-21 11:18:56
  * @FilePath: \GpsCardAdmin\src\utils\model.js
  * @description: 版本号
  */
-export const VersionModel = '1.1.0';
+export const VersionModel = '1.1.1';

src/views/dashboard/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:20:35
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-08 16:49:11
+ * @LastEditTime: 2021-12-21 11:20:36
  * @FilePath: \GpsCardAdmin\src\views\dashboard\index.vue
  * @description:
 -->
@@ -31,9 +31,13 @@ export default {
     padding: 30px;
     height: 100vh;
     width: 100%;
-    background-image: url('../../assets/bg.jpeg');
+    /* background-image: url('../../assets/bg.jpeg'); */
+    background-color: #fafafa;
     background-size: cover;
     background-repeat:no-repeat;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     .dashboard-text {
         text-align: center;
     }

src/views/login/index.vue

@@ -6,15 +6,15 @@
         <h3 class="title">登录</h3>
       </div>
 
-      <el-form-item prop="username">
+      <el-form-item prop="loginName">
         <span class="svg-container">
           <svg-icon icon-class="user" />
         </span>
         <el-input
-          ref="username"
+          ref="loginName"
           v-model="loginForm.loginName"
           placeholder="用户名"
-          name="username"
+          name="loginName"
           type="text"
           tabindex="1"
           auto-complete="on"
@@ -53,13 +53,12 @@
 </template>
 
 <script>
-import { validUsername } from '@/utils/validate'
 
 export default {
   name: 'Login',
   data() {
     const validateUsername = (rule, value, callback) => {
-      if (!validUsername(value)) {
+      if (value === '') {
         callback(new Error('请输入账号'))
       } else {
         callback()
@@ -74,8 +73,8 @@ export default {
     }
     return {
       loginForm: {
-        loginName: 'telpo',
-        password: 'telpo#1234'
+        loginName: '',
+        password: ''
       },
       loginRules: {
         loginName: [{ required: true, trigger: 'blur', validator: validateUsername }],

src/views/off-limits-manage/alarm-recognition/index.vue

@@ -77,7 +77,6 @@
                 :model="form"
                 label-position="left"
                 label-width="70px"
-                style="width: 400px;"
             >
                 <!-- 类型 -->
                 <el-form-item label="类型" prop="typeRadio" v-show="false">
@@ -99,7 +98,7 @@
                 </el-form-item>
                 <!-- 内容名称 -->
                 <el-form-item label="内容名称" prop="content" label-width="80px">
-                    <el-input v-model="form.content" style="width: 80%"/>
+                    <el-input v-model="form.content" style="width: 100%"/>
                 </el-form-item>
                 <!-- 状态 -->
                 <el-form-item label="状态" prop="status" required>

src/views/off-limits-manage/common-exception/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-15 16:41:14
+ * @LastEditTime: 2021-12-21 11:50:22
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue
  * @description:
 -->
@@ -80,7 +80,6 @@
                 :model="form"
                 label-position="left"
                 label-width="70px"
-                style="width: 400px;"
             >
                 <!-- 类别 -->
                 <el-form-item label="类别" prop="model">
@@ -101,7 +100,7 @@
                 </el-form-item>
                 <!-- 内容名称 -->
                 <el-form-item label="内容名称" prop="content" label-width="80px" clearable>
-                    <el-input v-model="form.content" style="width: 80%" />
+                    <el-input v-model="form.content" style="width: 100%" />
                 </el-form-item>
                 <!-- 状态 -->
                 <el-form-item label="状态" prop="status" required>

src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-07 15:14:51
- * @LastEditTime: 2021-12-14 09:24:18
+ * @LastEditTime: 2021-12-21 11:49:06
  * @LastEditors: JinxuChen
  * @Description:  自动报警分类
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue
@@ -12,7 +12,7 @@
     <el-dialog
       :title="titleTypeAddorModify"
       :visible.sync="dialogVisibleType"
-      width="50%"
+      width="400px"
     >
       <el-form :model="currentAddType" ref="currentAddType">
         <el-form-item label="类型" prop="kindId">
@@ -25,7 +25,7 @@
           :rules="[{ required: true, message: '类别不能为空' }]"
         >
           <el-input
-            :xs="24" :sm="24" :lg="8"
+            :xs="6" :sm="6" :lg="6"
             v-model="currentAddType.typeLabel"
             placeholder="请输入类别"
           ></el-input>

src/views/off-limits-manage/user-exception/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-16 10:20:45
+ * @LastEditTime: 2021-12-21 11:51:10
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -70,7 +70,6 @@
                 :rules="formRules"
                 label-position="left"
                 label-width="70px"
-                style="width: 400px"
             >
                 <!-- IMEI -->
                 <el-form-item label="IMEI" prop="imei" label-width="80px">
@@ -78,7 +77,7 @@
                 </el-form-item>
                 <!-- 内容名称 -->
                 <el-form-item label="内容名称" prop="content" label-width="80px">
-                    <el-input v-model="form.content" style="width: 80%" clearable />
+                    <el-input v-model="form.content" style="width: 100%" clearable />
                 </el-form-item>
                 <!-- 状态 -->
                 <el-form-item label="状态" prop="status" required>