develop_cloud #1

Merged
dashixiong merged 234 commits from develop_cloud into main-cloud 2026-02-11 02:06:04 +00:00
134 changed files with 17333 additions and 412 deletions
Showing only changes of commit 84bc29410a - Show all commits

View File

@ -17,7 +17,7 @@ const ems = {
deviceTypeOptions: {'TCP': 'TCP', 'RTU': 'RTU'},//设备类型
ticketStatusOptions: {1: '待处理', 2: '处理中', 3: '已处理'},//工单处理状态
strategyStatusOptions: {'0': '未启用', '1': '已运行', '2': '已暂停', '3': '禁用', '4': '删除'},//策略状态
chargeStatusOptions: {'1': '充电', '2': '待机'},//冲放状态
chargeStatusOptions: {'1': '充电', '2': '待机', '3': '放电'},//冲放状态
comparisonOperatorOptions: {'>': '>', '<': '<', '=': '=', '>=': '>=', '<=': '<='},
relationWithPoint: {'||': '||', '&&': '&&'}
},

View File

@ -1,119 +1,140 @@
<template>
<el-dialog :visible.sync="dialogTableVisible" class="ems-dialog" :title="mode === 'add'?'新增模板':`编辑模板` ">
<el-form ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="100px">
<el-form-item label="模板名称" prop="templateName">
<el-input v-model="formData.templateName" placeholder="请输入" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="soc限制" prop="sdcLimit" required>
<el-switch :active-value="1" :inactive-value="0" v-model="formData.sdcLimit"></el-switch>
</el-form-item>
<!-- <template v-if="formData.sdcLimit === 1">-->
<el-form-item label="soc下限" prop="sdcDown">
<el-input v-model="formData.sdcDown" placeholder="请输入" clearable :style="{width: '100%'}"></el-input>
<el-dialog :visible.sync="dialogTableVisible" class="ems-dialog add-template-dialog"
:title="mode === 'add'?'新增模板':`编辑模板` ">
<el-form ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="100px">
<el-form-item label="模板名称" prop="templateName">
<el-input v-model="formData.templateName" placeholder="请输入" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="soc限制" prop="sdcLimit" required>
<el-switch :active-value="1" :inactive-value="0" v-model="formData.sdcLimit"></el-switch>
</el-form-item>
<!-- <template v-if="formData.sdcLimit === 1">-->
<el-form-item label="soc下限" prop="sdcDown">
<el-input v-model="formData.sdcDown" placeholder="请输入" clearable :style="{width: '100%'}"></el-input>
</el-form-item>
<el-form-item label="soc上限" prop="sdcUp">
<el-input v-model="formData.sdcUp" placeholder="请输入" clearable :style="{width: '100%'}"></el-input>
</el-form-item>
<!-- </template>-->
</el-form>
<el-button type="primary" size="mini" @click="addTime">新增</el-button>
<!-- 新增时间段表单-->
<el-collapse-transition>
<el-card v-show="showAddTime" shadow="always" class="common-card-container" style="margin-top:25px;">
<el-form class="add-time-form transition-box" ref="addTimeForm" :model="formInline" :rules="formInlineRule"
label-width="100px" style="margin-top:25px">
<!-- <el-form-item label="开始时间" prop="startTime">-->
<!-- <el-time-select-->
<!-- placeholder="开始时间"-->
<!-- v-model="formInline.startTime"-->
<!-- :picker-options="{-->
<!-- start: '00:00',-->
<!-- step: '00:01',-->
<!-- end: '23:00',-->
<!-- }">-->
<!-- </el-time-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="结束时间" prop="endTime">-->
<!-- <el-time-select-->
<!-- placeholder="结束时间"-->
<!-- v-model="formInline.endTime"-->
<!-- :picker-options="{-->
<!-- start: '00:00',-->
<!-- step: '00:01',-->
<!-- end: '23:00',-->
<!-- minTime: formInline.startTime-->
<!-- }">-->
<!-- </el-time-select>-->
<!-- </el-form-item>-->
<el-form-item label="时间范围" prop="timeRange">
<el-time-picker
is-range
v-model="formInline.timeRange"
range-separator=""
start-placeholder="开始时间"
end-placeholder="结束时间"
placeholder="选择时间范围"
format="HH:mm"
value-format="HH:mm"
:style="{width: '100%'}">
</el-time-picker>
</el-form-item>
<el-form-item label="soc上限" prop="sdcUp">
<el-input v-model="formData.sdcUp" placeholder="请输入" clearable :style="{width: '100%'}"></el-input>
<el-form-item label="冲放功率" prop="chargeDischargePower">
<el-input v-model="formInline.chargeDischargePower" placeholder="请输入"
:style="{width: '100%'}"></el-input>
</el-form-item>
<!-- </template>-->
</el-form>
<el-button type="primary" size="mini" @click="addTime">新增</el-button>
<!-- 新增时间段表单-->
<el-collapse-transition>
<el-card v-show="showAddTime" shadow="always" class="common-card-container" style="margin-top:25px;">
<el-form class="add-time-form transition-box" ref="addTimeForm" :model="formInline" :rules="formInlineRule" label-width="100px" style="margin-top:25px">
<el-form-item label="开始时间" prop="startTime">
<el-time-select
placeholder="开始时间"
v-model="formInline.startTime"
:picker-options="{
start: '00:00',
step: '01:00',
end: '23:00',
}">
</el-time-select>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-time-select
placeholder="结束时间"
v-model="formInline.endTime"
:picker-options="{
start: '00:00',
step: '01:00',
end: '23:00',
minTime: formInline.startTime
}">
</el-time-select>
</el-form-item>
<el-form-item label="冲放功率" prop="chargeDischargePower">
<el-input v-model="formInline.chargeDischargePower" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="充电状态" prop="chargeStatus">
<el-select v-model="formInline.chargeStatus" placeholder="请选择">
<el-option v-for="(value,key) in chargeStatusOptions" :key="key+'chargeStatusOptions'" :label="value" :value="key"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="saveTime">保存</el-button>
<el-button size="mini" @click="cancelAddTime">取消</el-button>
</el-form-item>
</el-form>
</el-card>
</el-collapse-transition>
<el-table
<el-form-item label="充电状态" prop="chargeStatus">
<el-select v-model="formInline.chargeStatus" placeholder="请选择" :style="{width: '100%'}">
<el-option v-for="(value,key) in chargeStatusOptions" :key="key+'chargeStatusOptions'" :label="value"
:value="key"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="saveTime">保存</el-button>
<el-button size="mini" @click="cancelAddTime">取消</el-button>
</el-form-item>
</el-form>
</el-card>
</el-collapse-transition>
<el-table
:data="tableData"
border
style="width: 100%;margin-top:25px">
<!-- todo 如果要在span-method中使用column.property 在表格中必须定义prop="xxx"属性-->
<el-table-column
<el-table-column
prop="startTime"
label="开始时间">
</el-table-column>
<el-table-column
</el-table-column>
<el-table-column
prop="endTime"
label="结束时间">
</el-table-column>
<el-table-column
</el-table-column>
<el-table-column
prop="chargeDischargePower"
label="充放功率kW">
</el-table-column>
<el-table-column
</el-table-column>
<el-table-column
prop="chargeStatus"
label="充电状态">
<template slot-scope="scope">
{{chargeStatusOptions[scope.row.chargeStatus]}}
</template>
</el-table-column>
<el-table-column
<template slot-scope="scope">
{{ chargeStatusOptions[scope.row.chargeStatus] }}
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="120">
<template slot-scope="scope">
<el-button
<template slot-scope="scope">
<el-button
@click.native.prevent="deleteRow(scope.$index, tableData)"
type="warning"
size="mini">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button @click="closeDialog">取消</el-button>
<el-button type="primary" @click="saveDialog">确定</el-button>
</div>
</el-dialog>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button @click="closeDialog">取消</el-button>
<el-button type="primary" @click="saveDialog">确定</el-button>
</div>
</el-dialog>
</template>
<script>
import {mapState} from 'vuex'
import {addStrategyTemp,editStrategyTemp,getStrategyTempDetail} from '@/api/ems/dzjk'
import {addStrategyTemp, editStrategyTemp, getStrategyTempDetail} from '@/api/ems/dzjk'
export default {
inject:['$home'],
inject: ['$home'],
data() {
const now = new Date()
const year = now.getFullYear(), month = now.getMonth(), day = now.getDate()
const range = [new Date(year, month, day, 0), new Date(year, month, day, 23)]
return {
mode:'',
editTempId:'',
dialogTableVisible:false,
mode: '',
editTempId: '',
dialogTableVisible: false,
secondRange: range,
formData: {
templateName: '',
sdcLimit: false,
@ -127,44 +148,41 @@ export default {
trigger: 'blur'
}],
sdcDown: [
{required: true,message: '请输入', trigger: 'blur'},
{ pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数' }
{required: true, message: '请输入', trigger: 'blur'},
{pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数'}
],
sdcUp: [
{required: true,message: '请输入', trigger: 'blur'},
{ pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数' }
{required: true, message: '请输入', trigger: 'blur'},
{pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数'}
],
},
showAddTime: false,
formInline:{
startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''
formInline: {
timeRange: range,
chargeDischargePower: '',
chargeStatus: ''
},
formInlineRule:{
startTime: [{
formInlineRule: {
timeRange: [{
required: true,
message: '请选择开始时间',
trigger: 'change'
}],
endTime: [{
required: true,
message: '请选择结束时间',
message: '请选择时间范围',
trigger: 'change'
}],
chargeDischargePower: [{
required: true,
message: '请输入冲放功率',
trigger: 'blur'
},
{ pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数' }
required: true,
message: '请输入冲放功率',
trigger: 'blur'
},
{pattern: /^-?\d*\.?\d*$/, message: '请输入合法数字或小数'}
],
chargeStatus:[{
chargeStatus: [{
required: true,
message: '请选择充放状态',
trigger: ['blur','change']
}
trigger: ['blur', 'change']
}
]
},
tableData:[],
tableData: [],
}
},
computed: {
@ -172,145 +190,158 @@ export default {
chargeStatusOptions: state => state?.ems?.chargeStatusOptions || {},
})
},
watch: {
"formInline.startTime":{
handler(newVal){
if(newVal && this.formInline.endTime){
const endTime = parseInt((this.formInline.endTime).split(':')[0] || 0)
const startTime =parseInt(newVal.split(':')[0])
if(endTime<=startTime){
this.formInline.endTime = `${startTime+1 <=9 ? '0'+(startTime+1) : startTime+1}:00`
}
}
},
deep:true
},
},
methods: {
changeSiteId(){
this.dialogTableVisible=false
this.mode=''
this.editTempId=''
this.formData={
changeSiteId() {
this.dialogTableVisible = false
this.mode = ''
this.editTempId = ''
this.formData = {
templateName: '',
sdcLimit: false,
sdcDown: '',
sdcUp: '',
}
this.formInline={
startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''
}
this.formInline = {
timeRange: this.secondRange, chargeDischargePower: '', chargeStatus: ''
}//startTime: '', endTime: '',
this.showAddTime = false
this.tableData=[]
this.tableData = []
},
show({mode = 'add', editTempId = ''}){
show({mode = 'add', editTempId = ''}) {
this.$nextTick(() => {
this.dialogTableVisible = true
this.mode = mode
this.editTempId=editTempId
if(mode === 'edit' && editTempId){
this.editTempId = editTempId
if (mode === 'edit' && editTempId) {
getStrategyTempDetail(this.editTempId).then(response => {
const data=JSON.parse(JSON.stringify(response?.data || []));
if(data.length>0){
const {templateName,sdcLimit,sdcDown,sdcUp} =JSON.parse(JSON.stringify( data[0]));
this.formData.templateName=templateName
this.formData.sdcLimit=sdcLimit
this.formData.sdcDown=sdcDown
this.formData.sdcUp=sdcUp
const data = JSON.parse(JSON.stringify(response?.data || []));
if (data.length > 0) {
const {templateName, sdcLimit, sdcDown, sdcUp} = JSON.parse(JSON.stringify(data[0]));
this.formData.templateName = templateName
this.formData.sdcLimit = sdcLimit
this.formData.sdcDown = sdcDown
this.formData.sdcUp = sdcUp
}
if(data.length === 1){
const {startTime,endTime}=data;
if(!startTime || !endTime){
if (data.length === 1) {
const {startTime, endTime} = data;
if (!startTime || !endTime) {
this.tableData = []
}else{
this.tableData= data
} else {
this.tableData = data
}
}else{
this.tableData= data
} else {
this.tableData = data
}
})
}
})
},
addTime(){
this.showAddTime=true
addTime() {
this.showAddTime = true
},
cancelAddTime(){
cancelAddTime() {
this.$refs.addTimeForm.resetFields()
this.showAddTime=false
this.formInline = {startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''}
this.showAddTime = false
this.formInline = {timeRange: this.secondRange, chargeDischargePower: '', chargeStatus: ''}//startTime: '', endTime: '',
},
saveTime(){
saveTime() {
//表单校验校验成功添加到tableData里
this.$refs.addTimeForm.validate(valid => {
if (!valid) return
this.tableData.push(JSON.parse(JSON.stringify(this.formInline)));
this.$nextTick(() => {this.cancelAddTime()})
const {timeRange: [startTime, endTime], chargeDischargePower, chargeStatus} = this.formInline
this.tableData.push({startTime, endTime, chargeDischargePower, chargeStatus})
this.$nextTick(() => {
this.cancelAddTime()
})
})
},
deleteRow(index){
this.tableData.splice(index,1)
deleteRow(index) {
this.tableData.splice(index, 1)
},
saveDialog() {
this.$refs.addTempForm.validate(valid => {
if (!valid) return
//校验时间选择范围是否冲突
let status = true
this.tableData.forEach((outer,outerIndex)=>{
const {startTime, endTime}=outer
const outerStart = parseInt(startTime),outerEnd = parseInt(endTime)
if(outerStart>outerEnd){
status = false
}else{
this.tableData.forEach((inner,innerIndex)=>{
if(innerIndex !== outerIndex){
const {startTime:innerStartTime, endTime:innerEndTime}=inner
const innerStart = parseInt(innerStartTime),innerEnd = parseInt(innerEndTime)
if((innerStart<outerStart && innerEnd>outerEnd) || !((innerStart<outerStart && innerEnd<=outerStart) || (innerStart>=outerEnd && innerEnd>outerEnd))){
status=false
}
let status = true
this.tableData.forEach((outer, outerIndex) => {
const {startTime, endTime} = outer
const outerStart = parseInt(startTime), outerEnd = parseInt(endTime)
if (outerStart > outerEnd) {
status = false
} else {
this.tableData.forEach((inner, innerIndex) => {
if (innerIndex !== outerIndex) {
const {startTime: innerStartTime, endTime: innerEndTime} = inner
const innerStart = parseInt(innerStartTime), innerEnd = parseInt(innerEndTime)
if ((innerStart < outerStart && innerEnd > outerEnd) || !((innerStart < outerStart && innerEnd <= outerStart) || (innerStart >= outerEnd && innerEnd > outerEnd))) {
status = false
}
})
}
})
}
})
if (!status) {
return this.$message.error('时间选择范围冲突');
}
const {templateName, sdcLimit, sdcDown, sdcUp} = this.formData
const {siteId, updateStrategyId} = this.$home
const {tableData} = this
if (this.mode === 'edit') {
editStrategyTemp({
siteId,
strategyId: updateStrategyId,
templateId: this.editTempId,
templateName,
sdcLimit,
sdcDown,
sdcUp,
timeConfigList: tableData
}).then(response => {
if (response?.code === 200) {
this.closeDialog()
this.$emit('update')
this.$emit('updateTimeSetting')
}
})
if(!status){
return this.$message.error('时间选择范围冲突');
}
const {templateName,sdcLimit,sdcDown,sdcUp} = this.formData
const {siteId,updateStrategyId} =this.$home
const {tableData} = this
if(this.mode==='edit'){
editStrategyTemp({siteId,strategyId:updateStrategyId,templateId:this.editTempId,templateName,sdcLimit,sdcDown,sdcUp,timeConfigList:tableData}).then(response=>{
if(response?.code === 200){
this.closeDialog()
this.$emit('update')
this.$emit('updateTimeSetting')
}
})
}else{
addStrategyTemp({siteId,strategyId:updateStrategyId,templateName,sdcLimit,sdcDown,sdcUp,timeConfigList:tableData}).then(response=>{
if(response?.code === 200){
this.closeDialog()
this.$emit('update')
}
})
}
} else {
addStrategyTemp({
siteId,
strategyId: updateStrategyId,
templateName,
sdcLimit,
sdcDown,
sdcUp,
timeConfigList: tableData
}).then(response => {
if (response?.code === 200) {
this.closeDialog()
this.$emit('update')
}
})
}
})
},
closeDialog(){
closeDialog() {
// 清空所有数据
this.$refs.addTempForm.resetFields()
this.formData={
this.formData = {
templateName: '',
sdcLimit:0,
sdcDown: '',
sdcUp: '',
sdcLimit: 0,
sdcDown: '',
sdcUp: '',
}
this.tableData=[]
this.tableData = []
this.cancelAddTime()
this.dialogTableVisible=false
this.dialogTableVisible = false
}
}
}
</script>
<style lang="scss" scoped>
.add-template-dialog {
max-height: 90vh;
overflow-y: auto;
}
</style>

View File

@ -1,12 +1,15 @@
<template>
<el-dialog :visible.sync="dialogTableVisible" :close-on-press-escape="false" :close-on-click-modal="false" :show-close="false" destroy-on-close lock-scroll append-to-body width="600px" class="ems-dialog" :title="mode === 'add'?'新增设备':`编辑设备` " >
<el-dialog :visible.sync="dialogTableVisible" :close-on-press-escape="false" :close-on-click-modal="false"
:show-close="false" destroy-on-close lock-scroll append-to-body width="600px" class="ems-dialog"
:title="mode === 'add'?'新增设备':`编辑设备` ">
<el-form v-loading="loading>0" ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="140px">
<el-form-item label="站点" prop="siteId">
<el-select v-model="formData.siteId" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
<el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'siteOptions'"></el-option>
<el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList"
:key="index+'siteOptions'"></el-option>
</el-select>
</el-form-item>
<el-form-item label="设备id" prop="deviceId" >
<el-form-item label="设备id" prop="deviceId">
<el-input v-model="formData.deviceId" placeholder="请输入" maxlength="60" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
@ -15,27 +18,34 @@
</el-input>
</el-form-item>
<el-form-item label="设备描述" prop="description">
<el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable :style="{width: '100%'}">
<el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable
:style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="工作状态" prop="communicationStatus">
<el-select v-model="formData.communicationStatus" placeholder="请选择" :style="{width: '100%'}">
<el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions" :key="key+'communicationStatusOptions'"></el-option>
<el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions"
:key="key+'communicationStatusOptions'"></el-option>
</el-select>
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="formData.deviceType" placeholder="请选择" :style="{width: '100%'}">
<el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions" :key="key+'deviceTypeOptions'"></el-option>
<el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions"
:key="key+'deviceTypeOptions'"></el-option>
</el-select>
</el-form-item>
<el-form-item label="设备类别" prop="deviceCategory">
<el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
<el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"></el-option>
<el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList"
:key="index+'deviceCategoryList'"></el-option>
</el-select>
</el-form-item>
<el-form-item label="上级设备" prop="parentId" v-if="dccDeviceCategoryList.includes(formData.deviceCategory)">
<el-select v-model="formData.parentId" :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'" :style="{width: '100%'}">
<el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList" :key="index+'parentDeviceList'" ></el-option>
<el-select v-model="formData.parentId"
:placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'"
:style="{width: '100%'}">
<el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList"
:key="index+'parentDeviceList'"></el-option>
</el-select>
</el-form-item>
<el-form-item label="TCP设备的ip地址" prop="ipAddress" v-if="formData.deviceType === 'TCP'">
@ -46,7 +56,10 @@
<el-input v-model="formData.ipPort" placeholder="请输入" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="从站地址" prop="slaveId" v-if="formData.deviceType === 'TCP'">
<el-input v-model="formData.slaveId" placeholder="请输入" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="串口路径" prop="serialPort">
<el-input v-model="formData.serialPort" placeholder="请输入" clearable :style="{width: '100%'}">
</el-input>
@ -60,9 +73,9 @@
</el-input>
</el-form-item>
<el-form-item label="停止位" prop="stopBits">
<el-input v-model="formData.stopBits" placeholder="请输入" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-input v-model="formData.stopBits" placeholder="请输入" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="校验位" prop="parity">
<el-input v-model="formData.parity" placeholder="请输入" clearable :style="{width: '100%'}">
</el-input>
@ -82,28 +95,29 @@
import {mapState} from "vuex";
import {getAllSites} from '@/api/ems/zddt'
import {validText} from '@/utils/validate'
import {getDeviceDetailInfo,updateDevice,addDevice,getParentDeviceId} from "@/api/ems/site";
import {addDevice, getDeviceDetailInfo, getParentDeviceId, updateDevice} from "@/api/ems/site";
import {getAllDeviceCategory} from '@/api/ems/search'
export default {
props:{
mode:{
type:String,
default:"add"
props: {
mode: {
type: String,
default: "add"
},
id:{
type:String|Number,
required:false
id: {
type: String | Number,
required: false
}
},
data() {
const validateText=(rule, value, callback) =>{
const validateText = (rule, value, callback) => {
if (value !== '' && !validText(value)) {
callback(new Error('只能输入中文、英文、数字和特殊字符!'));
} else {
callback();
}
}
const validateDeviceId=(rule, value, callback) =>{
const validateDeviceId = (rule, value, callback) => {
if (value !== '' && !/^[a-zA-Z0-9]+$/.test(value)) {
callback(new Error('只能输入英文和数字!'));
} else {
@ -111,76 +125,80 @@ export default {
}
}
return {
loading:0,
dccDeviceCategoryList:['CLUSTER','BATTERY'],//需要展示上级设备的设备类型
dialogTableVisible:false,
parentDeviceList:[],//上级设备列表 从接口获取数据
siteList:[],//站点列表 从接口获取数据
deviceCategoryList:[],//设备类别列表 从接口获取数据
loading: 0,
dccDeviceCategoryList: ['CLUSTER', 'BATTERY'],//需要展示上级设备的设备类型
dialogTableVisible: false,
parentDeviceList: [],//上级设备列表 从接口获取数据
siteList: [],//站点列表 从接口获取数据
deviceCategoryList: [],//设备类别列表 从接口获取数据
formData: {
id:'',//设备唯一标识
siteId:'',//站点ID
deviceId:'',//设备id
deviceName:'',//设备名称
description:'',//设备描述
communicationStatus:'',//工作状态
deviceType:'',//设备类型
deviceCategory:'',//设备类别
parentId:'',//上级设备id
ipAddress:'',//TCP设备的ip地址
ipPort:"",//TCP端口号
serialPort:'',//串口路径
baudRate:'',//波特率
dataBits:'',//数据位
stopBits:'',//停止位
parity:'',//校验位
pictureUrl:'',//设备图片
id: '',//设备唯一标识
siteId: '',//站点ID
deviceId: '',//设备id
deviceName: '',//设备名称
description: '',//设备描述
communicationStatus: '',//工作状态
deviceType: '',//设备类型
deviceCategory: '',//设备类别
parentId: '',//上级设备id
ipAddress: '',//TCP设备的ip地址
ipPort: "",//TCP端口号
serialPort: '',//串口路径
baudRate: '',//波特率
dataBits: '',//数据位
stopBits: '',//停止位
parity: '',//校验位
pictureUrl: '',//设备图片
slaveId: '',//从站地址
},
rules: {
siteId:[
{ required: true, message: '请选择站点', trigger: ['blur','change']}
siteId: [
{required: true, message: '请选择站点', trigger: ['blur', 'change']}
],
deviceId:[
{ required: true, message: '请输入设备id', trigger: 'blur'},
{ validator: validateDeviceId, trigger: 'blur' }
deviceId: [
{required: true, message: '请输入设备id', trigger: 'blur'},
{validator: validateDeviceId, trigger: 'blur'}
],
deviceName:[
{ required: true, message: '请输入设备名称', trigger: 'blur'},
{ validator: validateText, trigger: 'blur' }
deviceName: [
{required: true, message: '请输入设备名称', trigger: 'blur'},
{validator: validateText, trigger: 'blur'}
],
description:[
{ required: true, message: '请输入设备描述', trigger: 'blur'},
{ validator: validateText, trigger: 'blur' }
description: [
{required: true, message: '请输入设备描述', trigger: 'blur'},
{validator: validateText, trigger: 'blur'}
],
communicationStatus:[
{ required: true, message: '请选择工作状态', trigger: ['blur','change']}
communicationStatus: [
{required: true, message: '请选择工作状态', trigger: ['blur', 'change']}
],
deviceType:[
{ required: true, message: '请选择设备类型', trigger:['blur','change']}
deviceType: [
{required: true, message: '请选择设备类型', trigger: ['blur', 'change']}
],
deviceCategory:[
{ required: true, message: '请选择设备类别', trigger: ['blur','change']}
deviceCategory: [
{required: true, message: '请选择设备类别', trigger: ['blur', 'change']}
],
ipAddress:[
{ validator: validateText, trigger: 'blur' }
ipAddress: [
{validator: validateText, trigger: 'blur'}
],
ipPort:[
{ validator: validateText, trigger: 'blur' }
ipPort: [
{validator: validateText, trigger: 'blur'}
],
serialPort:[
{ validator: validateText, trigger: 'blur' }
slaveId: [
{validator: validateText, trigger: 'blur'}
],
baudRate:[
{ validator: validateText, trigger: 'blur' }
serialPort: [
{validator: validateText, trigger: 'blur'}
],
dataBits:[
{ validator: validateText, trigger: 'blur' }
baudRate: [
{validator: validateText, trigger: 'blur'}
],
stopBits:[
{ validator: validateText, trigger: 'blur' }
dataBits: [
{validator: validateText, trigger: 'blur'}
],
parity:[
{ validator: validateText, trigger: 'blur' }
stopBits: [
{validator: validateText, trigger: 'blur'}
],
parity: [
{validator: validateText, trigger: 'blur'}
],
// pictureUrl:[
// { required: true, message: '请上传图片', trigger: ['blur', 'change']}
@ -191,144 +209,189 @@ export default {
computed: {
...mapState({
communicationStatusOptions: state => state?.ems?.communicationStatusOptions || {},
deviceTypeOptions:state=>state?.ems?.deviceTypeOptions || {}
deviceTypeOptions: state => state?.ems?.deviceTypeOptions || {}
})
},
watch:{
dialogTableVisible:{
handler(newVal){
watch: {
dialogTableVisible: {
handler(newVal) {
//打开弹窗
if(newVal){
if (newVal) {
this.getZdList()
this.getDeviceCategoryList()
}
},
immediate: true,
},
id:{
handler(newVal){
if((newVal || newVal===0) && this.mode !== 'add'){
this.loading+=1
id: {
handler(newVal) {
if ((newVal || newVal === 0) && this.mode !== 'add') {
this.loading += 1
getDeviceDetailInfo(newVal).then(response => {
this.formData = JSON.parse(JSON.stringify(response?.data || {}));
if(this.dccDeviceCategoryList.includes(this.formData.deviceCategory)){
if (this.dccDeviceCategoryList.includes(this.formData.deviceCategory)) {
this.getParentDeviceList(true)
}
}).finally(() => {this.loading-=1})
}).finally(() => {
this.loading -= 1
})
}
},
immediate: true,
}
},
methods: {
changeType(){
if(this.dccDeviceCategoryList.includes(this.formData.deviceCategory)){
changeType() {
if (this.dccDeviceCategoryList.includes(this.formData.deviceCategory)) {
this.getParentDeviceList()
}
},
uploadImage(data){
uploadImage(data) {
this.formData.pictureUrl = data
},
//获取站点列表
getZdList(){
this.loading+=1
getZdList() {
this.loading += 1
getAllSites().then(response => {
this.siteList = response?.data || []
}).finally(() => {this.loading-=1})
}).finally(() => {
this.loading -= 1
})
},
// 获取设备类别
getDeviceCategoryList(){
this.loading+=1
getDeviceCategoryList() {
this.loading += 1
getAllDeviceCategory().then(response => {
this.deviceCategoryList = response?.data || []
}).finally(() => {this.loading-=1})
}).finally(() => {
this.loading -= 1
})
},
//获取上级id列表
getParentDeviceList(init=false){
if(!this.formData.siteId){
return console.log('请先选择站点')
getParentDeviceList(init = false) {
if (!this.formData.siteId) {
return console.log('请先选择站点')
}
!init && (this.formData.parentId='')
this.loading= this.loading+1
getParentDeviceId({siteId:this.formData.siteId,deviceCategory:this.formData.deviceCategory}).then(response => {
!init && (this.formData.parentId = '')
this.loading = this.loading + 1
getParentDeviceId({siteId: this.formData.siteId, deviceCategory: this.formData.deviceCategory}).then(response => {
this.parentDeviceList = JSON.parse(JSON.stringify(response?.data || []));
}).finally(() => {
this.loading=this.loading -1
this.loading = this.loading - 1
})
},
saveDialog() {
this.$refs.addTempForm.validate(valid => {
if (!valid) return
this.loading+=1
this.loading += 1
const {
id='',
siteId='',//站点ID
deviceId='',//设备id
deviceName='',//设备名称
description='',//设备描述
communicationStatus='',//工作状态
deviceType='',//设备类型
deviceCategory='',//设备类别
parentId='',//上级设备id
ipAddress='',//TCP设备的ip地址
ipPort="",//TCP端口号
serialPort='',//串口路径
baudRate='',//波特率
dataBits='',//数据位
stopBits='',//停止位
parity='',//校验位
pictureUrl='',//设备图片
}= this.formData;
if(this.mode === 'add'){
addDevice({siteId,deviceId,deviceName,description,communicationStatus,deviceType,deviceCategory,parentId,ipAddress,ipPort,serialPort,baudRate,dataBits,stopBits,parity,pictureUrl}).then(response => {
if(response.code === 200){
id = '',
siteId = '',//站点ID
deviceId = '',//设备id
deviceName = '',//设备名称
description = '',//设备描述
communicationStatus = '',//工作状态
deviceType = '',//设备类型
deviceCategory = '',//设备类别
parentId = '',//上级设备id
ipAddress = '',//TCP设备的ip地址
ipPort = "",//TCP端口号
serialPort = '',//串口路径
baudRate = '',//波特率
dataBits = '',//数据位
stopBits = '',//停止位
parity = '',//校验位
pictureUrl = '',//设备图片
slaveId = '',//从站地址
} = this.formData;
if (this.mode === 'add') {
addDevice({
siteId,
deviceId,
deviceName,
description,
communicationStatus,
deviceType,
deviceCategory,
parentId,
ipAddress,
ipPort,
serialPort,
baudRate,
dataBits,
stopBits,
parity,
pictureUrl,
slaveId
}).then(response => {
if (response.code === 200) {
//新增成功
// 关闭弹窗 更新表格
this.$emit('update')
this.closeDialog()
}
}).finally(() => {
this.loading-=1
this.loading -= 1
})
}else{
updateDevice({id,siteId,deviceId,deviceName,description,communicationStatus,deviceType,deviceCategory,parentId,ipAddress,ipPort,serialPort,baudRate,dataBits,stopBits,parity,pictureUrl}).then(response => {
if(response.code === 200){
} else {
updateDevice({
id,
siteId,
deviceId,
deviceName,
description,
communicationStatus,
deviceType,
deviceCategory,
parentId,
ipAddress,
ipPort,
serialPort,
baudRate,
dataBits,
stopBits,
parity,
pictureUrl,
slaveId
}).then(response => {
if (response.code === 200) {
//新增成功
// 关闭弹窗 更新表格
this.$emit('update')
this.closeDialog()
}
}).finally(() => {
this.loading-=1
this.loading -= 1
})
}
})
},
closeDialog(){
closeDialog() {
this.$emit('clear')
// 清空所有数据
this.formData= {
id:'',//设备唯一标识
siteId:'',//站点ID
deviceId:'',//设备id
deviceName:'',//设备名称
description:'',//设备描述
communicationStatus:'',//工作状态
deviceType:'',//设备类型
deviceCategory:'',//设备类别
parentId:'',//上级设备id
ipAddress:'',//TCP设备的ip地址
ipPort:"",//TCP端口号
serialPort:'',//串口路径
baudRate:'',//波特率
dataBits:'',//数据位
stopBits:'',//停止位
parity:'',//校验位
pictureUrl:'',//设备图片
this.formData = {
id: '',//设备唯一标识
siteId: '',//站点ID
deviceId: '',//设备id
deviceName: '',//设备名称
description: '',//设备描述
communicationStatus: '',//工作状态
deviceType: '',//设备类型
deviceCategory: '',//设备类别
parentId: '',//上级设备id
ipAddress: '',//TCP设备的ip地址
ipPort: "",//TCP端口号
serialPort: '',//串口路径
baudRate: '',//波特率
dataBits: '',//数据位
stopBits: '',//停止位
parity: '',//校验位
pictureUrl: '',//设备图片
slaveId: '',//从站地址
}
this.$refs.addTempForm.resetFields()
this.dialogTableVisible=false
this.dialogTableVisible = false
}
}
}