Merge remote-tracking branch 'origin/main' into lichang

src/i18n/locales/en-US.ts

@@ -653,7 +653,7 @@ export default {
         import: 'Import',
         loadDataConfirm: 'Are you sure you want to reload the data?',
         loadData: 'Load Data',
-        loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. You can click reset to refresh the data list after the loading is finished, please don it repeat click to get update!!!!',
+        loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. Please wait a moment!!!!',
         startIMSI: 'Start IMSI',
         batchAddText: 'Batch Add',
         batchDelText: 'Batch Delete',
@@ -680,7 +680,7 @@ export default {
         import: 'Import',
         loadDataConfirm: 'Are you sure you want to reload the data?',
         loadData: 'Load Data',
-        loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. You can click reset to refresh the data list after the loading is finished, please don it repeat click to get update!!!!',
+        loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. Please wait a moment!!!!',
         numAdd: 'Number of releases',
         numDel: 'Number of deleted',
         checkDel: 'Check Delete',

src/i18n/locales/zh-CN.ts

@@ -653,7 +653,7 @@ export default {
         import: '导入',
         loadDataConfirm: '确认要重新加载数据吗？',
         loadData: '加载数据',
-        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新。加载结束后可点击重置刷新数据列表，请勿重复点击获取更新!!!',
+        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，请稍候!!!',
         startIMSI: '起始IMSI',
         batchAddText: '批量新增',
         batchDelText: '批量删除',
@@ -680,7 +680,7 @@ export default {
         import: '导入',
         loadDataConfirm: '确认要重新加载数据吗？',
         loadData: '加载数据',
-        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新。加载结束后可点击重置刷新数据列表，请勿重复点击获取更新!!!',
+        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，请稍候!!!',
         numAdd: '放号个数',
         numDel: '删除个数',
         checkDel:'勾选删除',

src/views/monitor/topology/index.vue

@@ -61,7 +61,7 @@ function fnGetList(refresh: boolean = false) {
         res.data.length > 0
       ) {
         // 根网管
-        let rootNodeInfo = { neName: undefined };
+        let rootNodeInfo = { neName: "OMC_001" };
         const nodes = [];
         const edges = [];
         for (const item of res.data) {
@@ -70,7 +70,7 @@ function fnGetList(refresh: boolean = false) {
           const nodeIndex = nodes.findIndex(v => v.id === item.neName);
           if (nodeIndex === -1) {
             if (item.neType === 'OMC') {
-              nodes.push({
+              nodes.unshift({
                 id: item.neName,
                 label: item.neName,
                 info: item,
@@ -120,7 +120,7 @@ function fnGetList(refresh: boolean = false) {
               });
             }
           } else {
-            edges.push({
+            edges.unshift({
               source: item.neName,
               target: rootNodeInfo.neName,
               label: `${item.neName}-${rootNodeInfo.neName}`,
@@ -140,6 +140,7 @@ function fnGetList(refresh: boolean = false) {
     })
     .then(hasNeList => {
       if (!hasNeList) return;
+      console.log(graphG6Data)
       if (refresh) {
         // graphG6.value.get('canvas').set('localRefresh', true);
         graphG6.value.destroy();

src/views/neUser/sub/index.vue

@@ -1538,30 +1538,29 @@ onMounted(() => {
         <!-- 大数组布局 -->
         <div v-for="(row, index) in bigRows" :key="String(row.id)">
           <a-row :gutter="16">
-            <a-col :lg="12" :md="12" :xs="24">
+            <a-col :lg="6" :md="6" :xs="24">
               <a-form-item
-                label="SST-SD"
+                label="SST"
                 name="row.sst"
-                :label-col="{ span: 5 }"
+                :label-col="{ span: 12 }"
+                :validateTrigger="[]"
+                :required="true"
               >
-                <div>
-                  <a-input-number
-                    v-model:value="row.sst"
-                    :min="1"
-                    :max="3"
-                    :step="1"
-                    style="width: 30%"
-                  />
-                  <span style="padding: 0 8px">-</span>
-                  <a-input
-                    v-model:value="row.sd"
-                    :maxlength="6"
-                    style="width: 60%"
-                  />
-                </div>
+                <a-input-number
+                  v-model:value="row.sst"
+                  :min="1"
+                  :max="3"
+                  :step="1"
+                />
               </a-form-item>
             </a-col>
-            <a-col :lg="12" :md="12" :xs="24">
+
+            <a-col :lg="8" :md="8" :xs="24">
+              <a-form-item label="SD" name="row.sst" :label-col="{ span: 5 }">
+                <a-input v-model:value="row.sd" :maxlength="6" />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="10" :md="10" :xs="24">
               <a-row :gutter="8">
                 <a-col :span="4">
                   <a-tooltip title="Add DNN">
@@ -1591,7 +1590,9 @@ onMounted(() => {
                 <a-form-item
                   label="DNN/APN"
                   name="dnn"
-                  :label-col="{ span: 10 }"
+                  :validateTrigger="[]"
+                  :required="true"
+                  :label-col="{ span: 12 }"
                 >
                   <a-input v-model:value="smallRow.dnn" allow-clear></a-input>
                 </a-form-item>
@@ -2071,26 +2072,29 @@ onMounted(() => {
         <!-- 大数组布局 -->
         <div v-for="(row, index) in bigRows" :key="String(row.id)">
           <a-row :gutter="16">
-            <a-col :lg="12" :md="12" :xs="24">
-              <a-form-item label="SST-SD" name="row.sst">
-                <div>
-                  <a-input-number
-                    v-model:value="row.sst"
-                    :min="1"
-                    :max="3"
-                    :step="1"
-                    style="width: 30%"
-                  />
-                  <span style="padding: 0 8px">-</span>
-                  <a-input
-                    v-model:value="row.sd"
-                    :maxlength="6"
-                    style="width: 60%"
-                  />
-                </div>
+            <a-col :lg="6" :md="6" :xs="24">
+              <a-form-item
+                label="SST"
+                name="row.sst"
+                :label-col="{ span: 12 }"
+                :validateTrigger="[]"
+                :required="true"
+              >
+                <a-input-number
+                  v-model:value="row.sst"
+                  :min="1"
+                  :max="3"
+                  :step="1"
+                />
               </a-form-item>
             </a-col>
-            <a-col :lg="12" :md="12" :xs="24">
+
+            <a-col :lg="8" :md="8" :xs="24">
+              <a-form-item label="SD" name="row.sst" :label-col="{ span: 5 }">
+                <a-input v-model:value="row.sd" :maxlength="6" />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="10" :md="10" :xs="24">
               <a-row :gutter="8">
                 <a-col :span="4">
                   <a-tooltip title="Add DNN">
@@ -2120,6 +2124,8 @@ onMounted(() => {
                 <a-form-item
                   label="DNN/APN"
                   name="dnn"
+                  :validateTrigger="[]"
+                  :required="true"
                   :label-col="{ span: 12 }"
                 >
                   <a-input v-model:value="smallRow.dnn" allow-clear></a-input>