From a7311a5147d0f2190e2f62728cb652a0f721dd7a Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 21 十二月 2022 18:52:23 +0800
Subject: [PATCH] 资料馆

---
 src/api/api.js               |    2 
 src/views/Archive/index.vue  |   60 +++++++----
 public/config/config.js      |   14 ++
 src/views/Thematic/index.vue |    8 
 src/components/mapsdk.vue    |  174 ++++++++++++++++++----------------
 5 files changed, 152 insertions(+), 106 deletions(-)

diff --git a/public/config/config.js b/public/config/config.js
index a24f1fc..dba79e5 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -30,3 +30,17 @@
     name: 'china_5m.Ei.402586.mpt',
   },
 };
+var gaoDeBaseUrl = [
+  {
+    url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+    label: '楂樺痉鐭㈤噺',
+  },
+  {
+    url: 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+    label: '楂樺痉褰卞儚',
+  },
+  {
+    url: 'http://webst02.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8',
+    label: '楂樺痉褰卞儚鏍囨敞',
+  },
+];
diff --git a/src/api/api.js b/src/api/api.js
index e85bb0d..cbcd9a0 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -609,7 +609,7 @@
 
 //璧勬枡棣�=>鏌ヨ鎵�鏈夎〃鏍�
 export function dataLib_selectTabs(params) {
-  return request.get('/dataLib/selectTabs', { params: params });
+  return request.get('/dataLib/selectTabsByPage', { params: params });
 }
 //璧勬枡棣�=>鏌ヨ鎵�鏈夎〃鏍�
 export function dataLib_selectFields(params) {
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 58c587c..4884a75 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -252,7 +252,7 @@
       });
 
       window.Viewer = window.sgworld._Viewer;
-
+      Viewer.imageryLayers._layers[0].show = false;
       //瀹氫綅
       sgworld.Navigate.jumpTo({
         //璺宠浆瑙嗚
@@ -262,36 +262,47 @@
           100000
         ),
       });
-      Viewer.imageryLayers.addImageryProvider(
-        new Cesium.WebMapTileServiceImageryProvider({
-          url: 'http://t0.tianditu.com/vec_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=94a34772eb88317fcbf8428e10448561',
-          layer: 'tdtVecBasicLayer',
-          style: 'default',
-          format: 'image/jpeg',
-          tileMatrixSetID: 'GoogleMapsCompatible',
-          show: false,
-        })
-      );
+      // Viewer.imageryLayers.addImageryProvider(
+      //   new Cesium.WebMapTileServiceImageryProvider({
+      //     url: 'http://t0.tianditu.com/vec_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=94a34772eb88317fcbf8428e10448561',
+      //     layer: 'tdtVecBasicLayer',
+      //     style: 'default',
+      //     format: 'image/jpeg',
+      //     tileMatrixSetID: 'GoogleMapsCompatible',
+      //     show: false,
+      //   })
+      // );
 
-      Viewer.imageryLayers.addImageryProvider(
-        new Cesium.WebMapTileServiceImageryProvider({
-          url: 'http://t0.tianditu.com/img_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=img&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=94a34772eb88317fcbf8428e10448561',
-          layer: 'tdtBasicLayer',
-          style: 'default',
-          format: 'image/jpeg',
-          tileMatrixSetID: 'GoogleMapsCompatible',
-          show: false,
-        })
-      );
-      Viewer.imageryLayers.addImageryProvider(
-        new Cesium.WebMapTileServiceImageryProvider({
-          url: 'http://t0.tianditu.com/cva_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=cva&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default.jpg&tk=94a34772eb88317fcbf8428e10448561',
-          layer: 'tdtAnnoLayer',
-          style: 'default',
-          format: 'image/jpeg',
-          tileMatrixSetID: 'GoogleMapsCompatible',
-        })
-      );
+      // Viewer.imageryLayers.addImageryProvider(
+      //   new Cesium.WebMapTileServiceImageryProvider({
+      //     url: 'http://t0.tianditu.com/img_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=img&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=94a34772eb88317fcbf8428e10448561',
+      //     layer: 'tdtBasicLayer',
+      //     style: 'default',
+      //     format: 'image/jpeg',
+      //     tileMatrixSetID: 'GoogleMapsCompatible',
+      //     show: false,
+      //   })
+      // );
+      // Viewer.imageryLayers.addImageryProvider(
+      //   new Cesium.WebMapTileServiceImageryProvider({
+      //     url: 'http://t0.tianditu.com/cva_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=cva&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default.jpg&tk=94a34772eb88317fcbf8428e10448561',
+      //     layer: 'tdtAnnoLayer',
+      //     style: 'default',
+      //     format: 'image/jpeg',
+      //     tileMatrixSetID: 'GoogleMapsCompatible',
+      //   })
+      // );
+
+      for (var i in gaoDeBaseUrl) {
+        sgworld.Creator.createUrlTemplateImageryProvider(
+          gaoDeBaseUrl[i].label,
+          gaoDeBaseUrl[i].url,
+          '0',
+          undefined,
+          true,
+          ''
+        );
+      }
 
       Viewer._enableInfoOrSelection = false;
       //鏄剧ずfps
@@ -334,11 +345,13 @@
     },
     setLayerVisible() {
       if (this.isActive == true) {
-        Viewer.imageryLayers.get(1).show = true;
-        Viewer.imageryLayers.get(2).show = false;
+        Viewer.imageryLayers._layers[1].show = true;
+        Viewer.imageryLayers._layers[2].show = false;
+        Viewer.imageryLayers._layers[3].show = false;
       } else {
-        Viewer.imageryLayers.get(1).show = false;
-        Viewer.imageryLayers.get(2).show = true;
+        Viewer.imageryLayers._layers[1].show = false;
+        Viewer.imageryLayers._layers[2].show = true;
+        Viewer.imageryLayers._layers[3].show = true;
       }
     },
     //鏄剧ず寮圭獥
@@ -843,53 +856,54 @@
 // .center {
 //   left: 1%;
 // }
-// .CenDiv {
-//   position: absolute;
-//   bottom: 1%;
-//   height: 40px;
-//   width: 60px;
-//   z-index: 101;
-//   display: flex;
-//   flex-direction: column;
-//   justify-content: space-between;
-//   box-shadow: 3px 3px 6px #666;
-//   border: 1px solid rgba(204, 204, 204, 0.76);
-//   border-radius: 5px;
-//   cursor: pointer;
-// }
-// .center1 {
-//   right: 1%;
-// }
-// .right {
-//   position: absolute;
-//   top: 50px;
-//   right: 0;
-//   width: 20%;
-//   height: calc(100% - 50px);
+.CenDiv {
+  position: absolute;
+  bottom: 1%;
+  left: 1%;
+  height: 40px;
+  width: 60px;
+  z-index: 101;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  box-shadow: 3px 3px 6px #666;
+  border: 1px solid rgba(204, 204, 204, 0.76);
+  border-radius: 5px;
+  cursor: pointer;
+}
+.center1 {
+  right: 1%;
+}
+.right {
+  position: absolute;
+  top: 50px;
+  right: 0;
+  width: 20%;
+  height: calc(100% - 50px);
 
-//   display: flex;
-//   flex-direction: column;
-//   justify-content: space-between;
-// }
-// .CenDiv:hover {
-//   border: 1px solid #409eff;
-// }
-// .active {
-//   width: 100%;
-//   height: 100%;
-//   background: url('../assets/img/Layer/imgLayer2.png') no-repeat center;
-//   position: absolute;
-//   background-size: 100% 100%;
-//   border-radius: 5px;
-// }
-// .menuLayer {
-//   width: 100%;
-//   height: 100%;
-//   background: url('../assets/img/Layer/imgLayer1.png') no-repeat center;
-//   position: absolute;
-//   background-size: 100% 100%;
-//   border-radius: 5px;
-// }
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.CenDiv:hover {
+  border: 1px solid #409eff;
+}
+.active {
+  width: 100%;
+  height: 100%;
+  background: url('../assets/img/Layer/imgLayer2.png') no-repeat center;
+  position: absolute;
+  background-size: 100% 100%;
+  border-radius: 5px;
+}
+.menuLayer {
+  width: 100%;
+  height: 100%;
+  background: url('../assets/img/Layer/imgLayer1.png') no-repeat center;
+  position: absolute;
+  background-size: 100% 100%;
+  border-radius: 5px;
+}
 
 // .menuSelect .el-input__inner {
 //   background: rgba(255, 255, 255, 0.2) !important;
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index d7fbced..dad2100 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -10,14 +10,17 @@
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
           <el-form-item>
             <el-input
-              v-model="formInline.user"
+              v-model="formInline.tab"
               suffix-icon="el-icon-search"
               :placeholder="$t('common.pleaseInput')"
             ></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button icon="el-icon-search" class="primaries">{{
+            <el-button icon="el-icon-search" @click="searchDataLibSelectTabs" class="primaries">{{
               $t('common.iquery')
+            }}</el-button>
+               <el-button icon="el-icon-refresh" @click="restDataLibSelectTabs" type="info">{{
+              $t('common.reset')
             }}</el-button>
           </el-form-item>
           <el-form-item>
@@ -116,10 +119,10 @@
             }"
    ></el-cascader>
   </el-form-item>
-  <el-form-item :label="$t('dataManage.vmobj.keyword')" >
+  <!-- <el-form-item :label="$t('dataManage.vmobj.keyword')" >
     <el-input v-model="queryForm.name" :placeholder="$t('common.pleaseInput')"></el-input>
-  </el-form-item>
-  <el-form-item>
+  </el-form-item> -->
+  <!-- <el-form-item>
   <el-button
             @click="queryInfo()"
             icon="el-icon-search"
@@ -127,8 +130,8 @@
             size="small"
             >{{ $t('common.iquery') }}</el-button
           >
-        </el-form-item>
-        <el-form-item>
+        </el-form-item> -->
+        <!-- <el-form-item>
           <el-button
             @click="resetInfo('queryForm')"
             icon="el-icon-refresh"
@@ -136,7 +139,7 @@
             size="small"
             >{{ $t('common.reset') }}</el-button
           >
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item  >
           <el-button
             type="danger"
@@ -160,7 +163,7 @@
             :data="tableData1"
             style="width: 100%"
             @selection-change="handleSelectionChange1"
-            height="100%"
+            height="500px"
           >
             <el-table-column type="selection" width="55" />
             <el-table-column prop="name" :label="$t('dataManage.vmobj.name')" />
@@ -225,7 +228,7 @@
           </el-table>
       </div>
     </div>
-    <div class="panerPage" v-show="!isMenuActive">
+    <div class="panerPage" >
       <div class="pagination_box">
         <el-pagination
           @size-change="handleSizeChange"
@@ -534,7 +537,7 @@
       queryForm:{
         dirid:null,
       },
-      formInline: {},
+      formInline: {tab:''},
       codeForm: {
         password: '',
         repassword: '',
@@ -576,6 +579,7 @@
       listData: {
         pageIndex: 1,
         pageSize: 10,
+        tab:''
       },
       count: 0,
       count1: 0,
@@ -690,10 +694,12 @@
       }
     },
     getMenuChange(res) {
+      this.listData.pageSize = 10;
+      this.listData.pageIndex = 1;
+      this.formInline.tab=""
       switch (res) {
         case 1:
-             this.listData.pageIndex = 1;
-      this.listData.pageSize = 10;
+
             this.getDataLibSelectTabs();
           this.isMenuActive = true;
 
@@ -717,9 +723,8 @@
     },
         // 鏌ヨ
     queryInfo() {
-      this.listData.name = this.queryForm.name.trim();
-      this.listData.pageSize = 10;
-      this.listData.pageIndex = 1;
+      this.listData.name = this.formInline.tab;
+
       this.getMetaData();
     },
      // 閲嶇疆鏌ヨ
@@ -828,15 +833,28 @@
         return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
       });
     },
+    searchDataLibSelectTabs(){
+          if(this.isMenuActive == true){
+            this.getDataLibSelectTabs()
+          }else{
+              this.queryInfo();
+          }
+    },
+restDataLibSelectTabs(){
+  this.formInline.tab=""
+  this.listData.pageIndex =1;
+  this.listData.pageSize=10
+  this.searchDataLibSelectTabs();
 
+},
     async getDataLibSelectTabs() {
-
-      const data = await dataLib_selectTabs();
+      this.listData.tab = this.formInline.tab
+      const data = await dataLib_selectTabs(this.listData);
       if (data.code != 200) {
         this.$message.error('鍒楄〃璋冪敤澶辫触');
         return;
       }
-      this.count = data.result.length;
+      this.count =data.count;
       this.dataType = data.result;
     },
     showDetail1(row){
@@ -1070,11 +1088,11 @@
     handleSizeChange(res) {
                    this.listData.pageIndex = 1;
       this.listData.pageSize = res;
-      if(this.isMenuActive == false){this.getMetaData()}
+      if(this.isMenuActive == false){this.getMetaData()}else{this.getDataLibSelectTabs()}
     },
     handleCurrentChange(res) {
          this.listData.pageIndex = res;
-          if(this.isMenuActive == false){this.getMetaData()}
+          if(this.isMenuActive == false){this.getMetaData()}else{this.getDataLibSelectTabs()}
     },
      async signGetPublicKey() {
       const res = await sign_getPublicKey();
diff --git a/src/views/Thematic/index.vue b/src/views/Thematic/index.vue
index 3415fc8..6dbe0fe 100644
--- a/src/views/Thematic/index.vue
+++ b/src/views/Thematic/index.vue
@@ -56,18 +56,18 @@
         </div>
         <div class="left_content">
           <div v-show="leftMenuOpen" @click="showLeftMenu">
-            <i style="color: white" class="el-icon-caret-left"></i>
+            <i style="color: skyblue" class="el-icon-caret-left"></i>
           </div>
           <div v-show="!leftMenuOpen" @click="showLeftMenu">
-            <i style="color: white" class="el-icon-caret-right"></i>
+            <i style="color: skyblue" class="el-icon-caret-right"></i>
           </div>
         </div>
         <div class="right_content">
           <div v-show="!rightMenuOpen" @click="showRightMenu">
-            <i style="color: white" class="el-icon-caret-left"></i>
+            <i style="color: skyblue" class="el-icon-caret-left"></i>
           </div>
           <div v-show="rightMenuOpen" @click="showRightMenu">
-            <i style="color: white" class="el-icon-caret-right"></i>
+            <i style="color: skyblue" class="el-icon-caret-right"></i>
           </div>
         </div>
       </div>

--
Gitblit v1.9.3