Merge remote-tracking branch 'origin/master'

jiangping

2025-03-05 c88fe3ea9fd8bd1ea556b4769a1a0cd6c9b5661d

Merge remote-tracking branch 'origin/master'

 admin/src/components/common/QueryForm/queryForm.vue

@@ -5,8 +5,8 @@
        <el-form-item v-if="item.type === 'input' && (showZk || index < listLength)" :key="item.filed">
          <el-input v-model="searchForm[item.filed]"
            :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
            :placeholder="item.label" class="w200"
            @change="changeForm(item.filed)" @keyup.enter.native="handlekeyup(item.keyup || false)" />
            :placeholder="item.label" class="w200" @change="changeForm(item.filed)"
            @keyup.enter.native="handlekeyup(item.keyup || false)" />
        </el-form-item>
        <el-form-item v-if="item.type === 'moneySelect' && (showZk || index < listLength)" :key="item.label">
          <el-input v-model="searchForm[item.filedStrt]"
@@ -20,8 +20,7 @@
        <el-form-item v-if="item.type === 'select' && (showZk || index < listLength)" :key="item.filed">
          <el-select v-model="searchForm[item.filed]" :filterable="item.filterable || true"
            :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
            :placeholder="item.label" class="w200"
            @change="changeForm(item.filed)">
            :placeholder="item.label" class="w200" @change="changeForm(item.filed)">
            <el-option v-for="opt, i in item.options" :key="i" :value="item.valueCode ? opt[item.valueCode] : opt.value"
              :label="item.labelCode ? opt[item.labelCode] : opt.label" />
          </el-select>
@@ -29,8 +28,17 @@
        <el-form-item v-if="item.type === 'date' && (showZk || index < listLength)" :key="item.filed">
          <el-date-picker v-model="searchForm[item.filed]" type="date" value-format="yyyy-MM-dd" class="w200"
            :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
            :placeholder="item.label" :picker-options="item.pickerOptions || {}"
            @change="changeForm(item.filed)" />
            :placeholder="item.label" :picker-options="item.pickerOptions || {}" @change="changeForm(item.filed)" />
        </el-form-item>
        <el-form-item label="起止时间" v-if="item.type === 'datetime' && (showZk || index < listLength)" :key="item.filed1">
          <el-date-picker v-model="searchForm[item.filed1]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
            class="w200"
            :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
            :placeholder="item.label" @change="changeForm(item.filed)" />
          <el-date-picker v-model="searchForm[item.filed2]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
            class="w200"
            :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
            :placeholder="item.label" @change="changeForm(item.filed)" />
        </el-form-item>
        <el-form-item v-if="item.type === 'daterange' && (showZk || index < listLength)" :key="item.filed">
          <el-date-picker v-model="searchForm[item.filed]" value-format="yyyy-MM-dd" type="daterange"

 admin/src/views/business/carEvent.vue

@@ -28,9 +28,13 @@
          </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"
          <!-- <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-date-picker> -->
          <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择开始时间" @change="changeRadio" />
          <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择结束时间" @change="changeRadio" />
        </el-form-item>
        <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
          <el-radio-button label="0">当天</el-radio-button>
@@ -77,7 +81,7 @@
            <span v-if="row.inoutType === 1">离园</span>
          </template>
        </el-table-column>
        <el-table-column label="车牌抓拍图" min-width="100px">
        <!-- <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]">
@@ -93,7 +97,7 @@
              </el-image>
            </div>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column prop="happenTime" label="事件时间" min-width="140px"></el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
@@ -157,15 +161,19 @@
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },

 admin/src/views/business/deviceEvent.vue

@@ -29,9 +29,13 @@
          </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"
          <!-- <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-date-picker> -->
          <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择开始时间" @change="changeRadio" />
          <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择结束时间" @change="changeRadio" />
        </el-form-item>
        <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
          <el-radio-button label="0">当天</el-radio-button>
@@ -142,15 +146,19 @@
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },

 admin/src/views/business/empower.vue

@@ -1,114 +1,103 @@
<template>
    <TableLayout :permissions="['business:empower:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="姓名手机号" prop="memberName">
                <el-input v-model="searchForm.memberName" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="下发状态" prop="sendStatus">
                <el-select v-model="searchForm.sendStatus" placeholder="请选择" @keypress.enter.native="search">
                    <el-option label="待下发" value="0"></el-option>
                    <el-option label="任务执行" value="1"></el-option>
                    <el-option label="下发成功" value="2"></el-option>
                    <el-option label="已取消" value="3"></el-option>
                    <el-option label="下发失败" value="4"></el-option>
                    <el-option label="任务下载已结束" value="5"></el-option>
                    <el-option label="不符合下发条件" value="6"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="组织" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="设备名称" prop="deviceName">
                <el-input v-model="searchForm.deviceName" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="下发起始时间" prop="startTime">
                <el-date-picker
                    @change="seleTime"
                    v-model="time"
                    @keypress.enter.native="search"
                    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-button label="0">当天</el-radio-button>
                <el-radio-button label="1">近7天</el-radio-button>
                <el-radio-button label="2">近30天</el-radio-button>
            </el-radio-group>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
                <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">导出</el-button></li>
<!--                <li><el-button type="primary" v-permissions="['business:empower:create']">立即下发</el-button></li>-->
<!--                <li><el-button type="primary" v-permissions="['business:empower:create']">取消下发</el-button></li>-->
            </ul>
            <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="memberName" label="姓名" min-width="80px"></el-table-column>
                <el-table-column prop="memberPhone" label="手机号" min-width="120px"></el-table-column>
                <el-table-column prop="memberidCard" show-overflow-tooltip label="身份证号码" min-width="160px"></el-table-column>
                <el-table-column prop="companyName" show-overflow-tooltip label="所属组织" min-width="240px"></el-table-column>
                <el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" min-width="150px"></el-table-column>
                <el-table-column label="门禁有效期" show-overflow-tooltip min-width="170px">
                    <template slot-scope="{row}">
                        <span v-if="!row.startTime || !row.endTime">长期</span>
                        <div v-else>
                            <span>起：{{row.startTime}}</span><br />
                            <span>止：{{row.endTime}}</span>
                        </div>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="150px"></el-table-column>
                <el-table-column label="是否删除" min-width="100px">
                    <template slot-scope="{row}">
                        <span style="color: green;" v-if="row.isdeleted === 0">否</span>
                        <span style="color: red;" v-if="row.isdeleted === 1">是</span>
                    </template>
                </el-table-column>
<!--                <el-table-column prop="createrName" label="操作人员" min-width="100px"></el-table-column>-->
                <el-table-column label="下发状态" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.sendStatus === 0">待下发</span>
                        <span v-if="row.sendStatus === 1">任务执行</span>
                        <span v-if="row.sendStatus === 2">下发成功</span>
                        <span v-if="row.sendStatus === 3">已取消</span>
                        <span v-if="row.sendStatus === 4">下发失败</span>
                        <span v-if="row.sendStatus === 5">任务下载已结束</span>
                        <span v-if="row.sendStatus === 6">不符合下发条件</span>
                    </template>
                </el-table-column>
                <el-table-column prop="sendType" label="下发类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.sendType === 0">实时</span>
                        <span v-if="row.sendType === 1">定时</span>
                    </template>
                </el-table-column>
                <el-table-column prop="sendDate" label="下发时间" min-width="150px"></el-table-column>
                <el-table-column prop="sendInfo" label="下发备注" min-width="150px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
    </TableLayout>
  <TableLayout :permissions="['business:empower:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="姓名手机号" prop="memberName">
        <el-input v-model="searchForm.memberName" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="下发状态" prop="sendStatus">
        <el-select v-model="searchForm.sendStatus" placeholder="请选择" @keypress.enter.native="search">
          <el-option label="待下发" value="0"></el-option>
          <el-option label="任务执行" value="1"></el-option>
          <el-option label="下发成功" value="2"></el-option>
          <el-option label="已取消" value="3"></el-option>
          <el-option label="下发失败" value="4"></el-option>
          <el-option label="任务下载已结束" value="5"></el-option>
          <el-option label="不符合下发条件" value="6"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="组织" prop="companyName">
        <el-input v-model="searchForm.companyName" placeholder="请输入" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="设备名称" prop="deviceName">
        <el-input v-model="searchForm.deviceName" placeholder="请输入" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="下发起始时间" prop="">
        <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" 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-date-picker type="datetime" v-model="searchForm.sendStartDate" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.sendEndDate" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <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>
      </el-radio-group>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
        <li><el-button type="primary" v-permissions="['business:empower:exportExcel']"
            @click="exportExcel">导出</el-button></li>
        <!--                <li><el-button type="primary" v-permissions="['business:empower:create']">立即下发</el-button></li>-->
        <!--                <li><el-button type="primary" v-permissions="['business:empower:create']">取消下发</el-button></li>-->
      </ul>
      <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="memberName" label="姓名" min-width="80px"></el-table-column>
        <el-table-column prop="memberPhone" label="手机号" min-width="120px"></el-table-column>
        <el-table-column prop="memberidCard" show-overflow-tooltip label="身份证号码" min-width="160px"></el-table-column>
        <el-table-column prop="companyName" show-overflow-tooltip label="所属组织" min-width="240px"></el-table-column>
        <el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" min-width="150px"></el-table-column>
        <el-table-column label="门禁有效期" show-overflow-tooltip min-width="170px">
          <template slot-scope="{row}">
            <span v-if="!row.startTime || !row.endTime">长期</span>
            <div v-else>
              <span>起：{{ row.startTime }}</span><br />
              <span>止：{{ row.endTime }}</span>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="150px"></el-table-column>
        <el-table-column label="是否删除" min-width="100px">
          <template slot-scope="{row}">
            <span style="color: green;" v-if="row.isdeleted === 0">否</span>
            <span style="color: red;" v-if="row.isdeleted === 1">是</span>
          </template>
        </el-table-column>
        <!--                <el-table-column prop="createrName" label="操作人员" min-width="100px"></el-table-column>-->
        <el-table-column label="下发状态" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.sendStatus === 0">待下发</span>
            <span v-if="row.sendStatus === 1">任务执行</span>
            <span v-if="row.sendStatus === 2">下发成功</span>
            <span v-if="row.sendStatus === 3">已取消</span>
            <span v-if="row.sendStatus === 4">下发失败</span>
            <span v-if="row.sendStatus === 5">任务下载已结束</span>
            <span v-if="row.sendStatus === 6">不符合下发条件</span>
          </template>
        </el-table-column>
        <el-table-column prop="sendType" label="下发类型" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.sendType === 0">实时</span>
            <span v-if="row.sendType === 1">定时</span>
          </template>
        </el-table-column>
        <el-table-column prop="sendDate" label="下发时间" min-width="150px"></el-table-column>
        <el-table-column prop="sendInfo" label="下发备注" min-width="150px"></el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
</template>

<script>
@@ -120,7 +109,7 @@
  name: 'Empower',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -137,7 +126,7 @@
      time: []
    }
  },
  created () {
  created() {
    this.config({
      module: '人员授权导入记录',
      api: '/business/empower',
@@ -148,30 +137,34 @@
    this.search()
  },
  methods: {
    changeRadio (e) {
    changeRadio(e) {
      this.searchForm.radio = e
      if (e === '0') {
        this.searchForm.sendStartDate = timeForMat(0)[0]
        this.searchForm.sendEndDate = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.sendStartDate = timeForMat(6)[0]
        this.searchForm.sendEndDate = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.sendStartDate = timeForMat(29)[0]
        this.searchForm.sendEndDate = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.sendStartDate && this.searchForm.sendEndDate && new Date(this.searchForm.sendStartDate).getTime() > new Date(this.searchForm.sendEndDate).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.sendStartDate = ''
        return
      }
      this.search()
    },
    seleTime (e) {
    seleTime(e) {
      this.searchForm.sendStartDate = e[0]
      this.searchForm.sendEndDate = e[1]
      this.searchForm.radio = null
      this.search()
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm = {}
      this.time = []

 admin/src/views/business/interfaceLog.vue

@@ -1,18 +1,18 @@
<template>
    <TableLayout :permissions="['business:interfacelog:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="接口名称" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入接口名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="类型" prop="type">
                <el-select v-model="searchForm.type" @change="search" placeholder="请选择">
                    <el-option label="调用" value="0"></el-option>
                    <el-option label="推送接受" value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="起止时间" prop="startDate">
                <el-date-picker
  <TableLayout :permissions="['business:interfacelog:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="接口名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入接口名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="类型" prop="type">
        <el-select v-model="searchForm.type" @change="search" placeholder="请选择">
          <el-option label="调用" value="0"></el-option>
          <el-option label="推送接受" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="起止时间" prop="startDate">
        <!-- <el-date-picker
                    @change="seleTime"
                    v-model="time"
                    type="datetimerange"
@@ -21,61 +21,59 @@
                    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-button label="0">当天</el-radio-button>
                <el-radio-button label="1">近7天</el-radio-button>
                <el-radio-button label="2">近30天</el-radio-button>
            </el-radio-group>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="name" label="接口名称" min-width="180px"></el-table-column>
                <el-table-column prop="url" label="地址信息" min-width="180px"></el-table-column>
                <el-table-column label="类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.type == 0">调用</span>
                        <span v-if="row.type == 1">推送接收</span>
                    </template>
                </el-table-column>
                <el-table-column label="平台" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.plat == 0">海康安防平台</span>
                        <span v-if="row.plat == 1">ERP系统</span>
                    </template>
                </el-table-column>
                <el-table-column prop="request" label="请求参数" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('请求参数', {content: row.request})">查看</el-button>
                    </template>
                </el-table-column>
                <el-table-column prop="repose" label="响应参数" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('响应参数', {content: row.repose})">查看</el-button>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
        <!-- 新建/修改 -->
        <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
    </TableLayout>
                </el-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.startDate" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.endDate" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <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>
      </el-radio-group>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="name" label="接口名称" min-width="180px"></el-table-column>
        <el-table-column prop="url" label="地址信息" min-width="180px"></el-table-column>
        <el-table-column label="类型" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.type == 0">调用</span>
            <span v-if="row.type == 1">推送接收</span>
          </template>
        </el-table-column>
        <el-table-column label="平台" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.plat == 0">海康安防平台</span>
            <span v-if="row.plat == 1">ERP系统</span>
          </template>
        </el-table-column>
        <el-table-column prop="request" label="请求参数" min-width="100px">
          <template slot-scope="{row}">
            <el-button type="text"
              @click="$refs.operaInterfaceLogWindow.open('请求参数', { content: row.request })">查看</el-button>
          </template>
        </el-table-column>
        <el-table-column prop="repose" label="响应参数" min-width="100px">
          <template slot-scope="{row}">
            <el-button type="text"
              @click="$refs.operaInterfaceLogWindow.open('响应参数', { content: row.repose })">查看</el-button>
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
    <!-- 新建/修改 -->
    <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange" />
  </TableLayout>
</template>

<script>
@@ -88,7 +86,7 @@
  name: 'InterfaceLog',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaInterfaceLogWindow },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -101,7 +99,7 @@
      time: []
    }
  },
  created () {
  created() {
    this.config({
      module: '三方平台接口交互记录',
      api: '/business/interfaceLog',
@@ -111,29 +109,33 @@
    this.changeRadio('0')
  },
  methods: {
    changeRadio (e) {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startDate = timeForMat(0)[0]
        this.searchForm.endDate = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startDate = timeForMat(6)[0]
        this.searchForm.endDate = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startDate = timeForMat(29)[0]
        this.searchForm.endDate = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startDate && this.searchForm.endDate && new Date(this.searchForm.startDate).getTime() > new Date(this.searchForm.endDate).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startDate = ''
        return
      }
      this.search()
    },
    seleTime (e) {
    seleTime(e) {
      this.searchForm.startDate = e[0]
      this.searchForm.endDate = e[1]
      this.searchForm.radio = null
      this.search()
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.startDate = ''
      this.searchForm.endDate = ''

 admin/src/views/business/retention.vue

@@ -17,9 +17,13 @@
          </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"
          <!-- <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-date-picker> -->
          <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择开始时间" @change="changeRadio" />
          <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择结束时间" @change="changeRadio" />
        </el-form-item>
        <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
          <el-radio-button label="0">当天</el-radio-button>
@@ -41,7 +45,8 @@
            @click="exportExcel">导出</el-button>
        </li>
      </ul>
      <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table :max-height="tableHeight" 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="name" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
@@ -50,7 +55,7 @@
          <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>
@@ -130,15 +135,19 @@
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },

 admin/src/views/business/retentionCars.vue

@@ -23,9 +23,13 @@
        </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"
        <!-- <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-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
@@ -123,15 +127,19 @@
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },

 admin/src/views/business/smsEmail.vue

@@ -5,7 +5,7 @@
      <el-form-item label="" prop="phone">
        <el-input v-model="searchForm.phone" placeholder="请输入手机号/邮箱地址" @keypress.enter.native="search"></el-input>
      </el-form-item>
<!--      <el-form-item label="" prop="type">
      <!--      <el-form-item label="" prop="type">
        <el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="类型">
          <el-option label="短信" value="0"></el-option>
          <el-option label="邮箱" value="1"></el-option>
@@ -25,9 +25,13 @@
        </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"
        <!-- <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-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
@@ -43,10 +47,10 @@
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="phone" label="手机号/邮箱" min-width="150px">
            <template slot-scope="{ row }">
              <span v-if="row.type == 0">{{ row.phone }}</span>
              <span v-if="row.type == 1">{{ row.email }}</span>
            </template>
          <template slot-scope="{ row }">
            <span v-if="row.type == 0">{{ row.phone }}</span>
            <span v-if="row.type == 1">{{ row.email }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="title" label="标题" min-width="100px"></el-table-column>
        <el-table-column prop="content" label="内容" min-width="300px"></el-table-column>
@@ -120,25 +124,29 @@
  methods: {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = ''
      // this.changeRadio('0')
      // this.searchForm.radio = ''
      this.changeRadio('0')
      this.searchForm = {}
      this.time = []
      this.search()
      // this.search()
    },
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },

 admin/src/views/business/trainTime.vue

@@ -9,9 +9,13 @@
        <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
      </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"
        <!-- <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-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.sendStartDate" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.sendEndDate" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
@@ -90,15 +94,19 @@
      if (e === '0') {
        this.searchForm.sendStartDate = timeForMat(0)[0]
        this.searchForm.sendEndDate = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.sendStartDate = timeForMat(6)[0]
        this.searchForm.sendEndDate = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.sendStartDate = timeForMat(29)[0]
        this.searchForm.sendEndDate = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.sendStartDate && this.searchForm.sendEndDate && new Date(this.searchForm.sendStartDate).getTime() > new Date(this.searchForm.sendEndDate).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.sendStartDate = ''
        return
      }
      this.search()
    },

 admin/src/views/business/visitEvent.vue

@@ -1,95 +1,83 @@
<template>
    <TableLayout :permissions="['business:visitevent:query']">
        <!-- 搜索表单 -->
        <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-form-item>
            <el-form-item label="车牌号" prop="carNo">
                <el-input v-model="searchForm.carNo" placeholder="请输入车牌号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="组织名称" prop="visitorWorkUint">
                <el-input v-model="searchForm.visitorWorkUint" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="事件类型" prop="eventType">
                <el-select v-model="searchForm.eventType" placeholder="请选择">
                    <el-option label="访客登记" value="541200006"></el-option>
                    <el-option label="访客签离" value="541200007"></el-option>
                    <el-option label="访客通行" value="541200060"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="进出类型" prop="inOrOut">
                <el-select v-model="searchForm.inOrOut" placeholder="请选择">
                    <el-option label="进" value="0"></el-option>
                    <el-option label="出" value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="起始时间" prop="carNo">
                <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-button label="0">当天</el-radio-button>
                <el-radio-button label="1">近7天</el-radio-button>
                <el-radio-button label="2">近30天</el-radio-button>
            </el-radio-group>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
                <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']" @click="exportExcel">导出</el-button></li>
            </ul>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="personName" 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="100px"></el-table-column>
                <el-table-column prop="visitorWorkUint" label="组织" min-width="100px"></el-table-column>
                <el-table-column prop="carNo" label="车牌号" min-width="100px"></el-table-column>
                <el-table-column prop="beVisitedPersonName" label="被访人" min-width="100px"></el-table-column>
                <el-table-column prop="beVisitedPersonOrg" label="被访人组织" min-width="100px"></el-table-column>
                <el-table-column prop="eventTypeName" label="事件类型" min-width="100px"></el-table-column>
                <el-table-column prop="inOrOut" label="进出类型" min-width="100px">
                  <template slot-scope="{row}">
                    <span v-if="row.inOrOut == '0'">进</span>
                    <span v-else-if="row.inOrOut == '1'">出</span>
                    <span v-else>-</span>
                  </template>
                </el-table-column>
                <el-table-column label="抓拍图" min-width="100px">
                    <template slot-scope="{row}">
                        <el-image v-if="row.captureUrlFull!=null"
                            style="width: 80px; height: 80px"
                            :src="row.captureUrlFull"
                            :preview-src-list="[row.captureUrlFull]">
                        </el-image>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="事件时间" min-width="100px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
    </TableLayout>
  <TableLayout :permissions="['business:visitevent:query']">
    <!-- 搜索表单 -->
    <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-form-item>
      <el-form-item label="车牌号" prop="carNo">
        <el-input v-model="searchForm.carNo" placeholder="请输入车牌号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="组织名称" prop="visitorWorkUint">
        <el-input v-model="searchForm.visitorWorkUint" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="事件类型" prop="eventType">
        <el-select v-model="searchForm.eventType" placeholder="请选择">
          <el-option label="访客登记" value="541200006"></el-option>
          <el-option label="访客签离" value="541200007"></el-option>
          <el-option label="访客通行" value="541200060"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="进出类型" prop="inOrOut">
        <el-select v-model="searchForm.inOrOut" placeholder="请选择">
          <el-option label="进" value="0"></el-option>
          <el-option label="出" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="起始时间" prop="carNo">
        <!-- <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-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <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>
      </el-radio-group>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
        <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']"
            @click="exportExcel">导出</el-button></li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="personName" 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="100px"></el-table-column>
        <el-table-column prop="visitorWorkUint" label="组织" min-width="100px"></el-table-column>
        <el-table-column prop="carNo" label="车牌号" min-width="100px"></el-table-column>
        <el-table-column prop="beVisitedPersonName" label="被访人" min-width="100px"></el-table-column>
        <el-table-column prop="beVisitedPersonOrg" label="被访人组织" min-width="100px"></el-table-column>
        <el-table-column prop="eventTypeName" label="事件类型" min-width="100px"></el-table-column>
        <el-table-column prop="inOrOut" label="进出类型" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.inOrOut == '0'">进</span>
            <span v-else-if="row.inOrOut == '1'">出</span>
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column label="抓拍图" min-width="100px">
          <template slot-scope="{row}">
            <el-image v-if="row.captureUrlFull != null" style="width: 80px; height: 80px" :src="row.captureUrlFull"
              :preview-src-list="[row.captureUrlFull]">
            </el-image>
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="事件时间" min-width="100px"></el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
</template>

<script>
@@ -101,7 +89,7 @@
  name: 'VisitEvent',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -118,7 +106,7 @@
      time: []
    }
  },
  created () {
  created() {
    this.config({
      module: '访客事件推送记录表',
      api: '/business/visitEvent',
@@ -130,29 +118,33 @@
    this.search()
  },
  methods: {
    seleTime (e) {
    seleTime(e) {
      this.searchForm.startTime = e[0]
      this.searchForm.endTime = e[1]
      this.searchForm.radio = null
      this.search()
    },
    changeRadio (e) {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.time = []
      this.searchForm = {}

 admin/src/views/business/wmsInterfaceLog.vue

@@ -1,18 +1,18 @@
<template>
    <TableLayout :permissions="['business:wmsinterfacelog:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="接口名称" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入接口名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="类型" prop="type">
                <el-select v-model="searchForm.type" @change="search" placeholder="请选择">
                    <el-option label="调用" value="0"></el-option>
                    <el-option label="推送接受" value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="起止时间" prop="startDate">
                <el-date-picker
  <TableLayout :permissions="['business:wmsinterfacelog:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="接口名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入接口名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="类型" prop="type">
        <el-select v-model="searchForm.type" @change="search" placeholder="请选择">
          <el-option label="调用" value="0"></el-option>
          <el-option label="推送接受" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="起止时间" prop="startDate">
        <!-- <el-date-picker
                    @change="seleTime"
                    v-model="time"
                    type="datetimerange"
@@ -21,61 +21,59 @@
                    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-button label="0">当天</el-radio-button>
                <el-radio-button label="1">近7天</el-radio-button>
                <el-radio-button label="2">近30天</el-radio-button>
            </el-radio-group>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="name" label="接口名称" min-width="180px"></el-table-column>
                <el-table-column prop="url" label="地址信息" min-width="180px"></el-table-column>
                <el-table-column label="类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.type == 0">调用</span>
                        <span v-if="row.type == 1">推送接收</span>
                    </template>
                </el-table-column>
<!--                <el-table-column label="平台" min-width="100px">
                </el-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.startDate" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.endDate" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <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>
      </el-radio-group>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="name" label="接口名称" min-width="180px"></el-table-column>
        <el-table-column prop="url" label="地址信息" min-width="180px"></el-table-column>
        <el-table-column label="类型" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.type == 0">调用</span>
            <span v-if="row.type == 1">推送接收</span>
          </template>
        </el-table-column>
        <!--                <el-table-column label="平台" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.plat == 0">海康安防平台</span>
                        <span v-if="row.plat == 1">ERP系统</span>
                    </template>
                </el-table-column>-->
                <el-table-column prop="request" label="请求参数" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('请求参数', {content: row.request})">查看</el-button>
                    </template>
                </el-table-column>
                <el-table-column prop="repose" label="响应参数" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('响应参数', {content: row.repose})">查看</el-button>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
        <!-- 新建/修改 -->
        <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
    </TableLayout>
        <el-table-column prop="request" label="请求参数" min-width="100px">
          <template slot-scope="{row}">
            <el-button type="text"
              @click="$refs.operaInterfaceLogWindow.open('请求参数', { content: row.request })">查看</el-button>
          </template>
        </el-table-column>
        <el-table-column prop="repose" label="响应参数" min-width="100px">
          <template slot-scope="{row}">
            <el-button type="text"
              @click="$refs.operaInterfaceLogWindow.open('响应参数', { content: row.repose })">查看</el-button>
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
    <!-- 新建/修改 -->
    <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange" />
  </TableLayout>
</template>

<script>
@@ -88,7 +86,7 @@
  name: 'InterfaceLog',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaInterfaceLogWindow },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -101,7 +99,7 @@
      time: []
    }
  },
  created () {
  created() {
    this.config({
      module: '三方平台接口交互记录',
      api: '/business/wmsInterfaceLog',
@@ -111,29 +109,33 @@
    this.changeRadio('0')
  },
  methods: {
    changeRadio (e) {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startDate = timeForMat(0)[0]
        this.searchForm.endDate = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startDate = timeForMat(6)[0]
        this.searchForm.endDate = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startDate = timeForMat(29)[0]
        this.searchForm.endDate = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startDate && this.searchForm.endDate && new Date(this.searchForm.startDate).getTime() > new Date(this.searchForm.endDate).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startDate = ''
        return
      }
      this.search()
    },
    seleTime (e) {
    seleTime(e) {
      this.searchForm.startDate = e[0]
      this.searchForm.endDate = e[1]
      this.searchForm.radio = null
      this.search()
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.startDate = ''
      this.searchForm.endDate = ''

 admin/src/views/meeting/bookings.vue

@@ -32,10 +32,13 @@
        </el-select>
      </el-form-item>
      <el-form-item label="起止时间" prop="startTime">
        <el-date-picker v-model="date" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
        <!-- <el-date-picker v-model="date" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
          :default-time="['00:00:00', '23:59:59']" start-placeholder="开始时间" end-placeholder="结束时间"
          @change="selectDate"></el-date-picker>
        <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="请输入开始时间" @change="search"/> -->
          @change="selectDate"></el-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
@@ -43,7 +46,7 @@
        <el-radio-button label="2">近30天</el-radio-button>
      </el-radio-group>
      <!-- <el-form-item label="结束时间" prop="endTime">
        <el-date-picker v-model="searchForm.endTime" value-format="yyyy-MM-dd" placeholder="请输入结束时间" @change="search"/>
        <el-date-picker v-model="searchForm.endTime" value-format="yyyy-MM-dd" placeholder="请选择结束时间" @change="search"/>
      </el-form-item> -->
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
@@ -213,15 +216,19 @@
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.date = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.date = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.date = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },

 admin/src/views/meeting/roomRecord.vue

@@ -3,12 +3,7 @@
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="会议室" prop="roomId">
        <el-select
            v-model="searchForm.roomId"
            filterable
            clearable
            placeholder="请选择会议室"
        >
        <el-select v-model="searchForm.roomId" filterable clearable placeholder="请选择会议室">
          <el-option v-for="item in rooms" :key="item.id" :value="item.id" :label="item.name" />
        </el-select>
      </el-form-item>
@@ -19,54 +14,43 @@
        <el-input v-model="searchForm.meeting" placeholder="请输入会议主题" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="类型" prop="status">
        <el-select v-model= "searchForm.objType" placeholder="请选择状态">
          <el-option  key="0"  value="0" label="管理员" />
          <el-option  key="1"  value="1" label="参会人员" />
          <el-option  key="2"  value="2" label="外部人员" />
        <el-select v-model="searchForm.objType" placeholder="请选择状态">
          <el-option key="0" value="0" label="管理员" />
          <el-option key="1" value="1" label="参会人员" />
          <el-option key="2" value="2" label="外部人员" />
        </el-select>
      </el-form-item>
      <el-form-item label="开门时间" prop="startTime">
        <el-date-picker
            v-model="date"
            type="datetimerange"
            range-separator="至"
            value-format="yyyy-MM-dd HH:mm:ss"
            start-placeholder="开始时间"
            end-placeholder="结束时间"
            @change="selectDate"
        ></el-date-picker>
        <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="请输入开始时间" @change="search"/> -->
        <el-date-picker v-model="date" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
          start-placeholder="开始时间" end-placeholder="结束时间" @change="selectDate"></el-date-picker>
        <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="请选择开始时间" @change="search"/> -->
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:roomrecord:exportExcel']" @click="exportExcel">导出</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:roomrecord:exportExcel']"
          @click="exportExcel">导出</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
<!--      <ul class="toolbar" v-permissions="['business:roomrecord:create', 'business:roomrecord:delete']">
      <!--      <ul class="toolbar" v-permissions="['business:roomrecord:create', 'business:roomrecord:delete']">
        <li><el-button type="primary" @click="$refs.operaRoomRecordWindow.open('新建会议室开门记录表')" icon="el-icon-plus" v-permissions="['business:roomrecord:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:roomrecord:delete']">删除</el-button></li>
      </ul>-->
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column label="人员姓名"  prop="userName" min-width="100px"></el-table-column>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column label="人员姓名" prop="userName" min-width="100px"></el-table-column>
        <el-table-column label="人员类型" prop="objType" min-width="100px">
            <template  slot-scope="{row}">
              <span v-if="row.objType==0" >管理员</span>
              <span v-else-if="row.objType==1">参会人员</span>
              <span v-else >外部人员</span>
            </template>
          <template slot-scope="{row}">
            <span v-if="row.objType == 0">管理员</span>
            <span v-else-if="row.objType == 1">参会人员</span>
            <span v-else>外部人员</span>
          </template>
        </el-table-column>
        <el-table-column label="会议主题" prop="meeting" min-width="100px"></el-table-column>
        <el-table-column label="会议室" prop="roomName" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="开门时间" min-width="100px"></el-table-column>
<!--        <el-table-column
        <!--        <el-table-column
          v-if="containPermissions(['business:roomrecord:update', 'business:roomrecord:delete'])"
          label="操作"
          min-width="120"
@@ -78,15 +62,11 @@
          </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>
    <!-- 新建/修改 -->
    <OperaRoomRecordWindow ref="operaRoomRecordWindow" @success="handlePageChange"/>
    <OperaRoomRecordWindow ref="operaRoomRecordWindow" @success="handlePageChange" />
  </TableLayout>
</template>

@@ -100,9 +80,9 @@
  name: 'RoomRecord',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaRoomRecordWindow },
  data () {
  data() {
    return {
      date:[],
      date: [],
      // 搜索
      rooms: [
        { name: '201会议室', id: '0' }
@@ -112,13 +92,13 @@
        userName: '',
        roomId: '',
        meeting: '',
        objType:null,
        objType: null,
        startDate: null,
        endDate: null,
      }
    }
  },
  created () {
  created() {
    this.config({
      module: '会议室开门记录表',
      api: '/meeting/roomRecord',
@@ -126,9 +106,9 @@
      'field.main': 'id'
    })
    findList({})
        .then(res => {
          this.rooms = res
        })
      .then(res => {
        this.rooms = res
      })
    this.search()
  },
  methods: {
@@ -136,16 +116,16 @@
      this.searchForm.endDate = v[1]
      this.searchForm.startDate = v[0]
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.date = []
      this.searchForm =   {
      this.searchForm = {
        userName: '',
            roomId: '',
            meeting: '',
            objType:null,
            startDate: null,
            endDate: null,
        roomId: '',
        meeting: '',
        objType: null,
        startDate: null,
        endDate: null,
      }
      this.search()
    }

 admin/src/views/operation/danger/record.vue

@@ -33,10 +33,14 @@
        </el-select>
      </el-form-item>
      <el-form-item label="提报时间" prop="startTime">
        <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
        <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
          format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
          range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
        </el-date-picker>
        </el-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.queryStartTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.queryEndTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
@@ -171,15 +175,19 @@
      if (e === '0') {
        this.searchForm.queryStartTime = timeForMat(0)[0]
        this.searchForm.queryEndTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.queryStartTime = timeForMat(6)[0]
        this.searchForm.queryEndTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.queryStartTime = timeForMat(29)[0]
        this.searchForm.queryEndTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.queryStartTime && this.searchForm.queryEndTime && new Date(this.searchForm.queryStartTime).getTime() > new Date(this.searchForm.queryEndTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.queryStartTime = ''
        return
      }
      this.search()
    },

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

@@ -1,90 +1,55 @@
<template>
  <TableLayout :permissions="['business:carusebook:query']">
    <!-- 搜索表单 -->
    <el-form
      ref="searchForm"
      slot="search-form"
      :model="searchForm"
      label-width="100px"
      inline
    >
      <el-form-item label="申请人" prop="memberName">
        <el-input
          v-model="searchForm.memberName"
          placeholder="请输入姓名/手机号"
          @keypress.enter.native="search"
        ></el-input>
      </el-form-item>
      <el-form-item label="申请人组织" prop="companyName">
        <el-input
          v-model="searchForm.companyName"
          placeholder="请输入申请人组织"
          clearable
          @keypress.enter.native="search"
        ></el-input>
      </el-form-item>
      <el-form-item label="车牌号" prop="carCode">
        <el-input
          v-model="searchForm.carCode"
          placeholder="请输入车牌号"
          clearable
          @keypress.enter.native="search"
        ></el-input>
      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select
          v-model="searchForm.status"
          @change="search"
          clearable
          placeholder="状态"
        >
          <el-option label="申请中" value="0"></el-option>
          <el-option label="审核中" value="1"></el-option>
          <el-option label="审批通过" value="2"></el-option>
          <el-option label="审批不通过" value="3"></el-option>
          <el-option label="已撤销" value="4"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="目的地类型" prop="type">
        <el-select
          v-model="searchForm.type"
          @change="search"
          clearable
          placeholder="目的地类型"
        >
          <el-option label="市内用车" value="0"></el-option>
          <el-option label="市外用车" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="申请时间" prop="startTime">
        <el-date-picker
          @change="seleTime"
          v-model="time"
          @keypress.enter.native="search"
          type="datetimerange"
          format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss"
          :default-time="['00:00:00', '23:59:59']"
          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-button label="0">当天</el-radio-button>
        <el-radio-button label="1">近7天</el-radio-button>
        <el-radio-button label="2">近30天</el-radio-button>
      </el-radio-group>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <div ref="QueryFormRef" slot="search-form">
      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
        <el-form-item label="申请人" prop="memberName">
          <el-input v-model="searchForm.memberName" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="申请人组织" prop="companyName">
          <el-input v-model="searchForm.companyName" placeholder="请输入申请人组织" clearable
            @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="车牌号" prop="carCode">
          <el-input v-model="searchForm.carCode" placeholder="请输入车牌号" clearable
            @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="状态" prop="status">
          <el-select v-model="searchForm.status" @change="search" clearable placeholder="状态">
            <el-option label="申请中" value="0"></el-option>
            <el-option label="审核中" value="1"></el-option>
            <el-option label="审批通过" value="2"></el-option>
            <el-option label="审批不通过" value="3"></el-option>
            <el-option label="已撤销" value="4"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="目的地类型" prop="type">
          <el-select v-model="searchForm.type" @change="search" clearable placeholder="目的地类型">
            <el-option label="市内用车" value="0"></el-option>
            <el-option label="市外用车" value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="出发时间" prop="startTime">
          <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
            format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
          </el-date-picker> -->
          <el-date-picker type="datetime" v-model="searchForm.queryStartTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择开始时间" @change="changeRadio" />
          <el-date-picker type="datetime" v-model="searchForm.queryEndTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择结束时间" @change="changeRadio" />
        </el-form-item>
        <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>
        </el-radio-group>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
    </div>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul
@@ -112,12 +77,8 @@
          >
        </li>
      </ul>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
      <el-table :max-height="tableHeight" 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="carCode"
@@ -260,8 +221,8 @@
      searchForm: {
        memberName: '',
        companyName: '',
        queryStartTime: '',
        queryEndTime: '',
        startTime: '',
        endTime: '',
        type: null,
        status: null,
        radio: 0
@@ -321,20 +282,23 @@
            })
        })
    },
    changeRadio (e) {
      this.searchForm.radio = e
      if (e === 0) {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.queryStartTime = timeForMat(0)[0]
        this.searchForm.queryEndTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === 1) {
      } else if (e === '1') {
        this.searchForm.queryStartTime = timeForMat(6)[0]
        this.searchForm.queryEndTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === 2) {
      } else if (e === '2') {
        this.searchForm.queryStartTime = timeForMat(29)[0]
        this.searchForm.queryEndTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.queryStartTime && this.searchForm.queryEndTime && new Date(this.searchForm.queryStartTime).getTime() > new Date(this.searchForm.queryEndTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.queryStartTime = ''
        return
      }
      this.search()
    },

 admin/src/views/statistics/platformStatic.vue

@@ -159,11 +159,11 @@
    },
    clear() {
      this.filters = {
        // selDate: []
        fastdate: '0'
        selDate: [],
        fastdate: ''
      }
      // this.getList()
      this.changeRadio('0')
      this.getList()
      // this.changeRadio('0')
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity

 admin/src/views/system/loginLog.vue

@@ -13,12 +13,12 @@
      </el-form-item>
      <el-form-item label="是否登录成功" prop="success">
        <el-select v-model="searchForm.success" placeholder="请选择是否登录状态" clearable @change="search">
          <el-option value="true" label="登录成功"/>
          <el-option value="false" label="登录失败"/>
          <el-option value="true" label="登录成功" />
          <el-option value="false" label="登录失败" />
        </el-select>
      </el-form-item>
      <el-form-item label="登录时间" prop="loginTime">
        <el-date-picker
        <!-- <el-date-picker
          v-model="searchDateRange"
          type="datetimerange"
          range-separator="至"
@@ -26,7 +26,11 @@
          start-placeholder="开始时间"
          end-placeholder="结束时间"
          @change="handleSearchTimeChange"
        ></el-date-picker>
        ></el-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
@@ -36,34 +40,27 @@
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        :default-sort="{prop: 'loginTime', order: 'descending'}"
        @sort-change="handleSortChange"
      >
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe
        :default-sort="{ prop: 'loginTime', order: 'descending' }" @sort-change="handleSortChange">
        <el-table-column prop="loginUsername" label="登录用户名" min-width="100px"></el-table-column>
        <el-table-column prop="ip" label="登录IP" min-width="120px"></el-table-column>
        <el-table-column prop="location" label="登录地址" min-width="160px"></el-table-column>
        <el-table-column prop="clientInfo" label="客户端" min-width="160px"></el-table-column>
        <el-table-column prop="osInfo" label="操作系统" min-width="100px"></el-table-column>
        <el-table-column prop="platform" label="登录平台" min-width="100px"></el-table-column>
        <el-table-column prop="loginTime" label="登录时间" min-width="160px" sortable="custom" sort-by="LOGIN_TIME"></el-table-column>
        <el-table-column prop="loginTime" label="登录时间" min-width="160px" sortable="custom"
          sort-by="LOGIN_TIME"></el-table-column>
        <el-table-column prop="systemVersion" label="系统版本" min-width="100px"></el-table-column>
        <el-table-column prop="serverIp" label="服务器IP" min-width="120px"></el-table-column>
        <el-table-column prop="success" label="状态" min-width="100px">
          <template slot-scope="{row}">
            {{row.success | statusText}}
            {{ row.success | statusText }}
          </template>
        </el-table-column>
        <el-table-column prop="reason" label="失败原因" min-width="160px"></el-table-column>
      </el-table>
      <pagination
          @size-change="handleSizeChange"
          @current-change="handlePageChange"
          :pagination="tableData.pagination"
      ></pagination>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
</template>
@@ -77,7 +74,7 @@
  name: 'SystemLoginLog',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索时间范围
      searchDateRange: [],
@@ -94,7 +91,7 @@
  },
  filters: {
    // 登录状态
    statusText (value) {
    statusText(value) {
      if (value != null && !value) {
        return '登录失败'
      }
@@ -102,8 +99,28 @@
    }
  },
  methods: {
    reset() {
      this.searchForm = {
        loginUsername: '',
        ip: '',
        serverIp: '',
        success: '',
        startTime: null,
        endTime: null
      }
      this.search()
    },
    changeRadio() {

      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },
    // 时间搜索范围变化
    handleSearchTimeChange (value) {
    handleSearchTimeChange(value) {
      this.searchForm.startTime = null
      this.searchForm.endTime = null
      if (value != null) {
@@ -113,7 +130,7 @@
      this.search()
    }
  },
  created () {
  created() {
    this.config({
      module: '登录日志',
      api: '/system/loginLog',

 admin/src/views/system/traceLog.vue

@@ -13,20 +13,20 @@
      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select v-model="searchForm.status" clearable @change="search">
          <el-option value="-1" label="未处理"/>
          <el-option value="0" label="失败"/>
          <el-option value="1" label="成功"/>
          <el-option value="-1" label="未处理" />
          <el-option value="0" label="失败" />
          <el-option value="1" label="成功" />
        </el-select>
      </el-form-item>
      <el-form-item label="异常等级" prop="exceptionLevel">
        <el-select v-model="searchForm.exceptionLevel" clearable @change="search">
          <el-option value="10" label="高"/>
          <el-option value="5" label="中"/>
          <el-option value="0" label="低"/>
          <el-option value="10" label="高" />
          <el-option value="5" label="中" />
          <el-option value="0" label="低" />
        </el-select>
      </el-form-item>
      <el-form-item label="操作时间范围">
        <el-date-picker
        <!-- <el-date-picker
          v-model="searchDateRange"
          type="datetimerange"
          range-separator="至"
@@ -34,7 +34,11 @@
          start-placeholder="开始时间"
          end-placeholder="结束时间"
          @change="handleSearchTimeChange"
        ></el-date-picker>
        ></el-date-picker> -->
        <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择开始时间" @change="changeRadio" />
        <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
          placeholder="请选择结束时间" @change="changeRadio" />
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
@@ -49,46 +53,45 @@
    </div>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        :default-sort="{prop: 'operaTime', order: 'descending'}"
        :row-class-name="tableRowClassName"
        @sort-change="handleSortChange"
      >
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe
        :default-sort="{ prop: 'operaTime', order: 'descending' }" :row-class-name="tableRowClassName"
        @sort-change="handleSortChange">
        <el-table-column prop="operaModule" label="业务模块" min-width="100px"></el-table-column>
        <el-table-column prop="operaRemark" label="操作说明" min-width="100px"></el-table-column>
        <el-table-column prop="requestMethod" label="请求方式" min-width="80px"></el-table-column>
        <el-table-column prop="requestUri" label="请求地址" min-width="200px"></el-table-column>
        <el-table-column prop="status" label="状态" min-width="80px">
          <template slot-scope="{row}">
            {{row.status | statusText}}
            {{ row.status | statusText }}
          </template>
        </el-table-column>
        <el-table-column prop="requestParams" label="请求参数" min-width="80px">
          <template slot-scope="{row}">
            <ColumnDetail v-if="row.requestParams != null" :content="row.requestParams" :limit="0"/>
            <ColumnDetail v-if="row.requestParams != null" :content="row.requestParams" :limit="0" />
          </template>
        </el-table-column>
        <el-table-column prop="requestResult" label="请求结果" min-width="80px">
          <template slot-scope="{row}">
            <ColumnDetail v-if="row.requestResult != null" :content="row.requestResult"/>
            <ColumnDetail v-if="row.requestResult != null" :content="row.requestResult" />
          </template>
        </el-table-column>
        <el-table-column prop="exceptionLevel" label="异常等级" sortable="custom" sort-by="EXCEPTION_LEVEL" min-width="100px">
        <el-table-column prop="exceptionLevel" label="异常等级" sortable="custom" sort-by="EXCEPTION_LEVEL"
          min-width="100px">
          <template slot-scope="{row}">
            {{row.exceptionLevel | exceptionLevelText}}
            {{ row.exceptionLevel | exceptionLevelText }}
          </template>
        </el-table-column>
        <el-table-column prop="exceptionStack" label="异常信息" min-width="170px">
          <template slot-scope="{row}">
            <ColumnDetail v-if="row.exceptionStack != null" :content="row.exceptionStack" :button-type="getExceptionButtonType(row.exceptionLevel)"/>
            <ColumnDetail v-if="row.exceptionStack != null" :content="row.exceptionStack"
              :button-type="getExceptionButtonType(row.exceptionLevel)" />
          </template>
        </el-table-column>
        <el-table-column prop="operaSpendTime" label="请求耗时(ms)" sortable="custom" sort-by="OPERA_SPEND_TIME" min-width="120px"></el-table-column>
        <el-table-column prop="operaSpendTime" label="请求耗时(ms)" sortable="custom" sort-by="OPERA_SPEND_TIME"
          min-width="120px"></el-table-column>
        <el-table-column prop="userRealname" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="operaTime" label="操作时间" sortable="custom" sort-by="OPERA_TIME" min-width="140px"></el-table-column>
        <el-table-column prop="operaTime" label="操作时间" sortable="custom" sort-by="OPERA_TIME"
          min-width="140px"></el-table-column>
        <el-table-column prop="platform" label="操作平台" min-width="100px"></el-table-column>
        <el-table-column prop="systemVersion" label="系统版本" min-width="80px"></el-table-column>
        <el-table-column prop="serverIp" label="处理服务器IP" min-width="100px"></el-table-column>
@@ -96,11 +99,8 @@
        <el-table-column prop="clientInfo" label="用户客户端" min-width="200px"></el-table-column>
        <el-table-column prop="osInfo" label="用户操作系统" min-width="100px"></el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      ></pagination>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
</template>
@@ -115,7 +115,7 @@
  name: 'SystemTraceLog',
  extends: BaseTable,
  components: { ColumnDetail, TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索时间反胃
      searchDateRange: [],
@@ -133,7 +133,7 @@
  },
  filters: {
    // 状态
    statusText (value) {
    statusText(value) {
      if (value === 1) {
        return '成功'
      }
@@ -143,7 +143,7 @@
      return '未处理'
    },
    // 异常等级
    exceptionLevelText (value) {
    exceptionLevelText(value) {
      if (value == null) {
        return ''
      }
@@ -161,15 +161,29 @@
  },
  methods: {
    // 搜索框重置
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchDateRange = []
      this.searchForm.startTime = null
      this.searchForm.endTime = null
    reset() {
      this.searchForm = {
        userRealname: '',
        operaModule: '',
        requestUri: '',
        status: null,
        exceptionLevel: null,
        startTime: null,
        endTime: null
      }
      this.search()
    },
    changeRadio() {

      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },
    // 标记行class
    tableRowClassName ({ row }) {
    tableRowClassName({ row }) {
      if (row.exceptionLevel === 5 || row.status === -1) {
        return 'warning-log'
      } else if (row.exceptionLevel === 10) {
@@ -178,7 +192,7 @@
      return ''
    },
    // 获取异常查看按钮类型
    getExceptionButtonType (level) {
    getExceptionButtonType(level) {
      if (level === 5) {
        return 'warning'
      }
@@ -188,7 +202,7 @@
      return null
    },
    // 时间搜索范围变化
    handleSearchTimeChange (value) {
    handleSearchTimeChange(value) {
      this.searchForm.startTime = null
      this.searchForm.endTime = null
      if (value != null) {
@@ -198,7 +212,7 @@
      this.search()
    }
  },
  created () {
  created() {
    this.config({
      api: '/system/traceLog',
      sorts: [{
@@ -215,10 +229,12 @@
// 状态栏
.status-bar {
  padding: 0 16px;

  [class^=status-] {
    font-size: 13px;
    margin-right: 12px;
    line-height: 40px;

    &::before {
      position: relative;
      top: 2px;
@@ -231,22 +247,27 @@
      margin-right: 6px;
    }
  }

  .status-warn::before {
    background-color: oldlace;
    border-color: orange;
  }

  .status-danger::before {
    background-color: #fdf0f0;
    border-color: indianred;
  }
}

/deep/ .table-content {
  margin-top: 0;
}

// 警告级日志
/deep/ .warning-log td {
  background-color: oldlace !important;
}

// 危险级日志
/deep/ .danger-log td {
  background-color: #fdf0f0 !important;

 admin/src/views/task/index.vue

@@ -102,7 +102,9 @@
      isShowDriver: false,
      filters: {
        queryType: '0',
        // fastdate: 0
        startDate: '',
        endDate: '',
        fastdate: '0'
      },
      queryFormConfig: {
        formItems: [
@@ -115,14 +117,14 @@
              { label: '访客报备', value: '1' },
              { label: '用车申请', value: '2' },
              { label: '隐患随手拍', value: '3' },
              { label: '物流车申请', value: '4' }
              { label: '物流车申请', value: '6' }
            ]
          },
          {
            filed: 'selTime',
            type: 'datetimerange',
            label: '起止时间',
            pickerOptions: {}
            filed1: 'startDate',
            filed2: 'endDate',
            type: 'datetime',
            label: '起止时间'
          },
          {
            type: 'slot',
@@ -146,19 +148,20 @@
        { name: '访客报备', id: 1 },
        { name: '用车申请', id: 2 },
        { name: '隐患随手拍', id: 3 },
        { name: '物流车申请', id: 4 }
        { name: '物流车申请', id: 6 }
      ]
    }
  },
  created() {
    // this.getHeadData()
    // this.changeRadio('0')
    this.getHeadData()
    this.changeRadio('0')
    // this.getHeadData()
  },
  methods: {
    changeRadio(day) {
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
      this.$set(this.filters, 'selTime', arr)
      this.filters.startDate = arr[0]
      this.filters.endDate = arr[1]
      this.getHeadData()
    },
    SubSuccess(str) {
@@ -230,20 +233,11 @@
      }
    },
    changeForm(str) {
      if (str === 'selTime') {
        this.$set(this.filters, 'fastdate', null)
        this.getHeadData()
      }
      this.$set(this.filters, 'fastdate', null)
      this.getHeadData()
    },
    getList(page) {
      const { filters, pagination } = this
      if (filters.selTime && filters.selTime.length > 0) {
        filters.startDate = filters.selTime[0]
        filters.endDate = filters.selTime[1]
      } else {
        filters.startDate = null
        filters.endDate = null
      }
      pagination.page = page || pagination.page
      taskCenterPage({
        model: { ...filters, queryType: Number(filters.queryType) },
@@ -262,13 +256,13 @@
    },
    getHeadData(page) {
      const { filters } = this
      if (filters.selTime && filters.selTime.length > 0) {
        filters.startDate = filters.selTime[0]
        filters.endDate = filters.selTime[1]
      } else {
        filters.startDate = null
        filters.endDate = null
      }
      // if (filters.selTime && filters.selTime.length > 0) {
      //   filters.startDate = filters.selTime[0]
      //   filters.endDate = filters.selTime[1]
      // } else {
      //   filters.startDate = null
      //   filters.endDate = null
      // }
      this.loading = true
      taskCenterHeadPC({ ...filters, queryType: Number(filters.queryType), isDetail: '1' }).then(res => {
        this.headData = res

 h5/pages/driver/index.vue

@@ -13,7 +13,7 @@
        <!--  -->
        <view class="title_wrap">
            <view class="name">作业任务</view>
            <view class="placeholder9">{{activeCurrent + 1}}/{{taskList.length}}</view>
            <view v-if="activeCurrent > 0" class="placeholder9">{{activeCurrent + 1}}/{{taskList.length}}</view>
        </view>

        <view v-if="taskList && taskList.length > 0" class="task_list">

            <swiper circular indicator-dots indicator-active-color="#4d99a8" indicator-color="#e0e2e7" class="task_swiper" @change="changeCur" :current="activeCurrent">


 h5/pages/login/login.vue

@@ -41,7 +41,7 @@
    export default {

        data() {

            return {

                code: ''

                code: '11'

            }

        },

        onLoad(option) {


 h5/pages/staff/vehicle/apply.vue

@@ -132,7 +132,7 @@
  },
  onLoad(option) {
    console.log(option)
    this.param = { ...option }
    this.param = { ...this.param, ...option }
    this.minDate = new Date().getTime()
    this.param.planUseDate = dayjs(this.param.startTime).format('YYYY-MM-DD HH:mm')
  },

 h5/utils/config.js

@@ -1,8 +1,8 @@

// export const baseUrl = 'zhyq_interface/'
export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/' 
// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/' 

export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'