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

Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

Browse Source
This commit is contained in:
sjl
2024-12-04 20:00:15 +08:00
parent e5d4aae846 d6af35828d
commit 9e8cdaead6
15 changed files with 118 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/src/views/machine/device/components/devicePopup.vue
View File

@@ -3,7 +3,7 @@
<el-tabs type="border-card">
<el-tab-pane label="设备台账信息">
<div >
<el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false">
<el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false">
<el-divider >设备信息</el-divider>
<el-row :gutter="24" >
<el-col :span="8">
@@ -53,7 +53,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="生产日期" prop="createDate" :label-width="100">
<el-date-picker
<el-date-picker
v-model="formContent.createDate"
placeholder="请选择生产日期"
:disabled-date="disabledDate"
@@ -62,8 +62,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出厂编号" prop="createId" placeholder="请输入出厂编号" :label-width="100">
<el-input v-model="formContent.createId" />
<el-form-item label="出厂编号" prop="createId" :label-width="100">
<el-input v-model="formContent.createId" placeholder="请输入出厂编号"/>
</el-form-item>
</el-col>
</el-row>
@@ -155,20 +155,20 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="IsPasswordShow">
<el-form-item label='识别码' prop='series' clearable placeholder="请输入识别码" :label-width="100">
<el-input v-model='formContent.series' show-password/>
<el-form-item label='识别码' prop='series' clearable :label-width="100">
<el-input v-model='formContent.series' placeholder="请输入识别码" show-password/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="IsPasswordShow">
<el-form-item label='密钥' prop='devKey' clearable placeholder="请输入密钥" :label-width="100">
<el-input v-model='formContent.devKey' show-password/>
<el-form-item label='密钥' prop='devKey' clearable :label-width="100">
<el-input v-model='formContent.devKey' placeholder="请输入密钥" show-password/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" v-if="DevIsShow">
<el-col :span="8">
<el-form-item label='样品编号' prop='sampleID' clearable placeholder="请输入样品编号" :label-width="100">
<el-input v-model='formContent.sampleID' />
<el-form-item label='样品编号' prop='sampleID' clearable :label-width="100">
<el-input v-model='formContent.sampleID' placeholder="请输入样品编号" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -251,12 +251,12 @@ const disabledDate = (time: Date) => {
devVolt:57.74,
devCurr:1,
manufacturer: '',
createDate: '',
createDate: dayjs().format('YYYY-MM-DD'),
createId: '',
hardwareVersion: '',
softwareVersion: '',
protocol: 'MMS',
ip: '',
ip: '192.168.1.200',
port: 102,
encryptionFlag: 1,
reCheckNum:0,
@@ -277,12 +277,12 @@ const disabledDate = (time: Date) => {
devVolt:57.74,
devCurr:1,
manufacturer: '',
createDate: '',
createDate: dayjs().format('YYYY-MM-DD'),
createId: '',
hardwareVersion: '',
softwareVersion: '',
protocol: 'MMS',
ip: '',
ip: '192.168.1.200',
port: 102,
encryptionFlag: 1,
reCheckNum:0,

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

@@ -10,7 +10,7 @@
<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>
<el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()'>导入</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="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
删除
@@ -69,19 +69,19 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
prop: 'name',
label: '设备名称',
search: { el: 'input' },
minWidth: 200,
minWidth: 180,
},
{
prop: 'devType',
label: '设备类型',
minWidth: 200,
minWidth: 180,
enum: dictStore.getDictData('Dev_Type'),
fieldNames: { label: 'name', value: 'id' },
},
{
prop: 'createDate',
label: '生产日期',
minWidth: 200,
minWidth: 180,
search: {
span: 2,
render: () => {
@@ -120,7 +120,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
enum: dictStore.getDictData('Dev_Manufacturers'),
search: { el: 'select', props: { filterable: true }, order: 1 },
fieldNames: { label: 'name', value: 'id' },
minWidth: 200,
minWidth: 190,
},
{ prop: 'operation', label: '操作', fixed: 'right', width: 200 },
])
@@ -162,10 +162,10 @@ const downloadFile = async () => {
searchParam.searchBeginTime = startDate.value;
searchParam.searchEndTime = endDate.value;
ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>
useDownload(exportPqDev,'被检设备导出数据', proTable.value?.searchParam, false,'.xlsx'),
)
ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>{
const patternId = dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.id//获取数据字典中对应的id
useDownload(exportPqDev,'被检设备导出数据', {...proTable.value?.searchParam,pattern:patternId}, false,'.xlsx')
})
}
//导入设备

10
frontend/src/views/machine/errorSystem/index.vue
View File

@@ -15,9 +15,9 @@
</template>
<!-- 表格操作 -->
<template #operation='scope'>
<el-button type='primary' link :icon='View' @click="openDialog('view', scope.row)">查看</el-button>
<el-button type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
<el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
<el-button v-auth.device="'view'" type='primary' link :icon='View' @click="openDialog('view', scope.row)">查看</el-button>
<el-button v-auth.device="'edit'" type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
<el-button v-auth.device="'delete'" type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
</template>
</ProTable>
</div>
@@ -74,9 +74,9 @@ const columns = ref<ColumnProps<ErrorSystem.ErrorSystemList>[]>([
// 打开 drawer(新增、编辑)
const openDialog = (titleType: string, row: Partial<ErrorSystem.ErrorSystemList> = {}) => {
if(titleType == 'view'){
errorStandardPopup.value?.open(row.name, row)
//errorStandardPopup.value?.open(row.name, row)
}else{
errorSystemPopup.value?.open(titleType, row)
//errorSystemPopup.value?.open(titleType, row)
}

6
frontend/src/views/machine/testScript/index.vue
View File

@@ -9,7 +9,7 @@
<!-- 表格 header 按钮 -->
<template #tableHeader='scope'>
<el-button v-auth.testScript="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
<el-button v-auth.testScript="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
<el-button v-auth.testScript="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
删除
</el-button>
@@ -112,9 +112,9 @@ const columns = reactive<ColumnProps<TestScript.ResTestScript>[]>([
// 打开 drawer(新增、编辑)
const openDialog = (titleType: string, row: Partial<TestScript.ResTestScript> = {}) => {
if(modeStore.currentMode == '比对式'){
comparisonPopup.value?.open(titleType, row)
//comparisonPopup.value?.open(titleType, row)
}else{
testScriptPopup.value?.open(titleType, row)
//testScriptPopup.value?.open(titleType, row)
}

2
frontend/src/views/machine/testSource/components/parameterTable.vue
View File

@@ -13,7 +13,7 @@
<template #tableHeader='scope'>
<el-button v-auth.testSource="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增
</el-button>
<el-button v-auth.testSource="'batchDelete'" type='danger' :icon='Delete'
<el-button v-auth.testSource="'delete'" type='danger' :icon='Delete'
plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
删除
</el-button>

6
frontend/src/views/machine/testSource/components/testSourcePopup.vue
View File

@@ -5,7 +5,7 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="检测源名称" prop="name" >
<el-input v-model='formContent.name' placeholder="检测源类型+设备类型简称+数字"/>
<el-input v-model='formContent.name' placeholder="源类型+源型号+数字"/>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -21,8 +21,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准源" prop="type">
<el-select v-model='formContent.type' placeholder="请选择检测源类型">
<el-form-item label="源类型" prop="type">
<el-select v-model='formContent.type' placeholder="请选择源类型">
<el-option
v-for="item in dictStore.getDictData('Pq_Source_Type')"
:key="item.id"

2
frontend/src/views/machine/testSource/index.vue
View File

@@ -9,7 +9,7 @@
<!-- 表格 header 按钮 -->
<template #tableHeader='scope'>
<el-button v-auth.testSource="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
<el-button v-auth.testSource="'batchDelete'" type='danger' :icon='Delete'
<el-button v-auth.testSource="'delete'" type='danger' :icon='Delete'
plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
删除
</el-button>