最新版本

jiangping

2024-05-10 753244324eb25da1648de79a4b2b1df3d1a3d49c

最新版本

 admin/src/api/meeting/bookings.js

ÎļþÃû´Ó admin/src/views/meeting/api/bookings.js ÐÞ¸Ä
@@ -1,5 +1,4 @@
import request from '@/utils/request'

import request from '../../utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/meetingAdmin/cloudService/business/bookings/page', data, {

 admin/src/api/meeting/devices.js

ÎļþÃû´Ó admin/src/views/meeting/api/devices.js ÐÞ¸Ä
@@ -1,5 +1,4 @@
import request from '@/utils/request'

import request from '../../utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/meetingAdmin/cloudService/business/devices/page', data, {

 admin/src/api/meeting/home.js

ÎļþÃû´Ó admin/src/views/meeting/api/home.js ÐÞ¸Ä
@@ -1,5 +1,4 @@
import request from '@/utils/request'

import request from '../../utils/request'
// æŸ¥è¯¢
export function home (data) {
  return request.post('/meetingAdmin/cloudService/business/home/home', data, {

 admin/src/api/meeting/notice.js

ÎļþÃû´Ó admin/src/views/meeting/api/notice.js ÐÞ¸Ä
@@ -1,5 +1,4 @@
import request from '@/utils/request'

import request from '../../utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/meetingAdmin/cloudService/business/notice/page', data, {

 admin/src/api/meeting/projects.js

ÎļþÃû´Ó admin/src/views/meeting/api/projects.js ÐÞ¸Ä
@@ -1,5 +1,4 @@
import request from '@/utils/request'

import request from '../../utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/meetingAdmin/cloudService/business/projects/page', data, {

 admin/src/api/meeting/roomRecord.js

ÎļþÃû´Ó admin/src/views/meeting/api/roomRecord.js ÐÞ¸Ä
@@ -1,5 +1,4 @@
import request from '@/utils/request'

import request from '../../utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/meetingAdmin/cloudService/business/roomRecord/page', data, {

 admin/src/api/meeting/roomTime.js

ÎļþÃû´Ó admin/src/views/meeting/api/roomTime.js ÐÞ¸Ä
@@ -1,5 +1,4 @@
import request from '@/utils/request'

import request from '../../utils/request'
// æŸ¥è¯¢
export function findList (data) {
  return request.post('/meetingAdmin/cloudService/business/roomTime/findList', data)

 admin/src/api/meeting/rooms.js

ÎļþÃû´Ó admin/src/views/meeting/api/rooms.js ÐÞ¸Ä
@@ -1,5 +1,4 @@
import request from '@/utils/request'

import request from '../../utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/meetingAdmin/cloudService/business/rooms/page', data, {

 admin/src/api/system/dictData.js

@@ -19,7 +19,10 @@
export function deleteById (id) {
  return request.get(`/visitsAdmin/cloudService/system/dictData/delete/${id}`)
}

// æŸ¥è¯¢å­—典值数据
export function getSystemDictData (label) {
  return request.get(`/visitsAdmin/cloudService/system/dictData/getSystemDictData?dictCode=SYSTEM&label=${label}`)
}
// æ‰¹é‡åˆ é™¤
export function deleteByIdInBatch (ids) {
  return request.get('/system/dictData/delete/batch', {

 admin/src/components/base/BaseTable.vue

@@ -51,7 +51,13 @@
      if (extParams.api == null) {
        throw new Error('Missing config option \'api\'.')
      }
      this.api = require('@/api' + extParams.api)

      if(extParams.api.indexOf('@/',0) === 0){
        this.api = require(extParams.api)
      }else {
        this.api = require('@/api' + extParams.api)
      }
      // this.api = require('@/api' + extParams.api)
      extParams.module && (this.module = extParams.module)
      extParams['field.id'] && (this.configData['field.id'] = extParams['field.id'])
      extParams['field.main'] && (this.configData['field.main'] = extParams['field.main'])

 admin/src/components/common/RichEditor.vue

@@ -111,7 +111,7 @@
          uploadImage: {
            // server: '/api/upload',
            name: 'file',
            server: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
            server: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadLocal',
            meta: {
              folder: 'shop'
            },

 admin/src/components/common/UploadAvatarImage.vue

@@ -36,7 +36,7 @@
  },
  data() {
    return {
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
    }
  },

@@ -50,13 +50,13 @@
        this.$message.success('上传成功')
        this.$emit('uploadSuccess', { imgurl: data.imgaddr, imgurlfull: data.url, name: data.originname })
      } else {
        this.$tip.apiFailed('上传失败')
        this.$message.error('上传失败')
      }
      this.$emit('uploadEnd')
    },
    uploadError() {
      this.$tip.apiFailed('上传失败')
      this.$emit('endUpload')
      this.$message.error('上传失败')
      this.$emit('uploadEnd')
    },
    // // æ‹¦æˆª
    beforeAvatarUpload(file) {

 admin/src/components/common/UploadAvatarVideo.vue

@@ -36,7 +36,7 @@
  },
  data() {
    return {
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
    }
  },

@@ -50,13 +50,13 @@
        this.$message.success('上传成功')
        this.$emit('uploadSuccess', { imgurl: data.imgaddr, imgurlfull: data.url, name: data.originname })
      } else {
        this.$tip.apiFailed('上传失败')
        this.$message.error('上传失败')
      }
      this.$emit('uploadEnd')
    },
    uploadError() {
      this.$tip.apiFailed('上传失败')
      this.$emit('endUpload')
      this.$message.apiFailed('上传失败')
      this.$emit('uploadEnd')
    },
    // // æ‹¦æˆª
    beforeAvatarUpload(file) {

 admin/src/components/common/UploadFile.vue

@@ -34,7 +34,7 @@
  data() {
    return {
      fileList:null,
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload?folder='+this.uploadData.folder
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload?folder='+this.uploadData.folder
    }
  },

@@ -48,13 +48,13 @@
        this.$message.success('上传成功')
        this.$emit('uploadSuccess', { fileurl: data.imgaddr, fileurlFull: data.url, name: data.originname })
      } else {
        this.$tip.apiFailed('上传失败')
        this.$message.error('上传失败')
      }
      this.$emit('uploadEnd')
    },
    uploadError() {
      this.$tip.apiFailed('上传失败')
      this.$emit('endUpload')
      this.$message.error('上传失败')
      this.$emit('uploadEnd')
    },
    // // æ‹¦æˆª
    beforeFileUpload(file) {

 admin/src/components/common/UploadFileCommon.vue

@@ -39,7 +39,7 @@
  },
  data() {
    return {
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
    }
  },

@@ -55,13 +55,13 @@
        this.$message.success('上传成功')
        this.$emit('uploadSuccess', { fileurl: data.imgaddr, fileUrlFull: data.url, name: data.originname })
      } else {
        this.$tip.apiFailed('上传失败')
        this.$message.error('上传失败')
      }
      this.$emit('uploadEnd')
    },
    uploadError() {
      this.$tip.apiFailed('上传失败')
      this.$emit('endUpload')
      this.$message.error('上传失败')
      this.$emit('uploadEnd')
    },
    // // æ‹¦æˆª
    beforeAvatarUpload(file) {
@@ -147,4 +147,4 @@
  width: 90px !important;
  height: 90px !important;
}
</style>
</style>

 admin/src/components/common/UploadImage.vue

@@ -33,15 +33,15 @@
        </span>
      </div>
    </el-upload>
    <el-image-viewer 
      v-if="showViewer" 
    <el-image-viewer
      v-if="showViewer"
      :on-close="closeViewer"
      :initialIndex="tempIndex"
      :url-list="srcList"
      :z-index="3000"
    />
  </div>
  

</template>

<script>
@@ -59,8 +59,8 @@
  },
  data() {
    return {
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
      
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadLocal',

      realList: [],
      srcList: [],
      tempIndex: 0,
@@ -76,20 +76,20 @@
          this.srcList = []
        }
      }
      

    }
  },
  methods: {
    beforeUpload(file) {
      

      this.$emit('beginUpload')
      return true
    },
     // ä¸Šä¼ å›¾ç‰‡æˆåŠŸ
     uploadSuccess (res, file, fileList) {     
     uploadSuccess (res, file, fileList) {
      // console.log('this.fileList', this.fileList);
      // console.log('fileList', fileList);
      this.$emit('endUpload')
      this.$emit('uploadEnd')
      this.realList = fileList
      this.srcList.push(res.data.url)
      // console.log('file', file);
@@ -106,7 +106,7 @@
      }
    },
    fail (err, file, fileList) {
      this.$emit('endUpload')
      this.$emit('uploadEnd')
      this.$message.error('上传失败')
    },
    handlePictureCardPreview(file) {
@@ -127,7 +127,7 @@
      this.realList.splice(tempIndex, 1)
      this.fileList.splice(tempIndex, 1)
      this.srcList.splice(tempIndex, 1)
      

    },
  },
}

 admin/src/components/common/upload.vue

@@ -43,7 +43,7 @@
        },
        data() {
            return {
                uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
                uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
            }
        },


 admin/src/views/business/visitorSources.vue

@@ -114,7 +114,7 @@
            fd.append('folder', 'visit/')
            fd.append('file', file)
            return upload(fd).then(res => {
              return res.prefixPath + res.folder + res.halfPath
              return res.url
            })
          }
        }),

 admin/src/views/meeting/bookings.vue

@@ -139,10 +139,10 @@
import Pagination from '@/components/common/Pagination'
import OperaBookingsWindow from '@/views/meeting/components/OperaBookingsWindow'
import OperaBookingsDetailWindow from '@/views/meeting/components/OperaBookingsDetailWindow'
import { findList } from '@/views/meeting/api/rooms'
import { findList } from '@/api/meeting/rooms'
import { getSystemDictData } from '@/api/system/dictData'
import { fetchTree } from '@/api/system/department'
import { cancelById, bookingsDetail } from '@/views/meeting/api/bookings'
import { cancelById, bookingsDetail } from '@/api/meeting/bookings'
export default {
  name: 'Bookings',
  extends: BaseTable,
@@ -195,7 +195,7 @@
  created () {
    this.config({
      module: '会议室预定信息表',
      api: '@/views/meeting/api/bookings',
      api: '/meeting/bookings',
      'field.id': 'id',
      'field.main': 'id'
    })

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

@@ -89,7 +89,7 @@
  },
  created () {
    this.config({
      api: '@/views/meeting/api/bookings',
      api: '/meeting/bookings',
      'field.id': 'id'
    })


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

@@ -103,8 +103,8 @@
import FileLink from '@/views/meeting/components/common/FileLink'
import { uploadFileLocal as upload } from '@/api/system/common'
import { fetchList as userList } from '@/api/system/user'
import { findListByObjId } from '@/views/meeting/api/projects'
import { findList } from '@/views/meeting/api/roomTime'
import { findListByObjId } from '@/api/meeting/projects'
import { findList } from '@/api/meeting/roomTime'
import { numRule, arrayRule } from '@/utils/form'
export default {
  name: 'OperaBookingsWindow',
@@ -159,7 +159,7 @@
  inject: ['rooms'],
  created () {
    this.config({
      api: '@/views/meeting/api/bookings',
      api: '/meeting/bookings',
      'field.id': 'id'
    })
    userList({

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

@@ -81,7 +81,7 @@
  inject: ['room'],
  created () {
    this.config({
      api: '@/views/meeting/api/devices',
      api: '/meeting/devices',
      'field.id': 'id'
    })


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

@@ -71,7 +71,7 @@
  },
  created () {
    this.config({
      api: '@/views/meeting/api/notice',
      api: 'meeting/notice',
      'field.id': 'id'
    })
  }

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

@@ -88,7 +88,7 @@
  },
  created () {
    this.config({
      api: '@/views/meeting/api/projects',
      api: '/meeting/projects',
      'field.id': 'id'
    })
  },

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

@@ -70,7 +70,7 @@
  },
  created () {
    this.config({
      api: '@/views/meeting/api/roomRecord',
      api: '/meeting/roomRecord',
      'field.id': 'id'
    })
  }

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

@@ -73,7 +73,7 @@
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import { numRule } from '@/utils/form'
import { fetchList } from '@/views/meeting/api/projects'
import { fetchList } from '@/api/meeting/projects'
export default {
  name: 'OperaRoomsWindow',
  extends: BaseOpera,
@@ -135,7 +135,7 @@
  inject: ['userList'],
  created () {
    this.config({
      api: '@/views/meeting/api/rooms',
      api: '/meeting/rooms',
      'field.id': 'id'
    })
    // realname: this.filterText

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

@@ -91,7 +91,7 @@
  },
  created () {
    this.config({
      api: '@/views/meeting/api/bookings',
      api: '/meeting/bookings',
      'field.id': 'id'
    })


 admin/src/views/meeting/devices.vue

@@ -94,8 +94,8 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDevicesWindow from '@/views/meeting/components/OperaDevicesWindow'
import { findList } from '@/views/meeting/api/rooms'
import { updateById } from '@/views/meeting/api/devices'
import { findList } from '@/api/meeting/rooms'
import { updateById } from '@/api/meeting/devices'
export default {
  name: 'Devices',
  extends: BaseTable,
@@ -127,7 +127,7 @@
  created () {
    this.config({
      module: '设备管理信息表',
      api: '@/views/meeting/api/devices',
      api: '/meeting/devices',
      'field.id': 'id',
      'field.main': 'id'
    })

 admin/src/views/meeting/roomRecord.vue

@@ -95,7 +95,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaRoomRecordWindow from '@/views/meeting/components/OperaRoomRecordWindow'
import { findList } from '@/views/meeting/api/rooms'
import { findList } from '@/api/meeting/rooms'
export default {
  name: 'RoomRecord',
  extends: BaseTable,
@@ -121,7 +121,7 @@
  created () {
    this.config({
      module: '会议室开门记录表',
      api: '@/views/meeting/api/roomRecord',
      api: '/meeting/roomRecord',
      'field.id': 'id',
      'field.main': 'id'
    })

 admin/src/views/meeting/roomStatistics.vue

@@ -130,7 +130,7 @@
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import { getRoomStatistics, exportRoomStatistics } from '@/views/meeting/api/bookings'
import { getRoomStatistics, exportRoomStatistics } from '@/api/meeting/bookings'
// import { findList } from '@/api/meeting/rooms'
export default {
  name: 'Rooms',
@@ -153,7 +153,7 @@
  created () {
    this.config({
      module: '会议室信息表',
      api: '@/views/meeting/api/rooms',
      api: '/meeting/rooms',
      'field.id': 'id',
      'field.main': 'id'
    })

 admin/src/views/meeting/rooms.vue

@@ -122,7 +122,7 @@
import OperaRoomsWindow from '@/views/meeting/components/OperaRoomsWindow'
import { fetchList as userList } from '@/api/system/user'
// import selectMember from '@/components/meeting/selectMember'
import { updateStatusById } from '@/views/meeting/api/rooms'
import { updateStatusById } from '@/api/meeting/rooms'
export default {
  name: 'Rooms',
  extends: BaseTable,
@@ -159,7 +159,7 @@
  created () {
    this.config({
      module: '会议室信息表',
      api: '@/views/meeting/api/rooms',
      api: '/meeting/rooms',
      'field.id': 'id',
      'field.main': 'id'
    })

 admin/src/views/meeting/userStatistics.vue

@@ -128,7 +128,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { getUserStatistics, exportUserStatistics } from '@/views/meeting/api/bookings'
import { getUserStatistics, exportUserStatistics } from '@/api/meeting/bookings'
import { fetchList as userList } from '@/api/system/user'

export default {
@@ -152,7 +152,7 @@
  created () {
    this.config({
      module: '会议室信息表',
      api: '@/views/meeting/api/rooms',
      api: '/meeting/rooms',
      'field.id': 'id',
      'field.main': 'id'
    })

 server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java