Merge remote-tracking branch 'origin/master'

k94314517

2024-05-27 ea8dea301e82be074187b10bdbe130c9802bede0

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

@@ -42,8 +42,7 @@
            v-for="item in userList()"
            :key="item.id"
            :value="item.id"

            :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
          />
        </el-select>
      </el-form-item>
@@ -73,7 +72,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,
@@ -103,18 +102,18 @@
        projectList: [],
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        editDate: null,
        isdeleted: 0,
        name: '',
        remark: '',
        startTime: '',
        endTime: '',
        limitNum: '',
        limitNum: 0,
        imgurl: '',
        imgFullUrl: '',
        tips: '',
        status: '',
        intervalTime: ''
        status: 0,
        intervalTime: 0
      },
      user: [],
      projectList: [],
@@ -135,7 +134,7 @@
  inject: ['userList'],
  created () {
    this.config({
      api: '@/views/meeting/api/rooms',
      api: '/meeting/rooms',
      'field.id': 'id'
    })
    // realname: this.filterText
@@ -178,6 +177,9 @@
        this.form.projectList = this.form.projectList ? target.projectList.map(item => item.projectId) : []
        this.form.sysList = this.form.sysList ? this.form.sysList.map(item => item.userId) : []
        // console.log(this.form.imgFullUrl);
        console.log(this.form)
        console.log(this.form.intervalTime)
        console.log(target)
      })
    },
    selectRange(v) {