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

菜单bug修复和数据接口更新

Browse Source
This commit is contained in:
zhangjunwen 2024-04-16 18:25:42 +08:00
parent 7e2d095c41
commit 657c3da35f
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IpcDataProcess.java
View File

@ -204,7 +204,9 @@ public class IpcDataProcess implements Runnable {
Map<String, Object> fields = new TreeMap(); Map<String, Object> fields = new TreeMap();
List<IpcAlarmRecord> alarmRecordList = new ArrayList<>(); List<IpcAlarmRecord> alarmRecordList = new ArrayList<>();
//TODO 停机运维状态数据不储存
tags.put("status", "1");//正常运行 0：停机 1：正常运行 2：待机 3：试运行
// 系统电流 // 系统电流
fields.put("sys_cur", (float) 0 + Math.random()); fields.put("sys_cur", (float) 0 + Math.random());
// 系统流量 // 系统流量

1
zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRecordMapper.xml
View File

@ -74,6 +74,7 @@
and #{params.endTime} and #{params.endTime}
</if> </if>
</where> </where>
order by a.alarm_time desc
</select> </select>
<select id="selectIpcAlarmRecordById" parameterType="Long" resultMap="IpcAlarmRecordResult"> <select id="selectIpcAlarmRecordById" parameterType="Long" resultMap="IpcAlarmRecordResult">

4
zfipc-ui/src/views/dataLog/index.vue
View File

@ -994,6 +994,10 @@ export default {
} }
}, },
handleQuery() { handleQuery() {
console.log("datetime:", this.datetime);
if (this.datetime == null) {
this.datetime = this.getDefaultTimeRange();
}
this.stopRefresh(); this.stopRefresh();
let startTime = new Date(this.datetime[0]); let startTime = new Date(this.datetime[0]);
this.queryParams.startTime = this.formatDateTime(startTime); this.queryParams.startTime = this.formatDateTime(startTime);

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

@ -205,13 +205,13 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:rules:edit']" v-hasPermi="['system:rules:edit']"
>修改</el-button> >修改</el-button>
<el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:rules:remove']" v-hasPermi="['system:rules:remove']"
>删除</el-button> >删除</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

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

@ -2200,7 +2200,7 @@ export default {
data: ["4um", "6um", "14um", "21um"], data: ["4um", "6um", "14um", "21um"],
}, },
yAxis: { yAxis: {
name: "颗粒度", name: "PM",
min: 0, min: 0,
max: 1, max: 1,
interval: 0.2, // 指定刻度间隔 interval: 0.2, // 指定刻度间隔

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

@ -10,7 +10,7 @@
class="container" class="container"
style="height:100%" style="height:100%"
> >
<el-header class="header">ZFSC4中高底辊液压压区P/Q特性</el-header> <el-header class="header">ZFSC4中高顶辊液压压区P/Q特性</el-header>
<el-main class="main"> <el-main class="main">
<el-row style="height: 20%;margin:0 3%;"> <el-row style="height: 20%;margin:0 3%;">
<el-row style="height: 50%"> <el-row style="height: 50%">
@ -178,7 +178,7 @@
class="container" class="container"
style="height:100%" style="height:100%"
> >
<el-header class="header">ZFSC4中高底辊液压系统主参数</el-header> <el-header class="header">ZFSC4中高顶辊液压系统主参数</el-header>
<el-main class="main"> <el-main class="main">
<el-row style="height: 50%"> <el-row style="height: 50%">
<el-col <el-col
@ -330,7 +330,7 @@
class="container" class="container"
style="height:100%" style="height:100%"
> >
<el-header class="header">ZFSC4中高底辊液压压区P/Q特性</el-header> <el-header class="header">ZFSC4中高顶辊液压压区P/Q特性</el-header>
<el-main class="main"> <el-main class="main">
<el-row style="height: 20%;margin:0 3%;"> <el-row style="height: 20%;margin:0 3%;">
<el-row style="height: 50%"> <el-row style="height: 50%">