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

src/views/complianceAnalysis/components/lsjl.vue

@@ -27,8 +27,8 @@
           size="mini"
           @input="changeForm"
         >
-          <!-- <i slot="suffix" class="el-input__icon el-icon-search"></i> -->
-          <el-button slot="append" icon="el-icon-search"></el-button>
+          <i slot="suffix" class="el-input__icon el-icon-search"></i>
+          <!-- <el-button slot="append" icon="el-icon-search"></el-button> -->
         </el-input>
       </el-col>
     </el-row>
@@ -223,6 +223,7 @@ export default {
     width: 100%;
     height: calc(100% - 40px);
     padding-top: 10px;
+    padding-right: 10px;
     overflow-x: hidden;
     overflow-y: auto;
     color: #fff;
@@ -255,7 +256,7 @@ export default {
     .nameTitle {
       color: #ffffff;
       font-size: 16px;
-      line-height: 20px;
+      line-height: 24px;
     }
     .item_bottom {
       display: flex;

src/views/complianceAnalysis/components/scjg.vue

@@ -2,13 +2,11 @@
   <div class="scjg">
     <div>
       <div class="downloadDiv">
-        <span>
+        <span class="xmmc">
           项目名称：
           <span class="text">{{ scjgObj.xmmc }}</span>
         </span>
-        <el-button type="primary" size="mini" @click="download">
-          导出报告
-        </el-button>
+        <span class="export" @click="download">导出报告</span>
       </div>
       <div>
         分析面积：
@@ -205,10 +203,19 @@ export default {
   height: 100%;
   overflow-y: auto;
   overflow-x: hidden;
+  padding-right: 10px;
   line-height: 40px;
   .downloadDiv {
-    span {
-      width: calc(100% - 100px);
+    .xmmc {
+      width: calc(100% - 120px);
+      display: inline-block;
+    }
+    .export {
+      width: 116px;
+      height: 32px;
+      background: #0f7ac8;
+      text-align: center;
+      line-height: 32px;
       display: inline-block;
     }
   }
@@ -219,7 +226,7 @@ export default {
   .echars {
     margin-bottom: 10px;
     .echartTitle {
-      width: calc(100% - 10px);
+      width: 100%;
       height: 40px;
       display: flex;
       justify-content: space-between;

src/views/complianceAnalysis/ghzc.scss

@@ -47,7 +47,7 @@
     .xz_box {
         width: 100%;
         height: calc(100% - 42px);
-        padding: 1rem;
+        padding: 1rem 10px 1rem 1rem;
         background: transparent;
         border-color: transparent;