fast(断路器): 增加日志反选功能、添加断路器“实时采集(1次/分钟)”功能预设,打包
This commit is contained in:
parent
3af303b605
commit
1d67888b56
|
@ -34,10 +34,10 @@
|
||||||
<el-form-item label="网关" prop="gateway" required>
|
<el-form-item label="网关" prop="gateway" required>
|
||||||
<el-input v-model="gatewayForm.gateway" autocomplete="off" type="text" />
|
<el-input v-model="gatewayForm.gateway" autocomplete="off" type="text" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="上行主题" prop="subscribeTopic" required>
|
<el-form-item label="订阅主题" prop="subscribeTopic" required>
|
||||||
<el-input v-model="gatewayForm.subscribeTopic" autocomplete="off" type="text" />
|
<el-input v-model="gatewayForm.subscribeTopic" autocomplete="off" type="text" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="下行主题" prop="publishTopic" required>
|
<el-form-item label="发布主题" prop="publishTopic" required>
|
||||||
<el-input v-model="gatewayForm.publishTopic" autocomplete="off" type="text" />
|
<el-input v-model="gatewayForm.publishTopic" autocomplete="off" type="text" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="btn-box">
|
<el-form-item class="btn-box">
|
||||||
|
@ -210,7 +210,19 @@
|
||||||
<div class="log-box-title">
|
<div class="log-box-title">
|
||||||
<div>日志</div>
|
<div>日志</div>
|
||||||
<div class="log-box-search">
|
<div class="log-box-search">
|
||||||
<el-input v-model="logSearch" placeholder="请输入搜索日志" clearable style="max-width: 200px" />
|
<el-input v-model="logSearch" placeholder="请输入搜索日志" clearable style="max-width: 200px" >
|
||||||
|
<template #prepend>
|
||||||
|
<el-tooltip
|
||||||
|
class="box-item"
|
||||||
|
effect="dark"
|
||||||
|
:content="searchLogReverseStatus?'关闭反向搜索':'开启反向搜索'"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<el-button @click="toggleSearchLogReverseStatus"><el-icon :color="searchLogReverseStatus?'#0066cc':'#909399'"><Sort /></el-icon></el-button>
|
||||||
|
</el-tooltip>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
</el-input>
|
||||||
<el-select v-model="logType" multiple collapse-tags placeholder="Select" style="margin-left: 10px; width: 150px">
|
<el-select v-model="logType" multiple collapse-tags placeholder="Select" style="margin-left: 10px; width: 150px">
|
||||||
<el-option v-for="item in logTypeList" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in logTypeList" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
|
@ -303,6 +315,7 @@ const logList = ref([]);
|
||||||
const logSearch = ref('');
|
const logSearch = ref('');
|
||||||
const logItemWidth = ref('auto');
|
const logItemWidth = ref('auto');
|
||||||
const logType = ref(['subscribe', 'publish', 'system', '']);
|
const logType = ref(['subscribe', 'publish', 'system', '']);
|
||||||
|
const searchLogReverseStatus = ref(false);
|
||||||
// 设备属性
|
// 设备属性
|
||||||
const logTypeList = [
|
const logTypeList = [
|
||||||
{
|
{
|
||||||
|
@ -330,6 +343,10 @@ const updateLogItemWidth = () => {
|
||||||
logItemWidth.value = window.innerWidth - 180 - 80 + 'px';
|
logItemWidth.value = window.innerWidth - 180 - 80 + 'px';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const toggleSearchLogReverseStatus = () => {
|
||||||
|
searchLogReverseStatus.value = !searchLogReverseStatus.value;
|
||||||
|
}
|
||||||
|
|
||||||
const getGuid = () => {
|
const getGuid = () => {
|
||||||
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
||||||
var r = (Math.random() * 16) | 0,
|
var r = (Math.random() * 16) | 0,
|
||||||
|
@ -559,16 +576,24 @@ const functionList = [
|
||||||
data: '00000001',
|
data: '00000001',
|
||||||
disabled: true
|
disabled: true
|
||||||
},
|
},
|
||||||
|
// {
|
||||||
|
// id: 3,
|
||||||
|
// name: '实时采集',
|
||||||
|
// addr: '62000',
|
||||||
|
// len: '2',
|
||||||
|
// data: '',
|
||||||
|
// disabled: true
|
||||||
|
// },
|
||||||
{
|
{
|
||||||
id: 3,
|
id: 4,
|
||||||
name: '实时采集',
|
name: '实时采集(1次/分钟)',
|
||||||
addr: '62000',
|
addr: '62000',
|
||||||
len: '2',
|
len: '2',
|
||||||
data: '',
|
data: '000927C00000EA60',
|
||||||
disabled: true
|
disabled: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 4,
|
id: 5,
|
||||||
name: '自定义',
|
name: '自定义',
|
||||||
addr: '',
|
addr: '',
|
||||||
len: '',
|
len: '',
|
||||||
|
@ -1074,7 +1099,13 @@ const searchLogList = computed(() => {
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
return logList.value.filter(item => {
|
return logList.value.filter(item => {
|
||||||
|
if (searchLogReverseStatus.value) {
|
||||||
|
// 反向选择:筛选出不匹配的项
|
||||||
|
return !(JSON.stringify(item.msg).includes(logSearch.value) || logType.value.indexOf(item.type) === -1);
|
||||||
|
} else {
|
||||||
|
// 正常选择:筛选出匹配的项
|
||||||
return JSON.stringify(item.msg).includes(logSearch.value) && logType.value.indexOf(item.type) !== -1;
|
return JSON.stringify(item.msg).includes(logSearch.value) && logType.value.indexOf(item.type) !== -1;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue