TuringsMachine/zfipc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面样式更新和展示问题修改

Browse Source
This commit is contained in:
zhangjunwen 2024-04-16 10:43:54 +08:00
parent 3c71e496da
commit 83ee70a1a8
8 changed files with 77 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcAlarmRecord.java
View File

@ -183,21 +183,21 @@ public class IpcAlarmRecord extends BaseEntity
this.alarmLevel = alarmLevel;
}
// public IpcEquipInfo getEquipInfo() {
// return equipInfo;
// }
//
// public void setEquipInfo(IpcEquipInfo equipInfo) {
// this.equipInfo = equipInfo;
// }
//
// public IpcAlarmRules getAlarmRules() {
// return alarmRules;
// }
//
// public void setAlarmRules(IpcAlarmRules alarmRules) {
// this.alarmRules = alarmRules;
// }
public IpcEquipInfo getEquipInfo() {
return equipInfo;
}
public void setEquipInfo(IpcEquipInfo equipInfo) {
this.equipInfo = equipInfo;
}
public IpcAlarmRules getAlarmRules() {
return alarmRules;
}
public void setAlarmRules(IpcAlarmRules alarmRules) {
this.alarmRules = alarmRules;
}
public String[] getIds() {
return ids;

3
zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcAlarmRulesServiceImpl.java
View File

@ -47,9 +47,6 @@ public class IpcAlarmRulesServiceImpl implements IIpcAlarmRulesService
List<IpcEquipInfo> equips = ipcEquipInfoService.selectIpcEquipInfoList(null);
for (IpcEquipInfo equip : equips) {
List<IpcAlarmRules> rulesByEquipId = selectIpcAlarmRulesByEquipId(equip.getId());
if(redisCache.getCacheObject(CacheConstants.IPC_RULES_KEY+equip.getId()) != null){
redisCache.deleteObject(CacheConstants.IPC_RULES_KEY+equip.getId());
}
redisCache.setCacheList((CacheConstants.IPC_RULES_KEY+equip.getId()),rulesByEquipId);
}
}

9
zfipc-ui/src/App.vue
View File

@ -30,18 +30,19 @@ div.el-table tr {
background-color: #0b2d57;
}
.el-tabs--border-card {
background-color: #124b86;
background-color: #002250;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
background-color: #002250;
background-color: #124b86;
border-color: white;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item {
background-color: #124b86;
background-color: #002250;
border-color: white;
}
.el-tabs--border-card > .el-tabs__header {
background-color: #124b86;
background-color: #002250;
}
.pagination-container {
height: 30px;

2
zfipc-ui/src/views/warn/alarm/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<el-tabs
v-model="activeName"
type="card"
type="border-card"
@tab-click="handleTabClick"
>
<el-tab-pane

6
zfipc-ui/src/views/warn/record/index.vue
View File

@ -6,12 +6,12 @@
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
style="text-align:right"
>
<el-form-item
label="监测设备"
prop="equipId"
label-width="60px"
>
<el-select
v-model="queryParams.equipId"
@ -30,6 +30,7 @@
<el-form-item
label="参数名称"
prop="alarmRulesId"
label-width="60px"
>
<el-select
v-model="queryParams.alarmRulesId"
@ -48,6 +49,7 @@
<el-form-item
label="报警等级"
prop="alarmLevel"
label-width="60px"
>
<el-select
v-model="queryParams.alarmLevel"
@ -65,6 +67,7 @@
<el-form-item
label="报警时间"
prop="alarmTime"
label-width="60px"
>
<el-date-picker
class="picker"
@ -80,6 +83,7 @@
<el-form-item
label="状态"
prop="alarmStatus"
label-width="40px"
>
<el-select
v-model="queryParams.status"

43
zfipc-ui/src/views/zf/cydg/yxjk.vue
View File

@ -396,52 +396,55 @@
<el-row style="height: 40%">
<el-col
:span="12"
id="dlnd"
style="height: 100%"
@click="trendClick('visc'
,'油品粘度','')"
style="height: 100%;"
>
<div
id="dlnd"
style="width: 100%;height: 100%;"
@click="trendClick('visc'
,'油品粘度','')"
></div>
</el-col>
<el-col
:span="12"
id="xdsd"
style="height: 100%"
@click="trendClick('oil_water'
,'油品湿度','%')"
></el-col>
>
<div
id="xdsd"
style="width: 100%;height: 100%;"
@click="trendClick('oil_water'
,'油品湿度','%')"
></div>
</el-col>
</el-row>
<el-row style="height: 10%;padding-top: 3%;">
<el-col
:span="3"
style="text-align: right;;height: 100%"
@click="trendClick('gran4'
,'油液颗粒度（4um）','PM')"
>4um</el-col>
><span @click="trendClick('gran4'
,'油液颗粒度（4um）','PM')">4um</span></el-col>
<el-col :span="3">
<span class="numCol">{{ yykld4 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
@click="trendClick('gran6'
,'油液颗粒度（6um）','PM')"
>6um</el-col><el-col :span="3">
><span @click="trendClick('gran6'
,'油液颗粒度（6um）','PM')">6um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld6 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
@click="trendClick('gran14'
,'油液颗粒度（14um）','PM')"
>14um</el-col><el-col :span="3">
><span @click="trendClick('gran14'
,'油液颗粒度（14um）','PM')">14um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld14 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
@click="trendClick('gran21'
,'油液颗粒度（21um）','PM')"
>21um</el-col><el-col :span="3">
><span @click="trendClick('gran21'
,'油液颗粒度（21um）','PM')">21um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld21 }}</span>
</el-col>
</el-row>

15
zfipc-ui/src/views/zf/zgdgBottom/index.vue
View File

@ -458,12 +458,25 @@
id="dlnd"
style="height: 100%"
>
<div
id="dlnd"
style="width: 100%;height: 100%;"
@click="trendClick('visc'
,'油品粘度','')"
></div>
</el-col>
<el-col
:span="12"
id="xdsd"
style="height: 100%"
></el-col>
>
<div
id="xdsd"
style="width: 100%;height: 100%;"
@click="trendClick('oil_water'
,'油品湿度','%')"
></div>
</el-col>
</el-row>
<el-row style="height: 10%;padding-top: 3%;">
<el-col

15
zfipc-ui/src/views/zf/zgdgTop/index.vue
View File

@ -458,12 +458,25 @@
id="dlnd"
style="height: 100%"
>
<div
id="dlnd"
style="width: 100%;height: 100%;"
@click="trendClick('visc'
,'油品粘度','')"
></div>
</el-col>
<el-col
:span="12"
id="xdsd"
style="height: 100%"
></el-col>
>
<div
id="xdsd"
style="width: 100%;height: 100%;"
@click="trendClick('oil_water'
,'油品湿度','%')"
></div>
</el-col>
</el-row>
<el-row style="height: 10%;padding-top: 3%;">
<el-col