|
@@ -299,9 +299,18 @@
|
|
|
<p v-hasPermi="['chemical:hxpAlarmRecord:list']" @click="goAlarmRecord">更多>></p>
|
|
|
</div>
|
|
|
<el-table class="subject-alarm-time" style="margin-bottom:10px;" border :data="tableList" ref="multipleTable">
|
|
|
- <el-table-column label="报警时间" align="center" prop="alarmTime"/>
|
|
|
- <el-table-column label="处理状态" align="center" prop="operate" width="100"/>
|
|
|
- <el-table-column label="处理人" align="center" prop="handlingUserName" width="90"/>
|
|
|
+ <el-table-column label="报警时间" align="center" prop="warningTime"/>
|
|
|
+ <el-table-column label="处理状态" align="center" prop="dispose" width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{scope.row.dispose ==0?'未处理':(scope.row.userType ==1?'已处理':'-')}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="处理人" align="center" prop="responder" width="90">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.warningType==4">{{scope.row.responder}}</span>
|
|
|
+ <span v-if="scope.row.warningType==3">{{scope.row.updateName}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
<pagination
|
|
|
v-show="totalTwo>0"
|
|
@@ -401,7 +410,12 @@ import {
|
|
|
updateSubject,
|
|
|
mangerVoice,
|
|
|
startUrl,
|
|
|
- queryHardByTypeList, getHaikangUserList, subjectTriggerModes, subjectEditSort, laboratorySubjectEditSort
|
|
|
+ queryHardByTypeList,
|
|
|
+ getHaikangUserList,
|
|
|
+ subjectTriggerModes,
|
|
|
+ subjectEditSort,
|
|
|
+ laboratorySubjectEditSort,
|
|
|
+ laboratoryWarningNoticeLogList
|
|
|
} from '@/api/laboratory/subject'
|
|
|
import { listData} from "@/api/system/dict/data";
|
|
|
import { filterDept } from "@/api/medicUniversity-3_1/index";
|
|
@@ -529,6 +543,10 @@ export default {
|
|
|
queryParamsTwo:{
|
|
|
pageNum:1,
|
|
|
pageSize:20,
|
|
|
+ warningEndTime: "",
|
|
|
+ warningStartTime: "",
|
|
|
+ warningType: "",
|
|
|
+ warningWay: "3"
|
|
|
},
|
|
|
hardwareData:[],
|
|
|
//mqtt实验室id
|
|
@@ -598,7 +616,7 @@ export default {
|
|
|
},
|
|
|
goAlarmRecord(){
|
|
|
this.$router.push({
|
|
|
- path: `/chemicalLibrary/alarmRecord`,
|
|
|
+ path: `/comprehensive/content/warningNotice`,
|
|
|
})
|
|
|
},
|
|
|
//智能门禁
|
|
@@ -656,9 +674,9 @@ export default {
|
|
|
//获取实验室报警列表数据
|
|
|
getHxpAlarmRecordNoAuthList(){
|
|
|
this.queryParamsTwo.subId = this.subId;
|
|
|
- getHxpAlarmRecordNoAuthList(this.queryParamsTwo).then(response => {
|
|
|
- this.totalTwo = response.total;
|
|
|
- this.tableList = response.rows;
|
|
|
+ laboratoryWarningNoticeLogList(this.queryParamsTwo).then(response => {
|
|
|
+ this.totalTwo = response.data.total;
|
|
|
+ this.tableList = response.data.records;
|
|
|
});
|
|
|
},
|
|
|
//播放文字
|
|
@@ -1006,6 +1024,10 @@ export default {
|
|
|
this.$set(this,'queryParamsTwo',{
|
|
|
pageNum:1,
|
|
|
pageSize:20,
|
|
|
+ warningEndTime: "",
|
|
|
+ warningStartTime: "",
|
|
|
+ warningType: "",
|
|
|
+ warningWay: "3"
|
|
|
});
|
|
|
this.getEnablelist();
|
|
|
this.getHxpAlarmRecordNoAuthList();
|