mirror of https://github.com/veops/cmdb.git
This reverts commit cd319421d5
.
This commit is contained in:
parent
6c45ca7cb0
commit
7f1d796fd1
|
@ -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', cellDates: true, })
|
||||
const workbook = XLSX.read(data, { type: 'binary' })
|
||||
const sheet = workbook.Sheets[workbook.SheetNames[0]]
|
||||
const lt = XLSX.utils.sheet_to_json(sheet, { header: 1 })
|
||||
resolve(lt)
|
||||
|
@ -56,6 +56,7 @@ 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])) {
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import moment from 'moment'
|
||||
import { mapState } from 'vuex'
|
||||
import CiTypeChoice from './modules/CiTypeChoice'
|
||||
import CiUploadTable from './modules/CiUploadTable'
|
||||
|
@ -74,22 +73,6 @@ 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
|
||||
}
|
||||
})
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
class="ops-stripe-table"
|
||||
:max-height="200"
|
||||
:data="dataSource"
|
||||
resizable
|
||||
>
|
||||
<vxe-column type="seq" width="40" />
|
||||
<vxe-column
|
||||
|
|
|
@ -372,7 +372,7 @@ export default {
|
|||
},
|
||||
async open(property, attrList) {
|
||||
this.visible = true
|
||||
await this.getNoticeConfigAppBot()
|
||||
this.getNoticeConfigAppBot()
|
||||
this.attrList = attrList
|
||||
if (property.has_trigger) {
|
||||
this.triggerId = property.trigger.id
|
||||
|
|
Loading…
Reference in New Issue