mager: 合并11.2版本

src/views/ne/neInfo/index.vue

@@ -1,16 +1,15 @@
 <script setup lang="ts">
 import { reactive, onMounted, toRaw, defineAsyncComponent, ref } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
-import { message, Modal } from 'ant-design-vue/lib';
-import { SizeType } from 'ant-design-vue/lib/config-provider';
-import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
-import { ColumnsType } from 'ant-design-vue/lib/table';
+import { message, Modal } from 'ant-design-vue/es';
+import { SizeType } from 'ant-design-vue/es/config-provider';
+import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
+import { ColumnsType } from 'ant-design-vue/es/table';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
 import { listNeInfo, delNeInfo, stateNeInfo } from '@/api/ne/neInfo';
 import { NE_TYPE_LIST } from '@/constants/ne-constants';
-import { hasRoles } from '@/plugins/auth-user';
 import useDictStore from '@/store/modules/dict';
 import useNeOptions from './hooks/useNeOptions';
 const { getDict } = useDictStore();
@@ -178,11 +177,11 @@ function fnTableSelectedRowKeys(keys: (string | number)[]) {
 /**对话框对象信息状态类型 */
 type ModalStateType = {
   /**配置备份框是否显示 */
-  visibleByBackConf: boolean;
+  openByBackConf: boolean;
   /**OAM文件配置框是否显示 */
-  visibleByOAM: boolean;
+  openByOAM: boolean;
   /**新增框或修改框是否显示 */
-  visibleByEdit: boolean;
+  openByEdit: boolean;
   /**新增框或修改框ID */
   editId: string;
   /**OAM框网元类型ID */
@@ -194,9 +193,9 @@ type ModalStateType = {
 
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
-  visibleByBackConf: false,
-  visibleByOAM: false,
-  visibleByEdit: false,
+  openByBackConf: false,
+  openByOAM: false,
+  openByEdit: false,
   editId: '',
   neId: '',
   neType: '',
@@ -213,7 +212,7 @@ function fnModalVisibleByEdit(row?: Record<string, any>) {
   } else {
     modalState.editId = row.id;
   }
-  modalState.visibleByEdit = !modalState.visibleByEdit;
+  modalState.openByEdit = !modalState.openByEdit;
 }
 
 /**
@@ -238,7 +237,9 @@ function fnModalEditOk(from: Record<string, any>) {
         item.neName = from.neName;
         item.ip = from.ip;
         item.port = from.port;
-        item.status = res.data.online ? '1' : '0';
+        if (item.status !== '2') {
+          item.status = res.data.online ? '1' : '0';
+        }
         Object.assign(item.serverState, res.data);
         const resouresUsage = parseResouresUsage(item.serverState);
         Reflect.set(item, 'resoures', resouresUsage);
@@ -255,9 +256,9 @@ function fnModalEditOk(from: Record<string, any>) {
  */
 function fnModalEditCancel() {
   modalState.editId = '';
-  modalState.visibleByEdit = false;
-  modalState.visibleByOAM = false;
-  modalState.visibleByBackConf = false;
+  modalState.openByEdit = false;
+  modalState.openByOAM = false;
+  modalState.openByBackConf = false;
 }
 
 /**
@@ -333,7 +334,7 @@ function fnRecordMore(type: string | number, row: Record<string, any>) {
     case 'oam':
       modalState.neId = row.neId;
       modalState.neType = row.neType;
-      modalState.visibleByOAM = !modalState.visibleByOAM;
+      modalState.openByOAM = !modalState.openByOAM;
       break;
     case 'backConfExport':
       backConf.value.exportConf(row.neType, row.neId);
@@ -341,7 +342,7 @@ function fnRecordMore(type: string | number, row: Record<string, any>) {
     case 'backConfImport':
       modalState.neId = row.neId;
       modalState.neType = row.neType;
-      modalState.visibleByBackConf = !modalState.visibleByBackConf;
+      modalState.openByBackConf = !modalState.openByBackConf;
       break;
     default:
       console.warn(type);
@@ -365,8 +366,18 @@ function fnGetList(pageNum?: number) {
       tablePagination.total = res.total;
       // 遍历处理资源情况数值
       tableState.data = res.rows.map(item => {
+        let resouresUsage = {
+          sysDiskUsage: 0,
+          sysMemUsage: 0,
+          sysCpuUsage: 0,
+          nfCpuUsage: 0,
+        };
         const neState = item.serverState;
-        const resouresUsage = parseResouresUsage(neState);
+        if (neState) {
+          resouresUsage = parseResouresUsage(neState);
+        } else {
+          item.serverState = { online: false };
+        }
         Reflect.set(item, 'resoures', resouresUsage);
         return item;
       });
@@ -381,33 +392,27 @@ function parseResouresUsage(neState: Record<string, any>) {
   let nfCpuUsage = 0;
   if (neState.cpu) {
     nfCpuUsage = neState.cpu.nfCpuUsage;
+    const nfCpu = +(nfCpuUsage / 100);
+    nfCpuUsage = +nfCpu.toFixed(2);
     if (nfCpuUsage > 100) {
-      const nfCpu = +(neState.cpu.nfCpuUsage / 100);
-      if (nfCpu > 100) {
-        nfCpuUsage = 100;
-      } else {
-        nfCpuUsage = +nfCpu.toFixed(2);
-      }
+      nfCpuUsage = 100;
     }
 
     sysCpuUsage = neState.cpu.sysCpuUsage;
+    const sysCpu = +(sysCpuUsage / 100);
+    sysCpuUsage = +sysCpu.toFixed(2);
     if (sysCpuUsage > 100) {
-      const sysCpu = +(neState.cpu.sysCpuUsage / 100);
-      if (sysCpu > 100) {
-        sysCpuUsage = 100;
-      } else {
-        sysCpuUsage = +sysCpu.toFixed(2);
-      }
+      sysCpuUsage = 100;
     }
   }
 
   let sysMemUsage = 0;
   if (neState.mem) {
-    let men = neState.mem.sysMemUsage;
-    if (men > 100) {
-      men = +(men / 100).toFixed(2);
+    const men = neState.mem.sysMemUsage;
+    sysMemUsage = +(men / 100).toFixed(2);
+    if (sysMemUsage > 100) {
+      sysMemUsage = 100;
     }
-    sysMemUsage = men;
   }
 
   let sysDiskUsage = 0;
@@ -487,7 +492,7 @@ onMounted(() => {
     <a-card :bordered="false" :body-style="{ padding: '0px' }">
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
-        <a-space :size="8" align="center" v-roles:has="['admin']">
+        <a-space :size="8" align="center">
           <a-button type="primary" @click.prevent="fnModalVisibleByEdit()">
             <template #icon><PlusOutlined /></template>
             {{ t('common.addText') }}
@@ -573,31 +578,26 @@ onMounted(() => {
           </template>
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
-              <span v-roles:has="['admin']">
-                <a-tooltip>
-                  <template #title>{{ t('common.editText') }}</template>
-                  <a-button
-                    type="link"
-                    @click.prevent="fnModalVisibleByEdit(record)"
-                  >
-                    <template #icon><FormOutlined /></template>
-                  </a-button>
-                </a-tooltip>
-              </span>
-              <span v-roles:has="['admin', 'teacher']">
-                <a-tooltip>
-                  <template #title>
-                    {{ t('views.ne.common.restart') }}
-                  </template>
-                  <a-button
-                    type="link"
-                    @click.prevent="fnRecordMore('restart', record)"
-                  >
-                    <template #icon><UndoOutlined /></template>
-                  </a-button>
-                </a-tooltip>
-              </span>
-
+              <a-tooltip>
+                <template #title>{{ t('common.editText') }}</template>
+                <a-button
+                  type="link"
+                  @click.prevent="fnModalVisibleByEdit(record)"
+                >
+                  <template #icon><FormOutlined /></template>
+                </a-button>
+              </a-tooltip>
+              <a-tooltip>
+                <template #title>
+                  {{ t('views.ne.common.restart') }}
+                </template>
+                <a-button
+                  type="link"
+                  @click.prevent="fnRecordMore('restart', record)"
+                >
+                  <template #icon><UndoOutlined /></template>
+                </a-button>
+              </a-tooltip>
               <a-tooltip placement="left">
                 <template #title>{{ t('common.moreText') }}</template>
                 <a-dropdown placement="bottomRight" trigger="click">
@@ -610,30 +610,31 @@ onMounted(() => {
                         <FileTextOutlined />
                         {{ t('views.ne.common.log') }}
                       </a-menu-item>
-                      <a-menu-item key="start" v-if="hasRoles(['admin'])">
+                      <a-menu-item key="start">
                         <ThunderboltOutlined />
                         {{ t('views.ne.common.start') }}
                       </a-menu-item>
-                      <a-menu-item key="stop" v-if="hasRoles(['admin'])">
+                      <a-menu-item key="stop">
                         <CloseSquareOutlined />
                         {{ t('views.ne.common.stop') }}
                       </a-menu-item>
                       <a-menu-item
                         key="reload"
                         v-if="
-                          !['OMC', 'PCF', 'IMS', 'MME'].includes(
-                            record.neType
-                          ) && hasRoles(['admin'])
+                          !['OMC', 'PCF', 'IMS', 'MME'].includes(record.neType)
                         "
                       >
                         <SyncOutlined />
                         {{ t('views.ne.common.reload') }}
                       </a-menu-item>
-                      <a-menu-item key="delete" v-if="hasRoles(['admin'])">
+                      <a-menu-item key="delete">
                         <DeleteOutlined />
                         {{ t('common.deleteText') }}
                       </a-menu-item>
-                      <a-menu-item key="oam" v-if="hasRoles(['admin'])">
+                      <a-menu-item
+                        key="oam"
+                        v-if="!['OMC'].includes(record.neType)"
+                      >
                         <FileTextOutlined />
                         {{ t('views.ne.common.oam') }}
                       </a-menu-item>
@@ -654,7 +655,7 @@ onMounted(() => {
           </template>
         </template>
         <template #expandedRowRender="{ record }">
-          <a-row :gutter="16">
+          <a-row>
             <a-col :offset="2" :lg="8" :md="8" :xs="8">
               <a-divider orientation="left">
                 {{ t('views.ne.neInfo.info') }}
@@ -752,7 +753,7 @@ onMounted(() => {
 
     <!-- 新增框或修改框 -->
     <EditModal
-      v-model:visible="modalState.visibleByEdit"
+      v-model:open="modalState.openByEdit"
       :edit-id="modalState.editId"
       @ok="fnModalEditOk"
       @cancel="fnModalEditCancel"
@@ -760,7 +761,7 @@ onMounted(() => {
 
     <!-- OAM编辑框 -->
     <OAMModal
-      v-model:visible="modalState.visibleByOAM"
+      v-model:open="modalState.openByOAM"
       :ne-id="modalState.neId"
       :ne-type="modalState.neType"
       @cancel="fnModalEditCancel"
@@ -769,7 +770,7 @@ onMounted(() => {
     <!-- 配置文件备份框 -->
     <BackConfModal
       ref="backConf"
-      v-model:visible="modalState.visibleByBackConf"
+      v-model:open="modalState.openByBackConf"
       :ne-id="modalState.neId"
       :ne-type="modalState.neType"
       @cancel="fnModalEditCancel"