0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#10750

This commit is contained in:
XieYongHong 2023-07-11 15:53:01 +08:00
parent bd34de8642
commit 4f3099cc50
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/Log/Access/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<pro-search :columns="columns" target="search" @search="handleSearch" />
<pro-search :columns="columns" target="search-access" @search="handleSearch" />
<j-pro-table
ref="tableRef"
model="TABLE"

2
src/views/Log/System/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<pro-search :columns="columns" target="search" @search="handleSearch" />
<pro-search :columns="columns" target="search-system" @search="handleSearch" />
<j-pro-table
ref="tableRef"
model="TABLE"

2
src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
View File

@ -5,7 +5,7 @@
</template>
<script lang="ts" setup>
import TabComponent from '@/views/rule-engine/Alarm/Log/TabComponent/indev.vue'
import TabComponent from '@/views/rule-engine/Alarm/Log/TabComponent/index.vue'
import { useRoute } from 'vue-router';
const route = useRoute();
const id = route.query?.id

10
src/views/rule-engine/Alarm/Log/TabComponent/indev.vue → src/views/rule-engine/Alarm/Log/TabComponent/index.vue
View File

@ -2,25 +2,25 @@
<div class="alarm-log-card">
<pro-search
:columns="columns"
target="alarm-log"
:target="`alarm-log-${props.type}`"
v-if="['all', 'detail'].includes(props.type)"
@search="search"
/>
<pro-search
:columns="produtCol"
target="alarm-log"
:target="`alarm-log-${props.type}`"
v-if="['product', 'other'].includes(props.type)"
@search="search"
/>
<pro-search
:columns="deviceCol"
target="alarm-log"
target="alarm-log-device"
v-if="props.type === 'device'"
@search="search"
/>
<pro-search
:columns="orgCol"
target="alarm-log"
target="alarm-log-org"
v-if="props.type === 'org'"
@search="search"
/>
@ -257,7 +257,7 @@ const deviceCol = [
key: 'targetName',
search: {
type: 'select',
opstions: async () => {
options: async () => {
const res = await getDeviceList();
if (res.status === 200) {
return res.result.map((item: any) => ({

2
src/views/rule-engine/Alarm/Log/index.vue
View File

@ -10,7 +10,7 @@ import { useAlarmStore } from '@/store/alarm';
import { storeToRefs } from 'pinia';
import { queryLevel } from '@/api/rule-engine/config';
import { Store } from 'jetlinks-store';
import TableComponents from './TabComponent/indev.vue';
import TableComponents from './TabComponent/index.vue';
const list = [
{
key: 'all',

4
src/views/system/Department/device/index.vue
View File

@ -274,10 +274,10 @@ const columns = [
search: {
rename: 'productId$product-info',
type: 'select',
handleValue(value: string) {
handleValue(value: string, data: any) {
return value && value.length ? [{
column: 'id',
termType: 'in',
termType: data.termType === 'not' ? 'nin' : 'in',
value: `${value.toString()}`
}] : undefined;
},

4
yarn.lock
View File

@ -3837,8 +3837,8 @@ jetlinks-ui-components@^1.0.23:
jetlinks-ui-components@^1.0.24:
version "1.0.24"
resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#0be30b811e9a31e6089b2c970110d32117b23f3c"
integrity sha512-XZ8hhozMh5vFLWVWswHjE3rknDJK+PyYJt8GaVOI86LY5RDl/tnbasgXCZHtyWjPJvJFSWiqqblHUJvJKSUVtQ==
resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#a8ee3d4a76f6545920810a0bd1d76cda8143713b"
integrity sha512-W9CNHLJTrTko/T522J0S6AHbCT2xHwljPXBsWkHCZ+LsB6vQtb4tT7CMKVMJvki2IlzjoynebXE7uzV/0LfV/A==
dependencies:
"@vueuse/core" "^9.12.0"
"@vueuse/router" "^9.13.0"