Merge branch 'main' of http://192.168.2.166:3180/OMC/ems_frontend_vue3
This commit is contained in:
@@ -73,7 +73,7 @@ export async function getServerTime() {
|
|||||||
*/
|
*/
|
||||||
export function getSysConf() {
|
export function getSysConf() {
|
||||||
return request({
|
return request({
|
||||||
url: `/sysConf`,
|
url: `/sys-conf`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ function fnSendMML() {
|
|||||||
// 拼装命令
|
// 拼装命令
|
||||||
const argsStr = argsArr.join(',');
|
const argsStr = argsArr.join(',');
|
||||||
if (object && argsStr) {
|
if (object && argsStr) {
|
||||||
cmdStr = `${operation} ${object}:${argsStr}`;
|
cmdStr = `${operation} ${object} ${argsStr}`;
|
||||||
} else if (object) {
|
} else if (object) {
|
||||||
cmdStr = `${operation} ${object}`;
|
cmdStr = `${operation} ${object}`;
|
||||||
} else {
|
} else {
|
||||||
@@ -110,17 +110,17 @@ function fnSendMML() {
|
|||||||
cmdStr = cmdStr.trim();
|
cmdStr = cmdStr.trim();
|
||||||
|
|
||||||
// 发送
|
// 发送
|
||||||
state.mmlCmdLog += `$> ${cmdStr}\n`;
|
state.mmlCmdLog += `${cmdStr}\n`;
|
||||||
state.from.sendLoading = true;
|
state.from.sendLoading = true;
|
||||||
const [neType, neId] = state.neType;
|
const [neType, neId] = state.neType;
|
||||||
sendMMlByNE(neType, neId, cmdStr).then(res => {
|
sendMMlByNE(neType, neId, cmdStr).then(res => {
|
||||||
state.from.sendLoading = false;
|
state.from.sendLoading = false;
|
||||||
if (res.code === RESULT_CODE_SUCCESS) {
|
if (res.code === RESULT_CODE_SUCCESS) {
|
||||||
let resultStr = res.data;
|
let resultStr = res.data;
|
||||||
resultStr = resultStr.replace(/(\r\n|\n)/g, '\n$> ');
|
resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
|
||||||
state.mmlCmdLog += `$> ${resultStr}\n`;
|
state.mmlCmdLog += `${resultStr}\n`;
|
||||||
} else {
|
} else {
|
||||||
state.mmlCmdLog += `$> ${res.msg}\n`;
|
state.mmlCmdLog += `${res.msg}\n`;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -110,16 +110,16 @@ function fnSendMML() {
|
|||||||
cmdStr = cmdStr.trim();
|
cmdStr = cmdStr.trim();
|
||||||
|
|
||||||
// 发送
|
// 发送
|
||||||
state.mmlCmdLog += `$> ${cmdStr}\n`;
|
state.mmlCmdLog += `${cmdStr}\n`;
|
||||||
state.from.sendLoading = true;
|
state.from.sendLoading = true;
|
||||||
sendMMlByOMC(state.neId, cmdStr).then(res => {
|
sendMMlByOMC(state.neId, cmdStr).then(res => {
|
||||||
state.from.sendLoading = false;
|
state.from.sendLoading = false;
|
||||||
if (res.code === RESULT_CODE_SUCCESS) {
|
if (res.code === RESULT_CODE_SUCCESS) {
|
||||||
let resultStr = res.data;
|
let resultStr = res.data;
|
||||||
resultStr = resultStr.replace(/(\r\n|\n)/g, '\n$> ');
|
resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
|
||||||
state.mmlCmdLog += `$> ${resultStr}\n`;
|
state.mmlCmdLog += `${resultStr}\n`;
|
||||||
} else {
|
} else {
|
||||||
state.mmlCmdLog += `$> ${res.msg}\n`;
|
state.mmlCmdLog += `${res.msg}\n`;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -110,16 +110,16 @@ function fnSendMML() {
|
|||||||
cmdStr = cmdStr.trim();
|
cmdStr = cmdStr.trim();
|
||||||
|
|
||||||
// 发送
|
// 发送
|
||||||
state.mmlCmdLog += `$> ${cmdStr}\n`;
|
state.mmlCmdLog += `${cmdStr}\n`;
|
||||||
state.from.sendLoading = true;
|
state.from.sendLoading = true;
|
||||||
sendMMlByUDM(state.neId, cmdStr).then(res => {
|
sendMMlByUDM(state.neId, cmdStr).then(res => {
|
||||||
state.from.sendLoading = false;
|
state.from.sendLoading = false;
|
||||||
if (res.code === RESULT_CODE_SUCCESS) {
|
if (res.code === RESULT_CODE_SUCCESS) {
|
||||||
let resultStr = res.data;
|
let resultStr = res.data;
|
||||||
resultStr = resultStr.replace(/(\r\n|\n)/g, '\n$> ');
|
resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
|
||||||
state.mmlCmdLog += `$> ${resultStr}\n`;
|
state.mmlCmdLog += `${resultStr}\n`;
|
||||||
} else {
|
} else {
|
||||||
state.mmlCmdLog += `$> ${res.msg}\n`;
|
state.mmlCmdLog += `${res.msg}\n`;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1119,7 +1119,6 @@ onMounted(() => {
|
|||||||
@close="fnModalUploadImportClose"
|
@close="fnModalUploadImportClose"
|
||||||
v-model:visible="uploadImportState.visible"
|
v-model:visible="uploadImportState.visible"
|
||||||
:ext="['.csv', '.txt']"
|
:ext="['.csv', '.txt']"
|
||||||
:size="5"
|
|
||||||
>
|
>
|
||||||
<template #default>
|
<template #default>
|
||||||
<a-textarea
|
<a-textarea
|
||||||
|
|||||||
@@ -1797,7 +1797,6 @@ onMounted(() => {
|
|||||||
@close="fnModalUploadImportClose"
|
@close="fnModalUploadImportClose"
|
||||||
v-model:visible="uploadImportState.visible"
|
v-model:visible="uploadImportState.visible"
|
||||||
:ext="['.csv', '.txt']"
|
:ext="['.csv', '.txt']"
|
||||||
:size="5"
|
|
||||||
>
|
>
|
||||||
<template #default>
|
<template #default>
|
||||||
<a-textarea
|
<a-textarea
|
||||||
|
|||||||
Reference in New Issue
Block a user