diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/PublicStateEnum.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/PublicStateEnum.java
new file mode 100644
index 00000000..b9b4dce2
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/PublicStateEnum.java
@@ -0,0 +1,62 @@
+package com.yanzhu.common.core.enums;
+
+/**
+ * 公共状态枚举
+ */
+public enum PublicStateEnum {
+
+    YES("Y", "YES"),
+    NO("N", "NO"),
+    OK("0", "正常"),
+    DISABLE("1", "停用"),
+    DELETED("2", "删除"),
+    HG("1","合格"),
+    BHG("2","不合格"),
+    USERTYPE_JFJL("21", "甲方经理"),
+    /**********************************项目验收***************************************/
+    PROJECT_CHECK_TYPE_JPYS("1", "举牌验收"),
+    PROJECT_CHECK_POSITION_TYPE("1", "默认工序部位类型"),
+    /**********************************项目验收***************************************/
+
+    /**********************************审批相关***************************************/
+    AUDIT_TYPE_QYFS("1", "取样复试"),
+    AUDIT_TYPE_CLFY("4", "材料封样"),
+    AUDIT_TYPE_JPYS("3", "举牌验收"),
+    AUDIT_TYPE_SCSL("2", "实测实量"),
+    AUDIT_TYPE_GCGNJY("5", "工程功能检验"),
+    AUDITINFO_DSH("1", "待审核"),
+    AUDITINFO_SHBH("3", "审核驳回"),
+    AUDITINFO_SHTG("4", "审核通过"),
+    /**********************************审批相关***************************************/
+
+    /**********************************视频设备***************************************/
+    VIDEO_ONLINE("1", "在线"),
+    VIDEO_OFFLINE("2", "离线"),
+    VIDEO_UNKNOWN("3", "未知"),
+    /**********************************视频设备***************************************/
+
+    /**********************************材料进场取样复试***************************************/
+    CHECK_STATE_SJ("1", "送检中"),
+    /**********************************材料进场取样复试***************************************/
+    COMZGS("1","子公司状态标识");
+
+    private final String code;
+    private final String info;
+
+    PublicStateEnum(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollide.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollide.java
index ec59aa08..361dcabb 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollide.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollide.java
@@ -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;
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLimit.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLimit.java
index dbe3e1c4..3c7caf07 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLimit.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLimit.java
@@ -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;
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLocal.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLocal.java
index 85032499..96badf45 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLocal.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLocal.java
@@ -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;
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRound.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRound.java
index aefbd404..5f61f8a8 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRound.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRound.java
@@ -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;
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java
index 7e97c179..61672f11 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java
@@ -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;
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/bigscreen/TowerCraneController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/bigscreen/TowerCraneController.java
new file mode 100644
index 00000000..433cae3c
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/bigscreen/TowerCraneController.java
@@ -0,0 +1,104 @@
+package com.yanzhu.manage.controller.bigscreen;
+
+import com.yanzhu.common.core.enums.PublicStateEnum;
+import com.yanzhu.common.core.text.Convert;
+import com.yanzhu.common.core.web.controller.BaseController;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.device.domain.DevTowerDataLimit;
+import com.yanzhu.device.domain.DevTowerDataRun;
+import com.yanzhu.device.domain.DevTowerProjectConfig;
+import com.yanzhu.manage.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔吊监测Controller
+ *
+ * @author JiangYuQi
+ * @date 2024-08-08
+ */
+@RestController
+@RequestMapping("/bgscreen/tower")
+public class TowerCraneController extends BaseController {
+
+
+    @Autowired
+    private IDevTowerDataRunService devTowerDataRunService;
+
+    @Autowired
+    private IDevTowerDataRoundService devTowerDataRoundService;
+
+    @Autowired
+    private IDevTowerDataLimitService devTowerDataLimitService;
+
+    @Autowired
+    private IDevTowerDataLocalService devTowerDataLocalService;
+
+    @Autowired
+    private IDevTowerDataCollideService devTowerDataCollideService;
+
+    @Autowired
+    private IDevTowerProjectConfigService devTowerProjectConfigService;
+
+    /**
+     * 查询塔基配置列表
+     */
+    @GetMapping("/findTowerConfigGroupOnline")
+    public AjaxResult findTowerConfigGroupOnline(String deptId, String projectId)
+    {
+        DevTowerProjectConfig devTowerProjectConfig = new DevTowerProjectConfig();
+        devTowerProjectConfig.setProjectId(Convert.toLong(projectId));
+        List<Map<String, Object>> list = devTowerProjectConfigService.findtowerConfigGroupOnline(devTowerProjectConfig);
+        return success(list);
+    }
+
+    /**
+     * 查询塔基配置列表
+     */
+    @GetMapping("/findTowerConfigListByProjectId")
+    public AjaxResult findTowerConfigListByProjectId(String deptId, String projectId)
+    {
+       DevTowerProjectConfig devTowerProjectConfig = new DevTowerProjectConfig();
+        devTowerProjectConfig.setProjectId(Convert.toLong(projectId));
+        devTowerProjectConfig.setIsDel(Convert.toLong(PublicStateEnum.OK.getCode()));
+        List<DevTowerProjectConfig> list = devTowerProjectConfigService.selectDevTowerProjectConfigList(devTowerProjectConfig);
+        return success(list);
+    }
+
+    /**
+     * 查询塔基运行统计
+     */
+    @GetMapping("/findTowerStatisticsView")
+    public AjaxResult findTowerStatisticsView(String deviceSn)
+    {
+        Map<String, Object> data = devTowerDataRunService.findtowerStatisticsView(deviceSn);
+        return success(data);
+    }
+
+    /**
+     * 查询塔基限位数据
+     */
+    @GetMapping("/selectDevTowerDataLimitList")
+    public AjaxResult selectDevTowerDataLimitList(DevTowerDataLimit devTowerDataLimit)
+    {
+        startPage();
+        List<DevTowerDataLimit> list = devTowerDataLimitService.selectDevTowerDataLimitList(devTowerDataLimit);
+        return success(list);
+    }
+
+    /**
+     * 查询塔基实时数据
+     */
+    @GetMapping("/selectDevTowerDataRunList")
+    public AjaxResult selectDevTowerDataRunList(DevTowerDataRun devTowerDataRun)
+    {
+        startPage();
+        List<DevTowerDataRun> list = devTowerDataRunService.selectDevTowerDataRunList(devTowerDataRun);
+        return success(list);
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java
index f4e4ed72..547d73a0 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java
@@ -27,6 +27,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import static com.yanzhu.manage.service.impl.DevTowerProjectConfigServiceImpl.YANZHU_DEVICE_TOWER;
+
 /**
  * 塔吊监测APIController
  *
@@ -70,7 +72,7 @@ public class TowerCraneApiController {
     @RateLimiter(count = 10, limitType = LimitType.IP)
     @PostMapping("/v1/push")
     public AjaxResult pushData(@Validated @RequestBody TowerReqVo req) {
-        DevTowerProjectConfig config = redisService.getCacheObject(CacheConstants.YANZHU_DEVICE_TOWER+req.getContent().getDeviceKey());
+        DevTowerProjectConfig config = redisService.getCacheObject(YANZHU_DEVICE_TOWER+req.getContent().getDeviceKey());
         if(config==null){
             throw new ServiceException(HttpStatusEnum.DARA_EXCEPTION.getInfo(), HttpStatusEnum.DARA_EXCEPTION.getCode());
         }
diff --git a/yanzhu-ui-vue3/src/api/device/towerDataCollide.js b/yanzhu-ui-vue3/src/api/device/towerDataCollide.js
new file mode 100644
index 00000000..cee22575
--- /dev/null
+++ b/yanzhu-ui-vue3/src/api/device/towerDataCollide.js
@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 查询塔机碰撞信息列表
+export function listTowerDataCollide(query) {
+  return request({
+    url: "/manage/device/towerDataCollide/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询塔机碰撞信息详细
+export function getTowerDataCollide(id) {
+  return request({
+    url: "/manage/device/towerDataCollide/" + id,
+    method: "get",
+  });
+}
+
+// 新增塔机碰撞信息
+export function addTowerDataCollide(data) {
+  return request({
+    url: "/manage/device/towerDataCollide",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改塔机碰撞信息
+export function updateTowerDataCollide(data) {
+  return request({
+    url: "/manage/device/towerDataCollide",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除塔机碰撞信息
+export function delTowerDataCollide(id) {
+  return request({
+    url: "/manage/device/towerDataCollide/" + id,
+    method: "delete",
+  });
+}
diff --git a/yanzhu-ui-vue3/src/api/device/towerDataLimit.js b/yanzhu-ui-vue3/src/api/device/towerDataLimit.js
new file mode 100644
index 00000000..d03eeef4
--- /dev/null
+++ b/yanzhu-ui-vue3/src/api/device/towerDataLimit.js
@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 查询塔机限位信息列表
+export function listTowerDataLimit(query) {
+  return request({
+    url: "/manage/device/towerDataLimit/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询塔机限位信息详细
+export function getTowerDataLimit(id) {
+  return request({
+    url: "/manage/device/towerDataLimit/" + id,
+    method: "get",
+  });
+}
+
+// 新增塔机限位信息
+export function addTowerDataLimit(data) {
+  return request({
+    url: "/manage/device/towerDataLimit",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改塔机限位信息
+export function updateTowerDataLimit(data) {
+  return request({
+    url: "/manage/device/towerDataLimit",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除塔机限位信息
+export function delTowerDataLimit(id) {
+  return request({
+    url: "/manage/device/towerDataLimit/" + id,
+    method: "delete",
+  });
+}
diff --git a/yanzhu-ui-vue3/src/api/device/towerDataRound.js b/yanzhu-ui-vue3/src/api/device/towerDataRound.js
new file mode 100644
index 00000000..3dcc4477
--- /dev/null
+++ b/yanzhu-ui-vue3/src/api/device/towerDataRound.js
@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 查询塔机工作循环列表
+export function listTowerDataRound(query) {
+  return request({
+    url: "/manage/device/towerDataRound/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询塔机工作循环详细
+export function getTowerDataRound(id) {
+  return request({
+    url: "/manage/device/towerDataRound/" + id,
+    method: "get",
+  });
+}
+
+// 新增塔机工作循环
+export function addTowerDataRound(data) {
+  return request({
+    url: "/manage/device/towerDataRound",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改塔机工作循环
+export function updateTowerDataRound(data) {
+  return request({
+    url: "/manage/device/towerDataRound",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除塔机工作循环
+export function delTowerDataRound(id) {
+  return request({
+    url: "/manage/device/towerDataRound/" + id,
+    method: "delete",
+  });
+}
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
index 8e45bac1..b988d710 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
@@ -1,13 +1,474 @@
 <template>
     <div class="app-container tower-data-collide">
-        222222
+        <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" 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>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="单位名称" prop="deptName">
+                <el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="创建时间">
+                <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                    type="daterange" range-separator="-" start-placeholder="开始日期"
+                    end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="danger" plain icon="el-icon-delete" size="small" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['device:towerDataCollide:remove']">删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="small" @click="handleExport"
+                    v-hasPermi="['device:towerDataCollide:export']">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="towerDataCollideList" @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="deviceKey" width="200" />
+            <el-table-column label="塔机坐标x" align="center" prop="coordinateX" width="120" />
+            <el-table-column label="塔机坐标y" align="center" prop="coordinateY" width="120" />
+            <el-table-column label="前臂长度" align="center" prop="frontBrachium" width="100" />
+            <el-table-column label="平衡臂长度" align="center" prop="afterBrachium" width="120" />
+            <el-table-column label="塔身高度" align="center" prop="towerBodyHeight" width="100" />
+            <el-table-column label="吊钩实时高度" align="center" prop="height" width="160" />
+            <el-table-column label="塔机实时回转角度" align="center" prop="angle" width="200" />
+            <el-table-column label="吊钩实时幅度" align="center" prop="range" width="160" />
+            <el-table-column label="设置的预警距离" align="center" prop="earlyWarningDistance" width="180" />
+            <el-table-column label="设置的报警距离" align="center" prop="alarmWarningDistance" width="180" />
+            <el-table-column label="塔身高度相差" align="center" prop="contourValue" width="160" />
+            <el-table-column label="是否有效" align="center" prop="isDel" width="100">
+                <template #default="scope">
+                    <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">
+                <template #default="scope">
+                    <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+                <template #default="scope">
+                    <el-button size="small" type="primary" text icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['device:towerDataCollide:remove']">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改塔机碰撞信息对话框 -->
+        <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="项目主键" prop="projectId">
+                    <el-input v-model="form.projectId" placeholder="请输入项目主键" />
+                </el-form-item>
+                <el-form-item label="总包单位主键" prop="deptId">
+                    <el-input v-model="form.deptId" placeholder="请输入总包单位主键" />
+                </el-form-item>
+                <el-form-item label="设备序列号" prop="deviceKey">
+                    <el-input v-model="form.deviceKey" placeholder="请输入设备序列号" />
+                </el-form-item>
+                <el-form-item label="设备来源" prop="deviceSource">
+                    <el-input v-model="form.deviceSource" placeholder="请输入设备来源" />
+                </el-form-item>
+                <el-form-item label="塔机编号" prop="towerId">
+                    <el-input v-model="form.towerId" placeholder="请输入塔机编号" />
+                </el-form-item>
+                <el-form-item label="塔机坐标x" prop="coordinateX">
+                    <el-input v-model="form.coordinateX" placeholder="请输入塔机坐标x" />
+                </el-form-item>
+                <el-form-item label="塔机坐标y" prop="coordinateY">
+                    <el-input v-model="form.coordinateY" placeholder="请输入塔机坐标y" />
+                </el-form-item>
+                <el-form-item label="前臂长度" prop="frontBrachium">
+                    <el-input v-model="form.frontBrachium" placeholder="请输入前臂长度" />
+                </el-form-item>
+                <el-form-item label="平衡臂长度" prop="afterBrachium">
+                    <el-input v-model="form.afterBrachium" placeholder="请输入平衡臂长度" />
+                </el-form-item>
+                <el-form-item label="塔身高度" prop="towerBodyHeight">
+                    <el-input v-model="form.towerBodyHeight" placeholder="请输入塔身高度" />
+                </el-form-item>
+                <el-form-item label="吊钩实时高度" prop="height">
+                    <el-input v-model="form.height" placeholder="请输入吊钩实时高度" />
+                </el-form-item>
+                <el-form-item label="塔机实时回转角度" prop="angle">
+                    <el-input v-model="form.angle" placeholder="请输入塔机实时回转角度" />
+                </el-form-item>
+                <el-form-item label="吊钩实时幅度" prop="range">
+                    <el-input v-model="form.range" placeholder="请输入吊钩实时幅度" />
+                </el-form-item>
+                <el-form-item label="设置的预警距离" prop="earlyWarningDistance">
+                    <el-input v-model="form.earlyWarningDistance" placeholder="请输入设置的预警距离" />
+                </el-form-item>
+                <el-form-item label="设置的报警距离" prop="alarmWarningDistance">
+                    <el-input v-model="form.alarmWarningDistance" placeholder="请输入设置的报警距离" />
+                </el-form-item>
+                <el-form-item label="塔身高度相差" prop="contourValue">
+                    <el-input v-model="form.contourValue" placeholder="请输入塔身高度相差" />
+                </el-form-item>
+                <el-form-item label="是否有效" prop="isDel">
+                    <el-select v-model="form.isDel" placeholder="请选择是否有效">
+                        <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>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" placeholder="请输入备注" />
+                </el-form-item>
+                <el-divider content-position="center">碰撞详情信息</el-divider>
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button type="primary" icon="el-icon-plus" size="small"
+                            @click="handleAddDevTowerDataCollideDetail">添加</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="danger" icon="el-icon-delete" size="small"
+                            @click="handleDeleteDevTowerDataCollideDetail">删除</el-button>
+                    </el-col>
+                </el-row>
+                <el-table :data="devTowerDataCollideDetailList" :row-class-name="rowDevTowerDataCollideDetailIndex"
+                    @selection-change="handleDevTowerDataCollideDetailSelectionChange" ref="devTowerDataCollideDetail">
+                    <el-table-column type="selection" width="50" align="center" />
+                    <el-table-column label="序号" align="center" prop="index" width="50" />
+                    <el-table-column label="设备序列号" prop="deviceKey" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.deviceKey" placeholder="请输入设备序列号" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="设备来源" prop="deviceSource" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.deviceSource" placeholder="请输入设备来源" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="塔机编号" prop="towerId" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.towerId" placeholder="请输入塔机编号" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="塔机坐标x" prop="coordinateX" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.coordinateX" placeholder="请输入塔机坐标x" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="塔机坐标y" prop="coordinateY" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.coordinateY" placeholder="请输入塔机坐标y" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="前臂长度" prop="frontBrachium" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.frontBrachium" placeholder="请输入前臂长度" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="平衡臂长度" prop="afterBrachium" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.afterBrachium" placeholder="请输入平衡臂长度" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="塔身高度" prop="towerBodyHeight" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.towerBodyHeight" placeholder="请输入塔身高度" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="吊钩实时高度" prop="height" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.height" placeholder="请输入吊钩实时高度" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="塔机实时回转角度" prop="angle" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.angle" placeholder="请输入塔机实时回转角度" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="吊钩实时幅度" prop="range" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.range" placeholder="请输入吊钩实时幅度" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="最短碰撞水平距离" prop="collideHorizontalDistance" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.collideHorizontalDistance" placeholder="请输入最短碰撞水平距离" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="最短碰撞前后距离" prop="collideVerticalDistance" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.collideVerticalDistance" placeholder="请输入最短碰撞前后距离" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="碰撞状态" prop="collideState" width="150">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.collideState" placeholder="请输入碰撞状态" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-form>
+            <div slot-slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
+import {
+    listTowerDataCollide, getTowerDataCollide, delTowerDataCollide,
+    addTowerDataCollide, updateTowerDataCollide
+} from "@/api/device/towerDataCollide";
+import useUserStore from '@/store/modules/user'
+import { findMyProjectList } from "@/api/publics";
 export default {
+    name: "TowerDataCollide",
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 子表选中数据
+            checkedDevTowerDataCollideDetail: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 塔机碰撞信息表格数据
+            towerDataCollideList: [],
+            // 碰撞详情表格数据
+            devTowerDataCollideDetailList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 碰撞状态时间范围
+            daterangeCreateTime: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                projectId: null,
+                projectName: null,
+                deptId: null,
+                deptName: null,
+                deviceKey: null,
+                deviceSource: null,
+                towerId: null,
+                createTime: null,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            },
+            dict: {
+                sys_common_isdel: []
+            },
+            userStore: {},
+            isAdmin: false,
+            projects: [],
+            currentPrjId: null,
+        };
+    },
+    created() {
+        this.dict = this.useDict('sys_common_isdel');
+        this.userStore = useUserStore()
+        this.isAdmin = this.userStore.isAdmin;
+        this.queryParams.projectId = this.userStore.currentPrjId;
+        this.queryParams.comId = this.userStore.currentComId;
+        this.currentPrjId = this.userStore.currentPrjId;
+        this.getList();
+        this.getProjectList();
+    },
+    methods: {
+        /** 查询项目列表 */
+        getProjectList() {
+            findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
+                this.projects = response.rows;
+            });
+        },
 
-}
+        /** 查询塔机碰撞信息列表 */
+        getList() {
+            this.loading = true;
+            this.queryParams.params = {};
+            if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+                this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+                this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+            }
+            listTowerDataCollide(this.queryParams).then(response => {
+                this.towerDataCollideList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                projectId: null,
+                deptId: null,
+                deviceKey: null,
+                deviceSource: null,
+                towerId: null,
+                coordinateX: null,
+                coordinateY: null,
+                frontBrachium: null,
+                afterBrachium: null,
+                towerBodyHeight: null,
+                height: null,
+                angle: null,
+                range: null,
+                earlyWarningDistance: null,
+                alarmWarningDistance: null,
+                contourValue: null,
+                isDel: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                remark: null
+            };
+            this.devTowerDataCollideDetailList = [];
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.daterangeCreateTime = [];
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加塔机碰撞信息";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids
+            getTowerDataCollide(id).then(response => {
+                this.form = response.data;
+                this.devTowerDataCollideDetailList = response.data.devTowerDataCollideDetailList;
+                this.open = true;
+                this.title = "修改塔机碰撞信息";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    this.form.devTowerDataCollideDetailList = this.devTowerDataCollideDetailList;
+                    if (this.form.id != null) {
+                        updateTowerDataCollide(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addTowerDataCollide(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除塔机碰撞信息编号为"' + ids + '"的数据项？').then(function () {
+                return delTowerDataCollide(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 碰撞详情序号 */
+        rowDevTowerDataCollideDetailIndex({ row, rowIndex }) {
+            row.index = rowIndex + 1;
+        },
+        /** 碰撞详情添加按钮操作 */
+        handleAddDevTowerDataCollideDetail() {
+            let obj = {};
+            obj.deviceKey = "";
+            obj.deviceSource = "";
+            obj.towerId = "";
+            obj.coordinateX = "";
+            obj.coordinateY = "";
+            obj.frontBrachium = "";
+            obj.afterBrachium = "";
+            obj.towerBodyHeight = "";
+            obj.height = "";
+            obj.angle = "";
+            obj.range = "";
+            obj.collideHorizontalDistance = "";
+            obj.collideVerticalDistance = "";
+            obj.collideState = "";
+            this.devTowerDataCollideDetailList.push(obj);
+        },
+        /** 碰撞详情删除按钮操作 */
+        handleDeleteDevTowerDataCollideDetail() {
+            if (this.checkedDevTowerDataCollideDetail.length == 0) {
+                this.$modal.msgError("请先选择要删除的碰撞详情数据");
+            } else {
+                const devTowerDataCollideDetailList = this.devTowerDataCollideDetailList;
+                const checkedDevTowerDataCollideDetail = this.checkedDevTowerDataCollideDetail;
+                this.devTowerDataCollideDetailList = devTowerDataCollideDetailList.filter(function (item) {
+                    return checkedDevTowerDataCollideDetail.indexOf(item.index) == -1
+                });
+            }
+        },
+        /** 复选框选中数据 */
+        handleDevTowerDataCollideDetailSelectionChange(selection) {
+            this.checkedDevTowerDataCollideDetail = selection.map(item => item.index)
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download('manage/device/towerDataCollide/export', {
+                ...this.queryParams
+            }, `towerDataCollide_${new Date().getTime()}.xlsx`)
+        }
+    }
+};
 </script>
 
 <style lang="scss">
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
index 02a637de..e34e06bc 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
@@ -1,13 +1,455 @@
 <template>
     <div class="app-container tower-data-limit">
-        222222
+        <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" 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>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="单位名称" prop="deptName">
+                <el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="创建时间">
+                <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                    type="daterange" range-separator="-" start-placeholder="开始日期"
+                    end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="danger" plain icon="el-icon-delete" size="small" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['device:towerDataLimit:remove']">删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="Download" size="small" @click="handleExport"
+                    v-hasPermi="['device:towerDataLimit:export']">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="towerDataLimitList" @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="deviceKey" width="200" />
+            <el-table-column label="风速预警" align="center" prop="windSpeedWarning" width="120" />
+            <el-table-column label="风速报警" align="center" prop="windSpeedAlarm" width="120" />
+            <el-table-column label="超载预警" align="center" prop="loadWarning" width="120" />
+            <el-table-column label="超载报警" align="center" prop="loadAlarm" width="120" />
+            <el-table-column label="力矩预警" align="center" prop="momentWarning" width="120" />
+            <el-table-column label="力矩报警" align="center" prop="momentAlarm" width="120" />
+            <el-table-column label="高限位预警" align="center" prop="highLimitWarning" width="150" />
+            <el-table-column label="高限位报警" align="center" prop="highLimitAlarm" width="150" />
+            <el-table-column label="低限位预警" align="center" prop="lowLimitWarning" width="150" />
+            <el-table-column label="低限位报警" align="center" prop="lowLimitAlarm" width="150" />
+            <el-table-column label="左限位预警" align="center" prop="leftLimitWarning" width="150" />
+            <el-table-column label="左限位报警" align="center" prop="leftLimitAlarm" width="150" />
+            <el-table-column label="右限位预警" align="center" prop="rightLimitWarning" width="150" />
+            <el-table-column label="右限位报警" align="center" prop="rightLimitAlarm" width="150" />
+            <el-table-column label="前限位预警" align="center" prop="frontLimitWarning" width="150" />
+            <el-table-column label="前限位报警" align="center" prop="frontLimitAlarm" width="150" />
+            <el-table-column label="后限位预警" align="center" prop="backLimitWarning" width="150" />
+            <el-table-column label="后限位报警" align="center" prop="backLimitAlarm" width="150" />
+            <el-table-column label="防碰角度预警" align="center" prop="collisionAngleWarning" width="160" />
+            <el-table-column label="防碰角度报警" align="center" prop="collisionAngleAlarm" width="160" />
+            <el-table-column label="防碰距离预警" align="center" prop="collisionDistanceWarning" width="160" />
+            <el-table-column label="防碰距离报警" align="center" prop="collisionDistanceAlarm" width="160" />
+            <el-table-column label="水平距离预警值" align="center" prop="hDistanceWarning" width="180" />
+            <el-table-column label="水平距离报警值" align="center" prop="hDistanceAlarm" width="180" />
+            <el-table-column label="垂直距离预警值" align="center" prop="vDistanceWarning" width="180" />
+            <el-table-column label="垂直距离报警值" align="center" prop="vDistanceAlarm" width="180" />
+            <el-table-column label="倾斜预警值" align="center" prop="leanWarning" width="160" />
+            <el-table-column label="倾斜报警值" align="center" prop="leanAlarm" width="160" />
+            <el-table-column label="幅度限位起点值" align="center" prop="rangeLimitStart" width="180" />
+            <el-table-column label="幅度限位终点值" align="center" prop="rangeLimitEnd" width="180" />
+            <el-table-column label="高度限位起点值" align="center" prop="heightLimitStart" width="180" />
+            <el-table-column label="高度限位终点值" align="center" prop="heightLimitEnd" width="180" />
+            <el-table-column label="回转限位起点值" align="center" prop="rotationLimitStart" width="180" />
+            <el-table-column label="回转限位终点值" align="center" prop="rotationLimitEnd" width="180" />
+            <el-table-column label="是否有效" align="center" prop="isDel" width="100">
+                <template #default="scope">
+                    <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">
+                <template #default="scope">
+                    <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+                <template #default="scope">
+                    <el-button size="small" type="primary" text icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['device:towerDataLimit:remove']">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改塔机限位信息对话框 -->
+        <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="项目主键" prop="projectId">
+                    <el-input v-model="form.projectId" placeholder="请输入项目主键" />
+                </el-form-item>
+                <el-form-item label="总包单位主键" prop="deptId">
+                    <el-input v-model="form.deptId" placeholder="请输入总包单位主键" />
+                </el-form-item>
+                <el-form-item label="设备序列号" prop="deviceKey">
+                    <el-input v-model="form.deviceKey" placeholder="请输入设备序列号" />
+                </el-form-item>
+                <el-form-item label="设备来源" prop="deviceSource">
+                    <el-input v-model="form.deviceSource" placeholder="请输入设备来源" />
+                </el-form-item>
+                <el-form-item label="塔机编号" prop="towerId">
+                    <el-input v-model="form.towerId" placeholder="请输入塔机编号" />
+                </el-form-item>
+                <el-form-item label="风速预警" prop="windSpeedWarning">
+                    <el-input v-model="form.windSpeedWarning" placeholder="请输入风速预警" />
+                </el-form-item>
+                <el-form-item label="风速报警" prop="windSpeedAlarm">
+                    <el-input v-model="form.windSpeedAlarm" placeholder="请输入风速报警" />
+                </el-form-item>
+                <el-form-item label="超载预警" prop="loadWarning">
+                    <el-input v-model="form.loadWarning" placeholder="请输入超载预警" />
+                </el-form-item>
+                <el-form-item label="超载报警" prop="loadAlarm">
+                    <el-input v-model="form.loadAlarm" placeholder="请输入超载报警" />
+                </el-form-item>
+                <el-form-item label="力矩预警" prop="momentWarning">
+                    <el-input v-model="form.momentWarning" placeholder="请输入力矩预警" />
+                </el-form-item>
+                <el-form-item label="力矩报警" prop="momentAlarm">
+                    <el-input v-model="form.momentAlarm" placeholder="请输入力矩报警" />
+                </el-form-item>
+                <el-form-item label="高限位预警" prop="highLimitWarning">
+                    <el-input v-model="form.highLimitWarning" placeholder="请输入高限位预警" />
+                </el-form-item>
+                <el-form-item label="高限位报警" prop="highLimitAlarm">
+                    <el-input v-model="form.highLimitAlarm" placeholder="请输入高限位报警" />
+                </el-form-item>
+                <el-form-item label="低限位预警" prop="lowLimitWarning">
+                    <el-input v-model="form.lowLimitWarning" placeholder="请输入低限位预警" />
+                </el-form-item>
+                <el-form-item label="低限位报警" prop="lowLimitAlarm">
+                    <el-input v-model="form.lowLimitAlarm" placeholder="请输入低限位报警" />
+                </el-form-item>
+                <el-form-item label="左限位预警" prop="leftLimitWarning">
+                    <el-input v-model="form.leftLimitWarning" placeholder="请输入左限位预警" />
+                </el-form-item>
+                <el-form-item label="左限位报警" prop="leftLimitAlarm">
+                    <el-input v-model="form.leftLimitAlarm" placeholder="请输入左限位报警" />
+                </el-form-item>
+                <el-form-item label="右限位预警" prop="rightLimitWarning">
+                    <el-input v-model="form.rightLimitWarning" placeholder="请输入右限位预警" />
+                </el-form-item>
+                <el-form-item label="右限位报警" prop="rightLimitAlarm">
+                    <el-input v-model="form.rightLimitAlarm" placeholder="请输入右限位报警" />
+                </el-form-item>
+                <el-form-item label="前限位预警" prop="frontLimitWarning">
+                    <el-input v-model="form.frontLimitWarning" placeholder="请输入前限位预警" />
+                </el-form-item>
+                <el-form-item label="前限位报警" prop="frontLimitAlarm">
+                    <el-input v-model="form.frontLimitAlarm" placeholder="请输入前限位报警" />
+                </el-form-item>
+                <el-form-item label="后限位预警" prop="backLimitWarning">
+                    <el-input v-model="form.backLimitWarning" placeholder="请输入后限位预警" />
+                </el-form-item>
+                <el-form-item label="后限位报警" prop="backLimitAlarm">
+                    <el-input v-model="form.backLimitAlarm" placeholder="请输入后限位报警" />
+                </el-form-item>
+                <el-form-item label="防碰角度预警" prop="collisionAngleWarning">
+                    <el-input v-model="form.collisionAngleWarning" placeholder="请输入防碰角度预警" />
+                </el-form-item>
+                <el-form-item label="防碰角度报警" prop="collisionAngleAlarm">
+                    <el-input v-model="form.collisionAngleAlarm" placeholder="请输入防碰角度报警" />
+                </el-form-item>
+                <el-form-item label="防碰距离预警" prop="collisionDistanceWarning">
+                    <el-input v-model="form.collisionDistanceWarning" placeholder="请输入防碰距离预警" />
+                </el-form-item>
+                <el-form-item label="防碰距离报警" prop="collisionDistanceAlarm">
+                    <el-input v-model="form.collisionDistanceAlarm" placeholder="请输入防碰距离报警" />
+                </el-form-item>
+                <el-form-item label="水平距离预警值" prop="hDistanceWarning">
+                    <el-input v-model="form.hDistanceWarning" placeholder="请输入水平距离预警值" />
+                </el-form-item>
+                <el-form-item label="水平距离报警值" prop="hDistanceAlarm">
+                    <el-input v-model="form.hDistanceAlarm" placeholder="请输入水平距离报警值" />
+                </el-form-item>
+                <el-form-item label="垂直距离预警值" prop="vDistanceWarning">
+                    <el-input v-model="form.vDistanceWarning" placeholder="请输入垂直距离预警值" />
+                </el-form-item>
+                <el-form-item label="垂直距离报警值" prop="vDistanceAlarm">
+                    <el-input v-model="form.vDistanceAlarm" placeholder="请输入垂直距离报警值" />
+                </el-form-item>
+                <el-form-item label="倾斜预警值" prop="leanWarning">
+                    <el-input v-model="form.leanWarning" placeholder="请输入倾斜预警值" />
+                </el-form-item>
+                <el-form-item label="倾斜报警值" prop="leanAlarm">
+                    <el-input v-model="form.leanAlarm" placeholder="请输入倾斜报警值" />
+                </el-form-item>
+                <el-form-item label="幅度限位起点值" prop="rangeLimitStart">
+                    <el-input v-model="form.rangeLimitStart" placeholder="请输入幅度限位起点值" />
+                </el-form-item>
+                <el-form-item label="幅度限位终点值" prop="rangeLimitEnd">
+                    <el-input v-model="form.rangeLimitEnd" placeholder="请输入幅度限位终点值" />
+                </el-form-item>
+                <el-form-item label="高度限位起点值" prop="heightLimitStart">
+                    <el-input v-model="form.heightLimitStart" placeholder="请输入高度限位起点值" />
+                </el-form-item>
+                <el-form-item label="高度限位终点值" prop="heightLimitEnd">
+                    <el-input v-model="form.heightLimitEnd" placeholder="请输入高度限位终点值" />
+                </el-form-item>
+                <el-form-item label="回转限位起点值" prop="rotationLimitStart">
+                    <el-input v-model="form.rotationLimitStart" placeholder="请输入回转限位起点值" />
+                </el-form-item>
+                <el-form-item label="回转限位终点值" prop="rotationLimitEnd">
+                    <el-input v-model="form.rotationLimitEnd" placeholder="请输入回转限位终点值" />
+                </el-form-item>
+                <el-form-item label="是否有效" prop="isDel">
+                    <el-select v-model="form.isDel" placeholder="请选择是否有效">
+                        <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>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" placeholder="请输入备注" />
+                </el-form-item>
+            </el-form>
+            <div slot-slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
+import {
+    listTowerDataLimit, getTowerDataLimit, delTowerDataLimit,
+    addTowerDataLimit, updateTowerDataLimit
+} from "@/api/device/towerDataLimit";
+import useUserStore from '@/store/modules/user'
+import { findMyProjectList } from "@/api/publics";
 export default {
-
-}
+    name: "TowerDataLimit",
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 塔机限位信息表格数据
+            towerDataLimitList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 备注时间范围
+            daterangeCreateTime: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                projectId: null,
+                projectName: null,
+                deptId: null,
+                deptName: null,
+                deviceKey: null,
+                deviceSource: null,
+                towerId: null,
+                createTime: null,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            },
+            dict: {
+                sys_common_isdel: []
+            },
+            userStore: {},
+            isAdmin: false,
+            projects: [],
+            currentPrjId: null,
+        };
+    },
+    created() {
+        this.dict = this.useDict('sys_common_isdel');
+        this.userStore = useUserStore()
+        this.isAdmin = this.userStore.isAdmin;
+        this.queryParams.projectId = this.userStore.currentPrjId;
+        this.queryParams.comId = this.userStore.currentComId;
+        this.currentPrjId = this.userStore.currentPrjId;
+        this.getList();
+        this.getProjectList();
+    },
+    methods: {
+        /** 查询项目列表 */
+        getProjectList() {
+            findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
+                this.projects = response.rows;
+            });
+        },
+        /** 查询塔机限位信息列表 */
+        getList() {
+            this.loading = true;
+            this.queryParams.params = {};
+            if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+                this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+                this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+            }
+            listTowerDataLimit(this.queryParams).then(response => {
+                this.towerDataLimitList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                projectId: null,
+                deptId: null,
+                deviceKey: null,
+                deviceSource: null,
+                towerId: null,
+                windSpeedWarning: null,
+                windSpeedAlarm: null,
+                loadWarning: null,
+                loadAlarm: null,
+                momentWarning: null,
+                momentAlarm: null,
+                highLimitWarning: null,
+                highLimitAlarm: null,
+                lowLimitWarning: null,
+                lowLimitAlarm: null,
+                leftLimitWarning: null,
+                leftLimitAlarm: null,
+                rightLimitWarning: null,
+                rightLimitAlarm: null,
+                frontLimitWarning: null,
+                frontLimitAlarm: null,
+                backLimitWarning: null,
+                backLimitAlarm: null,
+                collisionAngleWarning: null,
+                collisionAngleAlarm: null,
+                collisionDistanceWarning: null,
+                collisionDistanceAlarm: null,
+                hDistanceWarning: null,
+                hDistanceAlarm: null,
+                vDistanceWarning: null,
+                vDistanceAlarm: null,
+                leanWarning: null,
+                leanAlarm: null,
+                rangeLimitStart: null,
+                rangeLimitEnd: null,
+                heightLimitStart: null,
+                heightLimitEnd: null,
+                rotationLimitStart: null,
+                rotationLimitEnd: null,
+                isDel: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                remark: null
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.daterangeCreateTime = [];
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加塔机限位信息";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids
+            getTowerDataLimit(id).then(response => {
+                this.form = response.data;
+                this.open = true;
+                this.title = "修改塔机限位信息";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateTowerDataLimit(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addTowerDataLimit(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除塔机限位信息编号为"' + ids + '"的数据项？').then(function () {
+                return delTowerDataLimit(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download('manage/device/towerDataLimit/export', {
+                ...this.queryParams
+            }, `towerDataLimit_${new Date().getTime()}.xlsx`)
+        }
+    }
+};
 </script>
 
 <style lang="scss">
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
index 5a728fc3..eb30124b 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
@@ -1,13 +1,426 @@
 <template>
     <div class="app-container tower-data-round">
-        222222
+        <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" 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"
+                    type="daterange" range-separator="-" start-placeholder="开始日期"
+                    end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="danger" plain icon="el-icon-delete" size="small" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['device:towerDataRound:remove']">删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="Download" size="small" @click="handleExport"
+                    v-hasPermi="['device:towerDataRound:export']">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <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"
+                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.device_tower_warning"
+                            :value="scope.row.warnings ? scope.row.warnings.split(',') : '0'" />
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column label="工作循环最小高度" align="center" prop="minHeight" width="200" />
+            <el-table-column label="工作循环最大高度" align="center" prop="maxHeight" width="200" />
+            <el-table-column label="工作循环最小幅度" align="center" prop="minRange" width="200" />
+            <el-table-column label="工作循环最大幅度" align="center" prop="maxRange" width="200" />
+            <el-table-column label="工作循环开始高度" align="center" prop="startHeight" width="200" />
+            <el-table-column label="工作循环结束高度" align="center" prop="endHeight" width="200" />
+            <el-table-column label="工作循环开始幅度" align="center" prop="startRange" width="200" />
+            <el-table-column label="工作循环结束幅度" align="center" prop="endRange" width="200" />
+            <el-table-column label="工作循环开始回转角度" align="center" prop="startRotation" width="220" />
+            <el-table-column label="工作循环结束回转角度" align="center" prop="endRotation" width="220" />
+            <el-table-column label="工作循环最大吊重" align="center" prop="maxLoad" width="200" />
+            <el-table-column label="工作循环最大重量" align="center" prop="maxLoadPercent" width="200" />
+            <el-table-column label="工作循环最大力矩" align="center" prop="maxMoment" width="200" />
+            <el-table-column label="工作循环最大力矩百分比" align="center" prop="maxMomentPercent" width="240" />
+            <el-table-column label="工作循环开始风速" align="center" prop="startWindSpeed" width="200" />
+            <el-table-column label="工作循环结束风速" align="center" prop="endWindSpeed" width="200" />
+            <el-table-column label="工作循环开始风速等级" align="center" prop="startWindSpeedPercent" width="220" />
+            <el-table-column label="工作循环结束风速等级" align="center" prop="endWindSpeedPercent" width="220" />
+            <el-table-column label="工作循环开始水平倾角" align="center" prop="startLeanAngleX" width="220" />
+            <el-table-column label="工作循环结束水平倾角" align="center" prop="endLeanAngleX" width="220" />
+            <el-table-column label="工作循环开始垂直倾角" align="center" prop="startLeanAngleY" width="220" />
+            <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.sys_common_isdel" :value="scope.row.isDel" />
+                </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                <template #default="scope">
+                    <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+                <template #default="scope">
+                    <el-button size="small" type="primary" text icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['device:towerDataRound:remove']">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改塔机工作循环对话框 -->
+        <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="项目主键" prop="projectId">
+                    <el-input v-model="form.projectId" placeholder="请输入项目主键" />
+                </el-form-item>
+                <el-form-item label="总包单位主键" prop="deptId">
+                    <el-input v-model="form.deptId" placeholder="请输入总包单位主键" />
+                </el-form-item>
+                <el-form-item label="设备序列号" prop="deviceKey">
+                    <el-input v-model="form.deviceKey" placeholder="请输入设备序列号" />
+                </el-form-item>
+                <el-form-item label="设备来源" prop="deviceSource">
+                    <el-input v-model="form.deviceSource" placeholder="请输入设备来源" />
+                </el-form-item>
+                <el-form-item label="数据编号" prop="dataId">
+                    <el-input v-model="form.dataId" placeholder="请输入数据编号" />
+                </el-form-item>
+                <el-form-item label="工作循环开始" prop="workStartTime">
+                    <el-input v-model="form.workStartTime" placeholder="请输入工作循环开始" />
+                </el-form-item>
+                <el-form-item label="工作循环结束" prop="workEndTime">
+                    <el-input v-model="form.workEndTime" placeholder="请输入工作循环结束" />
+                </el-form-item>
+                <el-form-item label="工作循环最小高度" prop="minHeight">
+                    <el-input v-model="form.minHeight" placeholder="请输入工作循环最小高度" />
+                </el-form-item>
+                <el-form-item label="工作循环最大高度" prop="maxHeight">
+                    <el-input v-model="form.maxHeight" placeholder="请输入工作循环最大高度" />
+                </el-form-item>
+                <el-form-item label="工作循环最小幅度" prop="minRange">
+                    <el-input v-model="form.minRange" placeholder="请输入工作循环最小幅度" />
+                </el-form-item>
+                <el-form-item label="工作循环最大幅度" prop="maxRange">
+                    <el-input v-model="form.maxRange" placeholder="请输入工作循环最大幅度" />
+                </el-form-item>
+                <el-form-item label="工作循环开始高度" prop="startHeight">
+                    <el-input v-model="form.startHeight" placeholder="请输入工作循环开始高度" />
+                </el-form-item>
+                <el-form-item label="工作循环结束高度" prop="endHeight">
+                    <el-input v-model="form.endHeight" placeholder="请输入工作循环结束高度" />
+                </el-form-item>
+                <el-form-item label="工作循环开始幅度" prop="startRange">
+                    <el-input v-model="form.startRange" placeholder="请输入工作循环开始幅度" />
+                </el-form-item>
+                <el-form-item label="工作循环结束幅度单位米" prop="endRange">
+                    <el-input v-model="form.endRange" placeholder="请输入工作循环结束幅度单位米" />
+                </el-form-item>
+                <el-form-item label="工作循环开始回转角度单位度" prop="startRotation">
+                    <el-input v-model="form.startRotation" placeholder="请输入工作循环开始回转角度单位度" />
+                </el-form-item>
+                <el-form-item label="工作循环结束回转角度单位度" prop="endRotation">
+                    <el-input v-model="form.endRotation" placeholder="请输入工作循环结束回转角度单位度" />
+                </el-form-item>
+                <el-form-item label="工作循环最大吊重单位吨" prop="maxLoad">
+                    <el-input v-model="form.maxLoad" placeholder="请输入工作循环最大吊重单位吨" />
+                </el-form-item>
+                <el-form-item label="工作循环最大重量百分比" prop="maxLoadPercent">
+                    <el-input v-model="form.maxLoadPercent" placeholder="请输入工作循环最大重量百分比" />
+                </el-form-item>
+                <el-form-item label="工作循环最大力矩" prop="maxMoment">
+                    <el-input v-model="form.maxMoment" placeholder="请输入工作循环最大力矩" />
+                </el-form-item>
+                <el-form-item label="工作循环最大力矩百分比" prop="maxMomentPercent">
+                    <el-input v-model="form.maxMomentPercent" placeholder="请输入工作循环最大力矩百分比" />
+                </el-form-item>
+                <el-form-item label="工作循环开始风速" prop="startWindSpeed">
+                    <el-input v-model="form.startWindSpeed" placeholder="请输入工作循环开始风速" />
+                </el-form-item>
+                <el-form-item label="工作循环结束风速" prop="endWindSpeed">
+                    <el-input v-model="form.endWindSpeed" placeholder="请输入工作循环结束风速" />
+                </el-form-item>
+                <el-form-item label="工作循环开始风速等级" prop="startWindSpeedPercent">
+                    <el-input v-model="form.startWindSpeedPercent" placeholder="请输入工作循环开始风速等级" />
+                </el-form-item>
+                <el-form-item label="工作循环结束风速等级" prop="endWindSpeedPercent">
+                    <el-input v-model="form.endWindSpeedPercent" placeholder="请输入工作循环结束风速等级" />
+                </el-form-item>
+                <el-form-item label="工作循环开始水平倾角" prop="startLeanAngleX">
+                    <el-input v-model="form.startLeanAngleX" placeholder="请输入工作循环开始水平倾角" />
+                </el-form-item>
+                <el-form-item label="工作循环结束水平倾角" prop="endLeanAngleX">
+                    <el-input v-model="form.endLeanAngleX" placeholder="请输入工作循环结束水平倾角" />
+                </el-form-item>
+                <el-form-item label="工作循环开始垂直倾角" prop="startLeanAngleY">
+                    <el-input v-model="form.startLeanAngleY" placeholder="请输入工作循环开始垂直倾角" />
+                </el-form-item>
+                <el-form-item label="工作循环结束垂直倾角" prop="endLeanAngleY">
+                    <el-input v-model="form.endLeanAngleY" placeholder="请输入工作循环结束垂直倾角" />
+                </el-form-item>
+                <el-form-item label="警报信息" prop="warnings">
+                    <el-input v-model="form.warnings" placeholder="请输入警报信息" />
+                </el-form-item>
+                <el-form-item label="是否有效" prop="isDel">
+                    <el-select v-model="form.isDel" placeholder="请选择是否有效">
+                        <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>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" placeholder="请输入备注" />
+                </el-form-item>
+            </el-form>
+            <div slot-slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
+import {
+    listTowerDataRound,
+    getTowerDataRound,
+    delTowerDataRound,
+    addTowerDataRound,
+    updateTowerDataRound,
+} from "@/api/device/towerDataRound";
+import useUserStore from '@/store/modules/user'
+import { findMyProjectList } from "@/api/publics";
 export default {
-
-}
+    name: "TowerDataRound",
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 塔机工作循环表格数据
+            towerDataRoundList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 备注时间范围
+            daterangeCreateTime: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                projectId: null,
+                projectName: null,
+                deptId: null,
+                deptName: null,
+                deviceKey: null,
+                deviceSource: null,
+                dataId: null,
+                createTime: null,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {},
+            dict: {
+                sys_common_isdel: [],
+                device_tower_warning: []
+            },
+            userStore: {},
+            isAdmin: false,
+            projects: [],
+            currentPrjId: null,
+        };
+    },
+    created() {
+        this.dict = this.useDict('sys_common_isdel', 'device_tower_warning');
+        this.userStore = useUserStore()
+        this.isAdmin = this.userStore.isAdmin;
+        this.queryParams.projectId = this.userStore.currentPrjId;
+        this.queryParams.comId = this.userStore.currentComId;
+        this.currentPrjId = this.userStore.currentPrjId;
+        this.getList();
+        this.getProjectList();
+    },
+    methods: {
+        /** 查询项目列表 */
+        getProjectList() {
+            findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
+                this.projects = response.rows;
+            });
+        },
+        /** 查询塔机工作循环列表 */
+        getList() {
+            this.loading = true;
+            this.queryParams.params = {};
+            if (null != this.daterangeCreateTime && "" != this.daterangeCreateTime) {
+                this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+                this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+            }
+            listTowerDataRound(this.queryParams).then((response) => {
+                this.towerDataRoundList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                projectId: null,
+                deptId: null,
+                deviceKey: null,
+                deviceSource: null,
+                dataId: null,
+                workStartTime: null,
+                workEndTime: null,
+                minHeight: null,
+                maxHeight: null,
+                minRange: null,
+                maxRange: null,
+                startHeight: null,
+                endHeight: null,
+                startRange: null,
+                endRange: null,
+                startRotation: null,
+                endRotation: null,
+                maxLoad: null,
+                maxLoadPercent: null,
+                maxMoment: null,
+                maxMomentPercent: null,
+                startWindSpeed: null,
+                endWindSpeed: null,
+                startWindSpeedPercent: null,
+                endWindSpeedPercent: null,
+                startLeanAngleX: null,
+                endLeanAngleX: null,
+                startLeanAngleY: null,
+                endLeanAngleY: null,
+                warnings: null,
+                isDel: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                remark: null,
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.daterangeCreateTime = [];
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.id);
+            this.single = selection.length !== 1;
+            this.multiple = !selection.length;
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加塔机工作循环";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids;
+            getTowerDataRound(id).then((response) => {
+                this.form = response.data;
+                this.open = true;
+                this.title = "修改塔机工作循环";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate((valid) => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateTowerDataRound(this.form).then((response) => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addTowerDataRound(this.form).then((response) => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal
+                .confirm('是否确认删除塔机工作循环编号为"' + ids + '"的数据项？')
+                .then(function () {
+                    return delTowerDataRound(ids);
+                })
+                .then(() => {
+                    this.getList();
+                    this.$modal.msgSuccess("删除成功");
+                })
+                .catch(() => { });
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                "manage/device/towerDataRound/export",
+                {
+                    ...this.queryParams,
+                },
+                `towerDataRound_${new Date().getTime()}.xlsx`
+            );
+        },
+    },
+};
 </script>
 
 <style lang="scss">
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
index c62ace6a..ace64cec 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
@@ -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" />
@@ -108,7 +109,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
                 <template #default="scope">
-                    <el-button size="small" text icon="el-icon-delete" @click="handleDelete(scope.row)"
+                    <el-button size="small" type="primary" text icon="el-icon-delete" @click="handleDelete(scope.row)"
                         v-hasPermi="['device:towerDataRun:remove']">删除</el-button>
                 </template>
             </el-table-column>
diff --git a/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
index 36b48eff..de322561 100644
--- a/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
@@ -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" />
@@ -89,7 +90,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
                 <template #default="scope">
-                    <el-button size="small" text icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                    <el-button size="small" type="primary" text icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['device:towerProjectConfig:edit']">修改</el-button>
 
                 </template>
@@ -273,7 +274,6 @@ export default {
                     { max: 64, message: "最多输入64个字符" },
                 ],
             },
-            projectOptions: [],
             dict: {
                 sys_common_isdel: [],
                 device_tower_type: [],
@@ -286,13 +286,13 @@ export default {
         };
     },
     created() {
-        this.getList();
         this.dict = this.useDict('sys_common_isdel', 'device_tower_type', 'project_video_signal_state');
         this.userStore = useUserStore()
         this.isAdmin = this.userStore.isAdmin;
         this.queryParams.projectId = this.userStore.currentPrjId;
         this.queryParams.comId = this.userStore.currentComId;
         this.currentPrjId = this.userStore.currentPrjId;
+        this.getList();
         this.getProjectList();
     },
     methods: {