diff --git a/cmdb-ui/src/modules/cmdb/api/batch.js b/cmdb-ui/src/modules/cmdb/api/batch.js index c37efc5..19f6143 100644 --- a/cmdb-ui/src/modules/cmdb/api/batch.js +++ b/cmdb-ui/src/modules/cmdb/api/batch.js @@ -7,7 +7,7 @@ export function processFile(fileObj) { reader.readAsBinaryString(fileObj) reader.onload = function (e) { const data = e.target.result - const workbook = XLSX.read(data, { type: 'binary' }) + const workbook = XLSX.read(data, { type: 'binary', cellDates: true, }) const sheet = workbook.Sheets[workbook.SheetNames[0]] const lt = XLSX.utils.sheet_to_json(sheet, { header: 1 }) resolve(lt) @@ -56,7 +56,6 @@ export function any(ArrayList) { // 去除一个二维数组 底下为空的部分 export function filterNull(twoDimArray) { - console.log(twoDimArray) const newArray = [] for (let i = 0; i < twoDimArray.length; i++) { if (any(twoDimArray[i])) { diff --git a/cmdb-ui/src/modules/cmdb/views/batch/index.vue b/cmdb-ui/src/modules/cmdb/views/batch/index.vue index 1a4010f..f48f698 100644 --- a/cmdb-ui/src/modules/cmdb/views/batch/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/batch/index.vue @@ -29,6 +29,7 @@ </template> <script> +import moment from 'moment' import { mapState } from 'vuex' import CiTypeChoice from './modules/CiTypeChoice' import CiUploadTable from './modules/CiUploadTable' @@ -73,6 +74,22 @@ export default { const _ele = {} item.forEach((ele, j) => { if (ele !== undefined && ele !== null) { + const _find = this.ciTypeAttrs.attributes.find( + (attr) => attr.alias === dataList[0][j] || attr.name === dataList[0][j] + ) + if (_find?.value_type === '4') { + _ele[dataList[0][j]] = moment(ele).add(1, 'days').format('YYYY-MM-DD') + } else if (_find?.value_type === '3') { + _ele[dataList[0][j]] = moment(ele) + .add(43, 'seconds') + .format('YYYY-MM-DD HH:mm:ss') + } else if (_find?.value_type === '5') { + _ele[dataList[0][j]] = moment(ele) + .subtract(5, 'minutes') + .format('HH:mm:ss') + } else { + _ele[dataList[0][j]] = ele + } _ele[dataList[0][j]] = ele } }) diff --git a/cmdb-ui/src/modules/cmdb/views/batch/modules/CiUploadTable.vue b/cmdb-ui/src/modules/cmdb/views/batch/modules/CiUploadTable.vue index 4a97bb1..53eeea7 100644 --- a/cmdb-ui/src/modules/cmdb/views/batch/modules/CiUploadTable.vue +++ b/cmdb-ui/src/modules/cmdb/views/batch/modules/CiUploadTable.vue @@ -8,6 +8,7 @@ class="ops-stripe-table" :max-height="200" :data="dataSource" + resizable > <vxe-column type="seq" width="40" /> <vxe-column diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue index 78c468d..03f2ff5 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue @@ -372,7 +372,7 @@ export default { }, async open(property, attrList) { this.visible = true - this.getNoticeConfigAppBot() + await this.getNoticeConfigAppBot() this.attrList = attrList if (property.has_trigger) { this.triggerId = property.trigger.id