feat:新增设备管理mock数据，修改假勤管理部分逻辑

security-protection-platform/.aid/mock/system.js

@@ -2,10 +2,29 @@ const Mock = require('mockjs')
const data = Mock.mock({
  'data|100': [{
    deviceId: /SB\d{5}/,
    'deviceName|1': ['@integer(1,10)#人脸终端', '@integer(1,10)#摄像头', '@integer(1,10)#门禁'],
    'deviceType|': ['人脸终端', '摄像头', '门禁'],
    'deviceTypeId|1': [0, 1, 2],
    'deviceType': function () {
      if (this.deviceTypeId === 0) {
        return '人脸终端'
      } else if (this.deviceTypeId === 1) {
        return '摄像头'
      } else {
        return '门禁'
      }
    },
    'deviceName': function () {
      return parseInt(Math.random() * 10) + 1 + '#' + this.deviceType
    },
    // 'location|1': ['@integer(1,3)#风场SVG室', '@integer(1,3)#风场大门']
    imgUrl: ''
    imgUrl: function () {
      if (this.deviceTypeId === 0) {
        return "http://www.pt528.net/d/file/p/2019/04-03/6a1d8d84f188af227d9a8ffd3a748d8c.jpg"
      } else if (this.deviceTypeId === 1) {
        return "https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2579741018,2239188063&fm=26&gp=0.jpg"
      } else {
        return "http://www.pt528.net/d/file/p/2019/04-07/5847a0f1de97045f31753bfc5d33a6b8.jpg"
      }
    }
  }]
})
@@ -103,16 +122,7 @@ module.exports = [
      const deviceId = res.deviceId
      const deviceName = res.deviceName
      const deviceType = ['人脸终端', '摄像头', '门禁']
      let result = data.data.filter(item => item.deviceType = item.deviceName.split('#')[1])
      result.forEach(item => {
        if (item.deviceType === '人脸终端') {
          item.imgUrl = "http://www.pt528.net/d/file/p/2019/04-03/6a1d8d84f188af227d9a8ffd3a748d8c.jpg"
        } else if (item.deviceType === '摄像头') {
          item.imgUrl = "https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2579741018,2239188063&fm=26&gp=0.jpg"
        } else {
          item.imgUrl = "http://www.pt528.net/d/file/p/2019/04-07/5847a0f1de97045f31753bfc5d33a6b8.jpg"
        }
      })
      let result = data.data
      if (res.deviceTypeId) {
        result = result.filter(item => item.deviceType === deviceType[deviceTypeId])
      }
@@ -173,6 +183,13 @@ module.exports = [
      const res = parseQueryString(req.url)
      const id = res.deviceId
      const result = data.data.filter(item => item.deviceId === id)
      if (result[0].deviceType === '人脸终端') {
        result[0].deviceTypeId = 0
      } else if (result[0].deviceType === '摄像头') {
        result[0].deviceTypeId = 1
      } else {
        result[0].deviceTypeId = 2
      }
      return {
        success: true,
        data: result[0]
@@ -180,13 +197,57 @@ module.exports = [
    }
  },
  {
    url: '/system/getDeviceTypeList',
    method: 'get',
    url: '/system/addDeviceData',
    method: 'post',
    type: 'func',
    response: req => {
      const res = req.body
      const name = ['人脸终端', '摄像头', '门禁']
      const id = parseInt(res.deviceTypeId)
      const deviceName = res.deviceName
      let imgUrl
      if (name[id] === '人脸终端') {
        imgUrl = "http://www.pt528.net/d/file/p/2019/04-03/6a1d8d84f188af227d9a8ffd3a748d8c.jpg"
      } else if (name[id] === '摄像头') {
        imgUrl = "https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2579741018,2239188063&fm=26&gp=0.jpg"
      } else {
        imgUrl = "http://www.pt528.net/d/file/p/2019/04-07/5847a0f1de97045f31753bfc5d33a6b8.jpg"
      }
      const result = Mock.mock({
        deviceId: /SB\d{5}/,
        deviceName,
        deviceType: name[id],
        imgUrl
      })
      data.data.unshift(result)
      return {
        success: true,
        data: result
      }
    }
  },
  {
    url: '/system/editDeviceData',
    method: 'put',
    type: 'func',
    response: req => {
      const res = req.body
      const deviceId = res.deviceId
      const name = ['人脸终端', '摄像头', '门禁']
      const id = parseInt(res.deviceTypeId)
      const deviceName = res.deviceName
      const imgUrl = res.imgUrl
      data.data.some(item => {
        if (item.deviceId === deviceId) {
          item.deviceName = deviceName
          item.deviceType = name[id]
          item.deviceTypeId = id
          item.imgUrl = imgUrl
        }
      })
      return {
        success: true,
        data: [{ id: 0, name: '人脸终端' }, { id: 1, name: '摄像头' }, { id: 2, name: '门禁' }]
        msg: '修改成功！'
      }
    }
  }

security-protection-platform/src/api/system/index.js

@@ -53,20 +53,26 @@ const api = {
    })
  },
  getDeviceData (data) {
    return $http.get('/system/getDeviceData', data)
    return $http.get('/system/getDeviceData', data).catch((err) => { return err })
  },
  getDeviceTypes () {
    return $http.get('/system/getDeviceTypes')
    return $http.get('/system/getDeviceTypes').catch((err) => { return err })
  },
  deleteDeviceData (data) {
    if (Array.isArray(data.deviceId)) {
      return $http.delete(`/system/deleteDeviceData?deviceId=${data.deviceId.join(',')}`)
      return $http.delete(`/system/deleteDeviceData?deviceId=${data.deviceId.join(',')}`).catch((err) => { return err })
    } else {
      return $http.delete(`/system/deleteDeviceData?deviceId=${data.deviceId}`)
      return $http.delete(`/system/deleteDeviceData?deviceId=${data.deviceId}`).catch((err) => { return err })
    }
  },
  getDeviceInfo (id) {
    return $http.get(`/system/getDeviceInfo?deviceId=${id}`)
    return $http.get(`/system/getDeviceInfo?deviceId=${id}`).catch((err) => { return err })
  },
  addDeviceData (data) {
    return $http.post('/system/addDeviceData', data).catch((err) => { return err })
  },
  editDeviceData (data) {
    return $http.put('/system/editDeviceData', data).catch((err) => { return err })
  }
}

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

@@ -2,7 +2,7 @@
  <!-- 请假对话框 -->
  <t-modal :visibled.sync="visibled" :mask-closable="false" width="600px" height="500px">
    <template slot="header">
      <div class="leave-modal-title">设备新增</div>
      <div class="device-modal-title">{{ isEdit?'设备编辑':'设备新增' }}</div>
    </template>
    <template slot="close">
      <i @click="resetModalData">
@@ -11,17 +11,28 @@
    </template>
    <t-form ref="addDeviceModalForm" :model="addDeviceModalForm" :rules="addDeviceModalFormRules" :label-span="2" label-position="right">
      <t-form-item label="设备名称：" prop="deviceName">
        <t-input v-model="addDeviceModalForm.deviceName" :maxlength="100" :rows="3" count placeholder="请输入请假事由"></t-input>
        <t-input v-model="addDeviceModalForm.deviceName" :maxlength="100" :rows="3" count placeholder="请输入设备名称"></t-input>
      </t-form-item>
      <t-form-item label="设备类型：" prop="deviceTypeId">
        <t-select v-model="addDeviceModalForm.deviceTypeId" placeholder="请选择请假类型">
        <t-select v-model="addDeviceModalForm.deviceTypeId" placeholder="请选择设备类型">
          <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="图片上传：">
        <div style="display:flex;flex-direction:row">
          <t-upload ref="uploader" :format="['jpg','jpeg','png']" :show-uploaded="false" :before-upload="$_onUploadBeforeUpload" :action="action" multiple type="drag" style="width:180px;height:180px" @success="$_onUploadSuccess" @remove-file="$_onUploadRemoveFile" @error="$_onUploadError" @file-ext-error="$_onUploadFormatError" @file-exceeded-size="$_onUploadExceededSize">
            <div style="width: 180px;height:180px;line-height: 180px">
              <t-icon icon="plus-outline" size="40"></t-icon>
            </div>
          </t-upload>
          <img v-show="addDeviceModalForm.imgUrl?true:false" :src="addDeviceModalForm.imgUrl" style="margin-left:20px;width: 180px;height:180px;">
        </div>
      </t-form-item>
    </t-form>
    <template slot="footer">
      <t-button @click="resetModalData">取消</t-button>
      <t-button :loading="loadingSubmit" color="primary" @click="submitModalData">提交</t-button>
      <t-button v-if="isEdit" :loading="loadingSubmit" color="primary" @click="submitModalData">修改</t-button>
      <t-button v-else :loading="loadingSubmit" color="primary" @click="submitModalData">提交</t-button>
    </template>
  </t-modal>
</template>
@@ -39,6 +50,11 @@ export default {
    types: {
      type: Array,
      default: () => []
    },
    // 当前编辑的设备
    currentEditDevice: {
      type: Object,
      default: () => { }
    }
  },
  data () {
@@ -46,22 +62,26 @@ export default {
      // 新增设备对话框表单
      addDeviceModalForm: {
        deviceName: '', // 设备名称
        deviceTypeId: '' // 设备类型id
        deviceTypeId: '', // 设备类型id
        imgUrl: ''
      },
      // 请假对话框表单验证规则
      addDeviceModalFormRules: {
        deviceName: [
          { required: true, message: '请假类型不能为空', trigger: blur }
          { required: true, message: '设备名称不能为空', trigger: 'blur' }
        ],
        deviceTypeId: [
          { required: true, message: '开始时间不能为空' }
          { required: true, message: '设备类型不能为空' }
        ]
      },
      // 提交表单是否显示loading
      loadingSubmit: false
      loadingSubmit: false,
      action: '',
      uploadList: () => []
    }
  },
  computed: {
    // 显示/隐藏对话框
    visibled: {
      set (val) {
        this.$emit('update:add-device-modal', val)
@@ -69,12 +89,29 @@ export default {
      get () {
        return this.addDeviceModal
      }
    },
    // 是否为编辑状态
    isEdit: {
      get () {
        return this.addDeviceModalForm.deviceId != null
      }
    }
  },
  watch: {
    // 当前编辑设备
    currentEditDevice (val) {
      this.addDeviceModalForm = val
    }
  },
  mounted () {
    this.uploadList = this.$refs.uploader.files
  },
  methods: {
    // 重置表单数据
    resetModalData () {
      this.$refs.addDeviceModalForm.resetFields()
      this.addDeviceModalForm.deviceId = null
      this.addDeviceModalForm.imgUrl = ''
      this.visibled = false
    },
    // 提交表单数据
@@ -82,7 +119,11 @@ export default {
      this.loadingSubmit = true
      this.$refs['addDeviceModalForm'].validate((valid) => {
        if (valid) {
          this.addLeaveData()
          if (this.isEdit) {
            this.editDeviceData()
          } else {
            this.addDeviceData()
          }
          this.$emit('refresh-data')
        } else {
          console.log('error--------->请输入完整的表单信息！')
@@ -90,9 +131,9 @@ export default {
        }
      })
    },
    // 向服务器发送请求 添加请假数据
    async addLeaveData () {
      const res = await sysapi.addWorkOrderData({ ...this.leaveModalForm, duration: this.duration })
    // 向服务器发送请求 添加设备数据
    async addDeviceData () {
      const res = await sysapi.addDeviceData(this.addDeviceModalForm)
      if (res.status === 200) {
        this.resetModalData()
        // 如果数据有误
@@ -105,10 +146,76 @@ export default {
        this.$Message.danger('提交失败！')
      }
      this.loadingSubmit = false
    },
    // 向服务器发送请求 添加设备数据
    async editDeviceData () {
      const res = await sysapi.editDeviceData(this.addDeviceModalForm)
      if (res.status === 200) {
        this.resetModalData()
        // 如果数据有误
        if (res.data.fail) {
          this.$Message.warning(res.data.fail)
        } else {
          this.$Message.success('修改成功！')
        }
      } else {
        this.$Message.danger('修改失败！')
      }
      this.loadingSubmit = false
    },
    $_onDeleteIconClick (file) {
      this.$refs.uploader.removeFile(file)
    },
    $_onUploadRemoveFlie (file, fileList) {
      this.uploadList = fileList
    },
    $_onUploadPreviewFlie (file) {
      console.log(file)
    },
    $_onUploadProgress (e, file) {
      console.log(e)
      console.log(file)
    },
    $_onUploadSuccess (res, file) {
      // 因为演示用的上传服务器返回数据格式的原因，这里模拟添加 url
      console.log(file)
      this.uploadList.push(file)
    },
    $_onUploadRemoveFile () { },
    $_onUploadExceededSize () { },
    $_onUploadError (errMsg, response, file) {
      console.log(errMsg.message)
      this.$Notice.warning({
        title: `文件${file.name}上传失败`,
        desc:
          '原因：' + errMsg
      })
    },
    $_onUploadFileExtError (file, files) {
      this.$Notice.warning({
        title: '文件格式不正确',
        desc:
          '文件 ' + file.name + ' 格式不正确，请上传 jpg 或 png 格式的图片。'
      })
      console.log(files)
    },
    $_onUploadFileExceededSize (file) {
      this.$Notice.warning({
        title: '超出文件大小限制',
        desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
      })
    },
    $_onUploadFormatError () { },
    $_onUploadBeforeUpload () {
      const check = this.uploadList.length < 5
      if (!check) {
        this.$Notice.warning({
          title: '最多只能上传 5 张图片。'
        })
      }
      return check
    }
  }
}
</script>
<style>
</style>

security-protection-platform/src/modules/system/devicemana/index.vue

@@ -33,7 +33,7 @@
          <t-table-column label="操作">
            <template v-slot="{row}">
              <a href="javascript:;" style="color:#0089D4;" @click="getDeviceInfo(row.deviceId)">详情</a>
              <a href="javascript:;" style="color:#0089D4;">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="editDeviceData(row.deviceId)">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteDeviceData(row)">删除</a>
            </template>
          </t-table-column>
@@ -50,7 +50,7 @@
    </template> -->
    <!-- 新增设备对话框 -->
    <template>
      <add-device-modal :types="deviceTypeList" :add-device-modal.sync="addDeviceModal" @refresh-data="getDeviceData()">
      <add-device-modal :types="deviceTypesList" :add-device-modal.sync="addDeviceModal" :current-edit-device="currentEditDevice" @refresh-data="getDeviceData()">
      </add-device-modal>
    </template>
    <!-- 设备详情对话框 -->
@@ -97,8 +97,7 @@ export default {
      currentDeviceData: {},
      // 显示/隐藏新增设备对话框
      addDeviceModal: false,
      // 设备类型列表
      deviceTypeList: []
      currentEditDevice: {}
    }
  },
  created () {
@@ -197,7 +196,7 @@ export default {
      })
    },
    // 获取设备详情数据
    async getDeviceInfo(id) {
    async getDeviceInfo (id) {
      const res = await sysapi.getDeviceInfo(id)
      if (res.status === 200) {
        this.currentDeviceData = res.data.data
@@ -206,7 +205,16 @@ export default {
      }
    },
    // 显示新增设备对话框
    showAddDeviceModal() {
    showAddDeviceModal () {
      this.addDeviceModal = true
    },
    async editDeviceData (id) {
      const res = await sysapi.getDeviceInfo(id)
      if (res.status === 200) {
        this.currentEditDevice = res.data.data
      } else {
        this.$Message.danger('设备数据获取失败！')
      }
      this.addDeviceModal = true
    }
  }

security-protection-platform/src/modules/workorder/components/modal/approvalmodal.vue

@@ -20,8 +20,8 @@
    <t-form ref="approvalModalForm" :model="approvalModalForm" :rules="approvalModalFormRules" :label-span="2" label-position="right">
      <t-form-item label="审批结果：" prop="result">
        <t-radio-group v-model="approvalModalForm.result">
          <t-radio label="0">同意</t-radio>
          <t-radio label="1">拒绝</t-radio>
          <t-radio label="1">同意</t-radio>
          <t-radio label="0">拒绝</t-radio>
        </t-radio-group>
      </t-form-item>
      <t-form-item label="审批意见：" prop="comments">

security-protection-platform/src/modules/workorder/components/modal/fieldservicemodal.vue

@@ -155,7 +155,7 @@ export default {
      if (startDate && endDate) {
        const start = +new Date(startDate)
        const end = +new Date(endDate)
        return (end - start) / (24 * 60 * 60 * 1000)
        return (end - start) / (24 * 60 * 60 * 1000) + 1
      } else {
        return 0
      }
@@ -163,6 +163,7 @@ export default {
    // 计算结束时间
    calEndTime (startDate, duration) {
      if (startDate && duration) {
        duration = duration - 1
        const endDate = formatDateTime(new Date(+new Date(startDate) + (duration * 24 * 60 * 60 * 1000)))
        return endDate
      } else {

security-protection-platform/src/modules/workorder/components/modal/leavemodal.vue

@@ -153,7 +153,7 @@ export default {
      if (startDate && endDate) {
        const start = +new Date(startDate)
        const end = +new Date(endDate)
        return (end - start) / (24 * 60 * 60 * 1000)
        return (end - start) / (24 * 60 * 60 * 1000) + 1
      } else {
        return 0
      }
@@ -161,6 +161,7 @@ export default {
    // 计算结束时间
    calEndTime (startDate, duration) {
      if (startDate && duration) {
        duration = duration - 1
        const endDate = formatDateTime(new Date(+new Date(startDate) + (duration * 24 * 60 * 60 * 1000)))
        return endDate
      } else {

security-protection-platform/src/modules/workorder/components/modal/overtimemodal.vue

@@ -142,7 +142,7 @@ export default {
      if (startDate && endDate) {
        const start = +new Date(startDate)
        const end = +new Date(endDate)
        return (end - start) / (24 * 60 * 60 * 1000)
        return (end - start) / (24 * 60 * 60 * 1000) + 1
      } else {
        return 0
      }
@@ -150,6 +150,7 @@ export default {
    // 计算结束时间
    calEndTime (startDate, duration) {
      if (startDate && duration) {
        duration = duration - 1
        const endDate = formatDateTime(new Date(+new Date(startDate) + (duration * 24 * 60 * 60 * 1000)))
        return endDate
      } else {

security-protection-platform/src/modules/workorder/components/modal/workorderinfomodal.vue

@@ -15,7 +15,7 @@
    </div>
    <div v-if="status" class="approval-info row">
      <div class="col-6">审批人：<span>{{ data.approver }}</span></div>
      <div class="col-6">审批结果：<span>{{ data.result===0?'同意':'驳回' }}</span></div>
      <div class="col-6">审批结果：<span>{{ data.result==='0'?'失败':'成功' }}</span></div>
      <div class="col-12">审批时间：<span>{{ data.approveTime }}</span></div>
      <div class="col-12">审批意见：<span>{{ data.comments }}</span></div>
    </div>