解决打包报错问题
This commit is contained in:
parent
081608c4b0
commit
3bac5f119a
|
|
@ -109,8 +109,18 @@
|
||||||
></right-toolbar>
|
></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="leaseList" border @selection-change="handleSelect">
|
<el-table
|
||||||
<el-table-column type="selection" width="55" align="center" :selectable="(row) => row.taskStatus == 35" />
|
v-loading="loading"
|
||||||
|
:data="leaseList"
|
||||||
|
border
|
||||||
|
@selection-change="handleSelect"
|
||||||
|
>
|
||||||
|
<el-table-column
|
||||||
|
type="selection"
|
||||||
|
width="55"
|
||||||
|
align="center"
|
||||||
|
:selectable="(row) => row.taskStatus == 35"
|
||||||
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
label="序号"
|
label="序号"
|
||||||
|
|
@ -174,21 +184,16 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
>已推送</el-tag
|
>已推送</el-tag
|
||||||
>
|
>
|
||||||
<el-tag
|
<el-tag v-else type="danger" size="mini">未推送</el-tag>
|
||||||
v-else
|
|
||||||
type="danger"
|
|
||||||
size="mini"
|
|
||||||
>未推送</el-tag
|
|
||||||
>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column label="位置信息" align="center" prop="location">
|
||||||
label="位置信息"
|
<template v-slot="{ row }">
|
||||||
align="center"
|
<i
|
||||||
prop="location"
|
class="el-icon-location-information"
|
||||||
>
|
style="color: #459bd4; font-size: 24px"
|
||||||
<template v-slot="{row}">
|
@click="handleMap(row)"
|
||||||
<i class="el-icon-location-information" style="color: #459BD4; font-size: 24px;" @click="handleMap(row)"></i>
|
></i>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
@ -430,7 +435,9 @@
|
||||||
align="center"
|
align="center"
|
||||||
width="80"
|
width="80"
|
||||||
type="index"
|
type="index"
|
||||||
:index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
|
:index="
|
||||||
|
indexContinuation(outQuery.pageNum, outQuery.pageSize)
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<!-- <template slot-scope="scope">
|
<!-- <template slot-scope="scope">
|
||||||
<span>{{
|
<span>{{
|
||||||
|
|
@ -569,7 +576,7 @@ import {
|
||||||
import { getTypeList } from '@/api/store/warehousing'
|
import { getTypeList } from '@/api/store/warehousing'
|
||||||
import { equipmentTypeTree } from '@/api/store/tools'
|
import { equipmentTypeTree } from '@/api/store/tools'
|
||||||
import Treeselect from '@riophae/vue-treeselect'
|
import Treeselect from '@riophae/vue-treeselect'
|
||||||
import MapDialog from '@/views/warehouseManage/machinery/coding/component/MapDialog'
|
import MapDialog from '@/views/warehouseManage/machinery/coding/component/MapDIalog'
|
||||||
import DialogPush from './component/DialogPush'
|
import DialogPush from './component/DialogPush'
|
||||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||||
export default {
|
export default {
|
||||||
|
|
@ -882,7 +889,7 @@ export default {
|
||||||
},
|
},
|
||||||
// 推送智慧工地
|
// 推送智慧工地
|
||||||
handlePush() {
|
handlePush() {
|
||||||
console.log('🚀 ~ handlePush ~ :',)
|
console.log('🚀 ~ handlePush ~ :')
|
||||||
this.$refs.dialogPush.openDialog(true)
|
this.$refs.dialogPush.openDialog(true)
|
||||||
},
|
},
|
||||||
handleSelect(val) {
|
handleSelect(val) {
|
||||||
|
|
|
||||||
|
|
@ -146,7 +146,12 @@
|
||||||
:data="devicesList"
|
:data="devicesList"
|
||||||
@selection-change="handleSelectionChange"
|
@selection-change="handleSelectionChange"
|
||||||
>
|
>
|
||||||
<el-table-column type="selection" width="55" align="center" :selectable="(row) => row.maStatus == '15'" />
|
<el-table-column
|
||||||
|
type="selection"
|
||||||
|
width="55"
|
||||||
|
align="center"
|
||||||
|
:selectable="(row) => row.maStatus == '15'"
|
||||||
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
label="序号"
|
label="序号"
|
||||||
|
|
@ -545,7 +550,7 @@ import Treeselect from '@riophae/vue-treeselect'
|
||||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||||
import QRCode from 'qrcodejs2'
|
import QRCode from 'qrcodejs2'
|
||||||
import BindIOT from './component/BindIOT'
|
import BindIOT from './component/BindIOT'
|
||||||
import MapDialog from './component/MapDialog'
|
import MapDialog from './component/MapDIalog'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Devices',
|
name: 'Devices',
|
||||||
|
|
@ -760,7 +765,8 @@ export default {
|
||||||
const maId = row.maId || this.ids
|
const maId = row.maId || this.ids
|
||||||
getMachine(maId).then((response) => {
|
getMachine(maId).then((response) => {
|
||||||
this.form = response.data
|
this.form = response.data
|
||||||
if (this.form.maVender) this.form.maVender = parseInt(this.form.maVender)
|
if (this.form.maVender)
|
||||||
|
this.form.maVender = parseInt(this.form.maVender)
|
||||||
if (this.form.propId == 0) this.form.propId = ''
|
if (this.form.propId == 0) this.form.propId = ''
|
||||||
this.open = true
|
this.open = true
|
||||||
this.title = '编辑'
|
this.title = '编辑'
|
||||||
|
|
@ -802,10 +808,14 @@ export default {
|
||||||
},
|
},
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
handleExport() {
|
handleExport() {
|
||||||
this.download('base/machine/export', {
|
this.download(
|
||||||
...this.queryParams,
|
'base/machine/export',
|
||||||
dataCondition: this.ids
|
{
|
||||||
}, `编码设备管理_${new Date().getTime()}.xlsx`)
|
...this.queryParams,
|
||||||
|
dataCondition: this.ids,
|
||||||
|
},
|
||||||
|
`编码设备管理_${new Date().getTime()}.xlsx`,
|
||||||
|
)
|
||||||
},
|
},
|
||||||
handleBindIOT(row) {
|
handleBindIOT(row) {
|
||||||
console.log('🚀 ~ handleBindIOT ~ row:', row)
|
console.log('🚀 ~ handleBindIOT ~ row:', row)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue