From ec67414cb64da7a9de8e1d177b5d9e204061e7ec Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Tue, 24 Sep 2024 17:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=BA=8E=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                            | 27 +++++++++++++----
 src/views/dashboard/imsCDR/index.vue | 44 ++--------------------------
 src/views/system/user/index.vue      | 13 ++------
 3 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/README.md b/README.md
index 7c385343..4d036d7e 100644
--- a/README.md
+++ b/README.md
@@ -63,12 +63,27 @@ admin
 admin
 ```
 
-## k8s
 
-master 192.168.5.27 agtuser/admin123
 
-https://192.168.5.27:31325/#/workloads?namespace=default
+## 多租户涉及页面 
+ems_frontend_vue3\src\views\dashboard\smfCDR\index.vue
+ems_frontend_vue3\src\views\dashboard\imsCDR\index.vue
+ems_frontend_vue3\src\views\dashboard\amfUE\index.vue
+ems_frontend_vue3\src\views\dashboard\mmeUE\index.vue
+ems_frontend_vue3\src\views\system\user\index.vue
+ems_frontend_vue3\src\views\system\tenant\index.vue
+ems_frontend_vue3\src\views\system\log\operate\index.vue
+ems_frontend_vue3\src\views\neUser\sub\index.vue
+ems_frontend_vue3\src\views\neUser\ims\index.vue
+ems_frontend_vue3\src\views\neUser\ue\index.vue
+ems_frontend_vue3\src\views\neUser\base5G\index.vue
 
-```text
-eyJhbGciOiJSUzI1NiIsImtpZCI6ImZFVUhIb1puLW04M1dfSUYyRU8zWlZueXBpNUh4T0hTRVlzU19jNlVGQ0kifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlcm5ldGVzLWRhc2hib2FyZCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi11c2VyLXRva2VuLW44ZzRtIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6ImFkbWluLXVzZXIiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiI2M2NmYjAyNS01ZmQ0LTQ0ZTgtOTdiNC0yYWRiYWIxNzc5M2MiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6a3ViZXJuZXRlcy1kYXNoYm9hcmQ6YWRtaW4tdXNlciJ9.R3GRygFOjngTj-mEMBAHDeBxm3lpsXZYvC6cdTxByONtLrcMXDebwNVeKtAZ1V9qh2OrjD8n9CIygjULGPdfV6S520vjMh7Oa2q68nOyW49DNWQyYD8xLo-dQ6sX07fI7X_I3H35YUWW80jJAXjJawqIGXBSMG5intlo4tLTUSXmjCfhoQvFsgeRWu0j76pDvhMAvLPcgEXfTCi9tyL3yqJBIKONcKwmMlJeaKSR3pQk3KiibqrBO0MZclRozpke6J0ulfzTemwDDyCqBZmLsRPZ2yDd5hVBIJ9bHEcK0a25NmSFFzmd8XWQPZwg3Y4IbbY-8UhByGq0p9xS-7pGCQ
-```
+ems_frontend_vue3\src\views\tenant\amfUE\index.vue
+ems_frontend_vue3\src\views\tenant\base5G\index.vue
+ems_frontend_vue3\src\views\tenant\ims\index.vue
+ems_frontend_vue3\src\views\tenant\imsCDR\index.vue
+ems_frontend_vue3\src\views\tenant\mmeUE\index.vue
+ems_frontend_vue3\src\views\tenant\operate\index.vue
+ems_frontend_vue3\src\views\tenant\smfCDR\index.vue
+ems_frontend_vue3\src\views\tenant\sub\index.vue
+ems_frontend_vue3\src\views\tenant\ue\index.vue
\ No newline at end of file
diff --git a/src/views/dashboard/imsCDR/index.vue b/src/views/dashboard/imsCDR/index.vue
index 934b5e4f..0cc24ba0 100644
--- a/src/views/dashboard/imsCDR/index.vue
+++ b/src/views/dashboard/imsCDR/index.vue
@@ -534,7 +534,7 @@ onBeforeUnmount(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item label="IMS" name="neId ">
               <a-select
                 v-model:value="queryParams.neId"
@@ -543,7 +543,7 @@ onBeforeUnmount(() => {
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.called')"
               name="calledParty"
@@ -555,7 +555,7 @@ onBeforeUnmount(() => {
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.caller')"
               name="callerParty "
@@ -567,20 +567,6 @@ onBeforeUnmount(() => {
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="4" :md="12" :xs="24">
-            <a-form-item>
-              <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList(1)">
-                  <template #icon><SearchOutlined /></template>
-                  {{ t('common.search') }}
-                </a-button>
-                <a-button type="default" @click.prevent="fnQueryReset">
-                  <template #icon><ClearOutlined /></template>
-                  {{ t('common.reset') }}
-                </a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
           <a-col :lg="8" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.recordType')"
@@ -598,30 +584,6 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.dashboard.cdr.called')"
-              name="calledParty "
-            >
-              <a-input
-                v-model:value="queryParams.calledParty"
-                allow-clear
-                :placeholder="t('common.inputPlease')"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.dashboard.cdr.caller')"
-              name="callerParty "
-            >
-              <a-input
-                v-model:value="queryParams.callerParty"
-                allow-clear
-                :placeholder="t('common.inputPlease')"
-              ></a-input>
-            </a-form-item>
-          </a-col>
           <a-col :lg="8" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.time')"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8a9d2a56..c13c39f5 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -680,12 +680,6 @@ let uploadImportState: ModalUploadImportStateType = reactive({
   templateDownload: false,
 });
 
-function showTenant(value: any, option: any) {
-  modalState.showTenant = option.some(
-    (option: any) => option.roleKey === 'tenant'
-  );
-}
-
 /**对话框表格信息导入弹出窗口 */
 function fnModalUploadImportOpen() {
   uploadImportState.updateSupport = false;
@@ -799,8 +793,9 @@ function fnGetDeptTree() {
   });
 }
 
-function handleChange(value: any,options:any) {
-  modalState.from.roleIds=[value];
+function handleChange(value: any, options: any) {
+  modalState.from.roleIds = [value];
+  modalState.showTenant = options.roleKey === 'tenant';
 }
 
 onMounted(() => {
@@ -1255,7 +1250,6 @@ onMounted(() => {
                 :options="modalState.options.roles"
                 :field-names="{ label: 'roleName', value: 'roleId' }"
                 @select="handleChange"
-
               >
               </a-select>
             </a-form-item>
@@ -1481,7 +1475,6 @@ onMounted(() => {
             :options="modalState.options.roles"
             :field-names="{ label: 'roleName', value: 'roleId' }"
             :placeholder="t('common.selectPlease')"
-            @change="showTenant"
             @select="handleChange"
           >
           </a-select>