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:
caozehui
2024-12-05 09:55:35 +08:00
parent 6e9e3db358
commit 7d5d128b54
6 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/styles/element.scss
View File

@@ -441,7 +441,7 @@
.dialog-small { .dialog-small {
.el-dialog__body { .el-dialog__body {
max-height: 260px; max-height: 320px;
} }
} }

6
frontend/src/views/authority/resource/components/resourcePopup.vue
View File

@@ -19,7 +19,7 @@
<el-form-item label="编码" prop="code" :label-width="100"> <el-form-item label="编码" prop="code" :label-width="100">
<el-input v-model="formContent.code" /> <el-input v-model="formContent.code" />
</el-form-item> </el-form-item>
<el-form-item label="图标" prop="icon" :label-width="100"> <el-form-item v-if="!formContent.type" label="图标" prop="icon" :label-width="100">
<IconSelect <IconSelect
v-model="formContent.icon" v-model="formContent.icon"
:iconValue="formContent.icon" :iconValue="formContent.icon"
@@ -27,10 +27,10 @@
placeholder="选择一个图标" placeholder="选择一个图标"
/> />
</el-form-item> </el-form-item>
<el-form-item label="路由地址" prop="path" :label-width="100"> <el-form-item v-if="!formContent.type" label="路由地址" prop="path" :label-width="100">
<el-input v-model="formContent.path" /> <el-input v-model="formContent.path" />
</el-form-item> </el-form-item>
<el-form-item label="组件地址" prop="component" :label-width="100"> <el-form-item v-if="!formContent.type" label="组件地址" prop="component" :label-width="100">
<el-input v-model="formContent.component" /> <el-input v-model="formContent.component" />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort" :label-width="100"> <el-form-item label="排序" prop="sort" :label-width="100">

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

@@ -148,18 +148,19 @@
<el-row :gutter="24" > <el-row :gutter="24" >
<el-col :span="8"> <el-col :span="8">
<el-form-item label='是否加密' prop='encryptionFlag' :label-width="100"> <el-form-item label='是否加密' prop='encryptionFlag' :label-width="100">
<el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密" @change="handleEncryptionChange"> <!-- <el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密" @change="handleEncryptionChange">-->
<el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密">
<el-option label="是" :value="1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option> <el-option label="否" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="IsPasswordShow"> <el-col :span="8" v-if="formContent.encryptionFlag">
<el-form-item label='识别码' prop='series' clearable :label-width="100"> <el-form-item label='识别码' prop='series' clearable :label-width="100">
<el-input v-model='formContent.series' placeholder="请输入识别码" show-password/> <el-input v-model='formContent.series' placeholder="请输入识别码" show-password/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="IsPasswordShow"> <el-col :span="8" v-if="formContent.encryptionFlag">
<el-form-item label='密钥' prop='devKey' clearable :label-width="100"> <el-form-item label='密钥' prop='devKey' clearable :label-width="100">
<el-input v-model='formContent.devKey' placeholder="请输入密钥" show-password/> <el-input v-model='formContent.devKey' placeholder="请输入密钥" show-password/>
</el-form-item> </el-form-item>
@@ -230,7 +231,7 @@ import MonitorTable from '@/views/machine/device/components/monitorTab.vue';
const MonIsShow = ref(false) const MonIsShow = ref(false)
const DevIsShow = ref(false) const DevIsShow = ref(false)
const IsPasswordShow = ref(false) // const IsPasswordShow = ref(false)
const dictStore = useDictStore() const dictStore = useDictStore()
const mode = ref() const mode = ref()
// 定义弹出组件元信息 // 定义弹出组件元信息
@@ -258,7 +259,7 @@ const disabledDate = (time: Date) => {
protocol: 'MMS', protocol: 'MMS',
ip: '192.168.1.200', ip: '192.168.1.200',
port: 102, port: 102,
encryptionFlag: 1, encryptionFlag: 0,
reCheckNum:0, reCheckNum:0,
state: 1, state: 1,
}) })
@@ -284,7 +285,7 @@ const disabledDate = (time: Date) => {
protocol: 'MMS', protocol: 'MMS',
ip: '192.168.1.200', ip: '192.168.1.200',
port: 102, port: 102,
encryptionFlag: 1, encryptionFlag: 0,
reCheckNum:0, reCheckNum:0,
state: 1, state: 1,
} }
@@ -344,12 +345,10 @@ const disabledDate = (time: Date) => {
try { try {
dialogFormRef.value?.validate(async (valid: boolean) => { dialogFormRef.value?.validate(async (valid: boolean) => {
if (formContent.value.encryptionFlag === 1) { if (formContent.value.encryptionFlag === 0) {
handleEncryptionChange(1) formContent.value.series = ''
} else { formContent.value.devKey = ''
handleEncryptionChange(0)
} }
if (valid) { if (valid) {
formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD'); formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD');
if (formContent.value.arrivedDate) if (formContent.value.arrivedDate)
@@ -401,34 +400,34 @@ const open = (sign: string, data: Device.ResPqDev,currentMode: string) => {
} }
if (data.encryptionFlag === 1) { if (data.encryptionFlag === 1) {
handleEncryptionChange(1) //handleEncryptionChange(1)
} else { } else {
handleEncryptionChange(0) //handleEncryptionChange(0)
} }
if (data.id) { if (data.id) {
formContent.value = { ...data } formContent.value = { ...data }
} else { } else {
resetFormContent() resetFormContent()
handleEncryptionChange(1) //handleEncryptionChange(1)
} }
// 重置表单 // 重置表单
dialogFormRef.value?.resetFields() dialogFormRef.value?.resetFields()
} }
const handleEncryptionChange = (value: number) => { // const handleEncryptionChange = (value: number) => {
// 根据是否加密来显示或隐藏识别码和密钥 // // 根据是否加密来显示或隐藏识别码和密钥
if(value === 1){ // if(value === 1){
IsPasswordShow.value = true // IsPasswordShow.value = true
//
}else // }else
{ // {
IsPasswordShow.value = false // IsPasswordShow.value = false
// formContent.value.series = '' // // formContent.value.series = ''
// formContent.value.devKey = '' // // formContent.value.devKey = ''
// rules.value.series = []; // // rules.value.series = [];
// rules.value.devKey = []; // // rules.value.devKey = [];
} // }
} // }
// 对外映射 // 对外映射
defineExpose({ open }) defineExpose({ open })

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

@@ -69,19 +69,19 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
prop: 'name', prop: 'name',
label: '设备名称', label: '设备名称',
search: { el: 'input' }, search: { el: 'input' },
minWidth: 180, minWidth: 200,
}, },
{ {
prop: 'devType', prop: 'devType',
label: '设备类型', label: '设备类型',
minWidth: 180, minWidth: 200,
enum: dictStore.getDictData('Dev_Type'), enum: dictStore.getDictData('Dev_Type'),
fieldNames: { label: 'name', value: 'id' }, fieldNames: { label: 'name', value: 'id' },
}, },
{ {
prop: 'createDate', prop: 'createDate',
label: '生产日期', label: '生产日期',
minWidth: 180, minWidth: 200,
search: { search: {
span: 2, span: 2,
render: () => { render: () => {
@@ -120,7 +120,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
enum: dictStore.getDictData('Dev_Manufacturers'), enum: dictStore.getDictData('Dev_Manufacturers'),
search: { el: 'select', props: { filterable: true }, order: 1 }, search: { el: 'select', props: { filterable: true }, order: 1 },
fieldNames: { label: 'name', value: 'id' }, fieldNames: { label: 'name', value: 'id' },
minWidth: 190, minWidth: 200,
}, },
{ prop: 'operation', label: '操作', fixed: 'right', width: 200 }, { prop: 'operation', label: '操作', fixed: 'right', width: 200 },
]) ])

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

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

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

@@ -67,7 +67,7 @@
}, },
{ {
prop: 'devType', prop: 'devType',
label: '源型号', label: '设备类型',
enum: dictStore.getDictData('S_Dev_Type_'+dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.code), enum: dictStore.getDictData('S_Dev_Type_'+dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.code),
fieldNames: { label: 'name', value: 'id' }, fieldNames: { label: 'name', value: 'id' },
search: { el: 'select' }, search: { el: 'select' },
@@ -75,7 +75,7 @@
}, },
{ {
prop: 'type', prop: 'type',
label: '源类型', label: '检测源类型',
enum: dictStore.getDictData('Pq_Source_Type'), enum: dictStore.getDictData('Pq_Source_Type'),
fieldNames: { label: 'name', value: 'id' }, fieldNames: { label: 'name', value: 'id' },
search: { el: 'select' }, search: { el: 'select' },