ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
sjl
2025-01-15 20:37:58 +08:00
parent b23ee84543
commit 4e179d61b5
3 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/home/components/table.vue
View File

@@ -980,7 +980,7 @@ const handleTest = async (val: string) => {
const data = reactive({
socketServe: socketClient.Instance,
});
const url = 'ws://192.168.1.127:7777/hello?name=cdf';
const url = 'ws://localhost:7777/hello?name=cdf';
socketClient.Instance.connect(url);
data.socketServe = socketClient.Instance;
data.socketServe.registerCallBack('aaa', (res: { code: number; }) => {

22
frontend/src/views/machine/device/index.vue
View File

@@ -10,12 +10,8 @@
<template #tableHeader='scope'>
<el-button v-auth.device="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
<el-button v-auth.device="'export'" type='primary' :icon='Upload' plain @click='downloadFile()'>导出</el-button>
<<<<<<< HEAD
<el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click="importFile('')" v-if='modeStore.currentMode != "比对式"'>导入</el-button>
<el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click="importFile('比对式')" v-if='modeStore.currentMode === "比对式"'>导入</el-button>
=======
<el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()'>导入</el-button>
>>>>>>> ab02f8f1b34e2ceeee7cb83be9f6fc79b71116ad
<el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
删除
@@ -211,17 +207,17 @@ const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>(null)
const importFile = async (pattern:string) => {
if(pattern === '比对式'){
const params = {
title: '被检设备',
showCover: false,
tempApi: downloadTemplate,
importApi: importPqDev,
getTableList: proTable.value?.getTableList,
}
deviceImportExcel.value?.acceptParams(params)
// const params = {
// title: '被检设备',
// showCover: false,
// tempApi: downloadTemplate,
// importApi: importPqDev,
// getTableList: proTable.value?.getTableList,
// }
// deviceImportExcel.value?.acceptParams(params)
}else{
const params = {
title: '被检设备',
title: '被检设备',
showCover: false,
tempApi: downloadCNDevTemplate,
importApi: importCNDev,