Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Combinations/LayerManage/LayerManage.vue

@@ -337,7 +337,7 @@ export default {
       if (obj.checked) {
         obj.trans = 100;
         obj.visible = true;
-        this.addlayerdata.push(obj);
+        this.addlayerdata.unshift(obj);//将最新添加的对象放到第一位
         if (obj.title == "测试WMS") {
           this.layerparams[obj.id] = this.addWMS(obj);
           store.setlayerparamsList(this.layerparams);

src/components/Query/clickQuery/clickQuery.vue

@@ -1,28 +1,14 @@
 <template>
-  <div
-    class="sm-panel sm-function-module-query"
-    v-show="PoinyQueryShow && vectorShow"
-    v-drag
-  >
+  <div class="sm-panel sm-function-module-query" v-show="PoinyQueryShow && vectorShow" v-drag>
     <div class="sm-panel-header">
       <span>{{ Resource.PoinyQuery }}</span>
       <span class="closeBtn" @click="toggleVisibility">&times;</span>
     </div>
     <!-- <div class="sm-function-module-content-btn"> -->
     <div class="btnList">
-      <span
-        v-for="(item, index) in actionOptions"
-        :key="index"
-        class="icon-span"
-        :title="item.lable"
-        :class="item.isSelect ? 'selected-icon' : ''"
-        @click="changleQueryItem(item)"
-      >
-        <i
-          class="iconfont iconSize"
-          :class="item.iconName"
-          style="margin-top: 0px"
-        ></i>
+      <span v-for="(item, index) in actionOptions" :key="index" class="icon-span" :title="item.lable"
+        :class="item.isSelect ? 'selected-icon' : ''" @click="changleQueryItem(item)">
+        <i class="iconfont iconSize" :class="item.iconName" style="margin-top: 0px"></i>
       </span>
       <!-- <el-button type="primary" size="small" @click.stop="mapLayerQuery"
         >点击</el-button
@@ -33,51 +19,28 @@
     </div>
     <div class="sm-function-module-content-tabs">
       <el-tabs @tab-click="handleTabClick" v-model="activeLayerId">
-        <el-tab-pane
-          :label="item.label"
-          :name="item.id"
-          v-for="(item, index) in layerList"
-          :key="index"
-        ></el-tab-pane>
+        <el-tab-pane :label="item.label" :name="item.id" v-for="(item, index) in layerList" :key="index"></el-tab-pane>
       </el-tabs>
     </div>
     <div class="sm-function-module-content-table">
-      <el-collapse
-        :value="activeNames"
-        @change="handleCollapseChange"
-        v-if="
-          activeLayerId &&
-          queryResults[activeLayerId] &&
-          queryResults[activeLayerId].length > 0
-        "
-      >
-        <el-collapse-item
-          :title="'查询结果' + (index + 1)"
-          :name="'查询结果' + (index + 1)"
-          v-for="(item, index) in queryResults[activeLayerId]"
-          :key="index"
-        >
+      <el-collapse :value="activeNames" @change="handleCollapseChange" v-if="
+        activeLayerId &&
+        queryResults[activeLayerId] &&
+        queryResults[activeLayerId].length > 0
+      ">
+        <el-collapse-item :title="'查询结果' + (index + 1)" :name="'查询结果' + (index + 1)"
+          v-for="(item, index) in queryResults[activeLayerId]" :key="index">
           <template slot="title">
             查询结果{{ index + 1
-            }}<i
-              title="定位"
-              class="header-icon el-icon-s-promotion flyBtn2"
-              @click.stop="flyTo(index)"
-            ></i>
+            }}<i title="定位" class="header-icon el-icon-s-promotion flyBtn2" @click.stop="flyTo(index)"></i>
           </template>
-          <el-table
-            :data="item"
-            :show-header="false"
-            border
-            style="width: 100%"
-            :header-cell-style="{
-              background: 'rgba(10, 25, 38, 0.6)',
-              color: '#66b1ff',
-              fontSize: '14px',
-              fontFamily: 'Microsoft YaHei',
-              fontWeight: '400',
-            }"
-          >
+          <el-table :data="item" :show-header="false" border style="width: 100%" :header-cell-style="{
+            background: 'rgba(10, 25, 38, 0.6)',
+            color: '#66b1ff',
+            fontSize: '14px',
+            fontFamily: 'Microsoft YaHei',
+            fontWeight: '400',
+          }">
             <el-table-column prop="name" label="字段" width="100">
             </el-table-column>
             <el-table-column prop="value" label="值" width="208">
@@ -183,7 +146,7 @@ export default {
         : true;
     },
   },
-  created() {},
+  created() { },
   watch: {
     activeLayerId(val) {
       if (val && val != "0") {
@@ -381,12 +344,17 @@ export default {
       var tempArr = [];
       // "ResultNetWork@管线#1"///"ResultNetWork_Node@管线#1"
       if (eneityName.indexOf("雨水") > -1 || eneityName.indexOf("管线") > -1) {
-        for (let i = 0; i < store.state.vectorlayerlist.length; i++) {
-          let obj = store.state.vectorlayerlist[i];
-          console.log(obj.url);
+        // for (let i = 0; i < store.state.vectorlayerlist.length; i++) {
+          // let obj = store.state.vectorlayerlist[i];
+
+          // console.log(obj.url,'url----------',obj);
           let str1 = eneityName.match(/@(\S*)#/)[1];
           let str2 = eneityName.match(/(\S*)@/)[1];
           let str3 = str1 + ":" + str2;
+          // let obj = store.state.vectorlayerlist.find(i => i.title == str1);
+          let obj = store.state.vectorlayerlist.find((i) => {
+            return str1 == i.title
+          });
           let url1 = obj.url.replace("3D-", "data-");
           let url2 = url1.replace(
             "realspace",
@@ -399,7 +367,8 @@ export default {
           };
           let e = await this.mapQuery(url2, queryByIDParameters);
           if (e && e.totalCount > 0) {
-            that.layerList.push(store.state.vectorlayerlist[i]);
+            // that.layerList.push(store.state.vectorlayerlist[i]);
+            that.layerList.push(obj);
             for (let u = 0; u < e.features.length; u++) {
               let cur = [];
               var linSAr = JSON.parse(JSON.stringify(e.features[u]));
@@ -422,7 +391,7 @@ export default {
 
                 //获取图层id的参数
                 let substring = pickedFeature.primitive._baseUri.query;
-                for (let p = 0; p < store.state.vectorlayerlist.length; i++) {
+                for (let p = 0; p < store.state.vectorlayerlist.length; p++) {
                   if (store.state.vectorlayerlist[p].id == substring) {
                     that.layerList.push(store.state.vectorlayerlist[p]);
                     break;
@@ -440,7 +409,7 @@ export default {
               }
             }
           }
-        }
+        // }
       }
 
       that.loading = true;
@@ -613,7 +582,6 @@ export default {
         BBOX: bbox(xy, 10), // "12152284.626610054,2080930.4355590942,12153248.563804159,2081894.3727532008",
       };
       let res = await axios.get(url, { params });
-      console.log("---res", res);
       if (res.data && res.data.features.length > 0) {
         this.addLayerList(obj.title, obj);
         that.queryResultsGeom[obj.id] = geoms;

src/components/sceneAtttribute/basicOptions/basicOptions.vue

@@ -20,121 +20,6 @@
       <label>{{ Resource.nightView }}</label>
       <input type="checkbox" v-model="nightView" />
     </div>
-    <div class="sm-function-module-sub-section">
-      <label class="label-container">{{ Resource.brightness }}</label>
-      <div class="sm-solider-input-box">
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 63%"
-          type="range"
-          v-model="brightness"
-        />
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 34%"
-          type="number"
-          v-model="brightness"
-        />
-      </div>
-    </div>
-    <div class="sm-function-module-sub-section">
-      <label class="label-container">{{ Resource.contrast }}</label>
-      <div class="sm-solider-input-box">
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 63%"
-          type="range"
-          v-model="contrast"
-        />
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 34%"
-          type="number"
-          v-model="contrast"
-        />
-      </div>
-    </div>
-    <div class="sm-function-module-sub-section">
-      <label class="label-container">{{ Resource.hue }}</label>
-      <div class="sm-solider-input-box">
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 63%"
-          type="range"
-          v-model="hue"
-        />
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 34%"
-          type="number"
-          v-model="hue"
-        />
-      </div>
-    </div>
-    <div class="sm-function-module-sub-section">
-      <label class="label-container">{{ Resource.saturation }}</label>
-      <div class="sm-solider-input-box">
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 63%"
-          type="range"
-          v-model="saturation"
-        />
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 34%"
-          type="number"
-          v-model="saturation"
-        />
-      </div>
-    </div>
-    <div class="sm-function-module-sub-section">
-      <label class="label-container">{{ Resource.gamma }}</label>
-      <div class="sm-solider-input-box">
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 63%"
-          type="range"
-          v-model="gamma"
-        />
-        <input
-          class="min-solider"
-          min="0"
-          max="3"
-          step="0.02"
-          style="width: 34%"
-          type="number"
-          v-model="gamma"
-        />
-      </div>
-    </div>
     <div class="sm-function-module-sub-section">
       <label class="label-container">{{ Resource.queryCoordinates }}</label>
       <input
@@ -174,11 +59,6 @@ export default {
       atomsphereRender: true,
       fogEffect: false,
       nightView: false,
-      brightness: 1,
-      contrast: 1,
-      hue: 0,
-      saturation: 1,
-      gamma: 1,
       queryCoordinates: null,
       isDestroyFlag: true,
     };
@@ -311,36 +191,6 @@ export default {
         Nightscape.closNightSwitch();
       }
     },
-    brightness(val) {
-      if (imageryLayers.length > 0) {
-        let layer = imageryLayers.get(0);
-        layer["brightness"] = Number(val);
-      }
-    },
-    contrast(val) {
-      if (imageryLayers.length > 0) {
-        let layer = imageryLayers.get(0);
-        layer["contrast"] = Number(val);
-      }
-    },
-    hue(val) {
-      if (imageryLayers.length > 0) {
-        let layer = imageryLayers.get(0);
-        layer["hue"] = Number(val);
-      }
-    },
-    saturation(val) {
-      if (imageryLayers.length > 0) {
-        let layer = imageryLayers.get(0);
-        layer["saturation"] = Number(val);
-      }
-    },
-    gamma(val) {
-      if (imageryLayers.length > 0) {
-        let layer = imageryLayers.get(0);
-        layer["gamma"] = Number(val);
-      }
-    },
   },
 };
 </script>