[FE]新增用户管理页面默认查询条件和设备对话框视频地址字段值

security-protection-platform/src/modules/system/devicemana/components/modal/addDeviceModal.vue

@@ -1,6 +1,6 @@
<template>
  <!-- 请假对话框 -->
  <t-modal :visibled.sync="visibled" :mask-closable="false" width="600px" height="500px">
  <t-modal :visibled.sync="visibled" :mask-closable="false" width="600px" height="560px">
    <template slot="header">
      <div class="device-modal-title">{{ isEdit?'设备编辑':'设备新增' }}</div>
    </template>
@@ -21,6 +21,9 @@
          <t-option v-for="item in types" :value="item.id" :key="item.id">{{ item.name }}</t-option>
        </t-select>
      </t-form-item>
      <t-form-item label="视频地址：" prop="videoUrl">
        <t-input v-model="addDeviceModalForm.videoUrl" placeholder="请输入视频地址"></t-input>
      </t-form-item>
      <t-form-item label="图片上传：">
        <div style="display:flex;flex-direction:row">
          <t-upload ref="uploader" :format="['jpg','jpeg','png']" :show-uploaded="false" :before-upload="$_onUploadBeforeUpload" :action="action" :data="{pictureUrl:addDeviceModalForm.pictureUrl}" multiple type="drag" style="width:180px;height:180px" @success="$_onUploadSuccess" @remove-file="$_onUploadRemoveFile" @error="$_onUploadError" @file-ext-error="$_onUploadFormatError" @file-exceeded-size="$_onUploadExceededSize">
@@ -46,6 +49,7 @@ const defaultAddDeviceModalForm = {
  deviceId: '', // 设备id
  deviceName: '', // 设备名称
  deviceTypeId: '', // 设备类型id
  videoUrl: '', // 视频地址
  pictureUrl: '' // 图片标识
}
export default {
@@ -79,6 +83,9 @@ export default {
        deviceName: [
          { required: true, message: '设备名称不能为空', trigger: 'blur' }
        ],
        videoUrl: [
          { required: true, message: '视频地址不能为空', trigger: 'blur' }
        ],
        deviceTypeId: [
          { required: true, message: '设备类型不能为空' }
        ]

security-protection-platform/src/modules/usermana/index.vue

@@ -112,7 +112,9 @@ export default {
      // 人脸审核选择id
      auditid: 0,
      // 人脸审核的公司名称
      companyName: ''
      companyName: '',
      // 判断页面是否是第一次渲染
      firstCreated: true
    }
  },
@@ -137,6 +139,8 @@ export default {
  created () {
    // this.getDeviceData()
    this.getCompanyTypesList()
    // 默认选中能源部
    this.companyTypeId = 10086
  },
  methods: {
    // 获取用户列表数据
@@ -211,6 +215,13 @@ export default {
        })
        // eslint-disable-next-line no-return-assign
        this.departmentTypesList = data.filter(item => item.data = item.id)
        // 进入页面默认选中ebc
        if (this.departmentTypeId === '' && this.firstCreated) {
          this.$nextTick(() => {
            this.departmentTypeId = '10087'
            this.firstCreated = false
          })
        }
      } else {
        this.$Message.danger('部门类型列表数据获取失败！')
      }
@@ -310,10 +321,10 @@ export default {
    },
    // 编辑新增用户信息
    async editDeviceData (id) {
      const res = await sysapi.getOneEmployee({params: {employeeId: id}})
      const res = await sysapi.getOneEmployee({ params: { employeeId: id } })
      if (res.status === 200) {
        this.currentEditDevice = res.data.data
        console.log(this.currentEditDevice);
        console.log(this.currentEditDevice)
      } else {
        this.$Message.danger('设备数据获取失败！')
      }

security-protection-platform/src/modules/videoSurveillance/components/ReplayDialog/index.vue

@@ -70,10 +70,10 @@ export default {
      videoList: [],
      // 视频播放器对象
      $player: null,
      // 开始时间
      beginDay: '2020-12-19 20:14:00',
      // 结束时间
      endDay: '2020-12-19 20:14:59',
      //   开始时间
      beginDay: formatDateTime(new Date(+new Date() - 10 * 60 * 1000), 'yyyy-MM-dd hh:mm:ss'),
      //   结束时间
      endDay: formatDateTime(new Date(), 'yyyy-MM-dd hh:mm:ss'),
      isShow: true,
      playerOptions: {
        playbackRates: [0.7, 1.0, 1.5, 2.0], // 播放速度