Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/rulesManagement/meteringManagement/index.vue

@@ -32,7 +32,7 @@
       <div class="list">
         <div class="search_bar">
           <el-input
-            placeholder="请输入关键词"
+            placeholder="请输入编码或名称关键词"
             v-model="name"
             clearable
             class="input-with-select"

src/views/versionManage/index.vue

@@ -318,7 +318,7 @@ export default {
     removeBatch() {
       if (!this.selection.length) return this.$message.error('请至少选择一条数据');
       if (this.selection.some(item => item.status == 1)) return this.$message.error('启用状态的规则不允许删除！请检查');
-      this.$confirm('确定要删除选中的资质吗?', '提示', {
+      this.$confirm('确定要删除选中的规则吗?', '提示', {
         type: 'warning'
       }).then(() => {
         const loading = this.$loading({lock: true});