Merge branch 'bugfix-placehoder' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-13 11:35:45
+ * @LastEditTime: 2021-12-13 17:36:38
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -74,4 +74,6 @@ IMPROVEMENT
 ## v1.0.7F
 `2021年12月13日`
 FIX
-- 修复 表格-操作列显示问题
+- 修复 表格-操作列显示问题
+- 取消 搜索选择类别
+- 修改 输入搜索框提示都为 '请输入内容'

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

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-10 11:40:14
+ * @LastEditTime: 2021-12-13 17:31:26
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue
  * @description:
 -->
@@ -11,7 +11,7 @@
             <!-- 搜索 -->
             <el-input
                 v-model="searchValue"
-                placeholder="请输入关键字"
+                :placeholder="placeholder"
                 style="width: 200px; margin-left: 10px;"
                 class="filter-item"
                 @keyup.enter.native="onSearch"
@@ -95,7 +95,8 @@ export default {
             ],
             total: 0,
             page: 1,
-            limit: 10
+            limit: 10,
+            placeholder: '请输入内容'
         };
     },
     watch: {

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

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-10 11:37:39
+ * @LastEditTime: 2021-12-13 17:30:06
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-recognition\index.vue
  * @description:
 -->
@@ -33,6 +33,7 @@
                 @change="outSelecChange"
                 @clear="onClear"
                 clearable
+                v-show="false"
             >
                 <el-option
                     v-for="item in modelOptions"
@@ -45,7 +46,7 @@
             <!-- 搜索 -->
             <el-input
                 v-model="searchValue"
-                placeholder="请输入关键字"
+                :placeholder="placeholder"
                 style="width: 200px; margin-left: 10px;"
                 class="filter-item"
                 @keyup.enter.native="onSearch"
@@ -204,7 +205,8 @@ export default {
             },
             formOptions: [],
             dialogUpload: false,
-            loading: false
+            loading: false,
+            placeholder: '请输入内容'
         };
     },
     watch: {

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-10 11:32:57
+ * @LastEditTime: 2021-12-13 17:32:25
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue
  * @description:
 -->
@@ -24,6 +24,7 @@
                 filterable
                 @change="outSelecChange"
                 clearable
+                v-show="false"
             >
                 <el-option
                     v-for="item in modelOptions"
@@ -36,7 +37,7 @@
             <!-- 搜索 -->
             <el-input
                 v-model="searchValue"
-                placeholder="请输入关键字"
+                :placeholder="placeholder"
                 style="width: 200px; margin-left: 10px;"
                 class="filter-item"
                 @keyup.enter.native="onSearch"
@@ -178,7 +179,8 @@ export default {
                 model: [
                     { required: true, message: "请选择类别", trigger: "change" }
                 ]
-            }
+            },
+            placeholder: '请输入内容'
         };
     },
     watch: {

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-10 11:36:42
+ * @LastEditTime: 2021-12-13 17:33:49
  * @LastEditors: JinxuChen
  * @Description:  自动报警分类
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue
@@ -52,7 +52,7 @@
       <!-- 搜索 -->
       <el-input
         v-model="searchValue"
-        placeholder="请输入类别"
+        :placeholder="placeholder"
         style="width: 200px; margin-left: 10px"
         class="filter-item"
         @keyup.enter.native="onSearch"
@@ -135,6 +135,7 @@ export default {
         kindId: "1",
         typeLabel: "",
       },
+      placeholder: '请输入内容'
     };
   },
   methods: {

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-10 11:43:39
+ * @LastEditTime: 2021-12-13 17:35:05
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -18,7 +18,7 @@
             <!-- 搜索 -->
             <el-input
                 v-model="searchValue"
-                placeholder="请输入关键字"
+                :placeholder="placeholder"
                 style="width: 200px; margin-left: 10px;"
                 class="filter-item"
                 @keyup.enter.native="onSearch"
@@ -194,7 +194,8 @@ export default {
                         trigger: "blur"
                     }
                 ]
-            }
+            },
+            placeholder: '请输入内容'
         };
     },
     watch: {