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

feat: 去掉获取状态；金属通道类型改为4个

master
wally 4 years ago
parent
473c4693da
commit
3f6e1bc8ee
3 changed files with 68 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/apis/index.js
  2. 7
      src/components/device-select-and-status.vue
  3. 81
      src/views/function-config.vue

4
src/apis/index.js
View File

@ -23,10 +23,10 @@ export const getMonthsDate = params => http.get(`${corrosion}/statistics/months`
export const getRealtimeData = params => http.get(`${corrosion}/statistics/realtime`, { params }); export const getRealtimeData = params => http.get(`${corrosion}/statistics/realtime`, { params });
// 获取网络配置参数 // 获取网络配置参数
export const getConfigNetwork = () => http.get(`${corrosion}/config/network`); export const getConfigNetwork = params => http.get(`${corrosion}/config/network`, { params });
// 获取功能配置参数 // 获取功能配置参数
export const getConfigFunction = () => http.get(`${corrosion}/config/function`); export const getConfigFunction = params => http.get(`${corrosion}/config/function`, { params });
// 提交网络配置参数 // 提交网络配置参数
export const createConfigNetwork = data => http.post(`${corrosion}/config/network`, data); export const createConfigNetwork = data => http.post(`${corrosion}/config/network`, data);

7
src/components/device-select-and-status.vue
View File

@ -10,14 +10,13 @@ const store = useStore();
const devices = computed(() => store.state.device.devices); // 设备/站点列表 const devices = computed(() => store.state.device.devices); // 设备/站点列表
const deviceId = ref(''); // 选中的设备id const deviceId = ref(''); // 选中的设备id
const currentDeviceId = computed(() => store.state.device.currentDeviceId); // 正在操作的设备的id const currentDeviceId = computed(() => store.state.device.currentDeviceId); // 正在操作的设备的id
const get = computed(() => (props.status.get ? '设置生效' : '等待下发')); // const get = computed(() => (props.status.get ? '设置生效' : '等待下发'));
const set = computed(() => (props.status.set ? '设置生效' : '等待下发')); const set = computed(() => (props.status.set ? '设置生效' : '等待下发'));
// 监听currentDeviceId // 监听currentDeviceId
watch( watch(
() => currentDeviceId.value, () => currentDeviceId.value,
newValue => { newValue => {
console.log('newValue: ', newValue);
if (newValue && deviceId.value !== newValue) { if (newValue && deviceId.value !== newValue) {
deviceId.value = newValue; deviceId.value = newValue;
} }
@ -33,8 +32,8 @@ watch(
<el-option v-for="item in devices" :key="item.deviceId" :label="item.address" :value="item.deviceId"></el-option> <el-option v-for="item in devices" :key="item.deviceId" :label="item.address" :value="item.deviceId"></el-option>
</el-select> </el-select>
<span class="text-sm text-gray-500 ml-10">获取状态：</span> <!-- <span class="text-sm text-gray-500 ml-10">获取状态：</span>
<el-tag type="success">{{ get }}</el-tag> <el-tag type="success">{{ get }}</el-tag>-->
<span class="text-sm text-gray-500 ml-10">设置状态：</span> <span class="text-sm text-gray-500 ml-10">设置状态：</span>
<el-tag type="success">{{ set }}</el-tag> <el-tag type="success">{{ set }}</el-tag>

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

@ -1,4 +1,7 @@
<template> <template>
<!-- 设置站点选择 和 设备下发状态 -->
<DeviceSelectAndSelect @search="onSearch" :status="data.status" />
<el-form label-position="top" :model="data" ref="functionForm"> <el-form label-position="top" :model="data" ref="functionForm">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@ -81,22 +84,45 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设置安全模式" prop="securityMode"> <el-form-item label="选择金属通道1类型" prop="securityMode">
<!-- <el-input v-model="data.securityMode"></el-input> --> <el-select v-model="data.corrosiveType1" placeholder="选择金属腐蚀类型">
<el-radio v-model="data.securityMode" :label="0">不加密</el-radio> <el-option v-for="type in types" :key="type.value" :label="type.type" :value="type.value"></el-option>
<el-radio v-model="data.securityMode" :label="1">加密</el-radio> </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<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-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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设置金属腐蚀类型" prop="corrosiveType"> <el-form-item label="选择金属通道4类型" prop="corrosiveType">
<!-- <el-input v-model="data.corrosiveType"></el-input> --> <el-select v-model="data.corrosiveType4" placeholder="选择金属腐蚀类型">
<el-select v-model="data.corrosiveType" placeholder="选择金属腐蚀类型">
<el-option v-for="type in types" :key="type.value" :label="type.type" :value="type.value"></el-option> <el-option v-for="type in types" :key="type.value" :label="type.type" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="设置安全模式" prop="securityMode">
<!-- <el-input v-model="data.securityMode"></el-input> -->
<el-radio v-model="data.securityMode" :label="0">不加密</el-radio>
<el-radio v-model="data.securityMode" :label="1">加密</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设置上报时间" prop="report.type" style="margin-bottom: 0 !important"> <el-form-item label="设置上报时间" prop="report.type" style="margin-bottom: 0 !important">
@ -131,13 +157,19 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<!-- 刷新下发按钮 -->
<Refresh @refresh="onSearch(currentDeviceId, 1)" />
</template> </template>
<script setup> <script setup>
import { ref } from 'vue'; import { computed, ref } from 'vue';
import { useStore } from 'vuex';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { cloneDeep, isDate } from 'lodash'; import { cloneDeep, isDate } from 'lodash';
import { getConfigFunction, createConfigFunction } from 'apis/index'; import { getConfigFunction, createConfigFunction } from 'apis/index';
import DeviceSelectAndSelect from 'components/device-select-and-status.vue';
import Refresh from 'components/refresh.vue';
const data = ref({ const data = ref({
frequency: { frequency: {
@ -155,23 +187,29 @@ const data = ref({
temperatureLow: 0, // 温度低阈值 temperatureLow: 0, // 温度低阈值
temperatureHigh: 0, // 温度高阈值 temperatureHigh: 0, // 温度高阈值
securityMode: 0, // 安全模式 0->不加密 1->加密 securityMode: 0, // 安全模式 0->不加密 1->加密
corrosiveType: '', // 金属腐蚀类型 corrosiveType1: '', // 金属腐蚀类型
corrosiveType2: '', // 金属腐蚀类型
corrosiveType3: '', // 金属腐蚀类型
corrosiveType4: '', // 金属腐蚀类型
report: { report: {
type: 0, // 上报周期类型 0->时间点 1->周期 type: 0, // 上报周期类型 0->时间点 1->周期
timePoints: [0, 0, 0, 0, 0, 0], // 设置时间点 timePoints: [0, 0, 0, 0, 0, 0], // 设置时间点
cycle: 0, // 上报周期分钟数 cycle: 0, // 上报周期分钟数
}, },
status: { get: 0, set: 0 },
}); });
// 金属腐蚀的类型 // 金属腐蚀的类型
const types = ref([ const types = ref([
{ value: 0, type: '金属腐蚀通道 1 类型' }, { value: 0, type: '锌' },
{ value: 1, type: '金属腐蚀通道 2 类型' }, { value: 1, type: '铝' },
{ value: 2, type: '金属腐蚀通道 3 类型' }, { value: 2, type: '铜' },
{ value: 3, type: '金属腐蚀通道 4 类型' }, { value: 3, type: '钢' },
]); ]);
const functionForm = ref(null); // form const functionForm = ref(null); // form
const store = useStore();
const currentDeviceId = computed(() => store.state.device.currentDeviceId);
/** /**
* 格式化时间 * 格式化时间
@ -186,7 +224,7 @@ const formatTime = date => {
const onSubmit = () => { const onSubmit = () => {
functionForm.value.validate(async () => { functionForm.value.validate(async () => {
try { try {
const param = cloneDeep({ ...data.value }); const param = cloneDeep({ ...data.value, deviceId: currentDeviceId.value });
if (param.report.type === 0) { if (param.report.type === 0) {
// 按时间点上报 格式化时间格式 // 按时间点上报 格式化时间格式
const points = [...param.report.timePoints]; const points = [...param.report.timePoints];
@ -211,8 +249,15 @@ const onReset = () => {
functionForm.value.resetFields(); functionForm.value.resetFields();
}; };
// 获取功能参数 /**
getConfigFunction().then(res => { * 查询网络参数配置
data.value = res; * @param {string} deviceId 设备id
}); * @param {number} type 0数据库查询 1刷新查询
*/
const onSearch = async (deviceId, type = 0) => {
const params = { deviceId, type };
store.commit('device/setCurrentDeviceId', deviceId);
const resData = await getConfigFunction(params);
data.value = resData;
};
</script> </script>

Write Preview
Loading…
Cancel
Save