From 11a332b2466c10379f30c0f3503a33fb946336fb Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 30 八月 2024 13:44:57 +0800
Subject: [PATCH] 报警信息添加工位字段； 报警页面和首页自适应优化； 绑定首页设备控制和设备数据，与后台实时通讯；
---
Web/src/views/wcs/wcsAlarmInfo/index.vue | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/Web/src/views/wcs/wcsAlarmInfo/index.vue b/Web/src/views/wcs/wcsAlarmInfo/index.vue
index 1b582da..0eac6fd 100644
--- a/Web/src/views/wcs/wcsAlarmInfo/index.vue
+++ b/Web/src/views/wcs/wcsAlarmInfo/index.vue
@@ -1,42 +1,50 @@
锘�<template>
<div class="wcsAlarmInfo-container">
- <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+ <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="queryParams" ref="queryForm" labelWidth="90">
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item label="鍏抽敭瀛�">
- <el-input v-model="queryParams.searchKey" clearable="" placeholder="璇疯緭鍏ユā绯婃煡璇㈠叧閿瓧" />
-
+ <el-input v-model="queryParams.searchKey" clearable="" placeholder="璇疯緭鍏ユā绯婃煡璇㈠叧閿瓧"/>
+
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
<el-form-item label="PLCIP鍦板潃">
- <el-input v-model="queryParams.plcIP" clearable="" placeholder="璇疯緭鍏LCIP鍦板潃" />
-
+ <el-input v-model="queryParams.plcIP" clearable="" placeholder="璇疯緭鍏LCIP鍦板潃"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+ <el-form-item label="鐘舵��">
+ <el-select clearable="" v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option v-for="(item,index) in dl('YesNoEnum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" />
+
+ </el-select>
+
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
<el-form-item label="璁惧绫诲瀷">
- <el-input v-model="queryParams.type" clearable="" placeholder="璇疯緭鍏ヨ澶囩被鍨�" />
-
+ <el-select clearable="" v-model="queryParams.type" placeholder="璇烽�夋嫨璁惧绫诲瀷">
+ <el-option v-for="(item,index) in dl('PLCTypeEnum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" />
+
+ </el-select>
+
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
- <el-form-item>
+ <el-form-item >
<el-button-group style="display: flex; align-items: center;">
- <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'wcsAlarmInfo:page'"> 鏌ヨ
- </el-button>
- <el-button icon="ele-Refresh" @click="() => queryParams = {}"> 閲嶇疆 </el-button>
- <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI"
- style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
- <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI"
- style="margin-left:5px;"> 闅愯棌 </el-button>
- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsAlarmInfo"
- v-auth="'wcsAlarmInfo:add'"> 鏂板 </el-button>
-
+ <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'wcsAlarmInfo:page'"> 鏌ヨ </el-button>
+ <el-button icon="ele-Refresh" @click="() => queryParams = {}"> 閲嶇疆 </el-button>
+ <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
+ <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 闅愯棌 </el-button>
+ <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsAlarmInfo" v-auth="'wcsAlarmInfo:add'"> 鏂板 </el-button>
+
</el-button-group>
</el-form-item>
-
+
</el-col>
</el-row>
</el-form>
@@ -46,21 +54,28 @@
@sort-change="sortChange" border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column prop="plcIP" label="PLCIP鍦板潃" show-overflow-tooltip="" />
+ <el-table-column prop="plcPort" label="PLCIP绔彛" show-overflow-tooltip="" />
+ <el-table-column prop="stationNum" label="宸ヤ綅鍙�" show-overflow-tooltip="" />
<el-table-column prop="alarmCode" label="鎶ヨ缂栧彿" show-overflow-tooltip="" />
<el-table-column prop="alarmName" label="鎶ヨ鎻忚堪" show-overflow-tooltip="" />
<el-table-column prop="ledIP" label="鏄剧ず灞廼p鍦板潃" show-overflow-tooltip="" />
- <el-table-column prop="status" label="鎶ヨ鐘舵��" show-overflow-tooltip="">
+ <el-table-column prop="status" label="鐘舵��" show-overflow-tooltip="">
<template #default="scope">
<el-tag :type="dv('YesNoEnum', scope.row.status)?.tagType"> {{ dv('YesNoEnum',
- scope.row.status)?.name }}</el-tag>
+ scope.row.status)?.name}}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="type" label="璁惧绫诲瀷" show-overflow-tooltip="" />
+ <el-table-column prop="type" label="璁惧绫诲瀷" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag :type="dv('PLCTypeEnum', scope.row.type)?.tagType"> {{ dv('PLCTypeEnum',
+ scope.row.type)?.name}}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="alarmTime" label="鎶ヨ鏃ユ湡" show-overflow-tooltip="" />
- <el-table-column prop="ledStatus" label="LED鏄剧ず鐘舵��" show-overflow-tooltip="">
+ <el-table-column prop="ledStatus" label="LED鐘舵��" show-overflow-tooltip="">
<template #default="scope">
<el-tag :type="dv('YesNoEnum', scope.row.ledStatus)?.tagType"> {{ dv('YesNoEnum',
- scope.row.ledStatus)?.name }}</el-tag>
+ scope.row.ledStatus)?.name}}</el-tag>
</template>
</el-table-column>
<el-table-column label="淇敼璁板綍" width="80" align="center" show-overflow-tooltip>
--
Gitblit v1.8.0