历史报警隐藏新增编辑等无用按钮

itdmWeb/src/views/module-iTDM/itdmAlarm/ItdmAlarmList.vue

@@ -5,22 +5,29 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备名称">
-              <a-input placeholder="请输入设备名称" v-model="queryParam.deviceName"></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.deviceNo"></a-input>
+            <a-form-item label="设备">
+              <j-dict-select-tag placeholder="请选择设备" v-model="queryParam.deviceId" dictCode="itdm_device,device_name,id"/>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="设备类型">
+                <a-input placeholder="请输入设备类型" v-model="queryParam.deviceStatus"></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.valueType"></a-input>
               </a-form-item>
             </a-col>
           </template>
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <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.createTime_begin"></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.createTime_end"></j-date>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -38,13 +45,13 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('历史报警表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -95,22 +102,27 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
+          <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          </a-menu-item>
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+
+<!--          <a-divider type="vertical" />-->
+<!--          <a-dropdown>-->
+<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
+<!--            <a-menu slot="overlay">-->
+<!--              <a-menu-item>-->
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
         </span>
 
       </a-table>
@@ -126,6 +138,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ItdmAlarmModal from './modules/ItdmAlarmModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'ItdmAlarmList',
@@ -149,7 +162,7 @@
             }
           },
           {
-            title:'创建日期',
+            title:'采集日期',
             align:"center",
             dataIndex: 'createTime'
           },
@@ -164,6 +177,11 @@
             dataIndex: 'deviceNo'
           },
           {
+            title:'设备类型',
+            align:"center",
+            dataIndex: 'deviceStatus'
+          },
+          {
             title:'数据类型',
             align:"center",
             dataIndex: 'valueType'
@@ -203,7 +221,7 @@
           deleteBatch: "/itdmAlarm/itdmAlarm/deleteBatch",
           exportXlsUrl: "/itdmAlarm/itdmAlarm/exportXls",
           importExcelUrl: "itdmAlarm/itdmAlarm/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -222,9 +240,11 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'datetime',value:'createTime',text:'采集日期'})
+        fieldList.push({type:'string',value:'deviceId',text:'设备id',dictCode:"itdm_device,device_name,id"})
         fieldList.push({type:'string',value:'deviceName',text:'设备名称',dictCode:''})
         fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
+        fieldList.push({type:'string',value:'deviceStatus',text:'设备类型',dictCode:''})
         fieldList.push({type:'string',value:'valueType',text:'数据类型',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'value',text:'实际数值',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'maxValue',text:'数值上限',dictCode:''})

itdmWeb/src/views/module-iTDM/itdmAlarm/modules/ItdmAlarmForm.vue

@@ -14,6 +14,11 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
+            <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceStatus">
+              <a-input v-model="model.deviceStatus" placeholder="请输入设备类型"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
             <a-form-model-item label="数据类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="valueType">
               <a-input v-model="model.valueType" placeholder="请输入数据类型"  ></a-input>
             </a-form-model-item>
@@ -75,6 +80,9 @@
         },
         confirmLoading: false,
         validatorRules: {
+           deviceName: [
+              { required: true, message: '请输入设备名称!'},
+           ],
         },
         url: {
           add: "/itdmAlarm/itdmAlarm/add",