From abdf52e32fe7a1bc8e336c2277dfa0102c5d0937 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 26 Oct 2023 20:34:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20MML=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=A7=BB=E9=99=A4$>=20=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mmlManage/neOperate/index.vue  | 10 +++++-----
 src/views/mmlManage/omcOperate/index.vue |  8 ++++----
 src/views/mmlManage/udmOperate/index.vue |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/mmlManage/neOperate/index.vue b/src/views/mmlManage/neOperate/index.vue
index 4843070a..9c5b0945 100644
--- a/src/views/mmlManage/neOperate/index.vue
+++ b/src/views/mmlManage/neOperate/index.vue
@@ -101,7 +101,7 @@ function fnSendMML() {
   // 拼装命令
   const argsStr = argsArr.join(',');
   if (object && argsStr) {
-    cmdStr = `${operation} ${object}:${argsStr}`;
+    cmdStr = `${operation} ${object} ${argsStr}`;
   } else if (object) {
     cmdStr = `${operation} ${object}`;
   } else {
@@ -110,17 +110,17 @@ function fnSendMML() {
   cmdStr = cmdStr.trim();
 
   // 发送
-  state.mmlCmdLog += `$> ${cmdStr}\n`;
+  state.mmlCmdLog += `${cmdStr}\n`;
   state.from.sendLoading = true;
   const [neType, neId] = state.neType;
   sendMMlByNE(neType, neId, cmdStr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
       let resultStr = res.data;
-      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n$> ');
-      state.mmlCmdLog += `$> ${resultStr}\n`;
+      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
+      state.mmlCmdLog += `${resultStr}\n`;
     } else {
-      state.mmlCmdLog += `$> ${res.msg}\n`;
+      state.mmlCmdLog += `${res.msg}\n`;
     }
   });
 }
diff --git a/src/views/mmlManage/omcOperate/index.vue b/src/views/mmlManage/omcOperate/index.vue
index cdaf0104..65f1f655 100644
--- a/src/views/mmlManage/omcOperate/index.vue
+++ b/src/views/mmlManage/omcOperate/index.vue
@@ -110,16 +110,16 @@ function fnSendMML() {
   cmdStr = cmdStr.trim();
 
   // 发送
-  state.mmlCmdLog += `$> ${cmdStr}\n`;
+  state.mmlCmdLog += `${cmdStr}\n`;
   state.from.sendLoading = true;
   sendMMlByOMC(state.neId, cmdStr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
       let resultStr = res.data;
-      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n$> ');
-      state.mmlCmdLog += `$> ${resultStr}\n`;
+      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
+      state.mmlCmdLog += `${resultStr}\n`;
     } else {
-      state.mmlCmdLog += `$> ${res.msg}\n`;
+      state.mmlCmdLog += `${res.msg}\n`;
     }
   });
 }
diff --git a/src/views/mmlManage/udmOperate/index.vue b/src/views/mmlManage/udmOperate/index.vue
index 6c024850..32c85579 100644
--- a/src/views/mmlManage/udmOperate/index.vue
+++ b/src/views/mmlManage/udmOperate/index.vue
@@ -110,16 +110,16 @@ function fnSendMML() {
   cmdStr = cmdStr.trim();
 
   // 发送
-  state.mmlCmdLog += `$> ${cmdStr}\n`;
+  state.mmlCmdLog += `${cmdStr}\n`;
   state.from.sendLoading = true;
   sendMMlByUDM(state.neId, cmdStr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
       let resultStr = res.data;
-      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n$> ');
-      state.mmlCmdLog += `$> ${resultStr}\n`;
+      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
+      state.mmlCmdLog += `${resultStr}\n`;
     } else {
-      state.mmlCmdLog += `$> ${res.msg}\n`;
+      state.mmlCmdLog += `${res.msg}\n`;
     }
   });
 }

From dd51475c58296ea153030e5735eea42c465f7905 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 26 Oct 2023 20:41:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4UDM=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6/=E9=89=B4=E6=9D=83=E6=95=B0=E6=8D=AE-=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/neUser/auth/index.vue | 1 -
 src/views/neUser/sub/index.vue  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue
index c9f457a3..8b651f31 100644
--- a/src/views/neUser/auth/index.vue
+++ b/src/views/neUser/auth/index.vue
@@ -1119,7 +1119,6 @@ onMounted(() => {
       @close="fnModalUploadImportClose"
       v-model:visible="uploadImportState.visible"
       :ext="['.csv', '.txt']"
-      :size="5"
     >
       <template #default>
         <a-textarea
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index f772098c..716e85f0 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -1797,7 +1797,6 @@ onMounted(() => {
       @close="fnModalUploadImportClose"
       v-model:visible="uploadImportState.visible"
       :ext="['.csv', '.txt']"
-      :size="5"
     >
       <template #default>
         <a-textarea

From 7d0d062e45c32357ef1af2d306c8b4b2c537f0fa Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 27 Oct 2023 09:59:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E5=8F=AF=E6=9A=B4?=
 =?UTF-8?q?=E9=9C=B2=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index b1d3576a..f8df808d 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -73,7 +73,7 @@ export async function getServerTime() {
  */
 export function getSysConf() {
   return request({
-    url: `/sysConf`,
+    url: `/sys-conf`,
     method: 'get',
   });
 }