-
-
{{item.text}}
+
@@ -26,7 +32,11 @@
@@ -36,58 +46,146 @@
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/Modbus/index.vue b/src/views/device/Instance/Detail/Modbus/index.vue
new file mode 100644
index 00000000..78c4f085
--- /dev/null
+++ b/src/views/device/Instance/Detail/Modbus/index.vue
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/OPCUA/index.vue b/src/views/device/Instance/Detail/OPCUA/index.vue
new file mode 100644
index 00000000..73af067d
--- /dev/null
+++ b/src/views/device/Instance/Detail/OPCUA/index.vue
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/Running/Property/PropertyCard.vue b/src/views/device/Instance/Detail/Running/Property/PropertyCard.vue
index 343cb6ef..220765b2 100644
--- a/src/views/device/Instance/Detail/Running/Property/PropertyCard.vue
+++ b/src/views/device/Instance/Detail/Running/Property/PropertyCard.vue
@@ -24,7 +24,7 @@
更新时间
diff --git a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
new file mode 100644
index 00000000..d6fbb976
--- /dev/null
+++ b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/Running/Property/ValueRender.vue b/src/views/device/Instance/Detail/Running/Property/ValueRender.vue
index 0f8cb129..dd28f2cf 100644
--- a/src/views/device/Instance/Detail/Running/Property/ValueRender.vue
+++ b/src/views/device/Instance/Detail/Running/Property/ValueRender.vue
@@ -1,11 +1,58 @@
- {{value?.value || '--'}}
+
--
+
+
+
+
![]()
+
+
+
![]()
+
+
+
+
![]()
+
+
+
+
+
![]()
+
+
+
+
+
![]()
+
+
+
+
+
![]()
+
+
+
+
+
![]()
+
+
+
+
+
+
![]()
+
+
+ {{JSON.stringify(value?.formatValue)}}
+
+
+ {{String(value?.formatValue)}}
+
+
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/components/EditTable/index.vue b/src/views/device/Instance/Detail/components/EditTable/index.vue
new file mode 100644
index 00000000..5bae38da
--- /dev/null
+++ b/src/views/device/Instance/Detail/components/EditTable/index.vue
@@ -0,0 +1,289 @@
+
+
+
+
+
+ 批量映射
+ 保存
+
+
+
+
+
+
+ 采集器
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/components/MSelect.vue b/src/views/device/Instance/Detail/components/MSelect.vue
new file mode 100644
index 00000000..622d5a2f
--- /dev/null
+++ b/src/views/device/Instance/Detail/components/MSelect.vue
@@ -0,0 +1,113 @@
+
+
+ {{ item.name }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index f6a56de3..2d33e6ba 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -1,146 +1,261 @@
-
+
-
-
{{instanceStore.current.name}}
+
+
{{ instanceStore.current.name }}
-
-
+
+
启用设备
-
+
断开连接
-
-
+
+
- {{ instanceStore.current.id }}
+ {{
+ instanceStore.current.id
+ }}
- {{ instanceStore.current.productName }}
+ {{
+ instanceStore.current.productName
+ }}
-
+
-
+
\ No newline at end of file
From 906bc836cac40e62d7c0d3773ca54982dc0d2c1b Mon Sep 17 00:00:00 2001
From: jackhoo_98
Date: Wed, 22 Feb 2023 19:14:15 +0800
Subject: [PATCH 22/27] =?UTF-8?q?feat:=20=E8=BF=9C=E7=A8=8B=E5=8D=87?=
=?UTF-8?q?=E7=BA=A7=20=E5=88=97=E8=A1=A8/=E6=96=B0=E5=A2=9E/=E7=BC=96?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/device/firmware.ts | 53 +++
src/components/AIcon/index.tsx | 2 +
src/views/device/Firmware/Save/FileUpload.vue | 96 +++++
src/views/device/Firmware/Save/index.vue | 388 ++++++++++++++++++
src/views/device/Firmware/index.vue | 268 ++++++++++++
src/views/device/Firmware/type.d.ts | 23 ++
src/views/link/Protocol/index.vue | 3 +-
7 files changed, 832 insertions(+), 1 deletion(-)
create mode 100644 src/api/device/firmware.ts
create mode 100644 src/views/device/Firmware/Save/FileUpload.vue
create mode 100644 src/views/device/Firmware/Save/index.vue
create mode 100644 src/views/device/Firmware/index.vue
create mode 100644 src/views/device/Firmware/type.d.ts
diff --git a/src/api/device/firmware.ts b/src/api/device/firmware.ts
new file mode 100644
index 00000000..f0108f98
--- /dev/null
+++ b/src/api/device/firmware.ts
@@ -0,0 +1,53 @@
+import server from '@/utils/request';
+import { BASE_API_PATH } from '@/utils/variable';
+
+export const FIRMWARE_UPLOAD = `${BASE_API_PATH}/file/upload`;
+
+export const save = (data: object) => server.post(`/firmware`, data);
+
+export const update = (data: object) => server.patch(`/firmware`, data);
+
+export const remove = (id: string) => server.remove(`/firmware/${id}`);
+
+export const query = (data: object) => server.post(`/firmware/_query/`, data);
+
+export const querySystemApi = (data?: object) =>
+ server.post(`/system/config/scopes`, data);
+
+export const task = (data: Record) =>
+ server.post(`/firmware/upgrade/task/detail/_query`, data);
+
+export const taskById = (id: string) =>
+ server.get(`/firmware/upgrade/task/${id}`);
+
+export const saveTask = (data: Record) =>
+ server.post(`/firmware/upgrade/task`, data);
+
+export const deleteTask = (id: string) =>
+ server.remove(`/firmware/upgrade/task/${id}`);
+
+export const history = (data: Record) =>
+ server.post(`/firmware/upgrade/history/_query`, data);
+
+export const historyCount = (data: Record) =>
+ server.post(`/firmware/upgrade/history/_count`, data);
+
+export const startTask = (id: string, data: string[]) =>
+ server.post(`/firmware/upgrade/task/${id}/_start`, data);
+
+export const stopTask = (id: string) =>
+ server.post(`/firmware/upgrade/task/${id}/_stop`);
+
+export const startOneTask = (data: string[]) =>
+ server.post(`/firmware/upgrade/task/_start`, data);
+
+// export const queryProduct = (data?: any) =>
+// server.post(`/device-product/_query/no-paging`, data);
+export const queryProduct = (data?: any) =>
+ server.post(`/device-product/detail/_query/no-paging`, data);
+
+export const queryDevice = () =>
+ server.get(`/device/instance/_query/no-paging?paging=false`);
+
+export const validateVersion = (productId: string, versionOrder: number) =>
+ server.get(`/firmware/${productId}/${versionOrder}/exists`);
diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx
index 4ebea3b2..b5257f23 100644
--- a/src/components/AIcon/index.tsx
+++ b/src/components/AIcon/index.tsx
@@ -49,6 +49,8 @@ const iconKeys = [
'PartitionOutlined',
'ShareAltOutlined',
'playCircleOutlined',
+ 'FileTextOutlined',
+ 'UploadOutlined'
]
const Icon = (props: {type: string}) => {
diff --git a/src/views/device/Firmware/Save/FileUpload.vue b/src/views/device/Firmware/Save/FileUpload.vue
new file mode 100644
index 00000000..b7b6398b
--- /dev/null
+++ b/src/views/device/Firmware/Save/FileUpload.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/Firmware/Save/index.vue b/src/views/device/Firmware/Save/index.vue
new file mode 100644
index 00000000..ead74d77
--- /dev/null
+++ b/src/views/device/Firmware/Save/index.vue
@@ -0,0 +1,388 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
new file mode 100644
index 00000000..d8c34292
--- /dev/null
+++ b/src/views/device/Firmware/index.vue
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+ 新增
+
+
+ {{ slotProps.productName }}
+
+
+ {{
+ moment(slotProps.createTime).format(
+ 'YYYY-MM-DD HH:mm:ss',
+ )
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/Firmware/type.d.ts b/src/views/device/Firmware/type.d.ts
new file mode 100644
index 00000000..80a289c0
--- /dev/null
+++ b/src/views/device/Firmware/type.d.ts
@@ -0,0 +1,23 @@
+export type FormDataType = {
+ description: string;
+ name: string;
+ productId: string | undefined;
+ version: undefined;
+ versionOrder: undefined;
+ signMethod: string | undefined;
+ sign: string;
+ url: string;
+ size: number;
+ properties: Array;
+ id?: string;
+ format?: string;
+ mode?: object;
+ creatorId?: string;
+ createTime?: number;
+};
+
+export interface Properties {
+ id: string;
+ value: any;
+ keyid: number;
+}
diff --git a/src/views/link/Protocol/index.vue b/src/views/link/Protocol/index.vue
index 3ae666c1..f95d905d 100644
--- a/src/views/link/Protocol/index.vue
+++ b/src/views/link/Protocol/index.vue
@@ -153,6 +153,7 @@ import { getImage } from '@/utils/comm';
import { list, remove } from '@/api/link/protocol';
import { message } from 'ant-design-vue';
import Save from './Save/index.vue';
+import _ from 'lodash';
const tableRef = ref>({});
const router = useRouter();
@@ -261,7 +262,7 @@ const handlAdd = () => {
visible.value = true;
};
const handlEdit = (data: object) => {
- current.value = data;
+ current.value = _.cloneDeep(data);
visible.value = true;
};
From 67a2a42ae2b0dd622cf2d7d3c46c59147835d649 Mon Sep 17 00:00:00 2001
From: jackhoo_98
Date: Wed, 22 Feb 2023 19:36:53 +0800
Subject: [PATCH 23/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DIcon=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6iconKeys=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/AIcon/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx
index 4790d76a..35221782 100644
--- a/src/components/AIcon/index.tsx
+++ b/src/components/AIcon/index.tsx
@@ -49,7 +49,7 @@ const iconKeys = [
'PartitionOutlined',
'ShareAltOutlined',
'playCircleOutlined',
- 'RightOutlined'
+ 'RightOutlined',
'FileTextOutlined',
'UploadOutlined'
]
From 310cf92c577ef948f9cc379af242249311bab4d0 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Wed, 22 Feb 2023 19:38:58 +0800
Subject: [PATCH 24/27] =?UTF-8?q?update:=20=E9=80=9A=E7=9F=A5=E6=A8=A1?=
=?UTF-8?q?=E6=9D=BF=E6=9C=AA=E9=80=89=E9=85=8D=E7=BD=AE=E4=B8=8D=E6=9F=A5?=
=?UTF-8?q?=E6=94=B6=E4=BF=A1=E9=83=A8=E9=97=A8=E5=92=8C=E6=94=B6=E4=BF=A1?=
=?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/notice/Template/Detail/components/ToOrg.vue | 1 +
src/views/notice/Template/Detail/components/ToTag.vue | 1 +
src/views/notice/Template/Detail/components/ToUser.vue | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/views/notice/Template/Detail/components/ToOrg.vue b/src/views/notice/Template/Detail/components/ToOrg.vue
index fea66631..30422c50 100644
--- a/src/views/notice/Template/Detail/components/ToOrg.vue
+++ b/src/views/notice/Template/Detail/components/ToOrg.vue
@@ -30,6 +30,7 @@ const _value = computed({
const options = ref([]);
const queryData = async () => {
+ if (!props.configId) return;
const { result } = await templateApi.getDept(props.type, props.configId);
options.value = result.map((item: any) => ({
label: item.name,
diff --git a/src/views/notice/Template/Detail/components/ToTag.vue b/src/views/notice/Template/Detail/components/ToTag.vue
index 74c1f6c9..e304fc84 100644
--- a/src/views/notice/Template/Detail/components/ToTag.vue
+++ b/src/views/notice/Template/Detail/components/ToTag.vue
@@ -30,6 +30,7 @@ const _value = computed({
const options = ref([]);
const queryData = async () => {
+ if (!props.configId) return;
const { result } = await templateApi.getTags(props.configId);
options.value = result.map((item: any) => ({
label: item.name,
diff --git a/src/views/notice/Template/Detail/components/ToUser.vue b/src/views/notice/Template/Detail/components/ToUser.vue
index d5b7b41c..3edabeac 100644
--- a/src/views/notice/Template/Detail/components/ToUser.vue
+++ b/src/views/notice/Template/Detail/components/ToUser.vue
@@ -30,6 +30,7 @@ const _value = computed({
const options = ref([]);
const queryData = async () => {
+ if (!props.configId) return;
const { result } = await templateApi.getUser(props.type, props.configId);
options.value = result.map((item: any) => ({
label: item.name,
From db7f20e19bb35dcf20197bbd58cbfef3b5cab266 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Wed, 22 Feb 2023 20:01:31 +0800
Subject: [PATCH 25/27] =?UTF-8?q?update:=20api=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/apiPage.ts | 22 +-
src/components/Table/index.vue | 2 +-
src/router/menu.ts | 2 +-
.../system/Apply/Api/components/ApiDoes.vue | 2 +
.../system/Apply/Api/components/ApiTest.vue | 37 +-
src/views/system/Apply/Api/index.vue | 11 +-
src/views/system/Apply/index.vue | 13 +
.../Platforms/Api/components/ApiDoes.vue | 378 ++++++++++++++++++
.../Platforms/Api/components/ApiTest.vue | 299 ++++++++++++++
.../Platforms/Api/components/ChooseApi.vue | 98 +++++
.../Platforms/Api/components/InputCard.vue | 35 ++
.../Platforms/Api/components/LeftTree.vue | 100 +++++
src/views/system/Platforms/Api/index.vue | 124 ++++++
src/views/system/Platforms/Api/typing.d.ts | 27 ++
src/views/system/Platforms/index.vue | 11 +
15 files changed, 1143 insertions(+), 18 deletions(-)
create mode 100644 src/views/system/Apply/index.vue
create mode 100644 src/views/system/Platforms/Api/components/ApiDoes.vue
create mode 100644 src/views/system/Platforms/Api/components/ApiTest.vue
create mode 100644 src/views/system/Platforms/Api/components/ChooseApi.vue
create mode 100644 src/views/system/Platforms/Api/components/InputCard.vue
create mode 100644 src/views/system/Platforms/Api/components/LeftTree.vue
create mode 100644 src/views/system/Platforms/Api/index.vue
create mode 100644 src/views/system/Platforms/Api/typing.d.ts
create mode 100644 src/views/system/Platforms/index.vue
diff --git a/src/api/system/apiPage.ts b/src/api/system/apiPage.ts
index e2031d7e..9d0d3a8f 100644
--- a/src/api/system/apiPage.ts
+++ b/src/api/system/apiPage.ts
@@ -3,4 +3,24 @@ import server from '@/utils/request';
// 获取tree数据-第一层
export const getTreeOne_api = () => server.get(`/v3/api-docs/swagger-config`);
// 获取tree数据-第二层
-export const getTreeTwo_api = (name:string) => server.get(`/v3/api-docs/${name}`);
\ No newline at end of file
+export const getTreeTwo_api = (name: string) => server.get(`/v3/api-docs/${name}`);
+
+
+/**
+ * 获取已授权的接口ID
+ * @param id 第三方平台的ID
+ */
+export const getApiGranted_api = (id: string) => server.get(`/application/${id}/granted`);
+/**
+ * 获取可授权的接口ID
+ */
+export const apiOperations_api = () => server.get(`/application/operations`);
+
+/**
+ * 新增可授权的接口ID
+ */
+export const addOperations_api = (data:object) => server.patch(`/application/operations/_batch`,data);
+/**
+ * 删除可授权的接口ID
+ */
+export const delOperations_api = (data:object) => server.remove(`/application/operations/_batch`,{},{data});
\ No newline at end of file
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index d1fa47d2..51a3434b 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -41,7 +41,7 @@
@@ -47,21 +47,34 @@ import VueJsoneditor from 'vue3-ts-jsoneditor';
import MonacoEditor from '@/components/MonacoEditor/index.vue';
import type { apiDetailsType } from '../typing';
import InputCard from './InputCard.vue';
-import { PropType } from 'vue';
-const props = defineProps({
- selectApi: {
- type: Object as PropType
,
- required: true,
- },
-});
+const props = defineProps<{
+ selectApi: apiDetailsType;
+ paramsTable: any[];
+}>();
const requestBody = reactive({
- paramsTable: [],
+ paramsTable: [] as requestObj[],
paramsText: '',
});
const responsesContent = ref('{"a":123}');
+
+watch(
+ () => props.paramsTable,
+ (n) => {
+ const table = n?.map((item: any) => ({
+ paramsName: item.paramsName,
+ value: '',
+ }));
+ requestBody.paramsTable = table;
+ },
+);
+
+type requestObj = {
+ paramsName: string;
+ value: string;
+};
\ No newline at end of file
diff --git a/src/views/system/Platforms/Api/components/ApiDoes.vue b/src/views/system/Platforms/Api/components/ApiDoes.vue
new file mode 100644
index 00000000..b7f8f8f3
--- /dev/null
+++ b/src/views/system/Platforms/Api/components/ApiDoes.vue
@@ -0,0 +1,378 @@
+
+
+
+
{{ selectApi.summary }}
+
+
+
+
+ 请求数据类型
+ {{
+ getContent(selectApi.requestBody) ||
+ 'application/x-www-form-urlencoded'
+ }}
+ 响应数据类型
+ {{ `["/"]` }}
+
+
+
+
请求参数
+
+
+
+ {{ Boolean(slotProps.required) + '' }}
+
+
+ {{ slotProps.schema.type }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
new file mode 100644
index 00000000..161c135d
--- /dev/null
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -0,0 +1,299 @@
+
+
+
+
{{ props.selectApi.summary }}
+
+
+
+
+
请求参数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
new file mode 100644
index 00000000..66103ba8
--- /dev/null
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -0,0 +1,98 @@
+
+
+
+
+ {{ slotProps.url }}
+
+
+
+
保存
+
+
+
+
+
+
diff --git a/src/views/system/Platforms/Api/components/InputCard.vue b/src/views/system/Platforms/Api/components/InputCard.vue
new file mode 100644
index 00000000..c1742737
--- /dev/null
+++ b/src/views/system/Platforms/Api/components/InputCard.vue
@@ -0,0 +1,35 @@
+
+
+ {{ props.value?.toLocaleUpperCase() }}
+
+
+
+
+
+
diff --git a/src/views/system/Platforms/Api/components/LeftTree.vue b/src/views/system/Platforms/Api/components/LeftTree.vue
new file mode 100644
index 00000000..63d31d99
--- /dev/null
+++ b/src/views/system/Platforms/Api/components/LeftTree.vue
@@ -0,0 +1,100 @@
+
+
+
+ {{ name }}
+
+
+
+
+
+
+
diff --git a/src/views/system/Platforms/Api/index.vue b/src/views/system/Platforms/Api/index.vue
new file mode 100644
index 00000000..622da6f5
--- /dev/null
+++ b/src/views/system/Platforms/Api/index.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/Platforms/Api/typing.d.ts b/src/views/system/Platforms/Api/typing.d.ts
new file mode 100644
index 00000000..0fb45159
--- /dev/null
+++ b/src/views/system/Platforms/Api/typing.d.ts
@@ -0,0 +1,27 @@
+export type treeNodeTpye = {
+ name: string;
+ key: string;
+ schemas?:object;
+ link?: string;
+ apiList?: object[];
+ children?: treeNodeTpye[];
+
+};
+export type methodType = {
+ [key: string]: object
+}
+export type apiObjType = {
+ url: string,
+ method: methodType
+}
+
+export type apiDetailsType = {
+ url: string;
+ method: string;
+ summary: string;
+ parameters: any[];
+ requestBody?: any;
+ responses:object;
+}
+
+export type modeType = 'api'| 'appManger' | 'home'
\ No newline at end of file
diff --git a/src/views/system/Platforms/index.vue b/src/views/system/Platforms/index.vue
new file mode 100644
index 00000000..0abee066
--- /dev/null
+++ b/src/views/system/Platforms/index.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
From 819fa1cae528b11491944b343af142afd14af3b3 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Wed, 22 Feb 2023 20:02:56 +0800
Subject: [PATCH 26/27] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/notice/Template/Detail/index.vue | 55 ++++++++++++++--------
1 file changed, 35 insertions(+), 20 deletions(-)
diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index 2ba78972..ed118044 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -13,7 +13,7 @@
v-model:value="formData.type"
placeholder="请选择通知方式"
:disabled="!!formData.id"
- @change="resetPublicFiles"
+ @change="handleTypeChange"
>
{
watch(
() => formData.value.type,
(val) => {
- // formData.value.template = TEMPLATE_FIELD_MAP[val];
msgType.value = MSG_TYPE[val];
-
- formData.value.provider = msgType.value[0].value;
+ formData.value.provider =
+ route.params.id !== ':id'
+ ? formData.value.provider
+ : msgType.value[0].value;
+ // formData.value.provider = formData.value.provider || msgType.value[0].value;
// console.log('formData.value.template: ', formData.value.template);
- formData.value.template =
- TEMPLATE_FIELD_MAP[val][formData.value.provider];
+ // formData.value.template =
+ // TEMPLATE_FIELD_MAP[val][formData.value.provider];
if (val !== 'email') getConfigList();
- clearValid();
+ // clearValid();
// console.log('formData.value: ', formData.value);
if (val === 'sms') {
@@ -838,14 +840,14 @@ watch(
},
);
-watch(
- () => formData.value.provider,
- (val) => {
- formData.value.template = TEMPLATE_FIELD_MAP[formData.value.type][val];
+// watch(
+// () => formData.value.provider,
+// (val) => {
+// formData.value.template = TEMPLATE_FIELD_MAP[formData.value.type][val];
- clearValid();
- },
-);
+// clearValid();
+// },
+// );
// 验证规则
const formRules = ref({
@@ -908,12 +910,12 @@ watch(
{ deep: true },
);
-const clearValid = () => {
- setTimeout(() => {
- formData.value.variableDefinitions = [];
- clearValidate();
- }, 200);
-};
+// const clearValid = () => {
+// setTimeout(() => {
+// formData.value.variableDefinitions = [];
+// clearValidate();
+// }, 200);
+// };
/**
* 获取详情
@@ -941,10 +943,23 @@ const getConfigList = async () => {
configList.value = result;
};
+/**
+ * 通知方式改变
+ */
+const handleTypeChange = () => {
+ setTimeout(() => {
+ formData.value.template =
+ TEMPLATE_FIELD_MAP[formData.value.type][formData.value.provider];
+ resetPublicFiles();
+ }, 0);
+};
+
/**
* 通知类型改变
*/
const handleProviderChange = () => {
+ formData.value.template =
+ TEMPLATE_FIELD_MAP[formData.value.type][formData.value.provider];
getConfigList();
resetPublicFiles();
};
From 0ad8294fd08b4746e7e56f6ad0b2088e7ce7f1e4 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Wed, 22 Feb 2023 20:10:20 +0800
Subject: [PATCH 27/27] =?UTF-8?q?fix:=20=E5=88=87=E6=8D=A2=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5=E6=96=B9=E5=BC=8F,=20=E9=87=8D=E7=BD=AE=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/notice/Template/Detail/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index ed118044..9de2471f 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -806,6 +806,7 @@ const resetPublicFiles = () => {
) {
formData.value.template.toTag = undefined;
formData.value.template.toUser = undefined;
+ formData.value.template.agentId = undefined;
}
if (formData.value.type === 'weixin')
formData.value.template.toParty = undefined;
@@ -960,6 +961,7 @@ const handleTypeChange = () => {
const handleProviderChange = () => {
formData.value.template =
TEMPLATE_FIELD_MAP[formData.value.type][formData.value.provider];
+ console.log('formData.value.template: ', formData.value.template);
getConfigList();
resetPublicFiles();
};