|
|
|
@ -489,11 +489,14 @@ export default { |
|
|
|
</el-pagination> |
|
|
|
|
|
|
|
<!-- 新增数据dialog--> |
|
|
|
<el-dialog :title="!editFlag?'新增':'编辑'" :visible.sync="modalFlag" width="620px" |
|
|
|
:close-on-click-modal="false" :close-on-press-escape="false"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-dialog :title="!editFlag?'新增':'编辑'" :visible.sync="modalFlag" width="900px" |
|
|
|
:close-on-click-modal="false" :close-on-press-escape="false" class="device-edit-dialog"> |
|
|
|
<div class="dialog-content"> |
|
|
|
<div class="form-section"> |
|
|
|
<div class="section-title">基础信息</div> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" class="section-form"> |
|
|
|
<el-form-item label="BU" prop="bu"> |
|
|
|
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="editFlag" style="width: 221px"> |
|
|
|
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="editFlag || viewFlag" style="width: 221px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in userBuList" |
|
|
|
:key = "i.buNo" |
|
|
|
@ -507,24 +510,25 @@ export default { |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="设备编码"> |
|
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(200)" v-if="!editFlag"><a>设备编码</a></span> |
|
|
|
<el-input v-model="modalData.equipmentNo" disabled style="width: 100px"></el-input> |
|
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(200)" v-if="!editFlag && !viewFlag"><a>设备编码</a></span> |
|
|
|
<el-input v-model="modalData.equipmentNo" disabled style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="设备名称"> |
|
|
|
<el-input v-model="modalData.equipmentDesc" disabled style="width: 221px"></el-input> |
|
|
|
<el-input v-model="modalData.equipmentDesc" disabled style="width: 280px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
</div> |
|
|
|
<div class="form-section"> |
|
|
|
<div class="section-title">采集参数</div> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" class="section-form"> |
|
|
|
<el-form-item label="IP"> |
|
|
|
<el-input v-model="modalData.ip" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="端口"> |
|
|
|
<el-input v-model="modalData.port" style="width: 100px"></el-input> |
|
|
|
<el-input v-model="modalData.port" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="采集方式"> |
|
|
|
<!-- <el-input v-model="modalData.suffix" disabled style="width: 104px"></el-input>--> |
|
|
|
<!-- suffixList--> |
|
|
|
<el-select v-model="modalData.suffix" placeholder="请选择" style="width: 104px"> |
|
|
|
<el-select v-model="modalData.suffix" placeholder="请选择" style="width: 120px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in suffixList" |
|
|
|
:key = "i" |
|
|
|
@ -534,39 +538,44 @@ export default { |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="采集批次时间"> |
|
|
|
<el-input v-model="modalData.batchDate" style="width: 104px"></el-input> |
|
|
|
<el-input v-model="modalData.batchDate" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="采集ID"> |
|
|
|
<el-input v-model="modalData.fileNo" style="width: 104px"></el-input> |
|
|
|
<el-input v-model="modalData.fileNo" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="文件解析路径"> |
|
|
|
<!-- <span style="cursor: pointer" slot="label" @click="selectServerFolder()"><a>文件解析路径</a></span>--> |
|
|
|
<el-input v-model="modalData.folderPath" style="width: 570px"></el-input> |
|
|
|
</div> |
|
|
|
<div class="form-section"> |
|
|
|
<div class="section-title">路径配置</div> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" class="section-form"> |
|
|
|
<el-form-item label="文件解析路径" class="full-width-item"> |
|
|
|
<el-input v-model="modalData.folderPath"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="文件备份路径"> |
|
|
|
<el-input v-model="modalData.backupFolderPath" style="width: 570px"></el-input> |
|
|
|
<el-form-item label="文件备份路径" class="full-width-item"> |
|
|
|
<el-input v-model="modalData.backupFolderPath"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="图片备份路径"> |
|
|
|
<el-input v-model="modalData.backupPhotoPath" style="width: 570px"></el-input> |
|
|
|
<el-form-item label="图片备份路径" class="full-width-item"> |
|
|
|
<el-input v-model="modalData.backupPhotoPath"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
</div> |
|
|
|
<div class="form-section"> |
|
|
|
<div class="section-title">设备配置</div> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" class="section-form"> |
|
|
|
<el-form-item label="寄存器地址"> |
|
|
|
<el-input v-model="modalData.registerAddress" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.registerAddress" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="寄存器位数"> |
|
|
|
<el-input v-model="modalData.registerNum" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.registerNum" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="设备报警声音标识"> |
|
|
|
<el-select v-model="modalData.buzzer" style="width: 133px"> |
|
|
|
<el-select v-model="modalData.buzzer" style="width: 180px"> |
|
|
|
<el-option value="1" label="Y"></el-option> |
|
|
|
<el-option value="0" label="N"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="设备类型"> |
|
|
|
<el-select v-model="modalData.repairType" style="width: 133px"> |
|
|
|
<el-select v-model="modalData.repairType" style="width: 180px"> |
|
|
|
<el-option value="短信" label="短信"></el-option> |
|
|
|
<el-option value="邮件" label="邮件"></el-option> |
|
|
|
<el-option value="随身机" label="随身机"></el-option> |
|
|
|
@ -574,72 +583,76 @@ export default { |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
</div> |
|
|
|
<div class="form-section"> |
|
|
|
<div class="section-title">寄存器映射</div> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" class="section-form"> |
|
|
|
<el-form-item label="寄存器数量类型"> |
|
|
|
<el-input v-model="modalData.registerNumColumntype" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.registerNumColumntype" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="寄存器地址类型"> |
|
|
|
<el-input v-model="modalData.registerAddressInspection" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.registerAddressInspection" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="寄存器读取开始位"> |
|
|
|
<el-input v-model="modalData.registerNumInspection" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.registerNumInspection" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="寄存器检验单号类型"> |
|
|
|
<el-input v-model="modalData.registerNumInspectionColumntype" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.registerNumInspectionColumntype" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
</div> |
|
|
|
<div class="form-section"> |
|
|
|
<div class="section-title">文件解析参数</div> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" class="section-form"> |
|
|
|
<el-form-item label="单位数量"> |
|
|
|
<el-input v-model="modalData.unitId" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.unitId" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="文件类型读取行特殊标识"> |
|
|
|
<el-input v-model="modalData.excelCompareFieldsX" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.excelCompareFieldsX" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="文件读取列位数"> |
|
|
|
<el-input v-model="modalData.excelCompareFieldsY" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.excelCompareFieldsY" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="文件从多少行开始读取"> |
|
|
|
<el-input v-model="modalData.initialLine" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.initialLine" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="文件读取行数"> |
|
|
|
<el-input v-model="modalData.dataRow" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.dataRow" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="文件读取跳过行数"> |
|
|
|
<el-input v-model="modalData.skipLine" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.skipLine" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="数据分割标识"> |
|
|
|
<el-input v-model="modalData.cuttingSymbol" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.cuttingSymbol" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="设备直连标识"> |
|
|
|
<el-select v-model="modalData.transparentFlag" style="width: 133px"> |
|
|
|
<el-select v-model="modalData.transparentFlag" style="width: 180px"> |
|
|
|
<el-option value="Y" label="Y"></el-option> |
|
|
|
<el-option value="N" label="N"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :disabled="viewFlag" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="采集是否参与公式计算"> |
|
|
|
<el-select v-model="modalData.formulaCalculation" style="width: 133px"> |
|
|
|
<el-select v-model="modalData.formulaCalculation" style="width: 180px"> |
|
|
|
<el-option value="Y" label="Y"></el-option> |
|
|
|
<el-option value="N" label="N"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="公式计算函数"> |
|
|
|
<el-input v-model="modalData.formula" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.formula" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="采集数据是否需要分组"> |
|
|
|
<el-select v-model="modalData.groupCalculation" style="width: 133px"> |
|
|
|
<el-select v-model="modalData.groupCalculation" style="width: 180px"> |
|
|
|
<el-option value="Y" label="Y"></el-option> |
|
|
|
<el-option value="N" label="N"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="正则表达式"> |
|
|
|
<el-input v-model="modalData.regexp" style="width: 133px"></el-input> |
|
|
|
<el-input v-model="modalData.regexp" style="width: 180px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<el-footer style="height:35px;margin-top: 15px;text-align:center"> |
|
|
|
<el-button type="primary" @click="saveModalData()" v-if="!viewFlag">保 存</el-button> |
|
|
|
<el-button @click="modalFlag = false">取 消</el-button> |
|
|
|
</el-footer> |
|
|
|
@ -655,5 +668,81 @@ export default { |
|
|
|
</template> |
|
|
|
|
|
|
|
<style scoped> |
|
|
|
.device-edit-dialog .dialog-content { |
|
|
|
padding: 8px; |
|
|
|
max-height: 70vh; |
|
|
|
overflow-y: auto; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .form-section { |
|
|
|
margin-bottom: 12px; |
|
|
|
padding: 10px 12px 6px; |
|
|
|
border-radius: 4px; |
|
|
|
border-left: 2px solid #17b3a3; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .section-title { |
|
|
|
font-size: 13px; |
|
|
|
font-weight: 600; |
|
|
|
color: #303133; |
|
|
|
margin-bottom: 6px; |
|
|
|
padding-bottom: 4px; |
|
|
|
border-bottom: 1px solid #e4e7ed; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .section-form { |
|
|
|
margin-left: 0; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .el-form-item { |
|
|
|
margin-bottom: 8px; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .el-form-item__label { |
|
|
|
font-size: 12px; |
|
|
|
font-weight: 500; |
|
|
|
color: #606266; |
|
|
|
line-height: 1.2; |
|
|
|
padding-bottom: 4px; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .el-input__inner, |
|
|
|
.device-edit-dialog .el-select .el-input__inner { |
|
|
|
height: 32px; |
|
|
|
line-height: 32px; |
|
|
|
border-radius: 4px; |
|
|
|
font-size: 12px; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .full-width-item { |
|
|
|
width: 100%; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .full-width-item /deep/ .el-form-item__content { |
|
|
|
width: 100%; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .dialog-footer { |
|
|
|
height: 35px; |
|
|
|
margin-top: 15px; |
|
|
|
text-align: center; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .dialog-content::-webkit-scrollbar { |
|
|
|
width: 6px; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .dialog-content::-webkit-scrollbar-track { |
|
|
|
background: #f1f1f1; |
|
|
|
border-radius: 3px; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .dialog-content::-webkit-scrollbar-thumb { |
|
|
|
background: #c0c4cc; |
|
|
|
border-radius: 3px; |
|
|
|
} |
|
|
|
|
|
|
|
.device-edit-dialog .dialog-content::-webkit-scrollbar-thumb:hover { |
|
|
|
background: #909399; |
|
|
|
} |
|
|
|
</style> |