fix(device):添加谐波系统设备ID字段支持
This commit is contained in:
贾同学
@@ -81,46 +81,12 @@
|
||||
:disabled="formContent.importFlag == 1"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
|
||||
<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-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 label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
|
||||
<el-input v-model="formContent.hardwareVersion" clearable placeholder="请输入固件版本" />
|
||||
</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-input v-model="formContent.softwareVersion" clearable placeholder="请输入软件版本" />
|
||||
</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)
|
||||
@@ -508,8 +443,8 @@ const rules = computed(() => {
|
||||
dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }]
|
||||
// dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必选！', trigger: 'change' }]
|
||||
// dynamicRules.softwareVersion = [{ required: true, message: '软件版本必选！', trigger: 'change' }]
|
||||
dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }]
|
||||
dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }]
|
||||
dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }]
|
||||
dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }]
|
||||
dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }]
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user