fix: 修改bug
This commit is contained in:
100011797
parent
560de3c4dd
commit
41daa5ea2a
|
|
@ -58,7 +58,7 @@ const tab = [
|
|||
},
|
||||
{
|
||||
key: 'system-monitor',
|
||||
tab: '系统运维',
|
||||
tab: '系统监控',
|
||||
type: ['system-event'],
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div>
|
||||
<div style="padding-right: 20px">
|
||||
<j-tabs
|
||||
tab-position="left"
|
||||
v-if="tabs.length"
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ const onBind = () => {
|
|||
|
||||
const onSave = () => {
|
||||
editInfoVisible.value = false;
|
||||
user.getUserInfo();
|
||||
emit('save', props.current);
|
||||
emit('close');
|
||||
};
|
||||
|
|
|
|||
|
|
@ -226,8 +226,8 @@ const onDetail = (dt: any) => {
|
|||
_visible.value = true
|
||||
};
|
||||
|
||||
const onSave = () => {
|
||||
|
||||
const onSave = (dt: any) => {
|
||||
onSubscribe(dt);
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,14 +20,19 @@
|
|||
>
|
||||
<template #headerCell="{ column }">
|
||||
<template v-if="column.dataIndex === 'original'">
|
||||
<span>
|
||||
目标属性<j-tooltip title="协议包中物模型下的属性">
|
||||
<AIcon
|
||||
style="margin-left: 10px"
|
||||
type="QuestionCircleOutlined"
|
||||
/>
|
||||
</j-tooltip>
|
||||
</span>
|
||||
<div style="width: 100%; display: flex; justify-content: space-between; align-items: center;">
|
||||
<span>
|
||||
目标属性<j-tooltip
|
||||
title="协议包中物模型下的属性"
|
||||
>
|
||||
<AIcon
|
||||
style="margin-left: 10px"
|
||||
type="QuestionCircleOutlined"
|
||||
/>
|
||||
</j-tooltip>
|
||||
</span>
|
||||
<!-- <AIcon type="FilterOutlined" /> -->
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
<template #bodyCell="{ column, text, record }">
|
||||
|
|
@ -120,6 +125,29 @@ const columns = [
|
|||
compare: (a, b) =>
|
||||
(a.original?.length || 0) - (b.original?.length || 0),
|
||||
},
|
||||
// filters: [
|
||||
// {
|
||||
// text: '置顶已映射数据',
|
||||
// value: true,
|
||||
// },
|
||||
// {
|
||||
// text: '置顶未映射数据',
|
||||
// value: false,
|
||||
// },
|
||||
// ],
|
||||
// filterMultiple: false,
|
||||
// onFilter: (value: string) => {
|
||||
// const _dataSource = cloneDeep(dataSource.value).sort((a: any, b: any) => {
|
||||
// if(!value) {
|
||||
// return (a.original ? 1 : -1) - (b.original ? 1 : -1)
|
||||
// } else {
|
||||
// return (b.original ? 1 : -1) - (a.original ? 1 : -1)
|
||||
// }
|
||||
// })
|
||||
// console.log(value)
|
||||
// dataSource.value = _dataSource
|
||||
// return true
|
||||
// },
|
||||
},
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,35 +3,32 @@
|
|||
<div class="title">请选择首页视图</div>
|
||||
|
||||
<div class="choose-view">
|
||||
<j-row class="view-content" :gutter="24">
|
||||
<j-col
|
||||
<div class="view-content">
|
||||
<div
|
||||
:span="8"
|
||||
class="select-item"
|
||||
:class="{ selected: selectValue === 'device' }"
|
||||
@click="selectValue = 'device'"
|
||||
>
|
||||
<img :src="getImage('/home/device.png')" alt="" />
|
||||
</j-col>
|
||||
<j-col
|
||||
<img :src="getImage(`/home/home-view/device${selectValue === 'device' ? '-active' : ''}.png`)" alt="" />
|
||||
</div>
|
||||
<div
|
||||
:span="8"
|
||||
class="select-item"
|
||||
:class="{ selected: selectValue === 'ops' }"
|
||||
@click="selectValue = 'ops'"
|
||||
>
|
||||
<img :src="getImage('/home/ops.png')" alt="" />
|
||||
</j-col>
|
||||
<j-col
|
||||
<img :src="getImage(`/home/home-view/ops${selectValue === 'ops' ? '-active' : ''}.png`)" alt="" />
|
||||
</div>
|
||||
<div
|
||||
:span="8"
|
||||
class="select-item"
|
||||
:class="{ selected: selectValue === 'comprehensive' }"
|
||||
@click="selectValue = 'comprehensive'"
|
||||
>
|
||||
<img :src="getImage('/home/comprehensive.png')" alt="" />
|
||||
</j-col>
|
||||
</j-row>
|
||||
<j-button type="primary" class="btn" @click="confirm"
|
||||
>确定</j-button
|
||||
>
|
||||
<img :src="getImage(`/home/home-view/comprehensive${selectValue === 'comprehensive' ? '-active' : ''}.png`)" alt="" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn">
|
||||
<j-button type="primary" @click="confirm">保存修改</j-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -84,25 +81,26 @@ watch(
|
|||
|
||||
.choose-view {
|
||||
width: 100%;
|
||||
padding: 0 9%;
|
||||
box-sizing: border-box;
|
||||
.view-content {
|
||||
display: flex;
|
||||
flex-flow: row wrap;
|
||||
justify-content: space-between;
|
||||
.select-item {
|
||||
border: 2px solid transparent;
|
||||
cursor: pointer;
|
||||
width: 30%;
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
border-color: #10239e;
|
||||
background-size: cover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btn {
|
||||
display: block;
|
||||
margin: 48px auto;
|
||||
margin-bottom: 0;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 68px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="upload-image-warp" @click.stop>
|
||||
<div class="upload-image-border" :style="borderStyle" @click.stop>
|
||||
<div class="upload-image-warp" >
|
||||
<div class="upload-image-border" :style="borderStyle">
|
||||
<j-upload
|
||||
name="file"
|
||||
list-type="picture-card"
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
:img="cropperImg"
|
||||
@cancel="cropperVisible = false"
|
||||
@ok="saveImage"
|
||||
title="更换图片"
|
||||
title="更改图标"
|
||||
/>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ import Role from '../Role/index.vue';
|
|||
import { onlyMessage } from '@/utils/comm';
|
||||
import Template from '@/api/notice/template';
|
||||
import { variableMap } from '../../data';
|
||||
import { cloneDeep } from 'lodash-es';
|
||||
|
||||
type GrantType = {
|
||||
role: {
|
||||
|
|
@ -245,7 +246,7 @@ const onTemplateChange = (obj: any) => {
|
|||
};
|
||||
|
||||
watchEffect(() => {
|
||||
Object.assign(formModel, props.data);
|
||||
Object.assign(formModel, cloneDeep(props.data));
|
||||
});
|
||||
|
||||
const onPrev = () => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue