From 9ea6c11043df54a92852f5317a01941c85b5a8c9 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 31 May 2023 19:34:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8A=B3=E5=8A=A1=E5=AE=9E=E5=90=8D?=
 =?UTF-8?q?=E5=88=B6-=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/project.ts                    |   8 +
 src/assets/images/projectLogon/Vector.png     | Bin 0 -> 1669 bytes
 .../images/projectLogon/idCard-badge.png      | Bin 0 -> 2780 bytes
 .../images/projectLogon/idCard-face.png       | Bin 0 -> 2368 bytes
 .../dustSupervision/realTime/index.vue        |   2 +-
 .../videoMonitor/realtimeVideo/index.vue      |   8 +-
 src/views/goverment/videoMonitor/index.vue    |   8 +-
 .../dustSupervision/realTime/index.vue        |   2 +-
 .../laborRealName/classGroupManage/index.vue  |   5 +-
 .../memberManage/components/addMemberForm.vue | 776 ++++++++++++++++++
 .../laborRealName/memberManage/index.vue      | 280 ++++---
 .../laborRealName/workTypeManage/index.scss   |  21 +
 .../laborRealName/workTypeManage/index.vue    |  49 +-
 .../videoMonitor/realtimeVideo/index.vue      |   8 +-
 14 files changed, 991 insertions(+), 176 deletions(-)
 create mode 100644 src/assets/images/projectLogon/Vector.png
 create mode 100644 src/assets/images/projectLogon/idCard-badge.png
 create mode 100644 src/assets/images/projectLogon/idCard-face.png
 create mode 100644 src/views/project/laborRealName/memberManage/components/addMemberForm.vue
 create mode 100644 src/views/project/laborRealName/workTypeManage/index.scss

diff --git a/src/api/modules/project.ts b/src/api/modules/project.ts
index a428105..a4177ff 100644
--- a/src/api/modules/project.ts
+++ b/src/api/modules/project.ts
@@ -310,3 +310,11 @@ export const getworkTypeList = (params: FormData) => {
 export const addWorkType = (params: FormData) => {
 	return http.post(BASEURL + `/project/workerType/add`, params);
 };
+// 工种管理编辑
+export const updateWorkType = (params: FormData) => {
+	return http.post(BASEURL + `/project/workerType/edit`, params);
+};
+// 工种管理删除
+export const deleteWorkType = (params: { id: string }) => {
+	return http.post(BASEURL + `/project/workerType/delete`, params);
+};
diff --git a/src/assets/images/projectLogon/Vector.png b/src/assets/images/projectLogon/Vector.png
new file mode 100644
index 0000000000000000000000000000000000000000..e36200349474a58250cf066f41c321ddabf6ac23
GIT binary patch
literal 1669
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
P00000NkvXXu0mjfTvrl;

literal 0
HcmV?d00001

diff --git a/src/assets/images/projectLogon/idCard-badge.png b/src/assets/images/projectLogon/idCard-badge.png
new file mode 100644
index 0000000000000000000000000000000000000000..464e60e93ad75fee196ede93754d79d6b28e79b9
GIT binary patch
literal 2780
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
LL?P;|{4@Rw`b$_c

literal 0
HcmV?d00001

diff --git a/src/assets/images/projectLogon/idCard-face.png b/src/assets/images/projectLogon/idCard-face.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5f8a2d6a282bd88859d49ffb48bb58fe2d31c47
GIT binary patch
literal 2368
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

literal 0
HcmV?d00001

diff --git a/src/views/enterprise/dustSupervision/realTime/index.vue b/src/views/enterprise/dustSupervision/realTime/index.vue
index eb6178d..7e8e19d 100644
--- a/src/views/enterprise/dustSupervision/realTime/index.vue
+++ b/src/views/enterprise/dustSupervision/realTime/index.vue
@@ -89,7 +89,7 @@ const columns: ColumnProps[] = [
 		prop: "winddirection",
 		label: "风向",
 		render: scoped => {
-			return scoped.row.pm25 + "风";
+			return scoped.row.winddirection + "风";
 		}
 	},
 	{ prop: "createTime", label: "上报时间" }
diff --git a/src/views/enterprise/videoMonitor/realtimeVideo/index.vue b/src/views/enterprise/videoMonitor/realtimeVideo/index.vue
index 73c21de..c5cf0d1 100644
--- a/src/views/enterprise/videoMonitor/realtimeVideo/index.vue
+++ b/src/views/enterprise/videoMonitor/realtimeVideo/index.vue
@@ -41,10 +41,10 @@ let initCount = ref(0);
 let oWebControl = ref(null);
 let cameraIndexCode = ref<Array<string>>([]);
 let objData = ref({
-	appkey: "24017757", //海康提供的appkey
-	ip: "182.101.141.23", //海康提供的ip
-	secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
-	port: 18443,
+	appkey: "21582859", //海康提供的appkey
+	ip: "120.236.122.37", //海康提供的ip
+	secret: "CfxWWzB9MEC5y6R5CmWI", //海康提供的secret
+	port: 81,
 	playMode: 0, // 0 预览 1回放
 	layout: "4x6" //页面展示的模块数【16】
 });
diff --git a/src/views/goverment/videoMonitor/index.vue b/src/views/goverment/videoMonitor/index.vue
index a751b48..8d176e9 100644
--- a/src/views/goverment/videoMonitor/index.vue
+++ b/src/views/goverment/videoMonitor/index.vue
@@ -219,10 +219,10 @@ let initCount = ref(0);
 let oWebControl = ref(null);
 let cameraIndexCode = ref<Array<string>>([]);
 let objData = ref({
-	appkey: "24017757", //海康提供的appkey
-	ip: "182.101.141.23", //海康提供的ip
-	secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
-	port: 18443,
+	appkey: "21582859", //海康提供的appkey
+	ip: "120.236.122.37", //海康提供的ip
+	secret: "CfxWWzB9MEC5y6R5CmWI", //海康提供的secret
+	port: 81,
 	playMode: 0, // 0 预览 1回放
 	layout: "4x6" //页面展示的模块数【16】
 });
diff --git a/src/views/project/dustSupervision/realTime/index.vue b/src/views/project/dustSupervision/realTime/index.vue
index 1b0a6f0..98d4548 100644
--- a/src/views/project/dustSupervision/realTime/index.vue
+++ b/src/views/project/dustSupervision/realTime/index.vue
@@ -87,7 +87,7 @@ const columns: ColumnProps[] = [
 		prop: "winddirection",
 		label: "风向",
 		render: scoped => {
-			return scoped.row.pm25 + "风";
+			return scoped.row.winddirection + "风";
 		}
 	},
 	{ prop: "createTime", label: "上报时间" }
diff --git a/src/views/project/laborRealName/classGroupManage/index.vue b/src/views/project/laborRealName/classGroupManage/index.vue
index 166e96a..a5d5e2d 100644
--- a/src/views/project/laborRealName/classGroupManage/index.vue
+++ b/src/views/project/laborRealName/classGroupManage/index.vue
@@ -80,6 +80,7 @@ import {
 	classGroupInfo
 } from "@/api/modules/project";
 import DialogForm from "@/components/DialogForm/index.vue";
+import { Delete } from "@element-plus/icons-vue";
 
 import { GlobalStore } from "@/stores";
 
@@ -240,10 +241,10 @@ const getTableList = (params: any) => {
 
 const handleAddItem = async (index: number, row: any) => {
 	if (index === 1) {
-		title.value = "新增班组管理";
+		title.value = "新增班组";
 		formData.value = reactive({});
 	} else {
-		title.value = "编辑班组管理";
+		title.value = "编辑班组";
 		console.log(row);
 		const res: any = await classGroupInfo({ id: row.id });
 		formData.value = reactive({ ...res.result });
diff --git a/src/views/project/laborRealName/memberManage/components/addMemberForm.vue b/src/views/project/laborRealName/memberManage/components/addMemberForm.vue
new file mode 100644
index 0000000..8ba52ce
--- /dev/null
+++ b/src/views/project/laborRealName/memberManage/components/addMemberForm.vue
@@ -0,0 +1,776 @@
+<template>
+	<div class="overview">
+		<el-dialog title="新增工人" show-close v-model="visible1" style="min-width: 1300px">
+			<el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="200px" class="form" size="default">
+				<!-- 基础信息 -->
+				<div>
+					<div class="form-title">
+						<div>基础信息</div>
+					</div>
+					<div class="row">
+						<el-form-item label="姓名:" prop="personName">
+							<el-input placeholder="请输入" v-model="form.personName" disabled />
+						</el-form-item>
+						<el-form-item label="性别:" prop="engineeringName">
+							<el-radio-group placeholder="请选择" v-model="form.isImportant">
+								<el-radio :label="1">男</el-radio>
+								<el-radio :label="0">女</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="出生日期:" prop="projectName">
+							<el-input placeholder="请输入" v-model="form.projectName" />
+						</el-form-item>
+						<el-form-item label="民族:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.projectName" />
+						</el-form-item>
+					</div>
+					<el-form-item label="住址:" prop="registerAddress">
+						<el-input placeholder="请输入" v-model="form.registerAddress" />
+					</el-form-item>
+					<div class="row">
+						<el-form-item label="身份证号:" prop="projectName">
+							<el-input placeholder="请输入" v-model="form.projectName" />
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="签发机关:" prop="projectName">
+							<el-input placeholder="请输入" v-model="form.projectName" />
+						</el-form-item>
+						<el-form-item label="身份证有效期:" prop="engineeringName">
+							<div class="date-select">
+								<el-date-picker
+									style="width: 62%; margin-right: 8px"
+									v-model="form.engineeringName"
+									format="YYYY-MM-DD"
+									value-format="YYYY-MM-DD"
+									type="datetime"
+									placeholder="请选择时间"
+									v-if="changeType == 1"
+								/>
+								<div v-else>长期</div>
+								<el-radio-group v-model="changeType">
+									<el-radio-button label="1">日期</el-radio-button>
+									<el-radio-button label="2">长期</el-radio-button>
+								</el-radio-group>
+							</div>
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="身份证:" prop="isImportant">
+							<div class="idCard-img">
+								<el-upload
+									class="avatar-uploader"
+									:action="`${baseUrl}` + '/xmgl/file/upload'"
+									:show-file-list="false"
+									:on-success="handleAvatarSuccess"
+									:before-upload="beforeAvatarUpload"
+									accept="image/jpg, image/jpeg, image/png"
+								>
+									<img v-if="form.engineeringArea" :src="form.engineeringArea" class="avatar" />
+									<span v-else class="text-tip">上传身份证人像面</span>
+								</el-upload>
+								<el-upload
+									class="avatar-uploader"
+									:action="`${baseUrl}` + '/xmgl/file/upload'"
+									:show-file-list="false"
+									:on-success="handleAvatarSuccess"
+									:before-upload="beforeAvatarUpload"
+									accept="image/jpg, image/jpeg, image/png"
+								>
+									<img v-if="form.engineeringArea" :src="form.engineeringArea" class="avatar" />
+									<span v-else class="text-tip">上传身份证国徽面</span>
+								</el-upload>
+							</div>
+							<div class="idCard-tip">请上传清晰、完善、无遮挡物的身份证照片</div>
+						</el-form-item>
+						<el-form-item label="人像信息:" prop="position">
+							<div class="face-img">
+								<el-upload
+									class="face-uploader"
+									:action="`${baseUrl}` + '/xmgl/file/upload'"
+									:show-file-list="false"
+									:on-success="handleAvatarSuccess"
+									:before-upload="beforeAvatarUpload"
+									accept="image/jpg, image/jpeg, image/png"
+								>
+									<img v-if="form.engineeringArea" :src="form.engineeringArea" class="face-avatar" />
+									<el-icon v-else><plus /></el-icon>
+								</el-upload>
+								<div class="face-tip">
+									<span>人员照片示例</span>
+									<el-popover placement="right" :width="371" title="注册照片示例" trigger="hover">
+										<template #reference>
+											<div class="tip-circle">?</div>
+										</template>
+										<div class="face-register">
+											<div class="face-top">
+												<div class="face-top-left">
+													<img src="@/assets/images/projectLogon/vector.png" alt="" />
+												</div>
+												<div class="face-top-right">
+													<span>1.简单背景;</span>
+													<span>2.正脸表情;</span>
+													<span>3.正常镜片无反光;</span>
+													<span>4.面部光照强度适中;</span>
+													<span>5.面部明暗均匀;</span>
+												</div>
+											</div>
+											<div class="face-bottom">
+												<div class="face-bottom-title">照片要求</div>
+												<div class="face-bottom-require">
+													<span>1.小于400k;</span>
+													<span>2.面部区域像素不低于128X128,面部大小占整张照片1/3以上;</span>
+													<span>3.确保所有注册照为同一人,否则无法成功注册;</span>
+												</div>
+											</div>
+										</div>
+									</el-popover>
+								</div>
+							</div>
+						</el-form-item>
+					</div>
+				</div>
+				<div>
+					<!-- 进场信息 -->
+					<div class="form-title">
+						<div>进场信息</div>
+					</div>
+					<div class="row">
+						<el-form-item label="手机号:" prop="projectName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+						<el-form-item label="现居住地 :" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="参建单位:" prop="address">
+							<el-input placeholder="请输入" v-model="form.address" />
+						</el-form-item>
+						<el-form-item label="班组 :" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="工种 :" prop="engineeringCost">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+						<el-form-item label="人员类别:" prop="engineeringName">
+							<el-radio-group placeholder="请选择" v-model="form.isImportant">
+								<el-radio :label="1">男</el-radio>
+								<el-radio :label="0">女</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="是否参与安全教育:" prop="engineeringName">
+							<el-radio-group placeholder="请选择" v-model="form.isImportant">
+								<el-radio :label="1">合格</el-radio>
+								<el-radio :label="2">不合格</el-radio>
+								<el-radio :label="3">未培训</el-radio>
+							</el-radio-group>
+						</el-form-item>
+						<el-form-item label="是否购买工伤和意外保险:" prop="engineeringName">
+							<el-radio-group placeholder="请选择" v-model="form.isImportant">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="2">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="有无合同 :" prop="engineeringCost">
+							<el-radio-group placeholder="请选择" v-model="form.isImportant">
+								<el-radio :label="1">有</el-radio>
+								<el-radio :label="2">无</el-radio>
+							</el-radio-group>
+							<el-upload
+								v-model:file-list="filelist"
+								class="upload-demo"
+								:action="`${baseUrl}` + '/xmgl/file/upload'"
+								multiple
+								:limit="1"
+								:on-success="uploadSuccess"
+								style="display: flex; align-items: center; justify-content: center; margin-left: 22px"
+							>
+								<el-button plain color="#47A99D" size="small">选择文件</el-button>
+								<template #tip>
+									<div v-show="!form.engineeringCost" style="margin-left: 10px; color: #aeaeae">未选择任何文件</div>
+								</template>
+							</el-upload>
+						</el-form-item>
+						<el-form-item label="是否体验:" prop="engineeringName">
+							<el-radio-group placeholder="请选择" v-model="form.isImportant">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="2">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</div>
+				</div>
+				<!-- 银行卡与社保 -->
+				<div>
+					<div class="form-title">
+						<div>银行卡和社保</div>
+					</div>
+					<div class="row">
+						<el-form-item label="银行类型:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+						<el-form-item label="银行卡号:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="实名制卡号:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+						<el-form-item label="开户支行名称:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="开户支行代号:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+					</div>
+				</div>
+				<!-- 其他信息 -->
+				<div>
+					<div class="form-title">
+						<div>其他信息</div>
+					</div>
+					<div class="row">
+						<el-form-item label="政治面貌:" prop="politicsStatus">
+							<el-select v-model="form.politicsStatus" placeholder="请选择" style="width: 100%">
+								<el-option v-for="item in politicsStatusList" :key="item.value" :label="item.label" :value="item.value">
+								</el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item label="学历:" prop="educationLevel">
+							<el-select v-model="form.educationLevel" placeholder="请选择" style="width: 100%">
+								<el-option
+									v-for="item in educationLevelList"
+									:key="item.dictValue"
+									:label="item.dictValue"
+									:value="item.dictLabel"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="学位:" prop="academicDegree">
+							<el-select v-model="form.academicDegree" placeholder="请选择">
+								<el-option v-for="item in academicDegreeList" :key="item.label" :label="item.label" :value="item.value">
+								</el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item label="是否有重大病史:" prop="engineeringName">
+							<el-radio-group placeholder="请选择" v-model="form.isImportant">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="2">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="户口性质:" prop="engineeringName">
+							<el-radio-group placeholder="请选择" v-model="form.isImportant">
+								<el-radio :label="1">是</el-radio>
+								<el-radio :label="2">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+						<el-form-item label="婚姻状况:" prop="maritalStatus">
+							<el-select v-model="form.maritalStatus" placeholder="请选择" style="width: 100%">
+								<el-option v-for="item in maritalStatusList" :key="item.label" :label="item.label" :value="item.value">
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="紧急联系人:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+						<el-form-item label="紧急联系电话:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="开始工作日期:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+						<el-form-item label="岗前培训日期:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+					</div>
+					<div class="row">
+						<el-form-item label="邮箱:" prop="engineeringName">
+							<el-input placeholder="请输入" v-model="form.engineeringCost" />
+						</el-form-item>
+					</div>
+				</div>
+				<footer class="footer flx-center">
+					<el-button class="cancelButtonStyle" @click="visible1 = false">取消</el-button>
+					<el-button type="primary" @click="submitForm(form)">保存</el-button>
+				</footer>
+			</el-form>
+		</el-dialog>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, ref, watch } from "vue";
+import type { UploadProps } from "element-plus";
+import { ElMessage } from "element-plus";
+import { getDicList } from "@/api/modules/jxjview";
+const baseUrl = import.meta.env.VITE_API_URL;
+const props = defineProps({
+	newMemberDialog: Boolean
+});
+const visible1 = ref(false);
+const changeType = ref(1);
+const filelist = ref([]);
+const emits = defineEmits(["update:newMemberDialog"]);
+const rules = ref({
+	personName: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	sex: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	birthday: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	nation: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	address: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	idCard: [
+		{
+			pattern: /^[1-9]\d{5}(19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i,
+			message: "请输入正确的身份证号码",
+			trigger: "blur"
+		}
+	],
+	issuingAuthorityForIdCard: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	phone: [
+		{
+			pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+			message: "请输入合法手机号",
+			trigger: "blur"
+		}
+	],
+	companySn: [
+		{
+			pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	teamSn: [
+		{
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	workerType: [
+		{
+			message: "请选择",
+			trigger: "change"
+		}
+	],
+	legalPersonCard: [
+		{
+			pattern: /^[1-9]\d{5}(19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i,
+			message: "请输入正确的身份证号码",
+			trigger: "change"
+		}
+	]
+});
+const enum Type {
+	One = 1,
+	Two = 2,
+	Three = 3,
+	Four = 4,
+	Five = 5
+}
+const politicsStatusList = ref([
+	{ label: "中共党员", value: 1 },
+	{ label: "共青团团员", value: 2 },
+	{ label: "普通居民", value: 3 },
+	{ label: "其他党派人士", value: 4 }
+]);
+const academicDegreeList = ref([
+	{ label: "学士", value: 1 },
+	{ label: "硕士", value: 2 },
+	{ label: "博士", value: 3 }
+]);
+const maritalStatusList = ref([
+	{ label: "未婚", value: 1 },
+	{ label: "已婚", value: 2 }
+]);
+const educationLevelList: any = ref([]);
+const form = ref({
+	personName: "",
+	sex: 1,
+	birthday: "",
+	nation: "",
+	registerAddress: "",
+	idCard: "",
+	issuingAuthorityForIdCard: "",
+	idCardExpireDate: "",
+	idCardFront: "",
+	idCardBack: "",
+	portrait: "",
+	phone: "",
+	address: "",
+	companySn: "",
+	teamSn: "",
+	personType: Type["One"],
+	safetyEducation: Type["One"],
+	isPurchaseInsurance: Type["One"],
+	isContract: Type["One"],
+	isPhysicalExamination: Type["One"],
+	bankType: Type["One"],
+	bankCard: "",
+	realNameCardNumber: "",
+	bankName: "",
+	bankCode: "",
+	politicsStatus: null
+});
+// 图片上传成功后的钩子
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+	console.log(response.result.url);
+};
+
+const beforeAvatarUpload: UploadProps["beforeUpload"] = rawFile => {
+	if (rawFile.type !== "image/png" && rawFile.type !== "image/jpg" && rawFile.type !== "image/jpeg") {
+		console.log(rawFile.type);
+
+		ElMessage.error("请上传jpg或者png格式的图片");
+		return false;
+	}
+	//   限制文件大小
+	//   else if (rawFile.size / 1024 / 1024 > 2) {
+	//     ElMessage.error('Avatar picture size can not exceed 2MB!')
+	//     return false
+	//   }
+	return true;
+};
+const uploadSuccess = (response: any) => {
+	ElMessage.success("上传成功");
+	// ruleForm.businessLicense = response.result.originalFilename;
+	// ruleForm.businessLicense = response.result.url;
+	// ruleForm.businessLicenseOriginalName = response.result.originalFilename;
+
+	// businessLicense.value = [{ name: response.result.originalFilename, url: response.result.downloadPath }];
+};
+// 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 = initParam.engineeringSn;
+	// 		saveItem(data);
+	// 	} else {
+	// 		console.log("error submit!", fields);
+	// 	}
+	// });
+};
+const getDicMainList = async () => {
+	const { result } = await getDicList({ dictType: "education_level" });
+	educationLevelList.value.length = 0;
+	educationLevelList.value.push(...result);
+};
+// 监听父组件的visible，用来简介控制el-dialog的弹框开关，一般是用于开
+watch(
+	() => props.newMemberDialog,
+	(n, o) => {
+		visible1.value = n;
+	}
+);
+// 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关
+watch(visible1, (n, o) => {
+	emits("update:newMemberDialog", n);
+});
+onMounted(() => {
+	getDicMainList();
+});
+</script>
+
+<style lang="scss" scoped>
+@mixin fullwidth {
+	width: -webkit-fill-available;
+	width: -moz-available;
+	width: stretch;
+}
+.overview {
+	// background-color: #fff;
+	flex: 1;
+	.form {
+		background-color: #fff;
+		.form-title {
+			display: flex;
+			flex-direction: column;
+			background-color: #fff;
+			margin-bottom: 32px;
+			div {
+				position: relative;
+				padding-left: 6px;
+				font-size: 14px;
+				font-weight: 400;
+				color: #333333;
+				border-left: 3px solid #008bff;
+			}
+		}
+		.date-select {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+		}
+		.idCard-img {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.avatar-uploader {
+				width: 178px;
+				height: 115px;
+				line-height: 150px;
+				text-align: center;
+				border-radius: 6px;
+				cursor: pointer;
+				position: relative;
+				overflow: hidden;
+				.text-tip {
+					font-size: 10px;
+					font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+					font-weight: 400;
+					color: #616161;
+				}
+			}
+			.avatar-uploader:hover {
+				border-color: #409eff;
+			}
+			.avatar-uploader:first-child {
+				background: url("@/assets/images/projectLogon/idCard-face.png") center center no-repeat;
+			}
+			.avatar-uploader:last-child {
+				background: url("@/assets/images/projectLogon/idCard-badge.png") center center no-repeat;
+			}
+			.avatar {
+				width: 178px;
+				height: 115px;
+				display: block;
+			}
+		}
+		.idCard-tip {
+			font-size: 12px;
+			font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+			font-weight: 400;
+			color: #616161;
+		}
+		.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;
+			}
+			.face-tip {
+				display: flex;
+				align-items: center;
+				font-size: 12px;
+				.tip-circle {
+					width: 15px;
+					height: 15px;
+					text-align: center;
+					line-height: 15px;
+					background: #008bff;
+					opacity: 1;
+					border-radius: 50%;
+					color: white;
+					margin-left: 4px;
+				}
+			}
+		}
+		.row {
+			display: flex;
+			justify-content: space-between;
+			> :first-child,
+			> :last-child {
+				width: 45%;
+			}
+		}
+		:deep(.el-input--default) {
+			width: 100%;
+		}
+		.select {
+			width: 100%;
+		}
+		.continuous {
+			@include fullwidth;
+
+			box-sizing: border-box;
+			display: flex;
+			gap: 5px;
+			align-items: center;
+			justify-content: space-around;
+			width: 90%;
+			min-height: 40px;
+			padding-inline: 10px;
+			border: 1px solid #dddddd;
+			border-radius: 5px;
+			.label {
+				display: flex;
+				flex: 1;
+				align-items: center;
+				span {
+					flex-shrink: 0;
+					margin-right: 4px;
+					font-size: 12px;
+				}
+			}
+		}
+		.calendar {
+			position: absolute;
+			inset-block: 1px;
+			right: 1px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 41px;
+			height: 31px;
+			cursor: pointer;
+			background-color: #008aff;
+			border-top-right-radius: 2px;
+			border-bottom-right-radius: 2px;
+			.icon {
+				font-size: 20px;
+				color: #ffffff;
+			}
+		}
+		v-deep {
+			.date {
+				@include fullwidth;
+			}
+			.el-input__prefix {
+				display: none;
+			}
+		}
+	}
+	.footer {
+		display: flex;
+		justify-content: center;
+		margin: 40px;
+	}
+}
+.face-register {
+	.face-top {
+		display: flex;
+		&-left {
+			width: 90px;
+			height: 91px;
+			background: #ffffff;
+			border-radius: 6px 6px 6px 6px;
+			opacity: 1;
+			border: 1px solid #e5e5e5;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+		&-right {
+			width: 130px;
+			height: 91px;
+			line-height: 19px !important;
+			display: flex;
+			flex-direction: column;
+			margin-left: 10px;
+		}
+	}
+	.face-bottom {
+		display: flex;
+		flex-direction: column;
+		margin-top: 20px;
+		&-title {
+			font-size: 16px;
+			font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+			font-weight: 700;
+			color: #333333;
+			line-height: 16px;
+		}
+		&-require {
+			width: 100%;
+			height: 91px;
+			display: flex;
+			flex-direction: column;
+			margin-top: 10px;
+		}
+	}
+}
+
+.test :deep(.el-input__wrapper) {
+	box-shadow: 0 0 0 0;
+}
+.test :deep(.el-input__inner) {
+	text-align: center;
+}
+:deep(.el-table__empty-text) {
+	min-height: 200px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+</style>
diff --git a/src/views/project/laborRealName/memberManage/index.vue b/src/views/project/laborRealName/memberManage/index.vue
index 1023f64..81ff4ac 100644
--- a/src/views/project/laborRealName/memberManage/index.vue
+++ b/src/views/project/laborRealName/memberManage/index.vue
@@ -2,7 +2,7 @@
 	<div class="table-box">
 		<ProTable
 			ref="proTable"
-			title="参建单位列表"
+			title="班组管理列表"
 			:columns="columns"
 			:requestApi="getTableList"
 			:dataCallback="dataCallback"
@@ -10,21 +10,20 @@
 			:pagination="true"
 			background
 			:isShowSearch="false"
+			:initParam="initParam"
 			:onReset="true"
 		>
 			<template #formButton="scope">
 				<el-button class="addButtonStyle" @click="handleAddItem(1)">新增</el-button>
+				<el-button type="primary" @click="handleAddItem(1)">批量复职</el-button>
+				<el-button type="primary" @click="handleAddItem(1)">批量离场</el-button>
 			</template>
 			<template #operation="{ row }">
-				<el-button type="primary" link @click="handleEditItem(row)">
-					<img src="@/assets/images/tableIcon/配置权限.png" alt="" class="configureIcon" />
-					<span>配置权限</span>
-				</el-button>
 				<el-button type="primary" link @click="handleAddItem(2, row)">
 					<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
 					<span>编辑</span>
 				</el-button>
-				<el-button type="danger" link :icon="Delete" @click="deleteAccount(row)">删除</el-button>
+				<el-button type="danger" link :icon="Delete" @click="deleteGroup(row)">删除</el-button>
 			</template>
 			<template #state="{ row }">
 				<span :class="row.state === 1 ? '' : 'redText'">{{ row.state == 1 ? "启用" : "禁用" }}</span>
@@ -43,7 +42,13 @@
 				</div>
 			</template>
 		</el-drawer>
-
+		<engineeringDrawer v-model="engVisable" ref="engDrawer" :request="getengineering">
+			<template #default="{ data }">
+				<span style="margin-left: 10px" @click="onUpdate(data)">{{ data.engineeringName }}</span>
+			</template>
+		</engineeringDrawer>
+		<allEngineering @click="engVisable = true" />
+		<addMemberForm v-model:newMemberDialog="newMemberDialog"></addMemberForm>
 		<DialogForm
 			:title="title"
 			:formConfig="formConfig"
@@ -58,49 +63,108 @@
 </template>
 
 <script setup lang="tsx" name="ProjectSupervisionRecord">
-import { ref, reactive, nextTick } from "vue";
-import { ElMessage, ElMessageBox, ElTree } from "element-plus";
+import { ref, reactive, nextTick, onMounted } from "vue";
+import { ElMessage, ElMessageBox, ElTree, FormInstance } 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 TreeFilter from "@/components/TreeFilter/index.vue";
+import engineeringDrawer from "@/components/engineeringDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { editRolePermissions, getSystemRole, getTreemRoleList, getTreeByIdList } from "@/api/modules/goverment";
 import {
-	getRoleList,
-	addRole,
-	editRole,
-	deleteRole,
-	editRolePermissions,
-	getSystemRole,
-	getTreemRoleList,
-	getTreeByIdList
-} from "@/api/modules/goverment";
+	addClassGroup,
+	updateClassGroup,
+	deleteClassGroup,
+	getClassGroupList,
+	getBuildUnitAll,
+	classGroupInfo
+} from "@/api/modules/project";
 import DialogForm from "@/components/DialogForm/index.vue";
-// import { getProjectRecordPage } from "@/api/modules/project";
-
+import addMemberForm from "./components/addMemberForm.vue";
 import { Delete } from "@element-plus/icons-vue";
+
 import { GlobalStore } from "@/stores";
 
 const treeRef = ref(null);
-
+const engVisable = ref(false);
 const datas = reactive([]);
+const formRef = ref<FormInstance>();
 
 const defaultProps = {
 	children: "children",
-	label: (data, node) => node.data.meta.title
+	label: (data: any, node: { data: { meta: { title: any } } }) => node.data.meta.title
 };
 const router = useRouter();
 const store = GlobalStore();
-const visible = ref(false);
 const drawerVisible = ref(false);
+const visible = ref(false);
+const newMemberDialog = ref(false);
 const title = ref("");
-const formData = ref({
-	roleName: "",
-	priority: 1,
-	state: 0,
-	roleDesc: ""
+// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+const initParam = reactive({
+	solveFlag: 1,
+	engineeringSn: ""
 });
+const formData = ref({});
+// 弹窗中的配置
+const formConfig = {
+	formItemConfig: [
+		{
+			label: "参建单位",
+			prop: "companySn",
+			type: "select",
+			data: []
+		},
+		{
+			label: "班组名称",
+			prop: "teamName",
+			type: "input"
+		},
+		{
+			label: "班组长",
+			prop: "leaderName",
+			type: "input"
+		},
+		{
+			label: "班组长电话",
+			prop: "leaderTel",
+			type: "input"
+		},
+		{
+			label: "进场时间",
+			prop: "entryTime",
+			type: "date",
+			format: "YYYY-MM-DD",
+			valueFormat: "YYYY-MM-DD"
+		}
+	],
+	rules: {
+		companySn: [
+			{
+				required: true,
+				message: "请选择",
+				trigger: "change"
+			}
+		],
+		teamName: [
+			{
+				required: true,
+				message: "请输入",
+				trigger: "blur"
+			}
+		],
+		leaderTel: [
+			{
+				pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+				message: "请输入合法手机号",
+				trigger: "change"
+			}
+		]
+	}
+};
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const proTable = ref();
 
@@ -110,88 +174,34 @@ const getId = ref<number | undefined>(undefined);
 const columns: ColumnProps[] = [
 	{ type: "index", label: "序号", width: 80 },
 	{
-		prop: "roleName",
-		label: "单位名称",
-		search: { el: "input" }
+		prop: "companyName",
+		label: "工程名称"
 	},
-	// 多级 prop
-	{ prop: "priority", label: "显示顺序" },
-	{ prop: "state", label: "使用状态" },
 	{
-		prop: "state",
-		label: "状态",
+		prop: "personType",
+		label: "人员类别",
 		search: { el: "select" },
-		isShow: false,
 		enum: [
-			{ label: "启用", value: 1 },
-			{ label: "禁用", value: 0 }
+			{ label: "管理", value: 1 },
+			{ label: "工人", value: 2 }
 		]
 	},
+	{ prop: "teamName", label: "姓名", search: { el: "input" } },
+	{ prop: "teamName", label: "身份证号", search: { el: "input" } },
 	{
-		prop: "createTime",
-		label: "创建时间",
-		search: {
-			el: "date-picker",
-
-			props: {
-				type: "daterange",
-				format: "YYYY-MM-DD",
-				valueFormat: "YYYY-MM-DD"
-				// defaultTime: defaultTime2
-			}
-		}
+		prop: "inServiceType",
+		label: "人员状态",
+		search: { el: "select" },
+		enum: [
+			{ label: "在场", value: 1 },
+			{ label: "离场", value: 2 }
+		]
 	},
+	{ prop: "leaderName", label: "班组长" },
+	{ prop: "leaderTel", label: "班组长电话" },
 	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
 ];
 
-// 弹窗中的配置
-const formConfig = {
-	formItemConfig: [
-		{
-			label: "角色名称",
-			prop: "roleName",
-			type: "input"
-		},
-		{
-			label: "角色顺序",
-			prop: "priority",
-			type: "number"
-		},
-		{
-			label: "状态",
-			prop: "state",
-			type: "radio",
-			data: [
-				{ label: "启用", value: 1 },
-				{ label: "禁用", value: 0 }
-			]
-		},
-		{
-			label: "备注",
-			prop: "roleDesc",
-			type: "input",
-			mapIcon: true
-			// 标记dialog
-		}
-	],
-	rules: {
-		roleName: [
-			{
-				required: true,
-				message: "请输入角色名称",
-				trigger: "blur"
-			}
-		],
-		priority: [
-			{
-				required: true,
-				message: "请输入角色顺序",
-				trigger: "blur"
-			}
-		]
-	}
-};
-
 // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
 // 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
 const dataCallback = (data: any) => {
@@ -204,7 +214,7 @@ const dataCallback = (data: any) => {
 	};
 };
 
-const closeDrawer = done => {
+const closeDrawer = (done: () => void) => {
 	datas.length = 0;
 	done();
 };
@@ -215,7 +225,7 @@ const cacel = () => {
 };
 
 const transfrom = (arr: Array<any>) => {
-	const result = [];
+	const result: any[] | ConcatArray<{ authorityId: any; roleId: number | undefined; type: any }> = [];
 	return arr
 		.map(item => {
 			if (arr.children && Array.isArray(arr.children)) {
@@ -247,23 +257,20 @@ const getTableList = (params: any) => {
 		newParams.createTime_end = newParams.createTime[1];
 		delete newParams.createTime;
 	}
-	return getRoleList(newParams);
+	return getClassGroupList(newParams);
 };
 
-const handleAddItem = (index: number, row: any) => {
+const handleAddItem = async (index: number, row: any) => {
 	if (index === 1) {
-		title.value = "新增角色";
-		formData.value = reactive({
-			roleName: "",
-			priority: 1,
-			state: 1,
-			roleDesc: ""
-		});
+		title.value = "新增班组";
+		formData.value = reactive({});
 	} else {
-		title.value = "编辑角色";
-		formData.value = reactive({ ...row });
+		title.value = "编辑班组";
+		console.log(row);
+		const res: any = await classGroupInfo({ id: row.id });
+		formData.value = reactive({ ...res.result });
 	}
-	visible.value = true;
+	newMemberDialog.value = true;
 };
 
 // 修改数据按钮
@@ -278,31 +285,54 @@ const handleEditItem = async (row: any) => {
 	const res = await getTreeByIdList({ roleId: row.roleId });
 	// 打开弹窗时调用上面的接口勾选
 	nextTick(() => {
-		treeRef.value.setCheckedKeys(res.result.map(item => item.authorityId));
+		treeRef.value.setCheckedKeys(res.result.map((item: { authorityId: any }) => item.authorityId));
 	});
 };
-
+// TODO: 提交表单操作
 const saveItem = async (form: any) => {
-	if (form.roleId) {
+	form.engineeringSn = initParam.engineeringSn;
+	if (form.id) {
 		// console.log(form.dictCode);
-		const res = await editRole(form);
+		const res = await updateClassGroup(form);
 		proTable.value.getTableList();
 		ElMessage.success("编辑成功");
 	} else {
-		const res = await addRole(form);
+		const res = await addClassGroup(form);
 		ElMessage.success("新增成功");
 		proTable.value.getTableList();
 	}
-	visible.value = false;
+	newMemberDialog.value = false;
 };
 
 // 删除用户信息
-const deleteAccount = async (params: jxj_User.ResUserList) => {
-	await useHandleData(deleteRole, { roleId: params.roleId }, `删除【${params.roleName}】`);
+const deleteGroup = async (params: any) => {
+	await useHandleData(deleteClassGroup, { id: params.id }, `删除【${params.teamName}】`);
 	proTable.value.getTableList();
 };
-
-const changeTreeFilter = () => {
-	console.log(11);
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	initParam.engineeringSn = row.engineeringSn;
+	getUnitList();
+	ElMessage.success("页面已更新");
 };
+const getengineering = (params: any) => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	return getRelevanceList();
+};
+// 获取参建单位列表
+const getUnitList = async () => {
+	const res = await getBuildUnitAll({ engineeringSn: initParam.engineeringSn });
+	console.log(res);
+	formConfig.formItemConfig[0].data = res.result.map(item => {
+		console.log(item);
+		return {
+			label: item.companyName,
+			value: item.companySn
+		};
+	});
+};
+onMounted(() => {
+	getUnitList();
+});
 </script>
+<style scoped lang="scss"></style>
diff --git a/src/views/project/laborRealName/workTypeManage/index.scss b/src/views/project/laborRealName/workTypeManage/index.scss
new file mode 100644
index 0000000..7fb9c5f
--- /dev/null
+++ b/src/views/project/laborRealName/workTypeManage/index.scss
@@ -0,0 +1,21 @@
+.topCard {
+	border-radius: 8px;
+	margin-bottom: 20px;
+}
+:deep(.el-card__body) {
+	padding: 12px 0 12px 36px;
+}
+:deep(.el-select--default) {
+	width: 100%;
+}
+// :deep(.el-dialog__body) {
+// 	min-height: 300px;
+// }
+// 加上这个表格高度也变成230
+:deep(.el-scrollbar) {
+	min-height: 230px;
+}
+// 三层弹窗嵌套加深透明度
+:deep(.el-overlay) {
+	background-color: rgba(0, 0, 0, 0.3);
+}
diff --git a/src/views/project/laborRealName/workTypeManage/index.vue b/src/views/project/laborRealName/workTypeManage/index.vue
index b3edbd0..fb9fc84 100644
--- a/src/views/project/laborRealName/workTypeManage/index.vue
+++ b/src/views/project/laborRealName/workTypeManage/index.vue
@@ -1,5 +1,8 @@
 <template>
 	<div class="table-box">
+		<el-card shodow="never" class="topCard">
+			<el-button class="addButtonStyle" @click="handleAddItem(1)">新增</el-button>
+		</el-card>
 		<ProTable
 			ref="proTable"
 			title="工种管理列表"
@@ -13,9 +16,6 @@
 			:initParam="initParam"
 			:onReset="true"
 		>
-			<template #formButton="scope">
-				<el-button class="addButtonStyle" @click="handleAddItem(1)">新增</el-button>
-			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="handleAddItem(2, row)">
 					<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
@@ -71,15 +71,9 @@ import TreeFilter from "@/components/TreeFilter/index.vue";
 import engineeringDrawer from "@/components/engineeringDrawer/index.vue";
 import allEngineering from "@/components/allEngineering/index.vue";
 import { editRolePermissions, getSystemRole, getTreemRoleList, getTreeByIdList } from "@/api/modules/goverment";
-import {
-	addWorkType,
-	updateClassGroup,
-	deleteClassGroup,
-	getworkTypeList,
-	getBuildUnitAll,
-	classGroupInfo
-} from "@/api/modules/project";
+import { addWorkType, updateWorkType, deleteWorkType, getworkTypeList } from "@/api/modules/project";
 import DialogForm from "@/components/DialogForm/index.vue";
+import { Delete } from "@element-plus/icons-vue";
 
 import { GlobalStore } from "@/stores";
 
@@ -132,8 +126,7 @@ const columns: ColumnProps[] = [
 	{ type: "index", label: "序号", width: 80 },
 	{
 		prop: "typeName",
-		label: "工种名称",
-		search: { el: "input" }
+		label: "工种名称"
 	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
 ];
@@ -198,13 +191,12 @@ const getTableList = (params: any) => {
 
 const handleAddItem = async (index: number, row: any) => {
 	if (index === 1) {
-		title.value = "新增工种管理";
+		title.value = "新增工种";
 		formData.value = reactive({});
 	} else {
-		title.value = "编辑工种管理";
+		title.value = "编辑工种";
 		console.log(row);
-		const res: any = await classGroupInfo({ id: row.id });
-		formData.value = reactive({ ...res.result });
+		formData.value = reactive({ ...row });
 	}
 	visible.value = true;
 };
@@ -229,7 +221,7 @@ const saveItem = async (form: any) => {
 	form.engineeringSn = initParam.engineeringSn;
 	if (form.id) {
 		// console.log(form.dictCode);
-		const res = await updateClassGroup(form);
+		const res = await updateWorkType(form);
 		proTable.value.getTableList();
 		ElMessage.success("编辑成功");
 	} else {
@@ -242,7 +234,7 @@ const saveItem = async (form: any) => {
 
 // 删除用户信息
 const deleteGroup = async (params: any) => {
-	await useHandleData(deleteClassGroup, { id: params.id }, `删除【${params.teamName}】`);
+	await useHandleData(deleteWorkType, { id: params.id }, `删除【${params.typeName}】`);
 	proTable.value.getTableList();
 };
 // 点击抽屉的工程名称更新页面
@@ -254,20 +246,7 @@ const getengineering = (params: any) => {
 	// let newParams = JSON.parse(JSON.stringify(params));
 	return getRelevanceList();
 };
-// 获取参建单位列表
-const getUnitList = async () => {
-	const res = await getBuildUnitAll();
-	console.log(res);
-	formConfig.formItemConfig[0].data = []; // 每次调用先置空一次
-	formConfig.formItemConfig[0].data = res.result.map(item => {
-		console.log(item);
-		return {
-			label: item.companyName,
-			value: item.companySn
-		};
-	});
-};
-onMounted(() => {
-	getUnitList();
-});
 </script>
+<style lang="scss" scoped>
+@import "./index.scss";
+</style>
diff --git a/src/views/project/videoMonitor/realtimeVideo/index.vue b/src/views/project/videoMonitor/realtimeVideo/index.vue
index 21b2f17..05f72d6 100644
--- a/src/views/project/videoMonitor/realtimeVideo/index.vue
+++ b/src/views/project/videoMonitor/realtimeVideo/index.vue
@@ -41,10 +41,10 @@ let initCount = ref(0);
 let oWebControl = ref(null);
 let cameraIndexCode = ref<Array<string>>([]);
 let objData = ref({
-	appkey: "24017757", //海康提供的appkey
-	ip: "182.101.141.23", //海康提供的ip
-	secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
-	port: 18443,
+	appkey: "21582859", //海康提供的appkey
+	ip: "120.236.122.37", //海康提供的ip
+	secret: "CfxWWzB9MEC5y6R5CmWI", //海康提供的secret
+	port: 81,
 	playMode: 0, // 0 预览 1回放
 	layout: "4x6" //页面展示的模块数【16】
 });