Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/YZT_YUHANG

YHYZT/client/.gitignore

@@ -0,0 +1,27 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+dist-ssr
+coverage
+*.local
+
+/cypress/videos/
+/cypress/screenshots/
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

YHYZT/client/package.json

@@ -101,6 +101,5 @@
     "not ie <= 6",
     "Android >= 4",
     "IOS >= 7"
-
   ]
 }

YHYZT/client/src/views/DataCenter.vue

@@ -514,30 +514,19 @@
     </vl-map>
     <!--    <div id="description" class="description" ref="description">这里是描述文字</div>-->
     <div v-show="sxsbData.show" class="oepnLayerFeature">
-      <div v-for="(layer, idx) in sxsbData.layerData" :key="idx">
-        <div class="title" :title="layer.layerName">
-          <div style="display: flex">
-            <div
-              style="
-                width: 6px;
-                height: 20px;
-                background: #5988ff;
-                border-radius: 1px 1px 1px 1px;
-                margin-right: 6px;
-              "
-            />
-            <div>{{ layer.layerName }}</div>
-          </div>
-          <i class="iconfont yh-guanbi" @click="sxsbData.show = false" />
-        </div>
-        <div class="contents">
-          <table>
-            <tr v-for="(item, index) in layer.featureOverlayTable" :key="index">
-              <th>{{ item.name }}</th>
-              <td>{{ item.value }}</td>
-            </tr>
-          </table>
+      <div class="contents">
+        <div class="select_box">
+          <Select v-model="layIndex" clearable style="width:200px">
+            <Option v-for="(item,index) in sxsbData.layerData" :value="index" :key="index">{{ item.layerName }}</Option>
+          </Select>
+          <p class="desc">已识别<span>{{ sxsbData.layerData.length }}</span>个图层</p>
         </div>
+        <table v-if="sxsbData.layerData.length > 0 && layIndex >= 0">
+          <tr v-for="(item, index) in sxsbData.layerData[layIndex].featureOverlayTable" :key="index">
+            <th>{{ item.name }}</th>
+            <td>{{ item.value }}</td>
+          </tr>
+        </table>
       </div>
     </div>
     <el-dialog
@@ -674,9 +663,10 @@ export default {
           { name: "地块名称", value: "名称1" },
         ],
       },
+      layIndex: 0,
       sxsbData: {
         show: false,
-        layerData: [],
+        layerData: []
       },
       zycxData: {
         show: false,
@@ -1314,6 +1304,7 @@ export default {
           });
         });
       }
+      this.layIndex = 0;
       this.sxsbData.show = true;
       this.sxsbData.layerData.push(layer);
     },
@@ -2433,6 +2424,22 @@ export default {
       height: calc(100% - 38px);
       overflow-y: auto;
       padding: 10px 10px;
+      >.select_box {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        >.desc {
+          font-family: AlibabaPuHuiTiM;
+          font-size: 14px;
+          display: flex;
+          align-items: center;
+          >span {
+            display: inline-block;
+            margin: 0px 5px;
+            // font-size: 22px;
+          }
+        }
+      }
       table {
         width: 100%;
         font-size: 15px;
@@ -2441,6 +2448,7 @@ export default {
         border-radius: 8px 8px 8px 8px;
         font-family: AlibabaPuHuiTiM;
         font-size: 14px;
+        margin-top: 15px;
         td,
         th {
           padding: 2px 0;

YHYZT/server/.idea/encodings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
   </component>
 </project>

YHYZT/server/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/yh_yzt.iml" filepath="$PROJECT_DIR$/yh_yzt.iml" />
-    </modules>
-  </component>
-</project>

YHYZT/server/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
   </component>
 </project>

YHYZT/server/yh_yzt.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>