Merge branch 'xjw-dev' of http://192.168.34.160:8023/admin/zhgdyun into xjw-dev

src/assets/js/api/laborPerson.js

@@ -29,6 +29,8 @@ export const xmglXzHikvisionSyncRetryAPI = data => post('xmgl/xzHikvisionSync/re
 // 查找弹弓下发详情
 export const getDangongWorkerFaceStatusPageList = data => get('xmgl/dangongWorkerFaceStatus/page', data);
 
+// 人员在场超时记录
+export const regionViolationPageApi = data => post('xmgl/regionViolation/page', data);
 
 // 批量人员绑定设备
 export const batchBindDevForWorkersApi = data => post('xmgl/workerInfo/batchBindDevForWorkers', data); //批量绑定设备

src/assets/js/http.js

@@ -179,9 +179,9 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
     // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
     // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
-    axios.defaults.baseURL = "http://192.168.34.221:8111/"; //郭圣雄本地
+    // axios.defaults.baseURL = "http://192.168.34.221:8111/"; //郭圣雄本地
     // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
-    // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+    axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
     // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
     // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
     // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈

src/router/index.js

@@ -525,6 +525,13 @@ const routes2 = [{
                 component: () =>
                     import ("@/views/projectFront/laborManage/EpidemicPrevention"),
             },
+            // 劳务管理--人员在场超时记录
+            {
+                path: "/project/labor/personTimeOut",
+                name: "劳务管理_人员在场超时记录",
+                component: () =>
+                    import ("@/views/projectFront/laborManage/personTimeOut.vue"),
+            },
             // 劳务管理--人员审批
             {
                 path: "/project/labor/personAudit",

src/views/projectFront/laborManage/personTimeOut.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="fullHeight">
+    <div class="searchBox whiteBlock">
+      <el-form :inline="true" size="medium" :model="searchForm" ref="searchForm">
+        <el-form-item :label="$t('message.laborMange.personnelType')">
+          <el-select v-model="searchForm.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="企业名称">
+          <el-input v-model="searchForm.enterpriseName" :placeholder="$t('message.personnelPosition.please_enter')" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="班组/部门">
+          <el-input v-model="searchForm.teamName" :placeholder="$t('message.personnelPosition.please_enter')" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="姓名">
+          <el-input v-model="searchForm.workerName" :placeholder="$t('message.personnelPosition.please_enter')" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" plain @click="loadCardData">
+            {{ $t('message.personnelPosition.beaconManage.query') }}
+          </el-button>
+          <el-button type="warning" plain @click="resetForm">
+            {{ $t('message.personnelPosition.beaconManage.refresh') }}
+          </el-button>
+          <!-- 导出 -->
+          <el-button
+            type="primary"
+            @click="exportFn"
+            v-permission="{ key: 'csjl_export', menuPath: '/project/labor/personTimeOut' }"
+            >{{ $t('message.laborMange.export') }}</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <el-table class="tables" :data="pointList">
+        <el-table-column
+          type="index"
+          width="50"
+          align="center"
+          :label="$t('message.personnelPosition.beaconManage.table.index')"
+        ></el-table-column>
+        <el-table-column prop="workerType" label="人员类型" align="center">
+            <template slot-scope="scope">
+                <span>{{ scope.row.workerType }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="enterpriseName" label="企业名称" align="center"></el-table-column>
+        <el-table-column prop="teamName" label="班组/部门" align="center"></el-table-column>
+        <el-table-column prop="workerName" label="姓名" align="center"></el-table-column>
+        <el-table-column prop="enterTime" label="入场时间" align="center"></el-table-column>
+        <el-table-column prop="outTime" label="出场时间" align="center"></el-table-column>
+        <el-table-column prop="duration" label="在场时长" align="center"></el-table-column>
+      </el-table>
+      <el-pagination
+        class="pagerBox"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageNo"
+        :page-sizes="$store.state.PAGESIZRS"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next"
+        :total="Number(total)"
+        background
+      ></el-pagination>
+    </div>
+    <!-- 添加卡片弹框 -->
+    <el-dialog :modal-append-to-body="false" :title="cardDialogTitle" :visible.sync="cardDialog" width="667px" @close="close">
+      <div class="dialog_content">
+        <el-form size="medium" :model="cardForm" ref="cardForm" :rules="cardFormRules" label-width="125px" class="dialogFormBox">
+          <el-form-item :label="$t('message.laborDev.addToBlackReason')" prop="addReason">
+            <el-input v-model="cardForm.addReason" :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('message.laborDev.addToBlackTime')" prop="addTime">
+            <el-date-picker
+              v-model="cardForm.addTime"
+              type="date"
+              :placeholder="$t('message.laborMange.pleaseSelectADate')"
+              value-format="yyyy-MM-dd"
+              style="width: 100%"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item :label="$t('message.laborDev.blackNames')" prop="workerId">
+            <!-- multiple clearable-->
+            <el-select v-model="cardForm.workerId" :placeholder="$t('message.personnelPosition.please_select')" filterable>
+              <el-option :label="item.workerName" :value="item.id" v-for="(item, index) in allPersonList" :key="index"> </el-option>
+            </el-select>
+          </el-form-item>
+          <div class="dialog-footer">
+            <el-button class="cancleBtn" @click="cardDialog = false" icon="el-icon-circle-close" size="medium"
+              >{{ $t('message.personnelPosition.cancel') }}
+            </el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="saveCardFn" size="medium"
+              >{{ $t('message.personnelPosition.determine') }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getWorkerInfoListApi } from '@/assets/js/api/personnelPosition.js'
+import {
+  regionViolationPageApi,
+  workerBlacklistAddApi,
+  workerBlacklistEditApi,
+  workerBlacklistDeleteApi
+} from '@/assets/js/api/laborPerson.js'
+export default {
+  data() {
+    return {
+      searchForm: {
+        personType: '',
+        enterpriseName: '',
+        teamName: '',
+        workerName: ''
+      },
+      pointList: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+      cardDialogTitle: '',
+      cardDialog: false,
+      cardForm: {
+        addReason: '',
+        addTime: '',
+        idCard: '',
+        reason: '',
+        workerId: '',
+        workerName: '',
+        projectSn: this.$store.state.projectSn
+      },
+      cardFormRules: {
+        addReason: [
+          {
+            required: true,
+            message: this.$t('message.personnelPosition.required'),
+            trigger: 'blur'
+          }
+        ],
+        addTime: [
+          {
+            required: true,
+            message: this.$t('message.personnelPosition.mandatory'),
+            trigger: 'change'
+          }
+        ],
+        workerId: [
+          {
+            required: true,
+            message: this.$t('message.personnelPosition.mandatory'),
+            trigger: 'change'
+          }
+        ]
+      },
+      isAdd: false,
+      allPersonList: []
+    }
+  },
+  mounted() {
+    // this.loadAllPerson()
+    this.loadCardData()
+  },
+  filters: {
+    typeText(val, list) {
+      let findItem = list.find(item => val == item.value)
+      return findItem ? findItem.name : ''
+    }
+  },
+  methods: {
+    exportFn() {
+      fetch(this.$http.defaults.baseURL + 'xmgl/regionViolation/exportXls', {
+        headers: {
+          Authorization: this.$store.state.userInfo.token
+        }
+      })
+        .then(response => {
+          // 处理响应
+          if (!response.ok) {
+            throw new Error('导出失败')
+          }
+          return response.blob()
+        })
+        .then(blob => {
+          console.log('导出成功')
+          // 创建一个下载链接
+          const url = window.URL.createObjectURL(blob)
+          // 创建一个<a>元素
+          const link = document.createElement('a')
+          link.href = url
+          link.download = '导出文件.xlsx' // 指定下载文件的文件名
+          // 模拟点击下载链接
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link)
+          // 释放URL对象
+          window.URL.revokeObjectURL(url)
+          // 处理导出的文件
+          // 这里可以使用blob对象来获取导出的文件内容或者将其保存到本地
+        })
+        .catch(error => {
+          // 处理错误
+          console.error(error)
+        })
+    },
+    //获取所有人员
+    loadAllPerson() {
+      getWorkerInfoListApi({
+        projectSn: this.$store.state.projectSn,
+        userEnterpriseId: this.$store.state.userInfo.userEnterpriseId
+      }).then(res => {
+        this.allPersonList = res.result
+      })
+    },
+    addPoint(event) {
+      this.isAdd = true
+      this.cardDialog = true
+      this.cardForm = {
+        addReason: '',
+        addTime: '',
+        idCard: '',
+        reason: '',
+        workerId: '',
+        workerName: '',
+        projectSn: this.$store.state.projectSn
+      }
+      this.cardDialogTitle = this.$t('message.laborDev.add2')
+    },
+    editPoint(item) {
+      this.isAdd = false
+      this.cardDialogTitle = this.$t('message.laborDev.btn_edit') //编辑卡片
+      this.cardForm = JSON.parse(JSON.stringify(item))
+      this.cardDialog = true
+    },
+    removePoint(item) {
+      this.$confirm(
+        this.$t('message.personnelPosition.beaconManage.table.confirmText') + '【' + item.workerName + '】?',
+        this.$t('message.personnelPosition.beaconManage.table.Tips'),
+        {
+          type: 'warning'
+        }
+      ).then(() => {
+        workerBlacklistDeleteApi({ id: item.id }).then(res => {
+          this.loadCardData()
+          this.$message.success(this.$t('message.personnelPosition.delete_success')) //删除成功!
+        })
+      })
+    },
+    //获取卡片列表
+    loadCardData() {
+      let requestData = {
+        projectSn: this.$store.state.projectSn,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.searchForm
+      }
+      regionViolationPageApi(requestData).then(res => {
+        this.pointList = res.result.records
+        this.total = res.result.total
+      })
+    },
+    //添加或编辑卡片
+    saveCardFn() {
+      this.$refs['cardForm'].validate(valid => {
+        if (valid) {
+          if (this.isAdd) {
+            // this.cardForm.floorId = this.currentFloorDetail.floorId
+            workerBlacklistAddApi(this.cardForm).then(res => {
+              this.cardDialog = false
+              this.loadCardData()
+              this.$message.success(this.$t('message.personnelPosition.add_success')) //添加成功！
+            })
+          } else {
+            workerBlacklistEditApi(this.cardForm).then(res => {
+              this.cardDialog = false
+              this.loadCardData()
+              this.$message.success(this.$t('message.personnelPosition.edit_success')) //编辑成功！
+            })
+          }
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm() {
+      this.searchForm = {
+        type: '',
+        enterpriseName: '',
+        teamName: '',
+        workerName: ''
+      }
+      this.loadCardData()
+    },
+
+    //查看条数
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.loadCardData()
+    },
+    //查看页
+    handleCurrentChange(val) {
+      this.pageNo = val
+      this.loadCardData()
+    },
+    close() {
+      this.$nextTick(() => {
+        this.$refs.cardForm.clearValidate()
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.searchBox .el-form-item {
+  margin: 5px 15px 0px 0;
+}
+</style>