fix: 修复产品跳转设备列表,查询显示错误问题
This commit is contained in:
parent
01cf4fb82d
commit
06512ea6ea
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<j-advanced-search
|
<AdvancedSearch
|
||||||
:target='target'
|
:target='target'
|
||||||
:type='type'
|
:type='type'
|
||||||
:request='saveSearchHistory'
|
:request='saveSearchHistory'
|
||||||
|
@ -16,6 +16,7 @@
|
||||||
import { PropType } from 'vue'
|
import { PropType } from 'vue'
|
||||||
import { JColumnsProps } from 'components/Table/types'
|
import { JColumnsProps } from 'components/Table/types'
|
||||||
import { saveSearchHistory, getSearchHistory, deleteSearchHistory } from '@/api/comm'
|
import { saveSearchHistory, getSearchHistory, deleteSearchHistory } from '@/api/comm'
|
||||||
|
import { AdvancedSearch } from 'jetlinks-ui-components'
|
||||||
|
|
||||||
interface Emit {
|
interface Emit {
|
||||||
(e: 'search', data: any): void
|
(e: 'search', data: any): void
|
||||||
|
|
|
@ -81,6 +81,7 @@ watchEffect(() => {
|
||||||
dataIndex: `${i.id}_format`,
|
dataIndex: `${i.id}_format`,
|
||||||
search: {
|
search: {
|
||||||
type: i?.valueType?.type || 'string',
|
type: i?.valueType?.type || 'string',
|
||||||
|
rename: i.id
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -89,7 +89,11 @@
|
||||||
{{ JSON.stringify(value?.formatValue) }}
|
{{ JSON.stringify(value?.formatValue) }}
|
||||||
</div>
|
</div>
|
||||||
<div v-else :class="valueClass">
|
<div v-else :class="valueClass">
|
||||||
{{ String(value?.formatValue) }}
|
<div style='width: 100%;white-space: normal;'>
|
||||||
|
<j-ellipsis>
|
||||||
|
{{ String(value?.formatValue) }}
|
||||||
|
</j-ellipsis>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ValueDetail
|
<ValueDetail
|
||||||
v-if="visible"
|
v-if="visible"
|
||||||
|
|
|
@ -293,7 +293,7 @@ const getProtocol = async () => {
|
||||||
const jumpDevice = () => {
|
const jumpDevice = () => {
|
||||||
// console.log(productStore.current?.id);
|
// console.log(productStore.current?.id);
|
||||||
const searchParams = {
|
const searchParams = {
|
||||||
column: 'productId',
|
column: 'productName',
|
||||||
termType: 'eq',
|
termType: 'eq',
|
||||||
value: productStore.current?.id,
|
value: productStore.current?.id,
|
||||||
};
|
};
|
||||||
|
|
|
@ -168,7 +168,6 @@ const getIsRecord = async () => {
|
||||||
* 开始录像
|
* 开始录像
|
||||||
*/
|
*/
|
||||||
const recordStart = async ({ key }: { key: string}) => {
|
const recordStart = async ({ key }: { key: string}) => {
|
||||||
console.log(key)
|
|
||||||
showToolLock.value = false
|
showToolLock.value = false
|
||||||
showTool.value = false
|
showTool.value = false
|
||||||
isRecord.value = 1;
|
isRecord.value = 1;
|
||||||
|
|
Loading…
Reference in New Issue