Merge remote-tracking branch 'origin/master'

src/components/module_interLock/UEquipmentTree/UEquipmentTree.vue

@@ -2,10 +2,10 @@
   <div class="equipment-tree-container">
     <div v-if="treeData.type != 'history'">
       <a-button  type="primary" icon="plus"  style="width:13%;" @click="handleAdd"/>
-      <a-input-search style="width:85%;margin-left:2%" placeholder="请输入" @change="onChange" />
+      <a-input-search style="width:85%;margin-left:2%" allow-clear placeholder="请输入" @change="onChange" />
     </div>
     <div v-if="treeData.type == 'history'">
-      <a-input-search style="width:100%;margin-left:2%" placeholder="请输入" @change="onChange" />
+      <a-input-search style="width:100%;margin-left:2%" allow-clear placeholder="请输入" @change="onChange" />
     </div>
 
     <div class="tree-container">

src/views/module_interLock/interlockHistoryData/InterlockHistory/InterlockHistoryList.vue

@@ -23,7 +23,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
-              <a-form-item label="采集时间">
+              <a-form-item label="时间">
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.beginTime"></j-date>
                 <span class="query-group-split-cust"></span>
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.endTime"></j-date>