+
<template #extra>
- <!-- <j-tooltip
- :title="
- productStore.current?.count &&
- productStore.current?.count > 0
- ? '产品下有设备实例时不能更换接入方式'
- : ''
- "
- >
- <j-button
- class="changeBtn"
- size="small"
- :disabled="
- productStore.current?.count &&
- productStore.current?.count > 0
- "
- ghost
- type="primary"
- @click="showDevice"
- >更换</j-button
- >
- </j-tooltip> -->
<PermissionButton
style="margin: 0 0 0 20px"
type="primary"
size="small"
:tooltip="{
- title:
- productStore.current?.count &&
- productStore.current?.count > 0
- ? '产品下有设备实例时不能更换接入方式'
- : '',
+ title: tooltip
}"
- :disabled="
- productStore.current?.count &&
- productStore.current?.count > 0
- "
+ :disabled="checkDisabled"
ghost
@click="showDevice"
hasPermission="device/Product:update"
@@ -197,7 +169,7 @@
>
<div class="info">
<div>
- <div style="font-weight: 600; margin: 0 0 10 px 0">
+ <div style="font-weight: 600; margin: 0 0 10px 0">
{{
access?.provider === 'mqtt-server-gateway' ||
access?.provider === 'mqtt-client-gateway'
@@ -214,7 +186,7 @@
:scroll="{ y: 500 }"
>
<template #bodyCell="{ text, column, record }">
- <template v-if="column.key === 'topic'">
+ <template v-if="column?.key === 'topic'">
<j-tooltip
placement="topLeft"
:title="text"
@@ -224,7 +196,7 @@
</div>
</j-tooltip>
</template>
- <template v-if="column.key === 'stream'">
+ <template v-if="column?.key === 'stream'">
<div>{{ getStream(record) }}</div>
</template>
<template v-if="column.key === 'description'">
@@ -237,7 +209,7 @@
</div>
</j-tooltip>
</template>
- <template v-if="column.key === 'address'">
+ <template v-if="column?.key === 'address'">
<j-tooltip
placement="topLeft"
:title="text"
@@ -247,7 +219,7 @@
</div>
</j-tooltip>
</template>
- <template v-if="column.key === 'example'">
+ <template v-if="column?.key === 'example'">
<j-tooltip
placement="topLeft"
:title="text"
@@ -265,133 +237,21 @@
</j-row>
</div>
<!-- 选择设备 -->
- <j-modal
- title="设备接入配置"
- v-if="visible"
- visible
- width="1200px"
- okText="确定"
- cancelText="取消"
- @ok="submitData"
- @cancel="cancel"
- >
- <pro-search
- :columns="query.columns"
- target="deviceModal"
- @search="search"
- type="simple"
- />
- <JProTable
- :columns="query.columns"
- :request="queryList"
- ref="tableRef"
- model="CARD"
- :defaultParams="{
- ...temp,
- sorts: productStore.current?.accessId ? [
- { name: 'id', value: productStore.current?.accessId },
- { name: 'createTime', order: 'desc' },
- ] : [{ name: 'createTime', order: 'desc' }],
- }"
- :params="queryParams"
- @cancelSelect="cancelSelect"
- :gridColumn="2"
- :gridColumns="[2]"
- >
- <template #headerTitle>
- <PermissionButton
- type="primary"
- @click="add"
- hasPermission="link/AccessConfig:add"
- >新增</PermissionButton
- >
- </template>
- <template #deviceType="slotProps">
- <div>{{ slotProps.deviceType.text }}</div>
- </template>
- <template #card="slotProps">
- <CardBox
- :value="slotProps"
- @click="handleClick"
- v-bind="slotProps"
- :active="_selectedRowKeys.includes(slotProps.id)"
- :status="slotProps.state.value"
- :statusText="slotProps.state.text"
- :statusNames="{
- enabled: 'processing',
- disabled: 'error',
- }"
- >
- <template #img>
- <slot name="img">
- <img :src="getImage('/device-access.png')" />
- </slot>
- </template>
- <template #content>
- <Ellipsis style="width: calc(100% - 100px)">
- <h3 style="font-weight: 600">
- {{ slotProps.name }}
- </h3>
- </Ellipsis>
- <j-row>
- <j-col :span="12" v-if="slotProps.channelInfo">
- <div class="card-item-content-text">
- {{ slotProps.channelInfo?.name }}
- </div>
- <Ellipsis style="width: calc(100% - 20px)">
- <div>
- {{
- slotProps.channelInfo?.addresses
- ? slotProps.channelInfo
- ?.addresses[0].address
- : ''
- }}
- </div>
- </Ellipsis>
- </j-col>
- <j-col :span="12">
- <div class="card-item-content-text">协议</div>
- <div>{{ slotProps.protocolDetail?.name }}</div>
- </j-col>
- </j-row>
- <j-row>
- <j-col :span="24">
- <Ellipsis style="width: calc(100% - 50px)"
- ><div class="context-access">
- {{
- !!slotProps?.description
- ? slotProps?.description
- : dataSource.find(
- (item) =>
- item?.id ===
- slotProps?.provider,
- )?.description
- }}
- </div></Ellipsis
- >
- </j-col>
- </j-row>
- </template>
- </CardBox>
- </template>
- <template #state="slotProps">
- <j-badge
- :text="slotProps.state === 1 ? '正常' : '禁用'"
- :status="statusMap.get(slotProps.state)"
- />
- </template>
- <template #id="slotProps">
- <a>{{ slotProps.id }}</a>
- </template>
- </JProTable>
- </j-modal>
+ <AccessModal
+ v-if='visible'
+ :product-id='productStore.current.id'
+ :deviceType='productStore.current.deviceType'
+ :accessId='accessId'
+ :providersList='dataSource'
+ @cancel=' visible = false'
+ @submit='checkAccess'
+ />
</template>
-<script lang="ts" setup>
+<script lang="ts" setup name='AccessConfig'>
import { useProductStore } from '@/store/product';
import { ConfigMetadata } from '@/views/device/Product/typings';
import { Empty, message } from 'jetlinks-ui-components';
-import { getImage } from '@/utils/comm';
import Title from '../Title/index.vue';
import { usePermissionStore } from '@/store/permission';
import { steps, steps1 } from './util';
@@ -411,7 +271,7 @@ import {
detail,
modify,
} from '@/api/device/product';
-import { isNoCommunity } from '@/utils/utils';
+
import Driver from 'driver.js';
import 'driver.js/dist/driver.min.css';
import { marked } from 'marked';
@@ -419,7 +279,7 @@ import type { TableColumnType } from 'ant-design-vue';
import { useMenuStore } from '@/store/menu';
import _ from 'lodash';
import { accessConfigTypeFilter } from '@/utils/setting';
-import DeviceApi from '@/api/media/device';
+import AccessModal from './accessModal.vue'
const productStore = useProductStore();
const tableRef = ref();
@@ -435,7 +295,8 @@ marked.setOptions({
});
const simpleImage = ref(Empty.PRESENTED_IMAGE_SIMPLE);
const visible = ref<boolean>(false);
-const access = ref({});
+const access = ref<Record<string, any>>({});
+const accessId = ref<string>(productStore.current.accessId)
const config = ref<any>({});
const metadata = ref<ConfigMetadata>({ properties: [] });
const dataSource = ref<string[]>([]);
@@ -476,115 +337,17 @@ const cancel = () => {
* 打开设备弹窗
*/
const showDevice = () => {
- _selectedRowKeys.value = [productStore.current?.accessId];
visible.value = true;
};
-/**
- * 筛选
- */
-const query = reactive({
- columns: [
- {
- title: '名称',
- dataIndex: 'name',
- key: 'name',
- search: {
- first: true,
- type: 'string',
- },
- },
- {
- title: '网关类型',
- key: 'provider',
- dataIndex: 'provider',
- search: {
- type: 'select',
- options: async () => {
- return new Promise((resolve) => {
- getProviders().then((resp: any) => {
- const data = resp.result || [];
- resolve(accessConfigTypeFilter(data));
- });
- });
- },
- },
- },
- {
- title: '状态',
- key: 'state',
- dataIndex: 'state',
- search: {
- type: 'select',
- options: [
- {
- label: '正常',
- value: 'enabled',
- },
- {
- label: '禁用',
- value: 'disabled',
- },
- ],
- },
- },
- {
- title: '说明',
- key: 'description',
- dataIndex: 'description',
- search: {
- type: 'string',
- },
- },
- {
- title: '操作',
- key: 'action',
- fixed: 'right',
- width: 250,
- scopedSlots: true,
- },
- ],
-});
const param = ref<Record<string, any>>({
pageSize: 4,
terms: [],
});
const queryParams = ref<Record<string, any>>({});
-/**
- * 查询条件
- */
-const temp = {
- ...param.value,
- terms:
- productStore.current?.deviceType?.value === 'childrenDevice'
- ? [
- ...param.value.terms,
- {
- terms: [
- {
- column: 'provider',
- termType: 'in',
- value: 'child-device,edge-child-device',
- },
- ],
- },
- ]
- : [...param.value?.terms],
-};
-const _selectedRowKeys = ref<string[]>([]);
+
const currentForm = ref({});
-const cancelSelect = () => {
- _selectedRowKeys.value = [];
-};
-
-const handleClick = (dt: any) => {
- _selectedRowKeys.value.splice(0, 1);
- _selectedRowKeys.value = [dt.id];
- current.value = {
- ...dt,
- };
-};
const search = (e: any) => {
queryParams.value = {
...e,
@@ -727,6 +490,37 @@ const queryAccessDetail = async (id: string) => {
});
};
+const handleColumns = () => {
+ const Group = {
+ title: '分组',
+ dataIndex: 'group',
+ key: 'group',
+ ellipsis: true,
+ align: 'center',
+ width: 100,
+ customCell: (record: any, rowIndex: number) => {
+ const obj = {
+ children: record,
+ rowSpan: 0,
+ };
+ const list = config.value?.routes || [];
+
+ const arr = list.filter(
+ (res: any) => res.group === record.group,
+ );
+
+ const isRowIndex =
+ rowIndex === 0 ||
+ list[rowIndex - 1].group !== record.group;
+ isRowIndex && (obj.rowSpan = arr.length);
+
+ return obj;
+ },
+ };
+ columnsMQTT.value = [Group, ...ColumnsMQTT];
+ columnsHTTP.value = [Group, ...ColumnsHTTP];
+}
+
/**
* 查询协议信息
*/
@@ -737,34 +531,7 @@ const getConfigDetail = (
getConfigView(messageProtocol, transportProtocol).then((resp) => {
if (resp.status === 200) {
config.value = resp.result;
- const Group = {
- title: '分组',
- dataIndex: 'group',
- key: 'group',
- ellipsis: true,
- align: 'center',
- width: 100,
- customCell: (record: any, rowIndex: number) => {
- const obj = {
- children: record,
- rowSpan: 0,
- };
- const list = config.value?.routes || [];
-
- const arr = list.filter(
- (res: any) => res.group === record.group,
- );
-
- const isRowIndex =
- rowIndex === 0 ||
- list[rowIndex - 1].group !== record.group;
- isRowIndex && (obj.rowSpan = arr.length);
-
- return obj;
- },
- };
- columnsMQTT.value = [Group, ...ColumnsMQTT];
- columnsHTTP.value = [Group, ...ColumnsHTTP];
+ handleColumns()
if (config.value?.document) {
markdownToHtml.value = marked(config.value.document);
}
@@ -772,101 +539,6 @@ const getConfigDetail = (
});
};
-/**
- * 获取网关类型
- */
-const getProviderList = async () => {
- const res = await getProviders().then((resp) => {
- if (resp.status === 200) {
- dataSource.value = resp.result;
- }
- });
-};
-/**
- * 提交设备数据
- */
-const submitData = async () => {
- if (current.value) {
- const obj: any = {
- ...productStore.current,
- transportProtocol: current.value?.transport,
- protocolName: current.value?.protocolDetail?.name,
- accessId: current.value?.id,
- accessName: current.value?.name,
- accessProvider: current.value?.provider,
- messageProtocol: current.value?.protocol,
- };
- // getConfigView(current.value?.protocol, current.value?.transport).then(
- // (resp: any) => {
- // metadata.value = (resp?.result[0] as ConfigMetadata) || {
- // properties: [],
- // };
- // // 流传输模式 初始为udp模式
- // if (metadata.value?.properties) {
- // metadata.value?.properties.forEach((item) => {
- // if (
- // item.name === '流传输模式' &&
- // (!productStore.current?.configuration ||
- // !productStore.current?.configuration.hasOwnProperty(
- // item.name,
- // ))
- // ) {
- // formData.data[item.name] =
- // item.type.expands?.defaultValue;
- // }
- // });
- // }
- // },
- // );
- const metatdata = JSON.parse(productStore.current?.metadata || '{}');
- if (!productStore.current?.metadata) {
- const response = await getConfigView(
- obj?.messageProtocol || '',
- obj?.transportProtocol || '',
- );
- if (response.status === 200) {
- const ndata = JSON.parse(response.result?.metadata || '{}');
- const mdata = {
- events: modifyArray(
- metatdata?.events || [],
- ndata?.events || [],
- ),
- properties: modifyArray(
- metatdata?.properties || [],
- ndata?.properties || [],
- ),
- functions: modifyArray(
- metatdata?.functions || [],
- ndata?.functions || [],
- ),
- tags: modifyArray(metatdata?.tags || [], ndata?.tags || []),
- };
- // MetadataAction.insert(mdata);
- obj.metadata = JSON.stringify(mdata);
- }
- }
- // DeviceApi.getConfiguration(current.value?.protocol, current.value?.transport)
- // visible.value = false;
- // 保存或者更新设备接入
- const resp: any = obj.id
- ? await updateDevice(obj)
- : await saveDevice(obj);
- if (resp.status === 200) {
- detail(productStore.current?.id || '').then((res) => {
- if (res.status === 200) {
- productStore.current = { ...res.result };
- access.value = res.result;
- message.success('操作成功！');
- getData(obj.accessId);
- }
- visible.value = false;
- queryParams.value = {};
- });
- }
- } else {
- message.error('请选择接入方式');
- }
-};
const modifyArray = (oldData: any[], newData: any[]) => {
newData.map((item) => {
if (!_.map(oldData, 'id').includes(item.id)) {
@@ -894,6 +566,26 @@ const getGuide = async (isDriver1: boolean = false) => {
}
}
};
+
+const checkAccess = async (data: any) => {
+ visible.value = false
+ accessId.value = data.access.id
+ access.value = data.access
+ metadata.value = data.metadata[0]
+ config.value = data.access?.transportDetail || {}
+ handleColumns()
+ markdownToHtml.value = config.value?.document ? marked(config.value.document) : '';
+ getGuide(!!data.metadata.length); //
+}
+
+/**
+ * 获取协议类型名称
+ */
+const getProvidersList = async () => {
+ const res: any = await getProviders();
+ dataSource.value = res.result;
+};
+
/**
* 查询保存数据信息
*/
@@ -936,12 +628,7 @@ const getData = async (accessId?: string) => {
productStore.current?.messageProtocol || '',
productStore.current?.transportProtocol || '',
);
- getProviders().then((resp) => {
- if (resp.status === 200) {
- const data = resp.result || [];
- dataSource.value = accessConfigTypeFilter(data as any[]);
- }
- });
+
}
// else {
// if (productStore.current?.id) {
@@ -967,6 +654,22 @@ const submitDevice = async () => {
flatObj(values, result);
const { storePolicy, ...extra } = result;
const id = productStore.current?.id;
+ //TODO 二次确认是否覆盖物模型
+ // 更新选择设备(设备接入)
+ const accessObj = {
+ ...productStore.current,
+ transportProtocol: access.value?.transport,
+ protocolName: access.value?.protocolDetail?.name,
+ accessId: access.value?.id,
+ accessName: access.value?.name,
+ accessProvider: access.value?.provider,
+ messageProtocol: access.value?.protocol,
+ }
+ const updateDeviceResp = await updateDevice(accessObj)
+
+ if (!updateDeviceResp.success) return
+
+ // 更新产品配置信息
const resp = await modify(id || '', {
id: id,
configuration: { ...extra },
@@ -985,6 +688,7 @@ const submitDevice = async () => {
}
}
};
+
const flatObj = (obj: any, result: any) => {
Object.keys(obj).forEach((key: string) => {
if (typeof obj[key] === 'string') {
@@ -994,20 +698,11 @@ const flatObj = (obj: any, result: any) => {
}
});
};
+
const getDetailInfo = () => {};
-const add = () => {
- const url = menuStore.hasMenu('link/AccessConfig/Detail');
- if (url) {
- const tab: any = window.open(`${origin}/#${url}?view=false`);
- tab.onTabSaveSuccess = (value: any) => {
- if (value.status === 200) {
- tableRef.value.reload();
- handleClick(value.result);
- }
- };
- }
-};
+
+getProvidersList()
/**
* 初始化
*/
@@ -1017,6 +712,23 @@ watchEffect(() => {
}
});
+const tooltip = computed(() => {
+ if (productStore.current?.count > 0) {
+ return '产品下有设备实例时不能更换接入方式'
+ }
+ if (productStore.current.state === 1) {
+ return '停用产品后才可更换接入方式'
+ }
+ return ''
+})
+
+const checkDisabled = computed(() => {
+ if (productStore.current?.count > 0 || productStore.current.state === 1) {
+ return true
+ }
+ return false
+})
+
nextTick(() => {
getData();
});
diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue
index 9788ebd0..c4472e90 100644
--- a/src/views/device/Product/Save/index.vue
+++ b/src/views/device/Product/Save/index.vue
@@ -115,7 +115,7 @@
<script lang="ts" setup>
import { category } from '@/api/device/product';
-import { Form } from 'ant-design-vue';
+import { Form } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm.ts';
import { message } from 'jetlinks-ui-components';
import DialogTips from '../DialogTips/index.vue';
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 4a5b509e..364bf578 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -69,7 +69,7 @@
</slot>
</template>
<template #content>
- <Ellipsis style="width: calc(100% - 100px)"
+ <Ellipsis style="width: calc(100% - 100px); margin-bottom: 18px;"
><span
style="font-weight: 600; font-size: 16px"
>
@@ -621,8 +621,8 @@ onMounted(() => {
background: #f0f2f5;
}
.productImg {
- width: 88px;
- height: 88px;
+ width: 80px;
+ height: 80px;
}
.productName {
white-space: nowrap; /*强制在同一行内显示所有文本，直到文本结束或者遭遇br标签对象才换行。*/
diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue
index 53db5276..3ca6b1d4 100644
--- a/src/views/device/components/Metadata/Base/Edit/index.vue
+++ b/src/views/device/components/Metadata/Base/Edit/index.vue
@@ -14,7 +14,7 @@ import { useInstanceStore } from '@/store/instance';
import { useMetadataStore } from '@/store/metadata';
import { useProductStore } from '@/store/product';
import { ProductItem } from '@/views/device/Product/typings';
-import { message } from 'ant-design-vue/es';
+import { message } from 'jetlinks-ui-components';
import type { FormInstance } from 'ant-design-vue/es';
import { updateMetadata, asyncUpdateMetadata } from '../../metadata'
import { detail } from '@/api/device/instance';
diff --git a/src/views/edge/Device/Save/index.vue b/src/views/edge/Device/Save/index.vue
index d1636e08..3b03e983 100644
--- a/src/views/edge/Device/Save/index.vue
+++ b/src/views/edge/Device/Save/index.vue
@@ -178,7 +178,7 @@ const modelRef = reactive({
id: undefined,
name: '',
describe: '',
- photoUrl: getImage('/device/instance/device-card.png'),
+ photoUrl: getImage('/device-gateway.png'),
});
const vailId = async (_: Record<string, any>, value: string) => {
diff --git a/src/views/edge/Device/index.vue b/src/views/edge/Device/index.vue
index 6545579f..b5a4111a 100644
--- a/src/views/edge/Device/index.vue
+++ b/src/views/edge/Device/index.vue
@@ -51,11 +51,11 @@
>
<template #img>
<img
- :width="88"
- :height="88"
+ :width="80"
+ :height="80"
:src="
slotProps?.photoUrl ||
- getImage('/device/instance/device-card.png')
+ getImage('/device-gateway.png')
"
/>
</template>
@@ -68,7 +68,7 @@
{{ slotProps.name }}
</span>
</Ellipsis>
- <j-row style="margin-top: 20px">
+ <j-row style="margin-top: 18px">
<j-col :span="12">
<div class="card-item-content-text">
设备类型
diff --git a/src/views/edge/Resource/index.vue b/src/views/edge/Resource/index.vue
index 7fb822a5..7420cb31 100644
--- a/src/views/edge/Resource/index.vue
+++ b/src/views/edge/Resource/index.vue
@@ -38,7 +38,7 @@
{{ slotProps.name }}
</span>
</Ellipsis>
- <j-row style="margin-top: 20px">
+ <j-row style="margin-top: 18px">
<j-col :span="12">
<div class="card-item-content-text">
通讯协议
diff --git a/src/views/home/components/Pie.vue b/src/views/home/components/Pie.vue
index 1bbf3a71..3142b7c3 100644
--- a/src/views/home/components/Pie.vue
+++ b/src/views/home/components/Pie.vue
@@ -4,7 +4,7 @@
<script setup lang="ts">
import * as echarts from 'echarts';
-import { ComponentInternalInstance } from 'vue';
+import { ComponentInternalInstance, onBeforeUnmount } from 'vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -46,20 +46,35 @@ const options = computed(() => ({
],
}));
+const myChart = ref()
+
watch(options, () => {
- initChart();
+ if (myChart.value) {
+ myChart.value.setOption(options.value)
+ } else {
+ initChart()
+ }
});
+
+onBeforeUnmount(() => {
+ window.removeEventListener('resize', resize)
+})
+
+const resize = () => {
+ if (myChart.value) {
+ myChart.value.resize();
+ }
+}
+
const initChart = () => {
nextTick(() => {
- const myChart = echarts.init(proxy?.$refs[props.chartRef as string] as HTMLElement);
+ myChart.value = echarts.init(proxy?.$refs[props.chartRef as string] as HTMLElement);
- myChart.clear();
- myChart.setOption(options.value);
+ myChart.value.setOption(options.value);
- window.addEventListener('resize', () => {
- myChart.resize();
- });
+ window.addEventListener('resize', resize);
});
};
+
initChart();
</script>
diff --git a/src/views/home/components/PlatformPicCard.vue b/src/views/home/components/PlatformPicCard.vue
index f6308d82..4d59b4e4 100644
--- a/src/views/home/components/PlatformPicCard.vue
+++ b/src/views/home/components/PlatformPicCard.vue
@@ -4,11 +4,11 @@
<span>平台架构图</span>
<p>PLATFORM ARCHITECTURE DIAGRAM</p>
</div>
- <img
- :src="props.image || '/images/home/content.png'"
- class="bj"
- alt=""
- />
+ <div class='plaid'></div>
+ <div
+ class='bj'
+ :style='{ backgroundImage: `url(${props.image || "/images/home/content.png"})`}'
+ ></div>
</div>
</template>
@@ -26,16 +26,34 @@ const props = defineProps({
background-color: #fff;
border-bottom: 1px solid #2f54eb;
height: 458px;
+
+ .plaid {
+ background: repeating-linear-gradient(90deg, transparent, transparent 35px, rgba(#000, .1) 36px),
+ repeating-linear-gradient(0deg, transparent, transparent 35px, rgba(#000, .1) 36px);
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height:100%;
+ z-index: 1;
+ }
+
.bj {
+ position: relative;
+ z-index: 2;
display: block;
width: 100%;
- height: 100%;
+ height: calc(100% - 50px);
+ margin-top: 40px;
+ background-size: contain;
+ background-position: center;
+ background-repeat: no-repeat;
}
.title {
position: absolute;
width: 100%;
- z-index: 2;
+ z-index: 3;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
diff --git a/src/views/home/components/StepCard.vue b/src/views/home/components/StepCard.vue
index a5008a49..492fca09 100644
--- a/src/views/home/components/StepCard.vue
+++ b/src/views/home/components/StepCard.vue
@@ -6,7 +6,7 @@
<template #title>
<span>{{ props.tooltip }}</span>
</template>
- <AIcon type="QuestionCircleOutlined" style="padding-top: 5px" />
+ <AIcon type="QuestionCircleOutlined" style="padding-top: 8px;font-size: 14px;color: #666;" />
</j-tooltip>
</h5>
@@ -14,8 +14,8 @@
<div class="list-item" v-for="item in props.dataList">
<div class="item-content">
<div class="box-top" @click="jumpPage(item)">
- <span class="top-title">{{ item.title }}</span>
<img :src="item.iconUrl" alt="" />
+ <span class="top-title">{{ item.title }}</span>
</div>
<div class="box-details">{{ item.details }}</div>
</div>
@@ -108,6 +108,10 @@ const jumpPage = (row: recommendList) => {
z-index: 1;
height: 100%;
}
+ span {
+ position: relative;
+ z-index: 2;
+ }
}
.box-details {
padding: 24px;
@@ -129,4 +133,20 @@ const jumpPage = (row: recommendList) => {
}
}
}
+
+@media (min-width: @screen-md-min) {
+ .step-container {
+ .box-list {
+ .list-item {
+ .box-top {
+ font-size: 12px;
+ padding: 12px 18px;
+ }
+ .box-details {
+ padding: 12px;
+ }
+ }
+ }
+ }
+}
</style>
diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue
index f808a3bf..c1445dc0 100644
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@@ -20,15 +20,12 @@ const handle = async (appId: string, url: string) => {
const res = await getAppInfo_api(appId);
let menuUrl: any = url;
if (res.status === 200) {
- // console.log(res.result);
if (res.result.page.routeType === 'hash') {
menuUrl = `${url}`;
}
if (res.result.provider === 'internal-standalone') {
- //{baseUrl}/api/application/sso/{appId}/login?redirect={menuUrl}
- const urlStandalone = `${res.result.page.baseUrl}/#/api/application/sso/${appId}/login?redirect=${menuUrl}&layout=false`;
+ const urlStandalone = `${res.result.page.baseUrl}/api/application/sso/${appId}/login?redirect=${menuUrl}?layout=false`;
iframeUrl.value = urlStandalone;
- // console.log(urlStandalone);
} else if (res.result.provider === 'internal-integrated') {
const tokenUrl = `${
res.result.page.baseUrl
@@ -44,7 +41,12 @@ const handle = async (appId: string, url: string) => {
watchEffect(() => {
const params = route.path.split('/')?.[1];
const url = route.path.split('/').slice(2).join('/');
- console.log(params, url);
handle(params, url);
});
</script>
+
+<style lang='less' scoped>
+:deep(.children-full-height) {
+ margin: 0 !important;
+}
+</style>
diff --git a/src/views/init-home/Basic/index.vue b/src/views/init-home/Basic/index.vue
index 7aa07bc6..cd491755 100644
--- a/src/views/init-home/Basic/index.vue
+++ b/src/views/init-home/Basic/index.vue
@@ -257,21 +257,7 @@ import { getImage } from '@/utils/comm.ts';
import { Form, message } from 'jetlinks-ui-components';
import { FILE_UPLOAD } from '@/api/comm';
import {
- getSystemPermission,
save,
- addRole,
- getRoleMenu,
- updateRoleMenu,
- getResourcesCurrent,
- saveNetwork,
- saveProtocol,
- getProtocol,
- saveAccessConfig,
- saveProduct,
- saveDevice,
- changeDeploy,
- deployDevice,
- saveInit,
} from '@/api/initHome';
import { LocalStore } from '@/utils/comm';
import { TOKEN_KEY } from '@/utils/variable';
diff --git a/src/views/init-home/Role/index.vue b/src/views/init-home/Role/index.vue
index 299820c2..de2505b8 100644
--- a/src/views/init-home/Role/index.vue
+++ b/src/views/init-home/Role/index.vue
@@ -95,59 +95,67 @@ const findMenuByRole = (menu: any[], code: string): any => {
});
return _item;
};
+
+const saveRoleData = (item: any) => {
+ return new Promise(async (resolve) => {
+ const _itemData = RoleData[item];
+ // 添加该角色
+ const res = await addRole(_itemData);
+ if (res.status === 200) {
+ const menuTree = await getRoleMenu(res.result.id);
+ if (menuTree.status === 200) {
+ const _roleData = (RoleMenuData[item] as []).filter(
+ (roleItem: any) => {
+ const _menu = findMenuByRole(
+ menuTree.result,
+ roleItem.code,
+ );
+ if (_menu) {
+ roleItem.id = _menu.id;
+ roleItem.parentId = _menu.parentId;
+ roleItem.createTime = _menu.createTime;
+ return true;
+ }
+ return false;
+ },
+ );
+ //更新权限
+ const roleRes = await updateRoleMenu(res.result.id, {
+ menus: _roleData,
+ });
+ resolve(roleRes.status === 200)
+ } else {
+ resolve(false);
+ }
+ } else {
+ resolve(false);
+ }
+ });
+};
+
/**
* 保存角色
*/
const addRoleData = async () => {
- return new Promise((resolve) => {
- if (!keys.value.length) {
- return resolve(true);
- }
- let Count = 0;
- keys.value.forEach(async (item, index) => {
- const _itemData = RoleData[item];
- // 添加该角色
- const res = await addRole(_itemData);
- if (res.status === 200) {
- const menuTree = await getRoleMenu(res.result.id);
- if (menuTree.status === 200) {
- const _roleData = (RoleMenuData[item] as []).filter(
- (roleItem: any) => {
- const _menu = findMenuByRole(
- menuTree.result,
- roleItem.code,
- );
- if (_menu) {
- roleItem.id = _menu.id;
- roleItem.parentId = _menu.parentId;
- roleItem.createTime = _menu.createTime;
- return true;
- }
- return false;
- },
- );
- //更新权限
- const roleRes = await updateRoleMenu(res.result.id, {
- menus: _roleData,
- });
- if (roleRes.status === 200) {
- Count += 1;
- }
- if (index === keys.value.length - 1) {
- resolve(Count === keys.value.length);
- }
- } else if (index === keys.value.length - 1) {
- resolve(Count === keys.value.length);
- }
- } else if (index === keys.value.length - 1) {
- resolve(Count === keys.value.length);
- roleData.isSucessRole = 2;
- }else{
- resolve(false);
- }
- });
+ return new Promise((resolve) => {
+ if (!keys.value.length) {
+ return resolve(true);
+ }
+
+ const allPromise = keys.value.map(async (item) => {
+ return await saveRoleData(item);
});
+
+ Promise.all(allPromise).then((item) => {
+ resolve(
+ item.every((i) => {
+ return i;
+ }),
+ );
+ });
+ });
};
+
defineExpose({
submitRole: addRoleData,
});
diff --git a/src/views/init-home/data/baseMenu.ts b/src/views/init-home/data/baseMenu.ts
index 2f749d08..e6daa6a0 100644
--- a/src/views/init-home/data/baseMenu.ts
+++ b/src/views/init-home/data/baseMenu.ts
@@ -46,7 +46,7 @@ export const MESSAGE_SUBSCRIBE_MENU_DATA = {
permissions: [
{
permission: 'alarm-config',
- action: ['query']
+ actions: ['query']
}
]
}
diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue
index e7696942..021029c0 100644
--- a/src/views/init-home/index.vue
+++ b/src/views/init-home/index.vue
@@ -60,12 +60,10 @@
</div>
</template>
<script setup lang="ts">
-import { getImage } from '@/utils/comm.ts';
import Basic from './Basic/index.vue';
import Role from './Role/index.vue';
import Menu from './Menu/index.vue';
import InitData from './InitData/index.vue';
-import { modalState, formState, logoState } from './data/interface';
import { getInit, saveInit } from '@/api/initHome';
import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
import { FILE_UPLOAD } from '@/api/comm';
@@ -110,6 +108,7 @@ const submitData = async () => {
return;
}
const roleRes = await roleRef.value.submitRole();
+ console.log(roleRes);
if (!roleRes) {
loading.value = false;
return;
@@ -140,8 +139,8 @@ const judgeInitSet = async () => {
}
};
onBeforeMount(() => {
- // judgeInitSet();
-})
+ // judgeInitSet();
+});
</script>
<style scoped lang="less">
.page-container {
diff --git a/src/views/iot-card/CardManagement/Import.vue b/src/views/iot-card/CardManagement/Import.vue
index 0843fba8..bd0261f5 100644
--- a/src/views/iot-card/CardManagement/Import.vue
+++ b/src/views/iot-card/CardManagement/Import.vue
@@ -164,7 +164,7 @@ const getConfig = async () => {
// const blob = new Blob([res], { type: type });
// const url = URL.createObjectURL(blob);
// console.log(url);
-// downloadFileByUrl(url, `物联卡导入模版`, type);
+// downloadFileByUrl(url, `物联卡导入模板`, type);
// }
// };
diff --git a/src/views/iot-card/CardManagement/UploadFile.vue b/src/views/iot-card/CardManagement/UploadFile.vue
index ed5e3b72..e426552f 100644
--- a/src/views/iot-card/CardManagement/UploadFile.vue
+++ b/src/views/iot-card/CardManagement/UploadFile.vue
@@ -75,7 +75,7 @@ const downFile = async (type: string) => {
if (res) {
const blob = new Blob([res], { type: type });
const url = URL.createObjectURL(blob);
- downloadFileByUrl(url, `物联卡导入模版`, type);
+ downloadFileByUrl(url, `物联卡导入模板`, type);
}
};
diff --git a/src/views/iot-card/Home/index.vue b/src/views/iot-card/Home/index.vue
index 95bab3ad..aa5ced7d 100644
--- a/src/views/iot-card/Home/index.vue
+++ b/src/views/iot-card/Home/index.vue
@@ -1,8 +1,8 @@
<!-- 物联卡-首页 -->
<template>
<page-container>
- <j-row :gutter="24">
- <j-col :span="14">
+ <j-row :gutter="[24, 24]">
+ <j-col :xxl="14" :xl='24'>
<div class="home-guide">
<Guide title="物联卡引导"></Guide>
<div
@@ -26,7 +26,7 @@
</div>
</div>
</j-col>
- <j-col :span="10">
+ <j-col :xxl="10" :xl='24'>
<div class="home-statistics">
<Guide title="基础统计">
<template #extra>
@@ -72,7 +72,7 @@
</div>
</div>
</j-col>
- <j-col :span="24" style="min-height: 580px">
+ <j-col :span="24">
<div class="home-body">
<Guide
title="平台架构图"
@@ -354,7 +354,6 @@ getStateCard();
}
.home-guide {
- margin-bottom: 24px;
padding: 24px 16px;
background-color: #fff;
diff --git a/src/views/iot-card/Platform/index.vue b/src/views/iot-card/Platform/index.vue
index 3b3b5137..ea4fee15 100644
--- a/src/views/iot-card/Platform/index.vue
+++ b/src/views/iot-card/Platform/index.vue
@@ -27,7 +27,7 @@
</slot>
</template>
<template #content>
- <h3 style='font-size: 16px;width: calc(100% - 90px)'>
+ <h3 style='font-size: 16px;width: calc(100% - 90px); margin-bottom: 18px;'>
<Ellipsis>
{{ slotProps.name }}
</Ellipsis>
diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue
index 033cd858..09f6efe2 100644
--- a/src/views/link/AccessConfig/Detail/index.vue
+++ b/src/views/link/AccessConfig/Detail/index.vue
@@ -1,15 +1,15 @@
<template>
<page-container>
<j-spin :spinning="loading">
- <FullPage>
+ <div v-if="type && id === ':id'">
+ <Provider
+ @onClick="goProviders"
+ :dataSource="dataSource"
+ ></Provider>
+ </div>
+ <FullPage v-else>
<j-card :bordered="false">
- <div v-if="type && id === ':id'">
- <Provider
- @onClick="goProviders"
- :dataSource="dataSource"
- ></Provider>
- </div>
- <div v-else>
+ <div>
<div class="go-back" v-if="id === ':id'">
<a @click="goBack">返回</a>
</div>
diff --git a/src/views/link/AccessConfig/components/AccessCard/index.vue b/src/views/link/AccessConfig/components/AccessCard/index.vue
index a82aa6a7..e6f1361e 100644
--- a/src/views/link/AccessConfig/components/AccessCard/index.vue
+++ b/src/views/link/AccessConfig/components/AccessCard/index.vue
@@ -5,6 +5,7 @@
'card-render',
`access-${data.type || 'network'}`,
checked === data.id ? 'checked' : '',
+ disabled ? 'disabled' : ''
]"
@click="checkedChange(data.id)"
>
@@ -40,6 +41,10 @@ const props = defineProps({
type: Object,
default: () => {},
},
+ disabled: {
+ type: Boolean,
+ default: false
+ }
});
const checkedChange = (id: string) => {
@@ -105,6 +110,9 @@ const checkedChange = (id: string) => {
display: block;
}
}
+ &.disabled {
+ cursor: not-allowed;
+ }
}
.access-media {
background: url('/public/images/access-media.png') no-repeat;
diff --git a/src/views/link/AccessConfig/components/Network/index.vue b/src/views/link/AccessConfig/components/Network/index.vue
index a9d76b6f..ffb47c2f 100644
--- a/src/views/link/AccessConfig/components/Network/index.vue
+++ b/src/views/link/AccessConfig/components/Network/index.vue
@@ -134,6 +134,7 @@
<AccessCard
@checkedChange="procotolChange"
:checked="procotolCurrent"
+ :disabled='id !== ":id"'
:data="{ ...item, type: 'protocol' }"
>
</AccessCard>
diff --git a/src/views/link/AccessConfig/components/Provider/index.vue b/src/views/link/AccessConfig/components/Provider/index.vue
index 0c5c9dff..065f25c0 100644
--- a/src/views/link/AccessConfig/components/Provider/index.vue
+++ b/src/views/link/AccessConfig/components/Provider/index.vue
@@ -1,7 +1,7 @@
<template>
<div v-for="items in dataSource" :key="items.type" class="card-items">
<div class="card-items-container">
- <TitleComponent :data="items.title"></TitleComponent>
+ <TitleComponent :data="items.title" style='font-size: 16px;'></TitleComponent>
<j-row :gutter="[24, 24]">
<j-col :span="12" v-for="item in items.list" :key="item.id">
<div class="provider">
@@ -75,6 +75,9 @@ const click = (value: object) => {
<style lang="less" scoped>
.card-items {
margin-bottom: 24px;
+ background-color: #fff;
+ padding: 24px;
+
.card-items-container {
}
}
@@ -142,12 +145,12 @@ const click = (value: object) => {
display: flex;
width: calc(100% - 100px);
.images {
- width: 88px;
- height: 88px;
+ width: 80px;
+ height: 80px;
img {
- width: 88px;
- height: 88px;
+ width: 80px;
+ height: 80px;
}
}
diff --git a/src/views/link/DashBoard/components/Network.vue b/src/views/link/DashBoard/components/Network.vue
index 73dc81ba..35e46db8 100644
--- a/src/views/link/DashBoard/components/Network.vue
+++ b/src/views/link/DashBoard/components/Network.vue
@@ -162,7 +162,9 @@ const handleNetworkOptions = (optionsData: any, xAxis: any) => {
},
grid: {
left: '70px',
- right: '50px',
+ right: 10,
+ bottom: '24px',
+ top: 24
},
tooltip: {
trigger: 'axis',
diff --git a/src/views/link/DashBoard/components/TopCard.vue b/src/views/link/DashBoard/components/TopCard.vue
index a52e7631..870a6ddb 100644
--- a/src/views/link/DashBoard/components/TopCard.vue
+++ b/src/views/link/DashBoard/components/TopCard.vue
@@ -47,6 +47,7 @@ import { serverNode } from '@/api/link/dashboard';
import TopEchartsItemNode from './TopEchartsItemNode.vue';
import { getWebSocket } from '@/utils/websocket';
import { map } from 'rxjs/operators';
+import { isNoCommunity } from '@/utils/utils'
const serverId = ref();
const serverNodeOptions = ref<Array<any>>([]);
@@ -103,17 +104,19 @@ const getData = () => {
};
onMounted(() => {
- serverNode().then((resp: any) => {
- if (resp.success) {
- serverNodeOptions.value = resp.result.map((item: any) => ({
- label: item.name,
- value: item.id,
- }));
- if (serverNodeOptions.value.length) {
- serverId.value = serverNodeOptions.value[0]?.value;
- }
- }
- });
+ if (isNoCommunity) {
+ serverNode().then((resp: any) => {
+ if (resp.success) {
+ serverNodeOptions.value = resp.result.map((item: any) => ({
+ label: item.name,
+ value: item.id,
+ }));
+ if (serverNodeOptions.value.length) {
+ serverId.value = serverNodeOptions.value[0]?.value;
+ }
+ }
+ });
+ }
});
watch(
() => serverId.value,
@@ -132,9 +135,11 @@ watch(
// box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
border-radius: 2px;
justify-content: space-between;
+ padding: 24px;
+ gap: 24px;
.dash-board-item {
flex: 1;
- margin: 24px 12px;
+ //margin: 24px 12px;
min-width: 250px;
}
}
diff --git a/src/views/link/Protocol/Save/FileUpload.vue b/src/views/link/Protocol/Save/FileUpload.vue
index fa4b9c69..cd6b7d32 100644
--- a/src/views/link/Protocol/Save/FileUpload.vue
+++ b/src/views/link/Protocol/Save/FileUpload.vue
@@ -30,7 +30,7 @@ import { TOKEN_KEY } from '@/utils/variable';
import { PROTOCOL_UPLOAD } from '@/api/link/protocol';
import { onlyMessage } from '@/utils/comm';
import type { UploadChangeParam, UploadProps } from 'ant-design-vue';
-import { notification as Notification } from 'ant-design-vue';
+import { notification as Notification } from 'jetlinks-ui-components';
import { useSystem } from '@/store/system';
const emit = defineEmits(['update:modelValue', 'change']);
diff --git a/src/views/link/Protocol/index.vue b/src/views/link/Protocol/index.vue
index 9c62dfaa..5d269bc2 100644
--- a/src/views/link/Protocol/index.vue
+++ b/src/views/link/Protocol/index.vue
@@ -43,10 +43,7 @@
<template #content>
<div class="card-item-content">
<Ellipsis
- style="
- width: calc(100% - 100px);
- margin-bottom: 10px;
- "
+ style="margin-bottom: 18px;"
>
<span
style="
diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index 7a58cd4e..48191b97 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -1327,6 +1327,9 @@ const getSupports = async () => {
label: item.name,
value: item.id,
}));
+ if (!typeOptions.value.every((item : any) => item.value === 'UDP')) {
+ formData.value.type = typeOptions.value[0].value
+ }
}
};
diff --git a/src/views/media/Cascade/index.vue b/src/views/media/Cascade/index.vue
index 206d93dc..4bee8f17 100644
--- a/src/views/media/Cascade/index.vue
+++ b/src/views/media/Cascade/index.vue
@@ -45,7 +45,7 @@
<img
:src="
getImage(
- '/device/instance/device-card.png',
+ '/cascade.png',
)
"
/>
diff --git a/src/views/notice/Config/Debug/index.vue b/src/views/notice/Config/Debug/index.vue
index f5655d35..4c6bce92 100644
--- a/src/views/notice/Config/Debug/index.vue
+++ b/src/views/notice/Config/Debug/index.vue
@@ -11,13 +11,13 @@
>
<j-form ref="formRef" layout="vertical" :model="formData">
<j-form-item
- label="通知模版"
+ label="通知模板"
name="templateId"
:rules="{ required: true, message: '该字段为必填字段' }"
>
<j-select
v-model:value="formData.templateId"
- placeholder="请选择通知模版"
+ placeholder="请选择通知模板"
@change="getTemplateDetail"
>
<j-select-option
diff --git a/src/views/notice/Config/Detail/doc/AliyunSms.tsx b/src/views/notice/Config/Detail/doc/AliyunSms.tsx
index 7fa1a9c1..2fe087dc 100644
--- a/src/views/notice/Config/Detail/doc/AliyunSms.tsx
+++ b/src/views/notice/Config/Detail/doc/AliyunSms.tsx
@@ -1,5 +1,5 @@
// import './index.less';
-import { Image } from 'ant-design-vue';
+import { Image } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm';
const AliyunSms = () => {
diff --git a/src/views/notice/Config/Detail/doc/AliyunVoice.tsx b/src/views/notice/Config/Detail/doc/AliyunVoice.tsx
index 1d9d7df8..1060ebc5 100644
--- a/src/views/notice/Config/Detail/doc/AliyunVoice.tsx
+++ b/src/views/notice/Config/Detail/doc/AliyunVoice.tsx
@@ -1,5 +1,5 @@
// import './index.less';
-import { Image } from 'ant-design-vue';
+import { Image } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm';
const AliyunVoice = () => {
diff --git a/src/views/notice/Config/Detail/doc/DingTalk.tsx b/src/views/notice/Config/Detail/doc/DingTalk.tsx
index d660bb47..a796a3e7 100644
--- a/src/views/notice/Config/Detail/doc/DingTalk.tsx
+++ b/src/views/notice/Config/Detail/doc/DingTalk.tsx
@@ -1,5 +1,5 @@
// import './index.less';
-import { Image } from 'ant-design-vue';
+import { Image } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm';
const DingTalk = () => {
diff --git a/src/views/notice/Config/Detail/index.vue b/src/views/notice/Config/Detail/index.vue
index 5827bf4b..148b0865 100644
--- a/src/views/notice/Config/Detail/index.vue
+++ b/src/views/notice/Config/Detail/index.vue
@@ -81,6 +81,7 @@
<j-form-item
label="webHook"
v-bind="validateInfos['configuration.url']"
+ :rules='[{ max: 64, message: "最多可输入64个字符" }]'
>
<j-input
v-model:value="
@@ -322,7 +323,7 @@
<script setup lang="ts">
import { getImage } from '@/utils/comm';
-import { Form } from 'ant-design-vue';
+import { Form } from 'jetlinks-ui-components';
import { message } from 'jetlinks-ui-components';
import type { ConfigFormData } from '../types';
import {
diff --git a/src/views/notice/Template/Detail/doc/DingTalk.tsx b/src/views/notice/Template/Detail/doc/DingTalk.tsx
index a90aadd8..44763000 100644
--- a/src/views/notice/Template/Detail/doc/DingTalk.tsx
+++ b/src/views/notice/Template/Detail/doc/DingTalk.tsx
@@ -1,6 +1,6 @@
// import './index.less';
-import { Image } from 'ant-design-vue';
+import { Image } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm';
const DingTalk = () => {
diff --git a/src/views/notice/Template/Detail/doc/WeixinCorp.tsx b/src/views/notice/Template/Detail/doc/WeixinCorp.tsx
index 3ef91910..93f36758 100644
--- a/src/views/notice/Template/Detail/doc/WeixinCorp.tsx
+++ b/src/views/notice/Template/Detail/doc/WeixinCorp.tsx
@@ -20,7 +20,7 @@ const WeixinCorp = () => {
<div>
通知模板结合通知配置为告警消息通知提供支撑。通知模板只能调用同一类型的通知配置服务。
</div>
- <h1>2.模版配置说明</h1>
+ <h1>2.模板配置说明</h1>
<div>
<h2> 1、绑定配置</h2>
<div> 使用固定的通知配置发送此通知模板</div>
diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index b62822dc..babc0e11 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -4,10 +4,10 @@
<j-card>
<j-row>
<j-col :span="10">
- <j-form layout="vertical">
+ <j-form layout="vertical" :rules='formRules' ref='formRef' :model='formData'>
<j-form-item
label="通知方式"
- v-bind="validateInfos.type"
+ name='type'
>
<j-select
v-model:value="formData.type"
@@ -24,7 +24,7 @@
</j-select-option>
</j-select>
</j-form-item>
- <j-form-item label="名称" v-bind="validateInfos.name">
+ <j-form-item label="名称" name='name'>
<j-input
v-model:value="formData.name"
placeholder="请输入名称"
@@ -32,7 +32,7 @@
</j-form-item>
<j-form-item
label="类型"
- v-bind="validateInfos.provider"
+ name='provider'
v-if="
formData.type !== 'email' &&
formData.type !== 'webhook'
@@ -45,14 +45,14 @@
/>
</j-form-item>
<j-form-item
- v-bind="validateInfos.configId"
+ name='configId'
v-if="formData.type !== 'email'"
>
<template #label>
<span>
绑定配置
<j-tooltip
- title="使用固定的通知配置来发送此通知模版"
+ title="使用固定的通知配置来发送此通知模板"
>
<AIcon
type="QuestionCircleOutlined"
@@ -81,7 +81,7 @@
v-if="formData.provider === 'dingTalkMessage'"
>
<j-form-item
- v-bind="validateInfos['template.agentId']"
+ :name='["template", "agentId"]'
>
<template #label>
<span>
@@ -149,9 +149,7 @@
>
<j-form-item
label="消息类型"
- v-bind="
- validateInfos['template.messageType']
- "
+ :name='["template", "messageType"]'
>
<j-select
v-model:value="
@@ -179,11 +177,7 @@
>
<j-form-item
label="标题"
- v-bind="
- validateInfos[
- 'template.markdown.title'
- ]
- "
+ :name='["template", "markdown", "title"]'
>
<j-input
v-model:value="
@@ -200,9 +194,7 @@
>
<j-form-item
label="标题"
- v-bind="
- validateInfos['template.link.title']
- "
+ :name='["template", "link", "title"]'
>
<j-input
v-model:value="
@@ -256,7 +248,7 @@
<!-- 微信 -->
<template v-if="formData.type === 'weixin'">
<j-form-item
- v-bind="validateInfos['template.agentId']"
+ :name='["template", "agentId"]'
>
<template #label>
<span>
@@ -281,7 +273,7 @@
<span>
收信人
<j-tooltip
- title="如果不填写该字段,将在使用此模版发送通知时进行指定。"
+ title="如果不填写该字段,将在使用此模板发送通知时进行指定。"
>
<AIcon
type="QuestionCircleOutlined"
@@ -316,7 +308,7 @@
<span>
标签推送
<j-tooltip
- title="本企业微信的标签ID列表,最多支持100个,如果不填写该字段,将在使用此模版发送通知时进行指定"
+ title="本企业微信的标签ID列表,最多支持100个,如果不填写该字段,将在使用此模板发送通知时进行指定"
>
<AIcon
type="QuestionCircleOutlined"
@@ -335,7 +327,7 @@
<!-- 邮件 -->
<template v-if="formData.type === 'email'">
<j-form-item
- v-bind="validateInfos['template.subject']"
+ :name='["template", "subject"]'
>
<template #label>
<span>
@@ -354,7 +346,7 @@
/>
</j-form-item>
<j-form-item
- v-bind="validateInfos['template.sendTo']"
+ :name='["template", "sendTo"]'
>
<template #label>
<span>
@@ -399,7 +391,7 @@
<!-- 语音 -->
<template v-if="formData.type === 'voice'">
<j-form-item
- v-bind="validateInfos['template.templateType']"
+ :name='["template", "templateType"]'
>
<template #label>
<span>
@@ -432,11 +424,7 @@
<j-row :gutter="10">
<j-col :span="12">
<j-form-item
- v-bind="
- validateInfos[
- 'template.templateCode'
- ]
- "
+ :name='["template", "templateCode"]'
>
<template #label>
<span>
@@ -461,11 +449,7 @@
</j-col>
<j-col :span="12">
<j-form-item
- v-bind="
- validateInfos[
- 'template.calledNumber'
- ]
- "
+ :name='["template", "calledNumber"]'
>
<template #label>
<span>
@@ -490,9 +474,7 @@
</j-col>
</j-row>
<j-form-item
- v-bind="
- validateInfos['template.calledShowNumbers']
- "
+ :name='["template", "calledShowNumbers"]'
>
<template #label>
<span>
@@ -515,7 +497,7 @@
/>
</j-form-item>
<j-form-item
- v-bind="validateInfos['template.playTimes']"
+ :name='["template", "playTimes"]'
>
<template #label>
<span>
@@ -536,11 +518,11 @@
</j-form-item>
<j-form-item
v-if="formData.template.templateType === 'tts'"
- v-bind="validateInfos['template.ttsmessage']"
+ :name='["template", "ttsmessage"]'
>
<template #label>
<span>
- 模版内容
+ 模板内容
<j-tooltip
title="语音验证码内容输入框，用于渲染验语音证码变量。"
>
@@ -563,13 +545,13 @@
<j-row :gutter="10">
<j-col :span="12">
<j-form-item
- v-bind="validateInfos['template.code']"
+ :name='["template", "code"]'
>
<template #label>
<span>
模板
<j-tooltip
- title="阿里云短信平台自定义的模版名称"
+ title="阿里云短信平台自定义的模板名称"
>
<AIcon
type="QuestionCircleOutlined"
@@ -599,11 +581,7 @@
</j-col>
<j-col :span="12">
<j-form-item
- v-bind="
- validateInfos[
- 'template.phoneNumber'
- ]
- "
+ :name='["template", "phoneNumber"]'
>
<template #label>
<span>
@@ -628,7 +606,7 @@
</j-col>
</j-row>
<j-form-item
- v-bind="validateInfos['template.signName']"
+ :name='["template", "signName"]'
>
<template #label>
<span>
@@ -692,11 +670,11 @@
"
>
<j-form-item
- v-bind="validateInfos['template.message']"
+ :name='["template", "message"]'
>
<template #label>
<span>
- 模版内容
+ 模板内容
<j-tooltip
title="发送的内容，支持录入变量"
>
@@ -759,8 +737,8 @@
<script setup lang="ts">
import { getImage } from '@/utils/comm';
-import { Form, UploadChangeParam } from 'ant-design-vue';
-import { message } from 'jetlinks-ui-components';
+import { UploadChangeParam } from 'ant-design-vue';
+import { message, Form } from 'jetlinks-ui-components';
import type { IVariableDefinitions, TemplateFormData } from '../types';
import {
NOTICE_METHOD,
@@ -788,7 +766,7 @@ import { cloneDeep } from 'lodash-es';
const router = useRouter();
const route = useRoute();
const useForm = Form.useForm;
-
+const formRef = ref()
// 消息类型
const msgType = ref([
{
@@ -810,7 +788,7 @@ const formData = ref<TemplateFormData>({
sendTo: [],
attachments: [],
message: '',
- text: '',
+ text: ''
},
name: '',
type: 'email',
@@ -902,133 +880,119 @@ watch(
);
// 验证规则
-const formRules = ref({
+const formRules = {
type: [{ required: true, message: '请选择通知方式' }],
name: [
- { required: true, message: '请输入名称', trigger: 'blur' },
+ { required: true, message: '请输入名称' },
{ max: 64, message: '最多可输入64个字符' },
],
provider: [{ required: true, message: '请选择类型' }],
- configId: [{ required: true, message: '请选择绑定配置', trigger: 'blur' }],
- // 钉钉
- 'template.agentId': [
- { required: true, message: '请输入AgentId', trigger: 'blur' },
- { max: 64, message: '最多可输入64个字符', trigger: 'change' },
- ],
- 'template.messageType': [
- { required: true, message: '请选择消息类型', trigger: 'blur' },
- ],
- 'template.markdown.title': [
- { required: true, message: '请输入标题', trigger: 'blur' },
- { max: 64, message: '最多可输入64个字符', trigger: 'change' },
- ],
- 'template.link.title': [
- { required: true, message: '请输入标题', trigger: 'blur' },
- { max: 64, message: '最多可输入64个字符', trigger: 'change' },
- ],
- // 'template.url': [{ required: true, message: '请输入WebHook' }],
- // 微信
- // 'template.agentId': [{ required: true, message: '请输入AgentId' }],
- // 邮件
- 'template.subject': [
- { required: true, message: '请输入标题', trigger: 'blur' },
- { max: 64, message: '最多可输入64个字符', trigger: 'change' },
- ],
- 'template.sendTo': [
+ configId: [{ required: true, message: '请选择绑定配置' }],
+ template: {
+ agentId: [
+ { required: true, message: '请输入AgentId' },
+ { max: 64, message: '最多可输入64个字符' },
+ ],
+ messageType: [{ required: true, message: '请选择消息类型' }],
+ markdown: {
+ title: [
+ { required: true, message: '请输入标题' },
+ { max: 64, message: '最多可输入64个字符' },
+ ]
+ },
+ link: {
+ title: [
+ { required: true, message: '请输入标题' },
+ { max: 64, message: '最多可输入64个字符' },
+ ]
+ },
+ subject: [
+ { required: true, message: '请输入标题' },
+ { max: 64, message: '最多可输入64个字符' },
+ ],
+ sendTo: [
{
- trigger: 'change',
- validator(_rule: Rule, value: string[]) {
- const regEmail =
- /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
- let error;
- if (value) {
- value.some((item: string) => {
- if (!regEmail.test(item)) {
- error = item;
- return true;
- }
- return false;
- });
+ validator(_rule: Rule, value: string[]) {
+ const regEmail =
+ /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
+ let error;
+ if (value) {
+ value.some((item: string) => {
+ if (!regEmail.test(item)) {
+ error = item;
+ return true;
}
- if (error)
- return Promise.reject(error ? `${error}邮件格式错误` : '');
- else return Promise.resolve();
- },
- },
- ],
- // 阿里云语音
- 'template.templateType': [{ required: true, message: '请选择类型' }],
- 'template.templateCode': [
- { required: true, message: '请输入模板ID', trigger: 'blur' },
- ],
- 'template.calledNumber': [
- { max: 64, message: '最多可输入64个字符', trigger: 'change' },
+ return false;
+ });
+ }
+ if (error)
+ return Promise.reject(error ? `${error}邮件格式错误` : '');
+ else return Promise.resolve();
+ },
+ }
+ ],
+ templateType: [{ required: true, message: '请选择类型' }],
+ templateCode: [{ required: true, message: '请输入模板ID' }],
+ calledNumber: [
+ { max: 64, message: '最多可输入64个字符' },
{
- trigger: 'change',
- validator(_rule: Rule, value: string) {
- if (!value) return Promise.resolve();
- if (!phoneRegEx(value)) return Promise.reject('请输入有效号码');
- return Promise.resolve();
- },
- },
- ],
- 'template.calledShowNumbers': [
- { max: 64, message: '最多可输入64个字符', trigger: 'change' },
+ validator(_rule: Rule, value: string) {
+ if (!value) return Promise.resolve();
+ if (!phoneRegEx(value)) return Promise.reject('请输入有效号码');
+ return Promise.resolve();
+ },
+ }
+ ],
+ calledShowNumbers: [
+ { max: 64, message: '最多可输入64个字符' },
{
- trigger: 'change',
- validator(_rule: Rule, value: string) {
- if (!value) return Promise.resolve();
- if (!phoneRegEx(value)) return Promise.reject('请输入有效号码');
- return Promise.resolve();
- },
- },
- ],
- 'template.playTimes': [
+ validator(_rule: Rule, value: string) {
+ if (!value) return Promise.resolve();
+ if (!phoneRegEx(value)) return Promise.reject('请输入有效号码');
+ return Promise.resolve();
+ },
+ }
+ ],
+ playTimes: [
{
- trigger: 'change',
- validator(_rule: Rule, value: number) {
- if (value < 1 || value > 3)
- return Promise.reject('仅支持1～3次');
- else return Promise.resolve();
- },
- },
- ],
- // 短信
- 'template.code': [
- { required: true, message: '请选择模板', trigger: 'blur' },
- ],
- 'template.signName': [
- { required: true, message: '请输入签名', trigger: 'blur' },
- ],
- 'template.phoneNumber': [
- { max: 64, message: '最多可输入64个字符', trigger: 'change' },
+ validator(_rule: Rule, value: number) {
+ if (value < 1 || value > 3)
+ return Promise.reject('仅支持1～3次');
+ else return Promise.resolve();
+ },
+ }
+ ],
+ code: [{ required: true, message: '请选择模板'}],
+ signName: [{ required: true, message: '请输入签名' }],
+ phoneNumber: [
+ { max: 64, message: '最多可输入64个字符' },
{
- trigger: 'change',
- validator(_rule: Rule, value: string) {
- if (!value) return Promise.resolve();
- if (!phoneRegEx(value))
- return Promise.reject('该字段不是有效的手机号');
- return Promise.resolve();
- },
+ validator(_rule: Rule, value: string) {
+ if (!value) return Promise.resolve();
+ if (!phoneRegEx(value))
+ return Promise.reject('该字段不是有效的手机号');
+ return Promise.resolve();
+ },
+ }
+ ],
+ message: [
+ {
+ required: true,
+ message: '请输入模板内容',
},
- ],
- // webhook
+ { max: 500, message: '最多可输入500个字符' },
+ ],
+ ttsmessage: [
+ { max: 500, message: '最多可输入500个字符' }
+ ]
+ },
description: [{ max: 200, message: '最多可输入200个字符' }],
- 'template.message': [
- {
- required: true,
- message: '请输入模板内容',
- trigger: 'blur',
- },
- { max: 500, message: '最多可输入500个字符', trigger: 'change' },
- ],
- 'template.ttsmessage': [{ max: 500, message: '最多可输入500个字符' }],
-});
+}
-const { resetFields, validate, validateInfos, clearValidate } = useForm(
- formData.value,
- formRules.value,
-);
+// const { validate, validateInfos } = useForm(
+// formData.value,
+// formRules,
+// );
// 字段提取变量
watch(
@@ -1201,6 +1165,7 @@ const handleConfigChange = () => {
*/
const templateList = ref();
const getTemplateList = async () => {
+ if (!formData.value.configId) return
const id = formData.value.configId || undefined;
const { result } = await templateApi.getAliTemplate(id);
templateList.value = result;
@@ -1220,6 +1185,7 @@ const handleTemplateChange = () => {
*/
const signsList = ref();
const getSignsList = async () => {
+ if (!formData.value.configId) return
const id = formData.value.configId || undefined;
const { result } = await templateApi.getSigns(id);
signsList.value = result;
@@ -1252,27 +1218,25 @@ const handleSubmit = () => {
formData.value.template.message = formData.value.template.ttsmessage;
delete formData.value.template.ttsmessage;
}
- // 提交必填验证无法通过, 实际已有值, 问题未知, 暂时解决方法: 延迟验证
- setTimeout(() => {
- validate()
- .then(async () => {
- btnLoading.value = true;
- const res = formData.value.id
- ? await templateApi.update(formData.value)
- : await templateApi.save(formData.value);
+ formRef.value?.validate()
+ .then(async () => {
+ btnLoading.value = true;
- if (res?.success) {
- message.success('保存成功');
- router.back();
- }
- })
- .catch((err) => {
- console.log('err: ', err);
- })
- .finally(() => {
- btnLoading.value = false;
- });
- }, 200);
+ const res = formData.value.id
+ ? await templateApi.update(formData.value)
+ : await templateApi.save(formData.value);
+
+ if (res?.success) {
+ message.success('保存成功');
+ router.back();
+ }
+ })
+ .catch((err) => {
+ console.log('err: ', err);
+ })
+ .finally(() => {
+ btnLoading.value = false;
+ });
};
</script>
diff --git a/src/views/notice/Template/Log/index.vue b/src/views/notice/Template/Log/index.vue
index 038e41ed..840b253a 100644
--- a/src/views/notice/Template/Log/index.vue
+++ b/src/views/notice/Template/Log/index.vue
@@ -50,7 +50,7 @@
import templateApi from '@/api/notice/template';
import { PropType } from 'vue';
import moment from 'moment';
-import { Modal } from 'ant-design-vue';
+import { Modal } from 'jetlinks-ui-components';
type Emits = {
(e: 'update:visible', data: boolean): void;
diff --git a/src/views/oauth/index.vue b/src/views/oauth/index.vue
new file mode 100644
index 00000000..547796f1
--- /dev/null
+++ b/src/views/oauth/index.vue
@@ -0,0 +1,317 @@
+<template>
+ <div class='oauth-warp'>
+ <j-spin :spinning='spinning'>
+ <div class='oauth' v-if='!spinning'>
+ <div class='oauth-header'>
+ <div class='oauth-header-left'>
+ <img :src='logoImg' alt=''>
+ </div>
+ </div>
+
+ <div class='oauth-content'>
+ <!-- 登录 -->
+ <template v-if='isLogin'>
+ <div class='oauth-content-header'>
+ <img :src='headerImg' />
+ </div>
+ <div class='oauth-content-content'>
+ <div class='oauth-content-content-text'>
+ 您正在授权登录,{{ appName }}将获得以下权限:
+ </div>
+ <ul>
+ <li>关联{{userName}}账号</li>
+ <li>获取您的个人信息</li>
+ </ul>
+ <div class='oauth-content-button'>
+ <j-button type='primary' @click='() => goOAuth2Fn()'> 同意授权 </j-button>
+ <j-button type='primary' @click='changeAccount'> 切换账号 </j-button>
+ </div>
+ </div>
+ </template>
+ <template v-else>
+ <div class='oauth-content-header'>
+ <img :src='headerImg' />
+ </div>
+ <div class='oauth-content-login'>
+ <j-form layout='horizontal' size='large' :model='formModel' >
+ <j-form-item name='username'>
+ <j-input placeholder='用户名' v-model:value='formModel.username' />
+ </j-form-item>
+ <j-form-item name='password'>
+ <j-input-password placeholder='密码' v-model:value='formModel.password' />
+ </j-form-item>
+ <j-form-item name='verifyCode' v-if='captcha.base64'>
+ <j-input placeholder='请输入验证码' v-model:value='formModel.verifyCode' >
+ <template #addonAfter>
+ <img
+ :src='captcha.base64'
+ @click='getCode'
+ style='cursor: pointer'
+ />
+ </template>
+ </j-input>
+ </j-form-item>
+ <j-form-item>
+ <j-button
+ type='primary'
+ @click='doLogin'
+ style='width: 100%'
+ >
+ 登录
+ </j-button>
+ </j-form-item>
+ </j-form>
+ </div>
+ </template>
+ </div>
+ </div>
+ </j-spin>
+
+ </div>
+</template>
+
+<script setup lang='ts' name='Oauth'>
+import { TOKEN_KEY } from '@/utils/variable'
+import { config, code, getOAuth2, initApplication, authLogin } from '@/api/login'
+import { getMe_api } from '@/api/home'
+import { getImage } from '@/utils/comm'
+
+const spinning = ref(true)
+const isLogin = ref(false)
+const logoImg = ref('')
+const headerImg = ref('')
+const appName = ref('-')
+const userName = ref('-')
+const internal = ref('false')
+const params = ref()
+
+type LoginParam = {
+ username: string;
+ password: string;
+ expires?: number;
+ verifyCode?: string;
+ verifyKey?: string;
+};
+
+const formModel = reactive({
+ username: undefined,
+ password: undefined,
+ verifyCode: undefined
+})
+
+const captcha = reactive<{base64?: string, key?: string }>({
+ base64: undefined,
+ key: undefined
+})
+
+const getApplication = async (clientId: string) => {
+ const res = await initApplication(clientId)
+ if (res.success) {
+ appName.value = res.result.name
+ }
+}
+
+const getCode = async () => {
+ const resp = await config()
+ if (resp.result?.enabled) {
+ const codeResp = await code()
+ if (codeResp.success) {
+ captcha.base64 = codeResp.result?.base64
+ captcha.key = codeResp.result?.key
+ }
+ }
+}
+
+const goOAuth2Fn = async (data?: any) => {
+ console.log(data, params.value)
+ const res = await getOAuth2(data || params.value)
+ if (res.success) {
+ window.location.href = res.result;
+ } else {
+ getCode()
+ }
+}
+
+const changeAccount = () => {
+ localStorage.removeItem(TOKEN_KEY);
+ isLogin.value = false
+}
+
+const getLoginUser = async (data?: any) => {
+ const res = await getMe_api()
+ if (res.success) {
+ userName.value = res.result?.user.name
+ isLogin.value = true
+ getApplication(data.client_id || params.value.client_id)
+ if (data.internal === 'true' || internal.value === 'true') { // 是否走oauth2
+ goOAuth2Fn(data)
+ }
+ } else if (res.status === 401) {
+ setTimeout(() => {
+ spinning.value = false
+ })
+ getCode()
+ getApplication(data.client_id || params.value.client_id)
+ } else {
+ setTimeout(() => {
+ spinning.value = false
+ })
+ }
+
+}
+
+const getQueryVariable = (variable: any) => {
+ const query = window.location.search.substring(1);
+ const vars = query.split('&');
+ for (let i = 0; i < vars.length; i++) {
+ const pair = vars[i].split('=');
+ if (pair[0] === variable) {
+ return pair[1];
+ }
+ }
+ return '';
+}
+
+const doLogin = async () => {
+ const res = await authLogin({
+ verifyKey: captcha.key,
+ ...formModel
+ })
+ if (res.success) {
+ getLoginUser()
+ const token = res.result.token
+ localStorage.setItem(TOKEN_KEY, token)
+ goOAuth2Fn()
+ } else {
+ getCode()
+ }
+}
+
+const initPage = async () => {
+ let redirectUrl
+ const items = {
+ client_id: getQueryVariable('client_id'),
+ state: getQueryVariable('state'),
+ redirect_uri: decodeURIComponent(getQueryVariable('redirect_uri')),
+ response_type: getQueryVariable('response_type'),
+ scope: getQueryVariable('scope'),
+ }
+ const item = getQueryVariable('internal');
+ if (items.redirect_uri) {
+ const origin = items.redirect_uri.split('/').slice(0, 3)
+ const url = `${origin.join('/')}${items.redirect_uri?.split('redirect=')[1]}`
+ // redirectUrl = `${items.redirect_uri?.split('redirect_uri=')[0]}?redirect=${url}`
+ redirectUrl = items.redirect_uri
+ console.log(origin, items.redirect_uri)
+ }
+
+ getLoginUser({
+ ...items,
+ internal: getQueryVariable('internal'),
+ redirect_uri: redirectUrl,
+ })
+
+ internal.value = item
+ params.value = {
+ ...items,
+ redirect_uri: redirectUrl,
+ }
+}
+
+document.title = 'OAuth授权-jetlinks';
+headerImg.value = getImage('/logo.png')
+
+getCode()
+initPage()
+
+</script>
+
+<style scoped lang='less'>
+.oauth-warp {
+ height: 500px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.oauth {
+ .oauth-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ height: 60px;
+ font-size: 26px;
+ background-color: #fff;
+
+ .oauth-header-left {
+ margin-left: 10%;
+ }
+
+ .oauth-header-right {
+ display: flex;
+ width: 200px;
+ margin-right: 10%;
+ font-size: 14px;
+
+ .oauth-header-right-text {
+ color: rgb(0 0 0 / 70%);
+ }
+
+ // .oauth-header-right-connect {
+ // padding: 0 10px;
+ // }
+ }
+ }
+
+ .oauth-content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-evenly;
+ width: 370px;
+ height: 380px;
+ margin: 0 auto;
+ margin-top: 5%;
+ background: #fff;
+ box-shadow: 0 5px 5px #d4d4d4;
+
+ .oauth-content-header {
+ width: 60px;
+ height: 60px;
+
+ img {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .oauth-content-content {
+ height: 150px;
+ .oauth-content-content-text {
+ margin: 15px 15px;
+ font-size: 16px;
+ line-height: 22px;
+ }
+
+ ul {
+ color: #00000085;
+ list-style: inherit;
+ li {
+ padding-top: 10px;
+ }
+ }
+ }
+
+ .oauth-content-button {
+ display: flex;
+ justify-content: center;
+ width: 100%;
+ gap: 24px;
+ }
+ .oauth-content-login {
+ max-width: 300px;
+ }
+ }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index 7a79de68..265d52d3 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -78,7 +78,7 @@
<div class="content-des-title">
关联场景联动
</div>
- <Ellipsis
+ <Ellipsis style='margin-bottom: 18px;'
><div>
{{ (slotProps?.scene || []).map((item: any) => item?.name).join(',') || '' }}
</div></Ellipsis
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
index ac0e58c1..f68a7736 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
@@ -60,7 +60,7 @@
/>
</template>
<template #content>
- <Ellipsis style="width: calc(100% - 100px)">
+ <Ellipsis style="width: calc(100% - 100px);">
<span style="font-weight: 500">
{{ slotProps.alarmName }}
</span>
diff --git a/src/views/rule-engine/DashBoard/index.vue b/src/views/rule-engine/DashBoard/index.vue
index f3658a2c..d5ed9025 100644
--- a/src/views/rule-engine/DashBoard/index.vue
+++ b/src/views/rule-engine/DashBoard/index.vue
@@ -97,7 +97,7 @@
</template>
<script lang="ts" setup>
-import { Empty } from 'ant-design-vue';
+import { Empty } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm';
import Charts from './components/Charts.vue';
import TopCard from './components/TopCard.vue';
diff --git a/src/views/rule-engine/Instance/index.vue b/src/views/rule-engine/Instance/index.vue
index fba87fe4..1fe94e7b 100644
--- a/src/views/rule-engine/Instance/index.vue
+++ b/src/views/rule-engine/Instance/index.vue
@@ -46,12 +46,12 @@
<template #img>
<slot name="img">
<img
- :src="getImage('/device-product.png')"
+ :src="getImage('/scene/trigger-type/scene.png')"
/>
</slot>
</template>
<template #content>
- <Ellipsis style="width: calc(100% - 100px)">
+ <Ellipsis style="width: calc(100% - 100px); margin-bottom: 18px;">
<span
style="
font-weight: 600;
diff --git a/src/views/rule-engine/Scene/Save/Device/DeviceList.vue b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
index b3d493a7..23107240 100644
--- a/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
+++ b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
@@ -34,7 +34,7 @@
>
<template #img>
<slot name="img">
- <img width='88' height='88' :src="slotProps.photoUrl || getImage('/device/instance/device-card.png')" />
+ <img width='80' height='80' :src="slotProps.photoUrl || getImage('/device/instance/device-card.png')" />
</slot>
</template>
<template #content>
diff --git a/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue b/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue
index 027d82e6..90f136bd 100644
--- a/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue
+++ b/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue
@@ -2,7 +2,7 @@
<div class='device-select'>
<TopCard :options='typeList' v-model:value='selectorModel' @select='select' />
<DeviceList v-if='selectorModel === "fixed"' :productId='productId' :row-keys='devices' @update='updateDevice' />
- <OrgList v-else-if='selectorModel === "org"' :productId='productId' :row-keys='orgIds' @update='updateOrg' />
+ <OrgList v-else-if='selectorModel === "org" && isNoCommunity' :productId='productId' :row-keys='orgIds' @update='updateOrg' />
</div>
</template>
@@ -13,6 +13,7 @@ import OrgList from './OrgList.vue'
import { getImage } from '@/utils/comm'
import type { PropType } from 'vue'
import { SelectorValuesItem } from '@/views/rule-engine/Scene/typings'
+import { isNoCommunity } from '@/utils/utils'
type Emit = {
(e: 'update:selector', data: string): void
@@ -50,11 +51,14 @@ const selectorModel = ref(props.selector)
const devices = ref(props.deviceKeys)
const orgIds = ref(props.orgId)
-const typeList = [
+const typeList = ref([
{ label: '自定义', value: 'fixed', tip: '自定义选择当前产品下的任意设备', img: getImage('/scene/device-custom.png')},
{ label: '全部', value: 'all', tip: '产品下的所有设备', img: getImage('/scene/trigger-device-all.png')},
- { label: '按组织', value: 'org', tip: '选择产品下归属于具体组织的设备', img: getImage('/scene/trigger-device-org.png')},
-]
+])
+
+if (isNoCommunity) {
+ typeList.value.push({ label: '按组织', value: 'org', tip: '选择产品下归属于具体组织的设备', img: getImage('/scene/trigger-device-org.png')},)
+}
const select = (s: string) => {
selectorModel.value = s
diff --git a/src/views/rule-engine/Scene/Save/Device/Product.vue b/src/views/rule-engine/Scene/Save/Device/Product.vue
index a1725b6d..613cbe67 100644
--- a/src/views/rule-engine/Scene/Save/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Product.vue
@@ -31,7 +31,7 @@
>
<template #img>
<slot name="img">
- <img width='88' height='88' :src="slotProps.photoUrl || getImage('/device-product.png')" />
+ <img width='80' height='80' :src="slotProps.photoUrl || getImage('/device-product.png')" />
</slot>
</template>
<template #content>
diff --git a/src/views/rule-engine/Scene/Save/action/Device/Product.vue b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
index 8ca557e1..ecfcfe0d 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
@@ -31,8 +31,8 @@
<template #img>
<slot name="img">
<img
- :width="88"
- :height="88"
+ :width="80"
+ :height="80"
:src="
slotProps.photoUrl ||
getImage('/device-product.png')
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
index b5a1f4c1..1a04129c 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
@@ -258,6 +258,10 @@ const onSelectorChange = (val: string) => {
modelRef.selector = val;
};
+/**
+ * 切换设备
+ * @param _detail
+ */
const onDeviceChange = (_detail: any) => {
if (_detail) {
if (_detail.id) {
@@ -269,10 +273,16 @@ const onDeviceChange = (_detail: any) => {
modelRef.deviceId = '';
modelRef.selectorValues = [] as any;
}
+ modelRef.upperKey = ''
emits('save', unref(modelRef), { name: _detail.name });
}
};
+/**
+ * 变量选择
+ * @param val
+ * @param options
+ */
const onRelationChange = (val: any, options: any) => {
modelRef.deviceId = 'deviceId';
modelRef.source = 'upper';
@@ -281,6 +291,11 @@ const onRelationChange = (val: any, options: any) => {
emits('save', unref(modelRef), { relationName: options.label });
};
+/**
+ *
+ * @param val
+ * @param arr
+ */
const onTagChange = (val: any[], arr: any[]) => {
if (val) {
modelRef.deviceId = 'deviceId';
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
index c0248b84..5469d1d2 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
@@ -348,6 +348,7 @@ const termAdd = () => {
}
const onDelete = () => {
+ const key = formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.actionName].terms?.[props.termsName].terms?.[props.name].key
formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.actionName].terms?.[props.termsName].terms?.splice(props.name, 1)
const _options = formModel.value.branches![props.branchName].then[props.thenName].actions[props.name].options
const termsColumns = _options?.termsColumns || []
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
index 3e7c95c7..c178ad34 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
@@ -107,8 +107,11 @@ const onKeys: string[] = EventSubscribeKeys({
action: props.actionName
})
-const handleRequest = () => {
- columnRequest()
+const handleRequest = (e: any) => {
+ const hasDelete = 'isDelete' in e
+ if (!hasDelete) {
+ columnRequest()
+ }
}
EventEmitter.subscribe(onKeys, handleRequest)
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
index 0c832ba9..c4884343 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
@@ -6,328 +6,328 @@
>
<div class="actions-item">
<CheckItem v-bind='props'>
- <div class="item-options-warp">
- <div class="item-options-type" @click="onAdd">
- <img
- style="width: 18px"
- :src="
- iconMap.get(
- data?.executor === 'alarm'
- ? data?.alarm?.mode
- : data?.executor,
- )
- "
- />
- </div>
- <div
- class="item-options-content"
- v-if="data?.executor === 'alarm'"
- >
- <template v-if="data?.alarm?.mode === 'trigger'">
- 满足条件后将触发<j-button
- style="padding: 0"
- type="link"
- @click.stop="triggerVisible = true"
- >关联此场景的告警</j-button
- >
- </template>
- <template v-else>
- 满足条件后将解除<j-button
- style="padding: 0"
- type="link"
- @click.stop="triggerVisible = true"
- >关联此场景的告警</j-button
- >
- </template>
- </div>
- <div
- class="item-options-content"
- v-else-if="data?.executor === 'notify'"
- @click="onType('notify')"
- >
- <template v-if="data?.notify?.notifyType === 'dingTalk'">
- <template
- v-if="options?.provider === 'dingTalkRobotWebHook'"
- >
- <div>
- 通过<span class="notify-text-highlight"
- >群机器人消息</span
- >
- 发送
- <span class="notify-text-highlight">
- {{
- options?.templateName ||
- data?.notify?.templateId
- }}
- </span>
- </div>
- </template>
- <template v-else>
- <div>
- 通过
- <span class="notify-text-highlight">
- <img
- style="width: 18px"
- :src="
- itemNotifyIconMap.get(
- data?.notify?.notifyType,
- )
- "
- />
- 钉钉
- </span>
- 向<span class="notify-text-highlight">{{
- options?.sendTo || ''
- }}</span>
- <span class="notify-text-highlight">{{
- options?.orgName || ''
- }}</span>
- 发送
- <span class="notify-text-highlight">
- {{
- options?.templateName ||
- data?.notify?.templateId
- }}
- </span>
- </div>
- </template>
- </template>
- <template v-else-if="data?.notify?.notifyType === 'weixin'">
- <div>
- 通过
- <span class="notify-text-highlight">
- <img
- style="width: 18px"
- :src="
- itemNotifyIconMap.get(
- data?.notify?.notifyType,
- )
- "
- />
- 微信
- </span>
- 向<span class="notify-text-highlight">{{
- options?.sendTo || ''
- }}</span>
- <span class="notify-text-highlight">{{
- options?.orgName || ''
- }}</span>
- <span class="notify-text-highlight">{{
- options?.tagName || ''
- }}</span>
- 发送
- <span class="notify-text-highlight">
- {{
- options?.templateName ||
- data?.notify?.templateId
- }}
- </span>
- </div>
- </template>
- <template v-else-if="data?.notify?.notifyType === 'email'">
- <div style="display: flex;">
- 通过
- <span class="notify-text-highlight">
- <img
- style="width: 18px"
- :src="
- itemNotifyIconMap.get(
- data?.notify?.notifyType,
- )
- "
- />
- 邮件
- </span>
- 向<span class="notify-text-highlight">
- <Ellipsis style='max-width: 400px;'>
- {{
+ <div class="item-options-warp">
+ <div class="item-options-type" @click="onAdd">
+ <img
+ style="width: 18px"
+ :src="
+ iconMap.get(
+ data?.executor === 'alarm'
+ ? data?.alarm?.mode
+ : data?.executor,
+ )
+ "
+ />
+ </div>
+ <div
+ class="item-options-content"
+ v-if="data?.executor === 'alarm'"
+ >
+ <template v-if="data?.alarm?.mode === 'trigger'">
+ 满足条件后将触发<j-button
+ style="padding: 0"
+ type="link"
+ @click.stop="triggerVisible = true"
+ >关联此场景的告警</j-button
+ >
+ </template>
+ <template v-else>
+ 满足条件后将解除<j-button
+ style="padding: 0"
+ type="link"
+ @click.stop="triggerVisible = true"
+ >关联此场景的告警</j-button
+ >
+ </template>
+ </div>
+ <div
+ class="item-options-content"
+ v-else-if="data?.executor === 'notify'"
+ @click="onType('notify')"
+ >
+ <template v-if="data?.notify?.notifyType === 'dingTalk'">
+ <template
+ v-if="options?.provider === 'dingTalkRobotWebHook'"
+ >
+ <div>
+ 通过<span class="notify-text-highlight"
+ >群机器人消息</span
+ >
+ 发送
+ <span class="notify-text-highlight">
+ {{
+ options?.templateName ||
+ data?.notify?.templateId
+ }}
+ </span>
+ </div>
+ </template>
+ <template v-else>
+ <div>
+ 通过
+ <span class="notify-text-highlight">
+ <img
+ style="width: 18px"
+ :src="
+ itemNotifyIconMap.get(
+ data?.notify?.notifyType,
+ )
+ "
+ />
+ 钉钉
+ </span>
+ 向<span class="notify-text-highlight">{{
+ options?.sendTo || ''
+ }}</span>
+ <span class="notify-text-highlight">{{
+ options?.orgName || ''
+ }}</span>
+ 发送
+ <span class="notify-text-highlight">
+ {{
+ options?.templateName ||
+ data?.notify?.templateId
+ }}
+ </span>
+ </div>
+ </template>
+ </template>
+ <template v-else-if="data?.notify?.notifyType === 'weixin'">
+ <div>
+ 通过
+ <span class="notify-text-highlight">
+ <img
+ style="width: 18px"
+ :src="
+ itemNotifyIconMap.get(
+ data?.notify?.notifyType,
+ )
+ "
+ />
+ 微信
+ </span>
+ 向<span class="notify-text-highlight">{{
options?.sendTo || ''
- }}
- </Ellipsis>
- </span>
- 发送
- <span class="notify-text-highlight">
+ }}</span>
+ <span class="notify-text-highlight">{{
+ options?.orgName || ''
+ }}</span>
+ <span class="notify-text-highlight">{{
+ options?.tagName || ''
+ }}</span>
+ 发送
+ <span class="notify-text-highlight">
+ {{
+ options?.templateName ||
+ data?.notify?.templateId
+ }}
+ </span>
+ </div>
+ </template>
+ <template v-else-if="data?.notify?.notifyType === 'email'">
+ <div style="display: flex;">
+ 通过
+ <span class="notify-text-highlight">
+ <img
+ style="width: 18px"
+ :src="
+ itemNotifyIconMap.get(
+ data?.notify?.notifyType,
+ )
+ "
+ />
+ 邮件
+ </span>
+ 向<span class="notify-text-highlight">
+ <Ellipsis style='max-width: 400px;'>
{{
- options?.templateName ||
- data?.notify?.templateId
- }}
+ options?.sendTo || ''
+ }}
+ </Ellipsis>
</span>
- </div>
- </template>
- <template v-else-if="data?.notify?.notifyType === 'voice'">
- <div>
- 通过
- <span class="notify-text-highlight">
- <img
- style="width: 18px"
- :src="
- itemNotifyIconMap.get(
- data?.notify?.notifyType,
+ 发送
+ <span class="notify-text-highlight">
+ {{
+ options?.templateName ||
+ data?.notify?.templateId
+ }}
+ </span>
+ </div>
+ </template>
+ <template v-else-if="data?.notify?.notifyType === 'voice'">
+ <div>
+ 通过
+ <span class="notify-text-highlight">
+ <img
+ style="width: 18px"
+ :src="
+ itemNotifyIconMap.get(
+ data?.notify?.notifyType,
+ )
+ "
+ />
+ 语音
+ </span>
+ 向<span class="notify-text-highlight">{{
+ options?.sendTo || ''
+ }}</span>
+ 发送
+ <span class="notify-text-highlight">
+ {{
+ options?.templateName ||
+ data?.notify?.templateId
+ }}
+ </span>
+ </div>
+ </template>
+ <template v-else-if="data?.notify?.notifyType === 'sms'">
+ <div>
+ 通过
+ <span class="notify-text-highlight">
+ <img
+ style="width: 18px"
+ :src="
+ itemNotifyIconMap.get(
+ data?.notify?.notifyType,
+ )
+ "
+ />
+ 短信
+ </span>
+ 向<span class="notify-text-highlight">{{
+ options?.sendTo || ''
+ }}</span>
+ 发送
+ <span class="notify-text-highlight">
+ {{
+ options?.templateName ||
+ data?.notify?.templateId
+ }}
+ </span>
+ </div>
+ </template>
+ <template
+ v-else-if="data?.notify?.notifyType === 'webhook'"
+ >
+ <div>
+ 通过
+ <span class="notify-text-highlight">
+ <img
+ style="width: 18px"
+ :src="
+ itemNotifyIconMap.get(
+ data?.notify?.notifyType,
+ )
+ "
+ />
+ webhook
+ </span>
+ 发送
+ <span>{{
+ options?.templateName ||
+ data?.notify?.templateId
+ }}</span>
+ </div>
+ </template>
+ </div>
+ <div
+ class="item-options-content"
+ v-else-if="data?.executor === 'delay'"
+ @click="onType('delay')"
+ >
+ {{ options?.name }}
+ </div>
+ <div
+ class="item-options-content"
+ v-else-if="data?.executor === 'device'"
+ @click="onType('device')"
+ >
+ <template v-if="['fixed', 'context'].includes(data?.device?.selector)">
+ <div style='display: flex; align-items: center;'>
+ <AIcon
+ :type="
+ typeIconMap[
+ data?.device?.message?.messageType ||
+ 'INVOKE_FUNCTION'
+ ]
+ "
+ />
+ <span style="padding-left: 4px">{{
+ data?.options?.type
+ }}</span>
+ <AIcon
+ type="icon-mubiao"
+ style="padding:0 4px"
+ />
+ <Ellipsis style='max-width: 200px;margin-right: 12px;'>
+ {{data?.options?.name}}
+ </Ellipsis>
+ <Ellipsis style='max-width: 400px;'>
+ {{data?.options?.propertiesName}}
+ </Ellipsis>
+ <span v-if='!isBoolean(data?.options?.propertiesValue) && data?.options?.propertiesValue'>为 </span>
+ <Ellipsis style='max-width: 200px;'>
+ {{
+ `${
+ (
+ isBoolean(
+ data?.options?.propertiesValue,
)
- "
- />
- 语音
- </span>
- 向<span class="notify-text-highlight">{{
- options?.sendTo || ''
- }}</span>
- 发送
- <span class="notify-text-highlight">
- {{
- options?.templateName ||
- data?.notify?.templateId
- }}
- </span>
- </div>
- </template>
- <template v-else-if="data?.notify?.notifyType === 'sms'">
- <div>
- 通过
- <span class="notify-text-highlight">
- <img
- style="width: 18px"
- :src="
- itemNotifyIconMap.get(
- data?.notify?.notifyType,
- )
- "
- />
- 短信
- </span>
- 向<span class="notify-text-highlight">{{
- options?.sendTo || ''
- }}</span>
- 发送
- <span class="notify-text-highlight">
- {{
- options?.templateName ||
- data?.notify?.templateId
- }}
- </span>
- </div>
- </template>
- <template
- v-else-if="data?.notify?.notifyType === 'webhook'"
- >
- <div>
- 通过
- <span class="notify-text-highlight">
- <img
- style="width: 18px"
- :src="
- itemNotifyIconMap.get(
- data?.notify?.notifyType,
- )
- "
- />
- webhook
- </span>
- 发送
- <span>{{
- options?.templateName ||
- data?.notify?.templateId
- }}</span>
- </div>
- </template>
- </div>
- <div
- class="item-options-content"
- v-else-if="data?.executor === 'delay'"
- @click="onType('delay')"
- >
- {{ options?.name }}
- </div>
- <div
- class="item-options-content"
- v-else-if="data?.executor === 'device'"
- @click="onType('device')"
- >
- <template v-if="['fixed', 'context'].includes(data?.device?.selector)">
- <div style='display: flex; align-items: center;'>
- <AIcon
- :type="
- typeIconMap[
- data?.device?.message?.messageType ||
- 'INVOKE_FUNCTION'
- ]
- "
- />
- <span style="padding-left: 4px">{{
- data?.options?.type
- }}</span>
- <AIcon
- type="icon-mubiao"
- style="padding:0 4px"
- />
- <Ellipsis style='max-width: 200px;margin-right: 12px;'>
- {{data?.options?.name}}
- </Ellipsis>
- <Ellipsis style='max-width: 400px;'>
- {{data?.options?.propertiesName}}
- </Ellipsis>
- <span v-if='!isBoolean(data?.options?.propertiesValue) && data?.options?.propertiesValue'>为 </span>
- <Ellipsis style='max-width: 200px;'>
- {{
- `${
- (
- isBoolean(
- data?.options?.propertiesValue,
- )
- ? true
- : data?.options?.propertiesValue
- )
- ? `${data?.options?.propertiesValue}`
- : ''
- }`
- }}
- </Ellipsis>
+ ? true
+ : data?.options?.propertiesValue
+ )
+ ? `${data?.options?.propertiesValue}`
+ : ''
+ }`
+ }}
+ </Ellipsis>
- </div>
- </template>
- <template v-else-if="data?.device?.selector === 'tag'">
- <div>
- <AIcon
- :type="
- typeIconMap[
- data?.device?.message?.messageType ||
- 'INVOKE_FUNCTION'
- ]
- "
- />
- {{ data?.options?.type }}
- <span>{{ data?.options?.tagName }}</span>
- 的{{ data?.options?.productName }}
- {{ data?.options?.propertiesName }}
- </div>
- </template>
- <template v-else-if="data?.device?.selector === 'relation'">
- <div>
- <AIcon
- :type="
- typeIconMap[
- data?.device?.message?.messageType ||
- 'INVOKE_FUNCTION'
- ]
- "
- />
- {{ data?.options?.type }}与<span>{{
- data?.options?.triggerName
- }}</span
- >具有相同 {{ data?.options?.relationName }}的{{
- data?.options?.productName
- }}设备的
- {{ data?.options?.propertiesName }}
- </div>
- </template>
- </div>
- <j-button v-else @click="onAdd">点击配置执行动作</j-button>
- </div>
- <div class="item-number">{{ name + 1 }}</div>
- <j-popconfirm title="确认删除？" @confirm="onDelete" placement="topRight" :overlayStyle='{minWidth: "190px"}'>
- <div class="item-delete">
- <AIcon type="DeleteOutlined" />
- </div>
- </j-popconfirm>
+ </div>
+ </template>
+ <template v-else-if="data?.device?.selector === 'tag'">
+ <div>
+ <AIcon
+ :type="
+ typeIconMap[
+ data?.device?.message?.messageType ||
+ 'INVOKE_FUNCTION'
+ ]
+ "
+ />
+ {{ data?.options?.type }}
+ <span>{{ data?.options?.tagName }}</span>
+ 的{{ data?.options?.productName }}
+ {{ data?.options?.propertiesName }}
+ </div>
+ </template>
+ <template v-else-if="data?.device?.selector === 'relation'">
+ <div>
+ <AIcon
+ :type="
+ typeIconMap[
+ data?.device?.message?.messageType ||
+ 'INVOKE_FUNCTION'
+ ]
+ "
+ />
+ {{ data?.options?.type }}与<span>{{
+ data?.options?.triggerName
+ }}</span
+ >具有相同 {{ data?.options?.relationName }}的{{
+ data?.options?.productName
+ }}设备的
+ {{ data?.options?.propertiesName }}
+ </div>
+ </template>
+ </div>
+ <j-button v-else @click="onAdd">点击配置执行动作</j-button>
+ </div>
+ <div class="item-number">{{ name + 1 }}</div>
+ <j-popconfirm title="确认删除？" @confirm="onDelete" placement="topRight" :overlayStyle='{minWidth: "190px"}'>
+ <div class="item-delete">
+ <AIcon type="DeleteOutlined" />
+ </div>
+ </j-popconfirm>
</CheckItem>
</div>
</j-form-item>
@@ -461,11 +461,14 @@ const termsOptions = computed(() => {
});
const onDelete = () => {
+ const key = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].key
+ EventEmitter.emit(key!, { isDelete: true })
if (props.name !== 0 && !props.parallel) { // 清空上一个串行执行动作中的options.termsColumns和terms
_data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].options!.termsColumns = []
_data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].options!.terms = []
_data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].terms = []
}
+
emit('delete');
};
@@ -551,9 +554,9 @@ const onPropsCancel = () => {
const rules = [{
validator(_: any, v?: ActionsType) {
- console.log('validator',v)
+ console.log('validator-action-item',v)
if (v?.executor === 'device') {
- if(!v.device?.productId || !v.device?.selectorValues) {
+ if(v?.device?.source === 'fixed' && (!v.device?.productId || !v.device?.selectorValues)) {
return Promise.reject(new Error('该数据已发生变更，请重新配置'))
}
}
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
index 229b8464..1d15c422 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
@@ -73,19 +73,6 @@ const thenName = computed(() => {
return _data.value.branches![props.branchesName].then.findIndex(item => item.parallel === props.parallel)
})
-
-const rules = [{
- validator(_: any, v?: ActionsType) {
- console.log('validator',v)
- if (v?.executor === 'device') {
- if(!v.device?.productId || !v.device?.selectorValues) {
- return Promise.reject(new Error('该数据已发生变更，请重新配置'))
- }
- }
- return Promise.resolve()
- }
-}]
-
const onAdd = () => {
visible.value = true;
};
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue
index 031f051d..a086a64d 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue
@@ -37,7 +37,7 @@
:src="
getLogo(slotProps.type, slotProps.provider)
"
- class="logo"
+ class="notify-logo"
/>
</slot>
</template>
@@ -186,7 +186,7 @@ watch(
padding: 0;
}
-.logo {
+.notify-logo {
width: 88px;
height: 88px;
}
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue
index 066dbecd..d7837609 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue
@@ -38,7 +38,7 @@
:src="
getLogo(slotProps.type, slotProps.provider)
"
- class="logo"
+ class="notify-logo"
/>
</slot>
</template>
@@ -189,7 +189,7 @@ watch(
padding: 0;
}
-.logo {
+.notify-logo {
width: 88px;
height: 88px;
}
diff --git a/src/views/rule-engine/Scene/Save/util.ts b/src/views/rule-engine/Scene/Save/util.ts
index 1e0bd228..c35fb190 100644
--- a/src/views/rule-engine/Scene/Save/util.ts
+++ b/src/views/rule-engine/Scene/Save/util.ts
@@ -68,6 +68,8 @@ export const EventEmitterKeys = (params: Params): string => {
* @constructor
*/
export const EventSubscribeKeys = (params: Params): string[] => {
+ const sceneStore = useSceneStore()
+
let keys: string[] = []
if (params.action === 0) {
@@ -75,10 +77,14 @@ export const EventSubscribeKeys = (params: Params): string[] => {
}
for (let i = 0; i <= params.action; i++) {
- const _b = `branches_${params.branch}` // branchesName
- const _t = `then_${params.branchGroup}` // thenName
- const _a = `then_${i}` // actionName
- keys.push(`${_b}_${_t}_${_a}`)
+ let key = sceneStore.data.branches?.[params.branch].then[params.branchGroup].actions[i]?.key
+ if (!key) {
+ const _b = `branches_${params.branch}` // branchesName
+ const _t = `then_${params.branchGroup}` // thenName
+ const _a = `then_${i}` // actionName
+ key = `${_b}_${_t}_${_a}`
+ }
+ keys.push(key)
}
return keys
diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue
index b9aa6cef..f41e57df 100644
--- a/src/views/rule-engine/Scene/index.vue
+++ b/src/views/rule-engine/Scene/index.vue
@@ -61,7 +61,7 @@
<span class='subTitle-content'>
<Ellipsis :lineClamp="2">
{{
- slotProps?.description ||
+ slotProps?.description ? slotProps?.description :
typeMap.get(slotProps.triggerType)?.tip
}}
</Ellipsis>
@@ -137,7 +137,7 @@ import SaveModal from './Save/save.vue';
import type { SceneItem } from './typings';
import { useMenuStore } from 'store/menu';
import { query, _delete, _action, _execute } from '@/api/rule-engine/scene';
-import { message } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
import type { ActionsType } from '@/components/Table';
import { getImage } from '@/utils/comm';
import BadgeStatus from '@/components/BadgeStatus/index.vue';
@@ -388,7 +388,7 @@ const handleView = (id: string, triggerType: string) => {
<style scoped lang='less'>
.subTitle {
position: relative;
- margin-top: 10px;
+ margin-top: 18px;
.subTitle-title {
position: absolute;
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index 84cd8aa3..7729397b 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -1065,12 +1065,10 @@
>
<img
v-if="
- form.data.sso.configuration.oauth2
- .logoUrl
+ form.data.logoUrl
"
:src="
- form.data.sso.configuration.oauth2
- .logoUrl
+ form.data.logoUrl
"
alt="avatar"
style="width: 150px"
@@ -1333,6 +1331,10 @@
required: true,
message: '请输入默认密码',
},
+ {
+ min: 8,
+ message: '最少输入8个字符',
+ },
{
max: 64,
message: '最多可输入64个字符',
@@ -1456,10 +1458,10 @@ import type { formType, dictType, optionsType } from '../typing';
import { getRoleList_api } from '@/api/system/user';
import {
FormInstance,
- message,
UploadChangeParam,
UploadFile,
} from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components'
import { randomString } from '@/utils/utils';
import { cloneDeep, difference } from 'lodash';
import { useMenuStore } from '@/store/menu';
@@ -1905,7 +1907,7 @@ function changeBackUpload(info: UploadChangeParam<UploadFile<any>>) {
} else if (info.file.status === 'done') {
info.file.url = info.file.response?.result;
form.uploadLoading = false;
- form.data.sso.configuration.oauth2.logoUrl = info.file.response?.result;
+ form.data.logoUrl = info.file.response?.result;
} else if (info.file.status === 'error') {
form.uploadLoading = false;
message.error('logo上传失败，请稍后再试');
diff --git a/src/views/system/DataSource/Management/index.vue b/src/views/system/DataSource/Management/index.vue
index 0c403e48..6a703441 100644
--- a/src/views/system/DataSource/Management/index.vue
+++ b/src/views/system/DataSource/Management/index.vue
@@ -225,7 +225,8 @@ import {
} from '@/api/system/dataSource';
import { onlyMessage } from '@/utils/comm';
import { randomString } from '@/utils/utils';
-import { FormInstance, message } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
import { DataNode } from 'ant-design-vue/lib/tree';
import _ from 'lodash';
import { cloneDeep } from 'lodash';
diff --git a/src/views/system/DataSource/components/EditDialog.vue b/src/views/system/DataSource/components/EditDialog.vue
index 702512c1..3753d2e4 100644
--- a/src/views/system/DataSource/components/EditDialog.vue
+++ b/src/views/system/DataSource/components/EditDialog.vue
@@ -195,7 +195,8 @@ import {
getDataTypeDict_api,
saveDataSource_api,
} from '@/api/system/dataSource';
-import { FormInstance, message } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
import { Rule } from 'ant-design-vue/lib/form';
import type { dictItemType, optionItemType, sourceItemType } from '../typing';
diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index b85419a2..3ba88933 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -70,8 +70,11 @@
</slot>
</template>
<template #content>
- <h3 class="card-item-content-title">
+ <h3 class="card-item-content-title" style='margin-bottom: 18px;'>
+ <Ellipsis style="width: calc(100% - 100px);"
+ >
{{ slotProps.name }}
+ </Ellipsis>
</h3>
<j-row>
<j-col :span="12">
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index ec80e69e..dae9ce0f 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -4,6 +4,7 @@
:columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}"
+ style='margin-bottom: 0;'
/>
<FullPage>
<j-pro-table
@@ -87,8 +88,11 @@
</slot>
</template>
<template #content>
- <h3 class="card-item-content-title">
+ <h3 class="card-item-content-title" style='margin-bottom: 18px;'>
+ <Ellipsis style="width: calc(100% - 100px);"
+ >
{{ slotProps.name }}
+ </Ellipsis>
</h3>
<j-row>
<j-col :span="12">
diff --git a/src/views/system/Department/index.vue b/src/views/system/Department/index.vue
index 7f40433e..c6d993e6 100644
--- a/src/views/system/Department/index.vue
+++ b/src/views/system/Department/index.vue
@@ -6,7 +6,7 @@
<LeftTree @change="(id) => (departmentId = id)" />
</div>
<div class="right">
- <j-tabs v-model:activeKey="activeKey" destroyInactiveTabPane>
+ <j-tabs v-if='isNoCommunity' v-model:activeKey="activeKey" destroyInactiveTabPane>
<j-tab-pane key="product" tab="产品">
<Product
:parentId="departmentId"
@@ -23,6 +23,7 @@
<User :parentId="departmentId" />
</j-tab-pane>
</j-tabs>
+ <User :parentId="departmentId" v-else />
</div>
</div>
</div>
@@ -34,6 +35,7 @@ import LeftTree from './components/LeftTree.vue';
import Product from './product/index.vue';
import Device from './device/index.vue';
import User from './user/index.vue';
+import { isNoCommunity } from '@/utils/utils'
const activeKey = ref<'product' | 'device' | 'user'>('product');
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index a57f31e9..d838b830 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -4,6 +4,7 @@
:columns="columns"
target="category"
@search="(params:any)=>queryParams = {...params}"
+ style='margin-bottom: 0;'
/>
<FullPage>
<j-pro-table
@@ -86,8 +87,11 @@
</slot>
</template>
<template #content>
- <h3 class="card-item-content-title">
+ <h3 class="card-item-content-title" style='margin-bottom: 18px;'>
+ <Ellipsis style="width: calc(100% - 100px);"
+ >
{{ slotProps.name }}
+ </Ellipsis>
</h3>
<j-row>
<j-col :span="12">
diff --git a/src/views/system/Department/user/index.vue b/src/views/system/Department/user/index.vue
index ec3857f7..17867849 100644
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@@ -4,6 +4,7 @@
:columns="columns"
target="category"
@search="handleParams"
+ style='margin-bottom: 0;'
/>
<FullPage>
<j-pro-table
@@ -31,6 +32,7 @@
:hasPermission="`${permission}:bind-user`"
@click="dialogVisible = true"
style="margin-right: 15px"
+ :disabled='!parentId'
>
<AIcon type="PlusOutlined" />绑定用户
</PermissionButton>
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 8c4ebeb4..e070b92a 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -242,6 +242,7 @@
route.params.id === ':id' ? 'add' : 'update'
}`"
@click="form.clickSave"
+ :loading='form.saveLoading'
>
保存
</PermissionButton>
@@ -258,7 +259,8 @@
<script setup lang="ts">
import PermissionButton from '@/components/PermissionButton/index.vue';
-import { FormInstance, message } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
import ChooseIconDialog from '../components/ChooseIconDialog.vue';
import PermissChoose from '../components/PermissChoose.vue';
diff --git a/src/views/system/Menu/components/PermissChoose.vue b/src/views/system/Menu/components/PermissChoose.vue
index f4b138cd..83cf39cc 100644
--- a/src/views/system/Menu/components/PermissChoose.vue
+++ b/src/views/system/Menu/components/PermissChoose.vue
@@ -46,7 +46,7 @@
<script setup lang="ts">
import { exportPermission_api } from '@/api/system/permission';
-import { Form } from 'ant-design-vue';
+import { Form } from 'jetlinks-ui-components';
Form.useInjectFormItemContext();
const props = defineProps<{
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index e203810d..0d21f15e 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -85,11 +85,17 @@ import { message } from 'jetlinks-ui-components';
import dayjs from 'dayjs';
import { useUserInfo } from '@/store/userInfo';
import { MESSAGE_SUBSCRIBE_MENU_CODE, USER_CENTER_MENU_CODE } from '@/utils/consts'
-const admin = useUserInfo().userInfos?.type.id === 'admin';
+import { storeToRefs } from 'pinia';
const permission = 'system/Menu';
const router = useRouter();
+const userInfoStore = useUserInfo()
+const { userInfos } = storeToRefs(userInfoStore)
+
+const admin = computed(() => {
+ return userInfos.value?.username === 'admin';
+})
const columns = [
{
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index dfa74792..a4d9cc9f 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -35,7 +35,7 @@ import {
delOperations_api,
updateOperations_api,
} from '@/api/system/apiPage';
-import { message } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
import { modeType } from '../typing';
import { useDepartmentStore } from '@/store/department';
diff --git a/src/views/system/Relationship/components/EditDialog.vue b/src/views/system/Relationship/components/EditDialog.vue
index 73e4170e..78ac0e67 100644
--- a/src/views/system/Relationship/components/EditDialog.vue
+++ b/src/views/system/Relationship/components/EditDialog.vue
@@ -96,7 +96,8 @@
</template>
<script setup lang="ts">
-import { FormInstance, message } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
import { Rule } from 'ant-design-vue/es/form';
import {
diff --git a/src/views/system/Role/components/AddDialog.vue b/src/views/system/Role/components/AddDialog.vue
index 76ad205f..89941f64 100644
--- a/src/views/system/Role/components/AddDialog.vue
+++ b/src/views/system/Role/components/AddDialog.vue
@@ -36,7 +36,8 @@
</template>
<script setup lang="ts">
-import { FormInstance, message } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
import { saveRole_api } from '@/api/system/role';
import { useMenuStore } from '@/store/menu';
const route = useRoute();
diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue
index ca333beb..f63ffac7 100644
--- a/src/views/system/User/components/EditUserDialog.vue
+++ b/src/views/system/User/components/EditUserDialog.vue
@@ -184,7 +184,8 @@
<script setup lang="ts">
import PermissionButton from '@/components/PermissionButton/index.vue';
-import { FormInstance, message } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
import {
validateField_api,
getRoleList_api,
diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue
index f313f2a3..ce2fdc2f 100644
--- a/src/views/user/Login/index.vue
+++ b/src/views/user/Login/index.vue
@@ -37,16 +37,11 @@
:model="form"
class="login-form"
@finish="onFinish"
+ :rules='rules'
>
<j-form-item
label="账号"
name="username"
- :rules="[
- {
- required: true,
- message: '请输入账号!',
- },
- ]"
>
<j-input
v-model:value="form.username"
@@ -57,12 +52,6 @@
<j-form-item
label="密码"
name="password"
- :rules="[
- {
- required: true,
- message: '请输入密码!',
- },
- ]"
>
<j-input-password
v-model:value="form.password"
@@ -75,12 +64,6 @@
class="verifyCode"
label="验证码"
name="verifyCode"
- :rules="[
- {
- required: true,
- message: '请输入验证码!',
- },
- ]"
>
<j-input
v-model:value="form.verifyCode"
@@ -129,26 +112,26 @@
<div class="other">
<j-divider plain>
<div class="other-text">
- 其他方式登录
+ 其他登录方式
</div>
</j-divider>
<div class="other-button">
- <j-button
- v-for="(item, index) in bindings"
- :key="index"
- type="link"
- @Click="handleClickOther(item)"
+ <div
+ class='other-button-item'
+ v-for="(item, index) in bindings"
+ :key="index"
+ @click="handleClickOther(item)"
>
- <img
- style="width: 32px; height: 33px"
- :alt="item.name"
- :src="
- iconMap.get(
+ <img
+ style="width: 32px; height: 32px"
+ :alt="item.name"
+ :src="
+ item.logoUrl || iconMap.get(
item.provider,
) || defaultImg
"
- />
- </j-button>
+ />
+ </div>
</div>
</div>
</div>
@@ -214,6 +197,39 @@ const form = reactive({
verifyKey: '',
});
+const rules = {
+ username: [
+ {
+ validator(_: any, value: string) {
+ if (!value) {
+ return Promise.reject('请输入账号!')
+ }
+ return Promise.resolve()
+ }
+ }
+ ],
+ password: [
+ {
+ validator(_: any, value: string) {
+ if (!value) {
+ return Promise.reject('请输入密码!')
+ }
+ return Promise.resolve()
+ }
+ }
+ ],
+ verifyCode: [
+ {
+ validator(_: any, value: string) {
+ if (!value) {
+ return Promise.reject('请输入验证码!')
+ }
+ return Promise.resolve()
+ }
+ }
+ ]
+}
+
const codeUrl = ref('');
const codeConfig = ref(false);
@@ -445,6 +461,15 @@ screenRotation(screenWidth.value, screenHeight.value);
position: relative;
bottom: 10px;
text-align: center;
+ display: flex;
+ gap: 24px;
+ justify-content: center;
+ flex-wrap: wrap;
+
+ .other-button-item {
+ cursor: pointer;
+ padding: 4px;
+ }
}
}
@@ -529,7 +554,8 @@ screenRotation(screenWidth.value, screenHeight.value);
}
.content {
- padding: 32px 0 24px;
+ padding: 32px 0 24px !important;
+ margin-top: 12% !important;
}
}
</style>
diff --git a/vite.config.ts b/vite.config.ts
index baf145c2..88d9fcff 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -14,6 +14,7 @@ import monacoEditorPlugin from 'vite-plugin-monaco-editor';
import { JetlinksVueResolver } from './plugin/jetlinks'
import { optimizeDeps } from './plugin/optimize'
import copy from 'rollup-plugin-copy';
+import progress from 'vite-plugin-progress'
// https://vitejs.dev/config/
export default defineConfig(({ mode}) => {
@@ -33,7 +34,7 @@ export default defineConfig(({ mode}) => {
build: {
outDir: 'dist',
assetsDir: 'assets',
- sourcemap: true,
+ sourcemap: false,
cssCodeSplit: false,
manifest: true,
chunkSizeWarningLimit: 2000,
@@ -83,16 +84,17 @@ export default defineConfig(({ mode}) => {
targets: [
{src: 'node_modules/@liveqing/liveplayer-v3/dist/component/liveplayer-lib.min.js', dest: 'public/js'},
]
- })
+ }),
+ progress()
],
server: {
host:'0.0.0.0',
proxy: {
[env.VITE_APP_BASE_API]: {
- // target: 'http://192.168.33.22:8800',
+ target: 'http://192.168.32.226:8844',
// target: 'http://192.168.32.244:8881',
- target: 'http://120.77.179.54:8844', // 120测试
+ // target: 'http://120.77.179.54:8844', // 120测试
// target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://192.168.33.46:8844',
changeOrigin: true,
diff --git a/yarn.lock b/yarn.lock
index f246aa3b..e989032b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -986,6 +986,11 @@
resolved "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz"
integrity sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A==
+"@types/node@^10.3.6":
+ version "10.17.60"
+ resolved "http://registry.jetlinks.cn/@types%2fnode/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
+ integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
+
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
resolved "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"
@@ -1233,6 +1238,14 @@
resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.12.0.tgz"
integrity sha512-9oJ9MM9lFLlmvxXUqsR1wLt1uF7EVbP5iYaHJYqk+G2PbMjY6EXvZeTjbdO89HgoF5cI6z49o2zT/jD9SVoNpQ==
+"@vueuse/router@^9.13.0":
+ version "9.13.0"
+ resolved "http://47.108.170.157:9013/@vueuse%2frouter/-/router-9.13.0.tgz#cfc757fa89c654ab749c60bc2445f945cbb86b32"
+ integrity sha512-lcL6auSUGMGZMdDzZJb02QDe909AChzMXoxqFS3gL2E8mHmIx0SrNor+33UkqvvBPi18vXpDq/R7tPd9fxWwTg==
+ dependencies:
+ "@vueuse/shared" "9.13.0"
+ vue-demi "*"
+
"@vueuse/shared@7.7.1":
version "7.7.1"
resolved "https://registry.jetlinks.cn/@vueuse%2fshared/-/shared-7.7.1.tgz"
@@ -1247,6 +1260,13 @@
dependencies:
vue-demi "*"
+"@vueuse/shared@9.13.0":
+ version "9.13.0"
+ resolved "http://47.108.170.157:9013/@vueuse%2fshared/-/shared-9.13.0.tgz#089ff4cc4e2e7a4015e57a8f32e4b39d096353b9"
+ integrity sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==
+ dependencies:
+ vue-demi "*"
+
JSONStream@^1.0.4:
version "1.3.5"
resolved "https://registry.npmmirror.com/JSONStream/-/JSONStream-1.3.5.tgz"
@@ -3698,12 +3718,13 @@ jetlinks-store@^0.0.3:
resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz"
integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q==
-jetlinks-ui-components@^1.0.5:
+jetlinks-ui-components@1.0.5:
version "1.0.5"
- resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#da230869aacc49be00a03da55d6bf268570fee73"
- integrity sha512-XOHa0sxhFlCrKBJ1tscCXdLlcr1ZZjDhHx1sE4wqurnSKKU6PsjHKsyOWzMC1+4XgRcCLomvo9OGIwHI0IyQrQ==
+ resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#9fa4680c69471ee9abf518782faf1b4c276aa305"
+ integrity sha512-pFZ0ol0jjIrrIEqPOFmrS5K623QzczYVMFPf8NQ3XeSBLksW9dncgVEPa6cZZ+9jjwAgWHo2MyPGXZcY6SF8PQ==
dependencies:
"@vueuse/core" "^9.12.0"
+ "@vueuse/router" "^9.13.0"
ant-design-vue "^3.2.15"
colorpicker-v3 "^2.10.2"
lodash-es "^4.17.21"
@@ -5397,6 +5418,11 @@ process@^0.11.10:
resolved "https://registry.jetlinks.cn/process/-/process-0.11.10.tgz"
integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+progress@^2.0.3:
+ version "2.0.3"
+ resolved "http://registry.jetlinks.cn/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+ integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
promise-all-reject-late@^1.0.0:
version "1.0.1"
resolved "https://registry.jetlinks.cn/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz"
@@ -5509,6 +5535,13 @@ rc@1.2.8, rc@^1.0.1, rc@^1.1.6, rc@^1.2.1, rc@^1.2.8:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
+rd@^2.0.1:
+ version "2.0.1"
+ resolved "http://registry.jetlinks.cn/rd/-/rd-2.0.1.tgz#e18a8af5b2f7440c0db1523ca04c6e0f9660003f"
+ integrity sha512-/XdKU4UazUZTXFmI0dpABt8jSXPWcEyaGdk340KdHnsEOdkTctlX23aAK7ChQDn39YGNlAJr1M5uvaKt4QnpNw==
+ dependencies:
+ "@types/node" "^10.3.6"
+
read-cmd-shim@^2.0.0:
version "2.0.0"
resolved "http://47.108.170.157:9013/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
@@ -6765,6 +6798,15 @@ vite-plugin-monaco-editor@^1.1.0:
resolved "https://registry.jetlinks.cn/vite-plugin-monaco-editor/-/vite-plugin-monaco-editor-1.1.0.tgz"
integrity sha512-IvtUqZotrRoVqwT0PBBDIZPNraya3BxN/bfcNfnxZ5rkJiGcNtO5eAOWWSgT7zullIAEqQwxMU83yL9J5k7gww==
+vite-plugin-progress@^0.0.7:
+ version "0.0.7"
+ resolved "http://registry.jetlinks.cn/vite-plugin-progress/-/vite-plugin-progress-0.0.7.tgz#10979d2195b4dd1960ad0ec9347ce844fc13b97d"
+ integrity sha512-zyvKdcc/X+6hnw3J1HVV1TKrlFKC4Rh8GnDnWG/2qhRXjqytTcM++xZ+SAPnoDsSyWl8O93ymK0wZRgHAoglEQ==
+ dependencies:
+ picocolors "^1.0.0"
+ progress "^2.0.3"
+ rd "^2.0.1"
+
vite-plugin-style-import@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-2.0.0.tgz"
+
{
.card-content {
position: relative;
- padding: 30px 12px 16px 30px;
+ padding: 30px 12px 30px 30px;
overflow: hidden;
.card-item-avatar {
margin-right: 16px;
+ display: flex;
+ align-items: center;
}
.card-item-body {
@@ -237,6 +239,10 @@ const handleClick = () => {
flex-direction: column;
flex-grow: 1;
width: 0;
+
+ .ant-row{
+ margin-top: 19px;
+ }
}
.card-state {
@@ -285,7 +291,7 @@ const handleClick = () => {
}
:deep(.card-item-content-text) {
- color: rgba(0, 0, 0, 0.75);
+ color: rgba(0, 0, 0, 0.7);
font-size: 12px;
}
}
diff --git a/src/components/Empty/index.vue b/src/components/Empty/index.vue
index 19178587..1c594b2d 100644
--- a/src/components/Empty/index.vue
+++ b/src/components/Empty/index.vue
@@ -7,14 +7,13 @@
-
diff --git a/src/views/account/Center/index.vue b/src/views/account/Center/index.vue
index becf59e7..89d62d93 100644
--- a/src/views/account/Center/index.vue
+++ b/src/views/account/Center/index.vue
@@ -140,8 +140,10 @@
![]()
@@ -399,6 +401,8 @@ function getViews() {
display: flex;
margin-top: 24px;
flex-wrap: wrap;
+ gap: 24px;
+
.content-item {
margin-right: 24px;
@@ -438,9 +442,10 @@ function getViews() {
}
.account-card {
- margin-right: 24px;
width: 415px;
background-image: url(/images/notice/dingtalk-background.png);
+ border-right: 1px solid #f0f0f0;
+ border-bottom: 1px solid #f0f0f0;
display: flex;
align-items: center;
justify-content: space-between;
diff --git a/src/views/device/DashBoard/components/TopCard.vue b/src/views/device/DashBoard/components/TopCard.vue
index a8d07992..80de7b41 100644
--- a/src/views/device/DashBoard/components/TopCard.vue
+++ b/src/views/device/DashBoard/components/TopCard.vue
@@ -72,18 +72,16 @@ const props = defineProps({
}
.content-right {
width: 0;
- height: 123px;
display: flex;
- flex-grow: .7;
+ flex-grow: 1;
align-items: flex-end;
justify-content: flex-end;
img {
- width: 100%;
- height: 100%;
+ width: 92px;
+ height: 92px;
}
}
.content-right-echart{
- height: 123px;
display: flex;
flex-grow: 1;
align-items: flex-end;
diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index 3e50ea87..b0047d7a 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -5,7 +5,7 @@
-
+