feat:修改新增假勤数据回显问题，设备管理接口联调

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

@@ -20,6 +20,20 @@ const mapping = {
  maxAbsenceTimes: 'absentAlarmThreshold',
  depId: 'workOrgRoleId'
}
const mappingDeviceQuest = {
  page: 'pageNumber',
  limit: 'pageSize',
  deviceTypeId: 'typeId',
  deviceName: 'nameAsLike',
  deviceId: 'code'
}
const mappingDeviceResponse = {
  deviceName: 'resourceToolName',
  deviceId: 'resourceToolCode',
  deviceType: 'resourceToolTypeName',
  deviceTypeId: 'resourceToolType',
  imgUrl: 'toolPictureUrl'
}
const api = {
  getSchedules () {
@@ -52,27 +66,50 @@ const api = {
      return resp
    })
  },
  // 获取设备列表数据
  getDeviceData (data) {
    return $http.get('/system/getDeviceData', data).catch((err) => { return err })
    // return $http.get('/system/getDeviceData', data).catch((err) => { return err })
    data = keysMapping(data, mappingDeviceQuest)
    return $default.get('/sp/resourceTool/queryPageResourceTool', data).then(resp => {
      resp.data = keysMappingReverse(resp.data.data, mappingDeviceResponse)
      return resp
    }).catch((err) => { return err })
  },
  // 获取设备类型列表数据
  getDeviceTypes () {
    return $http.get('/system/getDeviceTypes').catch((err) => { return err })
    // return $http.get('/system/getDeviceTypes').catch((err) => { return err })
    return $default.get('/sp/resourceTool/queryResourceToolType').catch((err) => { return err })
  },
  // 删除设备
  deleteDeviceData (data) {
    if (Array.isArray(data.deviceId)) {
      return $http.delete(`/system/deleteDeviceData?deviceId=${data.deviceId.join(',')}`).catch((err) => { return err })
    // if (Array.isArray(data.deviceId)) {
    //   return $http.delete(`/system/deleteDeviceData?deviceId=${data.deviceId.join(',')}`).catch((err) => { return err })
    // } else {
    //   return $http.delete(`/system/deleteDeviceData?deviceId=${data.deviceId}`).catch((err) => { return err })
    // }
    if (Array.isArray(data.resourceToolId)) {
      return $default.delete(`/sp/resourceTool/deleteResourceTool?resourceToolId=${data.resourceToolId.join(',')}`).catch((err) => { return err })
    } else {
      return $http.delete(`/system/deleteDeviceData?deviceId=${data.deviceId}`).catch((err) => { return err })
      return $default.delete(`/sp/resourceTool/deleteResourceTool?resourceToolId=${data.resourceToolId}`).catch((err) => { return err })
    }
  },
  // 根据id获取单个设备数据
  getDeviceInfo (id) {
    return $http.get(`/system/getDeviceInfo?deviceId=${id}`).catch((err) => { return err })
    // return $http.get(`/system/getDeviceInfo?deviceId=${id}`).catch((err) => { return err })
    return $default.get(`/sp/resourceTool/queryOneResourceTool?resourceToolId=${id}`).then(resp => {
      resp.data = keysMappingReverse(resp.data.data, mappingDeviceResponse)
      return resp
    }).catch((err) => { return err })
  },
  addDeviceData (data) {
    return $http.post('/system/addDeviceData', data).catch((err) => { return err })
    // return $http.post('/system/addDeviceData', data).catch((err) => { return err })
    data = keysMapping(data, mappingDeviceResponse)
    return $default.post('/sp/resourceTool/createResourceTool', data).catch((err) => { return err })
  },
  editDeviceData (data) {
    return $http.put('/system/editDeviceData', data).catch((err) => { return err })
    // return $http.put('/system/editDeviceData', data).catch((err) => { return err })
    data = keysMapping(data, mappingDeviceResponse)
    return $default.post('/sp/resourceTool/modifyResourceTool', data).catch((err) => { return err })
  }
}

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

@@ -10,8 +10,11 @@
      </i>
    </template>
    <t-form ref="addDeviceModalForm" :model="addDeviceModalForm" :rules="addDeviceModalFormRules" :label-span="2" label-position="right">
      <t-form-item label="设备编号：" prop="deviceId">
        <t-input v-model="addDeviceModalForm.deviceId" placeholder="请输入设备编号"></t-input>
      </t-form-item>
      <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" placeholder="请输入设备名称"></t-input>
      </t-form-item>
      <t-form-item label="设备类型：" prop="deviceTypeId">
        <t-select v-model="addDeviceModalForm.deviceTypeId" placeholder="请选择设备类型">
@@ -20,12 +23,12 @@
      </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">
          <t-upload ref="uploader" :format="['jpg','jpeg','png']" :show-uploaded="false" :before-upload="$_onUploadBeforeUpload" :action="action" :data="{pictureUrl:addDeviceModalForm.pictureUrl}" name="picture" 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;">
          <img v-show="imgUrl?true:false" :src="imgUrl" style="margin-left:20px;width: 180px;height:180px;">
        </div>
      </t-form-item>
    </t-form>
@@ -39,6 +42,12 @@
<script>
import sysapi from '@/api/system'
const defaultAddDeviceModalForm = {
  deviceId: '', // 设备id
  deviceName: '', // 设备名称
  deviceTypeId: '', // 设备类型id
  pictureUrl: '' // 图片标识
}
export default {
  props: {
    // 显示 / 隐藏新增设备对话框
@@ -60,13 +69,13 @@ export default {
  data () {
    return {
      // 新增设备对话框表单
      addDeviceModalForm: {
        deviceName: '', // 设备名称
        deviceTypeId: '', // 设备类型id
        imgUrl: ''
      },
      addDeviceModalForm: JSON.parse(JSON.stringify(defaultAddDeviceModalForm)),
      imgUrl: '',
      // 请假对话框表单验证规则
      addDeviceModalFormRules: {
        deviceId: [
          { required: true, message: '设备编号不能为空', trigger: 'blur' }
        ],
        deviceName: [
          { required: true, message: '设备名称不能为空', trigger: 'blur' }
        ],
@@ -76,7 +85,7 @@ export default {
      },
      // 提交表单是否显示loading
      loadingSubmit: false,
      action: '',
      action: 'http://10.19.90.34:8018/sp/resourceTool/uploadResourceToolPicture',
      uploadList: () => []
    }
  },
@@ -93,7 +102,7 @@ export default {
    // 是否为编辑状态
    isEdit: {
      get () {
        return this.addDeviceModalForm.deviceId != null
        return this.addDeviceModalForm.resourceToolId != null
      }
    }
  },
@@ -101,6 +110,7 @@ export default {
    // 当前编辑设备
    currentEditDevice (val) {
      this.addDeviceModalForm = val
      this.imgUrl = val.toolPictureUrl
    }
  },
  mounted () {
@@ -109,9 +119,8 @@ export default {
  methods: {
    // 重置表单数据
    resetModalData () {
      this.$refs.addDeviceModalForm.resetFields()
      this.addDeviceModalForm.deviceId = null
      this.addDeviceModalForm.imgUrl = ''
      this.addDeviceModalForm = JSON.parse(JSON.stringify(defaultAddDeviceModalForm))
      this.imgUrl = ''
      this.visibled = false
    },
    // 提交表单数据
@@ -124,7 +133,6 @@ export default {
          } else {
            this.addDeviceData()
          }
          this.$emit('refresh-data')
        } else {
          console.log('error--------->请输入完整的表单信息！')
          this.loadingSubmit = false
@@ -140,6 +148,7 @@ export default {
        if (res.data.fail) {
          this.$Message.warning(res.data.fail)
        } else {
          this.$emit('refresh-data')
          this.$Message.success('提交成功！')
        }
      } else {
@@ -156,6 +165,7 @@ export default {
        if (res.data.fail) {
          this.$Message.warning(res.data.fail)
        } else {
          this.$emit('refresh-data')
          this.$Message.success('修改成功！')
        }
      } else {
@@ -177,6 +187,8 @@ export default {
      console.log(file)
    },
    $_onUploadSuccess (res, file) {
      this.imgUrl = res.data.data.toolPictureUrl
      this.addDeviceModalForm.pictureUrl = res.data.data.pictureUrl
      // 因为演示用的上传服务器返回数据格式的原因，这里模拟添加 url
      console.log(file)
      this.uploadList.push(file)
@@ -184,6 +196,7 @@ export default {
    $_onUploadRemoveFile () { },
    $_onUploadExceededSize () { },
    $_onUploadError (errMsg, response, file) {
      console.log(file)
      console.log(errMsg.message)
      this.$Notice.warning({
        title: `文件${file.name}上传失败`,

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

@@ -32,8 +32,8 @@
          <t-table-column prop="deviceType" label="设备类型" width="280"></t-table-column>
          <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;" @click="editDeviceData(row.deviceId)">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="getDeviceInfo(row.resourceToolId)">详情</a>
              <a href="javascript:;" style="color:#0089D4;" @click="editDeviceData(row.resourceToolId)">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteDeviceData(row)">删除</a>
            </template>
          </t-table-column>
@@ -92,7 +92,7 @@ export default {
      // 数据总数
      total: 100,
      // 批量删除的设备id
      deleteDeviceId: [],
      deleteResourceToolId: [],
      // 当前设备数据
      currentDeviceData: {},
      // 显示/隐藏新增设备对话框
@@ -110,7 +110,7 @@ export default {
      const res = await sysapi.getDeviceData({ params: { page: this.page, limit: this.limit, deviceTypeId: this.deviceTypeId, deviceName: this.deviceName, deviceId: this.deviceId } }
      )
      if (res.status === 200) {
        this.deviceDataList = res.data.data.data
        this.deviceDataList = res.data.data
        this.total = res.data.total
      } else {
        this.$Message.danger('设备数据列表获取失败！')
@@ -154,7 +154,7 @@ export default {
        title: '正在准备删除...',
        content: '<p>确定要删除？</p><p>删除后将无法还原！</p>',
        ok: async () => {
          const res = await sysapi.deleteDeviceData({ deviceId: row.deviceId })
          const res = await sysapi.deleteDeviceData({ resourceToolId: row.resourceToolId })
          if (res.status === 200) {
            this.getDeviceData()
            this.$Message.success('删除成功！')
@@ -170,19 +170,19 @@ export default {
    // 当复选框发生改变时 触发事件
    selectChange (data) {
      const arr = []
      data.forEach(item => arr.push(item.deviceId))
      this.deleteDeviceId = arr
      data.forEach(item => arr.push(item.resourceToolId))
      this.deleteResourceToolId = arr
    },
    // 批量删除数据
    multDeleteDeviceData () {
      if (this.deleteDeviceId.length === 0) {
      if (this.deleteResourceToolId.length === 0) {
        return this.$Message.warning('请选择要删除的数据！')
      }
      this.$Confirm.confirm({
        title: '正在准备删除...',
        content: '<p>确定要删除？</p><p>删除后将无法还原！</p>',
        ok: async () => {
          const res = await sysapi.deleteDeviceData({ deviceId: this.deleteDeviceId })
          const res = await sysapi.deleteDeviceData({ resourceToolId: this.deleteResourceToolId })
          if (res.status === 200) {
            this.getDeviceData()
            this.$Message.success('删除成功！')
@@ -199,7 +199,7 @@ export default {
    async getDeviceInfo (id) {
      const res = await sysapi.getDeviceInfo(id)
      if (res.status === 200) {
        this.currentDeviceData = res.data.data
        this.currentDeviceData = res.data
      } else {
        this.$Message.danger('设备详情数据获取失败！')
      }
@@ -211,7 +211,7 @@ export default {
    async editDeviceData (id) {
      const res = await sysapi.getDeviceInfo(id)
      if (res.status === 200) {
        this.currentEditDevice = res.data.data
        this.currentEditDevice = res.data
      } else {
        this.$Message.danger('设备数据获取失败！')
      }

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

@@ -98,7 +98,6 @@ export default {
      this.$refs['approvalModalForm'].validate((valid) => {
        if (valid) {
          this.addApprovalData()
          this.$emit('refresh-all-data')
        } else {
          this.loadingSubmit = false
          console.log('error--------->请输入完整的表单信息！')
@@ -111,6 +110,7 @@ export default {
      const res = await workOrderApi.addApprovalData(this.approvalModalForm)
      if (res.status === 200) {
        this.resetModalData()
        this.$emit('refresh-all-data')
        this.$Message.success('操作成功！')
      } else {
        this.$Message.danger('操作失败！')

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

@@ -92,7 +92,6 @@ export default {
      this.$refs['cardReplacementModalForm'].validate((valid) => {
        if (valid) {
          this.addCardReplacementData()
          this.$emit('refresh-data')
        } else {
          console.log('error--------->请输入完整的表单信息！')
          this.loadingSubmit = false
@@ -112,6 +111,7 @@ export default {
        if (res.data.fail) {
          this.$Message.warning(res.data.fail)
        } else {
          this.$emit('refresh-data')
          this.$Message.success('提交成功！')
        }
      } else {

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

@@ -115,7 +115,6 @@ export default {
      this.$refs['fieldServiceModalForm'].validate((valid) => {
        if (valid) {
          this.addFieldServiceData()
          this.$emit('refresh-data')
        } else {
          console.log('error--------->请输入完整的表单信息！')
          this.loadingSubmit = false
@@ -143,6 +142,7 @@ export default {
        if (res.data.fail) {
          this.$Message.warning(res.data.fail)
        } else {
          this.$emit('refresh-data')
          this.$Message.success('提交成功！')
        }
      } else {

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

@@ -113,7 +113,6 @@ export default {
      this.$refs['leaveModalForm'].validate((valid) => {
        if (valid) {
          this.addLeaveData()
          this.$emit('refresh-data')
        } else {
          console.log('error--------->请输入完整的表单信息！')
          this.loadingSubmit = false
@@ -141,6 +140,7 @@ export default {
        if (res.data.fail) {
          this.$Message.warning(res.data.fail)
        } else {
          this.$emit('refresh-data')
          this.$Message.success('提交成功！')
        }
      } else {

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

@@ -102,7 +102,6 @@ export default {
      this.$refs['overtimeModalForm'].validate((valid) => {
        if (valid) {
          this.addWorkOverTimeData()
          this.$emit('refresh-data')
        } else {
          console.log('error--------->请输入完整的表单信息！')
          this.loadingSubmit = false
@@ -130,6 +129,7 @@ export default {
        if (res.data.fail) {
          this.$Message.warning(res.data.fail)
        } else {
          this.$emit('refresh-data')
          this.$Message.success('提交成功！')
        }
      } else {