From f78c2388703490680d3abd58e9eb0e59a69f534a Mon Sep 17 00:00:00 2001
From: supermap123 <huangyiqin@supermap>
Date: Fri, 24 May 2024 17:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=99=E7=BC=BA=E9=99=B7=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9Aiportal=E6=88=91=E7=9A=84=E6=9C=8D=E5=8A=A1=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=85=A8=E2=80=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SuperMap iEarth/public/locale/en.js           |   3 +-
 SuperMap iEarth/public/locale/ja.js           |   3 +-
 SuperMap iEarth/public/locale/ru.js           |   3 +-
 SuperMap iEarth/public/locale/zh.js           |   1 +
 SuperMap iEarth/src/App.vue                   |   8 +
 .../package/addData/layer-mine/layerMine.vue  | 311 ++++++++----------
 6 files changed, 161 insertions(+), 168 deletions(-)

diff --git a/SuperMap iEarth/public/locale/en.js b/SuperMap iEarth/public/locale/en.js
index d6693358..9b365066 100644
--- a/SuperMap iEarth/public/locale/en.js	
+++ b/SuperMap iEarth/public/locale/en.js	
@@ -692,7 +692,8 @@ const local_en = {
     customImgSupport:"Custom addition of images currently only supports SuperMapImageryProvider type services",
     customTinSupport:"Custom terrain addition currently only supports SuperMapTerrainProvider type services",
     s3mNameRepeatTip:'The layer name is duplicated, please modify the current layer name',
-    sceneNameRepeatTip:'This scene already exists, please do not add it again'
+    sceneNameRepeatTip:'This scene already exists, please do not add it again',
+    refresh:"refresh",
 }
 
 window.local_en = local_en;
\ No newline at end of file
diff --git a/SuperMap iEarth/public/locale/ja.js b/SuperMap iEarth/public/locale/ja.js
index 1c7ae28c..2dd56309 100644
--- a/SuperMap iEarth/public/locale/ja.js	
+++ b/SuperMap iEarth/public/locale/ja.js	
@@ -692,7 +692,8 @@ const local_ja = {
     customImgSupport:"カスタム追加イメージは現在、SuperMapImageryProviderタイプサービスのみをサポートしています",
     customTinSupport:"カスタム地形追加現在SuperMapTerrainProviderタイプサービスのみサポート",
     s3mNameRepeatTip:'レイヤー名が重複しています。現在のレイヤー名を変更してください',
-    sceneNameRepeatTip:'このシーンはすでに存在します。再度追加しないでください'
+    sceneNameRepeatTip:'このシーンはすでに存在します。再度追加しないでください',
+    refresh:'リフレッシュ',
 }
 
 window.local_ja = local_ja;
\ No newline at end of file
diff --git a/SuperMap iEarth/public/locale/ru.js b/SuperMap iEarth/public/locale/ru.js
index 4c133a77..86c29f86 100644
--- a/SuperMap iEarth/public/locale/ru.js	
+++ b/SuperMap iEarth/public/locale/ru.js	
@@ -692,7 +692,8 @@ const local_ru = {
     customImgSupport:"В настоящее время поддерживаются только службы типов SuperMapImageryProvider",
     customTinSupport:"В настоящее время поддерживаются только сервисы типа SuperMapTerrainProvider",
     s3mNameRepeatTip:'Имя слоя дублируется, измените имя текущего слоя.',
-    sceneNameRepeatTip:'Эта сцена уже существует, пожалуйста, не добавляйте ее снова'
+    sceneNameRepeatTip:'Эта сцена уже существует, пожалуйста, не добавляйте ее снова',
+    refresh:'Обновить',
 }
 
 window.local_ru = local_ru;
\ No newline at end of file
diff --git a/SuperMap iEarth/public/locale/zh.js b/SuperMap iEarth/public/locale/zh.js
index e1018043..a918842f 100644
--- a/SuperMap iEarth/public/locale/zh.js	
+++ b/SuperMap iEarth/public/locale/zh.js	
@@ -693,6 +693,7 @@ const local_zh = {
         customTinSupport:"自定义添加地形当前仅支持 SuperMapTerrainProvider 类型服务",
         s3mNameRepeatTip:'图层名重复，请修改当前图层名称',
         sceneNameRepeatTip:'该场景已存在，请勿重复添加',
+        refresh:"刷新",
 }
 
 window.local_zh = local_zh;
\ No newline at end of file
diff --git a/SuperMap iEarth/src/App.vue b/SuperMap iEarth/src/App.vue
index b083632b..55c30aa3 100644
--- a/SuperMap iEarth/src/App.vue	
+++ b/SuperMap iEarth/src/App.vue	
@@ -378,6 +378,14 @@ const overridesTheme = {
   text-overflow: ellipsis; // 文字过长后使用省略号
 }
 
+// 我的服务里面的表格内容文字大小
+.n-data-table .n-data-table-th {
+  font-size: 0.14rem;
+}
+.n-data-table .n-data-table-td {
+  font-size: 0.12rem;
+}
+
 // echarts图表样式
 #echartsProfile > div {
   left: 0.1rem;
diff --git a/SuperMap iEarth/src/package/addData/layer-mine/layerMine.vue b/SuperMap iEarth/src/package/addData/layer-mine/layerMine.vue
index d0dfdc73..fbd72baa 100644
--- a/SuperMap iEarth/src/package/addData/layer-mine/layerMine.vue	
+++ b/SuperMap iEarth/src/package/addData/layer-mine/layerMine.vue	
@@ -1,48 +1,41 @@
 <template>
   <div class="layer-terrain-container">
-    <div id="portalServiceTable">
+    <div class="portalServiceTable">
       <n-data-table
         size="small"
         :columns="state.columns"
         :data="state.portalServiceList"
-        :pagination="pagination"
         flex-height
         class="flex-1-hidden"
         v-model:checked-row-keys="state.checkedRowKeys"
       />
     </div>
-
-    <div style="">
-        <n-checkbox v-model:checked="state.useSenceName">{{ $t("appointSceneName") }}</n-checkbox>
-    </div>
-
-    <div class="row-item-mine" v-if="state.useSenceName">
-      <span>{{ $t("name") }}</span>
-      <n-input class="add-input-border" v-model:value="state.sceneName" type="text" style="width: 2.4rem"/>
-    </div>
+    
+    <n-scrollbar x-scrollable>
+      <n-pagination 
+        v-model:page="state.currentPage" 
+        :page-count="state.pageCount" 
+        style="margin-top: 0.1rem;"
+      />
+    </n-scrollbar>
 
     <div class="btn-row-item opration">
       <n-button
         type="info"
+        class="ans-btn"
         color="#3499E5"
         text-color="#fff"
-        class="ans-btn"
+        :focusable="false"
         @click="addService"
         >{{ $t("sure") }}</n-button
       >
-      <n-button
-        class="btn-secondary"
-        @click="cancle"
-        color="rgba(255, 255, 255, 0.65)"
-        ghost
-        >{{ $t("cancle") }}</n-button
-      >
+      <n-button :focusable="false" @click="refreshData">{{ $t("refresh") }}</n-button>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, reactive } from "vue";
+import { watch, onMounted, reactive } from "vue";
 import { useMessage } from "naive-ui";
 import { IportalStoreCreate } from "@/store/iportalManage/index";
 import { useLayerStore } from "@/store/layerStore/layer";
@@ -58,8 +51,15 @@ const message = useMessage();
 
 let widget: any = viewer.cesiumWidget;
 
+// let testHeader = 'http://172.16.168.74:8190/iportal/'; 
+// http://172.16.168.74:8190/iportal/web/services.json?pageSize=10&orderBy=UPDATETIME&orderType=DESC&permissionType=READ&currentPage=1
+// 用户名/密码：admin supermap.12 by 易桂全
+
+let baseUrl = getRootUrl() + 'web/services.json?pageSize=10&orderBy=UPDATETIME&orderType=DESC&permissionType=READ&currentPage';
+
 onMounted(() => {
-  init();
+  let searchUrl = `${baseUrl}=1`;
+  getIportalServiceData(searchUrl);
   message.success($t("getData"));
 });
 
@@ -68,8 +68,8 @@ type stateType = {
   columns: any;
   tableData: any;
   checkedRowKeys: any;
-  useSenceName:boolean,
-  sceneName:string;
+  currentPage:number
+  pageCount:number
 };
 
 let state = reactive<stateType>({
@@ -109,74 +109,116 @@ let state = reactive<stateType>({
   ],
   tableData: [],
   checkedRowKeys: ["1"],
-  useSenceName:false,
-  sceneName: '',
+  currentPage:1,
+  pageCount:1
 });
 
-// 初始化并获取数据
-function init() {
-  //查询出portal中的服务列表（只查询出服务项）
-  let searchUrl =
-    getRootUrl() +
-    "gateway/catalog/resource/search.json?searchType=MY_RES&resourceType=SERVICE";
-
-  if (window.iEarthConsole) console.log("searchUrl-mine:", searchUrl);
-
-  window.axios
-    //需要withCredentials验证否？
-    .get(searchUrl, { withCredentials: IportalStore.isPortal })
-    .then(function (response: any) {
-      let data = response.data.content;
-      if (window.iEarthConsole) console.log("response-mine:", response);
-      data.forEach((item: any) => {
-        let sceneID = item.resourceId;
-
-        let highestpermissionurl =
-          getRootUrl() +
-          "web/permissions/highestpermission.json?resourceIds=" +
-          encodeURIComponent("[" + sceneID + "]") +
-          "&resourceType=SERVICE";
-
-        let arrays = ["READ", "READWRITE", "DELETE"];
-        //判断是否有权限
-        let noPermission = false;
-        window.axios
-          .get(highestpermissionurl, {
-            withCredentials: IportalStore.isPortal,
-          })
-          .then(function (responseHigh: any) {
-            if (arrays.indexOf(responseHigh.data[sceneID]) < 0) {
-              noPermission = true;
-            }
-            let scenePostUrl =
-              getRootUrl() + "web/services/" + item.resourceId + ".json";
-            window.axios
-              .get(scenePostUrl, { withCredentials: IportalStore.isPortal })
-              .then(function (responseScene) {
-                let sceneUrl =
-                  responseScene.data.proxiedUrl || responseScene.data.linkPage;
-                let disabled =
-                  noPermission || item.resourceSubType != "REALSPACE"; //是否禁用选择
-                state.portalServiceList.push({
-                  key: item.name,
-                  name: item.name,
-                  resourceSubType: item.resourceSubType,
-                  updateTime: dateDiff(item.updateTime),
-                  url: sceneUrl,
-                  disabled: disabled,
-                });
-                if (window.iEarthConsole)
-                  console.log(
-                    " state.portalServiceList：",
-                    state.portalServiceList
-                  );
-              });
-          });
+async function getIportalServiceData(searchUrl:string){
+  if(!searchUrl) return;
+
+  if (window.iEarthConsole){
+      console.log("iportal-myservice-searchUrl:",searchUrl);
+  }
+
+  let data = await window.axios.get(searchUrl).then((response)=>{
+    return response.data;
+  })
+
+  if (window.iEarthConsole){
+      console.log("iportal-myservice-data:",data);
+  }
+
+  state.pageCount = Number(data.totalPage);
+
+  if (data.content && data.content.length > 0) {
+    state.portalServiceList.length = 0; // 清空当前列表
+    data.content.forEach((item: any, index:number) => {
+      let sceneUrl = item.proxiedUrl || item.linkPage;
+      let disabled = item.type != "REALSPACE"; // 当前仅支持场景
+      state.portalServiceList.push({
+        key: `my-service-${index}`,
+        name: item.resTitle || '',
+        resourceSubType: item.type,
+        updateTime: dateDiff(item.updateTime),
+        url: sceneUrl,
+        disabled: disabled,
       });
-    });
+    })
+  }
 }
 
+// 因为@on-update:page = "fun"没起作用，这里用watch监听实现
+watch(
+  () => state.currentPage,
+  (val) => {
+    let searchUrl = `${baseUrl}=${val}`;
+    getIportalServiceData(searchUrl);
+  }
+);
+
+// // 初始化并获取数据
+// function init_Origin() {
+//   //查询出portal中的服务列表（只查询出服务项）
+//   let searchUrl =
+//     getRootUrl() +
+//     "gateway/catalog/resource/search.json?searchType=MY_RES&resourceType=SERVICE";
+
+//   if (window.iEarthConsole) console.log("searchUrl-mine:", searchUrl);
+
+//   window.axios
+//     //需要withCredentials验证否？
+//     .get(searchUrl, { withCredentials: IportalStore.isPortal })
+//     .then(function (response: any) {
+//       let data = response.data.content;
+//       if (window.iEarthConsole) console.log("response-mine:", response);
+//       data.forEach((item: any) => {
+//         let sceneID = item.resourceId;
+
+//         let highestpermissionurl =
+//           getRootUrl() +
+//           "web/permissions/highestpermission.json?resourceIds=" +
+//           encodeURIComponent("[" + sceneID + "]") +
+//           "&resourceType=SERVICE";
+
+//         let arrays = ["READ", "READWRITE", "DELETE"];
+//         //判断是否有权限
+//         let noPermission = false;
+//         window.axios
+//           .get(highestpermissionurl, {
+//             withCredentials: IportalStore.isPortal,
+//           })
+//           .then(function (responseHigh: any) {
+//             if (arrays.indexOf(responseHigh.data[sceneID]) < 0) {
+//               noPermission = true;
+//             }
+//             let scenePostUrl =
+//               getRootUrl() + "web/services/" + item.resourceId + ".json";
+//             window.axios
+//               .get(scenePostUrl, { withCredentials: IportalStore.isPortal })
+//               .then(function (responseScene) {
+//                 let sceneUrl =
+//                   responseScene.data.proxiedUrl || responseScene.data.linkPage;
+//                 let disabled =
+//                   noPermission || item.resourceSubType != "REALSPACE"; //是否禁用选择
+//                 state.portalServiceList.push({
+//                   key: item.name,
+//                   name: item.name,
+//                   resourceSubType: item.resourceSubType,
+//                   updateTime: dateDiff(item.updateTime),
+//                   url: sceneUrl,
+//                   disabled: disabled,
+//                 });
+//                 if (window.iEarthConsole){
+//                   console.log(" state.portalServiceList：",state.portalServiceList);
+//                 }
+//               });
+//           });
+//       });
+//     });
+// }
+
 // 打开保存的服务
+
 function addService() {
   let selecteditems = state.portalServiceList.filter((item: any) => {
     return item.key === state.checkedRowKeys[0];
@@ -189,11 +231,9 @@ function addService() {
       let promiseArray: any = [];
       setTrustedServers(url);
 
-      // let promise = viewer.scene.open(url);
-      let sceneName = state.sceneName == '' ? undefined : state.sceneName;
-      const promise = viewer.scene.open(url, sceneName, { autoSetView: true });
+      let promise = viewer.scene.open(url);
       promiseArray.push(promise);
-      promiseWhen(promiseArray, true);
+      promiseWhen(promiseArray);
     });
   }
 }
@@ -218,18 +258,18 @@ function setTrustedServers(url: string) {
   }
 }
 
-function promiseWhen(promiseArray, isSCP) {
+function promiseWhen(promiseArray) {
   SuperMap3D.when.all(
     promiseArray,
     function (layers) {
-      for (let i = 0; i < layers.length; i++) {
-        layers[i].visibleDistanceMax = 10000; //最大可见高度
-      }
+      // for (let i = 0; i < layers.length; i++) {
+      //   layers[i].visibleDistanceMax = 10000; //最大可见高度
+      // }
       setTimeout(() => {
-        //更新图层
-        layerStore.refreshLayerTree();
+        layerStore.refreshLayerTree(); //更新图层
       }, 500);
-      if (isSCP && layers[0]) {
+
+      if (layers && layers[0]) {
         viewer.flyTo(layers[0]);
       }
     },
@@ -242,25 +282,13 @@ function promiseWhen(promiseArray, isSCP) {
   );
 }
 
-// 取消
-function cancle() {
-  state.checkedRowKeys = ["1"];
+// 更新数据
+function refreshData() {
+  let searchUrl = `${baseUrl}=1`;
+  state.currentPage = 1;
+  getIportalServiceData(searchUrl);
 }
 
-// 表格相关
-const pagination = reactive({
-  page: 1,
-  pageSize: 10,
-  showSizePicker: true,
-  pageSizes: [10, 15, 20, 25, 30],
-  onChange: (page: number) => {
-    pagination.page = page;
-  },
-  onUpdatePageSize: (pageSize: number) => {
-    pagination.pageSize = pageSize;
-    pagination.page = 1;
-  },
-});
 
 /** 时间倒序，多少小时之前
  * @param timestamp 时间毫秒数
@@ -335,50 +363,16 @@ function dateDiff(timestamp) {
   display: flex;
   flex-wrap: wrap;
 
-  .ItemBox {
-    width: 30%;
-    color: rgba(255, 255, 255, 0.85);
-    margin-bottom: 0.07rem;
-    margin-right: 0.12rem;
-    box-sizing: border-box;
-    cursor: pointer;
-
-    .img-box {
-      width: 100%;
-      height: 0.84rem;
-      border-radius: 0.05rem;
-      overflow: hidden;
-      margin-bottom: 0.04rem;
-
-      .img {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-
-  .ItemBox:nth-child(3n) {
-    margin-right: 0;
-  }
-
-  .isSelect {
-    color: #3499e5;
-
-    .img-box {
-      border: 0.02rem solid #3499e5;
-    }
-  }
 }
 
-#portalServiceTable {
+.portalServiceTable {
+  display: flex;
+  flex-direction: column;
   margin-right: 0.1rem;
   height: 2.3rem;
-  z-index: 999999;
   background-color: rgb(29, 29, 17);
   opacity: 0.5;
-
-  display: flex;
-  flex-direction: column;
+  z-index: 999999;
 }
 
 .flex-1-hidden {
@@ -388,19 +382,6 @@ function dateDiff(timestamp) {
 
 .opration {
   margin-top: 0.1rem;
-  margin-left: 56%;
-}
-
-.row-item-mine{
-
-  span {
-    font-size: 0.14rem;
-  }
-
-  display: flex;
-  justify-content: space-between;
-  width: 3.4rem;
-  margin-top: 0.1rem;
-  margin-right: 0.1rem;
+  margin-left: 60%;
 }
 </style>