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

src/components/mapView/range.vue

@@ -348,6 +348,17 @@ export default {
     .clear {
       width: 80px;
     }
+    /deep/ .el-button--mini {
+      background: #0F7AC8;
+      border: none;
+      border-radius: 0;
+      color: #fff;
+      width: 60px;
+      height: 32px;
+      font-size: 14px;
+      // line-height: 32px;
+      // text-align: center;
+    }
   }
 }
 </style>

src/views/complianceAnalysis/components/hgxsc.vue

@@ -28,7 +28,8 @@
         ></el-input>
       </el-form-item>
     </el-form>
-    <div class="block-title">
+    <div class="site-title">
+      <div class="site_Icon"></div>
       分析因子
       <div
         v-show="$store.getters.name == 'admin'"
@@ -51,10 +52,8 @@
       </el-tree>
     </div>
     <div class="bottomBtns">
-      <el-button round class="btn-style" @click="reset">重置</el-button>
-      <el-button type="primary" round class="btn-style" @click="submitData">
-        确定</el-button
-      >
+      <span class="clearBtn"  @click="reset">取消</span>
+      <span class="sureBtn" @click="submitData">确定</span>
     </div>
   </div>
 </template>

src/views/complianceAnalysis/ghzc.scss

@@ -9,7 +9,7 @@
         position: absolute;
         top: 28px;
         z-index: 99;
-        background-image: url("/static/images/ghzc/background.png");
+        background-image: url("/static/images/ghzc/内容框.png");
         background-size: 100% 100%;
     }
 
@@ -20,7 +20,7 @@
             box-sizing: border-box;
             width: 100%;
             height: 42px;
-            background: url("/static/images/ghzc/title.png") no-repeat !important;
+            background: url("/static/images/ghzc/title_bg.png") no-repeat !important;
             background-size: 100% 100% !important;
             line-height: 43px;
             font-size: 14px;
@@ -30,6 +30,14 @@
             overflow: hidden;
             cursor: move;
         }
+
+        .lv-title {
+            font-family: 'HarmonyOS Sans, HarmonyOS Sans';
+            font-weight: bold;
+            font-size: 18px;
+            color: #FFFFFF;
+            margin-left: 30px;
+        }
     }
 
     .rightPane {
@@ -51,13 +59,17 @@
         }
 
         .el-tabs__item {
+            // width: 80px;
             height: 40px;
             line-height: 40px;
-            border-bottom: 2px solid #fff;
+            background: url("/static/images/ghzc/Tab_bg.png") no-repeat;
+            background-size: 100% 100%;
+            border-bottom: 2px solid #166CAD;
         }
 
         .el-tabs__item.is-active {
-            background: transparent;
+            background: url("/static/images/ghzc/Tabact_bg.png") no-repeat;
+            background-size: 100% 100%;
             border-color: transparent;
             border-bottom-color: #409EFF;
         }
@@ -86,23 +98,46 @@
         //     line-height: 45px;
         // }
         .bottomBtns {
-            width: 70%;
-            margin-left: 15%;
+            width: 100%;
+            // background-color: rgba(255, 192, 203, 0.418);
             display: flex;
             justify-content: space-between;
             text-align: center;
             position: absolute;
-            bottom: 10px;
+            bottom: 0px;
+
+
+            .sureBtn {
+                width: 65%;
+                background-color: #0F7AC8;
+                cursor: pointer;
+
+                &:hover {
+                    font-weight: bold;
+                }
+            }
+
+            .clearBtn {
+                cursor: pointer;
+                width: 30%;
+                background-color: #3f94f53f;
+                border: 1px solid #3F93F5;
+                color: #B6E0FF;
+
+                &:hover {
+                    font-weight: bold;
+                }
+            }
         }
     }
 
 
     .block-title {
-        color: #fff;
+        color: #CDDEEB;
         padding-left: 10px;
-        font-size: 16px;
-        font-weight: bold;
-
+        // font-weight: bold;
+        font-weight: 400;
+        font-size: 14px;
         // &::after {
         //   position: absolute;
         //   content: "";
@@ -194,24 +229,55 @@
 }
 
 .site-title {
+    width: 100%;
+    height: 40px;
+    // background-color: rgba(255, 192, 203, 0.425);
     color: #fff;
-    padding-left: 10px;
+    font-weight: 400;
     font-size: 16px;
-    font-weight: bold;
-
-    span {
-        width: 70px;
-        height: 100%;
-        line-height: 1.7;
-        text-align: center;
-        border-radius: 5px;
-        display: inline-block;
-        padding: 0;
-        border: 1px solid #02A7F0;
-        float: right;
-        cursor: pointer;
-        margin-left: 30px;
+    padding-left: 10px;
+    border-bottom: 4px solid #0B4072;
+    display: flex;
+    justify-content: flex-start;
+
+    .site_Icon {
+        width: 18px;
+        height: 18px;
+        background-image: url("/static/images/ghzc/icon.png");
+        background-size: 100% 100%;
+        // position: relative;
+        // top: 10px;
+        margin-top: 10px;
+
+    }
+
+    .el-button--mini {
+        background: #0F7AC8;
+        border: none;
+        border-radius: 0;
+        color: #fff;
+        width: 60px;
+        height: 32px;
+        font-size: 14px;
+        margin-left: 40px !important;
+        // margin-right: 20px;
+        // line-height: 32px;
+        // text-align: center;
     }
+
+    // span {
+    //     width: 70px;
+    //     height: 100%;
+    //     line-height: 1.7;
+    //     text-align: center;
+    //     border-radius: 5px;
+    //     display: inline-block;
+    //     padding: 0;
+    //     border: 1px solid #02A7F0;
+    //     float: right;
+    //     cursor: pointer;
+    //     margin-left: 30px;
+    // }
 }
 
 .el-input--mini .el-input__inner {
@@ -220,8 +286,14 @@
 
 .el-input__inner {
     color: #fff;
-    background: #409eff33 !important;
-    border: 1px solid #409eff;
+    background: #041C32 !important;
+    border: 1px dashed #0F7AC8;
+}
+
+.el-input__inner:hover {
+    // color: #fff;
+    // background: #041C32 !important;
+    // border: 1px dashed #409eff;
 }
 
 .el-input__inner::placeholder {
@@ -232,7 +304,8 @@
     color: #fff;
     /* 修改标题颜色 */
 }
-.el-collapse-item{
+
+.el-collapse-item {
     border: none;
 }
 
@@ -246,10 +319,12 @@
     border: 1px solid #d3dce6;
     /* 修改边框样式 */
 }
-.el-collapse-item__wrap{
+
+.el-collapse-item__wrap {
     background-color: transparent !important;
 }
-.el-scrollbar{
+
+.el-scrollbar {
     border: none !important;
 }
 

src/views/siteselection/components/fzxz.vue

@@ -75,8 +75,10 @@
       </el-form-item>
     </el-form>
     <div class="site-title">
+      <div class="site_Icon"></div>
       影响因子
-      <span @click="yzpz">配置</span>
+      <!-- <span @click="yzpz">配置</span> -->
+      <el-button size="mini" @click="yzpz">配置</el-button>
     </div>
     <div class="treeDiv">
       <el-table :data="tableData" border style="width: 100%">
@@ -95,10 +97,8 @@
       </el-table>
     </div>
     <div class="bottomBtns">
-      <el-button round class="btn-style" @click="reset">重置</el-button>
-      <el-button type="primary" round class="btn-style" @click="submitData">
-        确定</el-button
-      >
+      <span class="clearBtn"  @click="reset">取消</span>
+      <span class="sureBtn" @click="submitData">确定</span>
     </div>
     <yxyzPop :dialogVisible="dialogVisible" :tableData="tableData"></yxyzPop>
   </div>
@@ -411,6 +411,7 @@ export default {
     submitData() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
+
           // this.activeTabs = 'lsju'
           this.$emit('updateParent','activeTabs','lsju')
         } else {