From b75fbc37cd8d963b984dde61d17388207a23e04c Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 21 Oct 2025 10:17:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=9C=BA=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 .env.production                               |   2 +-
 .prettierrc.json                              |  12 +-
 src/components/KeyInfoForm/index.vue          |   4 +-
 src/components/PersonIdCardForm/index.vue     |  34 ++
 src/pages.json                                |  14 +
 src/pages/attendance/index.vue                |   4 +-
 src/pages/login/index.vue                     |   3 +-
 .../components/bindSetting.vue                | 295 ++++++++++++++++++
 src/pages/machine-setting/index.vue           | 257 +++++++++++++++
 .../person-check/aptitude-query/index.vue     |   2 +-
 src/pages/person-check/index.vue              |   2 +-
 .../child-pages/addAndEditPerson.vue          | 145 +++++----
 src/pages/person-entry/index.vue              |   4 +-
 src/pages/select-project/index.vue            |  29 +-
 src/pages/work/index.vue                      |  11 +-
 src/services/machine-setting.js               |  44 +++
 src/services/person-entry.js                  |  11 +-
 src/static/image/work/machine-setting.png     | Bin 0 -> 8818 bytes
 src/utils/http.js                             |  19 +-
 vite.config.js                                |   2 +-
 21 files changed, 799 insertions(+), 99 deletions(-)
 create mode 100644 src/pages/machine-setting/components/bindSetting.vue
 create mode 100644 src/pages/machine-setting/index.vue
 create mode 100644 src/services/machine-setting.js
 create mode 100644 src/static/image/work/machine-setting.png

diff --git a/.env.development b/.env.development
index 13ba143..665f142 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
 # VITE_API_BASE_URL = http://112.29.103.165:1616
-# VITE_API_BASE_URL = /api
+VITE_API_BASE_URL = /api
 # VITE_API_BASE_URL = http://192.168.0.14:1999/hd-realname/prod-api   
-VITE_API_BASE_URL = http://192.168.0.234:38080
+# VITE_API_BASE_URL = http://192.168.0.234:38080
diff --git a/.env.production b/.env.production
index 8bedfa4..12a4c28 100644
--- a/.env.production
+++ b/.env.production
@@ -1 +1 @@
-VITE_API_BASE_URL = http://192.168.0.14:1999/hd-realname/prod-api
\ No newline at end of file
+VITE_API_BASE_URL = https://sh.cygrxt.com:19999/hd-realname/prod-api
\ No newline at end of file
diff --git a/.prettierrc.json b/.prettierrc.json
index ad0351a..16f70fa 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,8 +1,8 @@
 {
-  "tabWidth": 4,
-  "singleQuote": true,
-  "semi": false,
-  "printWidth": 100,
-  "trailingComma": "all",
-  "endOfLine": "auto"
+    "tabWidth": 4,
+    "singleQuote": true,
+    "semi": false,
+    "printWidth": 100,
+    "trailingComma": "all",
+    "endOfLine": "auto"
 }
diff --git a/src/components/KeyInfoForm/index.vue b/src/components/KeyInfoForm/index.vue
index 422f5a4..c2cae12 100644
--- a/src/components/KeyInfoForm/index.vue
+++ b/src/components/KeyInfoForm/index.vue
@@ -368,7 +368,7 @@ const afterRead = (e) => {
                             // keyInfoForm.value.photoIds = data.data
                             photoIds.value = data.data
                         } else {
-                            uni.$u.toast('上传失败：' + data.msg)
+                            uni.$u.toast('上传失败')
                         }
                     },
                     fail: (err) => {
@@ -376,7 +376,7 @@ const afterRead = (e) => {
                     },
                 })
             } else {
-                uni.$u.toast('人脸识别失败：' + data?.msg)
+                uni.$u.toast('人脸识别失败')
                 keyInfoForm.value.faceImg = []
             }
         },
diff --git a/src/components/PersonIdCardForm/index.vue b/src/components/PersonIdCardForm/index.vue
index 67db76c..0e90887 100644
--- a/src/components/PersonIdCardForm/index.vue
+++ b/src/components/PersonIdCardForm/index.vue
@@ -157,6 +157,7 @@ import { ref, watch } from 'vue'
 import { pathToBase64 } from 'image-tools'
 import { useMemberStore } from '@/stores'
 import dayjs from 'dayjs'
+import { getShanghaiProByIdNumberAPI } from '@/services/person-entry'
 
 const memberStore = useMemberStore()
 const idCardFormRef = ref(null) // 身份证表单ref
@@ -278,6 +279,35 @@ const onBlurIdNumber = (val) => {
     idCardModel.value.birthday =
         birthday?.slice(0, 4) + '-' + birthday.slice(4, 6) + '-' + birthday.slice(6, 8)
     idCardModel.value.sex = sex % 2 === 0 ? '女' : '男'
+
+    console.log(props.formType, 'props.formType')
+
+    if (props.formType == 1) {
+        checkShanghaiPro()
+    }
+}
+
+// 校验身份证号
+const checkShanghaiPro = async () => {
+    const { data: res } = await getShanghaiProByIdNumberAPI({
+        idNumber: idCardModel.value.idNumber,
+    })
+    // return res
+
+    if (res && Object.keys(res).length > 0 && res.isShanghai == 1) {
+        uni.$u.toast('当前人员已经入场上海工程，可通过后台进行多工程设置...')
+        setTimeout(() => {
+            uni.navigateBack()
+        }, 1000)
+    }
+    if (res && Object.keys(res).length > 0 && (res.isShanghai == 0 || res.isShanghai == null)) {
+        uni.$u.toast('当前人员已经存在，可直接编辑')
+        setTimeout(() => {
+            uni.navigateTo({
+                url: 'pages/person-entry/child-pages/editPerson',
+            })
+        }, 1000)
+    }
 }
 
 // 日期格式化
@@ -474,6 +504,10 @@ const props = defineProps({
         type: Object,
         default: () => {},
     },
+    formType: {
+        type: [Number, String],
+        default: 1,
+    },
 })
 
 // 增加监听
diff --git a/src/pages.json b/src/pages.json
index cae4be5..ed91632 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -169,6 +169,20 @@
                 "navigationBarTitleText": "custom",
                 "navigationStyle": "custom"
             }
+        },
+        // 考勤机设置
+        {
+            "path": "pages/machine-setting/index",
+            "style": {
+                "navigationBarTitleText": "考勤机设置"
+            }
+        },
+        // 考勤机设置 ---- 绑定设置
+        {
+            "path": "pages/machine-setting/components/bindSetting",
+            "style": {
+                "navigationBarTitleText": "考勤机设置"
+            }
         }
     ],
     "globalStyle": {
diff --git a/src/pages/attendance/index.vue b/src/pages/attendance/index.vue
index be1538f..c358a54 100644
--- a/src/pages/attendance/index.vue
+++ b/src/pages/attendance/index.vue
@@ -147,11 +147,11 @@ const onAttendanceHandle = () => {
                                 }
                             },
                             fail: (err) => {
-                                uni.$u.toast('打卡失败：' + err.msg)
+                                uni.$u.toast('打卡失败：' + (err?.msg || ''))
                             },
                         })
                     } else {
-                        uni.$u.toast('人脸识别失败，请重新识别' + data?.msg)
+                        uni.$u.toast('人脸识别失败，请重新识别' + data.msg === null ? '' : data.msg)
                     }
                 },
                 fail: (err) => {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 52d9d93..3f501e2 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -175,6 +175,7 @@ const onHandleCodeImg = async () => {
 
 // 登录按钮
 const onSubmitLogin = debounce(() => {
+    // uni.navigateTo({ url: '/pages/select-project/index' })
     sendLoading.value = true
     loginModelRef.value
         .validate()
@@ -182,7 +183,6 @@ const onSubmitLogin = debounce(() => {
             if (valid) {
                 try {
                     const res = await loginApi(opinionModel.value)
-
                     sendLoading.value = false
                     if (res.code === 200) {
                         memberStore.setToken(res.data.access_token)
@@ -199,7 +199,6 @@ const onSubmitLogin = debounce(() => {
                                 uni.removeStorageSync('userInfo')
                             }
                         }
-
                         getUserInfo()
                     } else {
                         sendLoading.value = false
diff --git a/src/pages/machine-setting/components/bindSetting.vue b/src/pages/machine-setting/components/bindSetting.vue
new file mode 100644
index 0000000..2d807da
--- /dev/null
+++ b/src/pages/machine-setting/components/bindSetting.vue
@@ -0,0 +1,295 @@
+<template>
+    <view>
+        <!-- 绑定设置 -->
+        <view class="bind-setting-container">
+            <!-- 通讯编码 -->
+            <view class="form-item">
+                <text class="label-text">考勤机编码</text>
+                <text class="value-text">{{ machineInfo.deviceCode }}</text>
+            </view>
+
+            <!-- 考勤机名称 -->
+            <view class="form-item">
+                <text class="label-text">考勤机名称</text>
+                <text class="value-text">{{ machineInfo.deviceName }}</text>
+            </view>
+
+            <!-- 点击选择绑定数据提示 -->
+            <view class="select-tip">
+                <text class="tip-text">点击选择绑定数据</text>
+            </view>
+
+            <!-- 工程名称 -->
+            <view class="form-item">
+                <text class="label-text">工程名称</text>
+                <text class="value-text">{{ machineInfo.proName }}</text>
+            </view>
+
+            <!-- 分包商名称 -->
+            <view class="form-item select-item" @tap="onSelectSubcontractor">
+                <text class="label-text">分包商名称</text>
+                <view class="select-content">
+                    <text class="select-text" :class="{ placeholder: !machineInfo.subName }">
+                        {{ machineInfo.subName || '点击选择' }}
+                    </text>
+                    <up-icon name="arrow-right" size="16" color="#C0C4CC" />
+                </view>
+            </view>
+
+            <!-- 班组名称 -->
+            <view class="form-item select-item" @tap="onSelectTeam">
+                <text class="label-text">班组名称</text>
+                <view class="select-content">
+                    <text class="select-text" :class="{ placeholder: !machineInfo.teamName }">
+                        {{ machineInfo.teamName || '点击选择' }}
+                    </text>
+                    <up-icon name="arrow-right" size="16" color="#C0C4CC" />
+                </view>
+            </view>
+        </view>
+
+        <!-- 固定底部按钮 -->
+        <view class="bottom-buttons">
+            <up-button type="warning" text="解除绑定" class="unbind-btn" @tap="onUnbind" />
+            <up-button type="primary" text="确认绑定" class="confirm-btn" @tap="onConfirmBind" />
+        </view>
+
+        <!-- 分包 -->
+        <up-picker
+            :show="subPickerShow"
+            @cancel="onCancelSub"
+            closeOnClickOverlay
+            @confirm="onConfirmSub"
+            :columns="subPickerColumns"
+            @close="subPickerShow = false"
+        />
+        <!-- 班组 -->
+        <up-picker
+            :show="teamPickerShow"
+            @cancel="onCancelTeam"
+            closeOnClickOverlay
+            @confirm="onConfirmTeam"
+            :columns="teamPickerColumns"
+            @close="teamPickerShow = false"
+        />
+    </view>
+</template>
+
+<script setup name="bindSetting">
+import { ref, onMounted } from 'vue'
+import { getSubcontractorListAPI, getSubTeamContractListAPI } from '@/services/machine-setting'
+const subPickerShow = ref(false)
+const teamPickerShow = ref(false)
+const subPickerColumns = ref([[]])
+const teamPickerColumns = ref([[]])
+
+// 考勤机信息
+const machineInfo = ref({
+    deviceCode: '',
+    deviceName: '',
+    proId: '',
+    proName: '',
+    subId: '',
+    subName: '',
+    teamId: '',
+    teamName: '',
+})
+
+// 选择分包商
+const onSelectSubcontractor = () => {
+    // TODO: 实现分包商选择逻辑
+    subPickerShow.value = true
+}
+
+// 选择班组
+const onSelectTeam = () => {
+    // TODO: 实现班组选择逻辑
+    teamPickerShow.value = true
+}
+
+// 获取分包商列表
+const getSubcontractorListFun = async () => {
+    const res = await getSubcontractorListAPI({ proId: machineInfo.value.proId })
+    subPickerColumns.value[0] = res?.rows?.map((item) => {
+        return {
+            text: item.subName,
+            value: item.id,
+        }
+    })
+}
+
+// 获取班组列表
+const getSubTeamContractListFun = async () => {
+    const res = await getSubTeamContractListAPI({
+        proId: machineInfo.value.proId,
+        subId: machineInfo.value.subId,
+    })
+    teamPickerColumns.value[0] = res?.data?.map((item) => {
+        return {
+            text: item.teamName,
+            value: item.teamId,
+        }
+    })
+}
+
+// 解除绑定
+const onUnbind = () => {
+    uni.showModal({
+        title: '提示',
+        content: '确定要解除绑定吗？',
+        success: (res) => {
+            if (res.confirm) {
+                // TODO: 实现解除绑定逻辑
+                console.log('解除绑定')
+                uni.showToast({
+                    title: '解除绑定成功',
+                    icon: 'success',
+                })
+            }
+        },
+    })
+}
+
+// 确认绑定
+const onConfirmBind = () => {
+    if (!machineInfo.value.subcontractorName) {
+        uni.showToast({
+            title: '请选择分包商',
+            icon: 'none',
+        })
+        return
+    }
+
+    if (!machineInfo.value.teamName) {
+        uni.showToast({
+            title: '请选择班组',
+            icon: 'none',
+        })
+        return
+    }
+
+    // TODO: 实现确认绑定逻辑
+    console.log('确认绑定', machineInfo.value)
+    uni.showToast({
+        title: '绑定成功',
+        icon: 'success',
+    })
+}
+
+const onCancelSub = () => {
+    machineInfo.value.subId = ''
+    machineInfo.value.subName = ''
+    machineInfo.value.teamId = ''
+    machineInfo.value.teamName = ''
+    teamPickerColumns.value[0] = []
+    subPickerShow.value = false
+}
+const onConfirmSub = (e) => {
+    machineInfo.value.subId = e.value[0].value
+    machineInfo.value.subName = e.value[0].text
+    subPickerShow.value = false
+    getSubTeamContractListFun()
+}
+const onCancelTeam = () => {
+    machineInfo.value.teamId = ''
+    machineInfo.value.teamName = ''
+    teamPickerShow.value = false
+}
+const onConfirmTeam = (e) => {
+    machineInfo.value.teamId = e.value[0].value
+    machineInfo.value.teamName = e.value[0].text
+    teamPickerShow.value = false
+}
+
+onMounted(() => {
+    // 获取页面参数
+    const pages = getCurrentPages()
+    const currentPage = pages[pages.length - 1]
+    const options = currentPage.options
+
+    if (options.params) {
+        // TODO: 根据ID获取考勤机详细信息
+        console.log('考勤机ID:', JSON.parse(options.params))
+        machineInfo.value = JSON.parse(options.params)
+        getSubcontractorListFun()
+    }
+})
+</script>
+
+<style scoped lang="scss">
+.bind-setting-container {
+    padding: 20rpx;
+    background-color: #fff;
+    min-height: calc(100vh - 200rpx);
+    box-sizing: border-box;
+}
+
+.form-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 30rpx 0;
+    border-bottom: 1px solid #f5f5f5;
+
+    .label-text {
+        font-size: 28rpx;
+        color: #333;
+        font-weight: 500;
+    }
+
+    .value-text {
+        font-size: 28rpx;
+        color: #333;
+        max-width: 60%;
+        text-align: right;
+    }
+}
+
+.select-item {
+    .select-content {
+        display: flex;
+        align-items: center;
+
+        .select-text {
+            font-size: 28rpx;
+            color: #333;
+            margin-right: 10rpx;
+
+            &.placeholder {
+                color: #c0c4cc;
+            }
+        }
+    }
+}
+
+.select-tip {
+    padding: 20rpx 0;
+
+    .tip-text {
+        font-size: 24rpx;
+        color: #ff6b6b;
+    }
+}
+
+.bottom-buttons {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 20rpx;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
+
+    .unbind-btn {
+        flex: 1;
+        margin-right: 20rpx;
+    }
+
+    .confirm-btn {
+        flex: 1;
+    }
+}
+</style>
diff --git a/src/pages/machine-setting/index.vue b/src/pages/machine-setting/index.vue
new file mode 100644
index 0000000..4134e72
--- /dev/null
+++ b/src/pages/machine-setting/index.vue
@@ -0,0 +1,257 @@
+<template>
+    <!-- 考勤机设置 -->
+    <view class="machine-setting">
+        <view class="search-content">
+            <up-input
+                clearable
+                ref="inputRef"
+                class="search-name"
+                v-model="queryParams.deviceName"
+                placeholder="输入考勤机名称"
+            >
+                <template #suffix>
+                    <up-icon name="search" size="24" color="#909399" @tap="onSearchName" />
+                </template>
+            </up-input>
+        </view>
+
+        <scroll-view
+            scroll-y
+            class="machine-setting-content"
+            @scrolltolower="onHandleScrollToLower"
+        >
+            <view
+                :key="item.id"
+                class="machine-setting-item"
+                @tap="onMachineSettingItem(item)"
+                v-for="(item, index) in machineList"
+            >
+                <view class="machine-setting-item-header">
+                    <text class="index-text"> {{ index + 1 }} </text>
+                    <text> {{ item.deviceCode }} </text>
+                </view>
+
+                <view class="common-info common-info-1">
+                    <view>
+                        <text class="label-text">名称</text>
+                        <text> {{ item.deviceName }} </text>
+                    </view>
+                    <view>
+                        <u-tag
+                            size="small"
+                            :text="item.proId ? '已绑定' : '未绑定'"
+                            :type="item.proId ? 'success' : 'error'"
+                        />
+                    </view>
+                </view>
+
+                <template v-if="item.proId">
+                    <view class="common-info">
+                        <text class="label-text">所在工程</text>
+                        <text class="value-text">{{ item.proName }}</text>
+                    </view>
+                    <view class="common-info">
+                        <text class="label-text">所属分包</text>
+                        <text class="value-text">{{ item.subName }}</text>
+                    </view>
+                    <view class="common-info">
+                        <text class="label-text">所在班组</text>
+                        <text class="value-text">{{ item.teamName }}</text>
+                    </view>
+                </template>
+            </view>
+
+            <view class="loading-text">
+                {{ !hasMore ? '没有更多数据了~' : '正在加载...' }}
+            </view>
+        </scroll-view>
+
+        <view v-if="total === 10" class="empty-content">
+            <up-empty :icon="Empty" />
+        </view>
+    </view>
+</template>
+
+<script setup name="machineSetting">
+import { debounce } from 'lodash-es'
+import { ref, computed, onMounted, nextTick } from 'vue'
+import { getMachineListAPI } from '@/services/machine-setting.js'
+import { useCommonStore } from '@/stores'
+
+import Empty from '@/static/image/Empty.png'
+
+const inputRef = ref(null) // 输入框
+const machineList = ref([]) // 考勤机列表
+const total = ref(0) // 总条数
+
+const commonStore = useCommonStore() // 工程信息
+const queryParams = ref({
+    pageNum: 1,
+    pageSize: 10,
+    deviceName: '',
+})
+
+// 搜索姓名
+const onSearchName = () => {
+    queryParams.value.pageNum = 1
+    machineList.value = []
+
+    getMachineListFun()
+}
+
+// 获取考勤机列表数据
+const getMachineListFun = async () => {
+    const res = await getMachineListAPI(queryParams.value)
+    total.value = res?.total
+    machineList.value = [...machineList.value, ...res?.rows]
+}
+
+// 滚动到底部
+const onHandleScrollToLower = debounce(() => {
+    if (hasMore.value) {
+        queryParams.value.pageNum++
+        getMachineListFun()
+    }
+}, 1000)
+
+// 计算一下是否还有更多数据
+const hasMore = computed(() => {
+    return machineList.value.length < total.value
+})
+
+// 点击考勤机设置
+const onMachineSettingItem = (item) => {
+    const { deviceCode, deviceName, proId, proName, subId, subName, teamId, teamName } = item
+    const params = {
+        deviceCode,
+        deviceName,
+        proId,
+        proName,
+        subId,
+        subName,
+        teamId,
+        teamName,
+    }
+    uni.navigateTo({
+        url: `/pages/machine-setting/components/bindSetting?params=${JSON.stringify(params)}`,
+    })
+}
+
+onMounted(() => {
+    queryParams.value.proName = commonStore?.activeProjectName
+    getMachineListFun()
+})
+</script>
+
+<style scoped lang="scss">
+.machine-setting {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    background-color: #fff;
+    padding: 20rpx;
+    box-sizing: border-box;
+
+    .search-content {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        background-color: #fff;
+        margin-bottom: 20rpx;
+
+        .status-select {
+            width: 100%;
+            box-sizing: border-box;
+            border: 1px solid #e5e5e5;
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
+            color: #909399;
+        }
+    }
+}
+
+::v-deep .u-select__content .u-select__options__wrap {
+    top: 30px !important;
+    right: -30px !important;
+}
+
+.machine-setting-content {
+    flex: 1;
+    overflow-y: auto;
+
+    .machine-setting-item {
+        padding: 20rpx;
+        box-sizing: border-box;
+        background-color: #fff;
+        border-radius: 10rpx;
+        margin-bottom: 20rpx;
+        border: 1px solid #e5e5e5;
+        box-shadow: 0 0 10rpx 2rpx rgba(0, 0, 0, 0.1);
+        font-size: 14px;
+
+        .machine-setting-item-header {
+            padding: 16rpx 0;
+            border-bottom: 1px solid #e5e5e5;
+            display: flex;
+            align-items: center;
+
+            .index-text {
+                position: relative;
+                display: inline-block;
+                height: 60rpx;
+                width: 50rpx;
+                margin-right: 60rpx;
+                background-color: #409eff;
+                color: #fff;
+                text-align: center;
+                line-height: 60rpx;
+                border-top-left-radius: 10rpx;
+                border-bottom-left-radius: 10rpx;
+                border-radius: 10rpx;
+            }
+
+            .index-text::after {
+                content: '';
+                position: absolute;
+                right: -24rpx; /* 三角形宽度的一半 */
+                top: 0;
+                width: 0;
+                height: 0;
+                border-top: 30rpx solid transparent; /* 高度的一半 */
+                border-bottom: 30rpx solid transparent; /* 高度的一半 */
+                border-left: 30rpx solid #409eff; /* 三角形宽度 */
+            }
+
+            & text:last-child {
+                font-weight: bold;
+            }
+        }
+
+        .common-info {
+            padding: 20rpx 0;
+            display: flex;
+            align-items: center;
+            border-bottom: 1px solid #e5e5e5;
+
+            &:last-child {
+                border-bottom: none;
+            }
+        }
+
+        .common-info-1 view {
+            width: 50%;
+            display: flex;
+            justify-content: space-around;
+        }
+
+        .label-text {
+            color: #909399;
+        }
+
+        .value-text {
+            margin-left: 30rpx;
+        }
+    }
+}
+</style>
diff --git a/src/pages/person-check/aptitude-query/index.vue b/src/pages/person-check/aptitude-query/index.vue
index 4e89c04..9e55dc0 100644
--- a/src/pages/person-check/aptitude-query/index.vue
+++ b/src/pages/person-check/aptitude-query/index.vue
@@ -79,7 +79,7 @@ const queryParams = ref({
     pageNum: 1,
     pageSize: 12,
     workerName: '',
-    proName: commonStore?.activeProjectName,
+    // proName: commonStore?.activeProjectName,
 })
 
 // 获取人员列表
diff --git a/src/pages/person-check/index.vue b/src/pages/person-check/index.vue
index a0202c4..70a8a8b 100644
--- a/src/pages/person-check/index.vue
+++ b/src/pages/person-check/index.vue
@@ -61,7 +61,7 @@ const onFaceRecognition = () => {
                             })
                         }, 500)
                     } else {
-                        uni.$u.toast('人脸识别失败，请重新识别' + data?.msg)
+                        uni.$u.toast('人脸识别失败，请重新识别' + data.msg === null ? '' : data.msg)
                     }
                 },
                 fail: (err) => {
diff --git a/src/pages/person-entry/child-pages/addAndEditPerson.vue b/src/pages/person-entry/child-pages/addAndEditPerson.vue
index 4bdcac0..572bea8 100644
--- a/src/pages/person-entry/child-pages/addAndEditPerson.vue
+++ b/src/pages/person-entry/child-pages/addAndEditPerson.vue
@@ -1,73 +1,81 @@
 <template>
     <!-- 新增和修改人员信息 -->
 
-    <NavBarModal :navBarTitle="navBarTitle" />
-    <view
-        class="add-person-container"
-        :style="{
-            paddingBottom: nextBtnHeight + 'px',
-            paddingTop: safeAreaInsets?.top + paddingTop + 'px',
-        }"
-    >
-        <!-- 步骤条 -->
-        <view>
-            <up-steps :current="currentStep">
-                <up-steps-item
-                    :key="item.title"
-                    :title="item.title"
-                    :error="item.isError"
-                    v-for="item in stepList"
+    <view>
+        <NavBarModal :navBarTitle="navBarTitle" />
+        <view
+            class="add-person-container"
+            :style="{
+                paddingBottom: nextBtnHeight + 'px',
+                paddingTop: safeAreaInsets?.top + paddingTop + 'px',
+            }"
+        >
+            <!-- 步骤条 -->
+            <view>
+                <up-steps :current="currentStep">
+                    <up-steps-item
+                        :key="item.title"
+                        :title="item.title"
+                        :error="item.isError"
+                        v-for="item in stepList"
+                    />
+                </up-steps>
+            </view>
+
+            <view class="person-info-container">
+                <PersonIdCardForm
+                    ref="personIdCardFormRef"
+                    :idCardInfo="idCardInfo"
+                    :formType="formType"
+                    v-if="currentStep === 0"
                 />
-            </up-steps>
-        </view>
+                <KeyInfoForm
+                    :keyInfo="keyInfo"
+                    :formType="formType"
+                    v-if="currentStep === 1"
+                    ref="personKeyInfoFormRef"
+                />
+                <ContractForm
+                    v-if="currentStep === 2"
+                    ref="personContractFormRef"
+                    :contractInfo="contractInfo"
+                    :contractImageList="contractImageList"
+                    :isEditContractStatus="isEditContractStatus"
+                />
+                <WageCardForm
+                    :formType="formType"
+                    ref="personWageCardFormRef"
+                    :wageCardInfo="wageCardInfo"
+                    :wageCardImageList="wageCardImageList"
+                    v-if="currentStep === 3"
+                />
+            </view>
 
-        <view class="person-info-container">
-            <PersonIdCardForm
-                ref="personIdCardFormRef"
-                :idCardInfo="idCardInfo"
-                v-if="currentStep === 0"
-            />
-            <KeyInfoForm ref="personKeyInfoFormRef" :keyInfo="keyInfo" v-if="currentStep === 1" />
-            <ContractForm
-                v-if="currentStep === 2"
-                ref="personContractFormRef"
-                :contractInfo="contractInfo"
-                :contractImageList="contractImageList"
-                :isEditContractStatus="isEditContractStatus"
-            />
-            <WageCardForm
-                :formType="formType"
-                ref="personWageCardFormRef"
-                :wageCardInfo="wageCardInfo"
-                :wageCardImageList="wageCardImageList"
-                v-if="currentStep === 3"
+            <view class="next-btn" ref="nextBtnRef">
+                <up-button
+                    color="#0ab99c"
+                    text="上一步"
+                    @tap="onHandlePrev"
+                    v-if="currentStep > 0"
+                    style="margin-right: 10px"
+                />
+                <up-button
+                    type="primary"
+                    @tap="onHandleNext"
+                    :text="currentStep === 3 ? '提交' : '下一步'"
+                />
+            </view>
+
+            <up-loading-icon
+                :vertical="true"
+                duration="2000"
+                color="#3c9cff"
+                :show="showLoading"
+                textColor="#3c9cff"
+                text="数据正在提交，请稍后..."
+                style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%)"
             />
         </view>
-
-        <view class="next-btn" ref="nextBtnRef">
-            <up-button
-                color="#0ab99c"
-                text="上一步"
-                @tap="onHandlePrev"
-                v-if="currentStep > 0"
-                style="margin-right: 10px"
-            />
-            <up-button
-                type="primary"
-                @tap="onHandleNext"
-                :text="currentStep === 3 ? '提交' : '下一步'"
-            />
-        </view>
-
-        <up-loading-icon
-            :vertical="true"
-            duration="2000"
-            color="#3c9cff"
-            :show="showLoading"
-            textColor="#3c9cff"
-            text="数据正在提交，请稍后..."
-            style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%)"
-        />
     </view>
 </template>
 
@@ -76,9 +84,12 @@ import { useCommonStore } from '@/stores'
 import { pathToBase64 } from 'image-tools'
 import { onLoad } from '@dcloudio/uni-app'
 import { ref, onMounted, nextTick } from 'vue'
-import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
-import { getPersonInfoByIdAPI, updatePersonLightStatusApi } from '@/services/person-entry'
-import { addPersonEntryApi, editPersonEntryApi } from '@/services/person-entry'
+import {
+    getPersonInfoByIdAPI,
+    updatePersonLightStatusApi,
+    addPersonEntryApi,
+    editPersonEntryApi,
+} from '@/services/person-entry'
 
 import PersonIdCardForm from '@/components/PersonIdCardForm/index.vue'
 import KeyInfoForm from '@/components/KeyInfoForm/index.vue'
@@ -341,7 +352,7 @@ const getButtonHeight = () => {
 
 // 获取人员信息
 const getPersonInfoByIdFun = async (id) => {
-    const res = await getPersonInfoByIdAPI({ id })
+    const res = await getPersonInfoByIdAPI({ id, proId: commonStore?.activeProjectId })
 
     if (res.code === 200) {
         const {
diff --git a/src/pages/person-entry/index.vue b/src/pages/person-entry/index.vue
index ebe534b..5c26cf8 100644
--- a/src/pages/person-entry/index.vue
+++ b/src/pages/person-entry/index.vue
@@ -96,7 +96,9 @@ const handleTapPersonEntry = (item) => {
                                 })
                             }, 500)
                         } else {
-                            uni.$u.toast('人脸识别失败，请重新识别' + data?.msg)
+                            uni.$u.toast(
+                                '人脸识别失败，请重新识别' + data.msg === null ? '' : data.msg,
+                            )
                         }
                     },
                     fail: (err) => {
diff --git a/src/pages/select-project/index.vue b/src/pages/select-project/index.vue
index 839ab51..869fb28 100644
--- a/src/pages/select-project/index.vue
+++ b/src/pages/select-project/index.vue
@@ -11,7 +11,7 @@
                 </up-input>
             </view>
 
-            <view class="my-project-list">
+            <view class="my-project-list" v-if="projectList.length > 0">
                 <view
                     class="project-item"
                     :key="item.id"
@@ -21,6 +21,11 @@
                     {{ item.name }}
                 </view>
             </view>
+
+            <view v-else class="empty-container">
+                <up-empty text="暂无工程，可登录后台管理平台创建" />
+                <up-button type="primary" text="跳转首页..." @tap="onJumpHome" />
+            </view>
         </view>
     </up-popup>
 </template>
@@ -70,6 +75,11 @@ const getProjectList = async () => {
     })
 }
 
+// 跳转首页
+const onJumpHome = () => {
+    uni.switchTab({ url: '/pages/home/index' })
+}
+
 onMounted(() => {
     getProjectList()
 })
@@ -110,5 +120,22 @@ onMounted(() => {
             color: #333;
         }
     }
+
+    .empty-container {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        margin-top: 20rpx;
+        .up-empty {
+            margin-bottom: 20rpx;
+        }
+        .up-button {
+            width: 95%;
+            margin: 0 auto;
+            margin-bottom: 30rpx;
+        }
+    }
 }
 </style>
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index ff5b4d3..60e32d4 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -1,7 +1,7 @@
 <template>
     <!-- 工作台 -->
     <view>
-        <up-grid :col="4" class="work-grid">
+        <up-grid :col="4" class="work-grid" gap="20px">
             <up-grid-item v-for="(item, index) in workList" :key="index" @tap="handleTap(item)">
                 <view class="icon-box" :style="{ backgroundColor: item.bgc_color }">
                     <image :src="item.icon" mode="widthFix" class="icon-img" />
@@ -17,6 +17,7 @@ import EntryIcon from '@/static/image/work/entry.png'
 import ExitIcon from '@/static/image/work/exit.png'
 import CheckIcon from '@/static/image/work/check.png'
 import CountIcon from '@/static/image/work/count.png'
+import MachineSettingIcon from '@/static/image/work/machine-setting.png'
 
 const workList = [
     {
@@ -51,6 +52,14 @@ const workList = [
         icon: CountIcon,
         url: '/pages/att-count/index',
     },
+    {
+        name: 'machineSetting',
+        title: '考勤机设置',
+        icon: 'machineSetting',
+        bgc_color: '#eaf4d9',
+        icon: MachineSettingIcon,
+        url: '/pages/machine-setting/index',
+    },
 ]
 
 // 点击跳转
diff --git a/src/services/machine-setting.js b/src/services/machine-setting.js
new file mode 100644
index 0000000..f1ca2fb
--- /dev/null
+++ b/src/services/machine-setting.js
@@ -0,0 +1,44 @@
+import { http } from '@/utils/http'
+
+// 获取考勤机列表
+export const getMachineListAPI = (data) => {
+    return http({
+        method: 'GET',
+        url: `bmw/pmAttDevice/list`,
+        data,
+    })
+}
+// 考勤机解除绑定
+export const getMachineUnbindAPI = (data) => {
+    return http({
+        method: 'GET',
+        url: `/bmw/worker/**`,
+        data,
+    })
+}
+// 考勤机确认绑定
+export const getMachineConfirmBindAPI = (data) => {
+    return http({
+        method: 'GET',
+        url: `/bmw/worker/**`,
+        data,
+    })
+}
+
+// 根据工程ID获取分包商
+export const getSubcontractorListAPI = (data) => {
+    return http({
+        method: 'GET',
+        url: 'bmw/pmSub/getSublistByProId',
+        data,
+    })
+}
+
+// 根据工程ID和分包商ID获取班组
+export const getSubTeamContractListAPI = (data) => {
+    return http({
+        method: 'GET',
+        url: `/bmw/subTeamContract/getSubTeamContractList`,
+        data,
+    })
+}
diff --git a/src/services/person-entry.js b/src/services/person-entry.js
index ff08214..ee0050f 100644
--- a/src/services/person-entry.js
+++ b/src/services/person-entry.js
@@ -13,7 +13,7 @@ export const getPersonListAPI = (data) => {
 export const getPersonInfoByIdAPI = (data) => {
     return http({
         method: 'POST',
-        url: '/bmw/worker/select/' + data?.id,
+        url: `/bmw/worker/select/${data?.id}/${data.proId}`,
         data,
     })
 }
@@ -55,3 +55,12 @@ export const editPersonEntryExitApi = (data) => {
         data,
     })
 }
+
+// 获取上海工程人员信息
+export const getShanghaiProByIdNumberAPI = (data) => {
+    return http({
+        url: `/bmw/worker/selectByIdNumber/${data.idNumber}`,
+        method: 'POST',
+        data,
+    })
+}
diff --git a/src/static/image/work/machine-setting.png b/src/static/image/work/machine-setting.png
new file mode 100644
index 0000000000000000000000000000000000000000..d778c81e4eac4304f1727d23bb4b637aa244e345
GIT binary patch
literal 8818
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

literal 0
HcmV?d00001

diff --git a/src/utils/http.js b/src/utils/http.js
index 71b1477..b3f8a07 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -70,28 +70,32 @@ const httpInterceptor = {
 
             const commonStore = useCommonStore() // 请求配置
             const requestConfig = commonStore.requestConfig // 请求配置
+            const env = import.meta.env.MODE
 
             // 5. 增加请求配置
             // 入参加密
-            options.header['encryptRequest'] = requestConfig.encryptRequest
+            options.header['encryptRequest'] =
+                import.meta.env.MODE === 'development' ? false : requestConfig.encryptRequest
             // 数据完整性校验
-            options.header['checkIntegrity'] = requestConfig.checkIntegrity
+            options.header['checkIntegrity'] =
+                import.meta.env.MODE === 'development' ? false : requestConfig.checkIntegrity
             //回参是否加密
-            options.header['encryptResponse'] = requestConfig.encryptResponse
+            options.header['encryptResponse'] =
+                import.meta.env.MODE === 'development' ? false : requestConfig.encryptResponse
 
             const queryData =
                 options.data instanceof Object ? JSON.stringify(options.data) : options.data
 
             if (typeof queryData !== 'undefined' && options.method.toUpperCase() === 'POST') {
                 // 加密数据
-                if (requestConfig.encryptRequest) {
+                if (requestConfig.encryptRequest && env !== 'development') {
                     options.data = encryptWithSM4(queryData + '|' + hashWithSM3AndSalt(queryData))
                 }
             }
 
             if (options.data instanceof Object && options.method.toUpperCase() === 'GET') {
                 // 加密数据
-                if (requestConfig.encryptRequest) {
+                if (requestConfig.encryptRequest && env !== 'development') {
                     const url =
                         options.url + '?' + tansParams(options.data, requestConfig.encryptRequest)
 
@@ -99,8 +103,6 @@ const httpInterceptor = {
                     options.url = url
                 }
             }
-
-            console.log(options, 'options--**----')
         }
     },
 }
@@ -117,7 +119,6 @@ export const http = (options) => {
             success(res) {
                 console.log(res, '请求拦截器处解密后的返回值')
                 const currentEnv = getCurrentEnv()
-                console.log(currentEnv, 'currentEnv')
                 // 判断是H5 还是App环境
                 let isEncryptResponse = ''
                 if (currentEnv === 'windows') {
@@ -127,8 +128,6 @@ export const http = (options) => {
                 }
 
                 if (res.header[isEncryptResponse]) {
-                    console.log(JSON.parse(decryptWithSM4(res.data)), '解密后')
-
                     res.data = JSON.parse(decryptWithSM4(res.data))
                 }
 
diff --git a/vite.config.js b/vite.config.js
index 1d5b3db..4d78d89 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -10,7 +10,7 @@ export default defineConfig({
             '/api': {
                 // target: 'http://112.29.103.165:1616', // 测试环境
                 // target: 'http://192.168.0.133:58080', // 梁超
-                target: 'http://192.168.0.14:1999/hd-realname/prod-api', // 测试环境
+                target: 'http://192.168.0.14:1999/hd-real-name', // 测试环境
                 // target: 'http://192.168.0.234:38080', // 方亮
                 changeOrigin: true,
                 rewrite: (path) => {