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

fix(device):添加谐波系统设备ID字段支持

Browse Source
This commit is contained in:
贾同学
2025-10-30 11:09:50 +08:00
parent 7f2275bad9
commit 8aae184a8b
2 changed files with 28 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,45 +82,11 @@
/>
</el-form-item>
<el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
<el-input v-model="formContent.hardwareVersion" clearable
placeholder="请输入固件版本" />
<el-input v-model="formContent.hardwareVersion" clearable placeholder="请输入固件版本" />
</el-form-item>
<el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
<el-input v-model="formContent.softwareVersion" clearable
placeholder="请输入软件版本" />
<el-input v-model="formContent.softwareVersion" clearable placeholder="请输入软件版本" />
</el-form-item>
<!-- <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
<el-select
v-model="formContent.hardwareVersion"
clearable
placeholder="请选择固件版本"
filterable
allow-create
>
<el-option
v-for="item in selectOptions['hardwareVersion']"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
<el-select
v-model="formContent.softwareVersion"
clearable
placeholder="请选择软件版本"
filterable
allow-create
>
<el-option
v-for="item in selectOptions['softwareVersion']"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="定检日期" prop="inspectDate" v-if="MonIsShow">
<el-date-picker
v-model="formContent.inspectDate"
@@ -226,68 +192,29 @@
</el-select>
</el-form-item>
<el-form-item label="所属地市" prop="cityName" v-if="MonIsShow">
<el-input v-model="formContent.cityName" clearable
placeholder="请输入所属地市" :disabled="formContent.importFlag == 1" />
</el-form-item>
<el-form-item label="所属供电公司" prop="gdName" v-if="MonIsShow">
<el-input v-model="formContent.gdName" clearable
placeholder="请输入所属供电公司" :disabled="formContent.importFlag == 1" />
</el-form-item>
<el-form-item label="所属电站" prop="subName" v-if="MonIsShow">
<el-input v-model="formContent.subName" clearable
placeholder="请输入所属电站" :disabled="formContent.importFlag == 1" />
</el-form-item>
<!-- <el-form-item label="所属地市" prop="cityName" v-if="MonIsShow">
<el-select
<el-input
v-model="formContent.cityName"
clearable
placeholder="请选择所属地市"
placeholder="请输入所属地市"
:disabled="formContent.importFlag == 1"
filterable
allow-create
>
<el-option
v-for="item in selectOptions['cityName']"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属供电公司" prop="gdName" v-if="MonIsShow">
<el-select
<el-input
v-model="formContent.gdName"
clearable
placeholder="请选择所属供电公司"
placeholder="请输入所属供电公司"
:disabled="formContent.importFlag == 1"
filterable
allow-create
>
<el-option
v-for="item in selectOptions['gdName']"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属电站" prop="subName" v-if="MonIsShow">
<el-select
<el-input
v-model="formContent.subName"
clearable
placeholder="请选择所属电站"
placeholder="请输入所属电站"
:disabled="formContent.importFlag == 1"
filterable
allow-create
>
<el-option
v-for="item in selectOptions['subName']"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> -->
</el-form-item>
<el-form-item
v-auth.device="'factorFlag'"
label="是否支持系数校准"
@@ -299,6 +226,14 @@
<el-radio :value="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
v-if="scene === '1'"
label="谐波系统设备id"
prop="harmSysId"
placeholder="请输入谐波系统设备id"
>
<el-input v-model="formContent.harmSysId" :disabled="formContent.importFlag == 1" />
</el-form-item>
</el-form>
</div>
</el-tab-pane>
@@ -332,7 +267,7 @@ import dayjs from 'dayjs'
import MonitorTable from '@/views/machine/device/components/monitorTab.vue'
import { useAppSceneStore } from '@/stores/modules/mode'
import { generateUUID } from '@/utils'
import { Monitor } from '@/api/device/interface/monitor'
import { type Monitor } from '@/api/device/interface/monitor'
const AppSceneStore = useAppSceneStore()
const MonIsShow = ref(false)

9
frontend/src/views/machine/device/components/monitorPopup.vue
View File

@@ -11,15 +11,10 @@
<div>
<el-form :model="formContent" ref="dialogFormRef" :rules="rules" label-width="140" class="form-two">
<el-form-item label="名称" prop="name">
<el-input v-model="formContent.name" placeholder="请输入监测点名称" />
<el-input clearable v-model="formContent.name" placeholder="请输入监测点名称" />
</el-form-item>
<el-form-item label="线路号" prop="num">
<el-select
v-model="formContent.num"
clearable
placeholder="请选择线路号"
@change="handleMonNumChange"
>
<el-select v-model="formContent.num" placeholder="请选择线路号" @change="handleMonNumChange">
<el-option v-for="item in lineNum" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>