Merge branch 'mengzixuan' of http://gitlab.91isoft.com:90/car-test/web into develop

src/views/informationBase/viewStandardTerms/components/documentReviewDialog.vue

@@ -94,4 +94,7 @@ export default {
 .el-table {
   width: auto;
 }
+/deep/ .el-drawer__header {
+  margin-bottom: 0px !important;
+}
 </style>

src/views/informationBase/viewStandardTerms/components/vehicleModelDialog.vue

@@ -98,4 +98,25 @@ export default {
 .table {
   width: auto;
 }
+.table thead {
+  background: none;
+}
+.table th {
+  color: #303133;
+  font-size: 14px;
+  font-weight: 700;
+}
+.table td {
+  color: #606266;
+  font-size: 14px;
+  font-weight: 400;
+}
+.custom_title {
+  color: #303133 !important;
+  font-size: 18px;
+  font-weight: 400;
+}
+/deep/ .el-drawer__header {
+  margin-bottom: 0px !important;
+}
 </style>

src/views/informationBase/viewStandardTerms/index.vue

@@ -100,7 +100,7 @@
         <template slot-scope="scope">
           <div class="button-bar">
             <page-button
-              v-hasPermi="['setting:standard:update']"
+              v-hasPermi="['setting:standardTerms:content']"
               icon="doc-search"
               title="检验内容"
               @click.native="handleUpdate(scope.row)"

src/views/login.vue

@@ -26,6 +26,7 @@
           type="password"
           auto-complete="off"
           placeholder="密码"
+          maxlength="20"
           @keyup.enter.native="handleLogin"
         >
           <iconpark-icon slot="prefix" name="lock" size="20"></iconpark-icon>

src/views/setting/standardTerms/index.vue

@@ -99,7 +99,7 @@
         <template slot-scope="scope">
           <div class="button-bar">
             <page-button
-              v-hasPermi="['setting:standard:update']"
+              v-hasPermi="['setting:standardTerms:content']"
               icon="doc-search"
               title="检验内容"
               @click.native="handleUpdate(scope.row)"

src/views/system/user/index.vue

@@ -598,9 +598,9 @@ export default {
         password: [
           { required: true, message: '用户密码不能为空', trigger: 'blur' },
           {
-            min: 5,
+            min: 6,
             max: 20,
-            message: '用户密码长度必须介于 5 和 20 之间',
+            message: '用户密码长度必须介于 6 和 20 之间',
             trigger: 'blur'
           }
         ],