bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决打包报错问题

This commit is contained in:
BianLzhaoMin 2024-07-15 11:26:34 +08:00
parent 081608c4b0
commit 3bac5f119a
2 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -109,8 +109,18 @@
></right-toolbar>
</el-row>
<el-table 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
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
align="center"
label="序号"
@ -174,21 +184,16 @@
size="mini"
>已推送</el-tag
>
<el-tag
v-else
type="danger"
size="mini"
>未推送</el-tag
>
<el-tag v-else type="danger" size="mini">未推送</el-tag>
</template>
</el-table-column>
<el-table-column
label="位置信息"
align="center"
prop="location"
>
<template v-slot="{row}">
<i class="el-icon-location-information" style="color: #459BD4; font-size: 24px;" @click="handleMap(row)"></i>
<el-table-column label="位置信息" align="center" prop="location">
<template v-slot="{ row }">
<i
class="el-icon-location-information"
style="color: #459bd4; font-size: 24px"
@click="handleMap(row)"
></i>
</template>
</el-table-column>
@ -430,7 +435,9 @@
align="center"
width="80"
type="index"
:index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
:index="
indexContinuation(outQuery.pageNum, outQuery.pageSize)
"
>
<!-- <template slot-scope="scope">
<span>{{
@ -569,7 +576,7 @@ import {
import { getTypeList } from '@/api/store/warehousing'
import { equipmentTypeTree } from '@/api/store/tools'
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 '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
@ -882,7 +889,7 @@ export default {
},
// 推送智慧工地
handlePush() {
console.log('🚀 ~ handlePush ~ :',)
console.log('🚀 ~ handlePush ~ :')
this.$refs.dialogPush.openDialog(true)
},
handleSelect(val) {

24
sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
View File

@ -146,7 +146,12 @@
:data="devicesList"
@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
align="center"
label="序号"
@ -545,7 +550,7 @@ import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import QRCode from 'qrcodejs2'
import BindIOT from './component/BindIOT'
import MapDialog from './component/MapDialog'
import MapDialog from './component/MapDIalog'
export default {
name: 'Devices',
@ -760,7 +765,8 @@ export default {
const maId = row.maId || this.ids
getMachine(maId).then((response) => {
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 = ''
this.open = true
this.title = '编辑'
@ -802,10 +808,14 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('base/machine/export', {
...this.queryParams,
dataCondition: this.ids
}, `编码设备管理_${new Date().getTime()}.xlsx`)
this.download(
'base/machine/export',
{
...this.queryParams,
dataCondition: this.ids,
},
`编码设备管理_${new Date().getTime()}.xlsx`,
)
},
handleBindIOT(row) {
console.log('🚀 ~ handleBindIOT ~ row:', row)