diff --git a/src/router/index.js b/src/router/index.js
index c8729400..5c31df21 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -604,6 +604,15 @@ const routes2 = [{
                         "@/views/projectFront/laborManage/attendanceManage/attendanceManageOld.vue"
                     ),
             },
+            //劳务管理--中水北方人员考勤
+            {
+                path: "/project/labor/attendanceManageNorth",
+                name: "劳务管理_中水北方人员考勤",
+                component: () =>
+                    import (
+                        "@/views/projectFront/laborManage/attendanceManage/attendanceManageNorth.vue"
+                    ),
+            },
             {
                 path: "/project/labor/newAttendanceManage",
                 name: "劳务管理_人员考勤1",
diff --git a/src/views/companyAdmin/companyBigScreen/terminalOperation/components/isc_plugin.vue b/src/views/companyAdmin/companyBigScreen/terminalOperation/components/isc_plugin.vue
new file mode 100644
index 00000000..9cf900b9
--- /dev/null
+++ b/src/views/companyAdmin/companyBigScreen/terminalOperation/components/isc_plugin.vue
@@ -0,0 +1,144 @@
+<template>
+  <div class="playWnd" :id="`playWnd${itemId}`"></div>
+</template>
+<script>
+let closeVideo = null;
+// import {
+//   OpenVideo,
+//   unInitObjPlugin,
+//   InitObjPlugin,
+//   hidePluginWindow,
+//   showPluginWindow,
+//   resizeFn,
+//   isLoadPlugin,
+//   setWidthAndHeight,
+//   setOffset,
+// } from "./video_isc_plugin.js";
+import VideoPlugin from "./video_isc_plugin.js";
+import { getVideoItemInfoPoliceCameraItemApi } from "@/assets/js/api/workTicketManage";
+export default {
+  props: ["devList", "type", "isIframe", "itemId", "equipmentDialog"],
+  data() {
+    return {
+      layout: "1x1",
+      videoPlugin: null,
+    };
+  },
+  created() {
+    this.$EventBus.$on("controlVideoShowOrHide", (data) => {
+      console.log("controlVideoShowOrHide", data);
+      if (data == "hide") {
+        this.videoPlugin.hidePluginWindow();
+      } else {
+        this.videoPlugin.showPluginWindow();
+      }
+    });
+  },
+  mounted() {
+    // 初始化插件
+    this.videoPlugin = new VideoPlugin();
+
+    var layout = "2x2";
+    if (this.type == "company") {
+      layout = "4x6";
+    }
+    if (this.type.indexOf("x") != -1) {
+      layout = this.type;
+    }
+    this.layout = layout;
+    console.log("加载isc_plugin.vue");
+    if (this.devList.length > 0) {
+      this.devList.forEach((element) => {
+        this.play(element);
+      });
+    }
+  },
+  beforeDestroy() {
+    //反初始化
+    this.videoPlugin.unInitPlugin();
+  },
+  methods: {
+    getPreviewUrl(row) {
+      let tempCode = row.monitoringNumber;
+      const param = {
+        cameraIndexCode: tempCode,
+        // streamType: row.defaultStreamType == 2 ? 0 : row.defaultStreamType,
+        type: window.location.protocol.includes("https") ? "wss" : "ws",
+        transmode: 1,
+        itemId: row.itemId,
+        projectSn: row.projectSn,
+      };
+      // 这里
+      return getVideoItemInfoPoliceCameraItemApi(param);
+    },
+    play(row) {
+      this.getPreviewUrl({
+        ...row,
+      }).then((res) => {
+        if (res.code !== 200 && !res.result.videoInfo) {
+          Message.warning("获取视频流失败！");
+          return;
+        }
+        console.log("播放视频", this.itemId);
+        const dataList = [
+          {
+            ...row,
+            ...res.result.videoInfo,
+            ...res.result.config,
+            serialNumber: res.result.videoInfo.monitoringNumber,
+            defaultStreamType: 2,
+          },
+        ];
+        console.log("播放视频2222", dataList);
+        // 使用插件
+        this.videoPlugin.initPlugin(this.itemId, res.result.config.appId, res.result.config.appSecret, res.result.config.ip, res.result.config.port, dataList, this.layout)
+          .then(() => {
+            console.log('插件初始化成功');
+          })
+          .catch(error => {
+            console.error('插件初始化失败:', error);
+          });
+        // isLoadPlugin(dataList, this.layout, this.itemId);
+      });
+    },
+  },
+  watch: {
+    //监听value的变化，进行相应的操作即可
+    devList: {
+      handler(a, b) {
+        console.log("isc_plugin.vue获取到设备列表");
+        //a是value的新值，b是旧值
+        if (a.length > 0) {
+          a.forEach((element) => {
+            this.play(element);
+          });
+        }
+      },
+    },
+    equipmentDialog: {
+      // immediate: true,
+      handler(newval) {
+        console.log("resizeFn", newval, this.videoPlugin);
+        if (newval) {
+          this.videoPlugin.hidePluginWindow();
+        } else {
+          this.videoPlugin.showPluginWindow();
+        }            
+        // 调整大小
+        // this.videoPlugin.resizePlugin('', this.itemId);
+      },
+    },
+  },
+  computed: {
+    isExpand() {
+      return this.$store.state.isExpand;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.playWnd {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/companyAdmin/companyBigScreen/terminalOperation/components/video_isc_plugin.js b/src/views/companyAdmin/companyBigScreen/terminalOperation/components/video_isc_plugin.js
new file mode 100644
index 00000000..4717811b
--- /dev/null
+++ b/src/views/companyAdmin/companyBigScreen/terminalOperation/components/video_isc_plugin.js
@@ -0,0 +1,290 @@
+import './jsencrypt.min.js';
+
+class VideoPlugin {
+    constructor() {
+        this.isChrome = navigator.userAgent.indexOf('Chrome') > -1;
+        this.WebControl = null;
+        this.oWebControl = null;
+        this.pubKey = '';
+        this.initCount = 0;
+        this.loadWebControl();
+    }
+
+    async loadWebControl() {
+        if (this.isChrome) {
+            try {
+                const { WebControl } = await
+                import ('./jsWebControl-1.0.0.min.js');
+                this.WebControl = WebControl;
+            } catch (error) {
+                console.error('加载WebControl失败:', error);
+            }
+        }
+    }
+
+    async initPlugin(itemId, appkey, secret, ip, port, videoData, layout) {
+        if (!this.WebControl) {
+            console.error('WebControl未加载完成');
+            return false;
+        }
+        // 确保所有必要参数都已初始化
+        this.appkey = appkey;
+        this.secret = secret;
+        this.ip = ip;
+        this.port = port;
+        this.layout = layout;
+        this.width = 0;
+        this.height = 0;
+        return new Promise((resolve, reject) => {
+            this.oWebControl = new this.WebControl({
+                szPluginContainer: `playWnd${itemId}`,
+                iServicePortStart: 15900,
+                iServicePortEnd: 15909,
+                szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11",
+                cbConnectSuccess: () => this.onConnectSuccess(itemId, videoData, resolve),
+                cbConnectError: () => this.onConnectError(itemId, appkey, secret, ip, port, reject),
+                cbConnectClose: () => console.log("连接关闭")
+            });
+        });
+    }
+
+    onConnectSuccess(itemId, videoData, resolve) {
+        this.setCallbacks();
+        this.oWebControl.JS_StartService("window", {
+            dllPath: "./VideoPluginConnect.dll"
+        }).then(() => {
+            this.setupWindow(itemId, videoData);
+            resolve(true);
+        }).catch(error => {
+            console.error('启动服务失败:', error);
+        });
+    }
+
+    onConnectError(itemId, appkey, secret, ip, port, reject) {
+        console.log("插件未启动，正在尝试启动...");
+        this.initCount++;
+
+        if (this.initCount < 3) {
+            setTimeout(() => this.initPlugin(itemId, appkey, secret, ip, port), 3000);
+        } else {
+            reject(new Error("插件启动失败"));
+            this.showDownloadDialog();
+        }
+    }
+
+    setupWindow(itemId, videoData) {
+        const bottomHeight = 0;
+        let width = document.getElementById(`videoOverview${itemId}`).offsetWidth;
+        let height = document.getElementById(`videoOverview${itemId}`).offsetHeight - bottomHeight;
+
+        // 缩放比例计算
+        let ratio = 1;
+        if (enabledProjectV2 != 1) {
+            if (localStorage.getItem('systemInfo') && JSON.parse(localStorage.getItem('systemInfo')).zoomType != 1) {
+                ratio = this.getRatio();
+            }
+        }
+
+        width = width * ratio;
+        height = height * ratio;
+
+        // 窗口大小调整处理
+        window.onresize = () => {
+            clearTimeout(window.$timeId);
+            window.$timeId = setTimeout(() => {
+                const container = document.getElementById('videoBoxContainer') || document.querySelector('.videocBox');
+                if (container) {
+                    width = container.offsetWidth;
+                    height = container.offsetHeight - 80;
+                }
+                if (this.oWebControl != null) {
+                    this.oWebControl.JS_Resize(width, height);
+                }
+            }, 10);
+        };
+
+        this.oWebControl.JS_CreateWnd(`playWnd${itemId}`, width, height, {
+            bEmbed: false,
+            cbSetDocTitle: (uuid) => {
+                this.oWebControl._pendBg = false;
+                window.parent.postMessage({
+                    action: 'updateTitle',
+                    msg: '子页面通知父页面修改title',
+                    info: uuid
+                }, '*');
+            }
+        }).then(() => {
+            console.log("JS_CreateWnd success");
+            this.initVideo(videoData, itemId);
+        });
+    }
+
+    initVideo(videoData, itemId) {
+        this.getPubKey().then(() => {
+            const config = {
+                appkey: this.appkey,
+                secret: this.setEncrypt(this.secret),
+                ip: this.ip,
+                playMode: 0,
+                port: parseInt(this.port),
+                snapDir: "D:\\SnapDir",
+                videoDir: "D:\\VideoDir",
+                layout: this.layout,
+                enableHTTPS: 1,
+                encryptedFields: 'secret',
+                showToolbar: 0,
+                showSmart: 1,
+                buttonIDs: "0,16,256,257,258,259,260,512,513,514,515,516,517,768,769"
+            };
+            // 添加调试日志
+            console.log('初始化配置:', config);
+            console.log('视频数据:', videoData);
+            this.oWebControl.JS_RequestInterface({
+                funcName: "init",
+                argument: JSON.stringify(config)
+            }).then((response) => {
+                console.log('初始化响应:', response);
+                if (COMPANY === 'xingxuan') {
+                    this.oWebControl.oDocOffset.top = 94;
+                    this.oWebControl.oDocOffset.left = 280;
+                }
+                console.log("init success", videoData, document.getElementById(`videoOverview${itemId}`), document.getElementById(`videoOverview${itemId}`).width, document.getElementById(`videoOverview${itemId}`).offsetHeight);
+                // 确保使用最新的width和height
+                const width = document.getElementById(`videoOverview${itemId}`).offsetWidth;
+                const height = document.getElementById(`videoOverview${itemId}`).offsetHeight;
+                this.ratio = window.localStorage.getItem("zoom");
+                this.oWebControl.JS_Resize(width * this.ratio, height * this.ratio);
+
+                this.startVideoPreview(videoData);
+            });
+        });
+    }
+
+    startVideoPreview(videoData) {
+        for (let i = 0; i < videoData.length; i++) {
+            if (i < 24 && videoData.length >= i) {
+                this.openVideo(videoData[i].serialNumber, videoData[i].defaultStreamType, i + 1);
+            }
+        }
+    }
+
+    openVideo(cameraIndexCode, streamMode, winIndex) {
+        const transMode = 1; // TCP
+        const gpuMode = 0; // 不启用GPU硬解
+        // 添加调试信息
+        console.log('开始预览:', {
+            cameraIndexCode,
+            streamMode,
+            winIndex,
+            transMode,
+            gpuMode
+        });
+        this.oWebControl.JS_RequestInterface({
+            funcName: "startPreview",
+            argument: JSON.stringify({
+                cameraIndexCode: cameraIndexCode,
+                streamMode: streamMode == 2 ? 0 : streamMode,
+                transMode: transMode,
+                gpuMode: gpuMode,
+                wndId: winIndex || -1,
+            })
+        }).then((oData) => {
+            console.log('预览响应:', oData);
+        });
+    }
+
+    unInitPlugin() {
+        if (!this.oWebControl) return false;
+
+        const isIE = !!window.ActiveXObject || 'ActiveXObject' in window;
+        if (isIE) {
+            this.oWebControl.JS_Disconnect().then(() => {
+                console.log("JS_Disconnect");
+            });
+        } else {
+            this.oWebControl.JS_DestroyWnd().then(() => {
+                console.log("JS_DestroyWnd");
+                this.oWebControl.JS_StopService("window").then(() => {
+                    this.oWebControl.JS_Disconnect().then(() => {
+                        console.log("JS_Disconnect");
+                    });
+                });
+            });
+        }
+    }
+
+    setCallbacks() {
+        this.oWebControl.JS_SetWindowControlCallback({
+            cbIntegrationCallBack: this.cbIntegrationCallBack
+        });
+    }
+
+    getRatio() {
+        const bodyWidth = document.body.clientWidth;
+        const bodyHeight = document.body.clientHeight;
+        const scaleWidthNum = bodyWidth / 1920;
+        const scaleHeightNum = bodyHeight / 1080;
+
+        return scaleWidthNum > scaleHeightNum ? scaleHeightNum : scaleWidthNum;
+    }
+
+    setEncrypt(value) {
+        const encrypt = new JSEncrypt();
+        encrypt.setPublicKey(this.pubKey);
+        return encrypt.encrypt(value);
+    }
+
+    getPubKey() {
+        return new Promise((resolve) => {
+            this.oWebControl.JS_RequestInterface({
+                funcName: "getRSAPubKey",
+                argument: JSON.stringify({ keyLength: 1024 })
+            }).then((oData) => {
+                if (oData.responseMsg.data) {
+                    this.pubKey = oData.responseMsg.data;
+                    resolve();
+                }
+            });
+        });
+    }
+
+    cbIntegrationCallBack(oData) {
+        console.log(JSON.stringify(oData.responseMsg));
+    }
+
+    showDownloadDialog() {
+        if (confirm("检测到视频插件未安装，是否下载视频插件?")) {
+            window.location.href = "http://101.43.164.214:11111/image/VideoWebPlugin.rar";
+        }
+    }
+
+    resizePlugin(val, itemId) {
+        if (this.oWebControl) {
+            const width = document.getElementById(`videoOverview${itemId}`).offsetWidth;
+            const height = document.getElementById(`videoOverview${itemId}`).offsetHeight;
+
+            if (val && val == 1) {
+                this.oWebControl.JS_Resize(width / 2 + 20, height - 215);
+            } else {
+                this.oWebControl.JS_Resize(width, height);
+            }
+        }
+    }
+    hidePluginWindow() {
+        if (this.oWebControl) {
+            this.oWebControl.JS_HideWnd();
+        }
+    }
+    showPluginWindow() {
+        if (this.oWebControl) {
+            this.oWebControl.JS_ShowWnd();
+        }
+    }
+    setPluginOffset(left, top) {
+        if (this.WebControl) {
+            this.WebControl.JS_SetDocOffset({ left, top });
+        }
+    }
+}
+
+export default VideoPlugin;
\ No newline at end of file
diff --git a/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue b/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue
index f824b64d..32f39dc3 100644
--- a/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue
+++ b/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue
@@ -286,10 +286,19 @@
 											:controls="true"
 										/> -->
                     <IscPlayer
+                      v-if="videoConfig.enableNotPlugin == 1"
                       :devList="[item]"
                       :key="'player-' + item.itemId"
                       :playerId="'player-' + item.itemId"
                     />
+                    <div v-else class="fullHeight videoOverview" :id="`videoOverview${item.itemId}`">
+                      <IscPlugin
+                        :devList="[item]"
+                        :itemId="item.itemId"
+                        :type="'1x1'"
+                         :equipmentDialog="equipmentDialog"
+                      ></IscPlugin>
+                    </div>
                   </div>
                   <div
                     class="hls-video_title"
@@ -544,6 +553,7 @@ import {
   getWorkTicketHistoryListApi,
   getVideoItemInfoPoliceCameraItemApi,
 } from "@/assets/js/api/workTicketManage";
+import { projectVideoConfigListApi } from "@/assets/js/api/equipmentCenter/cameraList";
 import { selectAllProjectInfoList } from "@/assets/js/api/companyBigScreen.js";
 import { getPoliceCameraItemPageApi } from "@/assets/js/api/bodyWornCamera";
 import dayjs from "dayjs";
@@ -551,6 +561,7 @@ import duration from "dayjs/plugin/duration";
 dayjs.extend(duration);
 import store from "@/store";
 const BASEURL = store.state.FILEURL;
+
 const workTicketCountList = ref([
   {
     label: "施工中",
@@ -670,7 +681,10 @@ const getWorkTicketPage = () => {
         console.log("进来了", Number(res.result.total));
         workTicketInfo.total = Number(res.result.total);
         if (workTicketList.value.length > 0) {
-          onViewDetail(workTicketList.value[0]);
+          onViewDetail(workTicketList.value[0], true);
+        } else {
+          workTicketDetail.value = {};
+          policeCameraItemList.value = [];
         }
       }
     }
@@ -706,11 +720,28 @@ const getSelectAllProjectInfoList = () => {
 const onSelectProject = () => {
   workTicketInfo.pageNo = 1;
   workTicketList.value = [];
-
+  getProjectVideoConfigList();
   getWorkTicketPage();
   getWorkTicketCountWorkTicket();
   getWorkTicketTypeTreePage();
 }
+const videoConfig = ref({
+  enableNotPlugin: 1,
+});
+//查询项目各类型的视频配置信息
+const getProjectVideoConfigList = () => {
+  projectVideoConfigListApi({
+    projectSn: workTicketInfo.projectSn,
+  }).then((res) => {
+    if (res.code == 200) {
+      if (res.result) {
+        videoConfig.value = res.result;
+      } else {
+        videoConfig.enableNotPlugin = 1;
+      }
+    }
+  });
+};
 const onRefresh = () => {
   if(!viewAllShow.value){
     onWorkTicketQuery();
@@ -782,8 +813,8 @@ const isJSON = (str) => {
 };
 const timeInterval = ref(null);
 // 查看详情
-const onViewDetail = (row) => {
-  if (row.id == workTicketDetail.value.id) return;
+const onViewDetail = (row, flag) => {
+  if (row.id == workTicketDetail.value.id && flag != true) return;
   workTicketDetail.value = row;
   getWorkTicketQueryById();
   getWorkTicketHistoryList();
diff --git a/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue b/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue
index fcd212ff..82cadada 100644
--- a/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue
+++ b/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue
@@ -278,8 +278,9 @@ export default {
             resultList.map((item) => {
               return {
                 ...item.videoItem,
-                videoType: item.projectVideoConfig.videoType,
-                projectSn: item.projectVideoConfig.projectSn,
+                ...item.projectVideoConfig,
+                // videoType: item.projectVideoConfig.videoType,
+                // projectSn: item.projectVideoConfig.projectSn,
               };
             })
           );
@@ -323,8 +324,9 @@ export default {
         resultList.map((item) => {
           return {
             ...item.videoItem,
-            videoType: item.projectVideoConfig.videoType,
-            projectSn: item.projectVideoConfig.projectSn,
+            ...item.projectVideoConfig,
+            // videoType: item.projectVideoConfig.videoType,
+            // projectSn: item.projectVideoConfig.projectSn,
           };
         })
       );
@@ -404,8 +406,9 @@ export default {
             this.$emit("playParams", [
               {
                 ...data.videoItem,
-                videoType: data.projectVideoConfig.videoType,
-                projectSn: data.projectVideoConfig.projectSn,
+                ...data.projectVideoConfig,
+                // videoType: data.projectVideoConfig.videoType,
+                // projectSn: data.projectVideoConfig.projectSn,
               },
             ]);
           } else {
diff --git a/src/views/projectFront/aiAnalysis/warningList.vue b/src/views/projectFront/aiAnalysis/warningList.vue
index ffc62e12..aec93446 100644
--- a/src/views/projectFront/aiAnalysis/warningList.vue
+++ b/src/views/projectFront/aiAnalysis/warningList.vue
@@ -118,10 +118,10 @@
                   <el-tooltip
                     class="item"
                     effect="dark"
-                    :content="item.alarmDesc"
+                    :content="item.location"
                     placement="top-start"
                   >
-                    <span>{{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }}</span>
+                    <span>{{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.location }}</span>
                   </el-tooltip>
                 </div>
                 <!-- 去处置 -->
diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue
index 1864d6b0..de715a79 100644
--- a/src/views/projectFront/highModulus/pointManage.vue
+++ b/src/views/projectFront/highModulus/pointManage.vue
@@ -275,7 +275,11 @@
         </div>
         <el-table :data="realTimeList" class="tables">
           <!-- 立杆轴力 -->
-          <el-table-column align="center" prop="poleAxialForce" label="立杆轴力(N)">
+          <el-table-column
+            align="center"
+            prop="poleAxialForce"
+            label="立杆轴力(N)"
+          >
             <template #default="{ row }">
               <el-input
                 v-if="row.isRealTimeFlag"
@@ -286,7 +290,11 @@
             </template>
           </el-table-column>
           <!-- 水平位移 -->
-          <el-table-column align="center" prop="horizontalDisplacement" label="水平位移(mm)">
+          <el-table-column
+            align="center"
+            prop="horizontalDisplacement"
+            label="水平位移(mm)"
+          >
             <template #default="{ row }">
               <el-input
                 v-if="row.isRealTimeFlag"
@@ -297,7 +305,11 @@
             </template>
           </el-table-column>
           <!-- 模板沉降 -->
-          <el-table-column align="center" prop="formworkSettlement" label="模板沉降(mm)">
+          <el-table-column
+            align="center"
+            prop="formworkSettlement"
+            label="模板沉降(mm)"
+          >
             <template #default="{ row }">
               <el-input
                 v-if="row.isRealTimeFlag"
@@ -319,7 +331,11 @@
             </template>
           </el-table-column>
           <!-- 地基沉降 -->
-          <el-table-column align="center" prop="foundationSettlement" label="地基沉降(mm)">
+          <el-table-column
+            align="center"
+            prop="foundationSettlement"
+            label="地基沉降(mm)"
+          >
             <template #default="{ row }">
               <el-input
                 v-if="row.isRealTimeFlag"
@@ -330,7 +346,11 @@
             </template>
           </el-table-column>
           <!-- 水平倾斜 -->
-          <el-table-column align="center" prop="horizontalTilt" label="水平倾斜(°)">
+          <el-table-column
+            align="center"
+            prop="horizontalTilt"
+            label="水平倾斜(°)"
+          >
             <template #default="{ row }">
               <el-input
                 v-if="row.isRealTimeFlag"
@@ -353,7 +373,7 @@
                 value-format="yyyy-MM-dd hh:mm:ss"
                 type="datetime"
                 placeholder="测量时间"
-                style="width: 100%;"
+                style="width: 100%"
                 v-model="row.collectTime"
               ></el-date-picker>
               <span v-else>{{ row.collectTime }}</span>
@@ -363,7 +383,12 @@
             <template #default="{ row, $index }">
               <template v-if="row.isRealTimeFlag">
                 <el-button @click="rowSubmit(row)" type="text">确认</el-button>
-                <el-button @click="rowConcel(row, $index)" style="margin-left: 10px" type="text">取消</el-button>
+                <el-button
+                  @click="rowConcel(row, $index)"
+                  style="margin-left: 10px"
+                  type="text"
+                  >取消</el-button
+                >
               </template>
               <template v-else>
                 <el-button
@@ -374,7 +399,11 @@
                   >编辑</el-button
                 >
                 <el-button
-                  style="border: 0 !important; color: #f56c6c; margin-left: 10px"
+                  style="
+                    border: 0 !important;
+                    color: #f56c6c;
+                    margin-left: 10px;
+                  "
                   type="text"
                   icon="el-icon-delete"
                   @click="handleDelete(row)"
@@ -589,6 +618,11 @@ export default {
             type: 5,
             warningValue: "",
           },
+          {
+            alarmValue: "",
+            type: 6,
+            warningValue: "",
+          },
         ],
       },
       rules: {
@@ -758,6 +792,11 @@ export default {
               type: 5,
               warningValue: "",
             },
+            {
+              alarmValue: "",
+              type: 6,
+              warningValue: "",
+            },
           ],
         };
       });
@@ -793,10 +832,11 @@ export default {
     loadRealTimeData() {
       let json = Object.assign(
         this.filterForm,
-        { 
+        {
           measurePointNumber: this.ruleForm.measurePointNumber,
-          acquisitionInstrumentNumber: this.ruleForm.acquisitionInstrumentNumber,
-         },
+          acquisitionInstrumentNumber:
+            this.ruleForm.acquisitionInstrumentNumber,
+        },
         { projectSn: this.$store.state.projectSn }
       );
       highFormworkMeasureCurrentDataApi(json).then((res) => {
@@ -811,28 +851,28 @@ export default {
     },
     rowSubmit(row) {
       const params = {
-          ...this.ruleForm,
-          ...row,
-          projectSn: this.$store.state.projectSn,
-        };
-        if (this.realTimeType == 1) {
-          delete params.id;
-          highFormworkMeasureCurrentDataAddApi(params).then((res) => {
-            if (res.success) {
-              this.$message.success(res.message);
-              this.loadRealTimeData();
-            }
-          })
-        } else if (this.realTimeType == 2) {
-          highFormworkMeasureCurrentDataEditApi(params).then((res) => {
-            if (res.success) {
-              this.$message.success(res.message);
-              this.loadRealTimeData();
-            }
-          })
-        }
+        ...this.ruleForm,
+        ...row,
+        projectSn: this.$store.state.projectSn,
+      };
+      if (this.realTimeType == 1) {
+        delete params.id;
+        highFormworkMeasureCurrentDataAddApi(params).then((res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.loadRealTimeData();
+          }
+        });
+      } else if (this.realTimeType == 2) {
+        highFormworkMeasureCurrentDataEditApi(params).then((res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.loadRealTimeData();
+          }
+        });
+      }
     },
-    rowConcel(row, index){
+    rowConcel(row, index) {
       console.log(row, index);
       if (this.realTimeType == 1) {
         this.realTimeList.splice(index, 1);
@@ -870,9 +910,11 @@ export default {
         type: "warning",
       })
         .then(() => {
-          highFormworkMeasureCurrentDataDeleteApi({ id: row.id }).then((res) => {
-            this.loadRealTimeData();
-          });
+          highFormworkMeasureCurrentDataDeleteApi({ id: row.id }).then(
+            (res) => {
+              this.loadRealTimeData();
+            }
+          );
         })
         .catch(() => {});
     },
diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceManageNorth.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceManageNorth.vue
new file mode 100644
index 00000000..dbfc44eb
--- /dev/null
+++ b/src/views/projectFront/laborManage/attendanceManage/attendanceManageNorth.vue
@@ -0,0 +1,1424 @@
+<template>
+  <div class="attendanceManage fullHeight" ref="attendanceManage">
+    <vue-scroll style="width: 100%; height: 100%">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline whiteBlock"
+        size="medium"
+      >
+        <el-form-item :label="$t('message.laborMange.personnelType')">
+          <el-select
+            style="width: 120px"
+            v-model="formInline.personType"
+            :placeholder="$t('message.laborMange.pleasePersonnelType')"
+          >
+            <el-option :label="$t('message.laborMange.all')" value></el-option>
+            <el-option
+              :label="$t('message.laborMange.modules')"
+              :value="1"
+            ></el-option>
+            <el-option
+              :label="$t('message.laborMange.modules1')"
+              :value="2"
+            ></el-option>
+            <el-option
+              :label="$t('message.laborMange.modules2')"
+              :value="3"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('message.laborMange.companies')">
+          <el-select
+            filterable
+            :clearable="true"
+            v-model="formInline.enterpriseId"
+            :placeholder="$t('message.laborMange.pleaseChoose')"
+            @change="changeCompany"
+          >
+            <el-option
+              :label="item.enterpriseName"
+              :value="item.id"
+              v-for="item in enterpriseListData"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('message.laborMange.belongsToTeam')">
+          <el-select
+            filterable
+            :clearable="true"
+            v-model="formInline.teamId"
+            :placeholder="$t('message.laborMange.pleaseChoose')"
+          >
+            <el-option
+              :label="item.teamName"
+              :value="item.id"
+              v-for="item in teamListData"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('message.laborMange.department')">
+          <el-select
+            filterable
+            :clearable="true"
+            v-model="formInline.departmentId"
+            :placeholder="$t('message.laborMange.pleaseChoose')"
+          >
+            <el-option
+              :label="item.departmentName"
+              :value="item.id"
+              v-for="item in departmentListData"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item :label="$t('message.laborMange.workingState')">
+          <el-select
+            filterable
+            v-model="formInline.inserviceType"
+            :placeholder="$t('message.laborMange.pleaseChoose')"
+          >
+            <el-option
+              :label="item.name"
+              :value="item.id"
+              v-for="item in inserviceTypeOptions"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item :label="$t('message.laborMange.month')">
+          <el-date-picker
+            style="width: 120px"
+            value-format="yyyy-MM"
+            v-model="formInline.monthTime"
+            type="month"
+            :placeholder="$t('message.laborMange.pleaseSelectMonth')"
+            :clearable="false"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="姓名">
+          <el-input
+            v-model="formInline.workerName"
+            :placeholder="$t('message.laborMange.pleaseInputYourName')"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            @click="
+              page = 1;
+              getListData();
+            "
+            plain
+            >{{ $t("message.laborMange.inquire") }}</el-button
+          >
+          <el-button type="warning" @click="refresh" plain>{{
+            $t("message.laborMange.refresh")
+          }}</el-button>
+          <el-button
+            type="primary"
+            @click="
+              selectDateType = 1;
+              exportDialog = true;
+            "
+            >{{
+              $t("message.laborMange.export") +
+              $t("message.laborMange.detailData")
+            }}</el-button
+          >
+          <el-button
+            type="primary"
+            @click="exportMonthlyData"
+            v-permission="{
+              key: 'rykq_exportMonthData',
+              menuPath: '/project/labor/attendanceManage',
+            }"
+            >{{
+              $t("message.laborMange.export") +
+              $t("message.laborMange.monthData")
+            }}</el-button
+          >
+          <el-button
+            type="primary"
+            @click="
+              selectDateType = 2;
+              exportDialog = true;
+            "
+            v-permission="{
+              key: 'rykq_recountData',
+              menuPath: '/project/labor/attendanceManage',
+            }"
+            >{{ $t("message.laborMange.recountData") }}</el-button
+          >
+          <el-button
+            type="primary"
+            @click="attendancePrint"
+            v-permission="{
+              key: 'rykq_attendPrint',
+              menuPath: '/project/labor/attendanceManage',
+            }"
+            ><a :href="printPdf" class="printPdf">{{
+              $t("message.laborMange.attendPrint")
+            }}</a></el-button
+          >
+          <!-- v-permission="{key: 'rykq_pullTrafficData', menuPath: '/project/labor/attendanceManage'}" :无法正常显示 -->
+          <el-button
+            v-permission="{
+              key: 'rykq_pullTrafficData',
+              menuPath: '/project/labor/attendanceManage',
+            }"
+            type="primary"
+            @click="openPullDialog"
+            >拉取通行数据</el-button
+          >
+          <!-- <el-button type="primary" @click="importAttendanceData" >导入考勤数据</el-button> -->
+        </el-form-item>
+        <!-- <div class="doloadExcel">考勤模板下载</div> -->
+      </el-form>
+      <!-- <div class="placeholder"></div> -->
+      <div class="table_content whiteBlock">
+        <div style="text-align: right" class="flex">
+          <div class="pageTitle">
+            {{ $t("message.laborMange.AttendanceStatistics") }}
+          </div>
+          <div class="flex2 rigth">
+            <div>
+              <span
+                class="span"
+                style="background: #7CFC00; margin-right: 5px"
+              ></span>
+              {{ $t("message.laborMange.normalAttendance") }}
+            </div>
+            <div>
+              <span
+                class="span"
+                style="background: #FFA500; margin-right: 5px"
+              ></span>
+              {{ $t("message.laborMange.lackOfCard") }}
+            </div>
+            <div>
+              <span
+                class="span"
+                style="background: #FFFF00; margin-right: 5px"
+              ></span>
+              {{ $t("message.laborMange.beLate") }}/{{ $t("message.laborMange.leaveEarly") }}
+            </div>
+            <!-- <div>
+              <span
+                class="span"
+                style="background: #FFFF00; margin-right: 5px"
+              ></span>
+              {{ $t("message.laborMange.leaveEarly") }}
+            </div> -->
+            <!-- <div>
+                  <span
+                    class="span"
+                    style="background: #ffb85a; margin-right: 5px"
+                  ></span>
+                  {{ $t("message.laborMange.overtime") }}
+                </div> -->
+            <div>
+              <span
+                class="span"
+                style="background: #FF1132; margin-right: 5px"
+              ></span>
+              {{ $t("message.laborMange.noAttendance") }}
+            </div>
+          </div>
+        </div>
+        <el-table :data="tableData" max-height="500" width="100%" border>
+          <el-table-column
+            prop="workerName"
+            :label="$t('message.laborMange.compellation')"
+            align="center"
+          ></el-table-column>
+          <!-- <el-table-column
+                prop="temperature"
+                :label="'温度(℃)'"
+                align="center"
+              >
+              <template  slot-scope="scope">
+                {{scope.row.temperature?scope.row.temperature:'--'}}
+              </template>
+              </el-table-column> -->
+          <el-table-column
+            :prop="'day' + item"
+            :label="String(item)"
+            v-for="(item, index) in showTime"
+            :key="index"
+            align="center"
+            width="44"
+          >
+            <template slot-scope="scope">
+              <span
+                class="span"
+                v-show="scope.row['day' + item] == 0"
+                @click="selectWorker(scope.row, item, scope.$index)"
+                style="cursor: pointer; background: #FF1132"
+                :class="
+                  number == item && selectIndex == scope.$index ? 'span2' : ''
+                "
+              ></span>
+              <span
+                class="span"
+                v-show="scope.row['day' + item] == 1"
+                style="cursor: pointer; background: #7CFC00"
+                @click="selectWorker(scope.row, item, scope.$index)"
+                :class="
+                  number == item && selectIndex == scope.$index ? 'span2' : ''
+                "
+              ></span>
+              <span
+                class="span"
+                v-show="scope.row['day' + item] == 2"
+                style="cursor: pointer; background: #FFFF00"
+                @click="selectWorker(scope.row, item, scope.$index)"
+                :class="
+                  number == item && selectIndex == scope.$index ? 'span2' : ''
+                "
+              ></span>
+              <span
+                class="span"
+                v-show="scope.row['day' + item] == 3"
+                style="cursor: pointer; background: #FFFF00"
+                @click="selectWorker(scope.row, item, scope.$index)"
+                :class="
+                  number == item && selectIndex == scope.$index ? 'span2' : ''
+                "
+              ></span>
+              <span
+                class="span"
+                v-show="scope.row['day' + item] == 4"
+                style="cursor: pointer; background: #ffb85a"
+                @click="selectWorker(scope.row, item, scope.$index)"
+                :class="
+                  number == item && selectIndex == scope.$index ? 'span2' : ''
+                "
+              ></span>
+              <span
+                class="span"
+                v-show="scope.row['day' + item] == 5"
+                style="cursor: pointer; background: #FFA500"
+                @click="selectWorker(scope.row, item, scope.$index)"
+                :class="
+                  number == item && selectIndex == scope.$index ? 'span2' : ''
+                "
+              ></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          class="pagerBox"
+          style="margin: 10px 20px 0; text-align: right"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="page"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next"
+          :total="Number(total)"
+          background
+        ></el-pagination>
+        <div>
+          <div
+            style="text-align: right; margin: 15px 0; align-items: center"
+            class="flex"
+          >
+            <div class="pageTitle">
+              {{ $t("message.laborMange.attendanceDetail") }}
+            </div>
+            <el-button
+              size="medium"
+              v-permission="{
+                key: 'uploadAttendance',
+                menuPath: '/project/labor/attendanceManage',
+              }"
+              type="primary"
+              @click="uploadAttendanceDialog"
+              >上传考勤</el-button
+            >
+          </div>
+          <el-table :data="dateilList" style="width: 100%">
+            <el-table-column
+              prop="workerName"
+              :label="$t('message.laborMange.compellation')"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="temperature"
+              :label="$t('message.laborMange.temperature') + '(℃)'"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.temperature ? scope.row.temperature : "--" }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              :label="$t('message.laborMange.healthCodeStatus')"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ healthCodelist[scope.row.healthCode] }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="nucleicAcidTime"
+              :label="$t('message.laborMange.nucleicAcidTime')"
+              align="center"
+            ></el-table-column>
+
+            <el-table-column
+              :label="$t('message.laborMange.nucleicAcidResults')"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ nucleicAcidResultsList[scope.row.nucleicAcidResult] }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="vaccinateTime"
+              :label="$t('message.laborMange.vaccinationTime')"
+              align="center"
+            ></el-table-column>
+
+            <el-table-column
+              :label="$t('message.laborMange.vaccinationFrequency')"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{
+                  vaccinationFrequencyltsList[scope.row.vaccinateState] || "无"
+                }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="passType"
+              :label="
+                $t('message.laborMange.enterInto') +
+                '/' +
+                $t('message.laborMange.leave')
+              "
+              align="center"
+            >
+              <template slot-scope="scope">
+                <div v-if="scope.row.passType == 1">
+                  {{ $t("message.laborMange.enterInto") }}
+                </div>
+                <div v-if="scope.row.passType == 2">
+                  {{ $t("message.laborMange.leave") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="createTime"
+              :label="$t('message.laborMange.inOutTime')"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="passagewayName"
+              :label="$t('message.laborMange.inletOutletPosition')"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="address"
+              :label="$t('message.laborMange.inAndOutOfTheWay')"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <div v-if="scope.row.cardType == 1">
+                  {{ $t("message.laborMange.ic") }}
+                </div>
+                <div v-if="scope.row.cardType == 2">
+                  {{ $t("message.laborMange.faceRecognition") }}
+                </div>
+                <div v-if="scope.row.cardType == 3">
+                  {{ $t("message.laborMange.fingerprintIdentification") }}
+                </div>
+                <div v-if="scope.row.cardType == 4">
+                  {{ $t("message.laborMange.reissueACard") }}
+                </div>
+                <div v-if="scope.row.cardType == 5">
+                  {{ $t("message.laborMange.QRcode") }}
+                </div>
+                <div v-if="scope.row.cardType == 6">
+                  {{ $t("message.laborMange.bluetooth") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              :label="$t('message.laborMange.entranceGuardPhotos')"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <img
+                  :src="fileUrl + scope.row.imageUrl"
+                  style="width: 40px; height: 60px; cursor: pointer"
+                  @click="
+                    bigImageUrl = fileUrl + scope.row.imageUrl;
+                    bigImageDialog = true;
+                  "
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </vue-scroll>
+    <!-- 拉取通行数据弹框 -->
+    <el-dialog
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+      :visible.sync="imgImportDialog"
+      width="800px"
+    >
+      <div class="title-set" slot="title">
+        <div class="line"></div>
+        <span>同步人员通行数据</span>
+        <div
+          class="question-icon"
+          @mouseover="tipShow = true"
+          @mouseout="tipShow = false"
+        >
+          ?
+        </div>
+        <div class="tip-text" v-if="tipShow">
+          此处可同步海康ISC平台的通行数据
+        </div>
+      </div>
+      <div class="dialog-content">
+        <div class="form-content">
+          <el-form
+            label-width="230px"
+            size="medium"
+            style="width: 80%; margin: 0 auto"
+          >
+            <el-form-item
+              prop="afternoonStartTime"
+              label="选择需要手动拉取数据的时间段："
+            >
+              <el-date-picker
+                v-model="timeRange"
+                type="datetimerange"
+                :range-separator="$t('message.laborMange.to')"
+                :start-placeholder="$t('message.laborMange.startDate')"
+                :end-placeholder="$t('message.laborMange.dateClosed')"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="imgImportDialog = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >{{ $t("message.laborMange.cancel") }}</el-button
+          >
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="confirmPullData"
+            size="medium"
+            >确认拉取</el-button
+          >
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 查看大图 -->
+    <div
+      v-if="bigImageDialog"
+      class="bigImageDialog"
+      @click="bigImageDialog = false"
+    >
+      <div class="bigImageContent">
+        <img width="auto" height="auto" :src="bigImageUrl" alt />
+      </div>
+    </div>
+    <!-- 导出 -->
+    <el-dialog
+      :modal-append-to-body="false"
+      :title="
+        selectDateType == 1
+          ? $t('message.laborMange.hint1')
+          : $t('message.laborMange.hint2')
+      "
+      :visible.sync="exportDialog"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form label-width="90px" size="medium" class="dialogFormBox">
+          <el-form-item
+            prop="afternoonStartTime"
+            :label="$t('message.laborMange.timeFrame')"
+          >
+            <el-date-picker
+              v-model="exportDateArr"
+              type="daterange"
+              :range-separator="$t('message.laborMange.to')"
+              :start-placeholder="$t('message.laborMange.startDate')"
+              :end-placeholder="$t('message.laborMange.dateClosed')"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="exportDialog = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t("message.personnelPosition.cancel") }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="exportFn"
+              size="medium"
+              v-permission="{
+                key: 'rykq_exportDetailData',
+                menuPath: '/project/labor/attendanceManage',
+              }"
+              >{{ $t("message.personnelPosition.determine") }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+    <!-- 上传考勤弹窗 -->
+    <el-dialog
+      :visible.sync="uploadAttendanceShow"
+      width="600px"
+      append-to-body
+      title="上传考勤"
+    >
+      <el-form
+        ref="uploadAttendanceForm"
+        :model="uploadAttendanceForm"
+        :rules="uploadAttendanceFormRules"
+        size="medium"
+        label-width="210px"
+      >
+        <el-form-item label="企业名称" prop="enterpriseId">
+          <el-select
+            v-model="uploadAttendanceForm.enterpriseId"
+            placeholder="请选择"
+            clearable
+            filterable
+            @change="
+              enterpriseChange(
+                uploadAttendanceForm.enterpriseId,
+                uploadAttendanceForm.departmentId
+              )
+            "
+          >
+            <el-option
+              :label="item.enterpriseName"
+              :value="item.id"
+              v-for="item in enterpriseListData"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="部门&班组" prop="departmentId">
+          <el-select
+            v-model="uploadAttendanceForm.departmentId"
+            placeholder="请选择"
+            clearable
+            filterable
+            @change="
+              departmentTeamChange(
+                uploadAttendanceForm.enterpriseId,
+                uploadAttendanceForm.departmentId
+              )
+            "
+          >
+            <el-option
+              v-for="(item, index) in isDepartmentTeamList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="姓名" prop="workerId">
+          <el-select
+            v-model="uploadAttendanceForm.workerId"
+            placeholder="请选择"
+            clearable
+            filterable
+          >
+            <el-option
+              v-for="(item, index) in personList"
+              :key="item.id"
+              :label="item.workerName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="进入/出" prop="passType">
+          <el-radio-group v-model="uploadAttendanceForm.passType">
+            <el-radio :label="1">进</el-radio>
+            <el-radio :label="2">出</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="出入时间" prop="createTime">
+          <el-date-picker
+            value-format="yyyy-MM-dd hh:mm:ss"
+            type="datetime"
+            placeholder="开始时间"
+            v-model="uploadAttendanceForm.createTime"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="进出位置" prop="inletOutletPosition">
+          <el-select
+            v-model="uploadAttendanceForm.inletOutletPosition"
+            placeholder="请选择"
+            clearable
+            filterable
+          >
+            <el-option
+              v-for="(item, index) in allUfaceDev"
+              :key="item.id"
+              :label="item.devName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="进出方式" prop="cardType">
+          <el-select
+            v-model="uploadAttendanceForm.cardType"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in cardTypeList"
+              :key="item.cardTypeId"
+              :label="item.cardTypeName"
+              :value="item.cardTypeId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="门禁照片" prop="fileList">
+          <el-upload
+            :action="$store.state.UPLOADURL"
+            name="files"
+            list-type="picture-card"
+            :limit="1"
+            :on-preview="handlePictureCardPreview"
+            :on-success="handleAvatarSuccess"
+            :file-list="uploadAttendanceForm.fileList"
+            :on-remove="handleDelete"
+            :on-exceed="handleExceed"
+            accept=".jpg,.jpeg"
+          >
+            <i class="el-icon-plus"></i>
+            <div slot="tip" class="el-upload__tip">只支持.jpg格式</div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" style="text-align: center">
+        <el-button type="primary" @click="submitUploadAttendanceForm"
+          >确认</el-button
+        >
+        <el-button @click="uploadAttendanceFormCancel">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+  <script>
+import scroll from "vue-seamless-scroll";
+import {
+  getPageListData,
+  getSelectDateilApi,
+  getAfreshMonthAttendanceStatisticsApi,
+  attendFsdApi,
+} from "@/assets/js/api/attendanceManage";
+import {
+  getDepartmentInfoList,
+  getTeamInfoList,
+  getEnterpriseInfoList,
+  pullMemberDataApi,
+  reissueAttendanceCardApi,
+  getWorkerInfoList,
+  ufaceDevList,
+} from "@/assets/js/api/laborPerson";
+import { getDepartmentAndTeamListApi } from "@/assets/js/api/operationManagement";
+export default {
+  name: "attendanceManage",
+  components: {
+    scroll,
+  },
+  data() {
+    return {
+      tipShow: false,
+      timeRange: [],
+      printPdf: "",
+      nucleicAcidResultsList: {
+        0: "未知",
+        1: "阴性",
+        2: "阳性",
+      },
+      healthCodelist: {
+        0: "无",
+        1: "红码",
+        2: "黄码",
+        3: "绿码",
+      },
+      vaccinationFrequencyltsList: {
+        0: "未接种",
+        1: "接种一针",
+        2: "接种两针",
+        3: "接种三针",
+      },
+      exportDialog: false,
+      exportDateArr: [],
+      inserviceTypeOptions: [
+        {
+          name: this.$t("message.laborMange.onJob"),
+          id: 1,
+        },
+        {
+          name: this.$t("message.laborMange.dimission"),
+          id: 2,
+        },
+      ],
+      fileUrl: "",
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      formInline: {
+        workerName: "",
+        personType: "",
+        monthTime: "",
+        enterpriseId: "",
+        teamId: "",
+        departmentId: "",
+        inserviceType: 1,
+      },
+      projectSn: "",
+      tableData: [],
+      number: 0,
+      selectIndex: 0,
+      showSelectPersonSn: "",
+      showSelectTime: "",
+      dateilList: [],
+      showTime: 31,
+      bigImageDialog: false,
+      enterpriseListData: [],
+      teamListData: [],
+      departmentListData: [],
+      selectDateType: 1, //1是选择导出时间段    2是选择重新计算考勤的时间段
+      imgImportDialog: false,
+
+      // 上传考勤表单
+      uploadAttendanceShow: false,
+      uploadAttendanceFormRules: {},
+      uploadAttendanceForm: {
+        enterpriseId: "",
+        teamId: "",
+        departmentId: "",
+        workerId: "",
+        passType: "",
+        createTime: "",
+        inletOutletPosition: "",
+        cardType: "",
+        fileList: [],
+      },
+      cardTypeList: [
+        {
+          cardTypeId: 1,
+          cardTypeName: "IC卡",
+        },
+        {
+          cardTypeId: 2,
+          cardTypeName: "人脸识别",
+        },
+        {
+          cardTypeId: 3,
+          cardTypeName: "指纹识别",
+        },
+        {
+          cardTypeId: 5,
+          cardTypeName: "二维码",
+        },
+        {
+          cardTypeId: 6,
+          cardTypeName: "蓝牙",
+        },
+      ],
+      isDepartmentTeamList: [],
+      personList: [],
+      allUfaceDev: [],
+    };
+  },
+  created() {
+    let date = new Date();
+    let year = date.getFullYear();
+    let month = date.getMonth() + 1;
+    month = month < 10 ? "0" + month : month;
+    let mydate = year.toString() + "-" + month.toString();
+    this.formInline.monthTime = mydate;
+    this.projectSn = this.$store.state.projectSn;
+    this.getListData();
+    this.fileUrl = this.$store.state.FILEURL;
+    this.getCompanyList();
+    this.getTeamList();
+    // this.getPersonListFn();
+    this.getMachineList();
+  },
+
+  methods: {
+    enterpriseChange(enterpriseIds, departmentTeamIds, type) {
+      getDepartmentAndTeamListApi({
+        projectSn: this.projectSn,
+        enterpriseIds:
+          enterpriseIds instanceof Array
+            ? enterpriseIds.join(",")
+            : enterpriseIds,
+      }).then((res) => {
+        if (res.success) {
+          this.isDepartmentTeamList = res.result;
+          if (type != 1) {
+            this.uploadAttendanceForm.departmentId = "";
+          }
+          this.departmentTeamChange(enterpriseIds, departmentTeamIds, type);
+        }
+      });
+    },
+    departmentTeamChange(enterpriseIds, departmentTeamIds, type) {
+      let reqeustData = {
+        projectSn: this.$store.state.projectSn,
+      };
+      if (
+        enterpriseIds instanceof Array &&
+        departmentTeamIds instanceof Array
+      ) {
+        reqeustData.enterpriseIds = enterpriseIds;
+        reqeustData.departmentTeamIds = departmentTeamIds;
+      } else {
+        reqeustData.enterpriseId = enterpriseIds;
+        reqeustData.departmentTeamId = departmentTeamIds;
+      }
+      getWorkerInfoList(reqeustData).then((res) => {
+        this.personList = res.result.records;
+        if (type != 1) {
+          this.uploadAttendanceForm.workerId = "";
+        }
+      });
+    },
+    submitUploadAttendanceForm() {
+      this.$refs["uploadAttendanceForm"].validate((valid) => {
+        if (valid) {
+          let reqeustData = Object.assign({}, this.uploadAttendanceForm);
+          reqeustData.projectSn = this.$store.state.projectSn;
+          if (this.uploadAttendanceForm.inletOutletPosition) {
+            const find = this.allUfaceDev.find(
+              (item) => item.id == this.uploadAttendanceForm.inletOutletPosition
+            );
+            if (find) {
+              reqeustData.devSn = find.devSn;
+            }
+          }
+          if (this.uploadAttendanceForm.passType) {
+            reqeustData.type = this.uploadAttendanceForm.passType;
+          }
+          if (this.uploadAttendanceForm.createTime) {
+            reqeustData.time = this.uploadAttendanceForm.createTime;
+          }
+          if (this.uploadAttendanceForm.fileList.length > 0) {
+            reqeustData.photoUrl = this.uploadAttendanceForm.fileList[0].name;
+          }
+          if (this.uploadAttendanceForm.departmentId) {
+            const find = this.departmentListData.find(
+              (item) => item.id == this.uploadAttendanceForm.departmentId
+            );
+            if (find) {
+              reqeustData.departmentId = find.id;
+            }
+            const findTeam = this.teamListData.find(
+              (item) => item.id == this.uploadAttendanceForm.departmentId
+            );
+            if (findTeam) {
+              reqeustData.teamId = findTeam.id;
+            }
+          }
+          if (this.uploadAttendanceForm.workerId) {
+            const find = this.personList.find(
+              (item) => item.id == this.uploadAttendanceForm.workerId
+            );
+            if (find) {
+              reqeustData.personSn = find.personSn;
+            }
+          }
+
+          console.log(reqeustData);
+          reissueAttendanceCardApi(reqeustData).then((res) => {
+            if (res.success) {
+              this.$message({
+                type: "success",
+                message: res.message,
+              });
+              this.uploadAttendanceShow = false;
+              this.initUploadAttendance();
+              this.getListData();
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        }
+      });
+    },
+    uploadAttendanceFormCancel() {
+      this.initUploadAttendance();
+      this.uploadAttendanceShow = false;
+    },
+    handleAvatarSuccess(res, file) {
+      if (res.status == "SUCCESS") {
+        this.uploadAttendanceForm.fileList.push({
+          name: file.response.data[0].imageUrl,
+          url: this.$store.state.FILEURL + file.response.data[0].imageUrl,
+        });
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        this.$t("message.docManage.dialog_upload_files.limitingChoice")
+      );
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+
+    handleDelete(file, fileList) {
+      this.uploadAttendanceForm.fileList = fileList;
+    },
+    initUploadAttendance() {
+      this.uploadAttendanceForm = {
+        enterpriseId: "",
+        teamId: "",
+        departmentId: "",
+        workerId: "",
+        passType: "",
+        createTime: "",
+        inletOutletPosition: "",
+        cardType: "",
+        fileList: [],
+      };
+    },
+    uploadAttendanceDialog() {
+      this.initUploadAttendance();
+      this.uploadAttendanceShow = true;
+    },
+    getPersonListFn() {
+      let reqeustData = {
+        projectSn: this.$store.state.projectSn,
+        enterpriseId: "",
+      };
+      getWorkerInfoList(reqeustData).then((res) => {
+        this.personList = res.result.records;
+      });
+    },
+    //获取所有的闸机设备
+    getMachineList() {
+      ufaceDevList({ projectSn: this.$store.state.projectSn }).then((list) => {
+        this.allUfaceDev = list.result;
+      });
+    },
+    // 确认拉取数据
+    confirmPullData() {
+      if (!this.timeRange || this.timeRange.length == 0) {
+        this.$message.error("请先选择时间段");
+        return;
+      }
+      let reqeustData = {
+        projectSn: this.projectSn,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1],
+      };
+      pullMemberDataApi(reqeustData).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            message: res.message,
+            type: "success",
+          });
+          this.imgImportDialog = false;
+        }
+      });
+    },
+    /// 打开拉取通行数据弹窗
+    openPullDialog() {
+      this.timeRange = [];
+      this.imgImportDialog = true;
+    },
+    //考勤打印
+    attendancePrint() {
+      console.log("参数", this.formInline);
+      this.printPdf =
+        this.$http.defaults.baseURL +
+        "xmgl/workerWagesPayment/attendancePdf?monthTime=" +
+        this.formInline.monthTime +
+        "&personType=" +
+        this.formInline.personType +
+        "&projectSn=" +
+        this.$store.state.projectSn +
+        "&enterpriseId=" +
+        this.formInline.enterpriseId +
+        "&teamId=" +
+        this.formInline.teamId;
+      // console.log('路径', this.printPdf )
+    },
+    // 导入考勤数据
+    importAttendanceData() {},
+    //获取所属 企业下拉
+    getCompanyList() {
+      let data = {
+        projectSn: this.projectSn,
+        enterpriseName: "",
+        userEnterpriseId: this.$store.state.userInfo.userEnterpriseId,
+      };
+      getEnterpriseInfoList(data).then((res) => {
+        this.enterpriseListData = res.result;
+      });
+    },
+    //获取 部门 列表
+    getDepartmentList() {
+      let data = {
+        enterpriseId: this.formInline.enterpriseId,
+        projectSn: this.projectSn,
+      };
+      getDepartmentInfoList(data).then((res) => {
+        this.departmentListData = res.result.list;
+        // this.isDepartmentTeamList = [...this.isDepartmentTeamList, ...res.result.list];
+      });
+    },
+    //获取企业的 - 班组列表
+    getTeamList() {
+      let data = {
+        enterpriseId: this.formInline.enterpriseId,
+        projectSn: this.projectSn,
+      };
+      getTeamInfoList(data).then((res) => {
+        this.teamListData = res.result.list;
+        // this.isDepartmentTeamList = [...this.isDepartmentTeamList, ...res.result.list];
+      });
+    },
+    changeCompany() {
+      this.formInline.departmentId = "";
+      this.formInline.teamId = "";
+      this.getDepartmentList();
+      this.getTeamList();
+    },
+    //导出详细数据
+    exportFn() {
+      console.log(this.exportDateArr);
+      if (!this.exportDateArr || this.exportDateArr.length == 0) {
+        this.$message.error(
+          this.$t("message.laborMange.pleaseChoose") +
+            this.$t("message.laborMange.timeFrame")
+        );
+        return false;
+      }
+      if (this.selectDateType == 1) {
+        window.location.href =
+          this.$http.defaults.baseURL +
+          "xmgl/download/exportExcelWorkerAttendance?projectSn=" +
+          this.projectSn +
+          "&endTime=" +
+          this.exportDateArr[1] +
+          "&startTime=" +
+          this.exportDateArr[0] +
+          "&personType=" +
+          this.formInline.personType +
+          "&workerName=" +
+          this.formInline.workerName +
+          "&userEnterpriseId=" +
+          this.$store.state.userInfo.userEnterpriseId +
+          "&enterpriseId=" +
+          this.formInline.enterpriseId +
+          "&teamId=" +
+          this.formInline.teamId +
+          "&departmentId=" +
+          this.formInline.departmentId +
+          "&inserviceType=" +
+          this.formInline.inserviceType;
+      } else {
+        let data = {
+          userId: this.$store.state.userInfo.userId,
+          projectSn: this.projectSn,
+          startTime: this.exportDateArr[0],
+          endTime: this.exportDateArr[1],
+        };
+        getAfreshMonthAttendanceStatisticsApi(data).then((res) => {
+          this.$message.success(this.$t("message.laborMange.hint3"));
+        });
+      }
+      this.exportDialog = false;
+    },
+    //导出月份数据
+    exportMonthlyData() {
+      window.location.href =
+        this.$http.defaults.baseURL +
+        "xmgl/download/exportExcelMonthWorkerAttendanceStatistics?projectSn=" +
+        this.projectSn +
+        "&monthTime=" +
+        this.formInline.monthTime +
+        "&personType=" +
+        this.formInline.personType +
+        "&workerName=" +
+        this.formInline.workerName +
+        "&userEnterpriseId=" +
+        this.$store.state.userInfo.userEnterpriseId +
+        "&enterpriseId=" +
+        this.formInline.enterpriseId +
+        "&teamId=" +
+        this.formInline.teamId +
+        "&departmentId=" +
+        this.formInline.departmentId +
+        "&inserviceType=" +
+        this.formInline.inserviceType;
+    },
+
+    //查询 列表信息
+    getListData() {
+      let data = this.formInline;
+      data.pageNo = this.page;
+      data.pageSize = this.pageSize;
+      data.projectSn = this.projectSn;
+      data.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
+      getPageListData(data).then((res) => {
+        if (res.code == 200) {
+          this.total = res.result.total;
+          this.tableData = res.result.records;
+          let date = 0;
+          for (let i in res.result.records[0]) {
+            if (i.indexOf("day") >= 0) {
+              date++;
+            }
+          }
+          this.showTime = date > 0 ? date : this.showTime;
+          this.number = 0;
+          this.dateilList = [];
+        }
+      });
+    },
+    //选中的状态
+    selectWorker(value, num, index) {
+      this.number = num;
+      this.selectIndex = index;
+      this.showSelectPersonSn = value.personSn;
+      this.showSelectTime =
+        num < 10 ? value.queryTime + "-0" + num : value.queryTime + "-" + num;
+      this.getSelectDateil();
+    },
+    // 获取 个人考勤信息
+    getSelectDateil() {
+      let data = {
+        personSn: this.showSelectPersonSn,
+        queryTime: this.showSelectTime,
+      };
+      getSelectDateilApi(data).then((res) => {
+        if (res.code == 200) {
+          this.dateilList = res.result;
+        }
+      });
+    },
+
+    refresh() {
+      this.formInline.workerName = "";
+      this.formInline.personType = "";
+      this.formInline.enterpriseId = "";
+      this.formInline.teamId = "";
+      this.formInline.departmentId = "";
+      let date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      let mydate = year.toString() + "-" + month.toString();
+      this.formInline.monthTime = mydate;
+      this.page = 1;
+      this.pageSize = 10;
+
+      this.getListData();
+    },
+
+    handleSizeChange(value) {
+      this.pageSize = value;
+      this.getListData();
+    },
+    handleCurrentChange(value) {
+      this.page = value;
+      this.getListData();
+    },
+  },
+};
+</script>
+  <style lang="less" scoped>
+.printPdf {
+  text-decoration: none;
+  color: white;
+}
+.flex {
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+}
+.flex2 {
+  display: flex;
+  align-content: center;
+  justify-content: flex-end;
+}
+
+.attendanceManage {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+
+  .demo-form-inline {
+    width: 100%;
+    // background: #fff;
+    min-height: 84px;
+    padding: 24px 20px 0;
+    box-sizing: border-box;
+    border-radius: 3px;
+    margin-bottom: 7px;
+  }
+
+  .table_content {
+    width: 100%;
+    // background: #fff;
+    padding: 15px 0;
+    border-radius: 3px;
+    min-height: 100%;
+    // .left {
+    //   color: rgba(38, 45, 71, 100);
+    //   font-size: 15px;
+    //   font-family: PingFangSC-Medium;
+    //   text-align: center;
+    //   font-weight: 600;
+    //   padding: 0px 15px;
+    //   margin-left: 20px;
+    //   height: 20px;
+    //   line-height: 20px;
+    //   border-left: 3px solid #4a8bff;
+    // }
+    .pageTitle {
+      margin-left: 20px;
+      font-size: 15px;
+    }
+    .rigth {
+      div {
+        margin-right: 15px;
+        line-height: 30px;
+        font-size: 14px;
+      }
+    }
+    .span {
+      display: inline-block;
+      width: 10px;
+      height: 10px;
+      border-radius: 50%;
+      // margin-right: 3px;
+    }
+    .span2 {
+      display: inline-block;
+      width: 18px;
+      height: 18px;
+      border-radius: 50%;
+      // margin-right: 5px;
+      margin-bottom: -5px;
+    }
+  }
+  // .placeholder {
+  //   width: 100%;
+  //   height: 7px;
+  //   background: #f3f5fd;
+  // }
+  /deep/ .__view {
+    width: 100% !important;
+    min-width: 0 !important;
+  }
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+    width: 5px; // 横向滚动条
+    height: 8px; // 纵向滚动条 必写
+  }
+  // 滚动条的滑块
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    background-color: #cacaca;
+    border-radius: 3px;
+  }
+  .bigImageDialog {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.5);
+    text-align: center;
+    z-index: 1000000;
+    overflow-y: auto;
+    // padding-bottom: 50px;
+    height: 100%;
+    .bigImageContent {
+      height: 100%;
+      margin: 0 auto;
+      text-align: center;
+    }
+    img {
+      // margin-top: 10%;
+      position: relative;
+      top: 10%;
+      max-height: 80%;
+      max-width: 80%;
+    }
+  }
+}
+.doloadExcel {
+  // display: inline-block;
+  margin-right: 20px;
+  color: #5181f6;
+  cursor: pointer;
+  float: right;
+  text-decoration: underline;
+  line-height: 34px;
+}
+// 通行数据拉取弹窗样式
+.title-set {
+  display: flex;
+  align-items: center;
+  .line {
+    width: 0px;
+    height: 15px;
+    border-radius: 3px;
+    border: 2px solid #5c81ee;
+    margin-right: 10px;
+  }
+  > span {
+    margin-right: 5px;
+  }
+  .question-icon {
+    border: 1px solid #676c7c;
+    border-radius: 50%;
+    width: 10px;
+    height: 10px;
+    text-align: center;
+    line-height: 10px;
+    font-size: 12px;
+  }
+  .tip-text {
+    font-size: 14px;
+    margin-left: 5px;
+  }
+}
+</style>
+  
\ No newline at end of file