jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

塔机工作循环功能

dev_xd
haha 2025-03-20 22:07:00 +08:00
parent d00f1c5363
commit ff7b80ddbf
8 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollide.java
View File

@ -23,6 +23,10 @@ public class DevTowerDataCollide extends BaseEntity
/** 配置编号 */
private Long cfgId;
/** 租户名称 */
@Excel(name = "租户名称")
private String comName;
/** 项目主键 */
private Long projectId;
@ -33,10 +37,6 @@ public class DevTowerDataCollide extends BaseEntity
/** 总包单位主键 */
private Long comId;
/** 总包单位名称 */
@Excel(name = "总包单位名称")
private String comName;
/** 设备序列号 */
@Excel(name = "设备序列号")
private String deviceKey;

8
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLimit.java
View File

@ -23,6 +23,10 @@ public class DevTowerDataLimit extends BaseEntity
/** 项目主键 */
private Long projectId;
/** 租户名称 */
@Excel(name = "租户名称")
private String comName;
/** 项目名称 */
@Excel(name = "项目名称")
private String projectName;
@ -30,10 +34,6 @@ public class DevTowerDataLimit extends BaseEntity
/** 总包单位主键 */
private Long comId;
/** 总包单位名称 */
@Excel(name = "总包单位名称")
private String comName;
/** 设备序列号 */
@Excel(name = "设备序列号")
private String deviceKey;

8
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLocal.java
View File

@ -20,7 +20,9 @@ public class DevTowerDataLocal extends BaseEntity
/** 配置编号 */
private Long cfgId;
/** 租户名称 */
@Excel(name = "租户名称")
private String comName;
/** 项目主键 */
private Long projectId;
@ -31,10 +33,6 @@ public class DevTowerDataLocal extends BaseEntity
/** 总包单位主键 */
private Long comId;
/** 总包单位名称 */
@Excel(name = "总包单位名称")
private String comName;
/** 设备序列号 */
@Excel(name = "设备序列号")
private String deviceKey;

8
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRound.java
View File

@ -24,6 +24,10 @@ public class DevTowerDataRound extends BaseEntity
/** 项目主键 */
private Long projectId;
/** 租户名称 */
@Excel(name = "租户名称")
private String comName;
/** 项目名称 */
@Excel(name = "项目名称")
private String projectName;
@ -31,10 +35,6 @@ public class DevTowerDataRound extends BaseEntity
/** 总包单位主键 */
private Long comId;
/** 总包单位名称 */
@Excel(name = "总包单位名称")
private String comName;
/** 设备序列号 */
@Excel(name = "设备序列号")
private String deviceKey;

8
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java
View File

@ -24,6 +24,10 @@ public class DevTowerDataWarning extends BaseEntity
/** 项目主键 */
private Long projectId;
/** 租户名称 */
@Excel(name = "租户名称")
private String comName;
/** 项目名称 */
@Excel(name = "项目名称")
private String projectName;
@ -31,10 +35,6 @@ public class DevTowerDataWarning extends BaseEntity
/** 总包单位主键 */
private Long comId;
/** 总包单位名称 */
@Excel(name = "总包单位名称")
private String comName;
/** 设备序列号 */
@Excel(name = "设备序列号")
private String deviceKey;

23
yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
View File

@ -2,12 +2,12 @@
<div class="app-container tower-data-round">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="单位名称" prop="deptName">
<el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter="handleQuery" />
<el-form-item label="项目名称" prop="projectId">
<el-select v-model="queryParams.projectId" clearable :disabled="currentPrjId ? true : false" filterable
placeholder="请选择所属项目" style="width: 240px">
<el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
@ -34,15 +34,16 @@
<el-table v-loading="loading" :data="towerDataRoundList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目名称" align="center" prop="projectName" width="200" />
<el-table-column label="总包单位" align="center" prop="deptName" width="200" />
<el-table-column label="项目名称" align="center" prop="projectName" width="200"
v-if="currentPrjId ? false : true" />
<el-table-column label="id" align="center" prop="id" width="100" />
<el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
<el-table-column label="工作循环开始" align="center" prop="workStartTime" width="180" />
<el-table-column label="工作循环结束" align="center" prop="workEndTime" width="180" />
<el-table-column label="警报信息" align="center" prop="warnings" width="200">
<template #default="scope">
<div class="tag-group">
<dict-tag :options="dict.type.device_tower_warning"
<dict-tag :options="dict.device_tower_warning"
:value="scope.row.warnings ? scope.row.warnings.split(',') : '0'" />
</div>
</template>
@ -71,7 +72,7 @@
<el-table-column label="工作循环结束垂直倾角" align="center" prop="endLeanAngleY" width="220" />
<el-table-column label="是否有效" align="center" prop="isDel" width="100">
<template #default="scope">
<dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" />
<dict-tag :options="dict.sys_common_isdel" :value="scope.row.isDel" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
@ -185,7 +186,7 @@
</el-form-item>
<el-form-item label="是否有效" prop="isDel">
<el-select v-model="form.isDel" placeholder="请选择是否有效">
<el-option v-for="dict in dict.type.sys_common_isdel" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.sys_common_isdel" :key="dict.value" :label="dict.label"
:value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>

3
yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
View File

@ -3,7 +3,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="项目名称" prop="projectId">
<el-select v-model="queryParams.projectId" :disabled="currentPrjId ? true : false" filterable
<el-select v-model="queryParams.projectId" clearable :disabled="currentPrjId ? true : false" filterable
placeholder="请选择所属项目" style="width: 240px">
<el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
</el-option>
@ -38,6 +38,7 @@
<el-table v-loading="loading" :data="towerDataRunList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" width="100" />
<el-table-column label="项目名称" align="center" prop="projectName" width="200"
v-if="currentPrjId ? false : true" />
<el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />

3
yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
View File

@ -3,7 +3,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="项目名称" prop="projectId">
<el-select v-model="queryParams.projectId" :disabled="currentPrjId ? true : false" filterable
<el-select v-model="queryParams.projectId" clearable :disabled="currentPrjId ? true : false" filterable
placeholder="请选择所属项目" style="width: 200px">
<el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
</el-option>
@ -42,6 +42,7 @@
</el-row>
<el-table v-loading="loading" :data="towerProjectConfigList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" width="100" />
<el-table-column label="项目名称" align="center" prop="projectName" width="150"
v-if="currentPrjId ? false : true" />
<el-table-column label="设备名称" align="center" prop="deviceName" width="150" />