diff --git a/src/views/modules/tooladmin/ToolAdminList.vue b/src/views/modules/tooladmin/ToolAdminList.vue
index 7d00b7dbeeb1018daa601c99abafb08dc400e7dd..f02c3ce603ddf6e354a63c1aed0873742e9b21ad 100644
--- a/src/views/modules/tooladmin/ToolAdminList.vue
+++ b/src/views/modules/tooladmin/ToolAdminList.vue
@@ -16,6 +16,11 @@
               <a-input placeholder="请输入工具箱编号" v-model="queryParam.toolboxNum"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="标签">
+              <a-input placeholder="请输入标签" v-model="queryParam.toolNum"></a-input>
+            </a-form-item>
+          </a-col>
 <!--          <template v-if="toggleSearchStatus">-->
 <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
 <!--              <a-form-item label="物料码">-->
diff --git a/src/views/modules/warninginfo/WarningInfoList.vue b/src/views/modules/warninginfo/WarningInfoList.vue
index 4a8652f160ba5ef5403cbb4b1401869b11ba36a5..baf22f6b8e3116605bdc8b0e28fae54849b6289a 100644
--- a/src/views/modules/warninginfo/WarningInfoList.vue
+++ b/src/views/modules/warninginfo/WarningInfoList.vue
@@ -142,6 +142,7 @@
   import WarningInfoModal from './modules/WarningInfoModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { postAction } from '@api/manage'
+  import moment from 'moment'
 
   export default {
     name: 'WarningInfoList',
@@ -253,9 +254,9 @@
             title:'报警时间',
             align:"center",
             dataIndex: 'closeBoxTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            // customRender:function (text) {
+            //   return !text?"":(text.length>10?text.substr(0,10):text)
+            // }
           },
           {
             title:'标签内容',