eam
/
eam-ui
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BUG修改

master
添砖-JAVA\Administrator 6 months ago
parent
5dca80e209
commit
93db2a202c
3 changed files with 267 additions and 263 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 508
      src/views/eam/basic/item/index.vue
  2. 20
      src/views/eam/basic/location/index.vue
  3. 2
      src/views/eam/basic/location/location.data.ts

508
src/views/eam/basic/item/index.vue
View File

@ -1,36 +1,19 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search <Search :schema="Item.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
:schema="Item.allSchemas.searchSchema"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
<TableHead <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
:HeadButttondata="HeadButttondata" @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Item.allSchemas" />
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Item.allSchemas"
/>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total total: tableObject.total
}" }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
v-model:pageSize="tableObject.pageSize" v-model:sort="tableObject.sort">
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{ row }"> <template #code="{ row }">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span> <span>{{ row.code }}</span>
@ -43,284 +26,289 @@
</ContentWrap> </ContentWrap>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<BasicForm <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemRules" :formAllSchemas="Item.allSchemas"
ref="basicFormRef" :apiUpdate="ItemApi.updateItem" :apiCreate="ItemApi.createItem" @searchTableSuccess="searchTableSuccess"
@success="formsSuccess" :isBusiness="false" />
:rules="ItemRules"
:formAllSchemas="Item.allSchemas"
:apiUpdate="ItemApi.updateItem"
:apiCreate="ItemApi.createItem"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" /> <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
<!-- 详情 --> <!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="Item.allSchemas" /> <Detail ref="detailRef" :isBasic="true" :allSchemas="Item.allSchemas" />
<Dialog <Dialog ref="basicFormViewRef" v-model="showView" :key="viewKey" :closeOnClickModal="true" :title="viewTitle">
ref="basicFormViewRef"
v-model="showView"
:key="viewKey"
:closeOnClickModal="true"
:title="viewTitle"
>
<el-image v-for="url in urls" :key="url" :src="url" lazy /> <el-image v-for="url in urls" :key="url" :src="url" lazy />
</Dialog> </Dialog>
</template> </template>
<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 './item.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 { import {
DeviceAccounts, DeviceAccounts,
DeviceAccountsRules DeviceAccountsRules
} from '@/views/eam/device/deviceAccounts/deviceAccounts.data' } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts' import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
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 { SearchTable } from '@/components/SearchTable' import { SearchTable } from '@/components/SearchTable'
import { getAccessToken } from '@/utils/auth'
defineOptions({ name: 'Item' }) defineOptions({ name: 'Item' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息 const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const itemNumber = ref() const itemNumber = ref()
const tableColumns = ref(Item.allSchemas.tableColumns) const tableColumns = ref(Item.allSchemas.tableColumns)
const importFormRef = ref()
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/950552010397122560?token=' + getAccessToken())
const showView = ref(false) const showView = ref(false)
const viewTitle = ref('图片预览') const viewTitle = ref('图片预览')
const urls = ref([]) const urls = ref([])
const viewKey = ref(0) const viewKey = ref(0)
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV) formRef.setValues(setV)
})
}
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: ItemApi.getItemPage // 分页接口
}) })
}
// 字段设置 更新主列表字段 // 获得表格的各种操作
const updataTableColumns = (val) => { const { getList, setSearchParams } = tableMethods
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({ // 列表头部按钮
getListApi: ItemApi.getItemPage // 分页接口 const HeadButttondata = [
}) defaultButtons.defaultAddBtn({ hasPermi: 'basic:item:create' }), // 新增
defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), // 导出
defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null) // 设置
]
// 获得表格的各种操作 // 头部按钮事件
const { getList, setSearchParams } = tableMethods const buttonBaseClick = (val, item) => {
if (val == 'add') {
// 新增
openForm('create')
} else if (val == 'export') {
// 导出
handleExport()
} else if (val == 'qrCodeBatch') {
// 批量生成二维码
qrCodeBatch(val, item)
} else if (val == 'refresh') {
// 刷新
getList()
} else if (val == 'filtrate') {
// 筛选
} else {
// 其他按钮
console.log('其他按钮', item)
}
}
// 列表头部按钮 const qrCodeBatch = async (val, item) => {
const HeadButttondata =[ const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
defaultButtons.defaultAddBtn({ hasPermi: 'basic:item:create' }), // 新增 window.open(src.value + "&number=" + qrCodeList)
defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), // 导出 }
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null) // 设置
]
// 头部按钮事件 // 列表-操作按钮
const buttonBaseClick = (val, item) => { const butttondataView = (row) => {
if (val == 'add') { return [defaultButtons.viewBtn(null)]
// 新增
openForm('create')
} else if (val == 'export') {
// 导出
handleExport()
} else if (val == 'refresh') {
// 刷新
getList()
} else if (val == 'filtrate') {
// 筛选
} else {
// 其他按钮
console.log('其他按钮', item)
} }
} // 列表-操作按钮
const butttondata = (row) => {
// 列表-操作按钮 return [
const butttondataView = (row) => { defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // 编辑
return [defaultButtons.viewBtn(null)] defaultButtons.chooseDeviceBtn({ hasPermi: 'basic:item:choose' }), //备件
} defaultButtons.selectQrCodeBtn(null), //二维码
// 列表-操作按钮 defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), // 删除
const butttondata =(row)=>{ defaultButtons.viewBtn({ hide: !(row.filePathList != null && row.filePathList.length != 0) })
]
return [
defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // 编辑
defaultButtons.chooseDeviceBtn({ hasPermi: 'basic:item:choose' }), //备件
defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), // 删除
defaultButtons.viewBtn({hide: !(row.filePathList != null && row.filePathList.length != 0 )})
]}
// 列表-操作按钮事件
const buttonTableClick = async (val, row) => {
if (val == 'edit') {
// 编辑
openForm('update', row)
} else if (val == 'chooseDevice') {
openItem(row.number)
} else if (val == 'delete') {
// 删除
handleDelete(row.id)
} else if (val == 'view') {
// 图片预览
openForm('view', row)
} }
}
const searchTableRef = ref() // 列表-操作按钮事件
/** 绑定备件操作 */ const buttonTableClick = async (val, row) => {
const openItem = async (number: String) => { if (val == 'edit') {
itemNumber.value = number // 编辑
await CallBack1() openForm('update', row)
searchTableRef.value.open( } else if (val == 'chooseDevice') {
'选择设备', openItem(row.number)
DeviceAccounts.allSchemas, } else if (val == 'qrCode') {
DeviceAccountsApi.getDeviceAccountsPage, window.open(src.value + "&number='" + row.number + "'")
null, } else if (val == 'delete') {
DeviceAccounts.allSchemas.searchSchema, // 删除
true, handleDelete(row.id)
null, } else if (val == 'view') {
null, // 图片预览
null, openForm('view', row)
null, }
searchTableSelections.value }
)
}
const searchTableSelections = ref([]) const searchTableRef = ref()
const CallBack1 = async () => { /** 绑定备件操作 */
await getDeviceItemNoPage({ itemNumber: itemNumber.value }).then(async (res) => { const openItem = async (number : String) => {
await DeviceAccountsApi.getDeviceAccountsAllNoPage({}).then((response) => { itemNumber.value = number
searchTableSelections.value = response.filter((element) => { await CallBack1()
let flag = false searchTableRef.value.open(
res.forEach((item) => { '选择设备',
if (element.number == item.deviceNumber) { DeviceAccounts.allSchemas,
flag = true DeviceAccountsApi.getDeviceAccountsPage,
} null,
DeviceAccounts.allSchemas.searchSchema,
true,
null,
null,
null,
null,
searchTableSelections.value
)
}
const searchTableSelections = ref([])
const CallBack1 = async () => {
await getDeviceItemNoPage({ itemNumber: itemNumber.value }).then(async (res) => {
await DeviceAccountsApi.getDeviceAccountsAllNoPage({}).then((response) => {
searchTableSelections.value = response.filter((element) => {
let flag = false
res.forEach((item) => {
if (element.number == item.deviceNumber) {
flag = true
}
})
return flag
}) })
return flag
}) })
}) })
}) }
}
const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => { const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
const deviceItemRelList = selections.map((element) => ({ const deviceItemRelList = selections.map((element) => ({
itemNumber: itemNumber.value, itemNumber: itemNumber.value,
deviceNumber: element.number deviceNumber: element.number
})) }))
createDeviceItemBatch(deviceItemRelList).then((res) => { createDeviceItemBatch(deviceItemRelList).then((res) => {
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
}) })
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()
const openForm = (type: string, row?: any) => { const openForm = (type : string, row ?: any) => {
console.log(row) console.log(row)
if (type == 'view') { if (type == 'view') {
showView.value = true showView.value = true
urls.value = row.filePathList urls.value = row.filePathList
viewKey.value += 1 viewKey.value += 1
} else { } else {
if (row && row.filePathList && row.filePathList.length > 0) { if (row && row.filePathList && row.filePathList.length > 0) {
row.filePathListView = row.filePathList.map((item) => { row.filePathListView = row.filePathList.map((item) => {
return { return {
name: item, name: item,
url: item url: item
} }
}) })
}
basicFormRef.value.open(type, row)
} }
basicFormRef.value.open(type, row)
} }
}
// form表单提交 // form表单提交
const formsSuccess = async (formType, data) => { const formsSuccess = async (formType, data) => {
var isHave = Item.allSchemas.formSchema.some(function (item) { var isHave = Item.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime' return item.field === 'activeTime' || item.field === 'expireTime'
}) })
if (isHave) { if (isHave) {
if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) { if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
message.error('失效时间要大于生效时间') message.error('失效时间要大于生效时间')
return return
}
} }
if (data.activeTime == 0) data.activeTime = null
if (data.expireTime == 0) data.expireTime = null
data.filePathList = []
for (let i = 0; i < data.filePathListView.length; i++) {
data.filePathList.push(data.filePathListView[i].url)
}
if (formType === 'create') {
await ItemApi.createItem(data)
message.success(t('common.createSuccess'))
} else {
await ItemApi.updateItem(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
} }
if (data.activeTime == 0) data.activeTime = null
if (data.expireTime == 0) data.expireTime = null
data.filePathList = []
for (let i = 0; i < data.filePathListView.length; i++) {
data.filePathList.push(data.filePathListView[i].url)
}
if (formType === 'create') {
await ItemApi.createItem(data)
message.success(t('common.createSuccess'))
} else {
await ItemApi.updateItem(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
/** 详情操作 */ /** 详情操作 */
const detailRef = ref() const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row : any, titleName : any, titleValue : any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicItem') detailRef.value.openDetail(row, titleName, titleValue, 'basicItem')
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id : number) => {
try { try {
// 删除的二次确认 // 删除的二次确认
await message.delConfirm() await message.delConfirm()
// 发起删除 // 发起删除
await ItemApi.deleteItem(id) await ItemApi.deleteItem(id)
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// 刷新列表 // 刷新列表
await getList() await getList()
} catch {} } catch { }
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中
const handleExport = async () => { const handleExport = async () => {
try { try {
// 导出的二次确认 // 导出的二次确认
await message.exportConfirm() await message.exportConfirm()
// 发起导出 // 发起导出
exportLoading.value = true exportLoading.value = true
const data = await ItemApi.exportItem(tableObject.params) const data = await ItemApi.exportItem(tableObject.params)
download.excel(data, '备件.xlsx') download.excel(data, '备件.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
}
} }
}
// 筛选提交 // 筛选提交
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters
}
getList() // 刷新当前列表
} }
getList() // 刷新当前列表
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()
}) })
</script> </script>

20
src/views/eam/basic/location/index.vue
View File

@ -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' })
@ -56,6 +57,9 @@
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(Location.allSchemas.tableColumns) const tableColumns = ref(Location.allSchemas.tableColumns)
const importFormRef = ref()
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/950537917716037632?token=' + getAccessToken())
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
@ -90,6 +94,7 @@
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'basic:location:create'}), // 新增 defaultButtons.defaultAddBtn({hasPermi:'basic:location:create'}), // 新增
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), // 设置
@ -109,17 +114,26 @@
openForm('create') openForm('create')
} 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 { // 其他按钮
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
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'}), // 删除
] ]
@ -127,7 +141,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)
} }
} }

2
src/views/eam/basic/location/location.data.ts
View File

@ -145,7 +145,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
field: 'action', field: 'action',
isForm: false, isForm: false,
table: { table: {
width: 150, width: 180,
fixed: 'right' fixed: 'right'
} }
} }

Write Preview
Loading…
Cancel
Save