diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue
index 8e01b54e..e05b3974 100644
--- a/src/views/DataCollect/Channel/Save/index.vue
+++ b/src/views/DataCollect/Channel/Save/index.vue
@@ -109,10 +109,7 @@
/>
{
const changeAuthType = (value: Array) => {
formData.value.configuration.authType = value[0];
};
+const isAuthType = computed(() => {
+ const { authType } = formData.value.configuration;
+ return isArray(authType)
+ ? authType[0] === 'username'
+ : authType === 'username';
+});
+const isSecurityMode = computed(() => {
+ const { securityMode } = formData.value.configuration;
+ return securityMode === 'SignAndEncrypt' || securityMode === 'Sign'
+ ? true
+ : false;
+});
const filterOption = (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
@@ -251,18 +258,22 @@ const filterOption = (input: string, option: any) => {
const getOptionsList = async () => {
for (let key in Options.value) {
const res: any = await queryOptionsList(key);
- Options.value[key] = res.result.map((item: any) => ({
- label: item?.text || item,
- value: item?.value || item,
- }));
+ if (res.status === 200) {
+ Options.value[key] = res.result.map((item: any) => ({
+ label: item?.text || item,
+ value: item?.value || item,
+ }));
+ }
}
};
const getCertificateList = async () => {
const res: any = await queryCertificateList();
- certificateList.value = res.result.map((item: any) => ({
- value: item.id,
- label: item.name,
- }));
+ if (res.status === 200) {
+ certificateList.value = res.result.map((item: any) => ({
+ label: item.name,
+ value: item.id,
+ }));
+ }
};
const getProvidersList = async () => {
diff --git a/src/views/DataCollect/Channel/data.ts b/src/views/DataCollect/Channel/data.ts
index c5fba7be..158b211e 100644
--- a/src/views/DataCollect/Channel/data.ts
+++ b/src/views/DataCollect/Channel/data.ts
@@ -39,6 +39,7 @@ export const updateStatus = {
export const TiTlePermissionButtonStyle = {
padding: 0,
+ 'max-width': 'calc(100% - 90px)',
color: ' #1890ff !important',
'font-weight': 700,
'font-size': '16px',
@@ -62,7 +63,7 @@ export const regDomain = new RegExp(
);
export const checkEndpoint = (_rule: Rule, value: string): Promise =>
new Promise(async (resolve, reject) => {
- const res = await validateField(value);
+ const res: any = await validateField(value);
return res.result.passed ? resolve('') : reject(res.result.reason);
});
export const FormValidate = {
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 185dda6b..162dbcaf 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -31,7 +31,7 @@
:options="[
{ label: '01线圈寄存器', value: 'Coils' },
{ label: '03保存寄存器', value: 'HoldingRegisters' },
- { label: '04输入寄存器', value: 'DiscreteInputs' },
+ { label: '04输入寄存器', value: 'InputRegisters' },
]"
placeholder="请选择所功能码"
allowClear
@@ -74,7 +74,10 @@
/>
-.form {
- .form-radio-button {
- width: 148px;
- height: 80px;
- padding: 0;
- img {
- width: 100%;
- height: 100%;
- }
- }
- .form-upload-button {
- margin-top: 10px;
- }
- .form-submit {
- background-color: @primary-color !important;
- }
-}
-
+
diff --git a/src/views/Log/Access/index.vue b/src/views/Log/Access/index.vue
index 0c9d322a..0298a403 100644
--- a/src/views/Log/Access/index.vue
+++ b/src/views/Log/Access/index.vue
@@ -1,6 +1,6 @@
-
+
{{
descriptionsData?.responseTime -
- descriptionsData?.requestTime +
+ descriptionsData?.responseTime +
'ms'
}}
@@ -115,11 +115,10 @@