From 0a7014497175088133e9f4d45f31ec5adead662f Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Mon, 28 Aug 2023 13:54:53 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E6=96=B0=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=EF=BC=8C=E5=B9=B6=E5=BC=80=E5=A7=8B=E7=BC=96=E5=86=99?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BC=81=E4=B8=9A=E3=80=81=E6=94=BF?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=87=E9=99=8D=E6=9C=BA=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipManagement/index.scss                |  40 +
 .../liftSupervision/equipManagement/index.vue | 786 +++++++++++++++++
 .../historyData/alarmData/index.scss          |  16 +
 .../historyData/alarmData/index.vue           | 233 +++++
 .../historyData/realTimeData/index.scss       |  16 +
 .../historyData/realTimeData/index.vue        | 491 +++++++++++
 .../historyData/workCycleData/index.scss      |  16 +
 .../historyData/workCycleData/index.vue       | 315 +++++++
 .../notice/myReceive/index.scss               |  42 +
 .../notice/myReceive/index.vue                | 199 +++++
 .../liftSupervision/operatingData/index.scss  | 325 +++++++
 .../liftSupervision/operatingData/index.vue   | 388 ++++++++
 .../liftSupervision/operatingData/index.scss  | 325 +++++++
 .../liftSupervision/operatingData/index.vue   | 487 +++++++++++
 .../equipManagement/index.scss                |  35 +
 .../liftSupervision/equipManagement/index.vue | 827 ++++++++++++++++++
 .../historyData/alarmData/index.scss          |  11 +
 .../historyData/alarmData/index.vue           | 264 ++++++
 .../historyData/realTimeData/index.scss       |  11 +
 .../historyData/realTimeData/index.vue        | 522 +++++++++++
 .../historyData/workCycleData/index.scss      |  11 +
 .../historyData/workCycleData/index.vue       | 346 ++++++++
 .../liftSupervision/operatingData/index.scss  | 277 ++++++
 .../liftSupervision/operatingData/index.vue   | 429 +++++++++
 24 files changed, 6412 insertions(+)
 create mode 100644 src/views/enterprise/liftSupervision/equipManagement/index.scss
 create mode 100644 src/views/enterprise/liftSupervision/equipManagement/index.vue
 create mode 100644 src/views/enterprise/liftSupervision/historyData/alarmData/index.scss
 create mode 100644 src/views/enterprise/liftSupervision/historyData/alarmData/index.vue
 create mode 100644 src/views/enterprise/liftSupervision/historyData/realTimeData/index.scss
 create mode 100644 src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
 create mode 100644 src/views/enterprise/liftSupervision/historyData/workCycleData/index.scss
 create mode 100644 src/views/enterprise/liftSupervision/historyData/workCycleData/index.vue
 create mode 100644 src/views/enterprise/liftSupervision/notice/myReceive/index.scss
 create mode 100644 src/views/enterprise/liftSupervision/notice/myReceive/index.vue
 create mode 100644 src/views/enterprise/liftSupervision/operatingData/index.scss
 create mode 100644 src/views/enterprise/liftSupervision/operatingData/index.vue
 create mode 100644 src/views/goverment/liftSupervision/operatingData/index.scss
 create mode 100644 src/views/goverment/liftSupervision/operatingData/index.vue
 create mode 100644 src/views/project/liftSupervision/equipManagement/index.scss
 create mode 100644 src/views/project/liftSupervision/equipManagement/index.vue
 create mode 100644 src/views/project/liftSupervision/historyData/alarmData/index.scss
 create mode 100644 src/views/project/liftSupervision/historyData/alarmData/index.vue
 create mode 100644 src/views/project/liftSupervision/historyData/realTimeData/index.scss
 create mode 100644 src/views/project/liftSupervision/historyData/realTimeData/index.vue
 create mode 100644 src/views/project/liftSupervision/historyData/workCycleData/index.scss
 create mode 100644 src/views/project/liftSupervision/historyData/workCycleData/index.vue
 create mode 100644 src/views/project/liftSupervision/operatingData/index.scss
 create mode 100644 src/views/project/liftSupervision/operatingData/index.vue

diff --git a/src/views/enterprise/liftSupervision/equipManagement/index.scss b/src/views/enterprise/liftSupervision/equipManagement/index.scss
new file mode 100644
index 0000000..ebdacf0
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/equipManagement/index.scss
@@ -0,0 +1,40 @@
+.date-select {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.basic-form {
+	.face-img {
+		width: 100%;
+		align-self: flex-start;
+		:deep(.face-uploader .el-upload) {
+			border: 1px dashed #d9d9d9 !important;
+			border-radius: 6px !important;
+			cursor: pointer !important;
+			position: relative !important;
+			overflow: hidden !important;
+		}
+		.face-uploader .el-upload:hover {
+			border-color: #409eff !important;
+		}
+		:deep(.el-icon) {
+			font-size: 28px;
+			color: #8c939d;
+			width: 53px;
+			height: 53px;
+			line-height: 53px;
+			text-align: center;
+		}
+		.face-avatar {
+			width: 53px;
+			height: 53px;
+			display: block;
+		}
+	}
+}
+:deep() {
+	.tabs-option {
+		display: none;
+	}
+}
diff --git a/src/views/enterprise/liftSupervision/equipManagement/index.vue b/src/views/enterprise/liftSupervision/equipManagement/index.vue
new file mode 100644
index 0000000..bdff8f3
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/equipManagement/index.vue
@@ -0,0 +1,786 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="设备管理"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #formButton="scope">
+				<el-button class="addButtonStyle" @click="handleAddItem">新增</el-button>
+			</template>
+			<template #operation="{ row }">
+				<el-button type="primary" link @click="handleLookItem(row)">
+					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
+					<span>查看</span>
+				</el-button>
+				<el-button type="primary" link @click="handleEditItem(row)">
+					<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
+					<span>编辑</span>
+				</el-button>
+				<el-button type="danger" link :icon="Delete" @click="handleDeleteItem(row)">删除</el-button>
+			</template>
+			<template #state="{ row }">
+				<span :class="row.state === 1 ? '' : 'redText'">{{ row.state == 1 ? "启用" : "禁用" }}</span>
+			</template>
+		</ProTable>
+		<el-dialog :title="title" show-close v-model="newUnitDialog" style="min-width: 1200px">
+			<el-form ref="formRef" :model="formData" label-width="180px" :rules="rules" class="basic-form" size="default">
+				<!-- <el-form ref="formDataRef" :model="formData" label-width="150px" class="basic-form"> -->
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备名称:" prop="devName">
+							<el-input v-model="formData.devName" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="安装日期:" prop="installTime">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.installTime"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="黑匣子信息:" prop="blackBox">
+							<el-input v-model="formData.blackBox" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="结构类型:" prop="structureType">
+							<el-select
+								v-model="formData.structureType"
+								:disabled="title == '查看设备'"
+								placeholder="请选择"
+								style="width: 100%"
+							>
+								<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备使用状态:" prop="useState">
+							<el-select v-model="formData.useState" :disabled="title == '查看设备'" placeholder="请选择" style="width: 100%">
+								<el-option v-for="item in stateList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="设备图片:" prop="installImage">
+							<div class="face-img">
+								<el-upload
+									class="face-uploader"
+									:action="`${baseUrl}` + '/xmgl/file/upload'"
+									:show-file-list="false"
+									:on-success="(response, uploadFile) => handleAvatarSuccess(response, uploadFile)"
+									accept="image/jpg, image/jpeg, image/png"
+								>
+									<img v-if="formData.installImage" :src="formData.installImage" class="face-avatar" />
+									<el-icon v-else><plus /></el-icon>
+								</el-upload>
+							</div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="是否外地设备:" prop="isForeignDev">
+							<el-radio-group placeholder="请选择" v-model="formData.isForeignDev">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否全新设备:" prop="isNewDev">
+							<el-radio-group placeholder="请选择" v-model="formData.isNewDev">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="规格型号:" prop="model">
+							<el-input v-model="formData.model" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="许可证发证机关:" prop="licensingAuthority">
+							<el-input v-model="formData.licensingAuthority" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="出厂(合格证):" prop="factoryCertificate">
+							<el-input v-model="formData.factoryCertificate" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="工作幅度(m):" prop="workingRange">
+							<el-input v-model.number="formData.workingRange" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="最大额定起重量(kg):" prop="maxLiftingCapacity">
+							<el-input v-model.number="formData.maxLiftingCapacity" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="独立起升高度(m):" prop="independentLiftingHeight">
+							<el-input v-model.number="formData.independentLiftingHeight" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="购置日期:" prop="acquisitionDate">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.acquisitionDate"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="编号有效期:" prop="numberValidityPeriod">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.numberValidityPeriod"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备原值:" prop="originalValue">
+							<el-input v-model.number="formData.originalValue" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="设备改造次数:" prop="renovations">
+							<el-input v-model.number="formData.renovations" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="发票编码:" prop="invoiceCode">
+							<el-input v-model="formData.invoiceCode" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="购买合同编码:" prop="contractCode">
+							<el-input v-model="formData.contractCode" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="生产厂家:" prop="manufacturer">
+							<el-input v-model="formData.manufacturer" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="出厂日期:" prop="productionDate">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.productionDate"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="制造许可证编号:" prop="manufacturerLicense">
+							<el-input v-model="formData.manufacturerLicense" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否为原购产品:" prop="isOriginalProduct">
+							<el-radio-group placeholder="请选择" v-model="formData.isOriginalProduct">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备用途:" prop="useTo">
+							<el-input v-model="formData.useTo" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="前臂长:" prop="forearmLength">
+							<el-input v-model.number="formData.forearmLength" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="后臂长:" prop="posteriorArmLength">
+							<el-input v-model.number="formData.posteriorArmLength" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="塔身高度:" prop="towerHeight">
+							<el-input v-model.number="formData.towerHeight" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="前臂永久性标识:" prop="forearmFlag">
+							<el-input v-model="formData.forearmFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="后臂永久性标识:" prop="rearArmFlag">
+							<el-input v-model="formData.rearArmFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="塔帽永久性标识:" prop="towerCapFlag">
+							<el-input v-model="formData.towerCapFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="上转台永久性标识:" prop="upwardTurntableFlag">
+							<el-input v-model="formData.upwardTurntableFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="下转台永久性标识:" prop="lowerTurntableFlag">
+							<el-input v-model="formData.lowerTurntableFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="标准节点永久性标识:" prop="mastSectionFlag">
+							<el-input v-model="formData.mastSectionFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<footer class="footer flx-center" v-if="title != '查看设备'">
+					<el-button class="cancelButtonStyle" @click="newUnitDialog = false">取消</el-button>
+					<el-button type="primary" @click="submitForm(formData)">保存</el-button>
+				</footer>
+			</el-form>
+		</el-dialog>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" ref="engDrawer" :engList="engList">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{ data.engineeringName }}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, nextTick, onMounted } from "vue";
+import { ElMessage, FormInstance } from "element-plus";
+import type { UploadProps } from "element-plus";
+import { useRouter } from "vue-router";
+import { ColumnProps } from "@/components/ProTable/interface";
+import { useHandleData } from "@/hooks/useHandleData";
+import ProTable from "@/components/ProTable/index.vue";
+import { jxj_User } from "@/api/types";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { towerCraneEquipAdd, towerCraneEquipEdit, towerCraneEquipDel, towerCraneEquipPage } from "@/api/modules/enterpriseApi";
+import { GlobalStore } from "@/stores";
+import { Delete } from "@element-plus/icons-vue";
+const baseUrl = import.meta.env.VITE_API_URL;
+const typeList = ref([
+	{ label: "尖头塔", value: 1 },
+	{ label: "平头塔", value: 2 },
+	{ label: "动臂塔", value: 3 }
+]);
+const stateList = ref([
+	{ label: "设备进场", value: 1 },
+	{ label: "设备安装", value: 2 },
+	{ label: "设备验收", value: 3 },
+	{ label: "设备使用", value: 4 },
+	{ label: "设备拆除", value: 5 },
+	{ label: "设备退场", value: 6 }
+]);
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+const changeType = ref(1);
+const datas = reactive([]);
+const formRef = ref<FormInstance>();
+const router = useRouter();
+const store = GlobalStore();
+const drawerVisible = ref(false);
+const title = ref("");
+const newUnitDialog = ref(false);
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	engineeringSn: ""
+});
+const formData = ref({
+	devName: "",
+	installTime: "",
+	blackBox: "",
+	structureType: "",
+	useState: "",
+	installImage: "",
+	isForeignDev: 0,
+	isNewDev: 0,
+	model: "",
+	licensingAuthority: "",
+	factoryCertificate: "",
+	workingRange: "",
+	maxLiftingCapacity: "",
+	independentLiftingHeight: "",
+	acquisitionDate: "",
+	numberValidityPeriod: "",
+	originalValue: "",
+	renovations: "",
+	invoiceCode: "",
+	contractCode: "",
+	manufacturer: "",
+	productionDate: "",
+	manufacturerLicense: "",
+	isOriginalProduct: 0,
+	useTo: "",
+	forearmLength: "",
+	posteriorArmLength: "",
+	towerHeight: "",
+	forearmFlag: "",
+	rearArmFlag: "",
+	towerCapFlag: "",
+	upwardTurntableFlag: "",
+	lowerTurntableFlag: "",
+	mastSectionFlag: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+const getId = ref<number | undefined>(undefined);
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 80 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		search: { el: "input" }
+	},
+	{
+		prop: "installTime",
+		label: "安装时间",
+		search: {
+			el: "date-picker",
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{ prop: "blackBox", label: "黑匣子信息" },
+	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
+];
+
+const rules = ref({
+	devName: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	installTime: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	blackBox: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	structureType: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	installImage: [
+		{
+			required: true,
+			message: "请上传",
+			trigger: "change"
+		}
+	],
+	isForeignDev: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	isNewDev: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	model: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	factoryCertificate: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	workingRange: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	maxLiftingCapacity: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	independentLiftingHeight: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	acquisitionDate: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	numberValidityPeriod: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	originalValue: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	renovations: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	invoiceCode: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	manufacturer: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	productionDate: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+
+	manufacturerLicense: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	isOriginalProduct: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	useTo: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	forearmLength: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	posteriorArmLength: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	towerHeight: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	forearmFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	rearArmFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	towerCapFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	upwardTurntableFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	lowerTurntableFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	mastSectionFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	]
+});
+
+// 图片上传成功后的钩子
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+	console.log(response.result.url);
+	console.log(response, uploadFile);
+	formData.value.installImage = response.result.url;
+	formRef.value?.validateField("image");
+};
+// 删除设备
+const handleDeleteItem = async (params: jxj_User.ResUserList) => {
+	await useHandleData(towerCraneEquipDel, { id: params.id }, `删除【${params.devName}】`);
+	proTable.value.getTableList();
+};
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+const transfrom = (arr: Array<any>) => {
+	const result: any[] | ConcatArray<{ authorityId: any; roleId: number | undefined; type: any }> = [];
+	return arr
+		.map(item => {
+			if (arr.children && Array.isArray(arr.children)) {
+				result.concat(transfrom(arr.children));
+			}
+
+			return {
+				authorityId: item.name,
+				roleId: getId.value,
+				type: item.type
+			};
+		})
+		.concat(result);
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.installTime) {
+		newParams.installTime_begin = newParams.installTime[0];
+		newParams.installTime_end = newParams.installTime[1];
+		delete newParams.installTime;
+	}
+	if (searchSn.value) {
+		newParams.engineeringSn = searchSn.value;
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneEquipPage(newParams);
+};
+// 新增
+const handleAddItem = () => {
+	formRef.value?.resetFields();
+	title.value = "新增设备";
+	newUnitDialog.value = true;
+};
+// 查看
+const handleLookItem = (row: any) => {
+	formRef.value?.resetFields();
+	title.value = "查看设备";
+	console.log(row);
+	formData.value = reactive({ ...row });
+	changeType.value = formData.value.businessLicenseLifespan ? 1 : 2;
+	newUnitDialog.value = true;
+};
+// 编辑
+const handleEditItem = (row: any) => {
+	formRef.value?.clearValidate();
+	title.value = "编辑设备";
+	console.log(row);
+	formData.value = reactive({ ...row });
+	changeType.value = formData.value.businessLicenseLifespan ? 1 : 2;
+	newUnitDialog.value = true;
+};
+// TODO: 提交表单操作
+const submitForm = async (data: any) => {
+	const formEl = formRef.value;
+	if (!formEl) return;
+	await formEl.validate((valid, fields) => {
+		if (valid) {
+			if (changeType.value == 2) {
+				delete data.businessLicenseLifespan;
+			}
+			data.engineeringSn = searchSn.value;
+			saveItem(data);
+		} else {
+			console.log("error submit!", fields);
+		}
+	});
+};
+const saveItem = async (form: any) => {
+	if (form.id) {
+		// console.log(form.dictCode);
+		const res = await towerCraneEquipEdit(form);
+		proTable.value.getTableList();
+		ElMessage.success("编辑成功");
+		newUnitDialog.value = false;
+	} else {
+		const res = await towerCraneEquipAdd(form);
+		proTable.value.getTableList();
+		ElMessage.success("新增成功");
+		newUnitDialog.value = false;
+	}
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	searchSn.value = row.engineeringSn;
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/enterprise/liftSupervision/historyData/alarmData/index.scss b/src/views/enterprise/liftSupervision/historyData/alarmData/index.scss
new file mode 100644
index 0000000..78172c0
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/historyData/alarmData/index.scss
@@ -0,0 +1,16 @@
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.table-data {
+	@include flex;
+	> span {
+		display: inline-block;
+		width: 50%;
+	}
+}
+:deep() {
+	.tabs-option {
+		display: none;
+	}
+}
diff --git a/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue b/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue
new file mode 100644
index 0000000..a4611e8
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue
@@ -0,0 +1,233 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="报警数据"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #equipInfo="{ row }">
+				<span>设备名称: {{ row.devName }}</span>
+				<br />
+				<span>设备编号: {{ row.devNumber }}</span>
+				<br />
+				<span>司机姓名: {{ row.driverName }}</span>
+				<br />
+				<span>司机身份证号: {{ row.driverIdCard }}</span>
+				<br />
+				<span>特种作业号: {{ row.certification }}</span>
+			</template>
+			<template #alarmInfo="{ row }">
+				<div class="table-data">
+					<span
+						>环境防撞报警:
+						<span :style="{ color: row.environmentAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.environmentAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>高度上限位报警:
+						<span :style="{ color: row.heightUpperAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightUpperAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度下限位报警:
+						<span :style="{ color: row.heightLowerAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightLowerAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>幅度外限位报警:
+						<span :style="{ color: row.maxRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.maxRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度内限位报警:
+						<span :style="{ color: row.minRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.minRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>力矩报警:
+						<span :style="{ color: row.forceAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forceAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>多机防撞报警:
+						<span :style="{ color: row.multiAntiCollisionAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>逆时针回转限位报警:
+						<span :style="{ color: row.negAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.negAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>倾角报警:
+						<span :style="{ color: row.obliquityAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>塔机竖向高度报警:
+						<span :style="{ color: row.standardHighAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.standardHighAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>升降机报警时间: {{ row.createTime }}</span>
+				</div>
+			</template>
+		</ProTable>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" ref="engDrawer" :engList="engList">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{ data.engineeringName }}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, onMounted } from "vue";
+import { ElMessage } from "element-plus";
+import { ColumnProps } from "@/components/ProTable/interface";
+import ProTable from "@/components/ProTable/index.vue";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { towerCraneAlarmPage } from "@/api/modules/enterpriseApi";
+
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	solveFlag: 1,
+	engineeringSn: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+const getId = ref<number | undefined>(undefined);
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 200 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		isShow: false,
+		search: { el: "input" }
+	},
+	{
+		prop: "type",
+		label: "报警类型",
+		isShow: false,
+		search: { el: "select" },
+		enum: [
+			{ label: "报警", value: 1 },
+			{ label: "预警", value: 2 }
+		]
+	},
+	{
+		prop: "createTime",
+		label: "报警时间",
+		isShow: false,
+		search: {
+			el: "date-picker",
+
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{
+		prop: "equipInfo",
+		label: "设备信息",
+		align: "left"
+	},
+	// 多级 prop
+	{ prop: "alarmInfo", label: "报警信息", align: "left", width: 800 }
+];
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.createTime) {
+		newParams.createTime_begin = newParams.createTime[0];
+		newParams.createTime_end = newParams.createTime[1];
+		delete newParams.createTime;
+	}
+	if (searchSn.value) {
+		newParams.engineeringSn = searchSn.value;
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneAlarmPage(newParams);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	searchSn.value = row.engineeringSn;
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/enterprise/liftSupervision/historyData/realTimeData/index.scss b/src/views/enterprise/liftSupervision/historyData/realTimeData/index.scss
new file mode 100644
index 0000000..78172c0
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/historyData/realTimeData/index.scss
@@ -0,0 +1,16 @@
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.table-data {
+	@include flex;
+	> span {
+		display: inline-block;
+		width: 50%;
+	}
+}
+:deep() {
+	.tabs-option {
+		display: none;
+	}
+}
diff --git a/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue b/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
new file mode 100644
index 0000000..e081034
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
@@ -0,0 +1,491 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="报警数据"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #equipInfo="{ row }">
+				<span>设备名称: {{ row.devName }}</span>
+				<br />
+				<span>设备编号: {{ row.devNumber }}</span>
+				<br />
+				<span>司机姓名: {{ row.driverName }}</span>
+				<br />
+				<span>司机身份证号: {{ row.driverIdCard }}</span>
+				<br />
+				<span>角度: {{ row.angle ? row.angle : 0 }}°</span>
+				<br />
+				<span>高度: {{ row.height ? row.height : 0 }}m</span>
+				<br />
+				<span>载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span>
+				<br />
+				<span>载重: {{ row.loading ? row.loading : 0 }}kg</span>
+				<br />
+				<span>倾角: {{ row.obliquity ? row.obliquity : 0 }}°</span>
+				<br />
+				<span>倾角X: {{ row.obliquityX ? row.obliquityX : 0 }}°</span>
+				<br />
+				<span>倾角Y: {{ row.obliquityY ? row.obliquityY : 0 }}°</span>
+				<br />
+				<span>幅度: {{ row.ranger ? row.ranger : 0 }}m</span>
+				<br />
+				<span>倍率: {{ row.multiple ? row.multiple : 0 }}</span>
+				<br />
+				<span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
+				<br />
+				<span>力矩: {{ row.torque ? row.torque : 0 }}kg.m</span>
+				<br />
+				<span>力矩比: {{ row.torqueRatio ? row.torqueRatio : 0 }}%</span>
+				<br />
+				<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span>
+				<br />
+				<span
+					>回转状态:
+					{{
+						row.rotationState == 0 ? "停止回转" : row.rotationState == 1 ? "向右回转" : row.rotationState == 2 ? "向左回转" : ""
+					}}</span
+				>
+				<br />
+				<span
+					>起升状态:
+					{{
+						row.liftingState == 0 ? "停止升降" : row.liftingState == 1 ? "向下落勾" : row.liftingState == 2 ? "向上起勾" : ""
+					}}</span
+				>
+				<br />
+				<span
+					>变幅状态:
+					{{
+						row.rangerState == 0 ? "停止变幅" : row.rangerState == 1 ? "向外变幅" : row.rangerState == 2 ? "向内变幅" : ""
+					}}</span
+				>
+			</template>
+			<template #alarmInfo="{ row }">
+				<div class="table-data">
+					<span
+						>禁入区报警:
+						<span :style="{ color: row.forbidEntryAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forbidEntryAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>禁入区左转报警:
+						<span :style="{ color: row.forbidEntryLeftAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forbidEntryLeftAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>禁入区右转报警:
+						<span :style="{ color: row.forbidEntryRightAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forbidEntryRightAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>A类禁吊区域报警:
+						<span :style="{ color: row.forbidSuspendAlarmA == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendAlarmA == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>A类禁吊区左转报警:
+						<span :style="{ color: row.forbidSuspendLeftAlarmA == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendLeftAlarmA == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>A类禁吊区右转报警:
+						<span :style="{ color: row.forbidSuspendRightAlarmA == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendRightAlarmA == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>A类禁吊区向外变幅报警:
+						<span :style="{ color: row.forbidSuspendOutAlarmA == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendOutAlarmA == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>B类禁吊区域报警:
+						<span :style="{ color: row.forbidSuspendAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>B类禁吊区左转报警:
+						<span :style="{ color: row.forbidSuspendLeftAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendLeftAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>B类禁吊区右转报警:
+						<span :style="{ color: row.forbidSuspendRightAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendRightAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>B类禁吊区向外变幅报警:
+						<span :style="{ color: row.forbidSuspendOutAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendOutAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>B类禁吊区向内变幅报警:
+						<span :style="{ color: row.forbidSuspendBackAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendBackAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度上限位报警:
+						<span :style="{ color: row.heightUpperAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightUpperAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>高度下限位报警:
+						<span :style="{ color: row.heightLowerAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightLowerAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度外限位报警:
+						<span :style="{ color: row.maxRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.maxRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>幅度内限位报警:
+						<span :style="{ color: row.minRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.minRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>力矩报警:
+						<span :style="{ color: row.forceAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forceAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>多机防撞报警:
+						<span :style="{ color: row.multiAntiCollisionAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>多机防撞向内变幅报警:
+						<span :style="{ color: row.multiAntiCollisionBackAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionBackAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>多机防撞左转报警:
+						<span :style="{ color: row.multiAntiCollisionLeftAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionLeftAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>多机防撞向外变幅报警:
+						<span :style="{ color: row.multiAntiCollisionOutAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionOutAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>多机防撞右转报警:
+						<span :style="{ color: row.multiAntiCollisionRightAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionRightAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>逆时针回转限位报警:
+						<span :style="{ color: row.negAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.negAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>倾角报警:
+						<span :style="{ color: row.obliquityAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>倾角X报警:
+						<span :style="{ color: row.obliquityXAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityXAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>倾角Y报警:
+						<span :style="{ color: row.obliquityYAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityYAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>顺时针回转限位报警:
+						<span :style="{ color: row.posAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.posAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>风速报警:
+						<span :style="{ color: row.windSpeedAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.windSpeedAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+			</template>
+			<template #faultInfo="{ row }">
+				<div class="table-data">
+					<span
+						>角度传感器故障:
+						<span :style="{ color: row.angleError == 0 ? '#333' : '#E70000' }">{{
+							row.angleError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>GPS故障:
+						<span :style="{ color: row.gpsError == 0 ? '#333' : '#E70000' }">{{
+							row.gpsError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度传感器故障:
+						<span :style="{ color: row.heightError == 0 ? '#333' : '#E70000' }">{{
+							row.heightError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>身份识别模块故障:
+						<span :style="{ color: row.identificationError == 0 ? '#333' : '#E70000' }">{{
+							row.identificationError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>有无任何外设故障:
+						<span :style="{ color: row.peripheralError == 0 ? '#333' : '#E70000' }">{{
+							row.peripheralError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>倾角传感器故障:
+						<span :style="{ color: row.obliquityError == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度传感器故障:
+						<span :style="{ color: row.rangeError == 0 ? '#333' : '#E70000' }">{{
+							row.rangeError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>载重传感器故障:
+						<span :style="{ color: row.weightError == 0 ? '#333' : '#E70000' }">{{
+							row.weightError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>风速传感器故障:
+						<span :style="{ color: row.windSpeedError == 0 ? '#333' : '#E70000' }">{{
+							row.windSpeedError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+			</template>
+		</ProTable>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" ref="engDrawer" :engList="engList">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{ data.engineeringName }}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, onMounted } from "vue";
+import { ElMessage } from "element-plus";
+import { ColumnProps } from "@/components/ProTable/interface";
+import ProTable from "@/components/ProTable/index.vue";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { towerCraneDataPage } from "@/api/modules/enterpriseApi";
+
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	solveFlag: 1,
+	engineeringSn: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 200 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		isShow: false,
+		search: { el: "input" }
+	},
+	{
+		prop: "type",
+		label: "报警类型",
+		isShow: false,
+		search: { el: "select" },
+		enum: [
+			{ label: "报警", value: 1 },
+			{ label: "预警", value: 2 }
+		]
+	},
+	{
+		prop: "createTime",
+		label: "数据接受时间",
+		isShow: false,
+		search: {
+			el: "date-picker",
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{
+		prop: "equipInfo",
+		label: "设备信息",
+		align: "left",
+		width: 400
+	},
+	// 多级 prop
+	{ prop: "alarmInfo", label: "报警信息", align: "left", width: 800 },
+	{ prop: "faultInfo", label: "故障信息", align: "left" }
+];
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.createTime) {
+		newParams.createTime_begin = newParams.createTime[0];
+		newParams.createTime_end = newParams.createTime[1];
+		delete newParams.createTime;
+	}
+	if (searchSn.value) {
+		newParams.engineeringSn = searchSn.value;
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneDataPage(newParams);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	searchSn.value = row.engineeringSn;
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/enterprise/liftSupervision/historyData/workCycleData/index.scss b/src/views/enterprise/liftSupervision/historyData/workCycleData/index.scss
new file mode 100644
index 0000000..78172c0
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/historyData/workCycleData/index.scss
@@ -0,0 +1,16 @@
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.table-data {
+	@include flex;
+	> span {
+		display: inline-block;
+		width: 50%;
+	}
+}
+:deep() {
+	.tabs-option {
+		display: none;
+	}
+}
diff --git a/src/views/enterprise/liftSupervision/historyData/workCycleData/index.vue b/src/views/enterprise/liftSupervision/historyData/workCycleData/index.vue
new file mode 100644
index 0000000..8e84577
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/historyData/workCycleData/index.vue
@@ -0,0 +1,315 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="报警数据"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #equipDriverInfo="{ row }">
+				<span>设备名称: {{ row.devName }}</span>
+				<br />
+				<span>设备编号: {{ row.devNumber }}</span>
+				<br />
+				<span>司机姓名: {{ row.driverName }}</span>
+				<br />
+				<span>司机身份证号: {{ row.driverIdCard }}</span>
+			</template>
+			<template #workCycleInfo="{ row }">
+				<div class="table-data">
+					<span>工作循环开始时间: {{ row.startTime }}</span>
+					<span>工作循环结束时间: {{ row.endTime }}</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环持续时长: {{ row.duration ? row.duration : 0 }}s</span>
+					<span>工作循环最大载重: {{ row.maxLoad ? row.maxLoad : 0 }}kg</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大角度: {{ row.maxAngle ? row.maxAngle : 0 }}°</span>
+					<span>工作循环最小角度: {{ row.minAngle ? row.minAngle : 0 }}°</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大高度: {{ row.maxHeight ? row.maxHeight : 0 }}m</span>
+					<span>工作循环最小高度: {{ row.minHeight ? row.minHeight : 0 }}m</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大幅度: {{ row.maxRange ? row.maxRange : 0 }}m</span>
+					<span>工作循环最小幅度: {{ row.minRange ? row.minRange : 0 }}m</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环开始高度: {{ row.startHeight ? row.startHeight : 0 }}m</span>
+					<span>工作循环结束高度: {{ row.endHeight ? row.endHeight : 0 }}m</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环开始幅度: {{ row.startRange ? row.startRange : 0 }}m</span>
+					<span>工作循环结束幅度: {{ row.endRange ? row.endRange : 0 }}m</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环开始角度: {{ row.startAngle ? row.startAngle : 0 }}°</span>
+					<span>工作循环结束角度: {{ row.endAngle ? row.endAngle : 0 }}°</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大载重比: {{ row.maxLoadRatio ? row.maxLoadRatio : 0 }}%</span>
+					<span>工作循环最大风速: {{ row.maxWindSpeed ? row.maxWindSpeed : 0 }}m/s</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环中最大力矩: {{ row.maxForce ? row.maxForce : 0 }}kg·m</span>
+					<span>工作循环最大力矩百分比: {{ row.maxForceRatio ? row.maxForceRatio : 0 }}%</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大力矩时的幅度: {{ row.maxForceRatioRange ? row.maxForceRatioRange : 0 }}m</span>
+					<span>工作循环倍率: {{ row.multiple ? row.multiple : 0 }}%</span>
+				</div>
+			</template>
+			<template #alarmInfo="{ row }">
+				<div class="table-data">
+					<span
+						>防碰撞报警:
+						<span :style="{ color: row.antiCollisionAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.antiCollisionAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度上限位报警:
+						<span :style="{ color: row.heightUpperAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightUpperAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度下限位报警:
+						<span :style="{ color: row.heightLowerAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightLowerAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度外限位报警:
+						<span :style="{ color: row.maxRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.maxRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度内限位报警:
+						<span :style="{ color: row.minRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.minRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>力矩报警:
+						<span :style="{ color: row.forceAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forceAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>多机防撞报警:
+						<span :style="{ color: row.multiAntiCollisionAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>逆时针回转限位报警:
+						<span :style="{ color: row.negAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.negAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>倾角报警:
+						<span :style="{ color: row.obliquityAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>顺时针回转限位报警:
+						<span :style="{ color: row.posAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.posAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>风速报警:
+						<span :style="{ color: row.windSpeedAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.windSpeedAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>工作循环中是否出现环境防碰撞报警:
+						<span :style="{ color: row.workEnvironmentAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.workEnvironmentAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>工作循环中是否出现力矩预警:
+						<span :style="{ color: row.workForceAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.workForceAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+			</template>
+		</ProTable>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" ref="engDrawer" :engList="engList">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{ data.engineeringName }}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, onMounted } from "vue";
+import { ElMessage } from "element-plus";
+import { ColumnProps } from "@/components/ProTable/interface";
+import ProTable from "@/components/ProTable/index.vue";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { towerCraneWorkCyclePage } from "@/api/modules/enterpriseApi";
+
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	solveFlag: 1,
+	engineeringSn: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 200 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		isShow: false,
+		search: { el: "input" }
+	},
+	{
+		prop: "createTime",
+		label: "工作循环时间",
+		isShow: false,
+		search: {
+			el: "date-picker",
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{
+		prop: "equipDriverInfo",
+		label: "设备司机信息",
+		align: "left",
+		width: 400
+	},
+	// 多级 prop
+	{ prop: "workCycleInfo", label: "工作循环信息", align: "left", width: 600 },
+	{ prop: "alarmInfo", label: "工作循环报警信息", align: "left", width: 600 }
+];
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.createTime) {
+		newParams.startTime_begin = newParams.createTime[0];
+		newParams.endTime_end = newParams.createTime[1];
+		delete newParams.createTime;
+	}
+	if (searchSn.value) {
+		newParams.engineeringSn = searchSn.value;
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneWorkCyclePage(newParams);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	searchSn.value = row.engineeringSn;
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/enterprise/liftSupervision/notice/myReceive/index.scss b/src/views/enterprise/liftSupervision/notice/myReceive/index.scss
new file mode 100644
index 0000000..0fb6677
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/notice/myReceive/index.scss
@@ -0,0 +1,42 @@
+.el-table :deep(.el-table__row) {
+	height: 36px;
+}
+.el-table :deep(.el-table__header th) {
+	height: 36px;
+}
+
+.list {
+	margin: 18px 0 32px 0;
+}
+.time {
+	// margin-left: 42px;
+	margin: 10px 0 10px 42px;
+}
+.content {
+	padding: 0 40px;
+}
+.html-div {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	:deep() {
+		p:first-child {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+		p:not(:first-child) {
+			display: none !important;
+		}
+	}
+}
diff --git a/src/views/enterprise/liftSupervision/notice/myReceive/index.vue b/src/views/enterprise/liftSupervision/notice/myReceive/index.vue
new file mode 100644
index 0000000..847c113
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/notice/myReceive/index.vue
@@ -0,0 +1,199 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="我接收的"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+		>
+			<template #content="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
+			<template #operation="{ row }">
+				<el-button type="primary" link @click="onLook(row)">
+					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
+					<span>查看</span>
+				</el-button>
+			</template>
+		</ProTable>
+		<el-dialog v-model="visible" :destroy-on-close="true" title="查看通知">
+			<div>
+				<span class="flx-center titleText">{{ rowList.title }}</span>
+			</div>
+			<div class="text-12 flx-center">
+				<span>撰稿人：{{ rowList.createByName }}</span>
+				<span class="time">时间:{{ rowList.createTime }}</span>
+			</div>
+			<div class="content text-12" v-html="rowList.content"></div>
+			<div class="littleTitle list">附件列表</div>
+			<el-table
+				:data="annexFiles"
+				border
+				max-height="200"
+				class="el-table"
+				:header-cell-style="{ backgroundColor: '#e1eeff', textAlign: 'center' }"
+				:cell-style="{ textAlign: 'center' }"
+			>
+				<el-table-column type="index" label="序号" width="200" />
+				<el-table-column prop="fileName" label="附件名称" />
+				<el-table-column label="操作" width="200">
+					<template #default="{ row }">
+						<el-button type="primary" link size="small" @click="addAnnexFile(row)">查看</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="littleTitle list">接收人员列表</div>
+			<el-table
+				:data="rowList.accetpList"
+				class="el-table"
+				max-height="200"
+				:header-cell-style="{ textAlign: 'center', boxShadow: 'inset 0px -1px 0px 0px #EBEEF5' }"
+				:cell-style="{ textAlign: 'center' }"
+			>
+				<el-table-column prop="acceptName" label="名称" />
+				<el-table-column prop="isRead" label="阅读状态">
+					<template #default="{ row }">
+						{{ row.isRead === 1 ? "已读" : "未读" }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="readTime" label="查看时间" />
+			</el-table>
+			<template #footer>
+				<el-button type="primary" v-if="store.isManager && isReadState === 0" @click="onKnow">我已知晓</el-button>
+				<el-button type="primary" v-else @click="visible = false">关闭</el-button>
+			</template>
+		</el-dialog>
+		<el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close>
+			<el-table
+				:data="current"
+				border
+				class="el-table"
+				:header-cell-style="{ backgroundColor: '#f5f7fa', textAlign: 'center' }"
+				:cell-style="{ textAlign: 'center' }"
+			>
+				<el-table-column prop="fileName" label="文件名称" />
+				<el-table-column label="操作" width="200">
+					<template #default="{ row }">
+						<el-button type="primary" link size="small" @click="ondownLoad(row)">下载</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button type="primary" @click="fileVisible = false"> 关闭 </el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="governmentmyReceive">
+import { ref, reactive, onMounted } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { ColumnProps } from "@/components/ProTable/interface";
+import ProTable from "@/components/ProTable/index.vue";
+import { myNoticeReceivePage, noticeDetailMyPost, noticeReadMyPost } from "@/api/modules/common";
+import { GlobalStore } from "@/stores";
+import type { Options } from "@/views/goverment/approve/company/components/unit-table.vue";
+import type { UploadFile } from "@/components/FilesUpload/FilesUpload.vue";
+
+const store = GlobalStore();
+type AnnexFilesOptions = Options & {
+	files: UploadFile[];
+};
+
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+const baseUrl = import.meta.env.VITE_API_URL;
+const visible = ref(false);
+const fileVisible = ref(false);
+const rowList = ref({
+	title: "",
+	createByName: "",
+	createTime: "",
+	content: "",
+	accetpList: {}
+});
+const rowNoticeId = ref("");
+const isReadState = ref<number>();
+const annexFiles = ref<AnnexFilesOptions[]>([]);
+const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 80 },
+
+	// 多级 prop
+	{ prop: "title", label: "通知标题", search: { el: "input" } },
+	{ prop: "content", label: "通知内容", search: { el: "input" } },
+	{ prop: "createByName", label: "发布人名称" },
+	{ prop: "createTime", label: "发布时间" },
+	{
+		prop: "isRead",
+		label: "阅读状态",
+		render: scoped => {
+			return scoped.row.isRead === 1 ? "已读" : "未读";
+		}
+	},
+	{ prop: "operation", label: "操作", fixed: "right" }
+];
+
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	return myNoticeReceivePage(newParams);
+};
+
+const onLook = async row => {
+	isReadState.value = row.isRead;
+	const { result } = await noticeDetailMyPost({ noticeId: row.noticeId });
+	rowList.value = result || [];
+	annexFiles.value = result.annexFileList;
+	rowList.value.accetpList = result.acceptList;
+
+	visible.value = true;
+	rowNoticeId.value = row.noticeId;
+};
+const onKnow = async () => {
+	await noticeReadMyPost({ noticeId: rowNoticeId.value });
+	visible.value = false;
+	ElMessage.success("已知晓");
+	proTable.value.getTableList();
+};
+
+const addAnnexFile = (row: AnnexFilesOptions) => {
+	fileVisible.value = true;
+	current.value = [row];
+};
+
+const ondownLoad = row => {
+	ElMessageBox.confirm("确认下载数据?", "温馨提示", { type: "warning" }).then(() => {
+		if (!row.fileName) {
+			ElMessage.error("当前没有文件，请先上传文件");
+		} else {
+			window.open(baseUrl + "/xmgl/file/preview?fileUrl=" + row.fileUrl);
+		}
+	});
+};
+</script>
+<style lang="scss" scoped>
+@import "./index.scss";
+</style>
diff --git a/src/views/enterprise/liftSupervision/operatingData/index.scss b/src/views/enterprise/liftSupervision/operatingData/index.scss
new file mode 100644
index 0000000..379a4d2
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/operatingData/index.scss
@@ -0,0 +1,325 @@
+@mixin boxStyle {
+	background: #ffffff;
+	border-radius: 8px;
+}
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.operate-box {
+	width: 100%;
+	height: 100%;
+	@include flex;
+	.monitor-data {
+		@include boxStyle;
+
+		flex: 1;
+		height: 100%;
+		min-height: 600px;
+		.monitor-title {
+			margin-top: 15px;
+			margin-left: 36px;
+			@include flex;
+			span:first-child {
+				margin-right: 20px;
+				font-family: "Source Han Sans CN-Bold", "Source Han Sans CN";
+				font-size: 30px;
+				font-weight: bold;
+				color: #333333;
+			}
+			span:last-child {
+				font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+				font-size: 22px;
+				font-weight: 500;
+			}
+		}
+		.monitor-content {
+			display: flex;
+			height: calc(100% - 265px);
+			margin-top: 36px;
+			margin-left: 36px;
+			.monitor-tool {
+				position: relative;
+				span {
+					font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+					font-size: 18px;
+					font-weight: 400;
+					color: #000000;
+				}
+				.property-one {
+					position: absolute;
+					top: 0;
+					left: 0;
+				}
+				.property-two {
+					position: absolute;
+					top: 0;
+					right: 0;
+				}
+				.property-three {
+					position: absolute;
+					top: 180px;
+					left: 0;
+				}
+				.other-info {
+					position: absolute;
+					top: 240px;
+					right: 0;
+					display: flex;
+					flex-direction: column;
+					> span {
+						margin-bottom: 20px;
+					}
+				}
+				img {
+					width: 357px;
+					height: 100%;
+				}
+			}
+			.common-info {
+				display: flex;
+				flex-wrap: wrap;
+				align-content: flex-start;
+				margin-left: 86px;
+				&-item {
+					flex-direction: column;
+					justify-content: center;
+					width: 184px;
+					height: 100px;
+					margin-right: 26px;
+					margin-bottom: 30px;
+					background: #ffffff;
+					border: 1px solid #ebebeb;
+					border-radius: 4px;
+					@include flex;
+					> div:first-child {
+						@include flex;
+
+						margin-bottom: 12px;
+						span {
+							margin-right: 7px;
+							font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+							font-size: 18px;
+							font-weight: 500;
+							color: #333333;
+						}
+						img {
+							width: 20px;
+							height: 20px;
+						}
+					}
+					> div:last-child {
+						@include flex;
+						span {
+							font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+							font-size: 18px;
+							font-weight: 500;
+							color: #00378f;
+						}
+					}
+				}
+			}
+			.monitor-aspect {
+				display: flex;
+				flex-wrap: wrap;
+				align-content: flex-start;
+				margin-left: 86px;
+				&-item {
+					flex-direction: column;
+					justify-content: center;
+					width: 184px;
+					height: 100px;
+					margin-right: 26px;
+					margin-bottom: 30px;
+					background: #ffffff;
+					border: 1px solid #ebebeb;
+					border-radius: 4px;
+					@include flex;
+					> div:first-child {
+						@include flex;
+
+						margin-bottom: 12px;
+						span {
+							margin-right: 7px;
+							font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+							font-size: 18px;
+							font-weight: 500;
+							color: #333333;
+						}
+						img {
+							width: 20px;
+							height: 20px;
+						}
+					}
+					> div:last-child {
+						@include flex;
+						span {
+							font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+							font-size: 18px;
+							font-weight: 500;
+							color: #00378f;
+						}
+					}
+				}
+			}
+		}
+		.monitor-equip {
+			margin-top: 31px;
+			margin-bottom: 16px;
+			margin-left: 36px;
+			@include flex;
+			.monitor-state:not(:last-child) {
+				margin-right: 26px;
+			}
+			.monitor-state {
+				@include flex;
+
+				flex-direction: column;
+				align-items: center;
+				cursor: pointer;
+				> div {
+					position: relative;
+					img {
+						width: 184px;
+						height: 100px;
+					}
+					span {
+						position: absolute;
+						top: 0;
+						right: 0;
+						width: 32px;
+						height: 15px;
+						font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+						font-size: 10px;
+						font-weight: 400;
+						color: #ffffff;
+						text-align: center;
+					}
+				}
+				> span {
+					font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+					font-size: 16px;
+					font-weight: 400;
+					color: #000000;
+				}
+			}
+			.active-class {
+				box-shadow: 0 4px 8px 0 rgb(48 62 100 / 20%);
+			}
+		}
+	}
+	.no-data {
+		@include boxStyle;
+
+		display: flex;
+		flex: 1;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		min-height: 600px;
+		color: #999999;
+	}
+	.history-data {
+		@include boxStyle;
+
+		width: 300px;
+		height: 100%;
+		margin-left: 20px;
+		:deep() {
+			.leftMenu {
+				height: 100%;
+			}
+			.content {
+				height: calc(100% - 100px);
+			}
+		}
+		.search-wrapper {
+			@include flex;
+
+			height: 50px;
+			padding: 0 10px;
+			background-color: #ffffff;
+			border-bottom: 1px solid #e5e5e5;
+		}
+		.alarm-list {
+			height: calc(100% - 50px);
+			min-height: 83%;
+			overflow-y: scroll;
+			&-item {
+				display: flex;
+				flex-direction: column;
+				padding: 12px;
+				border-bottom: 1px solid #e5e5e5;
+				> div {
+					span {
+						font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+						font-size: 12px;
+						font-weight: 400;
+						color: #333333;
+					}
+				}
+				> div:not(:last-child) {
+					margin-bottom: 8px;
+				}
+			}
+		}
+		.info-list {
+			height: calc(100% - 50px);
+			min-height: 83%;
+			overflow-y: scroll;
+			&-item {
+				display: flex;
+				flex-direction: column;
+				padding: 12px;
+				border-bottom: 1px solid #e5e5e5;
+				> div:nth-child(1) {
+					margin-bottom: 10px;
+					font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+					font-size: 16px;
+					font-weight: 500;
+					color: #333333;
+				}
+				&-aspect {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					&-item {
+						margin-bottom: 8px;
+						span {
+							font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+							font-size: 12px;
+							font-weight: 400;
+						}
+						> span:nth-child(1) {
+							display: inline-block;
+							width: 36px;
+							height: 18px;
+							margin-right: 20px;
+							color: #606266;
+							text-align: left;
+						}
+						> span:nth-child(2) {
+							display: inline-block;
+							width: 42px;
+							height: 18px;
+							color: #333333;
+						}
+					}
+				}
+				> div:last-child {
+					margin-top: 5px;
+					font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+					font-size: 10px;
+					font-weight: 400;
+					color: rgb(102 102 102 / 80%);
+				}
+			}
+		}
+	}
+}
+:deep() {
+	.tabs-option {
+		display: none;
+	}
+}
diff --git a/src/views/enterprise/liftSupervision/operatingData/index.vue b/src/views/enterprise/liftSupervision/operatingData/index.vue
new file mode 100644
index 0000000..8fc9a79
--- /dev/null
+++ b/src/views/enterprise/liftSupervision/operatingData/index.vue
@@ -0,0 +1,388 @@
+<template>
+	<div class="operate-box">
+		<div class="monitor-data" v-if="equipList.length > 0">
+			<div class="monitor-title">
+				<span>{{ equipInfo.devName }}</span>
+				<span :style="{ color: equipInfo.online == 1 ? '#0f64da' : '#C3C3C3' }">{{
+					equipInfo.online == 1 ? "在线" : "离线"
+				}}</span>
+			</div>
+			<div class="monitor-content">
+				<div class="monitor-tool">
+					<img src="@/assets/images/onlineSupervision/liftImg.jpg" alt="" />
+					<!-- <span class="property-one">尾臂长: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}m</span>
+					<span class="property-two">臂长: {{ equipInfo.forearmLength ? equipInfo.forearmLength : 0 }}m</span>
+					<span class="property-three">塔身高: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span> -->
+					<div class="common-info">
+						<span>额定载重: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}kg</span>
+						<span>额定人数: {{ equipInfo.forearmLength ? equipInfo.forearmLength : 0 }}人</span>
+						<span>最大倾斜角度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}°</span>
+						<span>最大高度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+						<span>风级: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}级风</span>
+						<span>额定上行速度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+						<span>额定下行速度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+					</div>
+					<div class="other-info">
+						<span>设备编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}</span>
+						<span>安装日期: {{ equipInfo.installTime ? equipInfo.installTime : "" }}</span>
+						<!-- <span>终端编号: TD2374693</span> -->
+						<span>更新时间: {{ equipInfo.realTime ? equipInfo.realTime : "" }}</span>
+					</div>
+				</div>
+				<div class="monitor-aspect">
+					<div class="monitor-aspect-item" v-for="(item, index) in aspectList" :key="index">
+						<div>
+							<span>{{ item.name }}</span>
+							<img :src="item.img" alt="" srcset="" />
+						</div>
+						<div>
+							<span>{{ equipInfo[item.prop] ? equipInfo[item.prop] : 0 }}</span>
+							<span>{{ item.unit }}</span>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="monitor-equip">
+				<div
+					:class="equipActive == index ? 'active-class' : ''"
+					class="monitor-state"
+					v-for="(item, index) in equipList"
+					:key="index"
+					@click="getEquipInfo(item)"
+				>
+					<div>
+						<img :src="item.installImage" alt="" />
+						<span :style="{ backgroundColor: item.online == 1 ? '#008bff' : '#C3C3C3' }">{{
+							item.online == 1 ? "在线" : "离线"
+						}}</span>
+					</div>
+					<span>{{ item.devName }}</span>
+				</div>
+			</div>
+		</div>
+		<div class="no-data" v-else>
+			<img src="@/assets/images/notData.png" alt="notData" />
+			<div>暂无数据</div>
+		</div>
+		<div class="history-data">
+			<LeftMenuPlus
+				v-model="active"
+				:tabs="['历史报警', '历史监测信息']"
+				:pageable="pages"
+				class="LeftMenu"
+				@change-page="onCurChange"
+			>
+				<template #default>
+					<div class="search-wrapper">
+						<el-date-picker
+							style="margin-right: 5px"
+							v-model="searchForm.timeRange"
+							type="daterange"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+						/>
+						<el-button class="search-btn" type="primary" @click="search">查询</el-button>
+					</div>
+					<div class="alarm-list" v-if="active == 0">
+						<div class="alarm-list-item" v-for="(item, index) in alarmList" :key="index">
+							<div>
+								<span>设备名称: </span>
+								<span>{{ item.devName }}</span>
+							</div>
+							<div>
+								<span>设备编号: </span>
+								<span style="color: #0f64da">{{ item.devNumber }}</span>
+							</div>
+							<div>
+								<span>报警项目: </span>
+								<span>{{ alarmTransform(item) }}</span>
+							</div>
+							<div>
+								<span>报警时间: </span>
+								<span>{{ item.createTime }}</span>
+							</div>
+						</div>
+					</div>
+					<div class="info-list" v-if="active == 1">
+						<div class="info-list-item" v-for="(item, index) in monitorList" :key="index">
+							<div>{{ item.devName }}</div>
+							<div class="info-list-item-aspect">
+								<div class="info-list-item-aspect-item">
+									<span>角度</span>
+									<span>{{ item.angle ? item.angle : 0 }}°</span>
+								</div>
+								<div class="info-list-item-aspect-item">
+									<span>倾角</span>
+									<span>{{ item.obliquity ? item.obliquity : 0 }}°</span>
+								</div>
+							</div>
+							<div class="info-list-item-aspect">
+								<div class="info-list-item-aspect-item">
+									<span>高度</span>
+									<span>{{ item.height ? item.height : 0 }}m</span>
+								</div>
+								<div class="info-list-item-aspect-item">
+									<span>倾角X</span>
+									<span>{{ item.obliquityX ? item.obliquityX : 0 }}°</span>
+								</div>
+							</div>
+							<div class="info-list-item-aspect">
+								<div class="info-list-item-aspect-item">
+									<span>载重比</span>
+									<span>{{ item.loadRatio ? item.loadRatio : 0 }}%</span>
+								</div>
+								<div class="info-list-item-aspect-item">
+									<span>倾角Y</span>
+									<span>{{ item.obliquityY ? item.obliquityY : 0 }}°</span>
+								</div>
+							</div>
+							<div class="info-list-item-aspect">
+								<div class="info-list-item-aspect-item">
+									<span>载重</span>
+									<span>{{ item.loading ? item.loading : 0 }}kg</span>
+								</div>
+								<div class="info-list-item-aspect-item">
+									<span>幅度</span>
+									<span>{{ item.ranger ? item.ranger : 0 }}m</span>
+								</div>
+							</div>
+							<div>监测时间: {{ item.createTime ? item.createTime : "" }}</div>
+						</div>
+					</div>
+				</template>
+			</LeftMenuPlus>
+		</div>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" ref="engDrawer" :engList="engList">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{ data.engineeringName }}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, onMounted, watch } from "vue";
+import { ElMessage } from "element-plus";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { towerCraneEquipAll, operationData, towerCraneAlarmPage, towerCraneDataPage } from "@/api/modules/enterpriseApi";
+import LeftMenuPlus from "@/components/LeftMenuPlus/LeftMenu.vue";
+const equipActive = ref(0);
+const monitorList = ref([]);
+const alarmList = ref([]);
+const equipList = ref([]);
+const equipInfo = ref({});
+const searchForm = ref({
+	timeRange: []
+});
+const active = ref(0);
+const pages = ref({
+	pageNo: 1,
+	pageSize: 6,
+	total: 0
+});
+const aspectList = ref([
+	{
+		name: "力矩",
+		value: 10,
+		unit: "N·M",
+		img: new URL("@/assets/images/onlineSupervision/力矩.png", import.meta.url).href,
+		prop: "torque"
+	},
+	{
+		name: "载重",
+		value: 10,
+		unit: "T",
+		img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
+		prop: "loading"
+	},
+	{
+		name: "风速",
+		value: 10,
+		unit: "m/s",
+		img: new URL("@/assets/images/onlineSupervision/风速.png", import.meta.url).href,
+		prop: "windSpeed"
+	},
+	{
+		name: "高度",
+		value: 10,
+		unit: "m",
+		img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
+		prop: "height"
+	},
+	{
+		name: "回转角度",
+		value: 10,
+		unit: "°",
+		img: new URL("@/assets/images/onlineSupervision/回转角度.png", import.meta.url).href,
+		prop: "angle"
+	},
+	{
+		name: "塔身倾角",
+		value: 10,
+		unit: "°",
+		img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
+		prop: "obliquity"
+	},
+	{
+		name: "幅度",
+		value: 10,
+		unit: "m",
+		img: new URL("@/assets/images/onlineSupervision/幅度.png", import.meta.url).href,
+		prop: "ranger"
+	}
+]);
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+// 报警项目转换
+const alarmTransform = (obj: any) => {
+	let str = "";
+	if (obj["environmentAlarm"] == 1) str += "环境防碰撞报警,";
+	if (obj["forceAlarm"] == 1) str += "力矩报警,";
+	if (obj["heightLowerAlarm"] == 1) str += "高度下限位报警,";
+	if (obj["heightUpperAlarm"] == 1) str += "高度上限位报警,";
+	if (obj["maxRangeAlarm"] == 1) str += "幅度外限位报警,";
+	if (obj["minRangeAlarm"] == 1) str += "幅度内限位报警,";
+	if (obj["multiAntiCollisionAlarm"] == 1) str += "多机防撞报警,";
+	if (obj["negAngleAlarm"] == 1) str += "逆时针回转限位报警,";
+	if (obj["obliquityAlarm"] == 1) str += "倾角报警,";
+	if (obj["posAngleAlarm"] == 1) str += "顺时针回转限位报警,";
+	if (obj["standardHighAlarm"] == 1) str += "塔机间竖向高度报警,";
+	if (obj["windSpeedAlarm"] == 1) str += "风速报警";
+	return str;
+};
+// 获取历史检测信息
+const getMonitorList = async () => {
+	let requestData = {
+		pageNo: pages.value.pageNo,
+		pageSize: pages.value.pageSize
+	} as any;
+	requestData.engineeringSn = searchSn.value;
+	if (searchForm.value.timeRange && searchForm.value.timeRange.length > 0) {
+		requestData.createTime_begin = searchForm.value.timeRange[0];
+		requestData.createTime_end = searchForm.value.timeRange[1];
+	}
+	const res = await towerCraneDataPage(requestData);
+	console.log(res);
+	if (res && res.result && res.result.records.length > 0) {
+		monitorList.value = res.result.records;
+		pages.value.total = +res.result.total;
+	} else {
+		monitorList.value = [];
+		pages.value.total = 0;
+	}
+};
+// 获取历史报警列表
+const getAlarmList = async () => {
+	let requestData = {
+		pageNo: pages.value.pageNo,
+		pageSize: pages.value.pageSize
+	} as any;
+	requestData.engineeringSn = searchSn.value;
+	if (searchForm.value.timeRange && searchForm.value.timeRange.length > 0) {
+		requestData.createTime_begin = searchForm.value.timeRange[0];
+		requestData.createTime_end = searchForm.value.timeRange[1];
+	}
+	const res = await towerCraneAlarmPage(requestData);
+	console.log(res);
+	if (res && res.result && res.result.records.length > 0) {
+		alarmList.value = res.result.records;
+		pages.value.total = +res.result.total;
+	} else {
+		alarmList.value = [];
+		pages.value.total = 0;
+	}
+};
+// 获取设备列表
+const getEquipList = async () => {
+	let requestData = {} as any;
+	requestData.engineeringSn = searchSn.value;
+	const res = await towerCraneEquipAll(requestData);
+	console.log(res);
+	if (res && res.result && res.result.length > 0) {
+		equipList.value = res.result;
+		getEquipInfo(res.result[0]);
+	} else {
+		equipList.value = [];
+	}
+};
+// 获取设备信息
+const getEquipInfo = async (obj: any) => {
+	let requestData = {
+		id: obj.id
+	};
+	const res = await operationData(requestData);
+	console.log(res);
+	if (res && res.result) {
+		equipInfo.value = { ...obj, ...res.result };
+	} else {
+		equipInfo.value = { ...obj };
+	}
+};
+// 右侧报警数据搜索
+const search = () => {
+	console.log(666);
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+};
+// 页面的分页
+const onCurChange = async (params: number) => {
+	console.log(params);
+	pages.value.pageNo = params;
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	getEquipList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	searchSn.value = row.engineeringSn;
+	getEquipList();
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+	ElMessage.success("页面已更新");
+};
+watch(
+	() => active.value,
+	n => {
+		searchForm.value.timeRange = [];
+		if (n === 0) {
+			getAlarmList();
+		} else {
+			getMonitorList();
+		}
+	}
+);
+onMounted(async () => {
+	await getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/goverment/liftSupervision/operatingData/index.scss b/src/views/goverment/liftSupervision/operatingData/index.scss
new file mode 100644
index 0000000..fa64dac
--- /dev/null
+++ b/src/views/goverment/liftSupervision/operatingData/index.scss
@@ -0,0 +1,325 @@
+@mixin boxStyle {
+	border-radius: 8px;
+	background: #ffffff;
+}
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.entire-box {
+	height: 100%;
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	background-color: #f6f6f6;
+	.operate-box {
+		height: calc(100% - 112px);
+		padding: 0 20px 20px 20px;
+		@include flex;
+		.alarm-data {
+			height: 100%;
+			// 页面的项目工程
+			.leftProject {
+				border-radius: 8px;
+				color: #333333;
+				// background-color: pink;
+				.projectName {
+					display: block;
+					width: 100%;
+					overflow: hidden;
+
+					// font-weight: 700;
+					font-family: "siyuan_Medium";
+					font-size: 16px;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+				.leftMenu_item {
+					.middleSize {
+						font-size: 12px;
+					}
+					img {
+						margin: 0 4px;
+						width: 12px;
+						height: 12px;
+					}
+				}
+				.bottom_item {
+					.bottomSize {
+						font-size: 10px;
+						color: #666666;
+					}
+				}
+			}
+			.LeftMenu {
+				width: 300px;
+				height: 100%;
+				border-radius: 8px;
+				// box-shadow: 0 4px 4px 0 rgb(0 55 143 / 20%);
+				overflow-y: scroll;
+				margin-right: 20px;
+				:deep() {
+					.content {
+						height: calc(100% - 150px);
+					}
+				}
+			}
+		}
+		.monitor-data {
+			@include boxStyle;
+			flex: 1;
+			height: 100%;
+			.monitor-title {
+				margin-top: 15px;
+				margin-left: 36px;
+				span:first-child {
+					font-size: 30px;
+					font-family: Source Han Sans CN-Bold, Source Han Sans CN;
+					font-weight: bold;
+					color: #333333;
+					margin-right: 20px;
+				}
+				span:last-child {
+					font-size: 22px;
+					font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+					font-weight: 500;
+					color: #0f64da;
+				}
+			}
+			.monitor-content {
+				display: flex;
+				height: calc(100% - 265px);
+				margin-top: 36px;
+				margin-left: 36px;
+				.monitor-tool {
+					position: relative;
+					span {
+						font-size: 18px;
+						font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+						font-weight: 400;
+						color: #000000;
+					}
+					.property-one {
+						position: absolute;
+						top: 0;
+						left: 0;
+					}
+					.property-two {
+						position: absolute;
+						top: 0;
+						right: 0;
+					}
+					.property-three {
+						position: absolute;
+						top: 180px;
+						left: 0;
+					}
+					.other-info {
+						position: absolute;
+						top: 240px;
+						right: 0px;
+						display: flex;
+						flex-direction: column;
+						> span {
+							margin-bottom: 20px;
+						}
+					}
+					img {
+						width: 688px;
+						height: 100%;
+					}
+				}
+				.monitor-aspect {
+					margin-left: 56px;
+					display: flex;
+					flex-wrap: wrap;
+					align-content: flex-start;
+					&-item {
+						width: 184px;
+						height: 100px;
+						background: #ffffff;
+						border-radius: 4px;
+						border: 1px solid #ebebeb;
+						@include flex;
+						flex-direction: column;
+						justify-content: center;
+						margin-right: 26px;
+						margin-bottom: 30px;
+						> div:first-child {
+							@include flex;
+							margin-bottom: 12px;
+							span {
+								font-size: 18px;
+								font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+								font-weight: 500;
+								color: #333333;
+								margin-right: 7px;
+							}
+							img {
+								width: 20px;
+								height: 20px;
+							}
+						}
+						> div:last-child {
+							@include flex;
+							span {
+								font-size: 18px;
+								font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+								font-weight: 500;
+								color: #00378f;
+							}
+						}
+					}
+				}
+			}
+			.monitor-equip {
+				margin-top: 31px;
+				margin-left: 36px;
+				margin-bottom: 16px;
+				@include flex;
+				.monitor-state:not(:last-child) {
+					margin-right: 26px;
+				}
+				.monitor-state {
+					@include flex;
+					flex-direction: column;
+					align-items: center;
+					> div {
+						position: relative;
+						img {
+							width: 184px;
+							height: 100px;
+						}
+						span {
+							width: 32px;
+							height: 15px;
+							background: #008bff;
+							font-size: 10px;
+							font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+							font-weight: 400;
+							color: #ffffff;
+							text-align: center;
+							position: absolute;
+							top: 0;
+							right: 0;
+						}
+					}
+					> span {
+						font-size: 16px;
+						font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+						font-weight: 400;
+						color: #000000;
+					}
+				}
+				.active-class {
+					box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2);
+				}
+			}
+		}
+		.no-data {
+			@include boxStyle;
+			flex: 1;
+			height: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			color: #999;
+		}
+		.history-data {
+			@include boxStyle;
+			width: 300px;
+			height: 100%;
+			margin-left: 20px;
+			:deep() {
+				.leftMenu {
+					height: 100%;
+				}
+				.content {
+					height: calc(100% - 100px);
+				}
+			}
+			.search-wrapper {
+				@include flex;
+				height: 50px;
+				padding: 0 10px;
+				background-color: #ffffff;
+				border-bottom: 1px solid #e5e5e5;
+			}
+			.alarm-list {
+				height: calc(100% - 50px);
+				min-height: 83%;
+				overflow-y: scroll;
+				&-item {
+					display: flex;
+					flex-direction: column;
+					border-bottom: 1px solid #e5e5e5;
+					padding: 12px;
+					> div {
+						span {
+							font-size: 12px;
+							font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+							font-weight: 400;
+							color: #333333;
+						}
+					}
+					> div:not(:last-child) {
+						margin-bottom: 8px;
+					}
+				}
+			}
+			.info-list {
+				height: calc(100% - 50px);
+				min-height: 83%;
+				overflow-y: scroll;
+				&-item {
+					display: flex;
+					flex-direction: column;
+					border-bottom: 1px solid #e5e5e5;
+					padding: 12px;
+					> div:nth-child(1) {
+						font-size: 16px;
+						font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+						font-weight: 500;
+						color: #333333;
+						margin-bottom: 10px;
+					}
+					&-aspect {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						&-item {
+							margin-bottom: 8px;
+							span {
+								font-size: 12px;
+								font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+								font-weight: 400;
+							}
+							> span:nth-child(1) {
+								display: inline-block;
+								width: 36px;
+								height: 18px;
+								color: #606266;
+								margin-right: 20px;
+								text-align: left;
+							}
+							> span:nth-child(2) {
+								display: inline-block;
+								width: 42px;
+								height: 18px;
+								color: #333333;
+							}
+						}
+					}
+					> div:last-child {
+						font-size: 10px;
+						font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+						font-weight: 400;
+						color: rgba(102, 102, 102, 0.8);
+						margin-top: 5px;
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/views/goverment/liftSupervision/operatingData/index.vue b/src/views/goverment/liftSupervision/operatingData/index.vue
new file mode 100644
index 0000000..a1d7e66
--- /dev/null
+++ b/src/views/goverment/liftSupervision/operatingData/index.vue
@@ -0,0 +1,487 @@
+<template>
+	<div class="entire-box">
+		<layoutTop></layoutTop>
+		<div class="operate-box">
+			<div class="alarm-data">
+				<LeftMenu
+					v-model="alarmActive"
+					:tabs="['项目名称', '工程名称']"
+					:records="records"
+					:pageable="alarmPages"
+					class="LeftMenu"
+					@search="onSearchInput"
+					@change-page="onCurChange"
+				>
+					<template #default="{ data }">
+						<div class="leftProject" @click="onSearch(data)">
+							<span class="projectName">{{ data.projectName || data.engineeringName }}</span>
+							<div class="leftMenu_item flx-justify-between">
+								<div class="flx-justify-between">
+									<img src="@/assets/images/AIwaring/升降机.png" alt="" />
+									<span class="middleSize">接入升降机总数：{{ data.deviceNum ? data.deviceNum : 0 }}</span>
+								</div>
+								<div>
+									<img src="@/assets/images/AIwaring/报警.png" alt="" />
+									<span class="middleSize"
+										>今日报警次数：{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.todayAlarm }}</span
+									>
+								</div>
+							</div>
+
+							<div class="bottom_item flx-justify-between" style="margin-top: 6px">
+								<div>
+									<span class="bottomSize"
+										>今日待整改问题：{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.questionNum }}</span
+									>
+								</div>
+								<div>
+									<span class="bottomSize"
+										>今日已整改问题：{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.solveQuestionNum }}</span
+									>
+								</div>
+							</div>
+						</div>
+					</template>
+				</LeftMenu>
+			</div>
+			<div class="monitor-data" v-if="equipList.length > 0">
+				<div class="monitor-title">
+					<span>{{ equipInfo.devName }}</span>
+					<span :style="{ color: equipInfo.online == 1 ? '#0f64da' : '#C3C3C3' }">{{
+						equipInfo.online == 1 ? "在线" : "离线"
+					}}</span>
+				</div>
+				<div class="monitor-content">
+					<div class="monitor-tool">
+						<img src="@/assets/images/onlineSupervision/towerImg.png" alt="" />
+						<span class="property-one">尾臂长: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}m</span>
+						<span class="property-two">臂长: {{ equipInfo.forearmLength ? equipInfo.forearmLength : 0 }}m</span>
+						<span class="property-three">塔身高: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+						<div class="other-info">
+							<span>设备编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}</span>
+							<span>安装日期: {{ equipInfo.installTime ? equipInfo.installTime : "" }}</span>
+							<!-- <span>终端编号: TD2374693</span> -->
+							<span>更新时间: {{ equipInfo.realTime ? equipInfo.realTime : "" }}</span>
+						</div>
+					</div>
+					<div class="monitor-aspect">
+						<div class="monitor-aspect-item" v-for="(item, index) in aspectList" :key="index">
+							<div>
+								<span>{{ item.name }}</span>
+								<img :src="item.img" alt="" srcset="" />
+							</div>
+							<div>
+								<span>{{ equipInfo[item.prop] ? equipInfo[item.prop] : 0 }}</span>
+								<span>{{ item.unit }}</span>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="monitor-equip">
+					<div
+						:class="equipActive == index ? 'active-class' : ''"
+						class="monitor-state"
+						v-for="(item, index) in equipList"
+						:key="index"
+						@click="getEquipInfo(item)"
+					>
+						<div>
+							<img :src="item.installImage" alt="" />
+							<span :style="{ backgroundColor: item.online == 1 ? '#008bff' : '#C3C3C3' }">{{
+								item.online == 1 ? "在线" : "离线"
+							}}</span>
+						</div>
+						<span>{{ item.devName }}</span>
+					</div>
+				</div>
+			</div>
+			<div class="no-data" v-else>
+				<img src="@/assets/images/notData.png" alt="notData" />
+				<div>暂无数据</div>
+			</div>
+			<div class="history-data">
+				<LeftMenuPlus
+					v-model="active"
+					:tabs="['历史报警', '历史监测信息']"
+					:pageable="pages"
+					class="LeftMenu"
+					@change-page="onCurChange"
+				>
+					<template #default>
+						<div class="search-wrapper">
+							<el-date-picker
+								style="margin-right: 5px"
+								v-model="searchForm.timeRange"
+								type="daterange"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								range-separator="至"
+								start-placeholder="开始日期"
+								end-placeholder="结束日期"
+							/>
+							<el-button class="search-btn" type="primary" @click="search">查询</el-button>
+						</div>
+						<div class="alarm-list" v-if="active == 0">
+							<div class="alarm-list-item" v-for="(item, index) in alarmList" :key="index">
+								<div>
+									<span>设备名称: </span>
+									<span>{{ item.devName }}</span>
+								</div>
+								<div>
+									<span>设备编号: </span>
+									<span style="color: #0f64da">{{ item.devNumber }}</span>
+								</div>
+								<div>
+									<span>报警项目: </span>
+									<span>{{ alarmTransform(item) }}</span>
+								</div>
+								<div>
+									<span>报警时间: </span>
+									<span>{{ item.createTime }}</span>
+								</div>
+							</div>
+						</div>
+						<div class="info-list" v-if="active == 1">
+							<div class="info-list-item" v-for="(item, index) in monitorList" :key="index">
+								<div>{{ item.devName }}</div>
+								<div class="info-list-item-aspect">
+									<div class="info-list-item-aspect-item">
+										<span>角度</span>
+										<span>{{ item.angle ? item.angle : 0 }}°</span>
+									</div>
+									<div class="info-list-item-aspect-item">
+										<span>倾角</span>
+										<span>{{ item.obliquity ? item.obliquity : 0 }}°</span>
+									</div>
+								</div>
+								<div class="info-list-item-aspect">
+									<div class="info-list-item-aspect-item">
+										<span>高度</span>
+										<span>{{ item.height ? item.height : 0 }}m</span>
+									</div>
+									<div class="info-list-item-aspect-item">
+										<span>倾角X</span>
+										<span>{{ item.obliquityX ? item.obliquityX : 0 }}°</span>
+									</div>
+								</div>
+								<div class="info-list-item-aspect">
+									<div class="info-list-item-aspect-item">
+										<span>载重比</span>
+										<span>{{ item.loadRatio ? item.loadRatio : 0 }}%</span>
+									</div>
+									<div class="info-list-item-aspect-item">
+										<span>倾角Y</span>
+										<span>{{ item.obliquityY ? item.obliquityY : 0 }}°</span>
+									</div>
+								</div>
+								<div class="info-list-item-aspect">
+									<div class="info-list-item-aspect-item">
+										<span>载重</span>
+										<span>{{ item.loading ? item.loading : 0 }}kg</span>
+									</div>
+									<div class="info-list-item-aspect-item">
+										<span>幅度</span>
+										<span>{{ item.ranger ? item.ranger : 0 }}m</span>
+									</div>
+								</div>
+								<div>监测时间: {{ item.createTime ? item.createTime : "" }}</div>
+							</div>
+						</div>
+					</template>
+				</LeftMenuPlus>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, onMounted, watch } from "vue";
+import { ElMessage } from "element-plus";
+import { getRelevanceList } from "@/api/modules/common";
+import LeftMenuPlus from "@/components/LeftMenuPlus/LeftMenu.vue";
+import layoutTop from "@/components/layoutTop/index.vue";
+import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
+import {
+	getRealTimepPojectPage,
+	getRealTimeEngineeringPage,
+	towerCraneAlarmPage,
+	towerCraneDataPage,
+	towerCraneEquipAll,
+	operationData
+} from "@/api/modules/goverment";
+const monitorList = ref([]);
+const alarmList = ref([]);
+const equipList = ref([]);
+const equipInfo = ref({});
+const records = ref([]);
+const alarmActive = ref(0);
+const leftMenuSearchForm = ref({
+	name: ""
+});
+const searchForm = ref({
+	timeRange: []
+});
+const active = ref(0);
+const alarmPages = ref({
+	pageNo: 1,
+	pageSize: 6,
+	total: 0
+});
+const pages = ref({
+	pageNo: 1,
+	pageSize: 6,
+	total: 0
+});
+const aspectList = ref([
+	{
+		name: "力矩",
+		value: 10,
+		unit: "N·M",
+		img: new URL("@/assets/images/onlineSupervision/力矩.png", import.meta.url).href,
+		prop: "torque"
+	},
+	{
+		name: "载重",
+		value: 10,
+		unit: "T",
+		img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
+		prop: "loading"
+	},
+	{
+		name: "风速",
+		value: 10,
+		unit: "m/s",
+		img: new URL("@/assets/images/onlineSupervision/风速.png", import.meta.url).href,
+		prop: "windSpeed"
+	},
+	{
+		name: "高度",
+		value: 10,
+		unit: "m",
+		img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
+		prop: "height"
+	},
+	{
+		name: "回转角度",
+		value: 10,
+		unit: "°",
+		img: new URL("@/assets/images/onlineSupervision/回转角度.png", import.meta.url).href,
+		prop: "angle"
+	},
+	{
+		name: "塔身倾角",
+		value: 10,
+		unit: "°",
+		img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
+		prop: "obliquity"
+	},
+	{
+		name: "幅度",
+		value: 10,
+		unit: "m",
+		img: new URL("@/assets/images/onlineSupervision/幅度.png", import.meta.url).href,
+		prop: "ranger"
+	}
+]);
+const searchSn = ref("");
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+// 报警项目转换
+const alarmTransform = (obj: any) => {
+	let str = "";
+	if (obj["environmentAlarm"] == 1) str += "环境防碰撞报警,";
+	if (obj["forceAlarm"] == 1) str += "力矩报警,";
+	if (obj["heightLowerAlarm"] == 1) str += "高度下限位报警,";
+	if (obj["heightUpperAlarm"] == 1) str += "高度上限位报警,";
+	if (obj["maxRangeAlarm"] == 1) str += "幅度外限位报警,";
+	if (obj["minRangeAlarm"] == 1) str += "幅度内限位报警,";
+	if (obj["multiAntiCollisionAlarm"] == 1) str += "多机防撞报警,";
+	if (obj["negAngleAlarm"] == 1) str += "逆时针回转限位报警,";
+	if (obj["obliquityAlarm"] == 1) str += "倾角报警,";
+	if (obj["posAngleAlarm"] == 1) str += "顺时针回转限位报警,";
+	if (obj["standardHighAlarm"] == 1) str += "塔机间竖向高度报警,";
+	if (obj["windSpeedAlarm"] == 1) str += "风速报警";
+	return str;
+};
+// 获取设备列表
+const getEquipList = async () => {
+	let requestData = {} as any;
+	if (alarmActive.value == 0) {
+		requestData.projectSn = searchSn.value;
+	} else {
+		requestData.engineeringSn = searchSn.value;
+	}
+	const res = await towerCraneEquipAll(requestData);
+	console.log(res);
+	if (res && res.result && res.result.length > 0) {
+		equipList.value = res.result;
+		getEquipInfo(res.result[0]);
+	} else {
+		equipInfo.value = {};
+		equipList.value = [];
+	}
+};
+// 获取设备信息
+const getEquipInfo = async (obj: any) => {
+	let requestData = {
+		id: obj.id
+	};
+	const res = await operationData(requestData);
+	console.log(res);
+	if (res && res.result) {
+		equipInfo.value = { ...obj, ...res.result };
+	} else {
+		equipInfo.value = { ...obj };
+	}
+};
+// 获取历史检测信息
+const getMonitorList = async () => {
+	let requestData = {
+		pageNo: pages.value.pageNo,
+		pageSize: pages.value.pageSize
+	} as any;
+	if (alarmActive.value == 0) {
+		requestData.projectSn = searchSn.value;
+	} else {
+		requestData.engineeringSn = searchSn.value;
+	}
+	if (searchForm.value.timeRange && searchForm.value.timeRange.length > 0) {
+		requestData.createTime_begin = searchForm.value.timeRange[0];
+		requestData.createTime_end = searchForm.value.timeRange[1];
+	}
+	const res = await towerCraneDataPage(requestData);
+	console.log(res);
+	if (res && res.result && res.result.records.length > 0) {
+		monitorList.value = res.result.records;
+		pages.value.total = +res.result.total;
+	} else {
+		monitorList.value = [];
+		pages.value.total = 0;
+	}
+};
+// 获取历史报警列表
+const getAlarmList = async () => {
+	let requestData = {
+		pageNo: pages.value.pageNo,
+		pageSize: pages.value.pageSize
+	} as any;
+	if (alarmActive.value == 0) {
+		requestData.projectSn = searchSn.value;
+	} else {
+		requestData.engineeringSn = searchSn.value;
+	}
+	if (searchForm.value.timeRange && searchForm.value.timeRange.length > 0) {
+		requestData.createTime_begin = searchForm.value.timeRange[0];
+		requestData.createTime_end = searchForm.value.timeRange[1];
+	}
+	const res = await towerCraneAlarmPage(requestData);
+	console.log(res);
+	if (res && res.result && res.result.records.length > 0) {
+		alarmList.value = res.result.records;
+		pages.value.total = +res.result.total;
+	} else {
+		alarmList.value = [];
+		pages.value.total = 0;
+	}
+};
+function parse(val) {
+	return val.trim() ? JSON.parse(val) : {};
+}
+// 页面的项目名称和工程名称的div点击事件
+const onSearch = async (params: any) => {
+	console.log(params);
+	active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
+	getEquipList();
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+};
+// leftMenu页面的搜索按钮
+const onSearchInput = async (params: string) => {
+	leftMenuSearchForm.value.name = params;
+	if (active.value === 0) {
+		getProPage();
+	} else {
+		getEngPage();
+	}
+};
+// leftMenu页面的分页
+const onCurChange = async (params: number) => {
+	alarmPages.value.pageSize = params;
+	if (active.value === 0) {
+		getProPage();
+	} else {
+		getEngPage();
+	}
+};
+// 右侧报警数据搜索
+const search = () => {
+	console.log(666);
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+};
+
+// 获取项目名称分页
+const getProPage = async () => {
+	let requestData = {
+		...pages.value,
+		projectName: leftMenuSearchForm.value.name
+	};
+	const { result } = await getRealTimepPojectPage(requestData);
+	records.value = result.records;
+	pages.value.total = Number(result.total);
+};
+// 获取工程名称分页
+const getEngPage = async () => {
+	let requestData = {
+		...pages.value,
+		engineeringName: leftMenuSearchForm.value.name
+	};
+	const { result } = await getRealTimeEngineeringPage(requestData);
+	records.value = result.records;
+	pages.value.total = +result.total;
+};
+watch(
+	() => active.value,
+	n => {
+		searchForm.value.timeRange = [];
+		if (n === 0) {
+			getAlarmList();
+		} else {
+			getMonitorList();
+		}
+	}
+);
+watch(
+	() => alarmActive.value,
+	async (value: number) => {
+		pages.value.pageNo = 1;
+		pages.value.total = 0;
+		leftMenuSearchForm.value.name = "";
+		if (value === 0) {
+			await getProPage();
+			onSearch(records.value[0]);
+		} else {
+			await getEngPage();
+			onSearch(records.value[0]);
+		}
+	},
+	{
+		deep: true
+	}
+);
+onMounted(async () => {
+	await getProPage();
+	onSearch(records.value[0]);
+	searchSn.value = (records.value as any)[0].projectSn;
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/project/liftSupervision/equipManagement/index.scss b/src/views/project/liftSupervision/equipManagement/index.scss
new file mode 100644
index 0000000..5030cce
--- /dev/null
+++ b/src/views/project/liftSupervision/equipManagement/index.scss
@@ -0,0 +1,35 @@
+.date-select {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.basic-form {
+	.face-img {
+		width: 100%;
+		align-self: flex-start;
+		:deep(.face-uploader .el-upload) {
+			border: 1px dashed #d9d9d9 !important;
+			border-radius: 6px !important;
+			cursor: pointer !important;
+			position: relative !important;
+			overflow: hidden !important;
+		}
+		.face-uploader .el-upload:hover {
+			border-color: #409eff !important;
+		}
+		:deep(.el-icon) {
+			font-size: 28px;
+			color: #8c939d;
+			width: 53px;
+			height: 53px;
+			line-height: 53px;
+			text-align: center;
+		}
+		.face-avatar {
+			width: 53px;
+			height: 53px;
+			display: block;
+		}
+	}
+}
diff --git a/src/views/project/liftSupervision/equipManagement/index.vue b/src/views/project/liftSupervision/equipManagement/index.vue
new file mode 100644
index 0000000..86eca01
--- /dev/null
+++ b/src/views/project/liftSupervision/equipManagement/index.vue
@@ -0,0 +1,827 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="设备管理"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #formButton="scope">
+				<el-button class="addButtonStyle" @click="handleAddItem">新增</el-button>
+			</template>
+			<template #operation="{ row }">
+				<el-button type="primary" link @click="handleLookItem(row)">
+					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
+					<span>查看</span>
+				</el-button>
+				<el-button type="primary" link @click="handleEditItem(row)">
+					<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
+					<span>编辑</span>
+				</el-button>
+				<el-button type="danger" link :icon="Delete" @click="handleDeleteItem(row)">删除</el-button>
+			</template>
+			<template #state="{ row }">
+				<span :class="row.state === 1 ? '' : 'redText'">{{ row.state == 1 ? "启用" : "禁用" }}</span>
+			</template>
+		</ProTable>
+		<el-dialog :title="title" show-close v-model="newUnitDialog" style="min-width: 1200px">
+			<el-form ref="formRef" :model="formData" label-width="180px" :rules="rules" class="basic-form" size="default">
+				<!-- <el-form ref="formDataRef" :model="formData" label-width="150px" class="basic-form"> -->
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备名称:" prop="devName">
+							<el-input v-model="formData.devName" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="安装日期:" prop="installTime">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.installTime"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="黑匣子信息:" prop="blackBox">
+							<el-input v-model="formData.blackBox" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="结构类型:" prop="structureType">
+							<el-select
+								v-model="formData.structureType"
+								:disabled="title == '查看设备'"
+								placeholder="请选择"
+								style="width: 100%"
+							>
+								<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备使用状态:" prop="useState">
+							<el-select v-model="formData.useState" :disabled="title == '查看设备'" placeholder="请选择" style="width: 100%">
+								<el-option v-for="item in stateList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="设备图片:" prop="installImage">
+							<div class="face-img">
+								<el-upload
+									class="face-uploader"
+									:action="`${baseUrl}` + '/xmgl/file/upload'"
+									:show-file-list="false"
+									:on-success="(response, uploadFile) => handleAvatarSuccess(response, uploadFile)"
+									accept="image/jpg, image/jpeg, image/png"
+								>
+									<img v-if="formData.installImage" :src="formData.installImage" class="face-avatar" />
+									<el-icon v-else><plus /></el-icon>
+								</el-upload>
+							</div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="是否外地设备:" prop="isForeignDev">
+							<el-radio-group placeholder="请选择" v-model="formData.isForeignDev">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否全新设备:" prop="isNewDev">
+							<el-radio-group placeholder="请选择" v-model="formData.isNewDev">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="规格型号:" prop="model">
+							<el-input v-model="formData.model" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="许可证发证机关:" prop="licensingAuthority">
+							<el-input v-model="formData.licensingAuthority" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="出厂(合格证):" prop="factoryCertificate">
+							<el-input v-model="formData.factoryCertificate" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="工作幅度(m):" prop="workingRange">
+							<el-input v-model.number="formData.workingRange" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="最大额定起重量(kg):" prop="maxLiftingCapacity">
+							<el-input v-model.number="formData.maxLiftingCapacity" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="独立起升高度(m):" prop="independentLiftingHeight">
+							<el-input v-model.number="formData.independentLiftingHeight" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="购置日期:" prop="acquisitionDate">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.acquisitionDate"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="编号有效期:" prop="numberValidityPeriod">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.numberValidityPeriod"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备原值:" prop="originalValue">
+							<el-input v-model.number="formData.originalValue" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="设备改造次数:" prop="renovations">
+							<el-input v-model.number="formData.renovations" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="发票编码:" prop="invoiceCode">
+							<el-input v-model="formData.invoiceCode" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="购买合同编码:" prop="contractCode">
+							<el-input v-model="formData.contractCode" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="生产厂家:" prop="manufacturer">
+							<el-input v-model="formData.manufacturer" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="出厂日期:" prop="productionDate">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.productionDate"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="制造许可证编号:" prop="manufacturerLicense">
+							<el-input v-model="formData.manufacturerLicense" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否为原购产品:" prop="isOriginalProduct">
+							<el-radio-group placeholder="请选择" v-model="formData.isOriginalProduct">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备用途:" prop="useTo">
+							<el-input v-model="formData.useTo" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="前臂长:" prop="forearmLength">
+							<el-input v-model.number="formData.forearmLength" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="后臂长:" prop="posteriorArmLength">
+							<el-input v-model.number="formData.posteriorArmLength" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="塔身高度:" prop="towerHeight">
+							<el-input v-model.number="formData.towerHeight" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="前臂永久性标识:" prop="forearmFlag">
+							<el-input v-model="formData.forearmFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="后臂永久性标识:" prop="rearArmFlag">
+							<el-input v-model="formData.rearArmFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="塔帽永久性标识:" prop="towerCapFlag">
+							<el-input v-model="formData.towerCapFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="上转台永久性标识:" prop="upwardTurntableFlag">
+							<el-input v-model="formData.upwardTurntableFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="下转台永久性标识:" prop="lowerTurntableFlag">
+							<el-input v-model="formData.lowerTurntableFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="标准节点永久性标识:" prop="mastSectionFlag">
+							<el-input v-model="formData.mastSectionFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<footer class="footer flx-center" v-if="title != '查看设备'">
+					<el-button class="cancelButtonStyle" @click="newUnitDialog = false">取消</el-button>
+					<el-button type="primary" @click="submitForm(formData)">保存</el-button>
+				</footer>
+			</el-form>
+		</el-dialog>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{
+					activeValue == "eng" ? data.engineeringName : data.projectName
+				}}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, nextTick, onMounted } from "vue";
+import { ElMessage, ElMessageBox, ElTree, FormInstance } from "element-plus";
+import type { UploadProps } from "element-plus";
+import { useRouter } from "vue-router";
+import { ColumnProps } from "@/components/ProTable/interface";
+import { useHandleData } from "@/hooks/useHandleData";
+import ProTable from "@/components/ProTable/index.vue";
+import { jxj_User } from "@/api/types";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import {
+	towerCraneEquipAdd,
+	towerCraneEquipEdit,
+	towerCraneEquipDel,
+	towerCraneEquipPage,
+	getEngineeringName
+} from "@/api/modules/project";
+import { GlobalStore } from "@/stores";
+import { Delete } from "@element-plus/icons-vue";
+const baseUrl = import.meta.env.VITE_API_URL;
+const typeList = ref([
+	{ label: "尖头塔", value: 1 },
+	{ label: "平头塔", value: 2 },
+	{ label: "动臂塔", value: 3 }
+]);
+const stateList = ref([
+	{ label: "设备进场", value: 1 },
+	{ label: "设备安装", value: 2 },
+	{ label: "设备验收", value: 3 },
+	{ label: "设备使用", value: 4 },
+	{ label: "设备拆除", value: 5 },
+	{ label: "设备退场", value: 6 }
+]);
+const activeValue = ref("eng");
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+const changeType = ref(1);
+const datas = reactive([]);
+const formRef = ref<FormInstance>();
+const router = useRouter();
+const store = GlobalStore();
+const drawerVisible = ref(false);
+const title = ref("");
+const newUnitDialog = ref(false);
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	engineeringSn: ""
+});
+const formData = ref({
+	devName: "",
+	installTime: "",
+	blackBox: "",
+	structureType: "",
+	useState: "",
+	installImage: "",
+	isForeignDev: 0,
+	isNewDev: 0,
+	model: "",
+	licensingAuthority: "",
+	factoryCertificate: "",
+	workingRange: "",
+	maxLiftingCapacity: "",
+	independentLiftingHeight: "",
+	acquisitionDate: "",
+	numberValidityPeriod: "",
+	originalValue: "",
+	renovations: "",
+	invoiceCode: "",
+	contractCode: "",
+	manufacturer: "",
+	productionDate: "",
+	manufacturerLicense: "",
+	isOriginalProduct: 0,
+	useTo: "",
+	forearmLength: "",
+	posteriorArmLength: "",
+	towerHeight: "",
+	forearmFlag: "",
+	rearArmFlag: "",
+	towerCapFlag: "",
+	upwardTurntableFlag: "",
+	lowerTurntableFlag: "",
+	mastSectionFlag: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+const getId = ref<number | undefined>(undefined);
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 80 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		search: { el: "input" }
+	},
+	{
+		prop: "installTime",
+		label: "安装时间",
+		search: {
+			el: "date-picker",
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{ prop: "blackBox", label: "黑匣子信息" },
+	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
+];
+
+const rules = ref({
+	devName: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	installTime: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	blackBox: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	structureType: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	installImage: [
+		{
+			required: true,
+			message: "请上传",
+			trigger: "change"
+		}
+	],
+	isForeignDev: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	isNewDev: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	model: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	factoryCertificate: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	workingRange: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	maxLiftingCapacity: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	independentLiftingHeight: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	acquisitionDate: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	numberValidityPeriod: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	originalValue: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	renovations: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	invoiceCode: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	manufacturer: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	productionDate: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+
+	manufacturerLicense: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	isOriginalProduct: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	useTo: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	forearmLength: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	posteriorArmLength: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	towerHeight: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	forearmFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	rearArmFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	towerCapFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	upwardTurntableFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	lowerTurntableFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	mastSectionFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	]
+});
+
+// 图片上传成功后的钩子
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+	console.log(response.result.url);
+	console.log(response, uploadFile);
+	formData.value.installImage = response.result.url;
+	formRef.value?.validateField("image");
+};
+// 删除设备
+const handleDeleteItem = async (params: jxj_User.ResUserList) => {
+	await useHandleData(towerCraneEquipDel, { id: params.id }, `删除【${params.devName}】`);
+	proTable.value.getTableList();
+};
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+const transfrom = (arr: Array<any>) => {
+	const result: any[] | ConcatArray<{ authorityId: any; roleId: number | undefined; type: any }> = [];
+	return arr
+		.map(item => {
+			if (arr.children && Array.isArray(arr.children)) {
+				result.concat(transfrom(arr.children));
+			}
+
+			return {
+				authorityId: item.name,
+				roleId: getId.value,
+				type: item.type
+			};
+		})
+		.concat(result);
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.installTime) {
+		newParams.installTime_begin = newParams.installTime[0];
+		newParams.installTime_end = newParams.installTime[1];
+		delete newParams.installTime;
+	}
+	if (searchSn.value) {
+		if (activeValue.value == "eng") {
+			newParams.engineeringSn = searchSn.value;
+		} else if (activeValue.value == "project") {
+			newParams.projectSn = searchSn.value;
+		}
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneEquipPage(newParams);
+};
+// 新增
+const handleAddItem = () => {
+	formRef.value?.resetFields();
+	title.value = "新增设备";
+	newUnitDialog.value = true;
+};
+// 查看
+const handleLookItem = (row: any) => {
+	formRef.value?.resetFields();
+	title.value = "查看设备";
+	console.log(row);
+	formData.value = reactive({ ...row });
+	changeType.value = formData.value.businessLicenseLifespan ? 1 : 2;
+	newUnitDialog.value = true;
+};
+// 编辑
+const handleEditItem = (row: any) => {
+	formRef.value?.clearValidate();
+	title.value = "编辑设备";
+	console.log(row);
+	formData.value = reactive({ ...row });
+	changeType.value = formData.value.businessLicenseLifespan ? 1 : 2;
+	newUnitDialog.value = true;
+};
+// TODO: 提交表单操作
+const submitForm = async (data: any) => {
+	const formEl = formRef.value;
+	if (!formEl) return;
+	await formEl.validate((valid, fields) => {
+		if (valid) {
+			if (changeType.value == 2) {
+				delete data.businessLicenseLifespan;
+			}
+			if (activeValue.value == "eng") {
+				data.engineeringSn = searchSn.value;
+			} else if (activeValue.value == "project") {
+				data.projectSn = searchSn.value;
+			}
+			saveItem(data);
+		} else {
+			console.log("error submit!", fields);
+		}
+	});
+};
+const saveItem = async (form: any) => {
+	if (form.id) {
+		// console.log(form.dictCode);
+		const res = await towerCraneEquipEdit(form);
+		proTable.value.getTableList();
+		ElMessage.success("编辑成功");
+		newUnitDialog.value = false;
+	} else {
+		const res = await towerCraneEquipAdd(form);
+		proTable.value.getTableList();
+		ElMessage.success("新增成功");
+		newUnitDialog.value = false;
+	}
+};
+
+// 抽屉tab选择时
+const tabsSelect = val => {
+	activeValue.value = val;
+	if (val == "eng") {
+		getengineering();
+	} else if (val == "project") {
+		getProject();
+	}
+};
+// 获取项目信息
+const getProject = async () => {
+	const res = await getEngineeringName();
+	engList.value = [res.result];
+	if (res.result) {
+		searchSn.value = res.result.projectSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	if (activeValue.value == "eng") {
+		searchSn.value = row.engineeringSn;
+	} else if (activeValue.value == "project") {
+		searchSn.value = row.projectSn;
+	}
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/project/liftSupervision/historyData/alarmData/index.scss b/src/views/project/liftSupervision/historyData/alarmData/index.scss
new file mode 100644
index 0000000..669485c
--- /dev/null
+++ b/src/views/project/liftSupervision/historyData/alarmData/index.scss
@@ -0,0 +1,11 @@
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.table-data {
+	@include flex;
+	> span {
+		display: inline-block;
+		width: 50%;
+	}
+}
diff --git a/src/views/project/liftSupervision/historyData/alarmData/index.vue b/src/views/project/liftSupervision/historyData/alarmData/index.vue
new file mode 100644
index 0000000..3f9fc5e
--- /dev/null
+++ b/src/views/project/liftSupervision/historyData/alarmData/index.vue
@@ -0,0 +1,264 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="报警数据"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #equipInfo="{ row }">
+				<span>设备名称: {{ row.devName }}</span>
+				<br />
+				<span>设备编号: {{ row.devNumber }}</span>
+				<br />
+				<span>司机姓名: {{ row.driverName }}</span>
+				<br />
+				<span>司机身份证号: {{ row.driverIdCard }}</span>
+				<br />
+				<span>特种作业号: {{ row.certification }}</span>
+			</template>
+			<template #alarmInfo="{ row }">
+				<div class="table-data">
+					<span
+						>环境防撞报警:
+						<span :style="{ color: row.environmentAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.environmentAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>高度上限位报警:
+						<span :style="{ color: row.heightUpperAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightUpperAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度下限位报警:
+						<span :style="{ color: row.heightLowerAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightLowerAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>幅度外限位报警:
+						<span :style="{ color: row.maxRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.maxRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度内限位报警:
+						<span :style="{ color: row.minRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.minRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>力矩报警:
+						<span :style="{ color: row.forceAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forceAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>多机防撞报警:
+						<span :style="{ color: row.multiAntiCollisionAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>逆时针回转限位报警:
+						<span :style="{ color: row.negAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.negAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>倾角报警:
+						<span :style="{ color: row.obliquityAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>塔机竖向高度报警:
+						<span :style="{ color: row.standardHighAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.standardHighAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>升降机报警时间: {{ row.createTime }}</span>
+				</div>
+			</template>
+		</ProTable>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{
+					activeValue == "eng" ? data.engineeringName : data.projectName
+				}}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, onMounted } from "vue";
+import { ElMessage } from "element-plus";
+import { ColumnProps } from "@/components/ProTable/interface";
+import ProTable from "@/components/ProTable/index.vue";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { addBuildUnit, getBuildUnitList, getEngineeringName, towerCraneAlarmPage } from "@/api/modules/project";
+
+const activeValue = ref("eng");
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	solveFlag: 1,
+	engineeringSn: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+const getId = ref<number | undefined>(undefined);
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 200 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		isShow: false,
+		search: { el: "input" }
+	},
+	{
+		prop: "type",
+		label: "报警类型",
+		isShow: false,
+		search: { el: "select" },
+		enum: [
+			{ label: "报警", value: 1 },
+			{ label: "预警", value: 2 }
+		]
+	},
+	{
+		prop: "createTime",
+		label: "报警时间",
+		isShow: false,
+		search: {
+			el: "date-picker",
+
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{
+		prop: "equipInfo",
+		label: "设备信息",
+		align: "left"
+	},
+	// 多级 prop
+	{ prop: "alarmInfo", label: "报警信息", align: "left", width: 800 }
+];
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.createTime) {
+		newParams.createTime_begin = newParams.createTime[0];
+		newParams.createTime_end = newParams.createTime[1];
+		delete newParams.createTime;
+	}
+	if (searchSn.value) {
+		if (activeValue.value == "eng") {
+			newParams.engineeringSn = searchSn.value;
+		} else if (activeValue.value == "project") {
+			newParams.projectSn = searchSn.value;
+		}
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneAlarmPage(newParams);
+};
+
+// 抽屉tab选择时
+const tabsSelect = val => {
+	activeValue.value = val;
+	if (val == "eng") {
+		getengineering();
+	} else if (val == "project") {
+		getProject();
+	}
+};
+// 获取项目信息
+const getProject = async () => {
+	const res = await getEngineeringName();
+	engList.value = [res.result];
+	if (res.result) {
+		searchSn.value = res.result.projectSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	if (activeValue.value == "eng") {
+		searchSn.value = row.engineeringSn;
+	} else if (activeValue.value == "project") {
+		searchSn.value = row.projectSn;
+	}
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/project/liftSupervision/historyData/realTimeData/index.scss b/src/views/project/liftSupervision/historyData/realTimeData/index.scss
new file mode 100644
index 0000000..669485c
--- /dev/null
+++ b/src/views/project/liftSupervision/historyData/realTimeData/index.scss
@@ -0,0 +1,11 @@
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.table-data {
+	@include flex;
+	> span {
+		display: inline-block;
+		width: 50%;
+	}
+}
diff --git a/src/views/project/liftSupervision/historyData/realTimeData/index.vue b/src/views/project/liftSupervision/historyData/realTimeData/index.vue
new file mode 100644
index 0000000..5d5555e
--- /dev/null
+++ b/src/views/project/liftSupervision/historyData/realTimeData/index.vue
@@ -0,0 +1,522 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="报警数据"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #equipInfo="{ row }">
+				<span>设备名称: {{ row.devName }}</span>
+				<br />
+				<span>设备编号: {{ row.devNumber }}</span>
+				<br />
+				<span>司机姓名: {{ row.driverName }}</span>
+				<br />
+				<span>司机身份证号: {{ row.driverIdCard }}</span>
+				<br />
+				<span>角度: {{ row.angle ? row.angle : 0 }}°</span>
+				<br />
+				<span>高度: {{ row.height ? row.height : 0 }}m</span>
+				<br />
+				<span>载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span>
+				<br />
+				<span>载重: {{ row.loading ? row.loading : 0 }}kg</span>
+				<br />
+				<span>倾角: {{ row.obliquity ? row.obliquity : 0 }}°</span>
+				<br />
+				<span>倾角X: {{ row.obliquityX ? row.obliquityX : 0 }}°</span>
+				<br />
+				<span>倾角Y: {{ row.obliquityY ? row.obliquityY : 0 }}°</span>
+				<br />
+				<span>幅度: {{ row.ranger ? row.ranger : 0 }}m</span>
+				<br />
+				<span>倍率: {{ row.multiple ? row.multiple : 0 }}</span>
+				<br />
+				<span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
+				<br />
+				<span>力矩: {{ row.torque ? row.torque : 0 }}kg.m</span>
+				<br />
+				<span>力矩比: {{ row.torqueRatio ? row.torqueRatio : 0 }}%</span>
+				<br />
+				<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span>
+				<br />
+				<span
+					>回转状态:
+					{{
+						row.rotationState == 0 ? "停止回转" : row.rotationState == 1 ? "向右回转" : row.rotationState == 2 ? "向左回转" : ""
+					}}</span
+				>
+				<br />
+				<span
+					>起升状态:
+					{{
+						row.liftingState == 0 ? "停止升降" : row.liftingState == 1 ? "向下落勾" : row.liftingState == 2 ? "向上起勾" : ""
+					}}</span
+				>
+				<br />
+				<span
+					>变幅状态:
+					{{
+						row.rangerState == 0 ? "停止变幅" : row.rangerState == 1 ? "向外变幅" : row.rangerState == 2 ? "向内变幅" : ""
+					}}</span
+				>
+			</template>
+			<template #alarmInfo="{ row }">
+				<div class="table-data">
+					<span
+						>禁入区报警:
+						<span :style="{ color: row.forbidEntryAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forbidEntryAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>禁入区左转报警:
+						<span :style="{ color: row.forbidEntryLeftAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forbidEntryLeftAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>禁入区右转报警:
+						<span :style="{ color: row.forbidEntryRightAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forbidEntryRightAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>A类禁吊区域报警:
+						<span :style="{ color: row.forbidSuspendAlarmA == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendAlarmA == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>A类禁吊区左转报警:
+						<span :style="{ color: row.forbidSuspendLeftAlarmA == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendLeftAlarmA == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>A类禁吊区右转报警:
+						<span :style="{ color: row.forbidSuspendRightAlarmA == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendRightAlarmA == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>A类禁吊区向外变幅报警:
+						<span :style="{ color: row.forbidSuspendOutAlarmA == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendOutAlarmA == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>B类禁吊区域报警:
+						<span :style="{ color: row.forbidSuspendAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>B类禁吊区左转报警:
+						<span :style="{ color: row.forbidSuspendLeftAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendLeftAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>B类禁吊区右转报警:
+						<span :style="{ color: row.forbidSuspendRightAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendRightAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>B类禁吊区向外变幅报警:
+						<span :style="{ color: row.forbidSuspendOutAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendOutAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>B类禁吊区向内变幅报警:
+						<span :style="{ color: row.forbidSuspendBackAlarmB == 0 ? '#333' : '#E70000' }">{{
+							row.forbidSuspendBackAlarmB == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度上限位报警:
+						<span :style="{ color: row.heightUpperAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightUpperAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>高度下限位报警:
+						<span :style="{ color: row.heightLowerAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightLowerAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度外限位报警:
+						<span :style="{ color: row.maxRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.maxRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>幅度内限位报警:
+						<span :style="{ color: row.minRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.minRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>力矩报警:
+						<span :style="{ color: row.forceAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forceAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>多机防撞报警:
+						<span :style="{ color: row.multiAntiCollisionAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>多机防撞向内变幅报警:
+						<span :style="{ color: row.multiAntiCollisionBackAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionBackAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>多机防撞左转报警:
+						<span :style="{ color: row.multiAntiCollisionLeftAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionLeftAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>多机防撞向外变幅报警:
+						<span :style="{ color: row.multiAntiCollisionOutAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionOutAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>多机防撞右转报警:
+						<span :style="{ color: row.multiAntiCollisionRightAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionRightAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>逆时针回转限位报警:
+						<span :style="{ color: row.negAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.negAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>倾角报警:
+						<span :style="{ color: row.obliquityAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>倾角X报警:
+						<span :style="{ color: row.obliquityXAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityXAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>倾角Y报警:
+						<span :style="{ color: row.obliquityYAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityYAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>顺时针回转限位报警:
+						<span :style="{ color: row.posAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.posAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+					<span
+						>风速报警:
+						<span :style="{ color: row.windSpeedAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.windSpeedAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+			</template>
+			<template #faultInfo="{ row }">
+				<div class="table-data">
+					<span
+						>角度传感器故障:
+						<span :style="{ color: row.angleError == 0 ? '#333' : '#E70000' }">{{
+							row.angleError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>GPS故障:
+						<span :style="{ color: row.gpsError == 0 ? '#333' : '#E70000' }">{{
+							row.gpsError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度传感器故障:
+						<span :style="{ color: row.heightError == 0 ? '#333' : '#E70000' }">{{
+							row.heightError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>身份识别模块故障:
+						<span :style="{ color: row.identificationError == 0 ? '#333' : '#E70000' }">{{
+							row.identificationError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>有无任何外设故障:
+						<span :style="{ color: row.peripheralError == 0 ? '#333' : '#E70000' }">{{
+							row.peripheralError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>倾角传感器故障:
+						<span :style="{ color: row.obliquityError == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度传感器故障:
+						<span :style="{ color: row.rangeError == 0 ? '#333' : '#E70000' }">{{
+							row.rangeError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>载重传感器故障:
+						<span :style="{ color: row.weightError == 0 ? '#333' : '#E70000' }">{{
+							row.weightError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>风速传感器故障:
+						<span :style="{ color: row.windSpeedError == 0 ? '#333' : '#E70000' }">{{
+							row.windSpeedError == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+			</template>
+		</ProTable>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{
+					activeValue == "eng" ? data.engineeringName : data.projectName
+				}}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, onMounted } from "vue";
+import { ElMessage } from "element-plus";
+import { ColumnProps } from "@/components/ProTable/interface";
+import ProTable from "@/components/ProTable/index.vue";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { getEngineeringName, towerCraneDataPage } from "@/api/modules/project";
+
+const activeValue = ref("eng");
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	solveFlag: 1,
+	engineeringSn: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 200 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		isShow: false,
+		search: { el: "input" }
+	},
+	{
+		prop: "type",
+		label: "报警类型",
+		isShow: false,
+		search: { el: "select" },
+		enum: [
+			{ label: "报警", value: 1 },
+			{ label: "预警", value: 2 }
+		]
+	},
+	{
+		prop: "createTime",
+		label: "数据接受时间",
+		isShow: false,
+		search: {
+			el: "date-picker",
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{
+		prop: "equipInfo",
+		label: "设备信息",
+		align: "left",
+		width: 400
+	},
+	// 多级 prop
+	{ prop: "alarmInfo", label: "报警信息", align: "left", width: 800 },
+	{ prop: "faultInfo", label: "故障信息", align: "left" }
+];
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.createTime) {
+		newParams.createTime_begin = newParams.createTime[0];
+		newParams.createTime_end = newParams.createTime[1];
+		delete newParams.createTime;
+	}
+	if (searchSn.value) {
+		if (activeValue.value == "eng") {
+			newParams.engineeringSn = searchSn.value;
+		} else if (activeValue.value == "project") {
+			newParams.projectSn = searchSn.value;
+		}
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneDataPage(newParams);
+};
+
+// 抽屉tab选择时
+const tabsSelect = val => {
+	activeValue.value = val;
+	if (val == "eng") {
+		getengineering();
+	} else if (val == "project") {
+		getProject();
+	}
+};
+// 获取项目信息
+const getProject = async () => {
+	const res = await getEngineeringName();
+	engList.value = [res.result];
+	if (res.result) {
+		searchSn.value = res.result.projectSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	if (activeValue.value == "eng") {
+		searchSn.value = row.engineeringSn;
+	} else if (activeValue.value == "project") {
+		searchSn.value = row.projectSn;
+	}
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/project/liftSupervision/historyData/workCycleData/index.scss b/src/views/project/liftSupervision/historyData/workCycleData/index.scss
new file mode 100644
index 0000000..669485c
--- /dev/null
+++ b/src/views/project/liftSupervision/historyData/workCycleData/index.scss
@@ -0,0 +1,11 @@
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.table-data {
+	@include flex;
+	> span {
+		display: inline-block;
+		width: 50%;
+	}
+}
diff --git a/src/views/project/liftSupervision/historyData/workCycleData/index.vue b/src/views/project/liftSupervision/historyData/workCycleData/index.vue
new file mode 100644
index 0000000..7c077ca
--- /dev/null
+++ b/src/views/project/liftSupervision/historyData/workCycleData/index.vue
@@ -0,0 +1,346 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="报警数据"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #equipDriverInfo="{ row }">
+				<span>设备名称: {{ row.devName }}</span>
+				<br />
+				<span>设备编号: {{ row.devNumber }}</span>
+				<br />
+				<span>司机姓名: {{ row.driverName }}</span>
+				<br />
+				<span>司机身份证号: {{ row.driverIdCard }}</span>
+			</template>
+			<template #workCycleInfo="{ row }">
+				<div class="table-data">
+					<span>工作循环开始时间: {{ row.startTime }}</span>
+					<span>工作循环结束时间: {{ row.endTime }}</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环持续时长: {{ row.duration ? row.duration : 0 }}s</span>
+					<span>工作循环最大载重: {{ row.maxLoad ? row.maxLoad : 0 }}kg</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大角度: {{ row.maxAngle ? row.maxAngle : 0 }}°</span>
+					<span>工作循环最小角度: {{ row.minAngle ? row.minAngle : 0 }}°</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大高度: {{ row.maxHeight ? row.maxHeight : 0 }}m</span>
+					<span>工作循环最小高度: {{ row.minHeight ? row.minHeight : 0 }}m</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大幅度: {{ row.maxRange ? row.maxRange : 0 }}m</span>
+					<span>工作循环最小幅度: {{ row.minRange ? row.minRange : 0 }}m</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环开始高度: {{ row.startHeight ? row.startHeight : 0 }}m</span>
+					<span>工作循环结束高度: {{ row.endHeight ? row.endHeight : 0 }}m</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环开始幅度: {{ row.startRange ? row.startRange : 0 }}m</span>
+					<span>工作循环结束幅度: {{ row.endRange ? row.endRange : 0 }}m</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环开始角度: {{ row.startAngle ? row.startAngle : 0 }}°</span>
+					<span>工作循环结束角度: {{ row.endAngle ? row.endAngle : 0 }}°</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大载重比: {{ row.maxLoadRatio ? row.maxLoadRatio : 0 }}%</span>
+					<span>工作循环最大风速: {{ row.maxWindSpeed ? row.maxWindSpeed : 0 }}m/s</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环中最大力矩: {{ row.maxForce ? row.maxForce : 0 }}kg·m</span>
+					<span>工作循环最大力矩百分比: {{ row.maxForceRatio ? row.maxForceRatio : 0 }}%</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>工作循环最大力矩时的幅度: {{ row.maxForceRatioRange ? row.maxForceRatioRange : 0 }}m</span>
+					<span>工作循环倍率: {{ row.multiple ? row.multiple : 0 }}%</span>
+				</div>
+			</template>
+			<template #alarmInfo="{ row }">
+				<div class="table-data">
+					<span
+						>防碰撞报警:
+						<span :style="{ color: row.antiCollisionAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.antiCollisionAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度上限位报警:
+						<span :style="{ color: row.heightUpperAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightUpperAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>高度下限位报警:
+						<span :style="{ color: row.heightLowerAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.heightLowerAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度外限位报警:
+						<span :style="{ color: row.maxRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.maxRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>幅度内限位报警:
+						<span :style="{ color: row.minRangeAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.minRangeAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>力矩报警:
+						<span :style="{ color: row.forceAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.forceAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>多机防撞报警:
+						<span :style="{ color: row.multiAntiCollisionAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.multiAntiCollisionAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>逆时针回转限位报警:
+						<span :style="{ color: row.negAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.negAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>倾角报警:
+						<span :style="{ color: row.obliquityAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.obliquityAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>顺时针回转限位报警:
+						<span :style="{ color: row.posAngleAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.posAngleAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>风速报警:
+						<span :style="{ color: row.windSpeedAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.windSpeedAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>工作循环中是否出现环境防碰撞报警:
+						<span :style="{ color: row.workEnvironmentAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.workEnvironmentAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+				<div class="table-data">
+					<span
+						>工作循环中是否出现力矩预警:
+						<span :style="{ color: row.workForceAlarm == 0 ? '#333' : '#E70000' }">{{
+							row.workForceAlarm == 0 ? "正常" : "报警"
+						}}</span></span
+					>
+				</div>
+				<br />
+			</template>
+		</ProTable>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{
+					activeValue == "eng" ? data.engineeringName : data.projectName
+				}}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, onMounted } from "vue";
+import { ElMessage } from "element-plus";
+import { ColumnProps } from "@/components/ProTable/interface";
+import ProTable from "@/components/ProTable/index.vue";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { getEngineeringName, towerCraneWorkCyclePage } from "@/api/modules/project";
+
+const activeValue = ref("eng");
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	solveFlag: 1,
+	engineeringSn: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 200 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		isShow: false,
+		search: { el: "input" }
+	},
+	{
+		prop: "createTime",
+		label: "工作循环时间",
+		isShow: false,
+		search: {
+			el: "date-picker",
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{
+		prop: "equipDriverInfo",
+		label: "设备司机信息",
+		align: "left",
+		width: 400
+	},
+	// 多级 prop
+	{ prop: "workCycleInfo", label: "工作循环信息", align: "left", width: 600 },
+	{ prop: "alarmInfo", label: "工作循环报警信息", align: "left", width: 600 }
+];
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.createTime) {
+		newParams.startTime_begin = newParams.createTime[0];
+		newParams.endTime_end = newParams.createTime[1];
+		delete newParams.createTime;
+	}
+	if (searchSn.value) {
+		if (activeValue.value == "eng") {
+			newParams.engineeringSn = searchSn.value;
+		} else if (activeValue.value == "project") {
+			newParams.projectSn = searchSn.value;
+		}
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneWorkCyclePage(newParams);
+};
+
+// 抽屉tab选择时
+const tabsSelect = val => {
+	activeValue.value = val;
+	if (val == "eng") {
+		getengineering();
+	} else if (val == "project") {
+		getProject();
+	}
+};
+// 获取项目信息
+const getProject = async () => {
+	const res = await getEngineeringName();
+	engList.value = [res.result];
+	if (res.result) {
+		searchSn.value = res.result.projectSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	if (activeValue.value == "eng") {
+		searchSn.value = row.engineeringSn;
+	} else if (activeValue.value == "project") {
+		searchSn.value = row.projectSn;
+	}
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/project/liftSupervision/operatingData/index.scss b/src/views/project/liftSupervision/operatingData/index.scss
new file mode 100644
index 0000000..f9691a0
--- /dev/null
+++ b/src/views/project/liftSupervision/operatingData/index.scss
@@ -0,0 +1,277 @@
+@mixin boxStyle {
+	background: #ffffff;
+	border-radius: 8px;
+}
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
+.operate-box {
+	width: 100%;
+	height: 100%;
+	@include flex;
+	.monitor-data {
+		@include boxStyle;
+
+		flex: 1;
+		height: 100%;
+		min-height: 600px;
+		.monitor-title {
+			margin-top: 15px;
+			margin-left: 36px;
+			@include flex;
+			span:first-child {
+				margin-right: 20px;
+				font-family: "Source Han Sans CN-Bold", "Source Han Sans CN";
+				font-size: 30px;
+				font-weight: bold;
+				color: #333333;
+			}
+			span:last-child {
+				font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+				font-size: 22px;
+				font-weight: 500;
+			}
+		}
+		.monitor-content {
+			display: flex;
+			height: calc(100% - 265px);
+			margin-top: 36px;
+			margin-left: 36px;
+			.monitor-tool {
+				position: relative;
+				span {
+					font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+					font-size: 18px;
+					font-weight: 400;
+					color: #000000;
+				}
+				.property-one {
+					position: absolute;
+					top: 0;
+					left: 0;
+				}
+				.property-two {
+					position: absolute;
+					top: 0;
+					right: 0;
+				}
+				.property-three {
+					position: absolute;
+					top: 180px;
+					left: 0;
+				}
+				.other-info {
+					position: absolute;
+					top: 240px;
+					right: 0;
+					display: flex;
+					flex-direction: column;
+					> span {
+						margin-bottom: 20px;
+					}
+				}
+				img {
+					width: 357px;
+					height: 100%;
+				}
+			}
+			.monitor-aspect {
+				display: flex;
+				flex-wrap: wrap;
+				align-content: flex-start;
+				margin-left: 86px;
+				&-item {
+					flex-direction: column;
+					justify-content: center;
+					width: 184px;
+					height: 100px;
+					margin-right: 26px;
+					margin-bottom: 30px;
+					background: #ffffff;
+					border: 1px solid #ebebeb;
+					border-radius: 4px;
+					@include flex;
+					> div:first-child {
+						@include flex;
+
+						margin-bottom: 12px;
+						span {
+							margin-right: 7px;
+							font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+							font-size: 18px;
+							font-weight: 500;
+							color: #333333;
+						}
+						img {
+							width: 20px;
+							height: 20px;
+						}
+					}
+					> div:last-child {
+						@include flex;
+						span {
+							font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+							font-size: 18px;
+							font-weight: 500;
+							color: #00378f;
+						}
+					}
+				}
+			}
+		}
+		.monitor-equip {
+			margin-top: 31px;
+			margin-bottom: 16px;
+			margin-left: 36px;
+			@include flex;
+			.monitor-state:not(:last-child) {
+				margin-right: 26px;
+			}
+			.monitor-state {
+				@include flex;
+
+				flex-direction: column;
+				align-items: center;
+				cursor: pointer;
+				> div {
+					position: relative;
+					img {
+						width: 184px;
+						height: 100px;
+					}
+					span {
+						position: absolute;
+						top: 0;
+						right: 0;
+						width: 32px;
+						height: 15px;
+						font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+						font-size: 10px;
+						font-weight: 400;
+						color: #ffffff;
+						text-align: center;
+					}
+				}
+				> span {
+					font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+					font-size: 16px;
+					font-weight: 400;
+					color: #000000;
+				}
+			}
+			.active-class {
+				box-shadow: 0 4px 8px 0 rgb(48 62 100 / 20%);
+			}
+		}
+	}
+	.no-data {
+		@include boxStyle;
+
+		display: flex;
+		flex: 1;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		min-height: 600px;
+		color: #999999;
+	}
+	.history-data {
+		@include boxStyle;
+
+		width: 300px;
+		height: 100%;
+		margin-left: 20px;
+		:deep() {
+			.leftMenu {
+				height: 100%;
+			}
+			.content {
+				height: calc(100% - 100px);
+			}
+		}
+		.search-wrapper {
+			@include flex;
+
+			height: 50px;
+			padding: 0 10px;
+			background-color: #ffffff;
+			border-bottom: 1px solid #e5e5e5;
+		}
+		.alarm-list {
+			height: calc(100% - 50px);
+			min-height: 83%;
+			overflow-y: scroll;
+			&-item {
+				display: flex;
+				flex-direction: column;
+				padding: 12px;
+				border-bottom: 1px solid #e5e5e5;
+				> div {
+					span {
+						font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+						font-size: 12px;
+						font-weight: 400;
+						color: #333333;
+					}
+				}
+				> div:not(:last-child) {
+					margin-bottom: 8px;
+				}
+			}
+		}
+		.info-list {
+			height: calc(100% - 50px);
+			min-height: 83%;
+			overflow-y: scroll;
+			&-item {
+				display: flex;
+				flex-direction: column;
+				padding: 12px;
+				border-bottom: 1px solid #e5e5e5;
+				> div:nth-child(1) {
+					margin-bottom: 10px;
+					font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
+					font-size: 16px;
+					font-weight: 500;
+					color: #333333;
+				}
+				&-aspect {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					&-item {
+						margin-bottom: 8px;
+						span {
+							font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+							font-size: 12px;
+							font-weight: 400;
+						}
+						> span:nth-child(1) {
+							display: inline-block;
+							width: 36px;
+							height: 18px;
+							margin-right: 20px;
+							color: #606266;
+							text-align: left;
+						}
+						> span:nth-child(2) {
+							display: inline-block;
+							width: 42px;
+							height: 18px;
+							color: #333333;
+						}
+					}
+				}
+				> div:last-child {
+					margin-top: 5px;
+					font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+					font-size: 10px;
+					font-weight: 400;
+					color: rgb(102 102 102 / 80%);
+				}
+			}
+		}
+	}
+}
diff --git a/src/views/project/liftSupervision/operatingData/index.vue b/src/views/project/liftSupervision/operatingData/index.vue
new file mode 100644
index 0000000..9b51b43
--- /dev/null
+++ b/src/views/project/liftSupervision/operatingData/index.vue
@@ -0,0 +1,429 @@
+<template>
+	<div class="operate-box">
+		<div class="monitor-data" v-if="equipList.length > 0">
+			<div class="monitor-title">
+				<span>{{ equipInfo.devName }}</span>
+				<span :style="{ color: equipInfo.online == 1 ? '#0f64da' : '#C3C3C3' }">{{
+					equipInfo.online == 1 ? "在线" : "离线"
+				}}</span>
+			</div>
+			<div class="monitor-content">
+				<div class="monitor-tool">
+					<img src="@/assets/images/onlineSupervision/liftImg.jpg" alt="" />
+					<span class="property-one">尾臂长: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}m</span>
+					<span class="property-two">臂长: {{ equipInfo.forearmLength ? equipInfo.forearmLength : 0 }}m</span>
+					<span class="property-three">塔身高: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+					<div class="other-info">
+						<span>设备编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}</span>
+						<span>安装日期: {{ equipInfo.installTime ? equipInfo.installTime : "" }}</span>
+						<!-- <span>终端编号: TD2374693</span> -->
+						<span>更新时间: {{ equipInfo.realTime ? equipInfo.realTime : "" }}</span>
+					</div>
+				</div>
+				<div class="monitor-aspect">
+					<div class="monitor-aspect-item" v-for="(item, index) in aspectList" :key="index">
+						<div>
+							<span>{{ item.name }}</span>
+							<img :src="item.img" alt="" srcset="" />
+						</div>
+						<div>
+							<span>{{ equipInfo[item.prop] ? equipInfo[item.prop] : 0 }}</span>
+							<span>{{ item.unit }}</span>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="monitor-equip">
+				<div
+					:class="equipActive == index ? 'active-class' : ''"
+					class="monitor-state"
+					v-for="(item, index) in equipList"
+					:key="index"
+					@click="getEquipInfo(item)"
+				>
+					<div>
+						<img :src="item.installImage" alt="" />
+						<span :style="{ backgroundColor: item.online == 1 ? '#008bff' : '#C3C3C3' }">{{
+							item.online == 1 ? "在线" : "离线"
+						}}</span>
+					</div>
+					<span>{{ item.devName }}</span>
+				</div>
+			</div>
+		</div>
+		<div class="no-data" v-else>
+			<img src="@/assets/images/notData.png" alt="notData" />
+			<div>暂无数据</div>
+		</div>
+		<div class="history-data">
+			<LeftMenuPlus
+				v-model="active"
+				:tabs="['历史报警', '历史监测信息']"
+				:pageable="pages"
+				class="LeftMenu"
+				@change-page="onCurChange"
+			>
+				<template #default>
+					<div class="search-wrapper">
+						<el-date-picker
+							style="margin-right: 5px"
+							v-model="searchForm.timeRange"
+							type="daterange"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+						/>
+						<el-button class="search-btn" type="primary" @click="search">查询</el-button>
+					</div>
+					<div class="alarm-list" v-if="active == 0">
+						<div class="alarm-list-item" v-for="(item, index) in alarmList" :key="index">
+							<div>
+								<span>设备名称: </span>
+								<span>{{ item.devName }}</span>
+							</div>
+							<div>
+								<span>设备编号: </span>
+								<span style="color: #0f64da">{{ item.devNumber }}</span>
+							</div>
+							<div>
+								<span>报警项目: </span>
+								<span>{{ alarmTransform(item) }}</span>
+							</div>
+							<div>
+								<span>报警时间: </span>
+								<span>{{ item.createTime }}</span>
+							</div>
+						</div>
+					</div>
+					<div class="info-list" v-if="active == 1">
+						<div class="info-list-item" v-for="(item, index) in monitorList" :key="index">
+							<div>{{ item.devName }}</div>
+							<div class="info-list-item-aspect">
+								<div class="info-list-item-aspect-item">
+									<span>角度</span>
+									<span>{{ item.angle ? item.angle : 0 }}°</span>
+								</div>
+								<div class="info-list-item-aspect-item">
+									<span>倾角</span>
+									<span>{{ item.obliquity ? item.obliquity : 0 }}°</span>
+								</div>
+							</div>
+							<div class="info-list-item-aspect">
+								<div class="info-list-item-aspect-item">
+									<span>高度</span>
+									<span>{{ item.height ? item.height : 0 }}m</span>
+								</div>
+								<div class="info-list-item-aspect-item">
+									<span>倾角X</span>
+									<span>{{ item.obliquityX ? item.obliquityX : 0 }}°</span>
+								</div>
+							</div>
+							<div class="info-list-item-aspect">
+								<div class="info-list-item-aspect-item">
+									<span>载重比</span>
+									<span>{{ item.loadRatio ? item.loadRatio : 0 }}%</span>
+								</div>
+								<div class="info-list-item-aspect-item">
+									<span>倾角Y</span>
+									<span>{{ item.obliquityY ? item.obliquityY : 0 }}°</span>
+								</div>
+							</div>
+							<div class="info-list-item-aspect">
+								<div class="info-list-item-aspect-item">
+									<span>载重</span>
+									<span>{{ item.loading ? item.loading : 0 }}kg</span>
+								</div>
+								<div class="info-list-item-aspect-item">
+									<span>幅度</span>
+									<span>{{ item.ranger ? item.ranger : 0 }}m</span>
+								</div>
+							</div>
+							<div>监测时间: {{ item.createTime ? item.createTime : "" }}</div>
+						</div>
+					</div>
+				</template>
+			</LeftMenuPlus>
+		</div>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{
+					activeValue == "eng" ? data.engineeringName : data.projectName
+				}}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, onMounted, watch } from "vue";
+import { ElMessage } from "element-plus";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import {
+	getEngineeringName,
+	towerCraneEquipAll,
+	operationData,
+	towerCraneAlarmPage,
+	towerCraneDataPage
+} from "@/api/modules/project";
+import LeftMenuPlus from "@/components/LeftMenuPlus/LeftMenu.vue";
+const equipActive = ref(0);
+const monitorList = ref([]);
+const alarmList = ref([]);
+const equipList = ref([]);
+const equipInfo = ref({});
+const searchForm = ref({
+	timeRange: []
+});
+const active = ref(0);
+const pages = ref({
+	pageNo: 1,
+	pageSize: 6,
+	total: 0
+});
+const aspectList = ref([
+	{
+		name: "力矩",
+		value: 10,
+		unit: "N·M",
+		img: new URL("@/assets/images/onlineSupervision/力矩.png", import.meta.url).href,
+		prop: "torque"
+	},
+	{
+		name: "载重",
+		value: 10,
+		unit: "T",
+		img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
+		prop: "loading"
+	},
+	{
+		name: "风速",
+		value: 10,
+		unit: "m/s",
+		img: new URL("@/assets/images/onlineSupervision/风速.png", import.meta.url).href,
+		prop: "windSpeed"
+	},
+	{
+		name: "高度",
+		value: 10,
+		unit: "m",
+		img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
+		prop: "height"
+	},
+	{
+		name: "回转角度",
+		value: 10,
+		unit: "°",
+		img: new URL("@/assets/images/onlineSupervision/回转角度.png", import.meta.url).href,
+		prop: "angle"
+	},
+	{
+		name: "塔身倾角",
+		value: 10,
+		unit: "°",
+		img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href,
+		prop: "obliquity"
+	},
+	{
+		name: "幅度",
+		value: 10,
+		unit: "m",
+		img: new URL("@/assets/images/onlineSupervision/幅度.png", import.meta.url).href,
+		prop: "ranger"
+	}
+]);
+const activeValue = ref("eng");
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+// 报警项目转换
+const alarmTransform = (obj: any) => {
+	let str = "";
+	if (obj["environmentAlarm"] == 1) str += "环境防碰撞报警,";
+	if (obj["forceAlarm"] == 1) str += "力矩报警,";
+	if (obj["heightLowerAlarm"] == 1) str += "高度下限位报警,";
+	if (obj["heightUpperAlarm"] == 1) str += "高度上限位报警,";
+	if (obj["maxRangeAlarm"] == 1) str += "幅度外限位报警,";
+	if (obj["minRangeAlarm"] == 1) str += "幅度内限位报警,";
+	if (obj["multiAntiCollisionAlarm"] == 1) str += "多机防撞报警,";
+	if (obj["negAngleAlarm"] == 1) str += "逆时针回转限位报警,";
+	if (obj["obliquityAlarm"] == 1) str += "倾角报警,";
+	if (obj["posAngleAlarm"] == 1) str += "顺时针回转限位报警,";
+	if (obj["standardHighAlarm"] == 1) str += "塔机间竖向高度报警,";
+	if (obj["windSpeedAlarm"] == 1) str += "风速报警";
+	return str;
+};
+// 获取历史检测信息
+const getMonitorList = async () => {
+	let requestData = {
+		pageNo: pages.value.pageNo,
+		pageSize: pages.value.pageSize
+	} as any;
+	if (activeValue.value == "eng") {
+		requestData.engineeringSn = searchSn.value;
+	} else if (activeValue.value == "project") {
+		requestData.projectSn = searchSn.value;
+	}
+	if (searchForm.value.timeRange && searchForm.value.timeRange.length > 0) {
+		requestData.createTime_begin = searchForm.value.timeRange[0];
+		requestData.createTime_end = searchForm.value.timeRange[1];
+	}
+	const res = await towerCraneDataPage(requestData);
+	console.log(res);
+	if (res && res.result && res.result.records.length > 0) {
+		monitorList.value = res.result.records;
+		pages.value.total = +res.result.total;
+	} else {
+		monitorList.value = [];
+		pages.value.total = 0;
+	}
+};
+// 获取历史报警列表
+const getAlarmList = async () => {
+	let requestData = {
+		pageNo: pages.value.pageNo,
+		pageSize: pages.value.pageSize
+	} as any;
+	if (activeValue.value == "eng") {
+		requestData.engineeringSn = searchSn.value;
+	} else if (activeValue.value == "project") {
+		requestData.projectSn = searchSn.value;
+	}
+	if (searchForm.value.timeRange && searchForm.value.timeRange.length > 0) {
+		requestData.createTime_begin = searchForm.value.timeRange[0];
+		requestData.createTime_end = searchForm.value.timeRange[1];
+	}
+	const res = await towerCraneAlarmPage(requestData);
+	console.log(res);
+	if (res && res.result && res.result.records.length > 0) {
+		alarmList.value = res.result.records;
+		pages.value.total = +res.result.total;
+	} else {
+		alarmList.value = [];
+		pages.value.total = 0;
+	}
+};
+// 获取设备列表
+const getEquipList = async () => {
+	let requestData = {} as any;
+	if (activeValue.value == "eng") {
+		requestData.engineeringSn = searchSn.value;
+	} else if (activeValue.value == "project") {
+		requestData.projectSn = searchSn.value;
+	}
+	const res = await towerCraneEquipAll(requestData);
+	console.log(res);
+	if (res && res.result && res.result.length > 0) {
+		equipList.value = res.result;
+		getEquipInfo(res.result[0]);
+	} else {
+		equipList.value = [];
+	}
+};
+// 获取设备信息
+const getEquipInfo = async (obj: any) => {
+	let requestData = {
+		id: obj.id
+	};
+	const res = await operationData(requestData);
+	console.log(res);
+	if (res && res.result) {
+		equipInfo.value = { ...obj, ...res.result };
+	} else {
+		equipInfo.value = { ...obj };
+	}
+};
+// 右侧报警数据搜索
+const search = () => {
+	console.log(666);
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+};
+// 页面的分页
+const onCurChange = async (params: number) => {
+	console.log(params);
+	pages.value.pageNo = params;
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+};
+// 抽屉tab选择时
+const tabsSelect = val => {
+	activeValue.value = val;
+	if (val == "eng") {
+		getengineering();
+	} else if (val == "project") {
+		getProject();
+	}
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+};
+// 获取项目信息
+const getProject = async () => {
+	const res = await getEngineeringName();
+	engList.value = [res.result];
+	if (res.result) {
+		searchSn.value = res.result.projectSn;
+	}
+	getEquipList();
+	console.log(res);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	getEquipList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	if (activeValue.value == "eng") {
+		searchSn.value = row.engineeringSn;
+	} else if (activeValue.value == "project") {
+		searchSn.value = row.projectSn;
+	}
+	getEquipList();
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
+	ElMessage.success("页面已更新");
+};
+watch(
+	() => active.value,
+	n => {
+		searchForm.value.timeRange = [];
+		if (n === 0) {
+			getAlarmList();
+		} else {
+			getMonitorList();
+		}
+		searchForm.value.timeRange = [];
+	}
+);
+onMounted(async () => {
+	await getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>

From 767e85a1a44889f5deadccc63e844cf733735eae Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 28 Aug 2023 16:31:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detailsDialog.vue              | 22 ++++++++++++----
 .../components/transformInfo.vue              | 11 +++++---
 .../acceptanceApply/index.vue                 |  2 ++
 .../acceptancePlan/index.vue                  |  5 ++++
 .../components/transformInfo.vue              |  2 ++
 .../components/transformInfo.vue              |  2 ++
 .../components/transformInfo.vue              | 10 ++++++--
 .../acceptanceApply/index.vue                 |  4 ++-
 .../acceptancePlan/index.vue                  |  4 ++-
 .../GanttchartChart/index.vue                 |  4 ++-
 .../divisionsAndISubItems/index.vue           |  4 ++-
 .../investmentPayment/index.vue               |  4 ++-
 .../panoramicPlan/index.vue                   |  4 ++-
 .../planFinishSituation/index.vue             |  4 ++-
 .../components/detailsDialog.vue              | 25 ++++++++++++++-----
 .../components/transformInfo.vue              |  4 ++-
 .../acceptanceApply/index.vue                 |  2 ++
 .../acceptancePlan/index.vue                  |  7 +++++-
 .../components/transformInfo.vue              |  2 ++
 .../components/transformInfo.vue              |  2 ++
 .../ProjectSupervision/overview.vue           |  9 ++++++-
 21 files changed, 106 insertions(+), 27 deletions(-)

diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
index c361d8b..72fda32 100644
--- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
+++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
@@ -300,7 +300,9 @@ const baseUrl = import.meta.env.VITE_API_URL;
 const props = defineProps({
 	dialogVisible: Boolean,
 	relativeId: String,
-	title: String
+	title: String,
+	searchSn: String,
+	activeValue: String
 });
 const emits = defineEmits(["update:dialogVisible", "confirm"]);
 const visible1 = ref(false);
@@ -382,9 +384,13 @@ const confirm = async () => {
 	let requestData = {
 		...allForm.value,
 		detailList: recordData.value,
-		annexList: documentData.value,
-		engineeringSn: globalStore.engineeringSn
+		annexList: documentData.value
 	};
+	if (props.activeValue == "eng") {
+		requestData.engineeringSn = props.searchSn;
+	} else {
+		requestData.projectSn = props.searchSn;
+	}
 	if (props.title == "重新发起") {
 		requestData.id = props.relativeId;
 	}
@@ -467,7 +473,13 @@ const confirm = async () => {
 	visible1.value = false;
 };
 const getSingleEngineerData = async () => {
-	const res = await singleEngineer({ engineeringSn: globalStore.engineeringSn });
+	let requestData = {};
+	if (props.activeValue == "eng") {
+		requestData.engineeringSn = props.searchSn;
+	} else {
+		requestData.projectSn = props.searchSn;
+	}
+	const res = await singleEngineer(requestData);
 	singleEngineerList.value = res.result;
 	console.log(res);
 };
@@ -548,6 +560,7 @@ watch(
 	(n, o) => {
 		visible1.value = n;
 		if (n) {
+			getSingleEngineerData();
 			if (props.title == "新增") {
 				allForm.value = {
 					stage: "",
@@ -571,7 +584,6 @@ watch(visible1, (n, o) => {
 });
 onMounted(() => {
 	getDicMainList();
-	getSingleEngineerData();
 });
 </script>
 
diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
index 1d42b74..e1ce118 100644
--- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
+++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
@@ -487,8 +487,8 @@ onMounted(() => {});
 		top: 0;
 		right: -460px;
 		width: 380px;
-		height: calc(100% - 31px);
 		min-width: 420px;
+		height: calc(100% - 31px);
 		background: #ffffff;
 		box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2);
 		border-radius: 8px 8px 8px 8px;
@@ -502,7 +502,8 @@ onMounted(() => {});
 			display: flex;
 			margin-bottom: 12px;
 			span:nth-child(1) {
-				width: 56px;
+				display: inline-block;
+				width: 60px;
 				text-align: right;
 				font-size: 12px;
 				font-family: Source Han Sans CN-Medium, Source Han Sans CN;
@@ -524,11 +525,13 @@ onMounted(() => {});
 				img {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 				:deep(.el-image) {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 			}
@@ -574,10 +577,10 @@ onMounted(() => {});
 		.situation-step {
 			margin-top: 20px;
 			overflow-y: scroll;
-			height: 300px;
+			height: 210px;
 			.row {
 				span:nth-child(1) {
-					text-align: left;
+					text-align: right;
 				}
 			}
 			:deep(.el-timeline-item) {
diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue
index 6de5bb1..13c3d96 100644
--- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue
+++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue
@@ -41,6 +41,8 @@
 		v-model:dialogVisible="dialogVisible"
 		:title="newTitle"
 		:relativeId="relativeId"
+		:searchSn="searchSn"
+		:activeValue="activeValue"
 		@confirm="confirmReform"
 	></detailsDialog>
 </template>
diff --git a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue
index 2dab69c..5190c8f 100644
--- a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue
+++ b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue
@@ -284,6 +284,10 @@ const confirm = async (formEl: FormInstance | undefined) => {
 	await formEl.validate(async (valid, fields) => {
 		if (valid) {
 			planFormData.value.engineeringSn = initParam.engineeringSn;
+			planFormData.value.fileUrl = planFormData.value.fileUrl ? JSON.stringify(planFormData.value.fileUrl) : "";
+			if (planFormData.value.state == "0") {
+				planFormData.value.completeDate = null;
+			}
 			if (planFormData.value.id) {
 				const res = await acceptancePlanEdit({ ...planFormData.value });
 				ElMessage.success("编辑成功");
@@ -345,6 +349,7 @@ const getTableList = (params: any) => {
 
 // 修改数据按钮
 const handleEditItem = async (index: number, row: any) => {
+	ruleFormRef.value?.resetFields();
 	if (index === 1) {
 		newTitle.value = "新增验收计划";
 		planFormData.value = reactive({
diff --git a/src/views/enterprise/qualitySupervision/components/transformInfo.vue b/src/views/enterprise/qualitySupervision/components/transformInfo.vue
index 625a840..91710b1 100644
--- a/src/views/enterprise/qualitySupervision/components/transformInfo.vue
+++ b/src/views/enterprise/qualitySupervision/components/transformInfo.vue
@@ -520,11 +520,13 @@ onMounted(() => {});
 				img {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 				:deep(.el-image) {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 			}
diff --git a/src/views/enterprise/safetySupervision/components/transformInfo.vue b/src/views/enterprise/safetySupervision/components/transformInfo.vue
index 9693b41..1ea1e26 100644
--- a/src/views/enterprise/safetySupervision/components/transformInfo.vue
+++ b/src/views/enterprise/safetySupervision/components/transformInfo.vue
@@ -521,11 +521,13 @@ onMounted(() => {});
 				img {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 				:deep(.el-image) {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 			}
diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
index fd92ae9..b353049 100644
--- a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
+++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
@@ -495,11 +495,17 @@ onMounted(() => {});
 			.imgList {
 				display: flex;
 				flex-wrap: wrap;
+				img {
+					width: 95px;
+					height: 53px;
+					margin-right: 15px;
+					margin-bottom: 10px;
+				}
 				:deep(.el-image) {
 					width: 95px;
 					height: 53px;
 					margin-right: 15px;
-					margin-bottom: 5px;
+					margin-bottom: 10px;
 				}
 			}
 			.face-img {
@@ -544,7 +550,7 @@ onMounted(() => {});
 		.situation-step {
 			margin-top: 20px;
 			overflow-y: scroll;
-			height: 300px;
+			height: 210px;
 			.row {
 				span:nth-child(1) {
 					text-align: left;
diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue
index d090f90..fbc1a24 100644
--- a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue
+++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue
@@ -16,7 +16,9 @@
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
 								<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
-								<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
+									<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								</el-tooltip>
 							</div>
 						</div>
 					</div>
diff --git a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue
index 61c463d..5372da9 100644
--- a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue
+++ b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue
@@ -16,7 +16,9 @@
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
 								<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
-								<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
+									<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								</el-tooltip>
 							</div>
 						</div>
 					</div>
diff --git a/src/views/goverment/progressManagement/GanttchartChart/index.vue b/src/views/goverment/progressManagement/GanttchartChart/index.vue
index 0cc6a52..ddcd161 100644
--- a/src/views/goverment/progressManagement/GanttchartChart/index.vue
+++ b/src/views/goverment/progressManagement/GanttchartChart/index.vue
@@ -16,7 +16,9 @@
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
 								<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
-								<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
+									<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								</el-tooltip>
 							</div>
 							<!-- <div>
 							<img src="@/assets/images/AIwaring/报警.png" alt="" />
diff --git a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue
index 60cf26e..9104875 100644
--- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue
+++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue
@@ -16,7 +16,9 @@
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
 								<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
-								<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
+									<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								</el-tooltip>
 							</div>
 							<!-- <div>
 							<img src="@/assets/images/AIwaring/报警.png" alt="" />
diff --git a/src/views/goverment/progressManagement/investmentPayment/index.vue b/src/views/goverment/progressManagement/investmentPayment/index.vue
index f76408d..c162ce3 100644
--- a/src/views/goverment/progressManagement/investmentPayment/index.vue
+++ b/src/views/goverment/progressManagement/investmentPayment/index.vue
@@ -16,7 +16,9 @@
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
 								<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
-								<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
+									<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								</el-tooltip>
 							</div>
 						</div>
 					</div>
diff --git a/src/views/goverment/progressManagement/panoramicPlan/index.vue b/src/views/goverment/progressManagement/panoramicPlan/index.vue
index c65b3b2..9b3c0ec 100644
--- a/src/views/goverment/progressManagement/panoramicPlan/index.vue
+++ b/src/views/goverment/progressManagement/panoramicPlan/index.vue
@@ -16,7 +16,9 @@
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
 								<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
-								<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
+									<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								</el-tooltip>
 							</div>
 						</div>
 					</div>
diff --git a/src/views/goverment/progressManagement/planFinishSituation/index.vue b/src/views/goverment/progressManagement/planFinishSituation/index.vue
index b37e8c1..b878505 100644
--- a/src/views/goverment/progressManagement/planFinishSituation/index.vue
+++ b/src/views/goverment/progressManagement/planFinishSituation/index.vue
@@ -16,7 +16,9 @@
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
 								<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
-								<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
+									<span class="middleSize">{{ data.projectAddress || data.address }}</span>
+								</el-tooltip>
 							</div>
 						</div>
 					</div>
diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
index 9cd5382..5f5bae0 100644
--- a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
+++ b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
@@ -158,7 +158,7 @@
 								<el-input v-else class="test" v-model="row.annexName" />
 							</template>
 						</el-table-column>
-						<el-table-column prop="fileList" label="*操作" v-if="title != '详情'">
+						<el-table-column prop="fileList" label="*操作">
 							<template #default="{ row, $index }">
 								<el-button v-if="title != '新增' && title != '重新发起'" type="primary" @click="onDownLoad(row)" link
 									>下载附件</el-button
@@ -282,7 +282,7 @@ import { getDicList } from "@/api/modules/jxjview";
 import { singleEngineer } from "@/api/modules/common";
 import FilesUploadPlus from "@/components/FilesUploadPlus/FilesUpload.vue";
 import transformInfo from "./transformInfo.vue";
-import DownLoad from "@/utils/annexDowload";
+import DownLoad from "@/utils/annexDowload.ts";
 const current = ref({
 	files: []
 });
@@ -300,7 +300,9 @@ const baseUrl = import.meta.env.VITE_API_URL;
 const props = defineProps({
 	dialogVisible: Boolean,
 	relativeId: String,
-	title: String
+	title: String,
+	searchSn: String,
+	activeValue: String
 });
 const emits = defineEmits(["update:dialogVisible", "confirm"]);
 const visible1 = ref(false);
@@ -382,9 +384,13 @@ const confirm = async () => {
 	let requestData = {
 		...allForm.value,
 		detailList: recordData.value,
-		annexList: documentData.value,
-		engineeringSn: globalStore.engineeringSn
+		annexList: documentData.value
 	};
+	if (props.activeValue == "eng") {
+		requestData.engineeringSn = props.searchSn;
+	} else {
+		requestData.projectSn = props.searchSn;
+	}
 	if (props.title == "重新发起") {
 		requestData.id = props.relativeId;
 	}
@@ -466,7 +472,13 @@ const confirm = async () => {
 	visible1.value = false;
 };
 const getSingleEngineerData = async () => {
-	const res = await singleEngineer({ engineeringSn: globalStore.engineeringSn });
+	let requestData = {};
+	if (props.activeValue == "eng") {
+		requestData.engineeringSn = props.searchSn;
+	} else {
+		requestData.projectSn = props.searchSn;
+	}
+	const res = await singleEngineer(requestData);
 	singleEngineerList.value = res.result;
 	console.log(res);
 };
@@ -547,6 +559,7 @@ watch(
 	(n, o) => {
 		visible1.value = n;
 		if (n) {
+			getSingleEngineerData();
 			if (props.title == "新增") {
 				allForm.value = {
 					stage: "",
diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
index ff8c538..5d55fc9 100644
--- a/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
+++ b/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
@@ -519,11 +519,13 @@ onMounted(() => {});
 				img {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 				:deep(.el-image) {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 			}
@@ -569,7 +571,7 @@ onMounted(() => {});
 		.situation-step {
 			margin-top: 20px;
 			overflow-y: scroll;
-			height: 300px;
+			height: 210px;
 			.row {
 				span:nth-child(1) {
 					text-align: left;
diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/index.vue b/src/views/project/engineeringAcceptance/acceptanceApply/index.vue
index 18e5563..f419086 100644
--- a/src/views/project/engineeringAcceptance/acceptanceApply/index.vue
+++ b/src/views/project/engineeringAcceptance/acceptanceApply/index.vue
@@ -34,6 +34,8 @@
 		v-model:dialogVisible="dialogVisible"
 		:title="newTitle"
 		:relativeId="relativeId"
+		:searchSn="searchSn"
+		:activeValue="activeValue"
 		@confirm="confirmReform"
 	></detailsDialog>
 	<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
diff --git a/src/views/project/engineeringAcceptance/acceptancePlan/index.vue b/src/views/project/engineeringAcceptance/acceptancePlan/index.vue
index f00deb5..67812e6 100644
--- a/src/views/project/engineeringAcceptance/acceptancePlan/index.vue
+++ b/src/views/project/engineeringAcceptance/acceptancePlan/index.vue
@@ -125,7 +125,7 @@
 </template>
 
 <script setup lang="tsx" name="acceptancePlan">
-import { ref, reactive, onMounted } from "vue";
+import { ref, reactive, nextTick, onMounted } from "vue";
 import { ElMessage, ElMessageBox, UploadProps } from "element-plus";
 import type { FormInstance } from "element-plus";
 import { ColumnProps } from "@/components/ProTable/interface";
@@ -287,6 +287,10 @@ const confirm = async (formEl: FormInstance | undefined) => {
 	await formEl.validate(async (valid, fields) => {
 		if (valid) {
 			planFormData.value.engineeringSn = searchSn.value;
+			planFormData.value.fileUrl = planFormData.value.fileUrl ? JSON.stringify(planFormData.value.fileUrl) : "";
+			if (planFormData.value.state == "0") {
+				planFormData.value.completeDate = null;
+			}
 			if (planFormData.value.id) {
 				const res = await acceptancePlanEdit({ ...planFormData.value });
 				ElMessage.success("编辑成功");
@@ -352,6 +356,7 @@ const getTableList = (params: any) => {
 
 // 修改数据按钮
 const handleEditItem = async (index: number, row: any) => {
+	ruleFormRef.value?.resetFields();
 	if (index === 1) {
 		newTitle.value = "新增验收计划";
 		planFormData.value = reactive({
diff --git a/src/views/project/qualitySupervision/components/transformInfo.vue b/src/views/project/qualitySupervision/components/transformInfo.vue
index 97c6376..7478f88 100644
--- a/src/views/project/qualitySupervision/components/transformInfo.vue
+++ b/src/views/project/qualitySupervision/components/transformInfo.vue
@@ -520,11 +520,13 @@ onMounted(() => {});
 				img {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 				:deep(.el-image) {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 			}
diff --git a/src/views/project/safetySupervision/components/transformInfo.vue b/src/views/project/safetySupervision/components/transformInfo.vue
index 733001c..12ab792 100644
--- a/src/views/project/safetySupervision/components/transformInfo.vue
+++ b/src/views/project/safetySupervision/components/transformInfo.vue
@@ -520,11 +520,13 @@ onMounted(() => {});
 				img {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 				:deep(.el-image) {
 					width: 95px;
 					height: 53px;
+					margin-bottom: 10px;
 					margin-right: 15px;
 				}
 			}
diff --git a/src/views/project/supervision/ProjectSupervision/overview.vue b/src/views/project/supervision/ProjectSupervision/overview.vue
index b1a1fef..1da19dd 100644
--- a/src/views/project/supervision/ProjectSupervision/overview.vue
+++ b/src/views/project/supervision/ProjectSupervision/overview.vue
@@ -280,7 +280,7 @@ const engineeringPurpose = ref<DictDataList>([]);
 const structuralStyle = ref<DictDataList>([]);
 const validatorNumber = (e: any, index: any, key: string) => {
 	// 校验数字
-	let pattern = /^[1-9][0-9]*$/;
+	let pattern = /^[0-9][0-9]*$/;
 	let dataValue = form.value.engineeringSingles[index][key];
 	if (!pattern.test(dataValue)) {
 		ElMessage.error("请输入纯数字");
@@ -338,6 +338,13 @@ const next = async (formEl: FormInstance | undefined, params: any) => {
 				});
 				return;
 			}
+			if (form.value.engineeringSingles?.length == 0) {
+				ElMessage({
+					message: "请添加单体工程",
+					type: "error"
+				});
+				return;
+			}
 			form.value.engineeringSingles?.map(item => {
 				if (!item.name) {
 					validatorBool = false;

From dca0e454d4b8282ad3790310ed9551d1453d1c24 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 28 Aug 2023 17:57:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operatingData/index.vue                   |   1 +
 .../operatingData/index.scss                  |   4 +
 .../operatingData/index.vue                   |  10 +-
 .../hoistingMachineryRecord/index.scss        |  35 +
 .../project/hoistingMachineryRecord/index.vue | 827 ++++++++++++++++++
 .../operatingData/index.vue                   |   1 +
 6 files changed, 873 insertions(+), 5 deletions(-)
 create mode 100644 src/views/project/hoistingMachineryRecord/index.scss
 create mode 100644 src/views/project/hoistingMachineryRecord/index.vue

diff --git a/src/views/enterprise/towerCraneSupervision/operatingData/index.vue b/src/views/enterprise/towerCraneSupervision/operatingData/index.vue
index 63554c8..dd98372 100644
--- a/src/views/enterprise/towerCraneSupervision/operatingData/index.vue
+++ b/src/views/enterprise/towerCraneSupervision/operatingData/index.vue
@@ -308,6 +308,7 @@ const getEquipList = async () => {
 };
 // 获取设备信息
 const getEquipInfo = async (obj: any) => {
+	equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
 	let requestData = {
 		id: obj.id
 	};
diff --git a/src/views/goverment/towerCraneSupervision/operatingData/index.scss b/src/views/goverment/towerCraneSupervision/operatingData/index.scss
index fa64dac..fb8cf8c 100644
--- a/src/views/goverment/towerCraneSupervision/operatingData/index.scss
+++ b/src/views/goverment/towerCraneSupervision/operatingData/index.scss
@@ -20,6 +20,10 @@
 			height: 100%;
 			// 页面的项目工程
 			.leftProject {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-around;
+				height: 100%;
 				border-radius: 8px;
 				color: #333333;
 				// background-color: pink;
diff --git a/src/views/goverment/towerCraneSupervision/operatingData/index.vue b/src/views/goverment/towerCraneSupervision/operatingData/index.vue
index c0d06d7..3a7336b 100644
--- a/src/views/goverment/towerCraneSupervision/operatingData/index.vue
+++ b/src/views/goverment/towerCraneSupervision/operatingData/index.vue
@@ -22,13 +22,11 @@
 								</div>
 								<div>
 									<img src="@/assets/images/AIwaring/报警.png" alt="" />
-									<span class="middleSize"
-										>今日报警次数：{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.todayAlarm }}</span
-									>
+									<span class="middleSize">今日报警次数：{{ data.alarmNum ? data.alarmNum : 0 }}</span>
 								</div>
 							</div>
 
-							<div class="bottom_item flx-justify-between" style="margin-top: 6px">
+							<!-- <div class="bottom_item flx-justify-between" style="margin-top: 6px;">
 								<div>
 									<span class="bottomSize"
 										>今日待整改问题：{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.questionNum }}</span
@@ -39,7 +37,7 @@
 										>今日已整改问题：{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.solveQuestionNum }}</span
 									>
 								</div>
-							</div>
+							</div> -->
 						</div>
 					</template>
 				</LeftMenu>
@@ -209,6 +207,7 @@ import {
 	towerCraneEquipAll,
 	operationData
 } from "@/api/modules/goverment";
+const equipActive = ref(0);
 const monitorList = ref([]);
 const alarmList = ref([]);
 const equipList = ref([]);
@@ -324,6 +323,7 @@ const getEquipList = async () => {
 };
 // 获取设备信息
 const getEquipInfo = async (obj: any) => {
+	equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
 	let requestData = {
 		id: obj.id
 	};
diff --git a/src/views/project/hoistingMachineryRecord/index.scss b/src/views/project/hoistingMachineryRecord/index.scss
new file mode 100644
index 0000000..5030cce
--- /dev/null
+++ b/src/views/project/hoistingMachineryRecord/index.scss
@@ -0,0 +1,35 @@
+.date-select {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.basic-form {
+	.face-img {
+		width: 100%;
+		align-self: flex-start;
+		:deep(.face-uploader .el-upload) {
+			border: 1px dashed #d9d9d9 !important;
+			border-radius: 6px !important;
+			cursor: pointer !important;
+			position: relative !important;
+			overflow: hidden !important;
+		}
+		.face-uploader .el-upload:hover {
+			border-color: #409eff !important;
+		}
+		:deep(.el-icon) {
+			font-size: 28px;
+			color: #8c939d;
+			width: 53px;
+			height: 53px;
+			line-height: 53px;
+			text-align: center;
+		}
+		.face-avatar {
+			width: 53px;
+			height: 53px;
+			display: block;
+		}
+	}
+}
diff --git a/src/views/project/hoistingMachineryRecord/index.vue b/src/views/project/hoistingMachineryRecord/index.vue
new file mode 100644
index 0000000..86eca01
--- /dev/null
+++ b/src/views/project/hoistingMachineryRecord/index.vue
@@ -0,0 +1,827 @@
+<template>
+	<div class="table-box">
+		<ProTable
+			ref="proTable"
+			title="设备管理"
+			:columns="columns"
+			:requestApi="getTableList"
+			:dataCallback="dataCallback"
+			:tool-button="false"
+			:pagination="true"
+			background
+			:isShowSearch="false"
+			:initParam="initParam"
+			:onReset="true"
+		>
+			<template #formButton="scope">
+				<el-button class="addButtonStyle" @click="handleAddItem">新增</el-button>
+			</template>
+			<template #operation="{ row }">
+				<el-button type="primary" link @click="handleLookItem(row)">
+					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
+					<span>查看</span>
+				</el-button>
+				<el-button type="primary" link @click="handleEditItem(row)">
+					<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
+					<span>编辑</span>
+				</el-button>
+				<el-button type="danger" link :icon="Delete" @click="handleDeleteItem(row)">删除</el-button>
+			</template>
+			<template #state="{ row }">
+				<span :class="row.state === 1 ? '' : 'redText'">{{ row.state == 1 ? "启用" : "禁用" }}</span>
+			</template>
+		</ProTable>
+		<el-dialog :title="title" show-close v-model="newUnitDialog" style="min-width: 1200px">
+			<el-form ref="formRef" :model="formData" label-width="180px" :rules="rules" class="basic-form" size="default">
+				<!-- <el-form ref="formDataRef" :model="formData" label-width="150px" class="basic-form"> -->
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备名称:" prop="devName">
+							<el-input v-model="formData.devName" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="安装日期:" prop="installTime">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.installTime"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="黑匣子信息:" prop="blackBox">
+							<el-input v-model="formData.blackBox" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="结构类型:" prop="structureType">
+							<el-select
+								v-model="formData.structureType"
+								:disabled="title == '查看设备'"
+								placeholder="请选择"
+								style="width: 100%"
+							>
+								<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备使用状态:" prop="useState">
+							<el-select v-model="formData.useState" :disabled="title == '查看设备'" placeholder="请选择" style="width: 100%">
+								<el-option v-for="item in stateList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="设备图片:" prop="installImage">
+							<div class="face-img">
+								<el-upload
+									class="face-uploader"
+									:action="`${baseUrl}` + '/xmgl/file/upload'"
+									:show-file-list="false"
+									:on-success="(response, uploadFile) => handleAvatarSuccess(response, uploadFile)"
+									accept="image/jpg, image/jpeg, image/png"
+								>
+									<img v-if="formData.installImage" :src="formData.installImage" class="face-avatar" />
+									<el-icon v-else><plus /></el-icon>
+								</el-upload>
+							</div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="是否外地设备:" prop="isForeignDev">
+							<el-radio-group placeholder="请选择" v-model="formData.isForeignDev">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否全新设备:" prop="isNewDev">
+							<el-radio-group placeholder="请选择" v-model="formData.isNewDev">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="规格型号:" prop="model">
+							<el-input v-model="formData.model" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="许可证发证机关:" prop="licensingAuthority">
+							<el-input v-model="formData.licensingAuthority" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="出厂(合格证):" prop="factoryCertificate">
+							<el-input v-model="formData.factoryCertificate" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="工作幅度(m):" prop="workingRange">
+							<el-input v-model.number="formData.workingRange" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="最大额定起重量(kg):" prop="maxLiftingCapacity">
+							<el-input v-model.number="formData.maxLiftingCapacity" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="独立起升高度(m):" prop="independentLiftingHeight">
+							<el-input v-model.number="formData.independentLiftingHeight" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="购置日期:" prop="acquisitionDate">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.acquisitionDate"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="编号有效期:" prop="numberValidityPeriod">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.numberValidityPeriod"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备原值:" prop="originalValue">
+							<el-input v-model.number="formData.originalValue" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="设备改造次数:" prop="renovations">
+							<el-input v-model.number="formData.renovations" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="发票编码:" prop="invoiceCode">
+							<el-input v-model="formData.invoiceCode" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="购买合同编码:" prop="contractCode">
+							<el-input v-model="formData.contractCode" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="生产厂家:" prop="manufacturer">
+							<el-input v-model="formData.manufacturer" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="出厂日期:" prop="productionDate">
+							<el-date-picker
+								:disabled="title == '查看设备'"
+								style="width: 100%"
+								v-model="formData.productionDate"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								type="date"
+								placeholder="请选择时间"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="制造许可证编号:" prop="manufacturerLicense">
+							<el-input v-model="formData.manufacturerLicense" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否为原购产品:" prop="isOriginalProduct">
+							<el-radio-group placeholder="请选择" v-model="formData.isOriginalProduct">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="0">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="设备用途:" prop="useTo">
+							<el-input v-model="formData.useTo" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="前臂长:" prop="forearmLength">
+							<el-input v-model.number="formData.forearmLength" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="后臂长:" prop="posteriorArmLength">
+							<el-input v-model.number="formData.posteriorArmLength" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="塔身高度:" prop="towerHeight">
+							<el-input v-model.number="formData.towerHeight" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="前臂永久性标识:" prop="forearmFlag">
+							<el-input v-model="formData.forearmFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="后臂永久性标识:" prop="rearArmFlag">
+							<el-input v-model="formData.rearArmFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="塔帽永久性标识:" prop="towerCapFlag">
+							<el-input v-model="formData.towerCapFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="上转台永久性标识:" prop="upwardTurntableFlag">
+							<el-input v-model="formData.upwardTurntableFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="120">
+					<el-col :span="12">
+						<el-form-item label="下转台永久性标识:" prop="lowerTurntableFlag">
+							<el-input v-model="formData.lowerTurntableFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="标准节点永久性标识:" prop="mastSectionFlag">
+							<el-input v-model="formData.mastSectionFlag" placeholder="请输入" :disabled="title == '查看设备'" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<footer class="footer flx-center" v-if="title != '查看设备'">
+					<el-button class="cancelButtonStyle" @click="newUnitDialog = false">取消</el-button>
+					<el-button type="primary" @click="submitForm(formData)">保存</el-button>
+				</footer>
+			</el-form>
+		</el-dialog>
+		<!-- 侧边栏选择 -->
+		<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{
+					activeValue == "eng" ? data.engineeringName : data.projectName
+				}}</span>
+			</template>
+		</engineeringEngDrawer>
+		<allEngineering @click="engVisable = true" />
+	</div>
+</template>
+
+<script setup lang="tsx" name="ProjectSupervisionRecord">
+import { ref, reactive, nextTick, onMounted } from "vue";
+import { ElMessage, ElMessageBox, ElTree, FormInstance } from "element-plus";
+import type { UploadProps } from "element-plus";
+import { useRouter } from "vue-router";
+import { ColumnProps } from "@/components/ProTable/interface";
+import { useHandleData } from "@/hooks/useHandleData";
+import ProTable from "@/components/ProTable/index.vue";
+import { jxj_User } from "@/api/types";
+import { getRelevanceList } from "@/api/modules/common";
+import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import {
+	towerCraneEquipAdd,
+	towerCraneEquipEdit,
+	towerCraneEquipDel,
+	towerCraneEquipPage,
+	getEngineeringName
+} from "@/api/modules/project";
+import { GlobalStore } from "@/stores";
+import { Delete } from "@element-plus/icons-vue";
+const baseUrl = import.meta.env.VITE_API_URL;
+const typeList = ref([
+	{ label: "尖头塔", value: 1 },
+	{ label: "平头塔", value: 2 },
+	{ label: "动臂塔", value: 3 }
+]);
+const stateList = ref([
+	{ label: "设备进场", value: 1 },
+	{ label: "设备安装", value: 2 },
+	{ label: "设备验收", value: 3 },
+	{ label: "设备使用", value: 4 },
+	{ label: "设备拆除", value: 5 },
+	{ label: "设备退场", value: 6 }
+]);
+const activeValue = ref("eng");
+const engList = ref([]);
+const engVisable = ref(false);
+const searchSn = ref("");
+const changeType = ref(1);
+const datas = reactive([]);
+const formRef = ref<FormInstance>();
+const router = useRouter();
+const store = GlobalStore();
+const drawerVisible = ref(false);
+const title = ref("");
+const newUnitDialog = ref(false);
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	engineeringSn: ""
+});
+const formData = ref({
+	devName: "",
+	installTime: "",
+	blackBox: "",
+	structureType: "",
+	useState: "",
+	installImage: "",
+	isForeignDev: 0,
+	isNewDev: 0,
+	model: "",
+	licensingAuthority: "",
+	factoryCertificate: "",
+	workingRange: "",
+	maxLiftingCapacity: "",
+	independentLiftingHeight: "",
+	acquisitionDate: "",
+	numberValidityPeriod: "",
+	originalValue: "",
+	renovations: "",
+	invoiceCode: "",
+	contractCode: "",
+	manufacturer: "",
+	productionDate: "",
+	manufacturerLicense: "",
+	isOriginalProduct: 0,
+	useTo: "",
+	forearmLength: "",
+	posteriorArmLength: "",
+	towerHeight: "",
+	forearmFlag: "",
+	rearArmFlag: "",
+	towerCapFlag: "",
+	upwardTurntableFlag: "",
+	lowerTurntableFlag: "",
+	mastSectionFlag: ""
+});
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTable = ref();
+
+const getId = ref<number | undefined>(undefined);
+
+// 表格配置项
+const columns: ColumnProps[] = [
+	{ type: "index", label: "序号", width: 80 },
+	{
+		prop: "devName",
+		label: "设备名称",
+		search: { el: "input" }
+	},
+	{
+		prop: "installTime",
+		label: "安装时间",
+		search: {
+			el: "date-picker",
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+				// defaultTime: defaultTime2
+			}
+		}
+	},
+	{ prop: "blackBox", label: "黑匣子信息" },
+	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
+];
+
+const rules = ref({
+	devName: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	installTime: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	blackBox: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	structureType: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	installImage: [
+		{
+			required: true,
+			message: "请上传",
+			trigger: "change"
+		}
+	],
+	isForeignDev: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	isNewDev: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	model: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	factoryCertificate: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	workingRange: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	maxLiftingCapacity: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	independentLiftingHeight: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	acquisitionDate: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	numberValidityPeriod: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	originalValue: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	renovations: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	invoiceCode: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	manufacturer: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+
+	productionDate: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+
+	manufacturerLicense: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	isOriginalProduct: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	useTo: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	forearmLength: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	posteriorArmLength: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	towerHeight: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	forearmFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	rearArmFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	towerCapFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	upwardTurntableFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	lowerTurntableFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	mastSectionFlag: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	]
+});
+
+// 图片上传成功后的钩子
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+	console.log(response.result.url);
+	console.log(response, uploadFile);
+	formData.value.installImage = response.result.url;
+	formRef.value?.validateField("image");
+};
+// 删除设备
+const handleDeleteItem = async (params: jxj_User.ResUserList) => {
+	await useHandleData(towerCraneEquipDel, { id: params.id }, `删除【${params.devName}】`);
+	proTable.value.getTableList();
+};
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+	// console.log(data);
+	return {
+		list: data.records,
+		total: Number(data.total),
+		pageNo: Number(data.current),
+		pageSize: Number(data.size)
+	};
+};
+
+const transfrom = (arr: Array<any>) => {
+	const result: any[] | ConcatArray<{ authorityId: any; roleId: number | undefined; type: any }> = [];
+	return arr
+		.map(item => {
+			if (arr.children && Array.isArray(arr.children)) {
+				result.concat(transfrom(arr.children));
+			}
+
+			return {
+				authorityId: item.name,
+				roleId: getId.value,
+				type: item.type
+			};
+		})
+		.concat(result);
+};
+
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+	let newParams = JSON.parse(JSON.stringify(params));
+	if (newParams.installTime) {
+		newParams.installTime_begin = newParams.installTime[0];
+		newParams.installTime_end = newParams.installTime[1];
+		delete newParams.installTime;
+	}
+	if (searchSn.value) {
+		if (activeValue.value == "eng") {
+			newParams.engineeringSn = searchSn.value;
+		} else if (activeValue.value == "project") {
+			newParams.projectSn = searchSn.value;
+		}
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
+	}
+	return towerCraneEquipPage(newParams);
+};
+// 新增
+const handleAddItem = () => {
+	formRef.value?.resetFields();
+	title.value = "新增设备";
+	newUnitDialog.value = true;
+};
+// 查看
+const handleLookItem = (row: any) => {
+	formRef.value?.resetFields();
+	title.value = "查看设备";
+	console.log(row);
+	formData.value = reactive({ ...row });
+	changeType.value = formData.value.businessLicenseLifespan ? 1 : 2;
+	newUnitDialog.value = true;
+};
+// 编辑
+const handleEditItem = (row: any) => {
+	formRef.value?.clearValidate();
+	title.value = "编辑设备";
+	console.log(row);
+	formData.value = reactive({ ...row });
+	changeType.value = formData.value.businessLicenseLifespan ? 1 : 2;
+	newUnitDialog.value = true;
+};
+// TODO: 提交表单操作
+const submitForm = async (data: any) => {
+	const formEl = formRef.value;
+	if (!formEl) return;
+	await formEl.validate((valid, fields) => {
+		if (valid) {
+			if (changeType.value == 2) {
+				delete data.businessLicenseLifespan;
+			}
+			if (activeValue.value == "eng") {
+				data.engineeringSn = searchSn.value;
+			} else if (activeValue.value == "project") {
+				data.projectSn = searchSn.value;
+			}
+			saveItem(data);
+		} else {
+			console.log("error submit!", fields);
+		}
+	});
+};
+const saveItem = async (form: any) => {
+	if (form.id) {
+		// console.log(form.dictCode);
+		const res = await towerCraneEquipEdit(form);
+		proTable.value.getTableList();
+		ElMessage.success("编辑成功");
+		newUnitDialog.value = false;
+	} else {
+		const res = await towerCraneEquipAdd(form);
+		proTable.value.getTableList();
+		ElMessage.success("新增成功");
+		newUnitDialog.value = false;
+	}
+};
+
+// 抽屉tab选择时
+const tabsSelect = val => {
+	activeValue.value = val;
+	if (val == "eng") {
+		getengineering();
+	} else if (val == "project") {
+		getProject();
+	}
+};
+// 获取项目信息
+const getProject = async () => {
+	const res = await getEngineeringName();
+	engList.value = [res.result];
+	if (res.result) {
+		searchSn.value = res.result.projectSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+const getengineering = async () => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	const res = await getRelevanceList();
+	engList.value = res.result;
+	if (res.result && res.result.length > 0) {
+		searchSn.value = res.result[0].engineeringSn;
+	}
+	proTable.value.getTableList();
+	console.log(res);
+};
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	if (activeValue.value == "eng") {
+		searchSn.value = row.engineeringSn;
+	} else if (activeValue.value == "project") {
+		searchSn.value = row.projectSn;
+	}
+	proTable.value.getTableList();
+	ElMessage.success("页面已更新");
+};
+onMounted(() => {
+	getengineering();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
diff --git a/src/views/project/towerCraneSupervision/operatingData/index.vue b/src/views/project/towerCraneSupervision/operatingData/index.vue
index a72b96d..b80b13b 100644
--- a/src/views/project/towerCraneSupervision/operatingData/index.vue
+++ b/src/views/project/towerCraneSupervision/operatingData/index.vue
@@ -329,6 +329,7 @@ const getEquipList = async () => {
 };
 // 获取设备信息
 const getEquipInfo = async (obj: any) => {
+	equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
 	let requestData = {
 		id: obj.id
 	};

From 061d729e2a6b3858379aff668b2ebfbc09f3eadc Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Mon, 28 Aug 2023 18:28:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E7=BC=96=E5=86=99=E6=94=BF=E5=8A=A1?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BC=81=E4=B8=9A=E3=80=81=E6=94=BF?=
 =?UTF-8?q?=E5=8A=A1=E7=AB=AF=E5=8D=87=E9=99=8D=E6=9C=BA=E9=9D=99=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../liftSupervision/operatingData/index.scss  |  57 ++------
 .../liftSupervision/operatingData/index.vue   |   4 +-
 .../liftSupervision/operatingData/index.scss  | 125 ++++++++++--------
 .../liftSupervision/operatingData/index.vue   |  22 +--
 .../liftSupervision/operatingData/index.scss  |  14 +-
 .../liftSupervision/operatingData/index.vue   |  17 ++-
 6 files changed, 128 insertions(+), 111 deletions(-)

diff --git a/src/views/enterprise/liftSupervision/operatingData/index.scss b/src/views/enterprise/liftSupervision/operatingData/index.scss
index 379a4d2..709ddc0 100644
--- a/src/views/enterprise/liftSupervision/operatingData/index.scss
+++ b/src/views/enterprise/liftSupervision/operatingData/index.scss
@@ -63,7 +63,7 @@
 				}
 				.other-info {
 					position: absolute;
-					top: 240px;
+					top: 230px;
 					right: 0;
 					display: flex;
 					flex-direction: column;
@@ -71,52 +71,21 @@
 						margin-bottom: 20px;
 					}
 				}
+				.common-info {
+					position: absolute;
+					top: 30px;
+					left: 0;
+					display: flex;
+					flex-direction: column;
+					> span {
+						margin-bottom: 20px;
+					}
+				}
 				img {
 					width: 357px;
 					height: 100%;
-				}
-			}
-			.common-info {
-				display: flex;
-				flex-wrap: wrap;
-				align-content: flex-start;
-				margin-left: 86px;
-				&-item {
-					flex-direction: column;
-					justify-content: center;
-					width: 184px;
-					height: 100px;
-					margin-right: 26px;
-					margin-bottom: 30px;
-					background: #ffffff;
-					border: 1px solid #ebebeb;
-					border-radius: 4px;
-					@include flex;
-					> div:first-child {
-						@include flex;
-
-						margin-bottom: 12px;
-						span {
-							margin-right: 7px;
-							font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
-							font-size: 18px;
-							font-weight: 500;
-							color: #333333;
-						}
-						img {
-							width: 20px;
-							height: 20px;
-						}
-					}
-					> div:last-child {
-						@include flex;
-						span {
-							font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
-							font-size: 18px;
-							font-weight: 500;
-							color: #00378f;
-						}
-					}
+					margin-right: 215px;
+					margin-left: 215px;
 				}
 			}
 			.monitor-aspect {
diff --git a/src/views/enterprise/liftSupervision/operatingData/index.vue b/src/views/enterprise/liftSupervision/operatingData/index.vue
index 8fc9a79..5930da0 100644
--- a/src/views/enterprise/liftSupervision/operatingData/index.vue
+++ b/src/views/enterprise/liftSupervision/operatingData/index.vue
@@ -23,9 +23,9 @@
 						<span>额定下行速度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
 					</div>
 					<div class="other-info">
-						<span>设备编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}</span>
+						<span>备案编号: TD2374693</span>
 						<span>安装日期: {{ equipInfo.installTime ? equipInfo.installTime : "" }}</span>
-						<!-- <span>终端编号: TD2374693</span> -->
+						<span>终端编号: TD2374693</span>
 						<span>更新时间: {{ equipInfo.realTime ? equipInfo.realTime : "" }}</span>
 					</div>
 				</div>
diff --git a/src/views/goverment/liftSupervision/operatingData/index.scss b/src/views/goverment/liftSupervision/operatingData/index.scss
index fa64dac..8597e67 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.scss
+++ b/src/views/goverment/liftSupervision/operatingData/index.scss
@@ -1,27 +1,29 @@
 @mixin boxStyle {
-	border-radius: 8px;
 	background: #ffffff;
+	border-radius: 8px;
 }
 @mixin flex {
 	display: flex;
 	align-items: center;
 }
 .entire-box {
-	height: 100%;
-	width: 100%;
 	display: flex;
 	flex-direction: column;
+	width: 100%;
+	height: 100%;
 	background-color: #f6f6f6;
 	.operate-box {
 		height: calc(100% - 112px);
-		padding: 0 20px 20px 20px;
+		padding: 0 20px 20px;
 		@include flex;
 		.alarm-data {
 			height: 100%;
+
 			// 页面的项目工程
 			.leftProject {
-				border-radius: 8px;
 				color: #333333;
+				border-radius: 8px;
+
 				// background-color: pink;
 				.projectName {
 					display: block;
@@ -39,9 +41,9 @@
 						font-size: 12px;
 					}
 					img {
-						margin: 0 4px;
 						width: 12px;
 						height: 12px;
+						margin: 0 4px;
 					}
 				}
 				.bottom_item {
@@ -54,10 +56,11 @@
 			.LeftMenu {
 				width: 300px;
 				height: 100%;
-				border-radius: 8px;
+				margin-right: 20px;
+
 				// box-shadow: 0 4px 4px 0 rgb(0 55 143 / 20%);
 				overflow-y: scroll;
-				margin-right: 20px;
+				border-radius: 8px;
 				:deep() {
 					.content {
 						height: calc(100% - 150px);
@@ -67,21 +70,22 @@
 		}
 		.monitor-data {
 			@include boxStyle;
+
 			flex: 1;
 			height: 100%;
 			.monitor-title {
 				margin-top: 15px;
 				margin-left: 36px;
 				span:first-child {
+					margin-right: 20px;
+					font-family: "Source Han Sans CN-Bold", "Source Han Sans CN";
 					font-size: 30px;
-					font-family: Source Han Sans CN-Bold, Source Han Sans CN;
 					font-weight: bold;
 					color: #333333;
-					margin-right: 20px;
 				}
 				span:last-child {
+					font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
 					font-size: 22px;
-					font-family: Source Han Sans CN-Medium, Source Han Sans CN;
 					font-weight: 500;
 					color: #0f64da;
 				}
@@ -94,8 +98,8 @@
 				.monitor-tool {
 					position: relative;
 					span {
+						font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
 						font-size: 18px;
-						font-family: Source Han Sans CN-Regular, Source Han Sans CN;
 						font-weight: 400;
 						color: #000000;
 					}
@@ -116,8 +120,18 @@
 					}
 					.other-info {
 						position: absolute;
-						top: 240px;
-						right: 0px;
+						top: 210px;
+						right: 0;
+						display: flex;
+						flex-direction: column;
+						> span {
+							margin-bottom: 20px;
+						}
+					}
+					.common-info {
+						position: absolute;
+						top: 30px;
+						left: 0;
 						display: flex;
 						flex-direction: column;
 						> span {
@@ -125,35 +139,38 @@
 						}
 					}
 					img {
-						width: 688px;
+						width: 357px;
 						height: 100%;
+						margin-right: 170px;
+						margin-left: 180px;
 					}
 				}
 				.monitor-aspect {
-					margin-left: 56px;
 					display: flex;
 					flex-wrap: wrap;
 					align-content: flex-start;
+					margin-left: 56px;
 					&-item {
-						width: 184px;
-						height: 100px;
-						background: #ffffff;
-						border-radius: 4px;
-						border: 1px solid #ebebeb;
-						@include flex;
 						flex-direction: column;
 						justify-content: center;
+						width: 184px;
+						height: 100px;
 						margin-right: 26px;
 						margin-bottom: 30px;
+						background: #ffffff;
+						border: 1px solid #ebebeb;
+						border-radius: 4px;
+						@include flex;
 						> div:first-child {
 							@include flex;
+
 							margin-bottom: 12px;
 							span {
+								margin-right: 7px;
+								font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
 								font-size: 18px;
-								font-family: Source Han Sans CN-Medium, Source Han Sans CN;
 								font-weight: 500;
 								color: #333333;
-								margin-right: 7px;
 							}
 							img {
 								width: 20px;
@@ -163,8 +180,8 @@
 						> div:last-child {
 							@include flex;
 							span {
+								font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
 								font-size: 18px;
-								font-family: Source Han Sans CN-Medium, Source Han Sans CN;
 								font-weight: 500;
 								color: #00378f;
 							}
@@ -174,14 +191,15 @@
 			}
 			.monitor-equip {
 				margin-top: 31px;
-				margin-left: 36px;
 				margin-bottom: 16px;
+				margin-left: 36px;
 				@include flex;
 				.monitor-state:not(:last-child) {
 					margin-right: 26px;
 				}
 				.monitor-state {
 					@include flex;
+
 					flex-direction: column;
 					align-items: center;
 					> div {
@@ -191,43 +209,45 @@
 							height: 100px;
 						}
 						span {
-							width: 32px;
-							height: 15px;
-							background: #008bff;
-							font-size: 10px;
-							font-family: Source Han Sans CN-Regular, Source Han Sans CN;
-							font-weight: 400;
-							color: #ffffff;
-							text-align: center;
 							position: absolute;
 							top: 0;
 							right: 0;
+							width: 32px;
+							height: 15px;
+							font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+							font-size: 10px;
+							font-weight: 400;
+							color: #ffffff;
+							text-align: center;
+							background: #008bff;
 						}
 					}
 					> span {
+						font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
 						font-size: 16px;
-						font-family: Source Han Sans CN-Regular, Source Han Sans CN;
 						font-weight: 400;
 						color: #000000;
 					}
 				}
 				.active-class {
-					box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2);
+					box-shadow: 0 4px 8px 0 rgb(48 62 100 / 20%);
 				}
 			}
 		}
 		.no-data {
 			@include boxStyle;
-			flex: 1;
-			height: 100%;
+
 			display: flex;
-			justify-content: center;
-			align-items: center;
+			flex: 1;
 			flex-direction: column;
-			color: #999;
+			align-items: center;
+			justify-content: center;
+			height: 100%;
+			color: #999999;
 		}
 		.history-data {
 			@include boxStyle;
+
 			width: 300px;
 			height: 100%;
 			margin-left: 20px;
@@ -241,6 +261,7 @@
 			}
 			.search-wrapper {
 				@include flex;
+
 				height: 50px;
 				padding: 0 10px;
 				background-color: #ffffff;
@@ -253,12 +274,12 @@
 				&-item {
 					display: flex;
 					flex-direction: column;
-					border-bottom: 1px solid #e5e5e5;
 					padding: 12px;
+					border-bottom: 1px solid #e5e5e5;
 					> div {
 						span {
+							font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
 							font-size: 12px;
-							font-family: Source Han Sans CN-Regular, Source Han Sans CN;
 							font-weight: 400;
 							color: #333333;
 						}
@@ -275,14 +296,14 @@
 				&-item {
 					display: flex;
 					flex-direction: column;
-					border-bottom: 1px solid #e5e5e5;
 					padding: 12px;
+					border-bottom: 1px solid #e5e5e5;
 					> div:nth-child(1) {
+						margin-bottom: 10px;
+						font-family: "Source Han Sans CN-Medium", "Source Han Sans CN";
 						font-size: 16px;
-						font-family: Source Han Sans CN-Medium, Source Han Sans CN;
 						font-weight: 500;
 						color: #333333;
-						margin-bottom: 10px;
 					}
 					&-aspect {
 						display: flex;
@@ -291,16 +312,16 @@
 						&-item {
 							margin-bottom: 8px;
 							span {
+								font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
 								font-size: 12px;
-								font-family: Source Han Sans CN-Regular, Source Han Sans CN;
 								font-weight: 400;
 							}
 							> span:nth-child(1) {
 								display: inline-block;
 								width: 36px;
 								height: 18px;
-								color: #606266;
 								margin-right: 20px;
+								color: #606266;
 								text-align: left;
 							}
 							> span:nth-child(2) {
@@ -312,11 +333,11 @@
 						}
 					}
 					> div:last-child {
-						font-size: 10px;
-						font-family: Source Han Sans CN-Regular, Source Han Sans CN;
-						font-weight: 400;
-						color: rgba(102, 102, 102, 0.8);
 						margin-top: 5px;
+						font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
+						font-size: 10px;
+						font-weight: 400;
+						color: rgb(102 102 102 / 80%);
 					}
 				}
 			}
diff --git a/src/views/goverment/liftSupervision/operatingData/index.vue b/src/views/goverment/liftSupervision/operatingData/index.vue
index a1d7e66..8c96333 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.vue
+++ b/src/views/goverment/liftSupervision/operatingData/index.vue
@@ -53,15 +53,21 @@
 				</div>
 				<div class="monitor-content">
 					<div class="monitor-tool">
-						<img src="@/assets/images/onlineSupervision/towerImg.png" alt="" />
-						<span class="property-one">尾臂长: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}m</span>
-						<span class="property-two">臂长: {{ equipInfo.forearmLength ? equipInfo.forearmLength : 0 }}m</span>
-						<span class="property-three">塔身高: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+						<img src="@/assets/images/onlineSupervision/liftImg.jpg" alt="" />
+						<div class="common-info">
+							<span>额定载重: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}kg</span>
+							<span>额定人数: {{ equipInfo.forearmLength ? equipInfo.forearmLength : 0 }}人</span>
+							<span>最大倾斜角度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}°</span>
+							<span>最大高度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+							<span>风级: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}级风</span>
+							<span>额定上行速度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+							<span>额定下行速度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+						</div>
 						<div class="other-info">
-							<span>设备编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}</span>
-							<span>安装日期: {{ equipInfo.installTime ? equipInfo.installTime : "" }}</span>
-							<!-- <span>终端编号: TD2374693</span> -->
-							<span>更新时间: {{ equipInfo.realTime ? equipInfo.realTime : "" }}</span>
+							<span>备案编号: TD2374693</span>
+							<span>安装日期: 2022-12-01</span>
+							<span>终端编号: TD2374693</span>
+							<span>更新时间: 2023-05-23</span>
 						</div>
 					</div>
 					<div class="monitor-aspect">
diff --git a/src/views/project/liftSupervision/operatingData/index.scss b/src/views/project/liftSupervision/operatingData/index.scss
index f9691a0..a502cbe 100644
--- a/src/views/project/liftSupervision/operatingData/index.scss
+++ b/src/views/project/liftSupervision/operatingData/index.scss
@@ -63,7 +63,7 @@
 				}
 				.other-info {
 					position: absolute;
-					top: 240px;
+					top: 230px;
 					right: 0;
 					display: flex;
 					flex-direction: column;
@@ -71,9 +71,21 @@
 						margin-bottom: 20px;
 					}
 				}
+				.common-info {
+					position: absolute;
+					top: 30px;
+					left: 0;
+					display: flex;
+					flex-direction: column;
+					> span {
+						margin-bottom: 20px;
+					}
+				}
 				img {
 					width: 357px;
 					height: 100%;
+					margin-right: 215px;
+					margin-left: 215px;
 				}
 			}
 			.monitor-aspect {
diff --git a/src/views/project/liftSupervision/operatingData/index.vue b/src/views/project/liftSupervision/operatingData/index.vue
index 9b51b43..3719fac 100644
--- a/src/views/project/liftSupervision/operatingData/index.vue
+++ b/src/views/project/liftSupervision/operatingData/index.vue
@@ -10,13 +10,22 @@
 			<div class="monitor-content">
 				<div class="monitor-tool">
 					<img src="@/assets/images/onlineSupervision/liftImg.jpg" alt="" />
-					<span class="property-one">尾臂长: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}m</span>
+					<!-- <span class="property-one">尾臂长: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}m</span>
 					<span class="property-two">臂长: {{ equipInfo.forearmLength ? equipInfo.forearmLength : 0 }}m</span>
-					<span class="property-three">塔身高: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+					<span class="property-three">塔身高: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span> -->
+					<div class="common-info">
+						<span>额定载重: {{ equipInfo.posteriorArmLength ? equipInfo.posteriorArmLength : 0 }}kg</span>
+						<span>额定人数: {{ equipInfo.forearmLength ? equipInfo.forearmLength : 0 }}人</span>
+						<span>最大倾斜角度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}°</span>
+						<span>最大高度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+						<span>风级: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}级风</span>
+						<span>额定上行速度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+						<span>额定下行速度: {{ equipInfo.towerHeight ? equipInfo.towerHeight : 0 }}m</span>
+					</div>
 					<div class="other-info">
-						<span>设备编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}</span>
+						<span>备案编号: TD2374693</span>
 						<span>安装日期: {{ equipInfo.installTime ? equipInfo.installTime : "" }}</span>
-						<!-- <span>终端编号: TD2374693</span> -->
+						<span>终端编号: TD2374693</span>
 						<span>更新时间: {{ equipInfo.realTime ? equipInfo.realTime : "" }}</span>
 					</div>
 				</div>