Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/views/systemManagement/EditSystem/index.vue

@@ -134,7 +134,7 @@
               placeholder="请输入内容"
               clearable
               @clear="clearData"
-              v-model="keyWords"
+              v-model.trim="keyWords"
             ></el-input>
             <el-button @click="queryData()">搜索</el-button>
           </div>
@@ -269,6 +269,7 @@ export default {
   },
   methods: {
     queryData() {
+      this.keyWords = this.keyWords.replace(/\s+/g, "");
       const search = this.keyWords;
       if (search) {
         this.FormData.Unuselist = findarrays(
@@ -431,6 +432,9 @@ export default {
   font-weight: bold;
   color: #303133;
 }
+::v-deep .el-row {
+  width: 100%;
+}
 .Box {
   width: 100%;
   height: 100%;
@@ -522,7 +526,7 @@ export default {
     }
   }
   .inputBox2 .el-input__inner {
-    width: 470px;
+    width: 468px;
     height: 40px;
     background: #f5f7fa;
     border: 1px solid #dcdfe6;

src/views/systemManagement/addSystem/index.vue

@@ -132,7 +132,7 @@
               placeholder="请输入内容"
               clearable
               @clear="clearData"
-              v-model="keyWords"
+              v-model.trim="keyWords"
             ></el-input>
             <el-button @click="getUserData">搜索</el-button>
           </div>
@@ -394,6 +394,7 @@ export default {
       //   PageSize: this.PageSize,
       //   PageIndex: this.pageNum,
       // });
+      this.keyWords = this.keyWords.replace(/\s+/g, "");
       const search = this.keyWords;
       if (search) {
         this.FormData.Unuselist = findarrays(
@@ -431,6 +432,9 @@ export default {
   padding: 0 64px;
   padding-top: 32px;
 }
+::v-deep .el-row {
+  width: 100%;
+}
 .topBox {
   width: 100%;
   height: 240px;
@@ -438,6 +442,7 @@ export default {
   box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
   border-radius: 16px;
 }
+
 .fristLine {
   display: flex;
   margin-left: 33px;
@@ -516,7 +521,7 @@ export default {
     }
   }
   .inputBox2 .el-input__inner {
-    width: 480px;
+    width: 468px;
     height: 32px;
     background: #f5f7fa;
     border: 1px solid #dcdfe6;