ll

liukangdong

2024-10-15 aa64b8c36295468376b2878c0a432087bb77c7f2

ll

 admin/src/components/business/OperaPlatformApproveTemplWindow.vue

@@ -207,7 +207,7 @@
      activeType: '6',
      subLoading: false,
      apprList: [
        { remark: '审批人', active: false, memberType: 1, type: '1', objIds: [] },
        { remark: '审批人', active: false,approveType: 0, memberType: 1, type: '1', objIds: [] },
        { remark: '抄送人', active: false, type: '1', objIds: [] }
      ],
      activeIndex: 0,
@@ -230,7 +230,7 @@
      this.getfindCompanyTreePage()
      this.apprList = [
        { remark: '审批人', active: false, type: '0', memberType: 1, objIds: [] },
        { remark: '抄送人', active: false, type: '1', objIds: [] }
        { remark: '抄送人', active: false,approveType: 0, type: '1', objIds: [] }
      ]
      this.param = {}
      this.searchForm = {}
@@ -313,7 +313,7 @@
      this.activeIndex = 0
    },
    handleAddAppr() {
      this.apprList.splice(this.apprList.length - 1, 0, { remark: '审批人', active: false, memberType: 1, type: 0, objIds: [] })
      this.apprList.splice(this.apprList.length - 1, 0, { remark: '审批人',approveType: 0, active: false, memberType: 1, type: 0, objIds: [] })
      // this.apprList.push({ remark: '审批人', active: false, type: '0' })
    },
    // 获取组织树

 admin/src/views/business/approvalConfiguration.vue

@@ -384,7 +384,7 @@
      this.activeIndex = 0
    },
    handleAddAppr () {
      this.apprList.splice(this.apprList.length - 1, 0, { remark: '审批人', active: false, type: 0, objIds: [] })
      this.apprList.splice(this.apprList.length - 1, 0, { remark: '审批人',approveType: 0, active: false, type: 0, objIds: [] })
      // this.apprList.push({ remark: '审批人', active: false, type: '0' })
    },


 admin/src/views/business/approvalReport.vue

@@ -370,7 +370,7 @@
      this.activeIndex = 0
    },
    handleAddAppr () {
      this.apprList.splice(this.apprList.length - 2, 0, { remark: '审批人', active: false, type: 0, objIds: [] })
      this.apprList.splice(this.apprList.length - 2, 0, { remark: '审批人',approveType: 0, active: false, type: 0, objIds: [] })
      // this.apprList.push({ remark: '审批人', active: false, type: '0' })
    },


 admin/src/views/business/carEvent.vue

@@ -1,36 +1,18 @@
<template>
  <TableLayout :permissions="['business:carevent:query']">
    <!-- 搜索表单 -->
    <el-form
      ref="searchForm"
      slot="search-form"
      :model="searchForm"
      label-width="100px"
      inline
    >
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="车牌号" prop="plateNos">
        <el-input
          v-model="searchForm.plateNos"
          placeholder="请输入车牌号"
          @keypress.enter.native="search"
        ></el-input>
        <el-input v-model="searchForm.plateNos" placeholder="请输入车牌号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="姓名/手机号" prop="keyWords">
        <el-input
          v-model="searchForm.keyWords"
          placeholder="请输入姓名/手机号"
          @keypress.enter.native="search"
        ></el-input>
        <el-input v-model="searchForm.keyWords" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="组织" prop="companyName">
        <el-input
          v-model="searchForm.companyName"
          placeholder="请输入组织名称"
          @keypress.enter.native="search"
        ></el-input>
        <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="人员类型" prop="memberType">
       <el-select v-model="searchForm.queryUserType" placeholder="请选择">
        <el-select v-model="searchForm.queryUserType" placeholder="请选择">
          <el-option label="访客" value="0"></el-option>
          <el-option label="相关方组织" value="1"></el-option>
          <el-option label="内部员工" value="2"></el-option>
@@ -45,23 +27,11 @@
        </el-select>
      </el-form-item>
      <el-form-item label="起始时间" prop="eventType">
        <el-date-picker
          @change="seleTime"
          v-model="time"
          type="datetimerange"
          format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        >
        <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
      <el-radio-group
        v-model="searchForm.radio"
        size="small"
        @input="changeRadio"
      >
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
        <el-radio-button label="1">近7天</el-radio-button>
        <el-radio-button label="2">近30天</el-radio-button>
@@ -75,44 +45,19 @@
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:carevent:exportExcel']">
        <li>
          <el-button
            type="primary"
            v-permissions="['business:carevent:sync']"
            @click="$refs.OperaCarEventHkWindow.open('同步过车记录')"
            >同步</el-button
          >
          <el-button type="primary" v-permissions="['business:carevent:sync']"
            @click="$refs.OperaCarEventHkWindow.open('同步过车记录')">同步</el-button>
        </li>
        <li>
          <el-button
            type="primary"
            :loading="isWorking.export"
            v-permissions="['business:carevent:exportExcel']"
            @click="exportExcel"
            >导出</el-button
          >
          <el-button type="primary" :loading="isWorking.export" v-permissions="['business:carevent:exportExcel']"
            @click="exportExcel">导出</el-button>
        </li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column
          prop="plateNos"
          label="车牌号"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="parkName"
          label="停车库名称"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="gateName"
          label="出入口名称"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="eventTypeName"
          label="事件类型"
          min-width="100px"
        ></el-table-column>
        <el-table-column prop="plateNos" label="车牌号" min-width="100px"></el-table-column>
        <el-table-column prop="parkName" label="停车库名称" min-width="100px"></el-table-column>
        <el-table-column prop="gateName" label="出入口名称" min-width="100px"></el-table-column>
        <el-table-column prop="eventTypeName" label="事件类型" min-width="100px"></el-table-column>
        <el-table-column label="出入类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.inoutType === 0">进场</span>
@@ -122,33 +67,17 @@
        <el-table-column label="人员类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.companyType == 0">相关方组织</span>
            <span v-if="row.companyType == 1">内部员工</span>
            <span v-else-if="row.companyType == 1">内部员工</span>
            <span v-else>访客</span>
          </template>
        </el-table-column>
        <el-table-column
          prop="personName"
          label="姓名"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="personPhone"
          label="手机号"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="personCompanyName"
          label="组织"
          min-width="100px"
        ></el-table-column>
        <el-table-column prop="personName" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="personPhone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="personCompanyName" label="组织" min-width="100px"></el-table-column>
        <el-table-column label="车牌抓拍图" min-width="100px">
          <template slot-scope="{ row }">
            <div v-if="row.platePicUrl != null">
              <el-image
                style="width: 80px; height: 80px"
                :src="row.platePicUrl"
                :preview-src-list="[row.platePicUrl]"
              >
              <el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
              </el-image>
            </div>
          </template>
@@ -156,26 +85,15 @@
        <el-table-column label="抓拍图片" min-width="100px">
          <template slot-scope="{ row }">
            <div v-if="row.vehiclePicUrl != null">
              <el-image
                style="width: 80px; height: 80px"
                :src="row.vehiclePicUrl"
                :preview-src-list="[row.vehiclePicUrl]"
              >
              <el-image style="width: 80px; height: 80px" :src="row.vehiclePicUrl"
                :preview-src-list="[row.vehiclePicUrl]">
              </el-image>
            </div>
          </template>
        </el-table-column>
        <el-table-column
          prop="happenTime"
          label="事件时间"
          min-width="100px"
        ></el-table-column>
        <el-table-column prop="happenTime" label="事件时间" min-width="100px"></el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>

      <OperaCarEventHkWindow ref="OperaCarEventHkWindow" @success="search()" />

 admin/src/views/business/deviceEvent.vue

@@ -15,7 +15,7 @@
        </el-select>
      </el-form-item> -->
      <el-form-item label="人员类型" prop="memberType">
       <el-select v-model="searchForm.queryUserType" placeholder="请选择">
        <el-select v-model="searchForm.queryUserType" placeholder="请选择">
          <el-option label="访客" value="0"></el-option>
          <el-option label="相关方组织" value="1"></el-option>
          <el-option label="内部员工" value="2"></el-option>
@@ -61,7 +61,7 @@
        <el-table-column label="人员类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.companyType == 0">相关方组织</span>
            <span v-if="row.companyType == 1">内部员工</span>
            <span v-else-if="row.companyType == 1">内部员工</span>
            <span v-else>访客</span>
          </template>
        </el-table-column>

 admin/src/views/business/retention.vue

@@ -1,26 +1,12 @@
<template>
  <TableLayout :permissions="['business:retention:query']">
    <!-- 搜索表单 -->
    <el-form
      ref="searchForm"
      slot="search-form"
      :model="searchForm"
      label-width="100px"
      inline
    >
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="姓名/手机号" prop="keyWords">
        <el-input
          v-model="searchForm.keyWords"
          placeholder="请输入姓名/手机号"
          @keypress.enter.native="search"
        ></el-input>
        <el-input v-model="searchForm.keyWords" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="组织" prop="companyName">
        <el-input
          v-model="searchForm.companyName"
          placeholder="请输入组织名称"
          @keypress.enter.native="search"
        ></el-input>
        <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="人员类型" prop="queryUserType">
        <el-select v-model="searchForm.queryUserType" placeholder="请选择">
@@ -30,23 +16,11 @@
        </el-select>
      </el-form-item>
      <el-form-item label="起止时间" prop="startTime">
        <el-date-picker
          @change="seleTime"
          v-model="time"
          type="datetimerange"
          format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss"
          range-separator="至"
          start-placeholder="开始时间"
          end-placeholder="结束时间"
        >
        <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
        </el-date-picker>
      </el-form-item>
      <el-radio-group
        v-model="searchForm.radio"
        size="small"
        @input="changeRadio"
      >
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
        <el-radio-button label="1">近7天</el-radio-button>
        <el-radio-button label="2">近30天</el-radio-button>
@@ -60,91 +34,52 @@
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:retention:exportExcel']">
        <li>
          <el-button
            type="primary"
            :loading="isWorking.export"
            v-permissions="['business:retention:exportExcel']"
            @click="exportExcel"
            >导出</el-button
          >
          <el-button type="primary" :loading="isWorking.export" v-permissions="['business:retention:exportExcel']"
            @click="exportExcel">导出</el-button>
        </li>
      </ul>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="companyName" label="组织" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.type === 2 || row.type === 0">{{
              row.companyName
            }}</span>
              }}</span>
            <span v-else>{{ row.visitCompanyName }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="type" label="人员类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.companyType == 0">相关方组织</span>
            <span v-if="row.companyType == 1">内部员工</span>
            <span v-else-if="row.companyType == 1">内部员工</span>
            <span v-else>访客</span>
          </template>
        </el-table-column>
        <el-table-column
          prop="name"
          label="姓名"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="phone"
          label="手机号"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="idcardDecode"
          label="身份证号"
          min-width="130px"
        ></el-table-column>
        <el-table-column prop="name" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="idcardDecode" label="身份证号" min-width="130px"></el-table-column>
        <el-table-column label="进场门禁" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.type === 1">-</span>
            <span v-else>{{ row.deviceName }}</span>
          </template>
        </el-table-column>
        <el-table-column
          prop="eventDate"
          label="进场时间"
          min-width="100px"
        ></el-table-column>
        <el-table-column prop="eventDate" label="进场时间" min-width="100px"></el-table-column>
        <el-table-column label="人脸照片" min-width="100px">
          <template slot-scope="{ row }">
            <el-image
              v-if="row.faceImgFull != null"
              style="width: 80px; height: 80px"
              :src="row.faceImgFull"
              :preview-src-list="[row.faceImgFull]"
            >
            <el-image v-if="row.faceImgFull != null" style="width: 80px; height: 80px" :src="row.faceImgFull"
              :preview-src-list="[row.faceImgFull]">
            </el-image>
          </template>
        </el-table-column>
        <el-table-column label="操作" min-width="120" fixed="right">
          <template slot-scope="{ row }">
            <el-button
              type="text"
              @click="deleteById(row)"
              icon="el-icon-delete"
              v-permissions="['business:retention:delete']"
              >标记离场</el-button
            >
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
              v-permissions="['business:retention:delete']">标记离场</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
@@ -159,7 +94,7 @@
  name: 'Retention',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -173,7 +108,7 @@
      time: []
    }
  },
  created () {
  created() {
    this.config({
      module: '在园人员信息 表（滞留）',
      api: '/business/retention',
@@ -183,7 +118,7 @@
    this.changeRadio('0')
  },
  methods: {
    changeRadio (e) {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
@@ -199,7 +134,7 @@
      }
      this.search()
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.startTime = ''
      this.searchForm.radio = '0'
@@ -207,7 +142,7 @@
      this.time = []
      this.search()
    },
    seleTime (e) {
    seleTime(e) {
      this.searchForm.startTime = e[0]
      this.searchForm.endTime = e[1]
      this.searchForm.radio = null

 admin/src/views/operation/serviceCar/apprConfig.vue

@@ -389,7 +389,7 @@
      this.activeIndex = 0
    },
    handleAddAppr () {
      this.apprList.splice(this.apprList.length - 1, 0, { remark: '审批人', active: false, type: 0, objIds: [] })
      this.apprList.splice(this.apprList.length - 1, 0, { remark: '审批人',approveType: 0, active: false, type: 0, objIds: [] })
      // this.apprList.push({ remark: '审批人', active: false, type: '0' })
    },