ccsens_tall
/
tall4-pc
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of dd.tall.wiki:ccsens_fe/corrosion

master
song 4 years ago
parent
c78090da56 dc13a4f663
commit
9a917624c6
3 changed files with 48 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      src/views/device-create.vue
  2. 43
      src/views/function-config.vue
  3. 33
      src/views/network-config.vue

54
src/views/device-create.vue
View File

@ -1,116 +1,100 @@
<template>
<el-form label-position="top" :model="data" ref="deviceCreate">
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设备ID号" prop="deviceId">
<el-input v-model="data.deviceId"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设备完整ID" prop="deviceFullId">
<el-input v-model="data.deviceFullId"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="地区" prop="area">
<el-input v-model="data.area"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="安装地点名称" prop="address">
<el-input v-model="data.address"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="联系人" prop="contact">
<el-input v-model="data.contact"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="电话" prop="phone">
<el-input v-model="data.phone"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="经度" prop="lon">
<el-input v-model="data.lon"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="纬度" prop="lat">
<el-input v-model="data.lat"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="负责人" prop="head">
<el-input v-model="data.head"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="安装位置" prop="installLocation">
<el-input v-model="data.installLocation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="安装时间" prop="installTime">
<el-input v-model="data.installTime"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="正式运行时间" prop="runTime">
<el-input v-model="data.runTime"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="链路地址" prop="linkAddress">
<el-input v-model="data.linkAddress"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="探头编号" prop="probNo">
<el-input v-model="data.probNo"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="试样" prop="simple">
<el-input v-model="data.simple"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="sim卡1" prop="sim1">
<el-input v-model="data.sim1"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设备朝向" prop="deviceDirection">
<el-input v-model="data.deviceDirection"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="与主站后台联调情况" prop="joint">
<el-input v-model="data.joint"></el-input>
</el-form-item>
@ -118,7 +102,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="备注" prop="remark">
<el-input v-model="data.remark" type="textarea"></el-input>
</el-form-item>

43
src/views/function-config.vue
View File

@ -4,78 +4,68 @@
<el-form label-position="top" :model="data" ref="functionForm">
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置金属腐蚀采样频率(分钟)" prop="frequency.metal">
<el-input-number :min="0" v-model="data.frequency.metal" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置温湿度采样频率(分钟)" prop="frequency.th">
<el-input-number :min="0" v-model="data.frequency.th" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置SO2采样频率(分钟)" prop="frequency.so2">
<el-input-number :min="0" v-model="data.frequency.so2" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置盐雾采样频率(分钟)" prop="frequency.salt">
<el-input-number :min="0" v-model="data.frequency.salt" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置时间" prop="time">
<!-- <el-input v-model="data.time"></el-input> -->
<el-date-picker v-model="data.time" type="datetime" placeholder="设置时间"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置金属腐蚀采集个数" prop="count">
<el-input-number :min="0" v-model="data.count" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置电池电压低阈值" prop="batteryLow">
<el-input-number :min="0" v-model="data.batteryLow" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置电池电压高阈值" prop="batteryHigh">
<el-input-number :min="0" v-model="data.batteryHigh" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置太阳能电压高阈值" prop="sunHigh">
<el-input-number :min="0" v-model="data.sunHigh" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置湿度高阈值" prop="humidityHigh">
<el-input-number :min="0" v-model="data.humidityHigh" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置温度低阈值" prop="temperatureLow">
<el-input-number :min="0" v-model="data.temperatureLow" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="设置温度高阈值" prop="temperatureHigh">
<el-input-number :min="0" v-model="data.temperatureHigh" />
</el-form-item>
@ -83,28 +73,28 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="选择金属通道1类型" prop="securityMode">
<el-select v-model="data.corrosiveType1" placeholder="选择金属腐蚀类型">
<el-option v-for="type in types" :key="type.value" :label="type.type" :value="type.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="选择金属通道2类型" prop="corrosiveType">
<el-select v-model="data.corrosiveType2" placeholder="选择金属腐蚀类型">
<el-option v-for="type in types" :key="type.value" :label="type.type" :value="type.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="选择金属通道3类型" prop="securityMode">
<el-select v-model="data.corrosiveType3" placeholder="选择金属腐蚀类型">
<el-option v-for="type in types" :key="type.value" :label="type.type" :value="type.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="选择金属通道4类型" prop="corrosiveType">
<el-select v-model="data.corrosiveType4" placeholder="选择金属腐蚀类型">
<el-option v-for="type in types" :key="type.value" :label="type.type" :value="type.value"></el-option>
@ -225,6 +215,7 @@ const onSubmit = () => {
functionForm.value.validate(async () => {
try {
const param = cloneDeep({ ...data.value, deviceId: currentDeviceId.value });
param.time = new Date(param.time).getTime();
if (param.report.type === 0) {
// 按时间点上报 格式化时间格式
const points = [...param.report.timePoints];

33
src/views/network-config.vue
View File

@ -4,71 +4,62 @@
<el-form label-position="top" :model="data" ref="networkForm">
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="上报IP1地址" prop="ip1">
<el-input v-model="data.ip1"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="上报端口号1" prop="port1">
<el-input v-model="data.port1"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="上报IP2地址" prop="ip2">
<el-input v-model="data.ip2"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="上报端口号2" prop="port2">
<el-input v-model="data.port2"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="上报IP3地址" prop="ip3">
<el-input v-model="data.ip3"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="上报端口号3" prop="port3">
<el-input v-model="data.port3"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="备用ip地址" prop="ipBackup">
<el-input v-model="data.ipBackup"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="备用端口号" prop="portBackup">
<el-input v-model="data.portBackup"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="用户名" prop="account">
<el-input v-model="data.account"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="密码" prop="password">
<el-input v-model="data.password"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :xs="24" :md="12" :lg="8" :xl="6">
<el-form-item label="APN" prop="apn">
<el-input v-model="data.apn"></el-input>
</el-form-item>

Write Preview
Loading…
Cancel
Save