修改报警历史查询

industry-admin/src/views/alarm/alarmHistory/index.vue

@@ -3,16 +3,16 @@
         <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
             <el-form-item label="点位" prop="itemListTitle">
                 <el-input :title="queryParams.itemListTitle" v-model="queryParams.itemListTitle" disabled
-                    placeholder="请选择点位" maxlength="10">
+                    placeholder="请选择点位" maxlength="10" style="width:200px">
                     <el-button size="mini" type="primary" slot="append" icon="el-icon-search"
                         @click="chooseItemEvent">选择</el-button>
                 </el-input>
             </el-form-item>
             <el-form-item label="报警文本" prop="alarmText">
-                <el-input v-model="queryParams.alarmText" placeholder="请输入报警文本" />
+                <el-input v-model="queryParams.alarmText" placeholder="请输入报警文本" style="width:150px"/>
             </el-form-item>
             <el-form-item label="报警级别" prop="alarmType">
-                <el-select v-model="queryParams.alarmType" clearable>
+                <el-select v-model="queryParams.alarmType" clearable style="width:150px">
                     <el-option v-for="alarmType in alarmTypeList" :key="alarmType" :label="alarmType"
                         :value="alarmType">
                     </el-option>
@@ -20,12 +20,12 @@
             </el-form-item>
             <el-form-item label="开始时间" prop="startTime">
                 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.startTime" type="datetime"
-                    placeholder="选择开始时间">
+                    placeholder="选择开始时间" style="width:150px">
                 </el-date-picker>
             </el-form-item>
             <el-form-item label="结束时间" prop="endTime">
                 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.endTime" type="datetime"
-                    placeholder="选择结束时间">
+                    placeholder="选择结束时间" style="width:150px">
                 </el-date-picker>
             </el-form-item>
             <el-form-item>
@@ -112,6 +112,9 @@ export default {
             alarmTypeList: ['低低报', '低报', '高报', '高高报']
         }
     },
+    created(){
+      this.queryEvent();
+    },
     methods: {
         /** 接受传过来的数据 */
         receiveCheckedData(data) {
@@ -147,13 +150,15 @@ export default {
         /** 分页获取报警日志 */
         getHisAlarmLogList() {
             if (this.queryParams.itemIdList.length == 0) {
-                this.$message({
-                    message: '请选择点位！',
-                    type: 'warning'
-                })
-                return
+                // this.$message({
+                //     message: '请选择点位！',
+                //     type: 'warning'
+                // })
+                // return
+              this.queryParams.itemIdList = [0]
             }
             let param = qs.stringify(this.queryParams, { arrayFormat: 'repeat' })
+            console.log(param)
             getHisAlarmLogList(param).then(res => {
                 if (!res || !res.data) {
                     this.$message({

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/AlarmConfigServiceImpl.java

@@ -175,6 +175,9 @@ public class AlarmConfigServiceImpl implements AlarmConfigService {
     @Override
     public Result getHisAlarmLogList(List<Integer> itemIdList, String alarmText, String alarmType, String startTime, String endTime, Integer page, Integer limit) {
         JSONObject jsonObject = new JSONObject();
+        if(itemIdList.size()==1 && itemIdList.get(0).intValue()==0){
+            itemIdList.clear();
+        }
         Integer count = alarmConfigDao.getHisAlarmLogListCount(itemIdList, alarmText, alarmType, startTime, endTime);
         Integer startNum = (page - 1) * limit;
         List<AlarmLog> hisAlarmLogList = alarmConfigDao.getHisAlarmLogList(itemIdList, alarmText, alarmType, startTime, endTime, startNum, limit);

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/SystemServiceImpl.java

@@ -147,10 +147,12 @@ public class SystemServiceImpl implements SystemService {
             String sql1 = "SHOW VARIABLES LIKE '%datadir%'";
             ResultSet resultSet1 = statement.executeQuery(sql1);
             String path = "";
+            String diskpath = "";
             while ((resultSet1.next())) {
                 String value = resultSet1.getString("value");
                 jsonObject.put("path", value);
                 //path = value.split("\\\\")[0];
+                diskpath = value.split("\\\\")[0];
                 path = value;
                 jsonObject.put("tray", path);
                 break;
@@ -160,7 +162,7 @@ public class SystemServiceImpl implements SystemService {
             connection.close();
             File[] files = File.listRoots();
             for (File file : files) {
-                if (path.equals(file.getAbsolutePath().split("\\\\")[0])) {
+                if (diskpath.equals(file.getAbsolutePath().split("\\\\")[0])) {
                     jsonObject.put("totalSpace", file.getTotalSpace() / 1024 / 1024 / 1024);
                     jsonObject.put("usableSpace", file.getUsableSpace() / 1024 / 1024 / 1024);
                     break;