Browse Source

BUG修改

master
parent
commit
58b315b7fb
  1. 19
      src/views/eam/basic/location/index.vue
  2. 12
      src/views/eam/report/itemWarning/index.vue
  3. 0
      src/views/eam/report/itemWarning/itemWarning.data.ts

19
src/views/eam/basic/location/index.vue

@ -46,6 +46,7 @@
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import { getAccessToken } from '@/utils/auth'
defineOptions({ name: 'Location' }) defineOptions({ name: 'Location' })
@ -57,6 +58,8 @@
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(Location.allSchemas.tableColumns) const tableColumns = ref(Location.allSchemas.tableColumns)
const importFormRef = ref() const importFormRef = ref()
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/948743576290918400?token=' + getAccessToken())
// //
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
@ -92,6 +95,7 @@
defaultButtons.defaultAddBtn({hasPermi:'basic:location:create'}), // defaultButtons.defaultAddBtn({hasPermi:'basic:location:create'}), //
defaultButtons.defaultImportBtn(null), // defaultButtons.defaultImportBtn(null), //
defaultButtons.defaultExportBtn({hasPermi:'basic:location:update'}), // defaultButtons.defaultExportBtn({hasPermi:'basic:location:update'}), //
defaultButtons.selectQrCodeBatchBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -113,7 +117,10 @@
handleImport() handleImport()
} else if (val == 'export') { // } else if (val == 'export') { //
handleExport() handleExport()
} else if (val == 'refresh') { // }else if (val == 'qrCodeBatch') {
//
qrCodeBatch(val, item)
}else if (val == 'refresh') { //
getList() getList()
} else if (val == 'filtrate') { // } else if (val == 'filtrate') { //
} else { // } else { //
@ -121,9 +128,15 @@
} }
} }
const qrCodeBatch = async (val,item) => {
const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
window.open(src.value + "&number=" + qrCodeList)
}
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'basic:location:update'}), // defaultButtons.mainListEditBtn({hasPermi:'basic:location:update'}), //
defaultButtons.selectQrCodeBtn(null), //
defaultButtons.mainListDeleteBtn({hasPermi:'basic:location:delete'}), // defaultButtons.mainListDeleteBtn({hasPermi:'basic:location:delete'}), //
] ]
@ -131,7 +144,9 @@
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'edit') { // if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // } else if (val == 'qrCode') {
window.open(src.value + "&number='" + row.number + "'")
} else if (val == 'delete') { //
handleDelete(row.id) handleDelete(row.id)
} }
} }

12
src/views/eam/report/itemWarning/index.vue

@ -42,7 +42,7 @@
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { Item, ItemRules } from './item.data' import { Item, ItemRules } from './itemWarning.data'
import * as ItemApi from '@/api/eam/basic/item' import * as ItemApi from '@/api/eam/basic/item'
import { createDeviceItemBatch, getDeviceItemPage, getDeviceItemNoPage } from '@/api/eam/basic/rel' import { createDeviceItemBatch, getDeviceItemPage, getDeviceItemNoPage } from '@/api/eam/basic/rel'
import { DeviceAccounts, DeviceAccountsRules } from '@/views/eam/device/deviceAccounts/deviceAccounts.data' import { DeviceAccounts, DeviceAccountsRules } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
@ -87,9 +87,9 @@
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'basic:item:create' }), // // defaultButtons.defaultAddBtn({ hasPermi: 'basic:item:create' }), //
defaultButtons.defaultImportBtn(null), // // defaultButtons.defaultImportBtn(null), //
defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), // // defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -113,8 +113,8 @@
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // // defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), //
defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), // // defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), //
] ]
// - // -

0
src/views/eam/report/itemWarning/item.data.ts → src/views/eam/report/itemWarning/itemWarning.data.ts

Loading…
Cancel
Save