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

src/views/ConstructionApplication3D/Demolition/DemolitionList.vue

@@ -4369,8 +4369,13 @@ export default {
 </script>
 <style lang="scss">
 @import "@/../../zt.scss";
+
+
+</style>
+<style scoped>
+
 .el-icon-openeyes {
-  background: url("./yanjing.png") center no-repeat;
+  background: url("/static/images/zt/Nightscape/yanjing.png") center no-repeat;
   font-size: 0.7rem;
   background-size: cover;
   line-height:1rem;
@@ -4382,7 +4387,7 @@ export default {
   line-height:1rem;
 }
 .el-icon-closeeyes {
-  background: url("./biyan.png") center no-repeat;
+  background: url("/static/images/zt/Nightscape/biyan.png") center no-repeat;
   font-size: 0.7rem;
   background-size: cover;
   line-height:1rem;
@@ -4394,8 +4399,6 @@ export default {
   line-height:1rem;
 }
 
-</style>
-<style scoped>
 .fileInput {
   display: none;
 }

src/views/LandConsolidation/components/sdgk.vue

@@ -5,7 +5,13 @@
       <div class="item" v-for="(sd, index) in sdlist" :key="index">
         <div class="text">
           <p>{{ sd.name }}</p>
-          <span class="cvalue">{{ (sdata[sd.prop] || 0).toFixed(2) }} </span>
+          <span class="cvalue"
+            >{{
+              index == 2
+                ? (sdata[sd.prop] || 0)
+                : (sdata[sd.prop] || 0).toFixed(2)
+            }}
+          </span>
           <span class="unit">{{ sd.unit }}</span>
         </div>
       </div>