最新版本541200007

jiangping

2025-03-17 e39f4b6be29eb7a0775368075ae59f88cdb9c7dd

最新版本541200007

 admin/src/components/base/BaseTable.vue

@@ -44,7 +44,6 @@
    }
  },
  methods: {

    // 配置
    config (extParams) {
      if (extParams == null) {

 admin/src/router/index.js

@@ -99,7 +99,7 @@
})

router.afterEach((to, from, failure) => {
  setTimeout(function (){computeTableHeightIndex()},1000)
  setTimeout(function () { computeTableHeightIndex() }, 1000)
  window.addEventListener('resize', computeTableHeightIndex())
})
function computeTableHeightIndex () {
@@ -118,8 +118,8 @@
    const height9 = getEleHeghtByClassName('static_wrap', 0)
    const height10 = getEleHeghtByClassName('query_btns', 0)
    const height11 = getEleHeghtByClassName('el-tabs-ele', 0)
    const height12 = getEleHeghtByClassName('platgroup_tabs', 0)
    router.app.$store.commit('setTableHeightNew', height - height13 - height3 - height5 - height6 - height2 - height7 - height4 - height9 - height10 - height11 - height12)
    const height12 = getEleHeghtByClassName('platgroup_tabs', 0,20)
    router.app.$store.commit('setTableHeightNew', height -10 - height2 - height3 - height4 - height5 - height6 - height7 - height9 - height10 - height11 - height12 - height13)
    console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
  } else {
    console.log('tableLayout========================')

 admin/src/views/business/platformBroadcastLog.vue

@@ -6,8 +6,8 @@
        <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="content">
          <el-input v-model="searchForm.content" placeholder="请输入内容" @keypress.enter.native="search"></el-input>
        <el-form-item label="" prop="info">
          <el-input v-model="searchForm.info" placeholder="请输入内容" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="personType">
          <el-select v-model="searchForm.deviceType" placeholder="请选择设备类型">

 admin/src/views/meeting/bookings.vue

@@ -76,21 +76,13 @@
            <span class="long-title-style">{{ row.name }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="meetingTime" label="会议时间" align="center" min-width="160px"></el-table-column>

        <!-- <el-table-column prop="meetingTime" label="会议时间" align="center" min-width="120px"></el-table-column> -->
        <!-- <el-table-column prop="meetingTime" label="会议时间" align="center" min-width="120px"></el-table-column> -->
        <!-- <el-table-column prop="meetingTime" label="会议时间" align="center" min-width="120px"></el-table-column> -->
        <!-- <el-table-column prop="meetingTime" label="会议时间" align="center" min-width="400px"></el-table-column> -->
        
        <el-table-column prop="managerInfo" label="预约人" align="center" min-width="100px"></el-table-column>
       
        <el-table-column prop="createDate" label="操作时间" align="center" min-width="150px"></el-table-column>
        <el-table-column prop="roomName" label="会议室名称" align="center" min-width="120px" show-overflow-tooltip>
        <el-table-column prop="roomName" label="会议室" align="center" min-width="120px" show-overflow-tooltip>
          <template slot-scope="{ row }">
            <span class="long-title-style">{{ row.roomName }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="meetingTime" label="会议时间" align="center" min-width="120px"></el-table-column>
        <el-table-column prop="managerInfo" label="预约人" align="center" min-width="100px"></el-table-column>
        <el-table-column label="会议状态" align="center" min-width="60px">
          <template slot-scope="{ row }">
            <span v-if="row.meetingStatus == 1">未开始</span>
@@ -101,6 +93,7 @@
            <!-- {{ row.status==0 ? '正常' : '取消' }} -->
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="创建时间" align="center" min-width="150px"></el-table-column>
        <!-- <el-table-column prop="content" label="会议内容" min-width="100px"></el-table-column> -->
        <el-table-column v-if="
          containPermissions([

 admin/src/views/meeting/components/OperaBookingsDetailWindow.vue

@@ -4,7 +4,7 @@
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"
    width="600px"
    width="680px"
  >
    <div class="title-style">
      <div class="header-title">{{ form.name }}</div>

 admin/src/views/meeting/components/OperaBookingsWindow.vue

@@ -1,6 +1,6 @@
<template>
  <GlobalAlertWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm"
    width="840px">
    width="880px">
    <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="：">
      <el-form-item label="关联会议室" prop="roomId">
        <el-select v-model="form.roomId" filterable clearable :disabled="isEdit" placeholder="请选择关联会议室"

 admin/src/views/platform/LogisticsRecord/operation.vue

@@ -80,8 +80,9 @@
      filters: {
        selDate: [],
        fastdate: 0,
        beginWorkDateEnd: '',
        beginDoneDateEnd: ''
        beginWorkDateStart: '',
        beginWorkDateEnd: ''
        // beginDoneDateEnd: ''
      },
      list: [],
      queryFormConfig: {
@@ -102,8 +103,8 @@
            label: '驾驶员'
          },
          {
            filed1: 'beginWorkDateEnd',
            filed2: 'beginDoneDateEnd',
            filed1: 'beginWorkDateStart',
            filed2: 'beginWorkDateEnd',
            type: 'datetime',
            label: '作业时间'
          },
@@ -123,13 +124,13 @@
  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.filters.beginWorkDateEnd = arr[0]
      this.filters.beginDoneDateEnd = arr[1]
      this.filters.beginWorkDateEnd = arr[1]
      this.filters.beginWorkDateStart = arr[0]
      this.getList(1)
    },
    changeForm(str) {
      if(this.filters.beginWorkDateEnd > this.filters.beginDoneDateEnd){
        this.filters.beginWorkDateEnd = this.filters.beginDoneDateEnd
      if(this.filters.beginWorkDateStart> this.filters.beginWorkDateEnd ){
        this.filters.beginWorkDateEnd = this.filters.beginWorkDateEnd
        return this.$message.error('开始时间不能大于结束时间')
      }
      this.getList()
@@ -179,7 +180,7 @@
            model: {
              ...filters,
              jobType: 0,
              

            },
            sorts: [{ direction: 'DESC', property: 'create_date' }],
            capacity: 10000,